uncrustify ecore directfb

SVN revision: 50815
This commit is contained in:
Nicolas Aguirre 2010-08-04 16:17:53 +00:00
parent 53380ff916
commit bd0d948867
4 changed files with 833 additions and 812 deletions

View File

@ -5,29 +5,28 @@
#ifdef EAPI #ifdef EAPI
#undef EAPI #undef EAPI
#endif #endif /* ifdef EAPI */
#ifdef _MSC_VER #ifdef _MSC_VER
# ifdef BUILDING_DLL # ifdef BUILDING_DLL
# define EAPI __declspec(dllexport) # define EAPI __declspec(dllexport)
# else # else /* ifdef BUILDING_DLL */
# define EAPI __declspec(dllimport) # define EAPI __declspec(dllimport)
# endif # endif /* ifdef BUILDING_DLL */
#else #else /* ifdef _MSC_VER */
# ifdef __GNUC__ # ifdef __GNUC__
# if __GNUC__ >= 4 # if __GNUC__ >= 4
# define EAPI __attribute__ ((visibility("default"))) # define EAPI __attribute__ ((visibility("default")))
# else # else /* if __GNUC__ >= 4 */
# define EAPI # define EAPI
# endif # endif /* if __GNUC__ >= 4 */
# else # else /* ifdef __GNUC__ */
# define EAPI # define EAPI
# endif # endif /* ifdef __GNUC__ */
#endif #endif /* ifdef _MSC_VER */
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif /* ifdef __cplusplus */
EAPI extern int ECORE_DIRECTFB_EVENT_POSITION; EAPI extern int ECORE_DIRECTFB_EVENT_POSITION;
EAPI extern int ECORE_DIRECTFB_EVENT_SIZE; EAPI extern int ECORE_DIRECTFB_EVENT_SIZE;
@ -44,148 +43,141 @@ EAPI extern int ECORE_DIRECTFB_EVENT_ENTER;
EAPI extern int ECORE_DIRECTFB_EVENT_LEAVE; EAPI extern int ECORE_DIRECTFB_EVENT_LEAVE;
EAPI extern int ECORE_DIRECTFB_EVENT_WHEEL; EAPI extern int ECORE_DIRECTFB_EVENT_WHEEL;
#ifndef _ECORE_DIRECTFB_WINDOW_PREDEF #ifndef _ECORE_DIRECTFB_WINDOW_PREDEF
typedef struct _Ecore_DirectFB_Window Ecore_DirectFB_Window; typedef struct _Ecore_DirectFB_Window Ecore_DirectFB_Window;
#endif #endif /* ifndef _ECORE_DIRECTFB_WINDOW_PREDEF */
typedef struct _Ecore_DirectFB_Cursor Ecore_DirectFB_Cursor; typedef struct _Ecore_DirectFB_Cursor Ecore_DirectFB_Cursor;
typedef struct _Ecore_DirectFB_Event_Key_Down Ecore_DirectFB_Event_Key_Down;
typedef struct _Ecore_DirectFB_Event_Key_Up Ecore_DirectFB_Event_Key_Up;
typedef struct _Ecore_DirectFB_Event_Button_Down Ecore_DirectFB_Event_Button_Down;
typedef struct _Ecore_DirectFB_Event_Button_Up Ecore_DirectFB_Event_Button_Up;
typedef struct _Ecore_DirectFB_Event_Motion Ecore_DirectFB_Event_Motion;
typedef struct _Ecore_DirectFB_Event_Enter Ecore_DirectFB_Event_Enter;
typedef struct _Ecore_DirectFB_Event_Leave Ecore_DirectFB_Event_Leave;
typedef struct _Ecore_DirectFB_Event_Wheel Ecore_DirectFB_Event_Wheel;
typedef struct _Ecore_DirectFB_Event_Got_Focus Ecore_DirectFB_Event_Got_Focus;
typedef struct _Ecore_DirectFB_Event_Lost_Focus Ecore_DirectFB_Event_Lost_Focus;
typedef struct _Ecore_DirectFB_Event_Key_Down Ecore_DirectFB_Event_Key_Down;
typedef struct _Ecore_DirectFB_Event_Key_Up Ecore_DirectFB_Event_Key_Up;
typedef struct _Ecore_DirectFB_Event_Button_Down Ecore_DirectFB_Event_Button_Down;
typedef struct _Ecore_DirectFB_Event_Button_Up Ecore_DirectFB_Event_Button_Up;
typedef struct _Ecore_DirectFB_Event_Motion Ecore_DirectFB_Event_Motion;
typedef struct _Ecore_DirectFB_Event_Enter Ecore_DirectFB_Event_Enter;
typedef struct _Ecore_DirectFB_Event_Leave Ecore_DirectFB_Event_Leave;
typedef struct _Ecore_DirectFB_Event_Wheel Ecore_DirectFB_Event_Wheel;
typedef struct _Ecore_DirectFB_Event_Got_Focus Ecore_DirectFB_Event_Got_Focus;
typedef struct _Ecore_DirectFB_Event_Lost_Focus Ecore_DirectFB_Event_Lost_Focus;
/* this struct is to keep windows data (id, window itself and surface) in memory as every call /* this struct is to keep windows data (id, window itself and surface) in memory as every call
* to DirectFB for this values (e.g window->GetSurface(window,&surface)) will increment the * to DirectFB for this values (e.g window->GetSurface(window,&surface)) will increment the
* reference count, then we will have to release N times the data, so better we just ask for * reference count, then we will have to release N times the data, so better we just ask for
them once */ them once */
struct _Ecore_DirectFB_Window struct _Ecore_DirectFB_Window
{ {
DFBWindowID id; DFBWindowID id;
IDirectFBWindow *window; IDirectFBWindow *window;
IDirectFBSurface *surface; IDirectFBSurface *surface;
Ecore_DirectFB_Cursor *cursor; Ecore_DirectFB_Cursor *cursor;
}; };
struct _Ecore_DirectFB_Cursor struct _Ecore_DirectFB_Cursor
{ {
IDirectFBSurface *surface; IDirectFBSurface *surface;
int hot_x; int hot_x;
int hot_y; int hot_y;
}; };
struct _Ecore_DirectFB_Event_Key_Down /** DirectFB Key Down event */ struct _Ecore_DirectFB_Event_Key_Down /** DirectFB Key Down event */
{ {
char *name; /**< The name of the key that was released */ char *name; /**< The name of the key that was released */
char *string; /**< The logical symbol of the key that was pressed */ char *string; /**< The logical symbol of the key that was pressed */
char *key_compose; /**< The UTF-8 string conversion if any */ char *key_compose; /**< The UTF-8 string conversion if any */
unsigned int time; unsigned int time;
DFBWindowID win; DFBWindowID win;
}; };
struct _Ecore_DirectFB_Event_Key_Up /** DirectFB Key Up event */ struct _Ecore_DirectFB_Event_Key_Up /** DirectFB Key Up event */
{ {
char *name; /**< The name of the key that was released */ char *name; /**< The name of the key that was released */
char *string; /**< The logical symbol of the key that was pressed */ char *string; /**< The logical symbol of the key that was pressed */
char *key_compose; /**< The UTF-8 string conversion if any */ char *key_compose; /**< The UTF-8 string conversion if any */
unsigned int time; unsigned int time;
DFBWindowID win; DFBWindowID win;
}; };
struct _Ecore_DirectFB_Event_Button_Down struct _Ecore_DirectFB_Event_Button_Down
{ {
int button; int button;
int modifiers; int modifiers;
int x, y; int x, y;
unsigned int time; unsigned int time;
int double_click : 1; int double_click : 1;
int triple_click : 1; int triple_click : 1;
DFBWindowID win; DFBWindowID win;
}; };
struct _Ecore_DirectFB_Event_Button_Up struct _Ecore_DirectFB_Event_Button_Up
{ {
int button; int button;
int modifiers; int modifiers;
int x, y; int x, y;
unsigned int time; unsigned int time;
DFBWindowID win; DFBWindowID win;
}; };
struct _Ecore_DirectFB_Event_Motion struct _Ecore_DirectFB_Event_Motion
{ {
int modifiers; int modifiers;
int x, y; int x, y;
unsigned int time; unsigned int time;
DFBWindowID win; DFBWindowID win;
}; };
struct _Ecore_DirectFB_Event_Enter struct _Ecore_DirectFB_Event_Enter
{ {
int modifiers; int modifiers;
int x, y; int x, y;
unsigned int time; unsigned int time;
DFBWindowID win; DFBWindowID win;
}; };
struct _Ecore_DirectFB_Event_Leave struct _Ecore_DirectFB_Event_Leave
{ {
int modifiers; int modifiers;
int x, y; int x, y;
unsigned int time; unsigned int time;
DFBWindowID win; DFBWindowID win;
}; };
struct _Ecore_DirectFB_Event_Wheel struct _Ecore_DirectFB_Event_Wheel
{ {
int direction; int direction;
int z; int z;
int modifiers; int modifiers;
unsigned int time; unsigned int time;
DFBWindowID win; DFBWindowID win;
}; };
struct _Ecore_DirectFB_Event_Got_Focus struct _Ecore_DirectFB_Event_Got_Focus
{ {
unsigned int time; unsigned int time;
DFBWindowID win; DFBWindowID win;
}; };
struct _Ecore_DirectFB_Event_Lost_Focus struct _Ecore_DirectFB_Event_Lost_Focus
{ {
unsigned int time; unsigned int time;
DFBWindowID win; DFBWindowID win;
}; };
/* main functions */ /* main functions */
EAPI int ecore_directfb_init(const char *name); EAPI int ecore_directfb_init(const char *name);
EAPI int ecore_directfb_shutdown(void); EAPI int ecore_directfb_shutdown(void);
EAPI IDirectFB * ecore_directfb_interface_get(void); EAPI IDirectFB * ecore_directfb_interface_get(void);
/* window operations */ /* window operations */
EAPI Ecore_DirectFB_Window * ecore_directfb_window_new(int x, int y, int w, int h); EAPI Ecore_DirectFB_Window * ecore_directfb_window_new(int x, int y, int w, int h);
EAPI void ecore_directfb_window_free(Ecore_DirectFB_Window *window); EAPI void ecore_directfb_window_free(Ecore_DirectFB_Window *window);
EAPI void ecore_directfb_window_move(Ecore_DirectFB_Window *window, int x, int y); EAPI void ecore_directfb_window_move(Ecore_DirectFB_Window *window, int x, int y);
EAPI void ecore_directfb_window_resize(Ecore_DirectFB_Window *window, int w, int h); EAPI void ecore_directfb_window_resize(Ecore_DirectFB_Window *window, int w, int h);
EAPI void ecore_directfb_window_focus(Ecore_DirectFB_Window *window); EAPI void ecore_directfb_window_focus(Ecore_DirectFB_Window *window);
EAPI void ecore_directfb_window_show(Ecore_DirectFB_Window *window); EAPI void ecore_directfb_window_show(Ecore_DirectFB_Window *window);
EAPI void ecore_directfb_window_hide(Ecore_DirectFB_Window *window); EAPI void ecore_directfb_window_hide(Ecore_DirectFB_Window *window);
EAPI void ecore_directfb_window_shaped_set(Ecore_DirectFB_Window *window, int set); EAPI void ecore_directfb_window_shaped_set(Ecore_DirectFB_Window *window, int set);
EAPI void ecore_directfb_window_fullscreen_set(Ecore_DirectFB_Window *window, int set); EAPI void ecore_directfb_window_fullscreen_set(Ecore_DirectFB_Window *window, int set);
EAPI void ecore_directfb_window_size_get(Ecore_DirectFB_Window *window, int *w, int *h); EAPI void ecore_directfb_window_size_get(Ecore_DirectFB_Window *window, int *w, int *h);
EAPI void ecore_directfb_window_cursor_show(Ecore_DirectFB_Window *window, int show); EAPI void ecore_directfb_window_cursor_show(Ecore_DirectFB_Window *window, int show);
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif /* ifdef __cplusplus */
#endif #endif /* ifndef _ECORE_DIRECTFB_H */

