* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/
#include "config.h"
GdkDisplay *display = ((GdkEventSource*) source)->display;
gboolean retval;
- GDK_THREADS_ENTER ();
+ gdk_threads_enter ();
*timeout = -1;
- retval = (_gdk_event_queue_find_first (display) != NULL);
- GDK_THREADS_LEAVE ();
+ if (display->event_pause_count > 0)
+ retval = FALSE;
+ else
+ retval = (_gdk_event_queue_find_first (display) != NULL);
+
+ gdk_threads_leave ();
return retval;
}
GdkEventSource *event_source = (GdkEventSource*) source;
gboolean retval;
- GDK_THREADS_ENTER ();
+ gdk_threads_enter ();
- if (event_source->event_poll_fd.revents & G_IO_IN)
+ if (event_source->display->event_pause_count > 0)
+ retval = FALSE;
+ else if (event_source->event_poll_fd.revents & G_IO_IN)
retval = (_gdk_event_queue_find_first (event_source->display) != NULL);
else
retval = FALSE;
- GDK_THREADS_LEAVE ();
+ gdk_threads_leave ();
return retval;
}
void
-_gdk_broadway_events_got_input (GdkDisplay *display,
- const char *message)
+_gdk_broadway_events_got_input (BroadwayInputMsg *message)
{
+ GdkDisplay *display = gdk_display_get_default ();
GdkBroadwayDisplay *display_broadway = GDK_BROADWAY_DISPLAY (display);
GdkScreen *screen;
- GdkWindow *root, *window;
- char *p;
- int x, y, button, id, dir,key;
- guint64 time;
+ GdkWindow *window;
GdkEvent *event = NULL;
- char cmd;
GList *node;
- screen = gdk_display_get_default_screen (display);
- root = gdk_screen_get_root_window (screen);
-
- p = (char *)message;
- cmd = *p++;
- switch (cmd) {
- case 'm':
- id = strtol(p, &p, 10);
- p++; /* Skip , */
- x = strtol(p, &p, 10);
- p++; /* Skip , */
- y = strtol(p, &p, 10);
- p++; /* Skip , */
- time = strtol(p, &p, 10);
- display_broadway->last_x = x;
- display_broadway->last_y = y;
-
- window = g_hash_table_lookup (display_broadway->id_ht, GINT_TO_POINTER (id));
-
- if (display_broadway->mouse_in_toplevel != window)
+ switch (message->base.type) {
+ case BROADWAY_EVENT_ENTER:
+ window = g_hash_table_lookup (display_broadway->id_ht, GINT_TO_POINTER (message->pointer.event_window_id));
+ if (window)
{
- if (display_broadway->mouse_in_toplevel != NULL)
- {
- event = gdk_event_new (GDK_LEAVE_NOTIFY);
- event->crossing.window = g_object_ref (display_broadway->mouse_in_toplevel);
- event->crossing.time = time;
- event->crossing.x = x - display_broadway->mouse_in_toplevel->x;
- event->crossing.y = y - display_broadway->mouse_in_toplevel->y;
- event->crossing.x_root = x;
- event->crossing.y_root = y;
- event->crossing.mode = GDK_CROSSING_NORMAL;
- event->crossing.detail = GDK_NOTIFY_ANCESTOR;
- gdk_event_set_device (event, display->core_pointer);
-
- node = _gdk_event_queue_append (display, event);
- _gdk_windowing_got_event (display, node, event, 0);
-
- event = gdk_event_new (GDK_FOCUS_CHANGE);
- event->focus_change.window = g_object_ref (display_broadway->mouse_in_toplevel);
- event->focus_change.in = FALSE;
- gdk_event_set_device (event, display->core_pointer);
-
- node = _gdk_event_queue_append (display, event);
- _gdk_windowing_got_event (display, node, event, 0);
- }
+ event = gdk_event_new (GDK_ENTER_NOTIFY);
+ event->crossing.window = g_object_ref (window);
+ event->crossing.time = message->base.time;
+ event->crossing.x = message->pointer.win_x;
+ event->crossing.y = message->pointer.win_y;
+ event->crossing.x_root = message->pointer.root_x;
+ event->crossing.y_root = message->pointer.root_y;
+ event->crossing.state = message->pointer.state;
+ event->crossing.mode = message->crossing.mode;
+ event->crossing.detail = GDK_NOTIFY_ANCESTOR;
+ gdk_event_set_device (event, display->core_pointer);
- /* TODO: Unset when it dies */
- display_broadway->mouse_in_toplevel = window;
+ node = _gdk_event_queue_append (display, event);
+ _gdk_windowing_got_event (display, node, event, message->base.serial);
- if (window)
- {
- event = gdk_event_new (GDK_ENTER_NOTIFY);
- event->crossing.window = g_object_ref (window);
- event->crossing.time = time;
- event->crossing.x = x - window->x;
- event->crossing.y = y - window->y;
- event->crossing.x_root = x;
- event->crossing.y_root = y;
- event->crossing.mode = GDK_CROSSING_NORMAL;
- event->crossing.detail = GDK_NOTIFY_ANCESTOR;
- gdk_event_set_device (event, display->core_pointer);
-
- node = _gdk_event_queue_append (display, event);
- _gdk_windowing_got_event (display, node, event, 0);
-
- event = gdk_event_new (GDK_FOCUS_CHANGE);
- event->focus_change.window = g_object_ref (window);
- event->focus_change.in = TRUE;
- gdk_event_set_device (event, display->core_pointer);
-
- node = _gdk_event_queue_append (display, event);
- _gdk_windowing_got_event (display, node, event, 0);
+ event = gdk_event_new (GDK_FOCUS_CHANGE);
+ event->focus_change.window = g_object_ref (window);
+ event->focus_change.in = TRUE;
+ gdk_event_set_device (event, display->core_pointer);
- }
+ node = _gdk_event_queue_append (display, event);
+ _gdk_windowing_got_event (display, node, event, message->base.serial);
}
+ break;
+ case BROADWAY_EVENT_LEAVE:
+ window = g_hash_table_lookup (display_broadway->id_ht, GINT_TO_POINTER (message->pointer.event_window_id));
+ if (window)
+ {
+ event = gdk_event_new (GDK_LEAVE_NOTIFY);
+ event->crossing.window = g_object_ref (window);
+ event->crossing.time = message->base.time;
+ event->crossing.x = message->pointer.win_x;
+ event->crossing.y = message->pointer.win_y;
+ event->crossing.x_root = message->pointer.root_x;
+ event->crossing.y_root = message->pointer.root_y;
+ event->crossing.state = message->pointer.state;
+ event->crossing.mode = message->crossing.mode;
+ event->crossing.detail = GDK_NOTIFY_ANCESTOR;
+ gdk_event_set_device (event, display->core_pointer);
+ node = _gdk_event_queue_append (display, event);
+ _gdk_windowing_got_event (display, node, event, message->base.serial);
+
+ event = gdk_event_new (GDK_FOCUS_CHANGE);
+ event->focus_change.window = g_object_ref (window);
+ event->focus_change.in = FALSE;
+ gdk_event_set_device (event, display->core_pointer);
+
+ node = _gdk_event_queue_append (display, event);
+ _gdk_windowing_got_event (display, node, event, message->base.serial);
+ }
+ break;
+ case BROADWAY_EVENT_POINTER_MOVE:
+ if (_gdk_broadway_moveresize_handle_event (display, message))
+ break;
+
+ window = g_hash_table_lookup (display_broadway->id_ht, GINT_TO_POINTER (message->pointer.event_window_id));
if (window)
{
event = gdk_event_new (GDK_MOTION_NOTIFY);
event->motion.window = g_object_ref (window);
- event->motion.time = time;
- event->motion.x = x - window->x;
- event->motion.y = y - window->y;
- event->motion.x_root = x;
- event->motion.y_root = y;
+ event->motion.time = message->base.time;
+ event->motion.x = message->pointer.win_x;
+ event->motion.y = message->pointer.win_y;
+ event->motion.x_root = message->pointer.root_x;
+ event->motion.y_root = message->pointer.root_y;
+ event->motion.state = message->pointer.state;
gdk_event_set_device (event, display->core_pointer);
node = _gdk_event_queue_append (display, event);
- _gdk_windowing_got_event (display, node, event, 0);
+ _gdk_windowing_got_event (display, node, event, message->base.serial);
}
break;
- case 'b':
- case 'B':
- id = strtol(p, &p, 10);
- p++; /* Skip , */
- x = strtol(p, &p, 10);
- p++; /* Skip , */
- y = strtol(p, &p, 10);
- p++; /* Skip , */
- button = strtol(p, &p, 10);
- p++; /* Skip , */
- time = strtol(p, &p, 10);
- display_broadway->last_x = x;
- display_broadway->last_y = y;
-
- window = g_hash_table_lookup (display_broadway->id_ht, GINT_TO_POINTER (id));
+ case BROADWAY_EVENT_BUTTON_PRESS:
+ case BROADWAY_EVENT_BUTTON_RELEASE:
+ if (message->base.type != 'b' &&
+ _gdk_broadway_moveresize_handle_event (display, message))
+ break;
+ window = g_hash_table_lookup (display_broadway->id_ht, GINT_TO_POINTER (message->pointer.event_window_id));
if (window)
{
- event = gdk_event_new (cmd == 'b' ? GDK_BUTTON_PRESS : GDK_BUTTON_RELEASE);
+ event = gdk_event_new (message->base.type == 'b' ? GDK_BUTTON_PRESS : GDK_BUTTON_RELEASE);
event->button.window = g_object_ref (window);
- event->button.time = time;
- event->button.x = x - window->x;
- event->button.y = y - window->y;
- event->button.x_root = x;
- event->button.y_root = y;
- event->button.button = button + 1;
+ event->button.time = message->base.time;
+ event->button.x = message->pointer.win_x;
+ event->button.y = message->pointer.win_y;
+ event->button.x_root = message->pointer.root_x;
+ event->button.y_root = message->pointer.root_y;
+ event->button.button = message->button.button;
+ event->button.state = message->pointer.state;
gdk_event_set_device (event, display->core_pointer);
node = _gdk_event_queue_append (display, event);
- _gdk_windowing_got_event (display, node, event, 0);
+ _gdk_windowing_got_event (display, node, event, message->base.serial);
}
break;
- case 's':
- id = strtol(p, &p, 10);
- p++; /* Skip , */
- x = strtol(p, &p, 10);
- p++; /* Skip , */
- y = strtol(p, &p, 10);
- p++; /* Skip , */
- dir = strtol(p, &p, 10);
- p++; /* Skip , */
- time = strtol(p, &p, 10);
- display_broadway->last_x = x;
- display_broadway->last_y = y;
-
- window = g_hash_table_lookup (display_broadway->id_ht, GINT_TO_POINTER (id));
-
+ case BROADWAY_EVENT_SCROLL:
+ window = g_hash_table_lookup (display_broadway->id_ht, GINT_TO_POINTER (message->pointer.event_window_id));
if (window)
{
event = gdk_event_new (GDK_SCROLL);
event->scroll.window = g_object_ref (window);
- event->scroll.time = time;
- event->scroll.x = x - window->x;
- event->scroll.y = y - window->y;
- event->scroll.x_root = x;
- event->scroll.y_root = y;
- event->scroll.direction = dir == 0 ? GDK_SCROLL_UP : GDK_SCROLL_DOWN;
+ event->scroll.time = message->base.time;
+ event->scroll.x = message->pointer.win_x;
+ event->scroll.y = message->pointer.win_y;
+ event->scroll.x_root = message->pointer.root_x;
+ event->scroll.y_root = message->pointer.root_y;
+ event->scroll.direction = message->scroll.dir == 0 ? GDK_SCROLL_UP : GDK_SCROLL_DOWN;
gdk_event_set_device (event, display->core_pointer);
node = _gdk_event_queue_append (display, event);
- _gdk_windowing_got_event (display, node, event, 0);
+ _gdk_windowing_got_event (display, node, event, message->base.serial);
}
break;
- case 'k':
- case 'K':
- key = strtol(p, &p, 10);
- p++; /* Skip , */
- time = strtol(p, &p, 10);
-
- window = display_broadway->mouse_in_toplevel;
-
+ case BROADWAY_EVENT_KEY_PRESS:
+ case BROADWAY_EVENT_KEY_RELEASE:
+ window = g_hash_table_lookup (display_broadway->id_ht,
+ GINT_TO_POINTER (message->key.mouse_window_id));
if (window)
{
- event = gdk_event_new (cmd == 'k' ? GDK_KEY_PRESS : GDK_KEY_RELEASE);
+ event = gdk_event_new (message->base.type == 'k' ? GDK_KEY_PRESS : GDK_KEY_RELEASE);
event->key.window = g_object_ref (window);
- event->key.time = time;
- event->key.keyval = key;
+ event->key.time = message->base.time;
+ event->key.keyval = message->key.key;
+ event->key.state = message->key.state;
+ event->key.hardware_keycode = message->key.key;
event->key.length = 0;
gdk_event_set_device (event, display->core_pointer);
node = _gdk_event_queue_append (display, event);
- _gdk_windowing_got_event (display, node, event, 0);
+ _gdk_windowing_got_event (display, node, event, message->base.serial);
}
break;
+ case BROADWAY_EVENT_GRAB_NOTIFY:
+ case BROADWAY_EVENT_UNGRAB_NOTIFY:
+ _gdk_display_device_grab_update (display, display->core_pointer, NULL, message->base.serial);
+ break;
+
+ case BROADWAY_EVENT_CONFIGURE_NOTIFY:
+ window = g_hash_table_lookup (display_broadway->id_ht, GINT_TO_POINTER (message->configure_notify.id));
+ if (window)
+ {
+ window->x = message->configure_notify.x;
+ window->y = message->configure_notify.y;
+ window->width = message->configure_notify.width;
+ window->height = message->configure_notify.height;
+ _gdk_window_update_size (window);
+ _gdk_broadway_window_resize_surface (window);
+
+ event = gdk_event_new (GDK_CONFIGURE);
+ event->configure.window = g_object_ref (window);
+ event->configure.x = message->configure_notify.x;
+ event->configure.y = message->configure_notify.y;
+ event->configure.width = message->configure_notify.width;
+ event->configure.height = message->configure_notify.height;
+
+ node = _gdk_event_queue_append (display, event);
+ _gdk_windowing_got_event (display, node, event, message->base.serial);
+
+ if (window->resize_count >= 1)
+ {
+ window->resize_count -= 1;
+
+ if (window->resize_count == 0)
+ _gdk_broadway_moveresize_configure_done (display, window);
+ }
+ }
+ break;
+
+ case BROADWAY_EVENT_DELETE_NOTIFY:
+ window = g_hash_table_lookup (display_broadway->id_ht, GINT_TO_POINTER (message->delete_notify.id));
+ if (window)
+ {
+ event = gdk_event_new (GDK_DELETE);
+ event->any.window = g_object_ref (window);
+
+ node = _gdk_event_queue_append (display, event);
+ _gdk_windowing_got_event (display, node, event, message->base.serial);
+ }
+ break;
+
+ case BROADWAY_EVENT_SCREEN_SIZE_CHANGED:
+ screen = gdk_display_get_default_screen (display);
+ window = gdk_screen_get_root_window (screen);
+ window->width = message->screen_resize_notify.width;
+ window->height = message->screen_resize_notify.height;
+
+ _gdk_window_update_size (window);
+ _gdk_broadway_screen_size_changed (screen, &message->screen_resize_notify);
+ break;
+
default:
- g_print ("Unknown input command %s\n", message);
+ g_printerr ("_gdk_broadway_events_got_input - Unknown input command %c\n", message->base.type);
break;
}
}
GdkDisplay *display = ((GdkEventSource*) source)->display;
GdkEvent *event;
- GDK_THREADS_ENTER ();
+ gdk_threads_enter ();
event = gdk_display_get_event (display);
gdk_event_free (event);
}
- GDK_THREADS_LEAVE ();
+ gdk_threads_leave ();
return TRUE;
}
projects / ~andy / gtk / blobdiff