root: split out of luaa

Signed-off-by: Julien Danjou <julien@danjou.info>

CMakeLists.txt

@@ -41,6 +41,7 @@ set(AWE_SRCS
     ${SOURCE_DIR}/client.c
     ${SOURCE_DIR}/cnode.c
     ${SOURCE_DIR}/dbus.c
+    ${SOURCE_DIR}/root.c
     ${SOURCE_DIR}/event.c
     ${SOURCE_DIR}/property.c
     ${SOURCE_DIR}/ewmh.c

luaa.c

@@ -28,7 +28,6 @@
 #include <lualib.h>
 
 #include <xcb/xcb.h>
-#include <xcb/xtest.h>
 
 #include <basedir_fs.h>
 
@@ -51,6 +50,7 @@ extern const struct luaL_reg awesome_hooks_lib[];
 extern const struct luaL_reg awesome_dbus_lib[];
 extern const struct luaL_reg awesome_keygrabber_lib[];
 extern const struct luaL_reg awesome_mousegrabber_lib[];
+extern const struct luaL_reg awesome_root_lib[];
 extern const struct luaL_reg awesome_button_methods[];
 extern const struct luaL_reg awesome_button_meta[];
 extern const struct luaL_reg awesome_image_methods[];
@@ -70,155 +70,6 @@ extern const struct luaL_reg awesome_wibox_meta[];
 extern const struct luaL_reg awesome_key_methods[];
 extern const struct luaL_reg awesome_key_meta[];
 
-/** Send fake events. Usually the current focused client will get it.
- * \param L The Lua VM state.
- * \return The number of element pushed on stack.
- * \luastack
- * \lvalue A client.
- * \lparam The event type: key_press, key_release, button_press, button_release
- * or motion_notify.
- * \lparam The detail: in case of a key event, this is the keycode to send, in
- * case of a button event this is the number of the button. In case of a motion
- * event, this is a boolean value which if true make the coordinates relatives.
- * \lparam In case of a motion event, this is the X coordinate.
- * \lparam In case of a motion event, this is the Y coordinate.
- * \lparam In case of a motion event, this is the screen number to move on.
- * If not specified, the current one is used.
- */
-static int
-luaA_root_fake_input(lua_State *L)
-{
-    if(!globalconf.have_xtest)
-    {
-        luaA_warn(L, "XTest extension is not available, cannot fake input.");
-        return 0;
-    }
-
-    size_t tlen;
-    const char *stype = luaL_checklstring(L, 2, &tlen);
-    uint8_t type, detail;
-    int x = 0, y = 0;
-    xcb_window_t root = XCB_NONE;
-
-    switch(a_tokenize(stype, tlen))
-    {
-      case A_TK_KEY_PRESS:
-        type = XCB_KEY_PRESS;
-        detail = luaL_checknumber(L, 3); /* keycode */
-        break;
-      case A_TK_KEY_RELEASE:
-        type = XCB_KEY_RELEASE;
-        detail = luaL_checknumber(L, 3); /* keycode */
-        break;
-      case A_TK_BUTTON_PRESS:
-        type = XCB_BUTTON_PRESS;
-        detail = luaL_checknumber(L, 3); /* button number */
-        break;
-      case A_TK_BUTTON_RELEASE:
-        type = XCB_BUTTON_RELEASE;
-        detail = luaL_checknumber(L, 3); /* button number */
-        break;
-      case A_TK_MOTION_NOTIFY:
-        type = XCB_MOTION_NOTIFY;
-        detail = luaA_checkboolean(L, 3); /* relative to the current position or not */
-        x = luaL_checknumber(L, 4);
-        y = luaL_checknumber(L, 5);
-        if(lua_gettop(L) == 6 && !globalconf.xinerama_is_active)
-        {
-            int screen = luaL_checknumber(L, 6);
-            luaA_checkscreen(screen);
-            root = xutil_screen_get(globalconf.connection, screen)->root;
-        }
-        break;
-      default:
-        return 0;
-    }
-
-    xcb_test_fake_input(globalconf.connection,
-                        type,
-                        detail,
-                        XCB_CURRENT_TIME,
-                        root,
-                        x, y,
-                        0);
-    return 0;
-}
-
-/** Get or set global key bindings.
- * This binding will be available when you'll press keys on root window.
- * \param L The Lua VM state.
- * \return The number of element pushed on stack.
- * \luastack
- * \lparam An array of key bindings objects, or nothing.
- * \lreturn The array of key bindings objects of this client.
- */
-static int
-luaA_root_keys(lua_State *L)
-{
-    if(lua_gettop(L) == 1)
-    {
-        luaA_key_array_set(L, 1, &globalconf.keys);
-
-        int nscreen = xcb_setup_roots_length(xcb_get_setup(globalconf.connection));
-
-        for(int phys_screen = 0; phys_screen < nscreen; phys_screen++)
-        {
-            xcb_screen_t *s = xutil_screen_get(globalconf.connection, phys_screen);
-            xcb_ungrab_key(globalconf.connection, XCB_GRAB_ANY, s->root, XCB_BUTTON_MASK_ANY);
-            window_grabkeys(s->root, &globalconf.keys);
-        }
-    }
-
-    return luaA_key_array_get(L, &globalconf.keys);
-}
-
-/** Get or set global mouse bindings.
- * This binding will be available when you'll click on root window.
- * \param L The Lua VM state.
- * \return The number of element pushed on stack.
- * \luastack
- * \lparam An array of mouse button bindings objects, or nothing.
- * \lreturn The array of mouse button bindings objects.
- */
-static int
-luaA_root_buttons(lua_State *L)
-{
-    if(lua_gettop(L) == 1)
-        luaA_button_array_set(L, 1, &globalconf.buttons);
-
-    return luaA_button_array_get(L, &globalconf.buttons);
-}
-
-/** Set the root cursor.
- * \param L The Lua VM state.
- * \return The number of element pushed on stack.
- * \luastack
- * \lparam A X cursor name.
- */
-static int
-luaA_root_cursor(lua_State *L)
-{
-    const char *cursor_name = luaL_checkstring(L, 1);
-    uint16_t cursor_font = xcursor_font_fromstr(cursor_name);
-
-    if(cursor_font)
-    {
-        uint32_t change_win_vals[] = { xcursor_new(globalconf.connection, cursor_font) };
-
-        for(int screen_nbr = 0;
-            screen_nbr < xcb_setup_roots_length(xcb_get_setup(globalconf.connection));
-            screen_nbr++)
-            xcb_change_window_attributes(globalconf.connection,
-                                         xutil_screen_get(globalconf.connection, screen_nbr)->root,
-                                         XCB_CW_CURSOR,
-                                         change_win_vals);
-    }
-    else
-        luaA_warn(L, "invalid cursor %s", cursor_name);
-
-    return 0;
-}
-
 /** Quit awesome.
  * \param L The Lua VM state.
  * \return The number of elements pushed on stack.
@@ -802,14 +653,6 @@ luaA_init(xdgHandle xdg)
         { "__newindex", luaA_awesome_newindex },
         { NULL, NULL }
     };
-    static const struct luaL_reg root_lib[] =
-    {
-        { "buttons", luaA_root_buttons },
-        { "keys", luaA_root_keys },
-        { "cursor", luaA_root_cursor },
-        { "fake_input", luaA_root_fake_input },
-        { NULL, NULL }
-    };
 
     L = globalconf.L = luaL_newstate();
 
@@ -821,7 +664,7 @@ luaA_init(xdgHandle xdg)
     luaA_openlib(L, "awesome", awesome_lib, awesome_lib);
 
     /* Export root lib */
-    luaA_openlib(L, "root", root_lib, root_lib);
+    luaL_register(L, "root", awesome_root_lib);
 
     /* Export hooks lib */
     luaL_register(L, "hooks", awesome_hooks_lib);

root.c

@@ -0,0 +1,185 @@
+/*
+ * root.c - root window management
+ *
+ * Copyright © 2008-2009 Julien Danjou <julien@danjou.info>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ */
+
+#include <xcb/xtest.h>
+
+#include "mouse.h"
+#include "common/xcursor.h"
+
+/** Send fake events. Usually the current focused client will get it.
+ * \param L The Lua VM state.
+ * \return The number of element pushed on stack.
+ * \luastack
+ * \lvalue A client.
+ * \lparam The event type: key_press, key_release, button_press, button_release
+ * or motion_notify.
+ * \lparam The detail: in case of a key event, this is the keycode to send, in
+ * case of a button event this is the number of the button. In case of a motion
+ * event, this is a boolean value which if true make the coordinates relatives.
+ * \lparam In case of a motion event, this is the X coordinate.
+ * \lparam In case of a motion event, this is the Y coordinate.
+ * \lparam In case of a motion event, this is the screen number to move on.
+ * If not specified, the current one is used.
+ */
+static int
+luaA_root_fake_input(lua_State *L)
+{
+    if(!globalconf.have_xtest)
+    {
+        luaA_warn(L, "XTest extension is not available, cannot fake input.");
+        return 0;
+    }
+
+    size_t tlen;
+    const char *stype = luaL_checklstring(L, 2, &tlen);
+    uint8_t type, detail;
+    int x = 0, y = 0;
+    xcb_window_t root = XCB_NONE;
+
+    switch(a_tokenize(stype, tlen))
+    {
+      case A_TK_KEY_PRESS:
+        type = XCB_KEY_PRESS;
+        detail = luaL_checknumber(L, 3); /* keycode */
+        break;
+      case A_TK_KEY_RELEASE:
+        type = XCB_KEY_RELEASE;
+        detail = luaL_checknumber(L, 3); /* keycode */
+        break;
+      case A_TK_BUTTON_PRESS:
+        type = XCB_BUTTON_PRESS;
+        detail = luaL_checknumber(L, 3); /* button number */
+        break;
+      case A_TK_BUTTON_RELEASE:
+        type = XCB_BUTTON_RELEASE;
+        detail = luaL_checknumber(L, 3); /* button number */
+        break;
+      case A_TK_MOTION_NOTIFY:
+        type = XCB_MOTION_NOTIFY;
+        detail = luaA_checkboolean(L, 3); /* relative to the current position or not */
+        x = luaL_checknumber(L, 4);
+        y = luaL_checknumber(L, 5);
+        if(lua_gettop(L) == 6 && !globalconf.xinerama_is_active)
+        {
+            int screen = luaL_checknumber(L, 6);
+            luaA_checkscreen(screen);
+            root = xutil_screen_get(globalconf.connection, screen)->root;
+        }
+        break;
+      default:
+        return 0;
+    }
+
+    xcb_test_fake_input(globalconf.connection,
+                        type,
+                        detail,
+                        XCB_CURRENT_TIME,
+                        root,
+                        x, y,
+                        0);
+    return 0;
+}
+
+/** Get or set global key bindings.
+ * This binding will be available when you'll press keys on root window.
+ * \param L The Lua VM state.
+ * \return The number of element pushed on stack.
+ * \luastack
+ * \lparam An array of key bindings objects, or nothing.
+ * \lreturn The array of key bindings objects of this client.
+ */
+static int
+luaA_root_keys(lua_State *L)
+{
+    if(lua_gettop(L) == 1)
+    {
+        luaA_key_array_set(L, 1, &globalconf.keys);
+
+        int nscreen = xcb_setup_roots_length(xcb_get_setup(globalconf.connection));
+
+        for(int phys_screen = 0; phys_screen < nscreen; phys_screen++)
+        {
+            xcb_screen_t *s = xutil_screen_get(globalconf.connection, phys_screen);
+            xcb_ungrab_key(globalconf.connection, XCB_GRAB_ANY, s->root, XCB_BUTTON_MASK_ANY);
+            window_grabkeys(s->root, &globalconf.keys);
+        }
+    }
+
+    return luaA_key_array_get(L, &globalconf.keys);
+}
+
+/** Get or set global mouse bindings.
+ * This binding will be available when you'll click on root window.
+ * \param L The Lua VM state.
+ * \return The number of element pushed on stack.
+ * \luastack
+ * \lparam An array of mouse button bindings objects, or nothing.
+ * \lreturn The array of mouse button bindings objects.
+ */
+static int
+luaA_root_buttons(lua_State *L)
+{
+    if(lua_gettop(L) == 1)
+        luaA_button_array_set(L, 1, &globalconf.buttons);
+
+    return luaA_button_array_get(L, &globalconf.buttons);
+}
+
+/** Set the root cursor.
+ * \param L The Lua VM state.
+ * \return The number of element pushed on stack.
+ * \luastack
+ * \lparam A X cursor name.
+ */
+static int
+luaA_root_cursor(lua_State *L)
+{
+    const char *cursor_name = luaL_checkstring(L, 1);
+    uint16_t cursor_font = xcursor_font_fromstr(cursor_name);
+
+    if(cursor_font)
+    {
+        uint32_t change_win_vals[] = { xcursor_new(globalconf.connection, cursor_font) };
+
+        for(int screen_nbr = 0;
+            screen_nbr < xcb_setup_roots_length(xcb_get_setup(globalconf.connection));
+            screen_nbr++)
+            xcb_change_window_attributes(globalconf.connection,
+                                         xutil_screen_get(globalconf.connection, screen_nbr)->root,
+                                         XCB_CW_CURSOR,
+                                         change_win_vals);
+    }
+    else
+        luaA_warn(L, "invalid cursor %s", cursor_name);
+
+    return 0;
+}
+
+const struct luaL_reg awesome_root_lib[] =
+{
+    { "buttons", luaA_root_buttons },
+    { "keys", luaA_root_keys },
+    { "cursor", luaA_root_cursor },
+    { "fake_input", luaA_root_fake_input },
+    { NULL, NULL }
+};
+
+// vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=80