diff options
author | Jens Arnold <amiconn@rockbox.org> | 2005-03-18 00:03:22 +0000 |
---|---|---|
committer | Jens Arnold <amiconn@rockbox.org> | 2005-03-18 00:03:22 +0000 |
commit | 31b28f523a9e95031dcfbef342bcffcf66120eab (patch) | |
tree | a8d5e5b2c83e2a4631124ea93505f2722ee196be /uisimulator/x11/button-x11.c | |
parent | f89087df4b8e33ba3737e791d46f77019c500fb1 (diff) | |
download | rockbox-31b28f523a9e95031dcfbef342bcffcf66120eab.tar.gz rockbox-31b28f523a9e95031dcfbef342bcffcf66120eab.zip |
Extensive code policing (indentation levels, tab characters).
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@6199 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'uisimulator/x11/button-x11.c')
-rw-r--r-- | uisimulator/x11/button-x11.c | 125 |
1 files changed, 63 insertions, 62 deletions
diff --git a/uisimulator/x11/button-x11.c b/uisimulator/x11/button-x11.c index 594d489a56..28ede95df6 100644 --- a/uisimulator/x11/button-x11.c +++ b/uisimulator/x11/button-x11.c | |||
@@ -60,109 +60,109 @@ static int get_raw_button (void) | |||
60 | int ev=screenhack_handle_events(&release, &repeat); | 60 | int ev=screenhack_handle_events(&release, &repeat); |
61 | switch(ev) | 61 | switch(ev) |
62 | { | 62 | { |
63 | case XK_KP_Left: | 63 | case XK_KP_Left: |
64 | case XK_Left: | 64 | case XK_Left: |
65 | case XK_KP_4: | 65 | case XK_KP_4: |
66 | k = BUTTON_LEFT; | 66 | k = BUTTON_LEFT; |
67 | break; | 67 | break; |
68 | 68 | ||
69 | case XK_KP_Right: | 69 | case XK_KP_Right: |
70 | case XK_Right: | 70 | case XK_Right: |
71 | case XK_KP_6: | 71 | case XK_KP_6: |
72 | k = BUTTON_RIGHT; | 72 | k = BUTTON_RIGHT; |
73 | break; | 73 | break; |
74 | 74 | ||
75 | case XK_KP_Up: | 75 | case XK_KP_Up: |
76 | case XK_Up: | 76 | case XK_Up: |
77 | case XK_KP_8: | 77 | case XK_KP_8: |
78 | #ifdef BUTTON_UP | 78 | #ifdef BUTTON_UP |
79 | k = BUTTON_UP; | 79 | k = BUTTON_UP; |
80 | #elif defined BUTTON_PLAY | 80 | #elif defined BUTTON_PLAY |
81 | k = BUTTON_PLAY; | 81 | k = BUTTON_PLAY; |
82 | #endif | 82 | #endif |
83 | break; | 83 | break; |
84 | 84 | ||
85 | case XK_KP_Down: | 85 | case XK_KP_Down: |
86 | case XK_Down: | 86 | case XK_Down: |
87 | case XK_KP_2: | 87 | case XK_KP_2: |
88 | #ifdef BUTTON_DOWN | 88 | #ifdef BUTTON_DOWN |
89 | k = BUTTON_DOWN; | 89 | k = BUTTON_DOWN; |
90 | #elif defined BUTTON_STOP | 90 | #elif defined BUTTON_STOP |
91 | k = BUTTON_STOP; | 91 | k = BUTTON_STOP; |
92 | #endif | 92 | #endif |
93 | break; | 93 | break; |
94 | 94 | ||
95 | #ifdef BUTTON_ON | 95 | #ifdef BUTTON_ON |
96 | case XK_KP_Add: | 96 | case XK_KP_Add: |
97 | case XK_Q: | 97 | case XK_Q: |
98 | case XK_q: | 98 | case XK_q: |
99 | k = BUTTON_ON; | 99 | k = BUTTON_ON; |
100 | break; | 100 | break; |
101 | #endif | 101 | #endif |
102 | 102 | ||
103 | #ifdef BUTTON_OFF | 103 | #ifdef BUTTON_OFF |
104 | case XK_KP_Enter: | 104 | case XK_KP_Enter: |
105 | case XK_A: | 105 | case XK_A: |
106 | case XK_a: | 106 | case XK_a: |
107 | k = BUTTON_OFF; | 107 | k = BUTTON_OFF; |
108 | break; | 108 | break; |
109 | #endif | 109 | #endif |
110 | 110 | ||
111 | #ifdef BUTTON_F1 | 111 | #ifdef BUTTON_F1 |
112 | case XK_KP_Divide: | 112 | case XK_KP_Divide: |
113 | case XK_1: | 113 | case XK_1: |
114 | k = BUTTON_F1; | 114 | k = BUTTON_F1; |
115 | break; | 115 | break; |
116 | 116 | ||
117 | case XK_KP_Multiply: | 117 | case XK_KP_Multiply: |
118 | case XK_2: | 118 | case XK_2: |
119 | k = BUTTON_F2; | 119 | k = BUTTON_F2; |
120 | break; | 120 | break; |
121 | 121 | ||
122 | case XK_KP_Subtract: | 122 | case XK_KP_Subtract: |
123 | case XK_3: | 123 | case XK_3: |
124 | k = BUTTON_F3; | 124 | k = BUTTON_F3; |
125 | break; | 125 | break; |
126 | #elif defined(BUTTON_REC) | 126 | #elif defined(BUTTON_REC) |
127 | case XK_KP_Divide: | 127 | case XK_KP_Divide: |
128 | case XK_1: | 128 | case XK_1: |
129 | k = BUTTON_REC; | 129 | k = BUTTON_REC; |
130 | break; | 130 | break; |
131 | #endif | 131 | #endif |
132 | 132 | ||
133 | case XK_KP_Space: | 133 | case XK_KP_Space: |
134 | case XK_KP_5: | 134 | case XK_KP_5: |
135 | case XK_KP_Begin: | 135 | case XK_KP_Begin: |
136 | case XK_space: | 136 | case XK_space: |
137 | #ifdef BUTTON_PLAY | 137 | #ifdef BUTTON_PLAY |
138 | k = BUTTON_PLAY; | 138 | k = BUTTON_PLAY; |
139 | #elif defined(BUTTON_SELECT) | 139 | #elif defined(BUTTON_SELECT) |
140 | k = BUTTON_SELECT; | 140 | k = BUTTON_SELECT; |
141 | #endif | 141 | #endif |
142 | break; | 142 | break; |
143 | 143 | ||
144 | #ifdef HAVE_LCD_BITMAP | 144 | #ifdef HAVE_LCD_BITMAP |
145 | case XK_5: | 145 | case XK_5: |
146 | if(!release) | 146 | if(!release) |
147 | { | 147 | { |
148 | screen_dump(); | 148 | screen_dump(); |
149 | return 0; | 149 | return 0; |
150 | } | 150 | } |
151 | break; | 151 | break; |
152 | #endif | 152 | #endif |
153 | 153 | ||
154 | case XK_KP_Separator: | 154 | case XK_KP_Separator: |
155 | case XK_KP_Insert: | 155 | case XK_KP_Insert: |
156 | case XK_Insert: | 156 | case XK_Insert: |
157 | #ifdef BUTTON_MENU | 157 | #ifdef BUTTON_MENU |
158 | k = BUTTON_MENU; | 158 | k = BUTTON_MENU; |
159 | #elif defined(BUTTON_MODE) | 159 | #elif defined(BUTTON_MODE) |
160 | k = BUTTON_MODE; | 160 | k = BUTTON_MODE; |
161 | #endif | 161 | #endif |
162 | break; | 162 | break; |
163 | 163 | ||
164 | default: | 164 | default: |
165 | k = 0; | 165 | k = 0; |
166 | if(ev) | 166 | if(ev) |
167 | DEBUGF("received ev %d\n", ev); | 167 | DEBUGF("received ev %d\n", ev); |
168 | break; | 168 | break; |
@@ -172,7 +172,8 @@ static int get_raw_button (void) | |||
172 | /* return a release event */ | 172 | /* return a release event */ |
173 | button_state &= ~k; | 173 | button_state &= ~k; |
174 | k |= BUTTON_REL; | 174 | k |= BUTTON_REL; |
175 | } else { | 175 | } |
176 | else { | ||
176 | if(k) { | 177 | if(k) { |
177 | button_state |= k; | 178 | button_state |= k; |
178 | k = button_state; | 179 | k = button_state; |
@@ -222,8 +223,8 @@ long button_get(bool block) | |||
222 | } while(1); | 223 | } while(1); |
223 | 224 | ||
224 | if(!block) | 225 | if(!block) |
225 | /* delay a bit */ | 226 | /* delay a bit */ |
226 | sim_sleep(1); | 227 | sim_sleep(1); |
227 | 228 | ||
228 | return bits; | 229 | return bits; |
229 | } | 230 | } |