File diff suppressed because it is too large Load Diff

View File

@ -1,184 +1,184 @@
typedef struct _Ecore_DirectFB_Key_Symbols Ecore_DirectFB_Key_Symbols; typedef struct _Ecore_DirectFB_Key_Symbols Ecore_DirectFB_Key_Symbols;
struct _Ecore_DirectFB_Key_Symbols struct _Ecore_DirectFB_Key_Symbols
{ {
char *string; char *string;
char *name; char *name;
unsigned int id; unsigned int id;
}; };
static const Ecore_DirectFB_Key_Symbols _ecore_directfb_key_symbols[] = { static const Ecore_DirectFB_Key_Symbols _ecore_directfb_key_symbols[] = {
{"\010", "BackSpace",DIKS_BACKSPACE}, {"\010", "BackSpace",DIKS_BACKSPACE},
{"\011", "Tab", DIKS_TAB}, {"\011", "Tab", DIKS_TAB},
{"\015", "Return", DIKS_RETURN}, {"\015", "Return", DIKS_RETURN},
{"", "Cancel", DIKS_CANCEL}, {"", "Cancel", DIKS_CANCEL},
{"", "Escape", DIKS_ESCAPE}, {"", "Escape", DIKS_ESCAPE},
{" ", "space", DIKS_SPACE}, {" ", "space", DIKS_SPACE},
{"!", "exclam", DIKS_EXCLAMATION_MARK}, {"!", "exclam", DIKS_EXCLAMATION_MARK},
{"\"", "quotedbl", DIKS_QUOTATION}, {"\"", "quotedbl", DIKS_QUOTATION},
{"#", "numbersign", DIKS_NUMBER_SIGN}, {"#", "numbersign", DIKS_NUMBER_SIGN},
{"$", "dollar", DIKS_DOLLAR_SIGN}, {"$", "dollar", DIKS_DOLLAR_SIGN},
{"%", "percent", DIKS_PERCENT_SIGN}, {"%", "percent", DIKS_PERCENT_SIGN},
{"&", "ampersand", DIKS_AMPERSAND}, {"&", "ampersand", DIKS_AMPERSAND},
{"'", "apostrophe", DIKS_APOSTROPHE}, {"'", "apostrophe", DIKS_APOSTROPHE},
{"(", "parenleft", DIKS_PARENTHESIS_LEFT}, {"(", "parenleft", DIKS_PARENTHESIS_LEFT},
{")", "parenright", DIKS_PARENTHESIS_RIGHT}, {")", "parenright", DIKS_PARENTHESIS_RIGHT},
{"*", "asterisk", DIKS_ASTERISK}, {"*", "asterisk", DIKS_ASTERISK},
{"+", "plus", DIKS_PLUS_SIGN}, {"+", "plus", DIKS_PLUS_SIGN},
{",", "comma", DIKS_COMMA}, {",", "comma", DIKS_COMMA},
{"-", "minus", DIKS_MINUS_SIGN}, {"-", "minus", DIKS_MINUS_SIGN},
{".", "period", DIKS_PERIOD}, {".", "period", DIKS_PERIOD},
{"/", "slash", DIKS_SLASH}, {"/", "slash", DIKS_SLASH},
{"0", "0", DIKS_0}, {"0", "0", DIKS_0},
{"1", "1", DIKS_1}, {"1", "1", DIKS_1},
{"2", "2", DIKS_2}, {"2", "2", DIKS_2},
{"3", "3", DIKS_3}, {"3", "3", DIKS_3},
{"4", "4", DIKS_4}, {"4", "4", DIKS_4},
{"5", "5", DIKS_5}, {"5", "5", DIKS_5},
{"6", "6", DIKS_6}, {"6", "6", DIKS_6},
{"7", "7", DIKS_7}, {"7", "7", DIKS_7},
{"8", "8", DIKS_8}, {"8", "8", DIKS_8},
{"9", "9", DIKS_9}, {"9", "9", DIKS_9},
{":", "colon", DIKS_COLON}, {":", "colon", DIKS_COLON},
{";", "semicolon", DIKS_SEMICOLON}, {";", "semicolon", DIKS_SEMICOLON},
{"<", "less", DIKS_LESS_THAN_SIGN}, {"<", "less", DIKS_LESS_THAN_SIGN},
{"=", "equal", DIKS_EQUALS_SIGN}, {"=", "equal", DIKS_EQUALS_SIGN},
{">", "greater", DIKS_GREATER_THAN_SIGN}, {">", "greater", DIKS_GREATER_THAN_SIGN},
{"?", "question", DIKS_QUESTION_MARK}, {"?", "question", DIKS_QUESTION_MARK},
{"@", "at", DIKS_AT}, {"@", "at", DIKS_AT},
{"A", "A", DIKS_CAPITAL_A }, {"A", "A", DIKS_CAPITAL_A },
{"B", "B", DIKS_CAPITAL_B }, {"B", "B", DIKS_CAPITAL_B },
{"C", "C", DIKS_CAPITAL_C }, {"C", "C", DIKS_CAPITAL_C },
{"D", "D", DIKS_CAPITAL_D }, {"D", "D", DIKS_CAPITAL_D },
{"E", "E", DIKS_CAPITAL_E }, {"E", "E", DIKS_CAPITAL_E },
{"F", "F", DIKS_CAPITAL_F }, {"F", "F", DIKS_CAPITAL_F },
{"G", "G", DIKS_CAPITAL_G }, {"G", "G", DIKS_CAPITAL_G },
{"H", "H", DIKS_CAPITAL_H }, {"H", "H", DIKS_CAPITAL_H },
{"I", "I", DIKS_CAPITAL_I }, {"I", "I", DIKS_CAPITAL_I },
{"J", "J", DIKS_CAPITAL_J }, {"J", "J", DIKS_CAPITAL_J },
{"K", "K", DIKS_CAPITAL_K }, {"K", "K", DIKS_CAPITAL_K },
{"L", "L", DIKS_CAPITAL_L }, {"L", "L", DIKS_CAPITAL_L },
{"M", "M", DIKS_CAPITAL_M }, {"M", "M", DIKS_CAPITAL_M },
{"N", "N", DIKS_CAPITAL_N }, {"N", "N", DIKS_CAPITAL_N },
{"O", "O", DIKS_CAPITAL_O }, {"O", "O", DIKS_CAPITAL_O },
{"P", "P", DIKS_CAPITAL_P }, {"P", "P", DIKS_CAPITAL_P },
{"Q", "Q", DIKS_CAPITAL_Q }, {"Q", "Q", DIKS_CAPITAL_Q },
{"R", "R", DIKS_CAPITAL_R }, {"R", "R", DIKS_CAPITAL_R },
{"S", "S", DIKS_CAPITAL_S }, {"S", "S", DIKS_CAPITAL_S },
{"T", "T", DIKS_CAPITAL_T }, {"T", "T", DIKS_CAPITAL_T },
{"U", "U", DIKS_CAPITAL_U }, {"U", "U", DIKS_CAPITAL_U },
{"V", "V", DIKS_CAPITAL_V }, {"V", "V", DIKS_CAPITAL_V },
{"W", "W", DIKS_CAPITAL_W }, {"W", "W", DIKS_CAPITAL_W },
{"X", "X", DIKS_CAPITAL_X }, {"X", "X", DIKS_CAPITAL_X },
{"Y", "Y", DIKS_CAPITAL_Y }, {"Y", "Y", DIKS_CAPITAL_Y },
{"Z", "Z", DIKS_CAPITAL_Z }, {"Z", "Z", DIKS_CAPITAL_Z },
{"[", "bracketleft", DIKS_SQUARE_BRACKET_LEFT }, {"[", "bracketleft", DIKS_SQUARE_BRACKET_LEFT },
{"\\", "backslash", DIKS_BACKSLASH }, {"\\", "backslash", DIKS_BACKSLASH },
{"]", "bracketright", DIKS_SQUARE_BRACKET_RIGHT }, {"]", "bracketright", DIKS_SQUARE_BRACKET_RIGHT },
{"^", "asciicircum", DIKS_CIRCUMFLEX_ACCENT }, {"^", "asciicircum", DIKS_CIRCUMFLEX_ACCENT },
{"_", "underscore", DIKS_UNDERSCORE }, {"_", "underscore", DIKS_UNDERSCORE },
{"`", "grave", DIKS_GRAVE_ACCENT}, {"`", "grave", DIKS_GRAVE_ACCENT},
{"a", "a", DIKS_SMALL_A }, {"a", "a", DIKS_SMALL_A },
{"b","b", DIKS_SMALL_B }, {"b","b", DIKS_SMALL_B },
{"c","c", DIKS_SMALL_C }, {"c","c", DIKS_SMALL_C },
{"d","d", DIKS_SMALL_D }, {"d","d", DIKS_SMALL_D },
{"e","e", DIKS_SMALL_E }, {"e","e", DIKS_SMALL_E },
{"f","f", DIKS_SMALL_F }, {"f","f", DIKS_SMALL_F },
{"g","g", DIKS_SMALL_G }, {"g","g", DIKS_SMALL_G },
{"h","h", DIKS_SMALL_H }, {"h","h", DIKS_SMALL_H },
{"i","i", DIKS_SMALL_I }, {"i","i", DIKS_SMALL_I },
{"j","j", DIKS_SMALL_J }, {"j","j", DIKS_SMALL_J },
{"k","k", DIKS_SMALL_K }, {"k","k", DIKS_SMALL_K },
{"l","l", DIKS_SMALL_L }, {"l","l", DIKS_SMALL_L },
{"m","m", DIKS_SMALL_M }, {"m","m", DIKS_SMALL_M },
{"n","n", DIKS_SMALL_N }, {"n","n", DIKS_SMALL_N },
{"o", "o", DIKS_SMALL_O }, {"o", "o", DIKS_SMALL_O },
{"p", "p", DIKS_SMALL_P }, {"p", "p", DIKS_SMALL_P },
{"q", "q", DIKS_SMALL_Q }, {"q", "q", DIKS_SMALL_Q },
{"r", "r", DIKS_SMALL_R }, {"r", "r", DIKS_SMALL_R },
{"s", "s", DIKS_SMALL_S }, {"s", "s", DIKS_SMALL_S },
{"t", "t", DIKS_SMALL_T }, {"t", "t", DIKS_SMALL_T },
{"u", "u", DIKS_SMALL_U }, {"u", "u", DIKS_SMALL_U },
{"v", "v", DIKS_SMALL_V }, {"v", "v", DIKS_SMALL_V },
{"w", "w", DIKS_SMALL_W }, {"w", "w", DIKS_SMALL_W },
{"x", "x", DIKS_SMALL_X }, {"x", "x", DIKS_SMALL_X },
{"y", "y", DIKS_SMALL_Y }, {"y", "y", DIKS_SMALL_Y },
{"z", "z", DIKS_SMALL_Z }, {"z", "z", DIKS_SMALL_Z },
{"{", "braceleft",DIKS_CURLY_BRACKET_LEFT }, {"{", "braceleft",DIKS_CURLY_BRACKET_LEFT },
{"|", "bar", DIKS_VERTICAL_BAR }, {"|", "bar", DIKS_VERTICAL_BAR },
{"}", "braceright", DIKS_CURLY_BRACKET_RIGHT }, {"}", "braceright", DIKS_CURLY_BRACKET_RIGHT },
{"~", "asciitilde", DIKS_TILDE }, {"~", "asciitilde", DIKS_TILDE },
{"\177", "Delete", DIKS_DELETE }, {"\177", "Delete", DIKS_DELETE },
{"", "Left", DIKS_CURSOR_LEFT }, {"", "Left", DIKS_CURSOR_LEFT },
{"", "Right", DIKS_CURSOR_RIGHT}, {"", "Right", DIKS_CURSOR_RIGHT},
{"", "Up", DIKS_CURSOR_UP}, {"", "Up", DIKS_CURSOR_UP},
{"", "Down", DIKS_CURSOR_DOWN}, {"", "Down", DIKS_CURSOR_DOWN},
{"", "Insert", DIKS_INSERT}, {"", "Insert", DIKS_INSERT},
{"", "Home", DIKS_HOME}, {"", "Home", DIKS_HOME},
{"", "End", DIKS_END}, {"", "End", DIKS_END},
{"", "Page_Up", DIKS_PAGE_UP}, {"", "Page_Up", DIKS_PAGE_UP},
{"", "Page_Down", DIKS_PAGE_DOWN}, {"", "Page_Down", DIKS_PAGE_DOWN},
{"", "Print", DIKS_PRINT}, {"", "Print", DIKS_PRINT},
{"", "Pause", DIKS_PAUSE}, {"", "Pause", DIKS_PAUSE},
/* ok */ /* ok */
{"", "Select",DIKS_SELECT}, {"", "Select",DIKS_SELECT},
/* goto */ /* goto */
{"", "Clear", DIKS_CLEAR}, {"", "Clear", DIKS_CLEAR},
/* power */ /* power */
/* power 2 */ /* power 2 */
/* option */ /* option */
{"", "Menu",DIKS_MENU}, {"", "Menu",DIKS_MENU},
{"", "Help",DIKS_HELP}, {"", "Help",DIKS_HELP},
/* info */ /* info */
/* time */ /* time */
/* vendor */ /* vendor */
/* archive */ /* archive */
/* program */ /* program */
/* channel */ /* channel */
/* favorites */ /* favorites */
/* hasta next */ /* hasta next */
{"", "Next",DIKS_NEXT}, {"", "Next",DIKS_NEXT},
{"", "Begin",DIKS_BEGIN}, {"", "Begin",DIKS_BEGIN},
/* digits */ /* digits */
/* teen */ /* teen */
/* twen */ /* twen */
{"", "Break", DIKS_BREAK}, {"", "Break", DIKS_BREAK},
/* exit */ /* exit */
/* setup */ /* setup */
{"", "upleftcorner", DIKS_CURSOR_LEFT_UP }, {"", "upleftcorner", DIKS_CURSOR_LEFT_UP },
{"", "lowleftcorner", DIKS_CURSOR_LEFT_DOWN }, {"", "lowleftcorner", DIKS_CURSOR_LEFT_DOWN },
{"", "uprightcorner", DIKS_CURSOR_UP_RIGHT }, {"", "uprightcorner", DIKS_CURSOR_UP_RIGHT },
{"", "lowrightcorner",DIKS_CURSOR_DOWN_RIGHT }, {"", "lowrightcorner",DIKS_CURSOR_DOWN_RIGHT },
{"", "F1",DIKS_F1}, {"", "F1",DIKS_F1},
{"", "F2",DIKS_F2}, {"", "F2",DIKS_F2},
{"", "F3",DIKS_F3}, {"", "F3",DIKS_F3},
{"", "F4",DIKS_F4}, {"", "F4",DIKS_F4},
{"", "F5",DIKS_F5}, {"", "F5",DIKS_F5},
{"", "F6",DIKS_F6}, {"", "F6",DIKS_F6},
{"", "F7",DIKS_F7}, {"", "F7",DIKS_F7},
{"", "F8",DIKS_F8}, {"", "F8",DIKS_F8},
{"", "F9",DIKS_F9}, {"", "F9",DIKS_F9},
{"", "F10",DIKS_F10}, {"", "F10",DIKS_F10},
{"", "F11",DIKS_F11}, {"", "F11",DIKS_F11},
{"", "F12",DIKS_F12}, {"", "F12",DIKS_F12},
/* this are only mapped to one, not left right */ /* this are only mapped to one, not left right */
{"", "Shift_L", DIKS_SHIFT}, {"", "Shift_L", DIKS_SHIFT},
/*{"Shift_R",0xFFE2},*/ /*{"Shift_R",0xFFE2},*/
{"", "Control_L", DIKS_CONTROL}, {"", "Control_L", DIKS_CONTROL},
/*{"Control_R",0xFFE4},*/ /*{"Control_R",0xFFE4},*/
{"", "Meta_L", DIKS_META}, {"", "Meta_L", DIKS_META},
/* {"Meta_R",0xFFE8},*/ /* {"Meta_R",0xFFE8},*/
{"", "Alt_L", DIKS_ALT}, {"", "Alt_L", DIKS_ALT},
{"", "Alt_R", DIKS_ALTGR}, {"", "Alt_R", DIKS_ALTGR},
{"", "Super_L", DIKS_SUPER}, {"", "Super_L", DIKS_SUPER},
/*{"Super_R",0xFFEC},*/ /*{"Super_R",0xFFEC},*/
{"", "Hyper_L", DIKS_HYPER}, {"", "Hyper_L", DIKS_HYPER},
/*{"Hyper_R",0xFFEE},*/ /*{"Hyper_R",0xFFEE},*/
{"", "Caps_Lock", DIKS_CAPS_LOCK}, {"", "Caps_Lock", DIKS_CAPS_LOCK},
{"", "Num_Lock", DIKS_NUM_LOCK}, {"", "Num_Lock", DIKS_NUM_LOCK},
{"", "Scroll_Lock", DIKS_SCROLL_LOCK}, {"", "Scroll_Lock", DIKS_SCROLL_LOCK},
/* not included the dead keys */ /* not included the dead keys */
/* not included the custom keys */ /* not included the custom keys */
{"", "VoidSymbol", DIKS_NULL} {"", "VoidSymbol", DIKS_NULL}
}; };
static int _ecore_directfb_key_symbols_count = sizeof(_ecore_directfb_key_symbols)/sizeof(Ecore_DirectFB_Key_Symbols); static int _ecore_directfb_key_symbols_count = sizeof(_ecore_directfb_key_symbols) / sizeof(Ecore_DirectFB_Key_Symbols);

