change ESC to Ctrl+ESC for exit rendering mode

xiangfu · xiangfu · commit 5bea66258b45 · 2012-03-27T13:49:45.000+08:00
diff --git a/src/gui/guirender.c b/src/gui/guirender.c
@@ -36,6 +36,8 @@
 
 #include "guirender.h"
 
+static int ctrl;
+
 static void set_led(char c)
 {
 	int fd;
@@ -124,12 +126,15 @@ static void input_cb(mtk_event *e, int count)
 
 	for(i=0;i<count;i++) {
 		if((e[i].type == EVENT_TYPE_PRESS) && 
-		   (e[i].press.code == MTK_KEY_ESC)) {
+		   (e[i].press.code == MTK_KEY_ESC) && ctrl) {
 			guirender_stop();
 			mtk_input(&e[i+1], count-i-1);
 		}
 		if(e[i].type == EVENT_TYPE_PRESS) {
 			switch(e[i].press.code) {
+				case MTK_KEY_LEFTCTRL:
+					ctrl = 1;
+					break;
 				case MTK_KEY_F1:
 					set_video_format(VIDEO_FORMAT_CVBS6);
 					break;
@@ -152,6 +157,9 @@ static void input_cb(mtk_event *e, int count)
 					adjust_contrast(-5);
 					break;
 			}
+		} else if (e[i].type == EVENT_TYPE_RELEASE) {
+				if(e[i].release.code == MTK_KEY_LEFTCTRL)
+					ctrl = 0;
 		}
 	}
 }

Original file line number	Diff line number	Diff line change
`@@ -36,6 +36,8 @@`
`36`	`36`
`37`	`37`	`#include "guirender.h"`
`38`	`38`
	`39`	`+static int ctrl;`
	`40`	`+`
`39`	`41`	`static void set_led(char c)`
`40`	`42`	`{`
`41`	`43`	`int fd;`
`@@ -124,12 +126,15 @@ static void input_cb(mtk_event *e, int count)`
`124`	`126`
`125`	`127`	`for(i=0;i<count;i++) {`
`126`	`128`	`if((e[i].type == EVENT_TYPE_PRESS) &&`
`127`		`- (e[i].press.code == MTK_KEY_ESC)) {`
	`129`	`+ (e[i].press.code == MTK_KEY_ESC) && ctrl) {`
`128`	`130`	`guirender_stop();`
`129`	`131`	`mtk_input(&e[i+1], count-i-1);`
`130`	`132`	`}`
`131`	`133`	`if(e[i].type == EVENT_TYPE_PRESS) {`
`132`	`134`	`switch(e[i].press.code) {`
	`135`	`+ case MTK_KEY_LEFTCTRL:`
	`136`	`+ ctrl = 1;`
	`137`	`+ break;`
`133`	`138`	`case MTK_KEY_F1:`
`134`	`139`	`set_video_format(VIDEO_FORMAT_CVBS6);`
`135`	`140`	`break;`
`@@ -152,6 +157,9 @@ static void input_cb(mtk_event *e, int count)`
`152`	`157`	`adjust_contrast(-5);`
`153`	`158`	`break;`
`154`	`159`	`}`
	`160`	`+ } else if (e[i].type == EVENT_TYPE_RELEASE) {`
	`161`	`+ if(e[i].release.code == MTK_KEY_LEFTCTRL)`
	`162`	`+ ctrl = 0;`
`155`	`163`	`}`
`156`	`164`	`}`
`157`	`165`	`}`