efl/ecore_fb: remove deprecated files.
authorGustavo Sverzut Barbieri <barbieri@gmail.com>
Fri, 4 Jan 2013 20:44:19 +0000 (20:44 +0000)
committerGustavo Sverzut Barbieri <barbieri@gmail.com>
Fri, 4 Jan 2013 20:44:19 +0000 (20:44 +0000)
SVN revision: 82240

src/lib/ecore_fb/ecore_fb_kbd.c [deleted file]
src/lib/ecore_fb/ecore_fb_ps2.c [deleted file]

diff --git a/src/lib/ecore_fb/ecore_fb_kbd.c b/src/lib/ecore_fb/ecore_fb_kbd.c
deleted file mode 100644 (file)
index fd111db..0000000
+++ /dev/null
@@ -1,326 +0,0 @@
-static void _ecore_fb_event_free_key_down(void *data, void *ev);
-static void _ecore_fb_event_free_key_up(void *data, void *ev);
-
-static const char *_ecore_fb_kbd_syms[128 * 7] =
-{
-#include "ecore_fb_keytable.h"
-};
-
-static const char *_ecore_fb_btn_syms[128] =
-{
-   "0x00",
-     "Escape",
-     "F1",
-     "F2",
-     "F3",
-     "F4",
-     "Up",
-     "Right",
-     "Left",
-     "Down",
-     "Return",
-     "0x1b",
-     "0x1c",
-     "0x1d",
-     "0x1e",
-     "0x1f",
-     "0x20",
-     "0x21",
-     "0x22",
-     "0x23",
-     "0x24",
-     "0x25",
-     "0x26",
-     "0x27",
-     "0x28",
-     "0x29",
-     "0x2a",
-     "0x2b",
-     "0x2c",
-     "0x2d",
-     "0x2e",
-     "0x2f",
-     "0x30",
-     "0x31",
-     "0x32",
-     "0x33",
-     "0x34",
-     "0x35",
-     "0x36",
-     "0x37",
-     "0x38",
-     "0x39",
-     "0x3a",
-     "0x3b",
-     "0x3c",
-     "0x3d",
-     "0x3e",
-     "0x3f",
-     "0x40",
-     "0x41",
-     "0x42",
-     "0x43",
-     "0x44",
-     "0x45",
-     "0x46",
-     "0x47",
-     "0x48",
-     "0x49",
-     "0x4a",
-     "0x4b",
-     "0x4c",
-     "0x4d",
-     "0x4e",
-     "0x4f",
-     "0x50",
-     "0x51",
-     "0x52",
-     "0x53",
-     "0x54",
-     "0x55",
-     "0x56",
-     "0x57",
-     "0x58",
-     "0x59",
-     "0x5a",
-     "0x5b",
-     "0x5c",
-     "0x5d",
-     "0x5e",
-     "0x5f",
-     "0x60",
-     "0x61",
-     "0x62",
-     "0x63",
-     "0x64",
-     "0x65",
-     "0x66",
-     "0x67",
-     "0x68",
-     "0x69",
-     "0x6a",
-     "0x6b",
-     "0x6c",
-     "0x6d",
-     "0x6e",
-     "0x6f",
-     "0x70",
-     "0x71",
-     "0x72",
-     "0x73",
-     "0x74",
-     "0x75",
-     "0x76",
-     "0x77",
-     "0x78",
-     "0x79",
-     "0x7a",
-     "0x7b",
-     "0x7c",
-     "0x7d",
-     "0x7e",
-     "0x7f"
-};
-static int _ecore_fb_kbd_fd = -1;
-static int _ecore_fb_ctrl = 0;
-static int _ecore_fb_alt = 0;
-static int _ecore_fb_shift = 0;
-static int _ecore_fb_lock = 0;
-
-static Ecore_Fd_Handler *_ecore_fb_kbd_fd_handler_handle = NULL;
-static Eina_Bool _ecore_fb_kbd_fd_handler(void *data, Ecore_Fd_Handler *fd_handler);
-
-static void
-_ecore_fb_event_free_key_down(void *data EINA_UNUSED, void *ev)
-{
-   Ecore_Fb_Event_Key_Down *e;
-   e = ev;
-   free(e->keyname);
-   if (e->keysymbol) free(e->keysymbol);
-   if (e->key_compose) free(e->key_compose);
-   free(e);
-}
-
-static void
-_ecore_fb_event_free_key_up(void *data EINA_UNUSED, void *ev)
-{
-   Ecore_Fb_Event_Key_Up *e;
-
-   e = ev;
-   free(e->keyname);
-   if (e->keysymbol) free(e->keysymbol);
-   if (e->key_compose) free(e->key_compose);
-   free(e);
-}
-
-static Eina_Bool
-_ecore_fb_kbd_fd_handler(void *data EINA_UNUSED, Ecore_Fd_Handler *fd_handler EINA_UNUSED)
-{
-   int v = 0;
-
-   do
-     {
-        unsigned char buf;
-
-        v = read(_ecore_fb_kbd_fd, &buf, 1);
-        if (v < 0) return EINA_TRUE;
-        if (v < 1) return EINA_TRUE;
-        if (!(buf & 0x80))
-          {
-             /* DOWN */
-             int vt_switch = -1;
-             Ecore_Fb_Event_Key_Down *e;
-
-             e = calloc(1, sizeof(Ecore_Fb_Event_Key_Down));
-             if (!e) goto retry;
-             if (_ecore_fb_kbd_fd == _ecore_fb_tty_fd)
-               {
-                  int add = 0;
-
-                  if (_ecore_fb_shift) add = 1;
-                  else if (_ecore_fb_lock) add = 2;
-                  e->keyname = strdup(_ecore_fb_kbd_syms[(buf & 0x7f) * 7]);
-                  e->keysymbol = strdup(_ecore_fb_kbd_syms[((buf & 0x7f) * 7) + add]);
-                  e->key_compose = strdup(_ecore_fb_kbd_syms[((buf & 0x7f) * 7) + 3 + add]);
-               }
-             else
-                e->keyname = strdup(_ecore_fb_btn_syms[buf & 0x7f]);
-             if (!e->keyname)
-               {
-                  free(e);
-                  goto retry;
-               }
-             e->window = 1;
-             e->event_window = e->window;
-             e->root_window = e->window; 
-             e->same_screen = 1;
-             e->timestamp = ecore_loop_time_get() * 1000.0;
-             if (!strcmp(e->keyname, "Control_L"))
-                _ecore_fb_ctrl++;
-             else if (!strcmp(e->keyname, "Control_R"))
-                _ecore_fb_ctrl++;
-             else if (!strcmp(e->keyname, "Alt_L"))
-                _ecore_fb_alt++;
-             else if (!strcmp(e->keyname, "Alt_R"))
-                _ecore_fb_alt++;
-             else if (!strcmp(e->keyname, "Shift_L"))
-                _ecore_fb_shift++;
-             else if (!strcmp(e->keyname, "Shift_R"))
-                _ecore_fb_shift++;
-             else if (!strcmp(e->keyname, "Caps_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;
-             else if (!strcmp(e->keyname, "F4")) vt_switch = 3;
-             else if (!strcmp(e->keyname, "F5")) vt_switch = 4;
-             else if (!strcmp(e->keyname, "F6")) vt_switch = 5;
-             else if (!strcmp(e->keyname, "F7")) vt_switch = 6;
-             else if (!strcmp(e->keyname, "F8")) vt_switch = 7;
-             else if (!strcmp(e->keyname, "F9")) vt_switch = 8;
-             else if (!strcmp(e->keyname, "F10")) vt_switch = 9;
-             else if (!strcmp(e->keyname, "F11")) vt_switch = 10;
-             else if (!strcmp(e->keyname, "F12")) vt_switch = 11;
-             if (_ecore_fb_ctrl > 2) _ecore_fb_ctrl = 2;
-             if (_ecore_fb_alt > 2) _ecore_fb_alt = 2;
-             if ((_ecore_fb_kbd_fd == _ecore_fb_tty_fd) &&
-                 (_ecore_fb_ctrl))
-               {
-                  const char *ts = _ecore_fb_kbd_syms[(buf & 0x7f) + 3 + 3];
-                  
-                  if (ts)
-                    {
-                       if (e->key_compose) free(e->key_compose);
-                       e->key_compose = strdup(ts);
-                    }
-               }
-             if ((vt_switch >= 0) &&
-                 (_ecore_fb_ctrl) &&
-                 (_ecore_fb_alt))
-                _ecore_fb_vt_switch(vt_switch);
-             ecore_event_add(ECORE_FB_EVENT_KEY_DOWN, e, _ecore_fb_event_free_key_down, NULL);
-          }
-        else
-          {
-             /* UP */
-             Ecore_Fb_Event_Key_Up *e;
-
-             e = calloc(1, sizeof(Ecore_Fb_Event_Key_Up));
-             if (!e) goto retry;
-             if (_ecore_fb_kbd_fd == _ecore_fb_tty_fd)
-               {
-                  int add = 0;
-
-                  if (_ecore_fb_shift) add = 1;
-                  else if (_ecore_fb_lock) add = 2;
-                  e->keyname = strdup(_ecore_fb_kbd_syms[(buf & 0x7f) * 7]);
-                  e->keysymbol = strdup(_ecore_fb_kbd_syms[((buf & 0x7f) * 7) + add]);
-                  e->key_compose = strdup(_ecore_fb_kbd_syms[((buf & 0x7f) * 7) + 3 + add]);
-               }
-             else
-                e->keyname = strdup(_ecore_fb_btn_syms[buf & 0x7f]);
-             if (!e->keyname)
-               {
-                  free(e);
-                  goto retry;
-               }
-             e->window = 1;
-             e->event_window = e->window;
-             e->root_window = e->window; 
-             e->same_screen = 1;
-             e->timestamp = ecore_loop_time_get() * 1000.0;
-             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--;
-             else if (!strcmp(e->keyname, "Control_R"))
-                _ecore_fb_ctrl--;
-             else if (!strcmp(e->keyname, "Alt_L"))
-                _ecore_fb_alt--;
-             else if (!strcmp(e->keyname, "Alt_R"))
-                _ecore_fb_alt--;
-             else if (!strcmp(e->keyname, "Shift_L"))
-                _ecore_fb_shift--;
-             else if (!strcmp(e->keyname, "Shift_R"))
-                _ecore_fb_shift--;
-             else if (!strcmp(e->keyname, "Caps_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:
-        ;
-     }
-   while (v > 0);
-   return EINA_TRUE;
-}
-
-int
-ecore_fb_kbd_init(void)
-{
-   int prev_flags;
-
-   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);
-   if(!_ecore_fb_kbd_fd_handler_handle) return 0;
-   return 1;
-}
-
-void
-ecore_fb_kbd_shutdown(void)
-{
-   if (_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 = -1;
-   _ecore_fb_kbd_fd_handler_handle = NULL;
-   _ecore_fb_ctrl = 0;
-   _ecore_fb_lock = 0;
-   _ecore_fb_shift = 0;
-   _ecore_fb_alt = 0;
-}
diff --git a/src/lib/ecore_fb/ecore_fb_ps2.c b/src/lib/ecore_fb/ecore_fb_ps2.c
deleted file mode 100644 (file)
index 7931ef7..0000000
+++ /dev/null
@@ -1,224 +0,0 @@
-typedef struct _Ecore_Fb_Ps2_Event Ecore_Fb_Ps2_Event;
-struct _Ecore_Fb_Ps2_Event
-{
-   unsigned char button;
-   unsigned char x;
-   unsigned char y;
-   unsigned char z;
-};
-
-static int _ecore_fb_ps2_event_byte_count = 0;
-static Ecore_Fb_Ps2_Event _ecore_fb_ps2_event;
-static int _ecore_fb_ps2_fd = 0;
-static Eina_Bool _ecore_fb_ps2_fd_handler(void *data, Ecore_Fd_Handler *fd_handler);
-
-int
-ecore_fb_ps2_init(void)
-{
-   _ecore_fb_ps2_fd = open("/dev/psaux", O_RDWR);
-   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);
-        _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);
-        if (!_ecore_fb_ts_fd_handler_handle)
-          {
-             close(_ecore_fb_ps2_fd);
-             return 0;
-          }
-        return 1;
-     }
-   return 0;
-}
-
-void
-ecore_fb_ps2_shutdown(void)
-{
-   if (_ecore_fb_ps2_fd > 0) close(_ecore_fb_ps2_fd);
-   _ecore_fb_ps2_fd = 0;
-}
-
-static Eina_Bool
-_ecore_fb_ps2_fd_handler(void *data EINA_UNUSED, Ecore_Fd_Handler *fd_handler EINA_UNUSED)
-{
-   static int prev_x = 0, prev_y = 0, prev_button = 0;
-   static double last_time = 0;
-   static double last_last_time = 0;
-   int v = 0;
-
-   do
-     {
-        int x, y, button, i;
-        int num;
-        char *ptr;
-        double t;
-        static int did_double = 0;
-        static int did_triple = 0;
-
-        ptr = (char *)&(_ecore_fb_ps2_event);
-        ptr += _ecore_fb_ps2_event_byte_count;
-        num = sizeof(Ecore_Fb_Ps2_Event) - _ecore_fb_ps2_event_byte_count;
-        v = read(_ecore_fb_ps2_fd, ptr, num);
-        if (v < 0) return EINA_TRUE;
-        _ecore_fb_ps2_event_byte_count += v;
-        if (v < num) return EINA_TRUE;
-        t = ecore_loop_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);
-        else
-           x = prev_x + _ecore_fb_ps2_event.x;
-        if (_ecore_fb_ps2_event.button & 0x20)
-           y = prev_y - (0xffffff00 | _ecore_fb_ps2_event.y);
-        else
-           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;
-        if (x >= _ecore_fb_console_w) x = _ecore_fb_console_w - 1;
-        if (y >= _ecore_fb_console_h) y = _ecore_fb_console_h - 1;
-        /* add event to queue */
-        /* always add a move event */
-        if (1)
-          {
-             /* MOVE: mouse is down and was */
-             Ecore_Event_Mouse_Move *e;
-
-             e = calloc(1, sizeof(Ecore_Fb_Event_Mouse_Move));
-             if (!e) goto retry;
-             e->x = x;
-             e->y = y;
-             e->root.x = e->x;
-             e->root.y = e->y;
-             e->window = 1;
-             e->event_window = e->window;
-             e->root_window = e->window;
-             e->same_screen = 1;
-             e->timestamp = ecore_loop_time_get() * 1000.0;
-             ecore_event_add(ECORE_EVENT_MOUSE_MOVE, e, NULL, NULL);
-          }
-        for (i = 1; i <= 3; i++)
-          {
-             int mask;
-
-             mask = 1 << (i - 1);
-             if (((button & mask)) && (!(prev_button & mask)))
-               {
-                  /* DOWN: mouse is down, but was not now */
-                  Ecore_Event_Mouse_Button *e;
-
-                  e = calloc(1, sizeof(Ecore_Event_Mouse_Button));
-                  if (!e) goto retry;
-                  e->x = x;
-                  e->y = y;
-                  e->root.x = e->x;
-                  e->root.y = e->y;
-                  e->button = i;
-                  e->window = 1;
-                  e->event_window = e->window;
-                  e->root_window = e->window;
-                  e->same_screen = 1;
-                  if ((t - last_time) <= _ecore_fb_double_click_time)
-                    {
-                       e->double_click = 1;
-                       did_double = 1;
-                    }
-                  else
-                    {
-                       did_double = 0;
-                       did_triple = 0;
-                    }
-                  if ((t - last_last_time) <= (2 * _ecore_fb_double_click_time))
-                    {
-                       did_triple = 1;
-                       e->triple_click = 1;
-                    }
-                  else
-                    {
-                       did_triple = 0;
-                    }
-                  e->timestamp = ecore_loop_time_get() * 1000.0;
-                  ecore_event_add(ECORE_EVENT_MOUSE_BUTTON_DOWN, e, NULL, NULL);
-               }
-             else if ((!(button & mask)) && ((prev_button & mask)))
-               {
-                  /* UP: mouse was down, but is not now */
-                  Ecore_Event_Mouse_Button *e;
-
-                  e = calloc(1, sizeof(Ecore_Event_Mouse_Button));
-                  if (!e) goto retry;
-                  e->x = x;
-                  e->y = y;
-                  e->root.x = e->x;
-                  e->root.y = e->y;
-                  e->button = i;
-                  e->window = 1;
-                  e->event_window = e->window;
-                  e->root_window = e->window;
-                  e->same_screen = 1;
-                  if (did_double)
-                     e->double_click = 1;
-                  if (did_triple)
-                     e->triple_click = 1;
-                  e->timestamp = ecore_loop_time_get() * 1000.0;
-                  ecore_event_add(ECORE_EVENT_MOUSE_BUTTON_UP, e, NULL, NULL);
-               }
-          }
-        if (did_triple)
-          {
-             last_time = 0;
-             last_last_time = 0;
-          }
-        else
-          {
-             last_last_time = last_time;
-             last_time = t;
-          }
-        retry:
-        prev_x = x;
-        prev_y = y;
-        prev_button = button;
-     }
-   while (v > 0);
-   return EINA_TRUE;
-}
-/**
- * @defgroup Ecore_FB_Click_Group Framebuffer Double Click Functions
- * @ingroup Ecore_FB_Group
- *
- * Functions that deal with the double click time of the framebuffer.
- */
-
-/**
- * Sets the timeout for a double and triple clicks to be flagged.
- *
- * This sets the time between clicks before the double_click flag is
- * set in a button down event. If 3 clicks occur within double this
- * time, the triple_click flag is also set.
- *
- * @param   t The time in seconds
- * @ingroup Ecore_FB_Click_Group
- */
-EAPI void
-ecore_fb_double_click_time_set(double t)
-{
-   if (t < 0.0) t = 0.0;
-   _ecore_fb_double_click_time = t;
-}
-
-/**
- * Retrieves the double and triple click flag timeout.
- *
- * See @ref ecore_x_double_click_time_set for more information.
- *
- * @return  The timeout for double clicks in seconds.
- * @ingroup Ecore_FB_Click_Group
- */
-EAPI double
-ecore_fb_double_click_time_get(void)
-{
-   return _ecore_fb_double_click_time;
-}
-