frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

XQuartz: Use "pointer" and "pen" for device names to please GDK. 

(cherry picked from commit 00ca0f4d839abf47e9573a1552473e039cf787e6)
This commit is contained in:
Jeremy Huddleston 2008-09-30 13:54:08 -07:00
parent d3f597a986
commit 2a5ce41f03
1 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
hw/xquartz/darwin.c
View File

@ -470,15 +470,29 @@ void InitInput( int argc, char **argv )
{ {
darwinKeyboard = AddInputDevice(DarwinKeybdProc, TRUE); darwinKeyboard = AddInputDevice(DarwinKeybdProc, TRUE);
RegisterKeyboardDevice( darwinKeyboard ); RegisterKeyboardDevice( darwinKeyboard );
darwinKeyboard->name = strdup("Quartz Keyboard"); darwinKeyboard->name = strdup("keyboard");
/* here's the snippet from the current gdk sources:
if (!strcmp (tmp_name, "pointer"))
gdkdev->info.source = GDK_SOURCE_MOUSE;
else if (!strcmp (tmp_name, "wacom") ||
!strcmp (tmp_name, "pen"))
gdkdev->info.source = GDK_SOURCE_PEN;
else if (!strcmp (tmp_name, "eraser"))
gdkdev->info.source = GDK_SOURCE_ERASER;
else if (!strcmp (tmp_name, "cursor"))
gdkdev->info.source = GDK_SOURCE_CURSOR;
else
gdkdev->info.source = GDK_SOURCE_PEN;
*/
darwinPointer = AddInputDevice(DarwinMouseProc, TRUE); darwinPointer = AddInputDevice(DarwinMouseProc, TRUE);
RegisterPointerDevice( darwinPointer ); RegisterPointerDevice( darwinPointer );
darwinPointer->name = strdup("Quartz Pointing Device"); darwinPointer->name = strdup("pointer");
darwinTabletStylus = AddInputDevice(DarwinTabletProc, TRUE); darwinTabletStylus = AddInputDevice(DarwinTabletProc, TRUE);
RegisterPointerDevice( darwinTabletStylus ); RegisterPointerDevice( darwinTabletStylus );
darwinTabletStylus->name = strdup("stylus"); darwinTabletStylus->name = strdup("pen");
darwinTabletCursor = AddInputDevice(DarwinTabletProc, TRUE); darwinTabletCursor = AddInputDevice(DarwinTabletProc, TRUE);
RegisterPointerDevice( darwinTabletCursor ); RegisterPointerDevice( darwinTabletCursor );