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

[keygrabber] Fix key mapping 

- Use Mod5 to enter group 2 and 3
- Do not call the function is key not recognized

Signed-off-by: Julien Danjou <julien@danjou.info>
This commit is contained in:
Julien Danjou 2008-06-10 22:37:45 +02:00
parent 213b2190ed
commit 7d79509df9
4 changed files with 145 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
awful.lua
View File

@ -26,6 +26,8 @@ local os = os
local table = table
local hooks = hooks
local keygrabber = keygrabber
local print = print
local table = table
-- Reset env
setfenv(1, P)
@ -356,7 +358,6 @@ local function menu(p, textbox, exe_callback)
textbox:set("text", prompt)
keygrabber.run(
function (mod, key)
if key == "space" then key = " " end -- special case
if key == "Return" then
exe_callback(command)
textbox:set("text", "")
@ -367,7 +368,7 @@ local function menu(p, textbox, exe_callback)
elseif key == "BackSpace" then
command = command:sub(1, #command - 1)
textbox:set("text", p .. command)
elseif key ~= "None" then
else
command = command .. key
textbox:set("text", p .. command)
end

16
event.c
View File

@ -382,15 +382,17 @@ event_handle_keypress(void *data __attribute__ ((unused)),
if(globalconf.keygrabber != LUA_REFNIL)
{
lua_rawgeti(globalconf.L, LUA_REGISTRYINDEX, globalconf.keygrabber);
keygrabber_handlekpress(globalconf.L, ev);
if(lua_pcall(globalconf.L, 2, 1, 0))
if(keygrabber_handlekpress(globalconf.L, ev))
{
warn("error running function: %s", lua_tostring(globalconf.L, -1));
keygrabber_ungrab();
if(lua_pcall(globalconf.L, 2, 1, 0))
{
warn("error running function: %s", lua_tostring(globalconf.L, -1));
keygrabber_ungrab();
}
else if(!lua_isboolean(globalconf.L, -1) || !lua_toboolean(globalconf.L, -1))
keygrabber_ungrab();
}
else if(!lua_isboolean(globalconf.L, -1) || !lua_toboolean(globalconf.L, -1))
keygrabber_ungrab();
lua_pop(globalconf.L, 1); /* pop returned value */
lua_pop(globalconf.L, 1); /* pop returned value or function if not called */
}
else
{

178
keygrabber.c
View File

@ -19,9 +19,6 @@
*
*/
/* XKeysymToString */
#include <X11/Xlib.h>
#include <unistd.h>
#include <xcb/xcb.h>
@ -448,26 +445,116 @@ keysym_to_str(const xcb_keysym_t ksym)
char *buf;
/* Try to convert to Latin-1, handling ctrl */
if(!(((ksym >= XK_BackSpace) && (ksym <= XK_Clear)) ||
(ksym == XK_Return) || (ksym == XK_Escape) ||
(ksym == XK_KP_Space) || (ksym == XK_KP_Tab) ||
(ksym == XK_KP_Enter) ||
((ksym >= XK_KP_Multiply) && (ksym <= XK_KP_9)) ||
(ksym == XK_KP_Equal) ||
(ksym == XK_Delete)))
if(!((ksym >= XK_BackSpace && ksym <= XK_Clear)
|| ksym == XK_Return
|| ksym == XK_Escape
|| ksym == XK_KP_Space
|| ksym == XK_KP_Tab
|| ksym == XK_KP_Enter
|| ksym == XK_KP_Equal
|| (ksym >= XK_KP_Multiply && ksym <= XK_KP_9)
|| (ksym >= XK_F1 && ksym <= XK_R15)
|| ksym == XK_Delete))
return NULL;
switch(ksym)
{
case XK_BackSpace:
return a_strdup("BackSpace");
case XK_Return:
return a_strdup("Return");
case XK_Escape:
return a_strdup("Escape");
case XK_KP_Enter:
return a_strdup("KP_Enter");
case XK_F1:
return a_strdup("F1");
case XK_F2:
return a_strdup("F2");
case XK_F3:
return a_strdup("F3");
case XK_F4:
return a_strdup("F4");
case XK_F5:
return a_strdup("F5");
case XK_F6:
return a_strdup("F6");
case XK_F7:
return a_strdup("F7");
case XK_F8:
return a_strdup("F8");
case XK_F9:
return a_strdup("F9");
case XK_F10:
return a_strdup("F10");
case XK_F11:
return a_strdup("F11");
case XK_F12:
return a_strdup("F12");
case XK_F13:
return a_strdup("F13");
case XK_F14:
return a_strdup("F14");
case XK_F15:
return a_strdup("F15");
case XK_F16:
return a_strdup("F16");
case XK_F17:
return a_strdup("F17");
case XK_F18:
return a_strdup("F18");
case XK_F19:
return a_strdup("F19");
case XK_F20:
return a_strdup("F20");
case XK_F21:
return a_strdup("F21");
case XK_F22:
return a_strdup("F22");
case XK_F23:
return a_strdup("F23");
case XK_F24:
return a_strdup("F24");
case XK_F25:
return a_strdup("F25");
case XK_F26:
return a_strdup("F26");
case XK_F27:
return a_strdup("F27");
case XK_F28:
return a_strdup("F28");
case XK_F29:
return a_strdup("F29");
case XK_F30:
return a_strdup("F30");
case XK_F31:
return a_strdup("F31");
case XK_F32:
return a_strdup("F32");
case XK_F33:
return a_strdup("F33");
case XK_F34:
return a_strdup("F34");
case XK_F35:
return a_strdup("F35");
}
buf = p_new(char, 2);
/* If X KeySym, convert to ascii by grabbing low 7 bits */
if(ksym == XK_KP_Space)
switch(ksym)
{
case XK_KP_Space:
/* Patch encoding botch */
buf[0] = XK_space & 0x7F;
else if(ksym == XK_hyphen)
break;
case XK_hyphen:
/* Map to equivalent character */
buf[0] = (char)(XK_minus & 0xFF);
else
break;
default:
buf[0] = (char)(ksym & 0x7F);
break;
}
buf[1] = '\0';
return buf;
@ -482,18 +569,29 @@ key_press_lookup_string(xcb_key_press_event_t *e,
/* 'col' (third parameter) is used to get the proper KeySym
* according to modifier (XCB doesn't provide an equivalent to
* XLookupString()) */
k0 = xcb_key_press_lookup_keysym(globalconf.keysyms, e, 0);
k1 = xcb_key_press_lookup_keysym(globalconf.keysyms, e, 1);
* XLookupString()).
*
* If Mod5 is ON we look into second group.
*/
if(e->state & XCB_MOD_MASK_5)
{
k0 = xcb_key_press_lookup_keysym(globalconf.keysyms, e, 2);
k1 = xcb_key_press_lookup_keysym(globalconf.keysyms, e, 3);
}
else
{
k0 = xcb_key_press_lookup_keysym(globalconf.keysyms, e, 0);
k1 = xcb_key_press_lookup_keysym(globalconf.keysyms, e, 1);
}
/* The numlock modifier is on and the second KeySym is a keypad
* KeySym */
if((CLEANMASK(e->state) & globalconf.numlockmask) && xcb_is_keypad_key(k1))
if((e->state & globalconf.numlockmask) && xcb_is_keypad_key(k1))
{
/* The Shift modifier is on, or if the Lock modifier is on and
* is interpreted as ShiftLock, use the first KeySym */
if((CLEANMASK(e->state) & XCB_MOD_MASK_SHIFT) ||
(CLEANMASK(e->state) & XCB_MOD_MASK_LOCK && (e->state & globalconf.shiftlockmask)))
if((e->state & XCB_MOD_MASK_SHIFT) ||
(e->state & XCB_MOD_MASK_LOCK && (e->state & globalconf.shiftlockmask)))
*ksym = k0;
else
*ksym = k1;
@ -501,13 +599,13 @@ key_press_lookup_string(xcb_key_press_event_t *e,
/* The Shift and Lock modifers are both off, use the first
* KeySym */
else if(!(CLEANMASK(e->state) & XCB_MOD_MASK_SHIFT) && !(e->state & XCB_MOD_MASK_LOCK))
else if(!(e->state & XCB_MOD_MASK_SHIFT) && !(e->state & XCB_MOD_MASK_LOCK))
*ksym = k0;
/* The Shift modifier is off and the Lock modifier is on and is
* interpreted as CapsLock */
else if(!(CLEANMASK(e->state) & XCB_MOD_MASK_SHIFT) &&
(CLEANMASK(e->state) & XCB_MOD_MASK_LOCK && (e->state & globalconf.capslockmask)))
else if(!(e->state & XCB_MOD_MASK_SHIFT) &&
(e->state & XCB_MOD_MASK_LOCK && (e->state & globalconf.capslockmask)))
/* The first Keysym is used but if that KeySym is lowercase
* alphabetic, then the corresponding uppercase KeySym is used
* instead */
@ -515,8 +613,8 @@ key_press_lookup_string(xcb_key_press_event_t *e,
/* The Shift modifier is on, and the Lock modifier is on and is
* interpreted as CapsLock */
else if((CLEANMASK(e->state) & XCB_MOD_MASK_SHIFT) &&
(CLEANMASK(e->state) & XCB_MOD_MASK_LOCK && (e->state & globalconf.capslockmask)))
else if((e->state & XCB_MOD_MASK_SHIFT) &&
(e->state & XCB_MOD_MASK_LOCK && (e->state & globalconf.capslockmask)))
/* The second Keysym is used but if that KeySym is lowercase
* alphabetic, then the corresponding uppercase KeySym is used
* instead */
@ -524,18 +622,10 @@ key_press_lookup_string(xcb_key_press_event_t *e,
/* The Shift modifer is on, or the Lock modifier is on and is
* interpreted as ShiftLock, or both */
else if((CLEANMASK(e->state) & XCB_MOD_MASK_SHIFT) ||
(CLEANMASK(e->state) & XCB_MOD_MASK_LOCK && (e->state & globalconf.shiftlockmask)))
else if((e->state & XCB_MOD_MASK_SHIFT) ||
(e->state & XCB_MOD_MASK_LOCK && (e->state & globalconf.shiftlockmask)))
*ksym = k1;
if(xcb_is_modifier_key(*ksym) || xcb_is_function_key(*ksym) ||
xcb_is_pf_key(*ksym) || xcb_is_cursor_key(*ksym) ||
xcb_is_misc_function_key(*ksym))
{
*buf_len = 0;
return;
}
/* Handle special KeySym (Tab, Newline...) */
if((*ksym & 0xffffff00) == 0xff00)
*buf = keysym_to_str(*ksym);
@ -585,8 +675,9 @@ keygrabber_ungrab(void)
/** Handle keypress event.
* \param L Lua stack to push the key pressed.
* \param e Received XKeyEvent.
* \return True if a key was succesfully get, false otherwise.
*/
void
bool
keygrabber_handlekpress(lua_State *L, xcb_key_press_event_t *e)
{
xcb_keysym_t ksym = 0;
@ -595,7 +686,8 @@ keygrabber_handlekpress(lua_State *L, xcb_key_press_event_t *e)
int i = 1;
key_press_lookup_string(e, &buf, &len, &ksym);
/* Got a special key, see x_lookup_string() */
if(!len)
return false;
lua_newtable(L);
@ -640,15 +732,9 @@ keygrabber_handlekpress(lua_State *L, xcb_key_press_event_t *e)
lua_rawseti(L, -2, i++);
}
if(len)
{
/* \todo use buf, but for now it does not report correctly some keys
* as return, etc. */
lua_pushstring(L, XKeysymToString(ksym));
p_delete(&buf);
}
else
lua_pushstring(L, "None");
lua_pushstring(L, buf);
p_delete(&buf);
return true;
}
/** Grab keyboard and read pressed keys, calling callback function at each key

2
keygrabber.h
View File

@ -26,7 +26,7 @@
#include <xcb/xcb.h>
void keygrabber_ungrab(void);
void keygrabber_handlekpress(lua_State *L, xcb_key_press_event_t *);
bool keygrabber_handlekpress(lua_State *L, xcb_key_press_event_t *);
#endif
// vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=80