* 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,
- BroadwayInputMsg *message)
+_gdk_broadway_events_got_input (BroadwayInputMsg *message)
{
+ GdkDisplay *display = gdk_display_get_default ();
GdkBroadwayDisplay *display_broadway = GDK_BROADWAY_DISPLAY (display);
+ GdkScreen *screen;
GdkWindow *window;
GdkEvent *event = NULL;
GList *node;
- display_broadway->last_event_time = message->base.time;
-
switch (message->base.type) {
- case 'e': /* Enter */
- display_broadway->last_x = message->pointer.root_x;
- display_broadway->last_y = message->pointer.root_y;
- display_broadway->real_mouse_in_toplevel =
- g_hash_table_lookup (display_broadway->id_ht, GINT_TO_POINTER (message->pointer.mouse_window_id));
-
+ case BROADWAY_EVENT_ENTER:
window = g_hash_table_lookup (display_broadway->id_ht, GINT_TO_POINTER (message->pointer.event_window_id));
-
- /* TODO: Unset when it dies */
- display_broadway->mouse_in_toplevel = window;
if (window)
{
event = gdk_event_new (GDK_ENTER_NOTIFY);
_gdk_windowing_got_event (display, node, event, message->base.serial);
}
break;
- case 'l': /* Leave */
- display_broadway->last_x = message->pointer.root_x;
- display_broadway->last_y = message->pointer.root_y;
- display_broadway->real_mouse_in_toplevel =
- g_hash_table_lookup (display_broadway->id_ht, GINT_TO_POINTER (message->pointer.mouse_window_id));
-
+ case BROADWAY_EVENT_LEAVE:
window = g_hash_table_lookup (display_broadway->id_ht, GINT_TO_POINTER (message->pointer.event_window_id));
-
- display_broadway->mouse_in_toplevel = NULL;
if (window)
{
event = gdk_event_new (GDK_LEAVE_NOTIFY);
_gdk_windowing_got_event (display, node, event, message->base.serial);
}
break;
- case 'm': /* Mouse move */
- display_broadway->last_x = message->pointer.root_x;
- display_broadway->last_y = message->pointer.root_y;
- display_broadway->real_mouse_in_toplevel =
- g_hash_table_lookup (display_broadway->id_ht, GINT_TO_POINTER (message->pointer.mouse_window_id));
+ 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)
}
break;
- case 'b':
- case 'B':
- display_broadway->last_x = message->pointer.root_x;
- display_broadway->last_y = message->pointer.root_y;
- display_broadway->real_mouse_in_toplevel =
- g_hash_table_lookup (display_broadway->id_ht, GINT_TO_POINTER (message->pointer.mouse_window_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)
}
break;
- case 's':
- display_broadway->last_x = message->pointer.root_x;
- display_broadway->last_y = message->pointer.root_y;
- display_broadway->real_mouse_in_toplevel =
- g_hash_table_lookup (display_broadway->id_ht, GINT_TO_POINTER (message->pointer.mouse_window_id));
-
+ case BROADWAY_EVENT_SCROLL:
window = g_hash_table_lookup (display_broadway->id_ht, GINT_TO_POINTER (message->pointer.event_window_id));
if (window)
{
}
break;
- case 'k':
- case 'K':
- 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 (message->base.type == 'k' ? GDK_KEY_PRESS : GDK_KEY_RELEASE);
event->key.window = g_object_ref (window);
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);
}
break;
- case 'g':
- case 'u':
+ 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 'w':
+ case BROADWAY_EVENT_CONFIGURE_NOTIFY:
window = g_hash_table_lookup (display_broadway->id_ht, GINT_TO_POINTER (message->configure_notify.id));
if (window)
{
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 'W':
+ case BROADWAY_EVENT_DELETE_NOTIFY:
window = g_hash_table_lookup (display_broadway->id_ht, GINT_TO_POINTER (message->delete_notify.id));
if (window)
{
}
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_printerr ("Unknown input command %c\n", message->base.type);
+ 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;
}