On Fri, May 27, 2005 at 12:59:32PM +0200, Sebastien Bechet wrote: > Hello Jim, > > As fabrice know, i have done some work about it, but no time to debug. > Nevertheless, I think the code is near to work. > > Maybe it can help you or someone to finish gtk2 driver... > (you can apply it directly on CVS, see TODO on gtk.c top for bugs) > > Bye. > > -- > Sebastien Bechet <[EMAIL PROTECTED]> > av7.net
Wow...your code looks almost identical to mine. I suppose that shouldnt be surprising, considering that they are both based off of sdl.c ... still I wish I had known about this before I spent 10 hours writing a gtk2.c from scratch. I fixed the segfault, so ... the code is ready for release. Apply Makefile.diff to the Makefile in i386-softmmu - you may need to change the include dirs or library flags. Check 'gtk-config --cflags' and 'gtk-config --libs' to be sure. Note that the patched Makefile compiles gtk2.c into sdl.o, I plan on fixing that very soon. Bugs: - kludged Makefile - I do plan to merge in your configure and Makefile patches, but this kludge allowed me to write/debug gtkqemu a lot faster - modifier detection isnt working, so its difficult to get a grab and not possible to ungrab - this is why the no-sdl-grab patch is included - it is a bad idea to resize the window manually - you cant close the GTK window normally - must use 'quit' in qemu monitor if the OS doesnt close qemu thru APM - GDK grab/ungrab code untested - full screen mode untested - need to use "-monitor stdio" because changing virtual consoles doesnt work - probably a few more that I haven't noticed yet However, it boots and runs fine with Minix, Windows 98, and KNOPPIX V3.7. The major difference between your code and mine is that you use GdkPixbuf while I paint a GdkImage directly on the window. I decided against GdkPixbuf because it was too high level, and I wasn't sure how to convert the pixel buffer into the format needed by vga.c Personally, I think GTK is a bad way to go for something like this (SDL is a better choice but ideally you'd want something like OpenGL). I only wrote this because A) Fabrice continues to insist on GTK for linux but wont explain why B) I wanted to see if it was possible and how it could be done and C) I had a day off.
/* * QEMU GTK2 display driver * based on SDL driver by Fabrice * * Copyright (c) 2005 Jim Brown * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal * in the Software without restriction, including without limitation the rights * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell * copies of the Software, and to permit persons to whom the Software is * furnished to do so, subject to the following conditions: * * The above copyright notice and this permission notice shall be included in * all copies or substantial portions of the Software. * * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ #include "vl.h" #include <gtk/gtk.h> #include <gdk/gdk.h> // for those of you who dont want to get the no-sdl-grab patch static int grab_with_sdl = 0; /* define our own bitshift enums to allow qemugtk to know difference between left and right alt - something gtk doesnt provide in its modifiers mask. this uses qemu's own modifier_state[] map in order to guess correctly */ typedef enum { gtkshiftleft = 1 << 0, gtkshiftright = 1 << 1, gtkcontrolleft = 1 << 2, gtkcontrolright = 1 << 3, gtkaltleft = 1 << 4, gtkaltright = 1 << 5, gtkcapslock = 1 << 6 } gtk2keymod; static GtkWidget *screen; static GdkImage *image=NULL; static int ox = 0, oy = 0; static int gui_grab; /* if true, all keyboard/mouse events are grabbed */ static int last_vm_running; static int gui_saved_grab; static int gui_fullscreen; static int gui_key_modifier_pressed; static int gui_keysym; static int saved_grab_with_sdl; static int gui_fullscreen_initial_grab; static int gui_grab_code = gtkaltleft | gtkcontrolleft; static uint8_t modifiers_state[256]; static gboolean gtkexpose(GtkWidget *wid, GdkEventExpose *event) { gdk_draw_image(wid->window, wid->style->fg_gc[GTK_WIDGET_STATE(wid)], image, event->area.x, event->area.y, event->area.x, event->area.y, event->area.width, event->area.height); return TRUE; } static void gtkupdate(DisplayState *ds, int x, int y, int w, int h) { // printf("updating x=%d y=%d w=%d h=%d\n", x, y, w, h); GdkEventExpose ev; ev.area.x = x; ev.area.y = y; ev.area.width = w; ev.area.height = h; gtkexpose(screen, &ev); } static void gtkresize(DisplayState *ds, int w, int h) { // printf("resizing to %d %d\n", w, h); /*if (gui_fullscreen) gtk_window_fullscreen(GTK_WINDOW(screen)); else gtk_window_unfullscreen(GTK_WINDOW(screen));*/ if (image) g_object_unref(image); /* gdk_visual_get_best_with_depth() ??? but then how to paint onto window? */ image = gdk_image_new(GDK_IMAGE_NORMAL, gdk_visual_get_system(), w, h); gdk_image_set_colormap(image, gdk_colormap_get_system()); //if (!gui_fullscreen) //{ gtk_window_resize(GTK_WINDOW(screen), w, h); //} ds->data = image->mem; ds->linesize = image->bpl; ds->depth = image->bits_per_pixel; ds->width = w; ds->height = h; gtkupdate(ds, 0, 0, w, h); } static gboolean gtkconfig(GtkWidget *wid, GdkEventConfigure *ev, DisplayState *ds) { printf("resizing to %d %d\n", ev->width, ev->height); //gtkresize(ds, ev->width, ev->height); return TRUE; } /* generic keyboard conversion */ #include "gdk_keysym.h" #include "keymaps.c" static kbd_layout_t *kbd_layout = NULL; static uint8_t gtkkeyevent_to_keycode_generic(const GdkEventKey *ev) { int keysym; /* workaround for X11+SDL bug with AltGR - is it still needed for Gtk2? */ keysym = ev->keyval; if (keysym == 0 && ev->hardware_keycode == 113) keysym = GDK_Mode_switch; return keysym2scancode(kbd_layout, keysym); } /* specific keyboard conversions from scan codes */ #if defined(_WIN32) static uint8_t gtkkeyevent_to_keycode(const GdkEventKey *ev) { return ev->hardware_keycode; /* does this work on win32 gtk? */ } #else static const uint8_t x_keycode_to_pc_keycode[61] = { 0xc7, /* 97 Home */ 0xc8, /* 98 Up */ 0xc9, /* 99 PgUp */ 0xcb, /* 100 Left */ 0x4c, /* 101 KP-5 */ 0xcd, /* 102 Right */ 0xcf, /* 103 End */ 0xd0, /* 104 Down */ 0xd1, /* 105 PgDn */ 0xd2, /* 106 Ins */ 0xd3, /* 107 Del */ 0x9c, /* 108 Enter */ 0x9d, /* 109 Ctrl-R */ 0x0, /* 110 Pause */ 0xb7, /* 111 Print */ 0xb5, /* 112 Divide */ 0xb8, /* 113 Alt-R */ 0xc6, /* 114 Break */ 0x0, /* 115 */ 0x0, /* 116 */ 0x0, /* 117 */ 0x0, /* 118 */ 0x0, /* 119 */ 0x70, /* 120 Hiragana_Katakana */ 0x0, /* 121 */ 0x0, /* 122 */ 0x73, /* 123 backslash */ 0x0, /* 124 */ 0x0, /* 125 */ 0x0, /* 126 */ 0x0, /* 127 */ 0x0, /* 128 */ 0x79, /* 129 Henkan */ 0x0, /* 130 */ 0x7b, /* 131 Muhenkan */ 0x0, /* 132 */ 0x7d, /* 133 Yen */ 0x0, /* 134 */ 0x0, /* 135 */ 0x47, /* 136 KP_7 */ 0x48, /* 137 KP_8 */ 0x49, /* 138 KP_9 */ 0x4b, /* 139 KP_4 */ 0x4c, /* 140 KP_5 */ 0x4d, /* 141 KP_6 */ 0x4f, /* 142 KP_1 */ 0x50, /* 143 KP_2 */ 0x51, /* 144 KP_3 */ 0x52, /* 145 KP_0 */ 0x53, /* 146 KP_. */ 0x47, /* 147 KP_HOME */ 0x48, /* 148 KP_UP */ 0x49, /* 149 KP_PgUp */ 0x4b, /* 150 KP_Left */ 0x4c, /* 151 KP_ */ 0x4d, /* 152 KP_Right */ 0x4f, /* 153 KP_End */ 0x50, /* 154 KP_Down */ 0x51, /* 155 KP_PgDn */ 0x52, /* 156 KP_Ins */ 0x53, /* 157 KP_Del */ }; static uint8_t gtkkeyevent_to_keycode(const GdkEventKey *ev) { int keycode; keycode = ev->hardware_keycode; if (keycode < 9) { keycode = 0; } else if (keycode < 97) { keycode -= 8; /* just an offset */ } else if (keycode < 158) { /* use conversion table */ keycode = x_keycode_to_pc_keycode[keycode - 97]; } else { keycode = 0; } return keycode; } #endif static void reset_keys(void) { int i; for(i = 0; i < 256; i++) { if (modifiers_state[i]) { if (i & 0x80) kbd_put_keycode(0xe0); kbd_put_keycode(i | 0x80); modifiers_state[i] = 0; } } } /* convert GDK modifiers and invoke ugly hack to distinguish between left and right shift/control/alt */ static guint gtkGetModState(guint state, guint keyval) { guint key = 0; switch(keyval) { case GDK_Shift_L: key |= gtkshiftleft; break; case GDK_Shift_R: key |= gtkshiftright; break; case GDK_Control_L: key |= gtkcontrolleft; break; case GDK_Control_R: key |= gtkcontrolright; break; case GDK_Alt_L: key |= gtkaltleft; break; case GDK_Alt_R: key |= gtkaltright; break; case GDK_Caps_Lock: key |= gtkcapslock; break; default: break; } if (state & GDK_SHIFT_MASK) { if (modifiers_state[0x2a]) key |= gtkshiftleft; if (modifiers_state[0x36]) key |= gtkshiftright; } if (state & GDK_CONTROL_MASK) { if (modifiers_state[0x1d]) key |= gtkcontrolleft; if (modifiers_state[0x9d]) key |= gtkcontrolright; } if (state & GDK_MOD1_MASK) /* fixme: need to do a check to make sure that alt is mapped to GDK_MOD1_MASK in the GDK_Keymap */ { if (modifiers_state[0x38]) key |= gtkaltleft; if (modifiers_state[0xb8]) key |= gtkaltright; } if (state & GDK_LOCK_MASK) key |= gtkcapslock; return key; } static void gtkprocess_key(GdkEventKey *ev) { int keycode, v; if (ev->keyval == GDK_Pause) { /* specific case */ v = 0; if (ev->type == GDK_KEY_RELEASE) v |= 0x80; kbd_put_keycode(0xe1); kbd_put_keycode(0x1d | v); kbd_put_keycode(0x45 | v); return; } if (kbd_layout) { keycode = gtkkeyevent_to_keycode_generic(ev); } else { keycode = gtkkeyevent_to_keycode(ev); } switch(keycode) { case 0x00: /* sent when leaving window: reset the modifiers state */ reset_keys(); return; case 0x2a: /* Left Shift */ case 0x36: /* Right Shift */ case 0x1d: /* Left CTRL */ case 0x9d: /* Right CTRL */ case 0x38: /* Left ALT */ case 0xb8: /* Right ALT */ if (ev->type == GDK_KEY_RELEASE) modifiers_state[keycode] = 0; else modifiers_state[keycode] = 1; break; case 0x45: /* num lock */ case 0x3a: /* caps lock */ /* SDL does not send the key up event, so we generate it */ kbd_put_keycode(keycode); kbd_put_keycode(keycode | 0x80); return; } /* now send the key code */ if (keycode & 0x80) kbd_put_keycode(0xe0); if (ev->type == GDK_KEY_RELEASE) kbd_put_keycode(keycode | 0x80); else kbd_put_keycode(keycode & 0x7f); } static void gtkupdate_caption(void) { char buf[1024]; strcpy(buf, "QEMU"); if (!vm_running) { strcat(buf, " [Stopped]"); } if (gui_grab) { strcat(buf, " - Press Ctrl-Shift to exit grab"); } gtk_window_set_title(GTK_WINDOW(screen), buf); } static void gtkgrab_start(void) { GdkCursor *cur = NULL; /* ideally we'd set an invisble cursor here */ guint events; events = GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_SCROLL_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK; if (grab_with_sdl) { gdk_pointer_grab(screen->window, TRUE, events, screen->window, cur, GDK_CURRENT_TIME); gdk_keyboard_grab(screen->window, TRUE, GDK_CURRENT_TIME); } gui_grab = 1; gtkupdate_caption(); } static void gtkgrab_end(void) { if (grab_with_sdl) { gdk_pointer_ungrab(GDK_CURRENT_TIME); gdk_keyboard_ungrab(GDK_CURRENT_TIME); } gui_grab = 0; gtkupdate_caption(); } static gboolean gtksend_mouse_scroll(GtkWidget *wid, GdkEventScroll *ev) { int x, y, dx, dy, dz, state, buttons; if (gui_grab) { x = ev->x; y = ev->y; state = ev->state; buttons = 0; dx = x - ox; dy = y - oy; ox = x; oy = y; buttons = 0; if ((state & GDK_BUTTON1_MASK)) buttons |= MOUSE_EVENT_LBUTTON; if ((state & GDK_BUTTON3_MASK)) buttons |= MOUSE_EVENT_RBUTTON; if ((state & GDK_BUTTON2_MASK)) buttons |= MOUSE_EVENT_MBUTTON; /* test wheel - copied from Sebastien Bechet's gtk.c */ dz = 0; if ((state & GDK_BUTTON4_MASK) || ev->direction == GDK_SCROLL_UP) dz--; if ((state & GDK_BUTTON5_MASK) || ev->direction == GDK_SCROLL_DOWN) dz++; kbd_mouse_event(dx, dy, dz, buttons); } return TRUE; } static gboolean gtksend_mouse_button(GtkWidget *wid, GdkEventButton *ev) { int x, y, dx, dy, dz, state, buttons; if (gui_grab) { x = ev->x; y = ev->y; state = ev->state; buttons = 0; dx = x - ox; dy = y - oy; ox = x; oy = y; buttons = 0; if ((state & GDK_BUTTON1_MASK) || ev->button == 1) buttons |= MOUSE_EVENT_LBUTTON; if ((state & GDK_BUTTON3_MASK) || ev->button == 3) buttons |= MOUSE_EVENT_RBUTTON; if ((state & GDK_BUTTON2_MASK) || ev->button == 2) buttons |= MOUSE_EVENT_MBUTTON; /* XXX: test wheel */ dz = 0; if ((state & GDK_BUTTON4_MASK) || ev->button == 4) dz--; if ((state & GDK_BUTTON5_MASK) || ev->button == 5) dz++; kbd_mouse_event(dx, dy, dz, buttons); } else { if ((ev->state & GDK_BUTTON1_MASK) && ev->type == GDK_BUTTON_PRESS) { /* start grabbing all events */ gtkgrab_start(); } } return TRUE; } static gboolean gtksend_mouse_move(GtkWidget *wid, GdkEventMotion *ev) { int x, y, dx, dy, dz, state, buttons; if (gui_grab) { if (ev->is_hint) { gdk_window_get_pointer(ev->window, &x, &y, (GdkModifierType*)&state); } else { x = ev->x; y = ev->y; state = ev->state; } dx = x - ox; dy = y - oy; ox = x; oy = y; buttons = 0; if (state & GDK_BUTTON1_MASK) buttons |= MOUSE_EVENT_LBUTTON; if (state & GDK_BUTTON3_MASK) buttons |= MOUSE_EVENT_RBUTTON; if (state & GDK_BUTTON2_MASK) buttons |= MOUSE_EVENT_MBUTTON; /* XXX: test wheel */ dz = 0; if (state & GDK_BUTTON4_MASK) dz--; if (state & GDK_BUTTON5_MASK) dz++; kbd_mouse_event(dx, dy, dz, buttons); } return TRUE; } static void toggle_full_screen(DisplayState *ds) { gui_fullscreen = !gui_fullscreen; gtkresize(ds, image->width, image->height); if (gui_fullscreen) { gui_saved_grab = gui_grab; saved_grab_with_sdl = grab_with_sdl; grab_with_sdl = 1; gtkgrab_start(); } else { if (!gui_saved_grab || !saved_grab_with_sdl) gtkgrab_end(); grab_with_sdl = saved_grab_with_sdl; } vga_invalidate_display(); vga_update_display(); } static gboolean gtkkey_press(GtkWidget *wid, GdkEventKey *ev, DisplayState *ds) { int mod_state; if (ev->type == GDK_KEY_PRESS) { mod_state = (gtkGetModState(ev->state, ev->keyval) & gui_grab_code) == gui_grab_code; if (gui_key_modifier_pressed) { int keycode; keycode = gtkkeyevent_to_keycode(ev); switch(keycode) { case 0x21: /* 'f' key on US keyboard */ toggle_full_screen(ds); gui_keysym = 1; break; case 0x02 ... 0x0a: /* '1' to '9' keys */ console_select(keycode - 0x02); if (is_active_console(vga_console)) { /* tell the vga console to redisplay itself */ vga_invalidate_display(); } else { /* display grab if going to a text console */ if (gui_grab) gtkgrab_end(); } gui_keysym = 1; break; default: break; } } else if (!is_active_console(vga_console)) { int keysym; keysym = 0; if (ev->state & GDK_CONTROL_MASK) { switch(ev->keyval) { case GDK_Up: keysym = QEMU_KEY_CTRL_UP; break; case GDK_Down: keysym = QEMU_KEY_CTRL_DOWN; break; case GDK_Left: keysym = QEMU_KEY_CTRL_LEFT; break; case GDK_Right: keysym = QEMU_KEY_CTRL_RIGHT; break; case GDK_Home: keysym = QEMU_KEY_CTRL_HOME; break; case GDK_End: keysym = QEMU_KEY_CTRL_END; break; case GDK_Page_Up: keysym = QEMU_KEY_CTRL_PAGEUP; break; case GDK_Page_Down: keysym = QEMU_KEY_CTRL_PAGEDOWN; break; default: break; } } else { switch(ev->keyval) { case GDK_Up: keysym = QEMU_KEY_UP; break; case GDK_Down: keysym = QEMU_KEY_DOWN; break; case GDK_Left: keysym = QEMU_KEY_LEFT; break; case GDK_Right: keysym = QEMU_KEY_RIGHT; break; case GDK_Home: keysym = QEMU_KEY_HOME; break; case GDK_End: keysym = QEMU_KEY_END; break; case GDK_Page_Up: keysym = QEMU_KEY_PAGEUP; break; case GDK_Page_Down: keysym = QEMU_KEY_PAGEDOWN; break; case GDK_BackSpace: keysym = QEMU_KEY_BACKSPACE; break; case GDK_Delete: keysym = QEMU_KEY_DELETE; break; default: break; } } if (keysym) { kbd_put_keysym(keysym); } /*else if (ev->key.keysym.unicode != 0) { kbd_put_keysym(ev->key.keysym.unicode); }*/ } } else if (ev->type == GDK_KEY_RELEASE) { mod_state = (gtkGetModState(ev->state, ev->keyval) & gui_grab_code); if (!mod_state) { if (gui_key_modifier_pressed) { if (gui_keysym == 0) { /* exit/enter grab if pressing Ctrl-Alt */ if (!gui_grab) gtkgrab_start(); else gtkgrab_end(); /* SDL does not send back all the modifiers key, so we must correct it */ reset_keys(); return TRUE; } gui_key_modifier_pressed = 0; gui_keysym = 0; } } } if (is_active_console(vga_console)) gtkprocess_key(ev); return TRUE; } static void gtkrefresh(DisplayState *ds) { if (last_vm_running != vm_running) { last_vm_running = vm_running; gtkupdate_caption(); } if (ds->data != image->mem) { printf("Oops!\n"); ds->data = image->mem; } if (is_active_console(vga_console)) vga_update_display(); while (gtk_events_pending()) gtk_main_iteration(); } static void gtkcleanup(void) { gtk_main_quit(); } static gboolean gtkdeletewin(void) { /* how do we signal qemu that its time to shut itself off? this is the place that we hook to trap attempts to close the main qemu window - for now just ignore them */ //qemu_system_shutdown_request(); //return FALSE; return TRUE; } static void gtkdestroy(void) { /* ideally we would call a hook here so qemu could clean itself up */ gtkcleanup(); } void sdl_display_init(DisplayState *ds, int full_screen) { int events; #if defined(__APPLE__) /* always use generic keymaps */ if (!keyboard_layout) keyboard_layout = "en-us"; #endif if(keyboard_layout) { kbd_layout = init_keyboard_layout(keyboard_layout); if (!kbd_layout) exit(1); } if (!gtk_init_check (0,NULL)) { fprintf(stderr, "Could not load GTK\n"); exit(0); } /* note: adding GDK_DRAG_* and GDK_DROP_* would provide a mechanism for supporting drag and drop between host and guest */ events = GDK_EXPOSURE_MASK | GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_KEY_PRESS_MASK | GDK_KEY_RELEASE_MASK | GDK_ENTER_NOTIFY_MASK | GDK_LEAVE_NOTIFY_MASK | GDK_FOCUS_CHANGE_MASK | GDK_SCROLL_MASK | GDK_STRUCTURE_MASK; screen = gtk_window_new(GTK_WINDOW_TOPLEVEL); gtk_widget_set_events(screen, events); gtk_window_set_default_size(GTK_WINDOW(screen), 720, 400); g_signal_connect(G_OBJECT(screen), "delete_event", G_CALLBACK(gtkdeletewin), NULL); g_signal_connect(G_OBJECT(screen), "destroy", G_CALLBACK(gtkdestroy), NULL); gtk_container_set_border_width(GTK_CONTAINER(screen), 10); gtk_signal_connect(GTK_OBJECT(screen), "expose_event", (GtkSignalFunc) gtkexpose, NULL); gtk_signal_connect(GTK_OBJECT(screen), "configure_event", (GtkSignalFunc) gtkconfig, ds); gtk_signal_connect(GTK_OBJECT(screen), "motion_notify_event", (GtkSignalFunc) gtksend_mouse_move, NULL); gtk_signal_connect(GTK_OBJECT(screen), "button_press_event", (GtkSignalFunc) gtksend_mouse_button, NULL); gtk_signal_connect(GTK_OBJECT(screen), "button_release_event", (GtkSignalFunc) gtksend_mouse_button, NULL); gtk_signal_connect(GTK_OBJECT(screen), "scroll_event", (GtkSignalFunc) gtksend_mouse_scroll, NULL); gtk_signal_connect(GTK_OBJECT(screen), "key_press_event", (GtkSignalFunc) gtkkey_press, ds); gtk_signal_connect(GTK_OBJECT(screen), "key_release_event", (GtkSignalFunc) gtkkey_press, ds); /* gtk_signal_connect(GTK_OBJECT(screen), "enter_notify_event", (GtkSignalFunc) , NULL); gtk_signal_connect(GTK_OBJECT(screen), "leave_notify_event", (GtkSignalFunc) , NULL); gtk_signal_connect(GTK_OBJECT(screen), "focus_in_event", (GtkSignalFunc) , NULL); gtk_signal_connect(GTK_OBJECT(screen), "focus_out_event", (GtkSignalFunc) , NULL);*/ ds->dpy_update = gtkupdate; ds->dpy_resize = gtkresize; ds->dpy_refresh = gtkrefresh; gtkresize(ds, 720, 400); gtkupdate_caption(); gui_grab = 0; gtk_widget_show(screen); atexit(gtkcleanup); if (full_screen) { gui_fullscreen = 1; gui_fullscreen_initial_grab = 1; gtkgrab_start(); } }
#include <gdk/gdkkeysyms.h> typedef struct { const char* name; int keysym; } name2keysym_t; static name2keysym_t name2keysym[]={ /* ascii */ { "space", 0x020}, { "exclam", 0x021}, { "quotedbl", 0x022}, { "numbersign", 0x023}, { "dollar", 0x024}, { "percent", 0x025}, { "ampersand", 0x026}, { "apostrophe", 0x027}, { "parenleft", 0x028}, { "parenright", 0x029}, { "asterisk", 0x02a}, { "plus", 0x02b}, { "comma", 0x02c}, { "minus", 0x02d}, { "period", 0x02e}, { "slash", 0x02f}, { "0", 0x030}, { "1", 0x031}, { "2", 0x032}, { "3", 0x033}, { "4", 0x034}, { "5", 0x035}, { "6", 0x036}, { "7", 0x037}, { "8", 0x038}, { "9", 0x039}, { "colon", 0x03a}, { "semicolon", 0x03b}, { "less", 0x03c}, { "equal", 0x03d}, { "greater", 0x03e}, { "question", 0x03f}, { "at", 0x040}, { "A", 0x041}, { "B", 0x042}, { "C", 0x043}, { "D", 0x044}, { "E", 0x045}, { "F", 0x046}, { "G", 0x047}, { "H", 0x048}, { "I", 0x049}, { "J", 0x04a}, { "K", 0x04b}, { "L", 0x04c}, { "M", 0x04d}, { "N", 0x04e}, { "O", 0x04f}, { "P", 0x050}, { "Q", 0x051}, { "R", 0x052}, { "S", 0x053}, { "T", 0x054}, { "U", 0x055}, { "V", 0x056}, { "W", 0x057}, { "X", 0x058}, { "Y", 0x059}, { "Z", 0x05a}, { "bracketleft", 0x05b}, { "backslash", 0x05c}, { "bracketright", 0x05d}, { "asciicircum", 0x05e}, { "underscore", 0x05f}, { "grave", 0x060}, { "a", 0x061}, { "b", 0x062}, { "c", 0x063}, { "d", 0x064}, { "e", 0x065}, { "f", 0x066}, { "g", 0x067}, { "h", 0x068}, { "i", 0x069}, { "j", 0x06a}, { "k", 0x06b}, { "l", 0x06c}, { "m", 0x06d}, { "n", 0x06e}, { "o", 0x06f}, { "p", 0x070}, { "q", 0x071}, { "r", 0x072}, { "s", 0x073}, { "t", 0x074}, { "u", 0x075}, { "v", 0x076}, { "w", 0x077}, { "x", 0x078}, { "y", 0x079}, { "z", 0x07a}, { "braceleft", 0x07b}, { "bar", 0x07c}, { "braceright", 0x07d}, { "asciitilde", 0x07e}, /* latin 1 extensions */ { "nobreakspace", 0x0a0}, { "exclamdown", 0x0a1}, { "cent", 0x0a2}, { "sterling", 0x0a3}, { "currency", 0x0a4}, { "yen", 0x0a5}, { "brokenbar", 0x0a6}, { "section", 0x0a7}, { "diaeresis", 0x0a8}, { "copyright", 0x0a9}, { "ordfeminine", 0x0aa}, { "guillemotleft", 0x0ab}, { "notsign", 0x0ac}, { "hyphen", 0x0ad}, { "registered", 0x0ae}, { "macron", 0x0af}, { "degree", 0x0b0}, { "plusminus", 0x0b1}, { "twosuperior", 0x0b2}, { "threesuperior", 0x0b3}, { "acute", 0x0b4}, { "mu", 0x0b5}, { "paragraph", 0x0b6}, { "periodcentered", 0x0b7}, { "cedilla", 0x0b8}, { "onesuperior", 0x0b9}, { "masculine", 0x0ba}, { "guillemotright", 0x0bb}, { "onequarter", 0x0bc}, { "onehalf", 0x0bd}, { "threequarters", 0x0be}, { "questiondown", 0x0bf}, { "Agrave", 0x0c0}, { "Aacute", 0x0c1}, { "Acircumflex", 0x0c2}, { "Atilde", 0x0c3}, { "Adiaeresis", 0x0c4}, { "Aring", 0x0c5}, { "AE", 0x0c6}, { "Ccedilla", 0x0c7}, { "Egrave", 0x0c8}, { "Eacute", 0x0c9}, { "Ecircumflex", 0x0ca}, { "Ediaeresis", 0x0cb}, { "Igrave", 0x0cc}, { "Iacute", 0x0cd}, { "Icircumflex", 0x0ce}, { "Idiaeresis", 0x0cf}, { "ETH", 0x0d0}, { "Eth", 0x0d0}, { "Ntilde", 0x0d1}, { "Ograve", 0x0d2}, { "Oacute", 0x0d3}, { "Ocircumflex", 0x0d4}, { "Otilde", 0x0d5}, { "Odiaeresis", 0x0d6}, { "multiply", 0x0d7}, { "Ooblique", 0x0d8}, { "Oslash", 0x0d8}, { "Ugrave", 0x0d9}, { "Uacute", 0x0da}, { "Ucircumflex", 0x0db}, { "Udiaeresis", 0x0dc}, { "Yacute", 0x0dd}, { "THORN", 0x0de}, { "Thorn", 0x0de}, { "ssharp", 0x0df}, { "agrave", 0x0e0}, { "aacute", 0x0e1}, { "acircumflex", 0x0e2}, { "atilde", 0x0e3}, { "adiaeresis", 0x0e4}, { "aring", 0x0e5}, { "ae", 0x0e6}, { "ccedilla", 0x0e7}, { "egrave", 0x0e8}, { "eacute", 0x0e9}, { "ecircumflex", 0x0ea}, { "ediaeresis", 0x0eb}, { "igrave", 0x0ec}, { "iacute", 0x0ed}, { "icircumflex", 0x0ee}, { "idiaeresis", 0x0ef}, { "eth", 0x0f0}, { "ntilde", 0x0f1}, { "ograve", 0x0f2}, { "oacute", 0x0f3}, { "ocircumflex", 0x0f4}, { "otilde", 0x0f5}, { "odiaeresis", 0x0f6}, { "division", 0x0f7}, { "oslash", 0x0f8}, { "ooblique", 0x0f8}, { "ugrave", 0x0f9}, { "uacute", 0x0fa}, { "ucircumflex", 0x0fb}, { "udiaeresis", 0x0fc}, { "yacute", 0x0fd}, { "thorn", 0x0fe}, { "ydiaeresis", 0x0ff}, {"EuroSign", GDK_EuroSign}, /* modifiers */ {"Control_L", GDK_Control_L}, {"Control_R", GDK_Control_R}, {"Alt_L", GDK_Alt_L}, {"Alt_R", GDK_Alt_R}, {"Caps_Lock", GDK_Caps_Lock}, {"Meta_L", GDK_Meta_L}, {"Meta_R", GDK_Meta_R}, {"Shift_L", GDK_Shift_L}, {"Shift_R", GDK_Shift_R}, {"Super_L", GDK_Super_L}, {"Super_R", GDK_Super_R}, /* special keys */ {"BackSpace", GDK_BackSpace}, {"Tab", GDK_Tab}, {"Return", GDK_Return}, {"Right", GDK_Right}, {"Left", GDK_Left}, {"Up", GDK_Up}, {"Down", GDK_Down}, {"Page_Down", GDK_Page_Down}, {"Page_Up", GDK_Page_Up}, {"Insert", GDK_Insert}, {"Delete", GDK_Delete}, {"Home", GDK_Home}, {"End", GDK_End}, {"Scroll_Lock", GDK_Scroll_Lock}, {"F1", GDK_F1}, {"F2", GDK_F2}, {"F3", GDK_F3}, {"F4", GDK_F4}, {"F5", GDK_F5}, {"F6", GDK_F6}, {"F7", GDK_F7}, {"F8", GDK_F8}, {"F9", GDK_F9}, {"F10", GDK_F10}, {"F11", GDK_F11}, {"F12", GDK_F12}, {"F13", GDK_F13}, {"F14", GDK_F14}, {"F15", GDK_F15}, {"Sys_Req", GDK_Sys_Req}, {"KP_0", GDK_KP_0}, {"KP_1", GDK_KP_1}, {"KP_2", GDK_KP_2}, {"KP_3", GDK_KP_3}, {"KP_4", GDK_KP_4}, {"KP_5", GDK_KP_5}, {"KP_6", GDK_KP_6}, {"KP_7", GDK_KP_7}, {"KP_8", GDK_KP_8}, {"KP_9", GDK_KP_9}, {"KP_Add", GDK_KP_Add}, {"KP_Decimal", GDK_KP_Decimal}, {"KP_Divide", GDK_KP_Divide}, {"KP_Enter", GDK_KP_Enter}, {"KP_Equal", GDK_KP_Equal}, {"KP_Multiply", GDK_KP_Multiply}, {"KP_Subtract", GDK_KP_Subtract}, {"help", GDK_Help}, {"Menu", GDK_Menu}, {"Power", GDK_VoidSymbol}, {"Print", GDK_Print}, {"Mode_switch", GDK_Mode_switch}, {"Multi_Key", GDK_Multi_key}, {"Num_Lock", GDK_Num_Lock}, {"Pause", GDK_Pause}, {"Escape", GDK_Escape}, {0,0}, };
--- Makefile.org Fri May 27 11:21:47 2005 +++ Makefile Fri May 27 11:22:46 2005 @@ -392,13 +392,13 @@ endif $(QEMU_SYSTEM): $(VL_OBJS) libqemu.a - $(CC) $(VL_LDFLAGS) -o $@ $^ $(LIBS) $(SDL_LIBS) $(COCOA_LIBS) $(VL_LIBS) + $(CC) $(VL_LDFLAGS) -o $@ $^ $(LIBS) $(SDL_LIBS) $(COCOA_LIBS) $(VL_LIBS) -L/usr/local/lib -L/usr/X11R6/lib -lgtk-x11-2.0 -lgdk-x11-2.0 -lpango-1.0 -latk-1.0 -rdynamic -lgmodule-2.0 -lglib-2.0 -ldl -lXi -lXext -lX11 -lXft -lm cocoa.o: cocoa.m $(CC) $(CFLAGS) $(DEFINES) -c -o $@ $< -sdl.o: sdl.c keymaps.c sdl_keysym.h - $(CC) $(CFLAGS) $(DEFINES) $(SDL_CFLAGS) -c -o $@ $< +sdl.o: gtk2.c keymaps.c gdk_keysym.h + $(CC) $(CFLAGS) $(DEFINES) -I/usr/local/include/gtk-2.0 -I/usr/local/include/pango-1.0 -I/usr/local/include/atk-1.0 -I/usr/local/include/glib-2.0 -I/usr/local/lib/glib-2.0/include -I/usr/X11R6/include -I/usr/local/lib/gtk-2.0/include -c -o $@ $< sdlaudio.o: sdlaudio.c $(CC) $(CFLAGS) $(DEFINES) $(SDL_CFLAGS) -c -o $@ $<
_______________________________________________ Qemu-devel mailing list Qemu-devel@nongnu.org http://lists.nongnu.org/mailman/listinfo/qemu-devel