equal
deleted
inserted
replaced
1 diff --git a/Xi/exevents.c b/Xi/exevents.c |
1 diff --git a/Xi/exevents.c b/Xi/exevents.c |
2 index f681a8b..9ffb87f 100644 |
2 index 106da3a..dd7e3a2 100644 |
3 --- a/Xi/exevents.c |
3 --- a/Xi/exevents.c |
4 +++ b/Xi/exevents.c |
4 +++ b/Xi/exevents.c |
5 @@ -225,7 +225,16 @@ CopyKeyClass(DeviceIntPtr device, DeviceIntPtr master) |
5 @@ -225,7 +225,16 @@ CopyKeyClass(DeviceIntPtr device, DeviceIntPtr master) |
6 { |
6 { |
7 KeyClassPtr mk = master->key; |
7 KeyClassPtr mk = master->key; |
18 +#endif |
18 +#endif |
19 return; |
19 return; |
20 |
20 |
21 mk->sourceid = device->id; |
21 mk->sourceid = device->id; |
22 diff --git a/Xi/extinit.c b/Xi/extinit.c |
22 diff --git a/Xi/extinit.c b/Xi/extinit.c |
23 index 4483076..e40c5d0 100644 |
23 index 7e30755..5c008e4 100644 |
24 --- a/Xi/extinit.c |
24 --- a/Xi/extinit.c |
25 +++ b/Xi/extinit.c |
25 +++ b/Xi/extinit.c |
26 @@ -367,6 +367,10 @@ extern XExtensionVersion XIVersion; |
26 @@ -371,6 +371,10 @@ Mask PropagateMask[EMASKSIZE]; |
27 |
27 |
28 Mask PropagateMask[MAXDEVICES]; |
28 DevPrivateKeyRec XIClientPrivateKeyRec; |
29 |
29 |
30 +#ifdef SUNSOFT |
30 +#ifdef SUNSOFT |
31 +DevPrivateKeyRec HotkeyMapDevicePrivateKeyRec; |
31 +DevPrivateKeyRec HotkeyMapDevicePrivateKeyRec; |
32 +#endif |
32 +#endif |
33 + |
33 + |
34 /***************************************************************** |
34 /***************************************************************** |
35 * |
35 * |
36 * Versioning support |
36 * Declarations of local routines. |
37 @@ -1260,6 +1264,11 @@ XInputExtensionInit(void) |
37 @@ -1260,6 +1264,11 @@ XInputExtensionInit(void) |
38 (&XIClientPrivateKeyRec, PRIVATE_CLIENT, sizeof(XIClientRec))) |
38 (&XIClientPrivateKeyRec, PRIVATE_CLIENT, sizeof(XIClientRec))) |
39 FatalError("Cannot request private for XI.\n"); |
39 FatalError("Cannot request private for XI.\n"); |
40 |
40 |
41 +#ifdef SUNSOFT |
41 +#ifdef SUNSOFT |
45 + |
45 + |
46 if (!AddCallback(&ClientStateCallback, XIClientCallback, 0)) |
46 if (!AddCallback(&ClientStateCallback, XIClientCallback, 0)) |
47 FatalError("Failed to add callback to XI.\n"); |
47 FatalError("Failed to add callback to XI.\n"); |
48 |
48 |
49 diff --git a/config/hal.c b/config/hal.c |
49 diff --git a/config/hal.c b/config/hal.c |
50 index 2ead556..c3eab4a 100644 |
50 index 2ead556..9de9dfc 100644 |
51 --- a/config/hal.c |
51 --- a/config/hal.c |
52 +++ b/config/hal.c |
52 +++ b/config/hal.c |
53 @@ -123,6 +123,49 @@ get_prop_string_array(LibHalContext * hal_ctx, const char *udi, |
53 @@ -123,6 +123,49 @@ get_prop_string_array(LibHalContext * hal_ctx, const char *udi, |
54 return ret; |
54 return ret; |
55 } |
55 } |
131 + </match> |
131 + </match> |
132 <merge key="input.x11_options.XkbModel" type="string">pc105</merge> |
132 <merge key="input.x11_options.XkbModel" type="string">pc105</merge> |
133 <match key="/org/freedesktop/Hal/devices/computer:system.kernel.name" |
133 <match key="/org/freedesktop/Hal/devices/computer:system.kernel.name" |
134 string="Linux"> |
134 string="Linux"> |
135 diff --git a/include/inputstr.h b/include/inputstr.h |
135 diff --git a/include/inputstr.h b/include/inputstr.h |
136 index 841e805..a338ea8 100644 |
136 index 5a38924..263b1b1 100644 |
137 --- a/include/inputstr.h |
137 --- a/include/inputstr.h |
138 +++ b/include/inputstr.h |
138 +++ b/include/inputstr.h |
139 @@ -57,6 +57,11 @@ SOFTWARE. |
139 @@ -57,6 +57,11 @@ SOFTWARE. |
140 #include "geext.h" |
140 #include "geext.h" |
141 #include "privates.h" |
141 #include "privates.h" |