View File

@ -6,47 +6,47 @@ extern int _ecore_directfb_log_dom;
#ifdef ECORE_DIRECTFB_DEFAULT_LOG_COLOR #ifdef ECORE_DIRECTFB_DEFAULT_LOG_COLOR
#undef ECORE_DIRECTFB_DEFAULT_LOG_COLOR #undef ECORE_DIRECTFB_DEFAULT_LOG_COLOR
#endif #endif /* ifdef ECORE_DIRECTFB_DEFAULT_LOG_COLOR */
#define ECORE_DIRECTFB_DEFAULT_LOG_COLOR EINA_COLOR_BLUE #define ECORE_DIRECTFB_DEFAULT_LOG_COLOR EINA_COLOR_BLUE
#ifdef ERR #ifdef ERR
# undef ERR # undef ERR
#endif #endif /* ifdef ERR */
#define ERR(...) EINA_LOG_DOM_ERR(_ecore_directfb_log_dom, __VA_ARGS__) #define ERR(...) EINA_LOG_DOM_ERR(_ecore_directfb_log_dom, __VA_ARGS__)
#ifdef DBG #ifdef DBG
# undef DBG # undef DBG
#endif #endif /* ifdef DBG */
#define DBG(...) EINA_LOG_DOM_DBG(_ecore_directfb_log_dom, __VA_ARGS__) #define DBG(...) EINA_LOG_DOM_DBG(_ecore_directfb_log_dom, __VA_ARGS__)
#ifdef INF #ifdef INF
# undef INF # undef INF
#endif #endif /* ifdef INF */
#define INF(...) EINA_LOG_DOM_INFO(_ecore_directfb_log_dom, __VA_ARGS__) #define INF(...) EINA_LOG_DOM_INFO(_ecore_directfb_log_dom, __VA_ARGS__)
#ifdef WRN #ifdef WRN
# undef WRN # undef WRN
#endif #endif /* ifdef WRN */
#define WRN(...) EINA_LOG_DOM_WARN(_ecore_directfb_log_dom, __VA_ARGS__) #define WRN(...) EINA_LOG_DOM_WARN(_ecore_directfb_log_dom, __VA_ARGS__)
#ifdef CRIT #ifdef CRIT
# undef CRIT # undef CRIT
#endif #endif /* ifdef CRIT */
#define CRIT(...) EINA_LOG_DOM_CRIT(_ecore_directfb_log_dom, __VA_ARGS__) #define CRIT(...) EINA_LOG_DOM_CRIT(_ecore_directfb_log_dom, __VA_ARGS__)
/* macro for a safe call to DirectFB functions */ /* macro for a safe call to DirectFB functions */
#define DFBCHECK(x...) \ #define DFBCHECK(x ...)\
{ \ {\
_err = x; \ _err = x;\
if (_err != DFB_OK) { \ if (_err != DFB_OK) {\
CRIT("%s <%d>:\n\t", __FILE__, __LINE__ ); \ CRIT("%s <%d>:\n\t", __FILE__, __LINE__ );\
DirectFBErrorFatal( #x, _err ); \ DirectFBErrorFatal( # x, _err );\
} \ }\
} }
struct keymap struct keymap
{ {
char *name; char *name;
char *string; char *string;
}; };
#endif #endif /* ifndef _ECORE_DIRECTFB_PRIVATE_H */