swk

commit 8d23f1c2cc7906dfb5d528533853d7a0fe3d4f00
parent 514d165468205162fef7756b210f2b86bb4c27f0
Author: pancake <pancake@nopcode.org>
Date:   Wed, 28 Apr 2010 16:54:52 +0200

Fix segfault and some keys in n900
Diffstat:
config.def.h
 | 
7
++++---
gi_sdl.c
 | 
2
+-

2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/config.def.h b/config.def.h
@@ -8,7 +8,7 @@
 #endif
 
 /* appearance */
-#define FONTSIZE 14
+#define FONTSIZE 40
 #define FONTBOLD 1
 #define WINWIDTH 640
 #define WINHEIGHT 480
@@ -32,12 +32,13 @@ static SwkKeyBind keys[] = {
 	{ Ctrl, 10 , swk_focus_next },
 	{ Ctrl, 11 , swk_focus_prev },
 	{ Ctrl, 12 , swk_focus_activate },
+	{ 0, 225, swk_focus_activate }, // n900 enter
 	{   0 , KUp, swk_focus_prev },
 	{   0 , KDown, swk_focus_next },
 	{   0 , 13 , swk_focus_activate },
 	{ Ctrl, 12 , swk_focus_activate },
-	{ Ctrl, 10, swk_scroll_up },
-	{ Ctrl, 11, swk_scroll_down },
+	{ Ctrl|Shift, 10, swk_scroll_down },
+	{ Ctrl|Shift, 11, swk_scroll_up },
 	{ Ctrl, '+', swk_fontsize_increase },
 	{ Ctrl, '-', swk_fontsize_decrease },
 	{ 0 }
diff --git a/gi_sdl.c b/gi_sdl.c
@@ -114,10 +114,10 @@ swk_gi_event(SwkWindow *w, int dowait) {
 	if(has_event);
 	switch(event.type) {
 	default: ret = NULL; break;
-	case SDL_ACTIVEEVENT:
 	case SDL_VIDEORESIZE:
 		fprintf(stderr, "resize %d %d\n", event.resize.w, event.resize.h);
 		SDL_SetVideoMode(event.resize.w, event.resize.h, BPP, SDLFLAGS);
+	case SDL_ACTIVEEVENT:
 	case SDL_VIDEOEXPOSE:
 		ret->type = EExpose;
 		ret->data.expose.x = ret->data.expose.y = \