From a16c47d82ea78b991bc9ac115c220e2c08f77554 Mon Sep 17 00:00:00 2001 From: Christian Neukirchen Date: Thu, 19 Jul 2012 16:28:27 +0200 Subject: [PATCH 1/3] enable chording --- main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/main.c b/main.c index 5b645e8..4eef43d 100644 --- a/main.c +++ b/main.c @@ -26,7 +26,7 @@ int maxtab = 8; int chord; int autoindent; -#define chording 0 /* code here for reference but it causes deadlocks */ +#define chording 1 /* code here for reference but it causes deadlocks */ void notifyf(void *a, char *msg) -- 1.7.11.2 From fadea7e305b168f572d201591818d252a2ef2766 Mon Sep 17 00:00:00 2001 From: Christian Neukirchen Date: Thu, 19 Jul 2012 16:35:28 +0200 Subject: [PATCH 2/3] monochrome colors --- flayer.c | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/flayer.c b/flayer.c index f370773..1f6d44c 100644 --- a/flayer.c +++ b/flayer.c @@ -29,19 +29,17 @@ flstart(Rectangle r) { lDrect = r; - /* Main text is yellowish */ - maincols[BACK] = allocimagemix(display, DPaleyellow, DWhite); - maincols[HIGH] = allocimage(display, Rect(0,0,1,1), screen->chan, 1, DDarkyellow); - maincols[BORD] = allocimage(display, Rect(0,0,2,2), screen->chan, 1, DYellowgreen); + maincols[BACK] = display->white; + maincols[HIGH] = display->black; + maincols[BORD] = display->black; maincols[TEXT] = display->black; - maincols[HTEXT] = display->black; + maincols[HTEXT] = display->white; - /* Command text is blueish */ - cmdcols[BACK] = allocimagemix(display, DPalebluegreen, DWhite); - cmdcols[HIGH] = allocimage(display, Rect(0,0,1,1), screen->chan, 1, DPalegreygreen); - cmdcols[BORD] = allocimage(display, Rect(0,0,2,2), screen->chan, 1, DPurpleblue); + cmdcols[BACK] = display->white; + cmdcols[HIGH] = display->black; + cmdcols[BORD] = display->black; cmdcols[TEXT] = display->black; - cmdcols[HTEXT] = display->black; + cmdcols[HTEXT] = display->white; } void -- 1.7.11.2 From d74f8e287d9d073f6e565461d77ccb261416117f Mon Sep 17 00:00:00 2001 From: Christian Neukirchen Date: Thu, 19 Jul 2012 16:35:52 +0200 Subject: [PATCH 3/3] scrollwheel in scrollbar --- main.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/main.c b/main.c index 4eef43d..6559988 100644 --- a/main.c +++ b/main.c @@ -115,11 +115,11 @@ threadmain(int argc, char *argv[]) chord = 0; if(chording && chord) chord |= mousep->buttons; - else if(mousep->buttons&1){ + else if(mousep->buttons&(1|8)){ if(nwhich){ if(nwhich!=which) current(nwhich); - else if(scr) + else if(scr || mousep->buttons&8) scroll(which, 1); else{ t=(Text *)which->user1; @@ -137,8 +137,8 @@ threadmain(int argc, char *argv[]) scroll(which, 2); else menu2hit(); - }else if((mousep->buttons&4)){ - if(scr) + }else if((mousep->buttons&(4|16))){ + if(scr || mousep->buttons&16) scroll(which, 3); else menu3hit(); -- 1.7.11.2