awesomewm-mirrors
/
awesome
mirror of https://github.com/awesomeWM/awesome.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

mouse: split button out 

Signed-off-by: Julien Danjou <julien@danjou.info>
This commit is contained in:
Julien Danjou 2009-04-26 10:46:09 +02:00
parent c8b758ac48
commit 308ef7de5d
9 changed files with 311 additions and 252 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CMakeLists.txt
View File

@ -52,6 +52,7 @@ set(AWE_SRCS
${SOURCE_DIR}/spawn.c
${SOURCE_DIR}/hooks.c
${SOURCE_DIR}/mouse.c
${SOURCE_DIR}/button.c
${SOURCE_DIR}/screen.c
${SOURCE_DIR}/stack.c
${SOURCE_DIR}/selection.c

248
button.c Normal file
View File

@ -0,0 +1,248 @@
/*
* button.c - button managing
*
* Copyright © 2007-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 "button.h"
#include "common/xutil.h"
#include "common/tokenize.h"
DO_LUA_TOSTRING(button_t, button, "button")
LUA_OBJECT_FUNCS(button_t, button, "button")
void
button_unref_simplified(button_t **b)
{
button_unref(globalconf.L, *b);
}
/** Collect a button.
* \param L The Lua VM state.
* \return 0.
*/
static int
luaA_button_gc(lua_State *L)
{
button_t *button = luaL_checkudata(L, 1, "button");
luaL_unref(globalconf.L, LUA_REGISTRYINDEX, button->press);
luaL_unref(globalconf.L, LUA_REGISTRYINDEX, button->release);
return 0;
}
/** Create a new mouse button bindings.
* \param L The Lua VM state.
* \return The number of elements pushed on stack.
* \luastack
* \lparam A table with modifiers keys, or a button to clone.
* \lparam A mouse button number.
* \lparam A function to execute on click events.
* \lparam A function to execute on release events.
* \lreturn A mouse button binding.
*/
static int
luaA_button_new(lua_State *L)
{
int i, len;
button_t *button, *orig;
luaA_ref press = LUA_REFNIL, release = LUA_REFNIL;
if((orig = luaA_toudata(L, 2, "button")))
{
button_t *copy = button_new(L);
copy->mod = orig->mod;
copy->button = orig->button;
if(orig->press != LUA_REFNIL)
{
lua_rawgeti(L, LUA_REGISTRYINDEX, orig->press);
luaA_registerfct(L, -1, &copy->press);
lua_pop(L, 1);
}
else
copy->press = LUA_REFNIL;
if(orig->release != LUA_REFNIL)
{
lua_rawgeti(L, LUA_REGISTRYINDEX, orig->release);
luaA_registerfct(L, -1, &copy->release);
lua_pop(L, 1);
}
else
copy->release = LUA_REFNIL;
return 1;
}
luaA_checktable(L, 2);
/* arg 3 is mouse button */
i = luaL_checknumber(L, 3);
/* arg 4 and 5 are callback functions, check they are functions... */
if(!lua_isnil(L, 4))
luaA_checkfunction(L, 4);
if(lua_gettop(L) == 5 && !lua_isnil(L, 5))
luaA_checkfunction(L, 5);
/* ... then register (can't register before since 5 maybe not nil but not a
* function */
if(!lua_isnil(L, 4))
luaA_registerfct(L, 4, &press);
if(lua_gettop(L) == 5 && !lua_isnil(L, 5))
luaA_registerfct(L, 5, &release);
button = button_new(L);
button->press = press;
button->release = release;
button->button = xutil_button_fromint(i);
len = lua_objlen(L, 2);
for(i = 1; i <= len; i++)
{
size_t blen;
const char *buf;
lua_rawgeti(L, 2, i);
buf = luaL_checklstring(L, -1, &blen);
button->mod |= xutil_key_mask_fromstr(buf, blen);
lua_pop(L, 1);
}
return 1;
}
/** Set a button array with a Lua table.
* \param L The Lua VM state.
* \param idx The index of the Lua table.
* \param buttons The array button to fill.
*/
void
luaA_button_array_set(lua_State *L, int idx, button_array_t *buttons)
{
luaA_checktable(L, idx);
button_array_wipe(buttons);
button_array_init(buttons);
lua_pushnil(L);
while(lua_next(L, idx))
button_array_append(buttons, button_ref(L));
}
/** Push an array of button as an Lua table onto the stack.
* \param L The Lua VM state.
* \param buttons The button array to push.
* \return The number of elements pushed on stack.
*/
int
luaA_button_array_get(lua_State *L, button_array_t *buttons)
{
lua_createtable(L, buttons->len, 0);
for(int i = 0; i < buttons->len; i++)
{
button_push(L, buttons->tab[i]);
lua_rawseti(L, -2, i + 1);
}
return 1;
}
/** Button object.
* \param L The Lua VM state.
* \return The number of elements pushed on stack.
* \luastack
* \lfield press The function called when button press event is received.
* \lfield release The function called when button release event is received.
*/
static int
luaA_button_index(lua_State *L)
{
if(luaA_usemetatable(L, 1, 2))
return 1;
size_t len;
button_t *button = luaL_checkudata(L, 1, "button");
const char *attr = luaL_checklstring(L, 2, &len);
switch(a_tokenize(attr, len))
{
case A_TK_PRESS:
if(button->press != LUA_REFNIL)
lua_rawgeti(L, LUA_REGISTRYINDEX, button->press);
else
lua_pushnil(L);
break;
case A_TK_RELEASE:
if(button->release != LUA_REFNIL)
lua_rawgeti(L, LUA_REGISTRYINDEX, button->release);
else
lua_pushnil(L);
break;
case A_TK_BUTTON:
/* works fine, but not *really* neat */
lua_pushnumber(L, button->button);
break;
default:
break;
}
return 1;
}
/** Button object.
* \param L The Lua VM state.
* \return The number of elements pushed on stack.
* \luastack
*/
static int
luaA_button_newindex(lua_State *L)
{
if(luaA_usemetatable(L, 1, 2))
return 1;
size_t len;
button_t *button = luaL_checkudata(L, 1, "button");
const char *attr = luaL_checklstring(L, 2, &len);
switch(a_tokenize(attr, len))
{
case A_TK_PRESS:
luaA_registerfct(L, 3, &button->press);
break;
case A_TK_RELEASE:
luaA_registerfct(L, 3, &button->release);
break;
case A_TK_BUTTON:
button->button = xutil_button_fromint(luaL_checknumber(L, 3));
break;
default:
break;
}
return 0;
}
const struct luaL_reg awesome_button_methods[] =
{
{ "__call", luaA_button_new },
{ NULL, NULL }
};
const struct luaL_reg awesome_button_meta[] =
{
{ "__index", luaA_button_index },
{ "__newindex", luaA_button_newindex },
{ "__gc", luaA_button_gc },
{ "__tostring", luaA_button_tostring },
{ NULL, NULL }
};
// vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=80

49
button.h Normal file
View File

@ -0,0 +1,49 @@
/*
* button.h - button header
*
* Copyright © 2007-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.
*
*/
#ifndef AWESOME_BUTTON_H
#define AWESOME_BUTTON_H
#include "structs.h"
/** Mouse buttons bindings */
struct button_t
{
/** Lua references */
luaA_ref_array_t refs;
/** Key modifiers */
unsigned long mod;
/** Mouse button number */
unsigned int button;
/** Lua function to execute on press. */
luaA_ref press;
/** Lua function to execute on release. */
luaA_ref release;
};
void button_unref_simplified(button_t **);
ARRAY_FUNCS(button_t *, button, button_unref_simplified)
int luaA_button_array_get(lua_State *, button_array_t *);
void luaA_button_array_set(lua_State *, int idx, button_array_t *);
#endif
// vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=80

230
mouse.c
View File

@ -1,7 +1,7 @@
/*
* mouse.c - mouse managing
*
* Copyright © 2007-2008 Julien Danjou <julien@danjou.info>
* Copyright © 2007-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
@ -19,35 +19,12 @@
*
*/
#include <math.h>
#include "mouse.h"
#include "screen.h"
#include "tag.h"
#include "common/xcursor.h"
#include "client.h"
#include "structs.h"
#include "common/xutil.h"
DO_LUA_TOSTRING(button_t, button, "button")
LUA_OBJECT_FUNCS(button_t, button, "button")
void
button_unref_simplified(button_t **b)
{
button_unref(globalconf.L, *b);
}
/** Collect a button.
* \param L The Lua VM state.
* \return 0.
*/
static int
luaA_button_gc(lua_State *L)
{
button_t *button = luaL_checkudata(L, 1, "button");
luaL_unref(globalconf.L, LUA_REGISTRYINDEX, button->press);
luaL_unref(globalconf.L, LUA_REGISTRYINDEX, button->release);
return 0;
}
/** Get the pointer position.
* \param window The window to get position on.
* \param x will be set to the Pointer-x-coordinate relative to window
@ -118,205 +95,6 @@ mouse_warp_pointer(xcb_window_t window, int x, int y)
0, 0, 0, 0, x, y );
}
/** Create a new mouse button bindings.
* \param L The Lua VM state.
* \return The number of elements pushed on stack.
* \luastack
* \lparam A table with modifiers keys, or a button to clone.
* \lparam A mouse button number.
* \lparam A function to execute on click events.
* \lparam A function to execute on release events.
* \lreturn A mouse button binding.
*/
static int
luaA_button_new(lua_State *L)
{
int i, len;
button_t *button, *orig;
luaA_ref press = LUA_REFNIL, release = LUA_REFNIL;
if((orig = luaA_toudata(L, 2, "button")))
{
button_t *copy = button_new(L);
copy->mod = orig->mod;
copy->button = orig->button;
if(orig->press != LUA_REFNIL)
{
lua_rawgeti(L, LUA_REGISTRYINDEX, orig->press);
luaA_registerfct(L, -1, &copy->press);
lua_pop(L, 1);
}
else
copy->press = LUA_REFNIL;
if(orig->release != LUA_REFNIL)
{
lua_rawgeti(L, LUA_REGISTRYINDEX, orig->release);
luaA_registerfct(L, -1, &copy->release);
lua_pop(L, 1);
}
else
copy->release = LUA_REFNIL;
return 1;
}
luaA_checktable(L, 2);
/* arg 3 is mouse button */
i = luaL_checknumber(L, 3);
/* arg 4 and 5 are callback functions, check they are functions... */
if(!lua_isnil(L, 4))
luaA_checkfunction(L, 4);
if(lua_gettop(L) == 5 && !lua_isnil(L, 5))
luaA_checkfunction(L, 5);
/* ... then register (can't register before since 5 maybe not nil but not a
* function */
if(!lua_isnil(L, 4))
luaA_registerfct(L, 4, &press);
if(lua_gettop(L) == 5 && !lua_isnil(L, 5))
luaA_registerfct(L, 5, &release);
button = button_new(L);
button->press = press;
button->release = release;
button->button = xutil_button_fromint(i);
len = lua_objlen(L, 2);
for(i = 1; i <= len; i++)
{
size_t blen;
const char *buf;
lua_rawgeti(L, 2, i);
buf = luaL_checklstring(L, -1, &blen);
button->mod |= xutil_key_mask_fromstr(buf, blen);
lua_pop(L, 1);
}
return 1;
}
/** Set a button array with a Lua table.
* \param L The Lua VM state.
* \param idx The index of the Lua table.
* \param buttons The array button to fill.
*/
void
luaA_button_array_set(lua_State *L, int idx, button_array_t *buttons)
{
luaA_checktable(L, idx);
button_array_wipe(buttons);
button_array_init(buttons);
lua_pushnil(L);
while(lua_next(L, idx))
button_array_append(buttons, button_ref(L));
}
/** Push an array of button as an Lua table onto the stack.
* \param L The Lua VM state.
* \param buttons The button array to push.
* \return The number of elements pushed on stack.
*/
int
luaA_button_array_get(lua_State *L, button_array_t *buttons)
{
lua_createtable(L, buttons->len, 0);
for(int i = 0; i < buttons->len; i++)
{
button_push(L, buttons->tab[i]);
lua_rawseti(L, -2, i + 1);
}
return 1;
}
/** Button object.
* \param L The Lua VM state.
* \return The number of elements pushed on stack.
* \luastack
* \lfield press The function called when button press event is received.
* \lfield release The function called when button release event is received.
*/
static int
luaA_button_index(lua_State *L)
{
if(luaA_usemetatable(L, 1, 2))
return 1;
size_t len;
button_t *button = luaL_checkudata(L, 1, "button");
const char *attr = luaL_checklstring(L, 2, &len);
switch(a_tokenize(attr, len))
{
case A_TK_PRESS:
if(button->press != LUA_REFNIL)
lua_rawgeti(L, LUA_REGISTRYINDEX, button->press);
else
lua_pushnil(L);
break;
case A_TK_RELEASE:
if(button->release != LUA_REFNIL)
lua_rawgeti(L, LUA_REGISTRYINDEX, button->release);
else
lua_pushnil(L);
break;
case A_TK_BUTTON:
/* works fine, but not *really* neat */
lua_pushnumber(L, button->button);
break;
default:
break;
}
return 1;
}
/** Button object.
* \param L The Lua VM state.
* \return The number of elements pushed on stack.
* \luastack
*/
static int
luaA_button_newindex(lua_State *L)
{
if(luaA_usemetatable(L, 1, 2))
return 1;
size_t len;
button_t *button = luaL_checkudata(L, 1, "button");
const char *attr = luaL_checklstring(L, 2, &len);
switch(a_tokenize(attr, len))
{
case A_TK_PRESS:
luaA_registerfct(L, 3, &button->press);
break;
case A_TK_RELEASE:
luaA_registerfct(L, 3, &button->release);
break;
case A_TK_BUTTON:
button->button = xutil_button_fromint(luaL_checknumber(L, 3));
break;
default:
break;
}
return 0;
}
const struct luaL_reg awesome_button_methods[] =
{
{ "__call", luaA_button_new },
{ NULL, NULL }
};
const struct luaL_reg awesome_button_meta[] =
{
{ "__index", luaA_button_index },
{ "__newindex", luaA_button_newindex },
{ "__gc", luaA_button_gc },
{ "__tostring", luaA_button_tostring },
{ NULL, NULL }
};
/** Mouse library.
* \param L The Lua VM state.
* \return The number of elements pushed on stack.

25
mouse.h
View File

@ -22,31 +22,12 @@
#ifndef AWESOME_MOUSE_H
#define AWESOME_MOUSE_H
#include "structs.h"
/** Mouse buttons bindings */
struct button_t
{
/** Lua references */
luaA_ref_array_t refs;
/** Key modifiers */
unsigned long mod;
/** Mouse button number */
unsigned int button;
/** Lua function to execute on press. */
luaA_ref press;
/** Lua function to execute on release. */
luaA_ref release;
};
#include <stdbool.h>
#include <xcb/xcb.h>
#include <lua.h>
bool mouse_query_pointer(xcb_window_t, int16_t *, int16_t *, xcb_window_t *, uint16_t *);
int luaA_mouse_pushstatus(lua_State *, int, int, uint16_t);
void button_unref_simplified(button_t **);
ARRAY_FUNCS(button_t *, button, button_unref_simplified)
int luaA_button_array_get(lua_State *, button_array_t *);
void luaA_button_array_set(lua_State *, int idx, button_array_t *);
#endif
// vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=80

1
mousegrabber.c
View File

@ -21,6 +21,7 @@
#include <unistd.h>
#include "structs.h"
#include "mouse.h"
#include "mousegrabber.h"
#include "common/xcursor.h"

3
root.c
View File

@ -21,7 +21,8 @@
#include <xcb/xtest.h>
#include "mouse.h"
#include "structs.h"
#include "button.h"
#include "common/xcursor.h"
#include "common/tokenize.h"
#include "common/xutil.h"

4
widget.h
View File

@ -1,7 +1,7 @@
/*
* widget.h - widget managing header
*
* Copyright © 2007-2008 Julien Danjou <julien@danjou.info>
* Copyright © 2007-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
@ -22,7 +22,7 @@
#ifndef AWESOME_WIDGET_H
#define AWESOME_WIDGET_H
#include "mouse.h"
#include "button.h"
#include "common/tokenize.h"
typedef widget_t *(widget_constructor_t)(widget_t *);

2
window.c
View File

@ -23,7 +23,7 @@
#include <xcb/xcb_atom.h>
#include "window.h"
#include "mouse.h"
#include "button.h"
#include "common/atoms.h"
/** Mask shorthands */