qbit/xenocara
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

get rid of long standing XXX: now that we configure screens based on

Browse Source 
config options, add the keybinding GrabKey calls here
This commit is contained in:
okan 2013-05-22 16:54:09 +00:00
parent 82fdda20a0
commit 5496d2b0c6
2 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/cwm/calmwm.c
View File

@ -15,7 +15,7 @@
* ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*
* $OpenBSD: calmwm.c,v 1.75 2013/05/14 13:39:53 okan Exp $
* $OpenBSD: calmwm.c,v 1.76 2013/05/22 16:54:09 okan Exp $
*/
#include <sys/param.h>
@ -144,7 +144,6 @@ dpy_init(const char *dpyname)
static void
x_setup(void)
{
struct keybinding *kb;
int i;
Cursor_default = XCreateFontCursor(X_Dpy, XC_X_cursor);
@ -155,13 +154,6 @@ x_setup(void)
for (i = 0; i < ScreenCount(X_Dpy); i++)
screen_init(i);
/*
* XXX key grabs weren't done before, since Screenq was empty,
* do them here for now (this needs changing).
*/
TAILQ_FOREACH(kb, &Conf.keybindingq, entry)
conf_grab(&Conf, kb);
}
static void

10
app/cwm/conf.c
View File

@ -15,7 +15,7 @@
* ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*
* $OpenBSD: conf.c,v 1.130 2013/05/22 16:32:15 okan Exp $
* $OpenBSD: conf.c,v 1.131 2013/05/22 16:54:09 okan Exp $
*/
#include <sys/param.h>
@ -98,8 +98,9 @@ static char *color_binds[CWM_COLOR_MAX] = {
void
conf_screen(struct screen_ctx *sc)
{
int i;
XftColor xc;
struct keybinding *kb;
int i;
XftColor xc;
sc->gap = Conf.gap;
@ -139,6 +140,9 @@ conf_screen(struct screen_ctx *sc)
sc->visual, sc->colormap);
if (sc->xftdraw == NULL)
errx(1, "XftDrawCreate");
TAILQ_FOREACH(kb, &Conf.keybindingq, entry)
xu_key_grab(sc->rootwin, kb->modmask, kb->keysym);
}
static struct {