From c5b4f5885a033b672a281533b20dcba50b0a3de2 Mon Sep 17 00:00:00 2001 From: raster Date: Sun, 19 Sep 2010 03:26:59 +0000 Subject: [PATCH] fmting. git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/trunk/ecore@52455 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33 --- src/lib/ecore_fb/ecore_fb_kbd.c | 44 ++++++++++++++++++++--------------------- src/lib/ecore_fb/ecore_fb_ps2.c | 28 +++++++++++++------------- 2 files changed, 36 insertions(+), 36 deletions(-) diff --git a/src/lib/ecore_fb/ecore_fb_kbd.c b/src/lib/ecore_fb/ecore_fb_kbd.c index aa8190e..6d31a78 100644 --- a/src/lib/ecore_fb/ecore_fb_kbd.c +++ b/src/lib/ecore_fb/ecore_fb_kbd.c @@ -184,7 +184,7 @@ _ecore_fb_kbd_fd_handler(void *data __UNUSED__, Ecore_Fd_Handler *fd_handler __U e->key_compose = strdup(_ecore_fb_kbd_syms[((buf & 0x7f) * 6) + 3 + add]); } else - e->keyname = strdup(_ecore_fb_btn_syms[buf & 0x7f]); + e->keyname = strdup(_ecore_fb_btn_syms[buf & 0x7f]); if (!e->keyname) { free(e); @@ -192,19 +192,19 @@ _ecore_fb_kbd_fd_handler(void *data __UNUSED__, Ecore_Fd_Handler *fd_handler __U } ecore_event_add(ECORE_FB_EVENT_KEY_DOWN, e, _ecore_fb_event_free_key_down, NULL); if (!strcmp(e->keyname, "Control_L")) - _ecore_fb_ctrl++; + _ecore_fb_ctrl++; else if (!strcmp(e->keyname, "Control_R")) - _ecore_fb_ctrl++; + _ecore_fb_ctrl++; else if (!strcmp(e->keyname, "Alt_L")) - _ecore_fb_alt++; + _ecore_fb_alt++; else if (!strcmp(e->keyname, "Alt_R")) - _ecore_fb_alt++; + _ecore_fb_alt++; else if (!strcmp(e->keyname, "Shift_L")) - _ecore_fb_shift++; + _ecore_fb_shift++; else if (!strcmp(e->keyname, "Shift_R")) - _ecore_fb_shift++; + _ecore_fb_shift++; else if (!strcmp(e->keyname, "Caps_Lock")) - _ecore_fb_lock++; + _ecore_fb_lock++; else if (!strcmp(e->keyname, "F1")) vt_switch = 0; else if (!strcmp(e->keyname, "F2")) vt_switch = 1; else if (!strcmp(e->keyname, "F3")) vt_switch = 2; @@ -222,7 +222,7 @@ _ecore_fb_kbd_fd_handler(void *data __UNUSED__, Ecore_Fd_Handler *fd_handler __U if ((vt_switch >= 0) && (_ecore_fb_ctrl) && (_ecore_fb_alt)) - _ecore_fb_vt_switch(vt_switch); + _ecore_fb_vt_switch(vt_switch); } else { @@ -242,7 +242,7 @@ _ecore_fb_kbd_fd_handler(void *data __UNUSED__, Ecore_Fd_Handler *fd_handler __U e->key_compose = strdup(_ecore_fb_kbd_syms[((buf & 0x7f) * 6) + 3 + add]); } else - e->keyname = strdup(_ecore_fb_btn_syms[buf & 0x7f]); + e->keyname = strdup(_ecore_fb_btn_syms[buf & 0x7f]); if (!e->keyname) { free(e); @@ -250,25 +250,25 @@ _ecore_fb_kbd_fd_handler(void *data __UNUSED__, Ecore_Fd_Handler *fd_handler __U } ecore_event_add(ECORE_FB_EVENT_KEY_UP, e, _ecore_fb_event_free_key_up, NULL); if (!strcmp(e->keyname, "Control_L")) - _ecore_fb_ctrl--; + _ecore_fb_ctrl--; else if (!strcmp(e->keyname, "Control_R")) - _ecore_fb_ctrl--; + _ecore_fb_ctrl--; else if (!strcmp(e->keyname, "Alt_L")) - _ecore_fb_alt--; + _ecore_fb_alt--; else if (!strcmp(e->keyname, "Alt_R")) - _ecore_fb_alt--; + _ecore_fb_alt--; else if (!strcmp(e->keyname, "Shift_L")) - _ecore_fb_shift--; + _ecore_fb_shift--; else if (!strcmp(e->keyname, "Shift_R")) - _ecore_fb_shift--; + _ecore_fb_shift--; else if (!strcmp(e->keyname, "Caps_Lock")) - _ecore_fb_lock--; + _ecore_fb_lock--; if (_ecore_fb_ctrl < 0) _ecore_fb_ctrl = 0; if (_ecore_fb_alt < 0) _ecore_fb_alt = 0; if (_ecore_fb_shift < 0) _ecore_fb_shift = 0; if (_ecore_fb_lock < 0) _ecore_fb_lock = 0; } - retry: +retry: ; } while (v > 0); @@ -283,9 +283,9 @@ ecore_fb_kbd_init(void) prev_flags = fcntl(_ecore_fb_kbd_fd, F_GETFL); fcntl(_ecore_fb_kbd_fd, F_SETFL, prev_flags | O_NONBLOCK); _ecore_fb_kbd_fd_handler_handle = ecore_main_fd_handler_add(_ecore_fb_kbd_fd, - ECORE_FD_READ, - _ecore_fb_kbd_fd_handler, NULL, - NULL, NULL); + ECORE_FD_READ, + _ecore_fb_kbd_fd_handler, NULL, + NULL, NULL); if(!_ecore_fb_kbd_fd_handler_handle) return 0; return 1; } @@ -294,7 +294,7 @@ void ecore_fb_kbd_shutdown(void) { if (_ecore_fb_kbd_fd_handler_handle) - ecore_main_fd_handler_del(_ecore_fb_kbd_fd_handler_handle); + ecore_main_fd_handler_del(_ecore_fb_kbd_fd_handler_handle); if (_ecore_fb_kbd_fd >= 0) close(_ecore_fb_kbd_fd); _ecore_fb_kbd_fd = 0; _ecore_fb_kbd_fd_handler_handle = NULL; diff --git a/src/lib/ecore_fb/ecore_fb_ps2.c b/src/lib/ecore_fb/ecore_fb_ps2.c index 161c200..888a18e 100644 --- a/src/lib/ecore_fb/ecore_fb_ps2.c +++ b/src/lib/ecore_fb/ecore_fb_ps2.c @@ -19,18 +19,18 @@ ecore_fb_ps2_init(void) if (_ecore_fb_ps2_fd >= 0) { prev_flags = fcntl(_ecore_fb_ps2_fd, F_GETFL); - fcntl(_ecore_fb_ps2_fd, F_SETFL, prev_flags | O_NONBLOCK); + fcntl(_ecore_fb_ps2_fd, F_SETFL, prev_flags | O_NONBLOCK); _ecore_fb_ts_fd_handler_handle = ecore_main_fd_handler_add(_ecore_fb_ps2_fd, - ECORE_FD_READ, - _ecore_fb_ps2_fd_handler, NULL, NULL, NULL); + ECORE_FD_READ, + _ecore_fb_ps2_fd_handler, NULL, NULL, NULL); if (!_ecore_fb_ts_fd_handler_handle) - { - close(_ecore_fb_ps2_fd); - return 0; - } + { + close(_ecore_fb_ps2_fd); + return 0; + } return 1; } - return 0; + return 0; } void @@ -47,7 +47,7 @@ _ecore_fb_ps2_fd_handler(void *data __UNUSED__, Ecore_Fd_Handler *fd_handler __U static double last_time = 0; static double last_last_time = 0; int v = 0; - + do { int x, y, button, i; @@ -66,13 +66,13 @@ _ecore_fb_ps2_fd_handler(void *data __UNUSED__, Ecore_Fd_Handler *fd_handler __U t = ecore_time_get(); _ecore_fb_ps2_event_byte_count = 0; if (_ecore_fb_ps2_event.button & 0x10) - x = prev_x + (0xffffff00 | _ecore_fb_ps2_event.x); + x = prev_x + (0xffffff00 | _ecore_fb_ps2_event.x); else - x = prev_x + _ecore_fb_ps2_event.x; + x = prev_x + _ecore_fb_ps2_event.x; if (_ecore_fb_ps2_event.button & 0x20) - y = prev_y - (0xffffff00 | _ecore_fb_ps2_event.y); + y = prev_y - (0xffffff00 | _ecore_fb_ps2_event.y); else - y = prev_y - _ecore_fb_ps2_event.y; + y = prev_y - _ecore_fb_ps2_event.y; button = _ecore_fb_ps2_event.button & 0x7; if (x < 0) x = 0; if (y < 0) y = 0; @@ -107,7 +107,7 @@ _ecore_fb_ps2_fd_handler(void *data __UNUSED__, Ecore_Fd_Handler *fd_handler __U e->y = y; e->button = 1; if ((t - last_time) <= _ecore_fb_double_click_time) - e->double_click = 1; + e->double_click = 1; if ((t - last_last_time) <= (2 * _ecore_fb_double_click_time)) { did_triple = 1; -- 2.7.4