Merge branch 'backport' into work

[chaz/openbox] / openbox / event.h

diff --git a/openbox/event.h b/openbox/event.h
index a8d1aeaf9160aad2dc742cf59e3b58ff3c24926f..cdddc2f5751635e95f1a38e2c4d46ae99324ebd5 100644 (file)
--- a/openbox/event.h
+++ b/openbox/event.h
@@ -33,11 +33,6 @@ extern Time event_curtime;
 /*! The last user-interaction time, as given by the clients */
 extern Time event_last_user_time;
 
-/*! The value of the mask for the NumLock modifier */
-extern guint NumLockMask;
-/*! The value of the mask for the ScrollLock modifier */
-extern guint ScrollLockMask;
-
 void event_startup(gboolean reconfig);
 void event_shutdown(gboolean reconfig);
 
@@ -47,20 +42,20 @@ void event_enter_client(struct _ObClient *client);
 
 /*! Make mouse focus not move at all from the stuff that happens between these
  two function calls. */
-gulong event_start_ignore_all_enters();
+gulong event_start_ignore_all_enters(void);
 void event_end_ignore_all_enters(gulong start);
 
 /*! End *all* active and passive grabs on the keyboard */
-void event_cancel_all_key_grabs();
+void event_cancel_all_key_grabs(void);
 
 /* Halts any focus delay in progress, use this when the user is selecting a
    window for focus */
-void event_halt_focus_delay();
+void event_halt_focus_delay(void);
 
 /*! Compare t1 and t2, taking into account wraparound. True if t1
   comes at the same time or later than t2. */
 gboolean event_time_after(Time t1, Time t2);
 
-Time event_get_server_time();
+Time event_get_server_time(void);
 
 #endif