diff options
52 files changed, 561 insertions, 561 deletions
diff --git a/src/lib/ecore/Ecore_Getopt.h b/src/lib/ecore/Ecore_Getopt.h index 7a038f744a..751d30c788 100644 --- a/src/lib/ecore/Ecore_Getopt.h +++ b/src/lib/ecore/Ecore_Getopt.h | |||
@@ -1186,7 +1186,7 @@ EAPI Eina_List *ecore_getopt_list_free(Eina_List *list); | |||
1186 | * @return @c EINA_TRUE on success, @c EINA_FALSE on incorrect geometry value. | 1186 | * @return @c EINA_TRUE on success, @c EINA_FALSE on incorrect geometry value. |
1187 | * | 1187 | * |
1188 | * This is a helper function to be used with ECORE_GETOPT_CALLBACK_*(). | 1188 | * This is a helper function to be used with ECORE_GETOPT_CALLBACK_*(). |
1189 | * | 1189 | * |
1190 | * @c callback_data value is ignored, you can safely use @c NULL. | 1190 | * @c callback_data value is ignored, you can safely use @c NULL. |
1191 | */ | 1191 | */ |
1192 | EAPI Eina_Bool ecore_getopt_callback_geometry_parse(const Ecore_Getopt *parser, const Ecore_Getopt_Desc *desc, const char *str, void *data, Ecore_Getopt_Value *storage); | 1192 | EAPI Eina_Bool ecore_getopt_callback_geometry_parse(const Ecore_Getopt *parser, const Ecore_Getopt_Desc *desc, const char *str, void *data, Ecore_Getopt_Value *storage); |
diff --git a/src/lib/ecore/ecore.c b/src/lib/ecore/ecore.c index f6cacd44a6..0d79b621b2 100644 --- a/src/lib/ecore/ecore.c +++ b/src/lib/ecore/ecore.c | |||
@@ -582,7 +582,7 @@ ecore_fork_reset(void) | |||
582 | fcb->func(fcb->data); | 582 | fcb->func(fcb->data); |
583 | } | 583 | } |
584 | fork_cbs_walking--; | 584 | fork_cbs_walking--; |
585 | 585 | ||
586 | EINA_LIST_FOREACH_SAFE(fork_cbs, l, ln, fcb) | 586 | EINA_LIST_FOREACH_SAFE(fork_cbs, l, ln, fcb) |
587 | { | 587 | { |
588 | if (fcb->delete_me) | 588 | if (fcb->delete_me) |
diff --git a/src/lib/ecore/ecore_exe_posix.c b/src/lib/ecore/ecore_exe_posix.c index 07f1058ab0..f88f0ca15b 100644 --- a/src/lib/ecore/ecore_exe_posix.c +++ b/src/lib/ecore/ecore_exe_posix.c | |||
@@ -298,7 +298,7 @@ _impl_ecore_exe_efl_object_finalize(Eo *obj, Ecore_Exe_Data *exe) | |||
298 | #endif | 298 | #endif |
299 | if (run_pri != ECORE_EXE_PRIORITY_INHERIT) | 299 | if (run_pri != ECORE_EXE_PRIORITY_INHERIT) |
300 | { | 300 | { |
301 | #ifdef PRIO_PROCESS | 301 | #ifdef PRIO_PROCESS |
302 | if ((run_pri >= -20) && (run_pri <= 19)) | 302 | if ((run_pri >= -20) && (run_pri <= 19)) |
303 | setpriority(PRIO_PROCESS, 0, run_pri); | 303 | setpriority(PRIO_PROCESS, 0, run_pri); |
304 | #else | 304 | #else |
diff --git a/src/lib/ecore_audio/ecore_audio_obj_out_pulse.c b/src/lib/ecore_audio/ecore_audio_obj_out_pulse.c index edcc924acb..463ecb6773 100644 --- a/src/lib/ecore_audio/ecore_audio_obj_out_pulse.c +++ b/src/lib/ecore_audio/ecore_audio_obj_out_pulse.c | |||
@@ -234,11 +234,11 @@ static void _state_cb(pa_context *context, void *data) | |||
234 | Eo *eo_obj; | 234 | Eo *eo_obj; |
235 | pa_context_state_t state; | 235 | pa_context_state_t state; |
236 | Ecore_Audio_Out_Pulse_Data *pd = data; | 236 | Ecore_Audio_Out_Pulse_Data *pd = data; |
237 | 237 | ||
238 | if (!EPA_LOAD()) return; | 238 | if (!EPA_LOAD()) return; |
239 | state = EPA_CALL(pa_context_get_state)(context); | 239 | state = EPA_CALL(pa_context_get_state)(context); |
240 | pd->state = state; | 240 | pd->state = state; |
241 | 241 | ||
242 | //ref everything in the list to be sure... | 242 | //ref everything in the list to be sure... |
243 | EINA_LIST_FOREACH(pd->outputs, out, eo_obj) { | 243 | EINA_LIST_FOREACH(pd->outputs, out, eo_obj) { |
244 | efl_ref(eo_obj); | 244 | efl_ref(eo_obj); |
@@ -271,7 +271,7 @@ static void _state_job(void *data) | |||
271 | { | 271 | { |
272 | Eo *eo_obj; | 272 | Eo *eo_obj; |
273 | Eina_List *out, *tmp; | 273 | Eina_List *out, *tmp; |
274 | 274 | ||
275 | DBG("PA context fail."); | 275 | DBG("PA context fail."); |
276 | //ref everything in the list to be sure... | 276 | //ref everything in the list to be sure... |
277 | EINA_LIST_FOREACH(pd->outputs, out, eo_obj) { | 277 | EINA_LIST_FOREACH(pd->outputs, out, eo_obj) { |
diff --git a/src/lib/ecore_cocoa/ecore_cocoa_keys.h b/src/lib/ecore_cocoa/ecore_cocoa_keys.h index 9a3324c2c7..3cde2686f2 100644 --- a/src/lib/ecore_cocoa/ecore_cocoa_keys.h +++ b/src/lib/ecore_cocoa/ecore_cocoa_keys.h | |||
@@ -124,7 +124,7 @@ static const struct _ecore_cocoa_keys_s keystable[] = | |||
124 | { 127, "BackSpace", "\x08" }, | 124 | { 127, "BackSpace", "\x08" }, |
125 | { 126, "asciitilde", "~" }, | 125 | { 126, "asciitilde", "~" }, |
126 | 126 | ||
127 | { 160, "w0", "" }, | 127 | { 160, "w0", "" }, |
128 | { 161, "w1", "" }, | 128 | { 161, "w1", "" }, |
129 | { 162, "w2", "" }, | 129 | { 162, "w2", "" }, |
130 | { 163, "w3", "" }, | 130 | { 163, "w3", "" }, |
diff --git a/src/lib/ecore_con/Ecore_Con.h b/src/lib/ecore_con/Ecore_Con.h index 3cc1d09417..6155796200 100644 --- a/src/lib/ecore_con/Ecore_Con.h +++ b/src/lib/ecore_con/Ecore_Con.h | |||
@@ -120,38 +120,38 @@ | |||
120 | /** | 120 | /** |
121 | * @defgroup Ecore_Con_Buffer Ecore Connection Buffering | 121 | * @defgroup Ecore_Con_Buffer Ecore Connection Buffering |
122 | * @ingroup Ecore_Con_Group | 122 | * @ingroup Ecore_Con_Group |
123 | * | 123 | * |
124 | * As Ecore_Con works on an event driven design, as data arrives, events will | 124 | * As Ecore_Con works on an event driven design, as data arrives, events will |
125 | * be produced containing the data that arrived. It is up to the user of | 125 | * be produced containing the data that arrived. It is up to the user of |
126 | * Ecore_Con to either parse as they go, append to a file to later parse the | 126 | * Ecore_Con to either parse as they go, append to a file to later parse the |
127 | * whole file in one go, or append to memory to parse or handle later. | 127 | * whole file in one go, or append to memory to parse or handle later. |
128 | * | 128 | * |
129 | * To help with this Eina has some handy API's. The Eina_Binbuf and | 129 | * To help with this Eina has some handy API's. The Eina_Binbuf and |
130 | * Eina_Strbuf APIs, abstract dynamic buffer management and make it trivial | 130 | * Eina_Strbuf APIs, abstract dynamic buffer management and make it trivial |
131 | * to handle buffers at runtime, without having to manage them. Eina_Binbuf | 131 | * to handle buffers at runtime, without having to manage them. Eina_Binbuf |
132 | * makes it possible to create, expand, reset and slice a blob of memory - | 132 | * makes it possible to create, expand, reset and slice a blob of memory - |
133 | * all via API. No system calls, no pointer manipulations and no size | 133 | * all via API. No system calls, no pointer manipulations and no size |
134 | * calculation. | 134 | * calculation. |
135 | * | 135 | * |
136 | * Additional functions include adding content at specified byte positions in | 136 | * Additional functions include adding content at specified byte positions in |
137 | * the buffer, escaping the inputs, find and replace strings. This provides | 137 | * the buffer, escaping the inputs, find and replace strings. This provides |
138 | * extreme flexibility to play around, with a dynamic blob of memory. | 138 | * extreme flexibility to play around, with a dynamic blob of memory. |
139 | * | 139 | * |
140 | * It is good to free it (using eina_binbuf_free()) after using it. | 140 | * It is good to free it (using eina_binbuf_free()) after using it. |
141 | * | 141 | * |
142 | * Eina_Binbuf compliments Ecore_Con use cases, where dynamic sizes of data | 142 | * Eina_Binbuf compliments Ecore_Con use cases, where dynamic sizes of data |
143 | * arrive from the network (think http download in chunks). Using | 143 | * arrive from the network (think http download in chunks). Using |
144 | * Eina_Binbuf provides enough flexibility to handle data as it arrives and | 144 | * Eina_Binbuf provides enough flexibility to handle data as it arrives and |
145 | * to defer its processing until desired, without having to think about | 145 | * to defer its processing until desired, without having to think about |
146 | * where to store the temporary data and how to manage its size. | 146 | * where to store the temporary data and how to manage its size. |
147 | * | 147 | * |
148 | * An example of how to use these with Ecore_Con follows. | 148 | * An example of how to use these with Ecore_Con follows. |
149 | * | 149 | * |
150 | * @code | 150 | * @code |
151 | * #include <Eina.h> | 151 | * #include <Eina.h> |
152 | * #include <Ecore.h> | 152 | * #include <Ecore.h> |
153 | * #include <Ecore_Con.h> | 153 | * #include <Ecore_Con.h> |
154 | * | 154 | * |
155 | * static Eina_Bool | 155 | * static Eina_Bool |
156 | * data_callback(void *data, int type, void *event) | 156 | * data_callback(void *data, int type, void *event) |
157 | * { | 157 | * { |
@@ -161,56 +161,56 @@ | |||
161 | * // append data as it arrives - don't worry where or how it gets stored. | 161 | * // append data as it arrives - don't worry where or how it gets stored. |
162 | * // Also don't worry about size, expanding, reallocing etc. | 162 | * // Also don't worry about size, expanding, reallocing etc. |
163 | * // just keep appending - size is automatically handled. | 163 | * // just keep appending - size is automatically handled. |
164 | * | 164 | * |
165 | * eina_binbuf_append_length(data, url_data->data, url_data->size); | 165 | * eina_binbuf_append_length(data, url_data->data, url_data->size); |
166 | * | 166 | * |
167 | * fprintf(stderr, "Appended %d \n", url_data->size); | 167 | * fprintf(stderr, "Appended %d \n", url_data->size); |
168 | * } | 168 | * } |
169 | * return EINA_TRUE; | 169 | * return EINA_TRUE; |
170 | * } | 170 | * } |
171 | * | 171 | * |
172 | * | 172 | * |
173 | * | 173 | * |
174 | * static Eina_Bool | 174 | * static Eina_Bool |
175 | * completion_callback(void *data, int type, void *event) | 175 | * completion_callback(void *data, int type, void *event) |
176 | * { | 176 | * { |
177 | * Ecore_Con_Event_Url_Complete *url_complete = event; | 177 | * Ecore_Con_Event_Url_Complete *url_complete = event; |
178 | * printf("download completed with status code: %d\n", url_complete->status); | 178 | * printf("download completed with status code: %d\n", url_complete->status); |
179 | * | 179 | * |
180 | * // get the data back from Eina_Binbuf | 180 | * // get the data back from Eina_Binbuf |
181 | * char *ptr = eina_binbuf_string_get(data); | 181 | * char *ptr = eina_binbuf_string_get(data); |
182 | * size_t size = eina_binbuf_length_get(data); | 182 | * size_t size = eina_binbuf_length_get(data); |
183 | * | 183 | * |
184 | * // process data as required (write to file) | 184 | * // process data as required (write to file) |
185 | * fprintf(stderr, "Size of data = %d bytes\n", size); | 185 | * fprintf(stderr, "Size of data = %d bytes\n", size); |
186 | * int fd = open("./elm.png", O_CREAT); | 186 | * int fd = open("./elm.png", O_CREAT); |
187 | * write(fd, ptr, size); | 187 | * write(fd, ptr, size); |
188 | * close(fd); | 188 | * close(fd); |
189 | * | 189 | * |
190 | * // free it when done. | 190 | * // free it when done. |
191 | * eina_binbuf_free(data); | 191 | * eina_binbuf_free(data); |
192 | * | 192 | * |
193 | * ecore_main_loop_quit(); | 193 | * ecore_main_loop_quit(); |
194 | * | 194 | * |
195 | * return EINA_TRUE; | 195 | * return EINA_TRUE; |
196 | * } | 196 | * } |
197 | * | 197 | * |
198 | * | 198 | * |
199 | * int | 199 | * int |
200 | * main(int argc, char **argv) | 200 | * main(int argc, char **argv) |
201 | * { | 201 | * { |
202 | * | 202 | * |
203 | * const char *url = "http://www.enlightenment.org/p/index/d/logo.png"; | 203 | * const char *url = "http://www.enlightenment.org/p/index/d/logo.png"; |
204 | * | 204 | * |
205 | * ecore_init(); | 205 | * ecore_init(); |
206 | * ecore_con_init(); | 206 | * ecore_con_init(); |
207 | * ecore_con_url_init(); | 207 | * ecore_con_url_init(); |
208 | * | 208 | * |
209 | * | 209 | * |
210 | * // This is single additional line to manage dynamic network data. | 210 | * // This is single additional line to manage dynamic network data. |
211 | * Eina_Binbuf *data = eina_binbuf_new(); | 211 | * Eina_Binbuf *data = eina_binbuf_new(); |
212 | * Ecore_Con_Url *url_con = ecore_con_url_new(url); | 212 | * Ecore_Con_Url *url_con = ecore_con_url_new(url); |
213 | * | 213 | * |
214 | * ecore_event_handler_add(ECORE_CON_EVENT_URL_COMPLETE, | 214 | * ecore_event_handler_add(ECORE_CON_EVENT_URL_COMPLETE, |
215 | * completion_callback, | 215 | * completion_callback, |
216 | * data); | 216 | * data); |
@@ -218,7 +218,7 @@ | |||
218 | * data_callback, | 218 | * data_callback, |
219 | * data); | 219 | * data); |
220 | * ecore_con_url_get(url_con); | 220 | * ecore_con_url_get(url_con); |
221 | * | 221 | * |
222 | * ecore_main_loop_begin(); | 222 | * ecore_main_loop_begin(); |
223 | * return 0; | 223 | * return 0; |
224 | * } | 224 | * } |
diff --git a/src/lib/ecore_drm/Ecore_Drm.h b/src/lib/ecore_drm/Ecore_Drm.h index 3896b529d0..054995833c 100644 --- a/src/lib/ecore_drm/Ecore_Drm.h +++ b/src/lib/ecore_drm/Ecore_Drm.h | |||
@@ -213,16 +213,16 @@ EAPI extern int ECORE_DRM_EVENT_SEAT_ADD; /**< @since 1.14 */ | |||
213 | * @defgroup Ecore_Drm_Group Ecore_Drm - Drm Integration | 213 | * @defgroup Ecore_Drm_Group Ecore_Drm - Drm Integration |
214 | * @ingroup Ecore | 214 | * @ingroup Ecore |
215 | * @brief Ecore functions for dealing with drm, virtual terminals. | 215 | * @brief Ecore functions for dealing with drm, virtual terminals. |
216 | * | 216 | * |
217 | * Ecore_Drm provides a wrapper and functions for using libdrm. | 217 | * Ecore_Drm provides a wrapper and functions for using libdrm. |
218 | * | 218 | * |
219 | * @li @ref Ecore_Drm_Init_Group | 219 | * @li @ref Ecore_Drm_Init_Group |
220 | * @li @ref Ecore_Drm_Device_Group | 220 | * @li @ref Ecore_Drm_Device_Group |
221 | * @li @ref Ecore_Drm_Tty_Group | 221 | * @li @ref Ecore_Drm_Tty_Group |
222 | * @li @ref Ecore_Drm_Output_Group | 222 | * @li @ref Ecore_Drm_Output_Group |
223 | * @li @ref Ecore_Drm_Input_Group | 223 | * @li @ref Ecore_Drm_Input_Group |
224 | * @li @ref Ecore_Drm_Fb_Group | 224 | * @li @ref Ecore_Drm_Fb_Group |
225 | * | 225 | * |
226 | */ | 226 | */ |
227 | 227 | ||
228 | EAPI int ecore_drm_init(void); | 228 | EAPI int ecore_drm_init(void); |
@@ -232,13 +232,13 @@ EAPI int ecore_drm_shutdown(void); | |||
232 | * @ingroup Ecore_Drm_Device_Group | 232 | * @ingroup Ecore_Drm_Device_Group |
233 | * @brief Finds a drm device in the system. | 233 | * @brief Finds a drm device in the system. |
234 | * | 234 | * |
235 | * @param name The name of the device to find. If NULL, this function will | 235 | * @param name The name of the device to find. If NULL, this function will |
236 | * search for the default drm device. | 236 | * search for the default drm device. |
237 | * @param seat The name of the seat where this device may be found. If NULL, | 237 | * @param seat The name of the seat where this device may be found. If NULL, |
238 | * this function will use a default seat name 'seat0'. | 238 | * this function will use a default seat name 'seat0'. |
239 | * | 239 | * |
240 | * @return An opaque Ecore_Drm_Device structure representing the card. | 240 | * @return An opaque Ecore_Drm_Device structure representing the card. |
241 | * | 241 | * |
242 | */ | 242 | */ |
243 | EAPI Ecore_Drm_Device *ecore_drm_device_find(const char *name, const char *seat); | 243 | EAPI Ecore_Drm_Device *ecore_drm_device_find(const char *name, const char *seat); |
244 | 244 | ||
@@ -247,9 +247,9 @@ EAPI Ecore_Drm_Device *ecore_drm_device_find(const char *name, const char *seat) | |||
247 | * @brief Frees an Ecore_Drm_Device. | 247 | * @brief Frees an Ecore_Drm_Device. |
248 | * | 248 | * |
249 | * This function will cleanup and free any previously allocated Ecore_Drm_Device. | 249 | * This function will cleanup and free any previously allocated Ecore_Drm_Device. |
250 | * | 250 | * |
251 | * @param dev The Ecore_Drm_Device to free | 251 | * @param dev The Ecore_Drm_Device to free |
252 | * | 252 | * |
253 | */ | 253 | */ |
254 | EAPI void ecore_drm_device_free(Ecore_Drm_Device *dev); | 254 | EAPI void ecore_drm_device_free(Ecore_Drm_Device *dev); |
255 | 255 | ||
@@ -258,11 +258,11 @@ EAPI void ecore_drm_device_free(Ecore_Drm_Device *dev); | |||
258 | * @brief Opens an Ecore_Drm_Device. | 258 | * @brief Opens an Ecore_Drm_Device. |
259 | * | 259 | * |
260 | * This function will open an existing Ecore_Drm_Device for use. | 260 | * This function will open an existing Ecore_Drm_Device for use. |
261 | * | 261 | * |
262 | * @param dev The Ecore_Drm_Device to try and open | 262 | * @param dev The Ecore_Drm_Device to try and open |
263 | * | 263 | * |
264 | * @return @c EINA_TRUE on success, @c EINA_FALSE on failure | 264 | * @return @c EINA_TRUE on success, @c EINA_FALSE on failure |
265 | * | 265 | * |
266 | */ | 266 | */ |
267 | EAPI Eina_Bool ecore_drm_device_open(Ecore_Drm_Device *dev); | 267 | EAPI Eina_Bool ecore_drm_device_open(Ecore_Drm_Device *dev); |
268 | 268 | ||
@@ -271,50 +271,50 @@ EAPI Eina_Bool ecore_drm_device_open(Ecore_Drm_Device *dev); | |||
271 | * @brief Closes an Ecore_Drm_Device. | 271 | * @brief Closes an Ecore_Drm_Device. |
272 | * | 272 | * |
273 | * This function will close a previously opened Ecore_Drm_Device | 273 | * This function will close a previously opened Ecore_Drm_Device |
274 | * | 274 | * |
275 | * @param dev The Ecore_Drm_Device to free | 275 | * @param dev The Ecore_Drm_Device to free |
276 | * | 276 | * |
277 | * @return @c EINA_TRUE on success, @c EINA_FALSE on failure | 277 | * @return @c EINA_TRUE on success, @c EINA_FALSE on failure |
278 | * | 278 | * |
279 | */ | 279 | */ |
280 | EAPI Eina_Bool ecore_drm_device_close(Ecore_Drm_Device *dev); | 280 | EAPI Eina_Bool ecore_drm_device_close(Ecore_Drm_Device *dev); |
281 | 281 | ||
282 | /** | 282 | /** |
283 | * @ingroup Ecore_Drm_Device_Group | 283 | * @ingroup Ecore_Drm_Device_Group |
284 | * @brief Gets if a given Ecore_Drm_Device is master. | 284 | * @brief Gets if a given Ecore_Drm_Device is master. |
285 | * | 285 | * |
286 | * This function will check if the given drm device is set to master | 286 | * This function will check if the given drm device is set to master |
287 | * | 287 | * |
288 | * @param dev The Ecore_Drm_Device to check | 288 | * @param dev The Ecore_Drm_Device to check |
289 | * | 289 | * |
290 | * @return @c EINA_TRUE if device is master, @c EINA_FALSE otherwise | 290 | * @return @c EINA_TRUE if device is master, @c EINA_FALSE otherwise |
291 | * | 291 | * |
292 | */ | 292 | */ |
293 | EAPI Eina_Bool ecore_drm_device_master_get(Ecore_Drm_Device *dev); | 293 | EAPI Eina_Bool ecore_drm_device_master_get(Ecore_Drm_Device *dev); |
294 | 294 | ||
295 | /** | 295 | /** |
296 | * @ingroup Ecore_Drm_Device_Group | 296 | * @ingroup Ecore_Drm_Device_Group |
297 | * @brief Sets a given Ecore_Drm_Device to master. | 297 | * @brief Sets a given Ecore_Drm_Device to master. |
298 | * | 298 | * |
299 | * This function will attempt to set a given drm device to be master | 299 | * This function will attempt to set a given drm device to be master |
300 | * | 300 | * |
301 | * @param dev The Ecore_Drm_Device to set | 301 | * @param dev The Ecore_Drm_Device to set |
302 | * | 302 | * |
303 | * @return @c EINA_TRUE on success, @c EINA_FALSE on failure | 303 | * @return @c EINA_TRUE on success, @c EINA_FALSE on failure |
304 | * | 304 | * |
305 | */ | 305 | */ |
306 | EAPI Eina_Bool ecore_drm_device_master_set(Ecore_Drm_Device *dev); | 306 | EAPI Eina_Bool ecore_drm_device_master_set(Ecore_Drm_Device *dev); |
307 | 307 | ||
308 | /** | 308 | /** |
309 | * @ingroup Ecore_Drm_Device_Group | 309 | * @ingroup Ecore_Drm_Device_Group |
310 | * @brief Tells a given Ecore_Drm_Device to stop being master. | 310 | * @brief Tells a given Ecore_Drm_Device to stop being master. |
311 | * | 311 | * |
312 | * This function will attempt to ask a drm device to stop being master | 312 | * This function will attempt to ask a drm device to stop being master |
313 | * | 313 | * |
314 | * @param dev The Ecore_Drm_Device to set | 314 | * @param dev The Ecore_Drm_Device to set |
315 | * | 315 | * |
316 | * @return @c EINA_TRUE on success, @c EINA_FALSE on failure | 316 | * @return @c EINA_TRUE on success, @c EINA_FALSE on failure |
317 | * | 317 | * |
318 | */ | 318 | */ |
319 | EAPI Eina_Bool ecore_drm_device_master_drop(Ecore_Drm_Device *dev); | 319 | EAPI Eina_Bool ecore_drm_device_master_drop(Ecore_Drm_Device *dev); |
320 | 320 | ||
@@ -417,7 +417,7 @@ EAPI void ecore_drm_device_keyboard_cached_keymap_set(struct xkb_keymap *map); | |||
417 | * @ingroup Ecore_Drm_Device_Group | 417 | * @ingroup Ecore_Drm_Device_Group |
418 | * @brief Finds an Ecore_Drm_Output at the given coordinates. | 418 | * @brief Finds an Ecore_Drm_Output at the given coordinates. |
419 | * | 419 | * |
420 | * This function will loop all the existing outputs in Ecore_Drm_Device and | 420 | * This function will loop all the existing outputs in Ecore_Drm_Device and |
421 | * return an output if one exists that encapsulates the given coordinates. | 421 | * return an output if one exists that encapsulates the given coordinates. |
422 | * | 422 | * |
423 | * @param dev The Ecore_Drm_Device to search | 423 | * @param dev The Ecore_Drm_Device to search |
@@ -433,46 +433,46 @@ EAPI Ecore_Drm_Output *ecore_drm_device_output_find(Ecore_Drm_Device *dev, int x | |||
433 | /** | 433 | /** |
434 | * @ingroup Ecore_Drm_Tty_Group | 434 | * @ingroup Ecore_Drm_Tty_Group |
435 | * @brief Opens a tty for use. | 435 | * @brief Opens a tty for use. |
436 | * | 436 | * |
437 | * @param dev The Ecore_Drm_Device that this tty will belong to. | 437 | * @param dev The Ecore_Drm_Device that this tty will belong to. |
438 | * @param name The name of the tty to try and open. | 438 | * @param name The name of the tty to try and open. |
439 | * If NULL, /dev/tty0 will be used. | 439 | * If NULL, /dev/tty0 will be used. |
440 | * | 440 | * |
441 | * @return @c EINA_TRUE on success, @c EINA_FALSE on failure | 441 | * @return @c EINA_TRUE on success, @c EINA_FALSE on failure |
442 | * | 442 | * |
443 | */ | 443 | */ |
444 | EAPI Eina_Bool ecore_drm_tty_open(Ecore_Drm_Device *dev, const char *name); | 444 | EAPI Eina_Bool ecore_drm_tty_open(Ecore_Drm_Device *dev, const char *name); |
445 | 445 | ||
446 | /** | 446 | /** |
447 | * @ingroup Ecore_Drm_Tty_Group | 447 | * @ingroup Ecore_Drm_Tty_Group |
448 | * @brief Closes an already opened tty. | 448 | * @brief Closes an already opened tty. |
449 | * | 449 | * |
450 | * @param dev The Ecore_Drm_Device which owns this tty. | 450 | * @param dev The Ecore_Drm_Device which owns this tty. |
451 | * | 451 | * |
452 | * @return @c EINA_TRUE on success, @c EINA_FALSE on failure | 452 | * @return @c EINA_TRUE on success, @c EINA_FALSE on failure |
453 | * | 453 | * |
454 | */ | 454 | */ |
455 | EAPI Eina_Bool ecore_drm_tty_close(Ecore_Drm_Device *dev); | 455 | EAPI Eina_Bool ecore_drm_tty_close(Ecore_Drm_Device *dev); |
456 | 456 | ||
457 | /** | 457 | /** |
458 | * @ingroup Ecore_Drm_Tty_Group | 458 | * @ingroup Ecore_Drm_Tty_Group |
459 | * @brief Releases a virtual terminal. | 459 | * @brief Releases a virtual terminal. |
460 | * | 460 | * |
461 | * @param dev The Ecore_Drm_Device which owns this tty. | 461 | * @param dev The Ecore_Drm_Device which owns this tty. |
462 | * | 462 | * |
463 | * @return @c EINA_TRUE on success, @c EINA_FALSE on failure | 463 | * @return @c EINA_TRUE on success, @c EINA_FALSE on failure |
464 | * | 464 | * |
465 | */ | 465 | */ |
466 | EAPI Eina_Bool ecore_drm_tty_release(Ecore_Drm_Device *dev); | 466 | EAPI Eina_Bool ecore_drm_tty_release(Ecore_Drm_Device *dev); |
467 | 467 | ||
468 | /** | 468 | /** |
469 | * @ingroup Ecore_Drm_Tty_Group | 469 | * @ingroup Ecore_Drm_Tty_Group |
470 | * @brief Acquires a virtual terminal. | 470 | * @brief Acquires a virtual terminal. |
471 | * | 471 | * |
472 | * @param dev The Ecore_Drm_Device which owns this tty. | 472 | * @param dev The Ecore_Drm_Device which owns this tty. |
473 | * | 473 | * |
474 | * @return @c EINA_TRUE on success, @c EINA_FALSE on failure | 474 | * @return @c EINA_TRUE on success, @c EINA_FALSE on failure |
475 | * | 475 | * |
476 | */ | 476 | */ |
477 | EAPI Eina_Bool ecore_drm_tty_acquire(Ecore_Drm_Device *dev); | 477 | EAPI Eina_Bool ecore_drm_tty_acquire(Ecore_Drm_Device *dev); |
478 | 478 | ||
@@ -481,10 +481,10 @@ EAPI Eina_Bool ecore_drm_tty_acquire(Ecore_Drm_Device *dev); | |||
481 | * @brief Gets the opened virtual terminal file descriptor. | 481 | * @brief Gets the opened virtual terminal file descriptor. |
482 | * | 482 | * |
483 | * @param dev The Ecore_Drm_Device which owns this tty. | 483 | * @param dev The Ecore_Drm_Device which owns this tty. |
484 | * | 484 | * |
485 | * @return The tty fd opened from previous call to ecore_drm_tty_open | 485 | * @return The tty fd opened from previous call to ecore_drm_tty_open |
486 | * | 486 | * |
487 | * | 487 | * |
488 | * @since 1.10 | 488 | * @since 1.10 |
489 | */ | 489 | */ |
490 | EAPI int ecore_drm_tty_get(Ecore_Drm_Device *dev); | 490 | EAPI int ecore_drm_tty_get(Ecore_Drm_Device *dev); |
@@ -496,8 +496,8 @@ EAPI int ecore_drm_tty_get(Ecore_Drm_Device *dev); | |||
496 | * This function will create outputs for Ecore_Drm_Device. | 496 | * This function will create outputs for Ecore_Drm_Device. |
497 | * | 497 | * |
498 | * @param dev The Ecore_Drm_Device device for which outputs | 498 | * @param dev The Ecore_Drm_Device device for which outputs |
499 | * needs to be created | 499 | * needs to be created |
500 | * | 500 | * |
501 | * @return EINA_TRUE on success, EINA_FALSE on failure. | 501 | * @return EINA_TRUE on success, EINA_FALSE on failure. |
502 | * | 502 | * |
503 | */ | 503 | */ |
@@ -510,7 +510,7 @@ EAPI Eina_Bool ecore_drm_outputs_create(Ecore_Drm_Device *dev); | |||
510 | * This function will cleanup and free any previously allocated Ecore_Drm_Output. | 510 | * This function will cleanup and free any previously allocated Ecore_Drm_Output. |
511 | * | 511 | * |
512 | * @param output The Ecore_Drm_Output to free | 512 | * @param output The Ecore_Drm_Output to free |
513 | * | 513 | * |
514 | */ | 514 | */ |
515 | EAPI void ecore_drm_output_free(Ecore_Drm_Output *output); | 515 | EAPI void ecore_drm_output_free(Ecore_Drm_Output *output); |
516 | 516 | ||
@@ -565,7 +565,7 @@ EAPI void ecore_drm_output_repaint(Ecore_Drm_Output *output); | |||
565 | * This function will give the output size of Ecore_Drm_Device. | 565 | * This function will give the output size of Ecore_Drm_Device. |
566 | * | 566 | * |
567 | * @param dev The Ecore_Drm_Device to get output size | 567 | * @param dev The Ecore_Drm_Device to get output size |
568 | * @param output The output id whose information needs to be retrieved | 568 | * @param output The output id whose information needs to be retrieved |
569 | * @param *w The parameter in which output width is stored | 569 | * @param *w The parameter in which output width is stored |
570 | * @param *h The parameter in which output height is stored | 570 | * @param *h The parameter in which output height is stored |
571 | * | 571 | * |
@@ -649,7 +649,7 @@ EAPI void ecore_drm_fb_destroy(Ecore_Drm_Fb *fb); | |||
649 | * @param fb The Ecore_Drm_Fb to mark as dirty | 649 | * @param fb The Ecore_Drm_Fb to mark as dirty |
650 | * @param rects The regions of the Ecore_Drm_Fb which are dirty | 650 | * @param rects The regions of the Ecore_Drm_Fb which are dirty |
651 | * @param count The number of regions | 651 | * @param count The number of regions |
652 | * | 652 | * |
653 | * @since 1.14 | 653 | * @since 1.14 |
654 | */ | 654 | */ |
655 | EAPI void ecore_drm_fb_dirty(Ecore_Drm_Fb *fb, Eina_Rectangle *rects, unsigned int count); | 655 | EAPI void ecore_drm_fb_dirty(Ecore_Drm_Fb *fb, Eina_Rectangle *rects, unsigned int count); |
@@ -793,7 +793,7 @@ EAPI char *ecore_drm_output_name_get(Ecore_Drm_Output *output); | |||
793 | * | 793 | * |
794 | * @param output The Ecore_Drm_Output to set the dpms level on | 794 | * @param output The Ecore_Drm_Output to set the dpms level on |
795 | * @param level The level to set | 795 | * @param level The level to set |
796 | * | 796 | * |
797 | * @since 1.14 | 797 | * @since 1.14 |
798 | */ | 798 | */ |
799 | EAPI void ecore_drm_output_dpms_set(Ecore_Drm_Output *output, int level); | 799 | EAPI void ecore_drm_output_dpms_set(Ecore_Drm_Output *output, int level); |
@@ -809,7 +809,7 @@ EAPI void ecore_drm_output_dpms_set(Ecore_Drm_Output *output, int level); | |||
809 | * @param r The amount to scale the red channel | 809 | * @param r The amount to scale the red channel |
810 | * @param g The amount to scale the green channel | 810 | * @param g The amount to scale the green channel |
811 | * @param b The amount to scale the blue channel | 811 | * @param b The amount to scale the blue channel |
812 | * | 812 | * |
813 | * @since 1.14 | 813 | * @since 1.14 |
814 | */ | 814 | */ |
815 | EAPI void ecore_drm_output_gamma_set(Ecore_Drm_Output *output, uint16_t size, uint16_t *r, uint16_t *g, uint16_t *b); | 815 | EAPI void ecore_drm_output_gamma_set(Ecore_Drm_Output *output, uint16_t size, uint16_t *r, uint16_t *g, uint16_t *b); |
@@ -966,7 +966,7 @@ EAPI void ecore_drm_output_crtc_size_get(Ecore_Drm_Output *output, int *width, i | |||
966 | * @ingroup Ecore_Drm_Device_Group | 966 | * @ingroup Ecore_Drm_Device_Group |
967 | * @brief Finds an Ecore_Drm_Output which has the given name. | 967 | * @brief Finds an Ecore_Drm_Output which has the given name. |
968 | * | 968 | * |
969 | * This function will loop all the existing outputs in Ecore_Drm_Device and | 969 | * This function will loop all the existing outputs in Ecore_Drm_Device and |
970 | * return an output if one exists that matches the given name. | 970 | * return an output if one exists that matches the given name. |
971 | * | 971 | * |
972 | * @param dev The Ecore_Drm_Device to search | 972 | * @param dev The Ecore_Drm_Device to search |
diff --git a/src/lib/ecore_drm/ecore_drm.c b/src/lib/ecore_drm/ecore_drm.c index fb8c593b09..75c4c76b38 100644 --- a/src/lib/ecore_drm/ecore_drm.c +++ b/src/lib/ecore_drm/ecore_drm.c | |||
@@ -50,25 +50,25 @@ _ecore_drm_event_activate_send(Eina_Bool active) | |||
50 | if (!(e = calloc(1, sizeof(Ecore_Drm_Event_Activate)))) return; | 50 | if (!(e = calloc(1, sizeof(Ecore_Drm_Event_Activate)))) return; |
51 | 51 | ||
52 | e->active = active; | 52 | e->active = active; |
53 | ecore_event_add(ECORE_DRM_EVENT_ACTIVATE, e, | 53 | ecore_event_add(ECORE_DRM_EVENT_ACTIVATE, e, |
54 | _ecore_drm_event_activate_free, NULL); | 54 | _ecore_drm_event_activate_free, NULL); |
55 | } | 55 | } |
56 | 56 | ||
57 | /** | 57 | /** |
58 | * @defgroup Ecore_Drm_Init_Group Drm Library Init and Shutdown Functions | 58 | * @defgroup Ecore_Drm_Init_Group Drm Library Init and Shutdown Functions |
59 | * | 59 | * |
60 | * Functions that start and shutdown the Ecore_Drm Library. | 60 | * Functions that start and shutdown the Ecore_Drm Library. |
61 | */ | 61 | */ |
62 | 62 | ||
63 | /** | 63 | /** |
64 | * Initialize the Ecore_Drm library | 64 | * Initialize the Ecore_Drm library |
65 | * | 65 | * |
66 | * @return The number of times the library has been initialized without | 66 | * @return The number of times the library has been initialized without |
67 | * being shut down. 0 is returned if an error occurs. | 67 | * being shut down. 0 is returned if an error occurs. |
68 | * | 68 | * |
69 | * @ingroup Ecore_Drm_Init_Group | 69 | * @ingroup Ecore_Drm_Init_Group |
70 | */ | 70 | */ |
71 | EAPI int | 71 | EAPI int |
72 | ecore_drm_init(void) | 72 | ecore_drm_init(void) |
73 | { | 73 | { |
74 | /* if we have already initialized, return the count */ | 74 | /* if we have already initialized, return the count */ |
@@ -78,7 +78,7 @@ ecore_drm_init(void) | |||
78 | if (!eina_init()) return --_ecore_drm_init_count; | 78 | if (!eina_init()) return --_ecore_drm_init_count; |
79 | 79 | ||
80 | /* try to init ecore */ | 80 | /* try to init ecore */ |
81 | if (!ecore_init()) | 81 | if (!ecore_init()) |
82 | { | 82 | { |
83 | eina_shutdown(); | 83 | eina_shutdown(); |
84 | return --_ecore_drm_init_count; | 84 | return --_ecore_drm_init_count; |
@@ -96,7 +96,7 @@ ecore_drm_init(void) | |||
96 | /* eina_log_level_set(EINA_LOG_LEVEL_DBG); */ | 96 | /* eina_log_level_set(EINA_LOG_LEVEL_DBG); */ |
97 | 97 | ||
98 | /* try to create logging domain */ | 98 | /* try to create logging domain */ |
99 | _ecore_drm_log_dom = | 99 | _ecore_drm_log_dom = |
100 | eina_log_domain_register("ecore_drm", ECORE_DRM_DEFAULT_LOG_COLOR); | 100 | eina_log_domain_register("ecore_drm", ECORE_DRM_DEFAULT_LOG_COLOR); |
101 | if (!_ecore_drm_log_dom) | 101 | if (!_ecore_drm_log_dom) |
102 | { | 102 | { |
diff --git a/src/lib/ecore_drm/ecore_drm_dbus.c b/src/lib/ecore_drm/ecore_drm_dbus.c index 5834133179..4d60428879 100644 --- a/src/lib/ecore_drm/ecore_drm_dbus.c +++ b/src/lib/ecore_drm/ecore_drm_dbus.c | |||
@@ -33,7 +33,7 @@ static int _dbus_init_count = 0; | |||
33 | static Eldbus_Connection *dconn; | 33 | static Eldbus_Connection *dconn; |
34 | static Eldbus_Object *dobj; | 34 | static Eldbus_Object *dobj; |
35 | 35 | ||
36 | static void | 36 | static void |
37 | _ecore_drm_dbus_device_pause_done(uint32_t major, uint32_t minor) | 37 | _ecore_drm_dbus_device_pause_done(uint32_t major, uint32_t minor) |
38 | { | 38 | { |
39 | Eldbus_Proxy *proxy; | 39 | Eldbus_Proxy *proxy; |
@@ -56,7 +56,7 @@ _ecore_drm_dbus_device_pause_done(uint32_t major, uint32_t minor) | |||
56 | eldbus_proxy_send(proxy, msg, NULL, NULL, -1); | 56 | eldbus_proxy_send(proxy, msg, NULL, NULL, -1); |
57 | } | 57 | } |
58 | 58 | ||
59 | static void | 59 | static void |
60 | _cb_session_removed(void *data, const Eldbus_Message *msg) | 60 | _cb_session_removed(void *data, const Eldbus_Message *msg) |
61 | { | 61 | { |
62 | Ecore_Drm_Device *dev; | 62 | Ecore_Drm_Device *dev; |
@@ -81,7 +81,7 @@ _cb_session_removed(void *data, const Eldbus_Message *msg) | |||
81 | } | 81 | } |
82 | } | 82 | } |
83 | 83 | ||
84 | static void | 84 | static void |
85 | _cb_device_paused(void *ctxt EINA_UNUSED, const Eldbus_Message *msg) | 85 | _cb_device_paused(void *ctxt EINA_UNUSED, const Eldbus_Message *msg) |
86 | { | 86 | { |
87 | const char *errname, *errmsg; | 87 | const char *errname, *errmsg; |
@@ -104,7 +104,7 @@ _cb_device_paused(void *ctxt EINA_UNUSED, const Eldbus_Message *msg) | |||
104 | } | 104 | } |
105 | } | 105 | } |
106 | 106 | ||
107 | static void | 107 | static void |
108 | _cb_device_resumed(void *ctxt EINA_UNUSED, const Eldbus_Message *msg) | 108 | _cb_device_resumed(void *ctxt EINA_UNUSED, const Eldbus_Message *msg) |
109 | { | 109 | { |
110 | const char *errname, *errmsg; | 110 | const char *errname, *errmsg; |
@@ -133,7 +133,7 @@ _property_response_set(void *data EINA_UNUSED, const Eldbus_Message *msg, Eldbus | |||
133 | ERR("Eldbus Message error %s - %s\n\n", errname, errmsg); | 133 | ERR("Eldbus Message error %s - %s\n\n", errname, errmsg); |
134 | } | 134 | } |
135 | 135 | ||
136 | static void | 136 | static void |
137 | _cb_properties_changed(void *data EINA_UNUSED, Eldbus_Proxy *proxy EINA_UNUSED, void *event) | 137 | _cb_properties_changed(void *data EINA_UNUSED, Eldbus_Proxy *proxy EINA_UNUSED, void *event) |
138 | { | 138 | { |
139 | Eldbus_Proxy_Event_Property_Changed *ev; | 139 | Eldbus_Proxy_Event_Property_Changed *ev; |
@@ -142,14 +142,14 @@ _cb_properties_changed(void *data EINA_UNUSED, Eldbus_Proxy *proxy EINA_UNUSED, | |||
142 | 142 | ||
143 | if (!strcmp(ev->name, "Active")) | 143 | if (!strcmp(ev->name, "Active")) |
144 | { | 144 | { |
145 | eldbus_proxy_property_set(proxy, "Active", "b", (void *)EINA_TRUE, | 145 | eldbus_proxy_property_set(proxy, "Active", "b", (void *)EINA_TRUE, |
146 | _property_response_set, NULL); | 146 | _property_response_set, NULL); |
147 | eldbus_proxy_property_set(proxy, "State", "s", &"active", | 147 | eldbus_proxy_property_set(proxy, "State", "s", &"active", |
148 | _property_response_set, NULL); | 148 | _property_response_set, NULL); |
149 | } | 149 | } |
150 | } | 150 | } |
151 | 151 | ||
152 | Eina_Bool | 152 | Eina_Bool |
153 | _ecore_drm_dbus_session_take(void) | 153 | _ecore_drm_dbus_session_take(void) |
154 | { | 154 | { |
155 | Eldbus_Proxy *proxy; | 155 | Eldbus_Proxy *proxy; |
@@ -184,7 +184,7 @@ _ecore_drm_dbus_session_take(void) | |||
184 | return EINA_TRUE; | 184 | return EINA_TRUE; |
185 | } | 185 | } |
186 | 186 | ||
187 | Eina_Bool | 187 | Eina_Bool |
188 | _ecore_drm_dbus_session_release(void) | 188 | _ecore_drm_dbus_session_release(void) |
189 | { | 189 | { |
190 | Eldbus_Proxy *proxy; | 190 | Eldbus_Proxy *proxy; |
@@ -217,7 +217,7 @@ _ecore_drm_dbus_session_release(void) | |||
217 | return EINA_TRUE; | 217 | return EINA_TRUE; |
218 | } | 218 | } |
219 | 219 | ||
220 | void | 220 | void |
221 | _ecore_drm_dbus_device_release(uint32_t major, uint32_t minor) | 221 | _ecore_drm_dbus_device_release(uint32_t major, uint32_t minor) |
222 | { | 222 | { |
223 | Eldbus_Proxy *proxy; | 223 | Eldbus_Proxy *proxy; |
@@ -264,7 +264,7 @@ eldbus_err: | |||
264 | if (callback) callback(data, fd, b); | 264 | if (callback) callback(data, fd, b); |
265 | } | 265 | } |
266 | 266 | ||
267 | int | 267 | int |
268 | _ecore_drm_dbus_device_take(uint32_t major, uint32_t minor, Ecore_Drm_Open_Cb callback, void *data) | 268 | _ecore_drm_dbus_device_take(uint32_t major, uint32_t minor, Ecore_Drm_Open_Cb callback, void *data) |
269 | { | 269 | { |
270 | Eldbus_Proxy *proxy; | 270 | Eldbus_Proxy *proxy; |
@@ -338,7 +338,7 @@ _ecore_drm_dbus_device_take_no_pending(uint32_t major, uint32_t minor, Eina_Bool | |||
338 | return fd; | 338 | return fd; |
339 | } | 339 | } |
340 | 340 | ||
341 | int | 341 | int |
342 | _ecore_drm_dbus_init(Ecore_Drm_Device *dev) | 342 | _ecore_drm_dbus_init(Ecore_Drm_Device *dev) |
343 | { | 343 | { |
344 | Eldbus_Proxy *proxy; | 344 | Eldbus_Proxy *proxy; |
@@ -385,7 +385,7 @@ _ecore_drm_dbus_init(Ecore_Drm_Device *dev) | |||
385 | goto proxy_err; | 385 | goto proxy_err; |
386 | } | 386 | } |
387 | 387 | ||
388 | eldbus_proxy_signal_handler_add(proxy, "SessionRemoved", | 388 | eldbus_proxy_signal_handler_add(proxy, "SessionRemoved", |
389 | _cb_session_removed, dev); | 389 | _cb_session_removed, dev); |
390 | 390 | ||
391 | /* try to get the Session proxy */ | 391 | /* try to get the Session proxy */ |
@@ -395,9 +395,9 @@ _ecore_drm_dbus_init(Ecore_Drm_Device *dev) | |||
395 | goto proxy_err; | 395 | goto proxy_err; |
396 | } | 396 | } |
397 | 397 | ||
398 | eldbus_proxy_signal_handler_add(proxy, "PauseDevice", | 398 | eldbus_proxy_signal_handler_add(proxy, "PauseDevice", |
399 | _cb_device_paused, NULL); | 399 | _cb_device_paused, NULL); |
400 | eldbus_proxy_signal_handler_add(proxy, "ResumeDevice", | 400 | eldbus_proxy_signal_handler_add(proxy, "ResumeDevice", |
401 | _cb_device_resumed, NULL); | 401 | _cb_device_resumed, NULL); |
402 | 402 | ||
403 | /* try to get the Properties proxy */ | 403 | /* try to get the Properties proxy */ |
@@ -408,7 +408,7 @@ _ecore_drm_dbus_init(Ecore_Drm_Device *dev) | |||
408 | } | 408 | } |
409 | 409 | ||
410 | eldbus_proxy_properties_monitor(proxy, EINA_TRUE); | 410 | eldbus_proxy_properties_monitor(proxy, EINA_TRUE); |
411 | eldbus_proxy_event_callback_add(proxy, ELDBUS_PROXY_EVENT_PROPERTY_CHANGED, | 411 | eldbus_proxy_event_callback_add(proxy, ELDBUS_PROXY_EVENT_PROPERTY_CHANGED, |
412 | _cb_properties_changed, NULL); | 412 | _cb_properties_changed, NULL); |
413 | 413 | ||
414 | return _dbus_init_count; | 414 | return _dbus_init_count; |
@@ -424,7 +424,7 @@ conn_err: | |||
424 | return --_dbus_init_count; | 424 | return --_dbus_init_count; |
425 | } | 425 | } |
426 | 426 | ||
427 | int | 427 | int |
428 | _ecore_drm_dbus_shutdown(void) | 428 | _ecore_drm_dbus_shutdown(void) |
429 | { | 429 | { |
430 | if (--_dbus_init_count != 0) return _dbus_init_count; | 430 | if (--_dbus_init_count != 0) return _dbus_init_count; |
diff --git a/src/lib/ecore_drm/ecore_drm_device.c b/src/lib/ecore_drm/ecore_drm_device.c index d2d6f6f03f..c5865ce1e8 100644 --- a/src/lib/ecore_drm/ecore_drm_device.c +++ b/src/lib/ecore_drm/ecore_drm_device.c | |||
@@ -193,8 +193,8 @@ _ecore_drm_device_cached_keymap_update(struct xkb_keymap *map) | |||
193 | 193 | ||
194 | /** | 194 | /** |
195 | * @defgroup Ecore_Drm_Device_Group Device manipulation functions | 195 | * @defgroup Ecore_Drm_Device_Group Device manipulation functions |
196 | * | 196 | * |
197 | * Functions that deal with finding, opening, closing, and otherwise using | 197 | * Functions that deal with finding, opening, closing, and otherwise using |
198 | * the DRM device itself. | 198 | * the DRM device itself. |
199 | */ | 199 | */ |
200 | 200 | ||
@@ -231,7 +231,7 @@ ecore_drm_device_find(const char *name, const char *seat) | |||
231 | if (!(devseat = eeze_udev_syspath_get_property(device, "ID_SEAT"))) | 231 | if (!(devseat = eeze_udev_syspath_get_property(device, "ID_SEAT"))) |
232 | devseat = eina_stringshare_add("seat0"); | 232 | devseat = eina_stringshare_add("seat0"); |
233 | 233 | ||
234 | if ((seat) && (strcmp(seat, devseat))) | 234 | if ((seat) && (strcmp(seat, devseat))) |
235 | goto cont; | 235 | goto cont; |
236 | else if (strcmp(devseat, "seat0")) | 236 | else if (strcmp(devseat, "seat0")) |
237 | goto cont; | 237 | goto cont; |
@@ -239,7 +239,7 @@ ecore_drm_device_find(const char *name, const char *seat) | |||
239 | devparent = eeze_udev_syspath_get_parent_filtered(device, "pci", NULL); | 239 | devparent = eeze_udev_syspath_get_parent_filtered(device, "pci", NULL); |
240 | if (!devparent) | 240 | if (!devparent) |
241 | { | 241 | { |
242 | devparent = | 242 | devparent = |
243 | eeze_udev_syspath_get_parent_filtered(device, "platform", NULL); | 243 | eeze_udev_syspath_get_parent_filtered(device, "platform", NULL); |
244 | platform = EINA_TRUE; | 244 | platform = EINA_TRUE; |
245 | } | 245 | } |
@@ -297,7 +297,7 @@ out: | |||
297 | return dev; | 297 | return dev; |
298 | } | 298 | } |
299 | 299 | ||
300 | EAPI void | 300 | EAPI void |
301 | ecore_drm_device_free(Ecore_Drm_Device *dev) | 301 | ecore_drm_device_free(Ecore_Drm_Device *dev) |
302 | { | 302 | { |
303 | unsigned int i = 0; | 303 | unsigned int i = 0; |
@@ -334,7 +334,7 @@ ecore_drm_device_free(Ecore_Drm_Device *dev) | |||
334 | free(dev); | 334 | free(dev); |
335 | } | 335 | } |
336 | 336 | ||
337 | EAPI Eina_Bool | 337 | EAPI Eina_Bool |
338 | ecore_drm_device_open(Ecore_Drm_Device *dev) | 338 | ecore_drm_device_open(Ecore_Drm_Device *dev) |
339 | { | 339 | { |
340 | uint64_t caps; | 340 | uint64_t caps; |
@@ -454,7 +454,7 @@ ecore_drm_devices_get(void) | |||
454 | return drm_devices; | 454 | return drm_devices; |
455 | } | 455 | } |
456 | 456 | ||
457 | EAPI Eina_Bool | 457 | EAPI Eina_Bool |
458 | ecore_drm_device_master_get(Ecore_Drm_Device *dev) | 458 | ecore_drm_device_master_get(Ecore_Drm_Device *dev) |
459 | { | 459 | { |
460 | drm_magic_t mag; | 460 | drm_magic_t mag; |
@@ -463,14 +463,14 @@ ecore_drm_device_master_get(Ecore_Drm_Device *dev) | |||
463 | if ((!dev) || (dev->drm.fd < 0)) return EINA_FALSE; | 463 | if ((!dev) || (dev->drm.fd < 0)) return EINA_FALSE; |
464 | 464 | ||
465 | /* get if we are master or not */ | 465 | /* get if we are master or not */ |
466 | if ((drmGetMagic(dev->drm.fd, &mag) == 0) && | 466 | if ((drmGetMagic(dev->drm.fd, &mag) == 0) && |
467 | (drmAuthMagic(dev->drm.fd, mag) == 0)) | 467 | (drmAuthMagic(dev->drm.fd, mag) == 0)) |
468 | return EINA_TRUE; | 468 | return EINA_TRUE; |
469 | 469 | ||
470 | return EINA_FALSE; | 470 | return EINA_FALSE; |
471 | } | 471 | } |
472 | 472 | ||
473 | EAPI Eina_Bool | 473 | EAPI Eina_Bool |
474 | ecore_drm_device_master_set(Ecore_Drm_Device *dev) | 474 | ecore_drm_device_master_set(Ecore_Drm_Device *dev) |
475 | { | 475 | { |
476 | /* check for valid device */ | 476 | /* check for valid device */ |
@@ -483,7 +483,7 @@ ecore_drm_device_master_set(Ecore_Drm_Device *dev) | |||
483 | return EINA_TRUE; | 483 | return EINA_TRUE; |
484 | } | 484 | } |
485 | 485 | ||
486 | EAPI Eina_Bool | 486 | EAPI Eina_Bool |
487 | ecore_drm_device_master_drop(Ecore_Drm_Device *dev) | 487 | ecore_drm_device_master_drop(Ecore_Drm_Device *dev) |
488 | { | 488 | { |
489 | /* check for valid device */ | 489 | /* check for valid device */ |
@@ -496,14 +496,14 @@ ecore_drm_device_master_drop(Ecore_Drm_Device *dev) | |||
496 | return EINA_TRUE; | 496 | return EINA_TRUE; |
497 | } | 497 | } |
498 | 498 | ||
499 | EAPI int | 499 | EAPI int |
500 | ecore_drm_device_fd_get(Ecore_Drm_Device *dev) | 500 | ecore_drm_device_fd_get(Ecore_Drm_Device *dev) |
501 | { | 501 | { |
502 | EINA_SAFETY_ON_NULL_RETURN_VAL(dev, -1); | 502 | EINA_SAFETY_ON_NULL_RETURN_VAL(dev, -1); |
503 | return dev->drm.fd; | 503 | return dev->drm.fd; |
504 | } | 504 | } |
505 | 505 | ||
506 | EAPI void | 506 | EAPI void |
507 | ecore_drm_device_window_set(Ecore_Drm_Device *dev, unsigned int window) | 507 | ecore_drm_device_window_set(Ecore_Drm_Device *dev, unsigned int window) |
508 | { | 508 | { |
509 | /* check for valid device */ | 509 | /* check for valid device */ |
diff --git a/src/lib/ecore_drm/ecore_drm_evdev.c b/src/lib/ecore_drm/ecore_drm_evdev.c index c907769be9..f93f78ca0e 100644 --- a/src/lib/ecore_drm/ecore_drm_evdev.c +++ b/src/lib/ecore_drm/ecore_drm_evdev.c | |||
@@ -32,7 +32,7 @@ | |||
32 | 32 | ||
33 | static void _device_modifiers_update(Ecore_Drm_Evdev *edev); | 33 | static void _device_modifiers_update(Ecore_Drm_Evdev *edev); |
34 | 34 | ||
35 | static void | 35 | static void |
36 | _device_calibration_set(Ecore_Drm_Evdev *edev) | 36 | _device_calibration_set(Ecore_Drm_Evdev *edev) |
37 | { | 37 | { |
38 | const char *sysname; | 38 | const char *sysname; |
@@ -42,7 +42,7 @@ _device_calibration_set(Ecore_Drm_Evdev *edev) | |||
42 | const char *vals; | 42 | const char *vals; |
43 | enum libinput_config_status status; | 43 | enum libinput_config_status status; |
44 | 44 | ||
45 | if ((!libinput_device_config_calibration_has_matrix(edev->device)) || | 45 | if ((!libinput_device_config_calibration_has_matrix(edev->device)) || |
46 | (libinput_device_config_calibration_get_default_matrix(edev->device, cal) != 0)) | 46 | (libinput_device_config_calibration_get_default_matrix(edev->device, cal) != 0)) |
47 | return; | 47 | return; |
48 | 48 | ||
@@ -54,7 +54,7 @@ _device_calibration_set(Ecore_Drm_Evdev *edev) | |||
54 | EINA_LIST_FREE(devices, device) | 54 | EINA_LIST_FREE(devices, device) |
55 | { | 55 | { |
56 | vals = eeze_udev_syspath_get_property(device, "WL_CALIBRATION"); | 56 | vals = eeze_udev_syspath_get_property(device, "WL_CALIBRATION"); |
57 | if ((!vals) || | 57 | if ((!vals) || |
58 | (sscanf(vals, "%f %f %f %f %f %f", | 58 | (sscanf(vals, "%f %f %f %f %f %f", |
59 | &cal[0], &cal[1], &cal[2], &cal[3], &cal[4], &cal[5]) != 6)) | 59 | &cal[0], &cal[1], &cal[2], &cal[3], &cal[4], &cal[5]) != 6)) |
60 | goto cont; | 60 | goto cont; |
@@ -62,7 +62,7 @@ _device_calibration_set(Ecore_Drm_Evdev *edev) | |||
62 | cal[2] /= edev->output->current_mode->width; | 62 | cal[2] /= edev->output->current_mode->width; |
63 | cal[5] /= edev->output->current_mode->height; | 63 | cal[5] /= edev->output->current_mode->height; |
64 | 64 | ||
65 | status = | 65 | status = |
66 | libinput_device_config_calibration_set_matrix(edev->device, cal); | 66 | libinput_device_config_calibration_set_matrix(edev->device, cal); |
67 | 67 | ||
68 | if (status != LIBINPUT_CONFIG_STATUS_SUCCESS) | 68 | if (status != LIBINPUT_CONFIG_STATUS_SUCCESS) |
@@ -74,7 +74,7 @@ cont: | |||
74 | } | 74 | } |
75 | } | 75 | } |
76 | 76 | ||
77 | static void | 77 | static void |
78 | _device_output_set(Ecore_Drm_Evdev *edev) | 78 | _device_output_set(Ecore_Drm_Evdev *edev) |
79 | { | 79 | { |
80 | Ecore_Drm_Input *input; | 80 | Ecore_Drm_Input *input; |
@@ -102,7 +102,7 @@ _device_output_set(Ecore_Drm_Evdev *edev) | |||
102 | 102 | ||
103 | edev->output = output; | 103 | edev->output = output; |
104 | 104 | ||
105 | if (libinput_device_has_capability(edev->device, | 105 | if (libinput_device_has_capability(edev->device, |
106 | LIBINPUT_DEVICE_CAP_POINTER)) | 106 | LIBINPUT_DEVICE_CAP_POINTER)) |
107 | { | 107 | { |
108 | edev->seat->ptr.ix = edev->seat->ptr.dx = edev->output->current_mode->width / 2; | 108 | edev->seat->ptr.ix = edev->seat->ptr.dx = edev->output->current_mode->width / 2; |
@@ -112,7 +112,7 @@ _device_output_set(Ecore_Drm_Evdev *edev) | |||
112 | } | 112 | } |
113 | } | 113 | } |
114 | 114 | ||
115 | static void | 115 | static void |
116 | _device_configure(Ecore_Drm_Evdev *edev) | 116 | _device_configure(Ecore_Drm_Evdev *edev) |
117 | { | 117 | { |
118 | if (libinput_device_config_tap_get_finger_count(edev->device) > 0) | 118 | if (libinput_device_config_tap_get_finger_count(edev->device) > 0) |
@@ -123,7 +123,7 @@ _device_configure(Ecore_Drm_Evdev *edev) | |||
123 | libinput_device_config_tap_set_enabled(edev->device, tap); | 123 | libinput_device_config_tap_set_enabled(edev->device, tap); |
124 | } | 124 | } |
125 | 125 | ||
126 | ecore_drm_outputs_geometry_get(edev->seat->input->dev, | 126 | ecore_drm_outputs_geometry_get(edev->seat->input->dev, |
127 | &edev->mouse.minx, &edev->mouse.miny, | 127 | &edev->mouse.minx, &edev->mouse.miny, |
128 | &edev->mouse.maxw, &edev->mouse.maxh); | 128 | &edev->mouse.maxw, &edev->mouse.maxh); |
129 | 129 | ||
@@ -131,7 +131,7 @@ _device_configure(Ecore_Drm_Evdev *edev) | |||
131 | _device_calibration_set(edev); | 131 | _device_calibration_set(edev); |
132 | } | 132 | } |
133 | 133 | ||
134 | static void | 134 | static void |
135 | _device_keyboard_setup(Ecore_Drm_Evdev *edev) | 135 | _device_keyboard_setup(Ecore_Drm_Evdev *edev) |
136 | { | 136 | { |
137 | Ecore_Drm_Input *input; | 137 | Ecore_Drm_Input *input; |
@@ -155,25 +155,25 @@ _device_keyboard_setup(Ecore_Drm_Evdev *edev) | |||
155 | return; | 155 | return; |
156 | } | 156 | } |
157 | 157 | ||
158 | edev->xkb.ctrl_mask = | 158 | edev->xkb.ctrl_mask = |
159 | 1 << xkb_map_mod_get_index(edev->xkb.keymap, XKB_MOD_NAME_CTRL); | 159 | 1 << xkb_map_mod_get_index(edev->xkb.keymap, XKB_MOD_NAME_CTRL); |
160 | edev->xkb.alt_mask = | 160 | edev->xkb.alt_mask = |
161 | 1 << xkb_map_mod_get_index(edev->xkb.keymap, XKB_MOD_NAME_ALT); | 161 | 1 << xkb_map_mod_get_index(edev->xkb.keymap, XKB_MOD_NAME_ALT); |
162 | edev->xkb.shift_mask = | 162 | edev->xkb.shift_mask = |
163 | 1 << xkb_map_mod_get_index(edev->xkb.keymap, XKB_MOD_NAME_SHIFT); | 163 | 1 << xkb_map_mod_get_index(edev->xkb.keymap, XKB_MOD_NAME_SHIFT); |
164 | edev->xkb.win_mask = | 164 | edev->xkb.win_mask = |
165 | 1 << xkb_map_mod_get_index(edev->xkb.keymap, XKB_MOD_NAME_LOGO); | 165 | 1 << xkb_map_mod_get_index(edev->xkb.keymap, XKB_MOD_NAME_LOGO); |
166 | edev->xkb.scroll_mask = | 166 | edev->xkb.scroll_mask = |
167 | 1 << xkb_map_mod_get_index(edev->xkb.keymap, XKB_LED_NAME_SCROLL); | 167 | 1 << xkb_map_mod_get_index(edev->xkb.keymap, XKB_LED_NAME_SCROLL); |
168 | edev->xkb.num_mask = | 168 | edev->xkb.num_mask = |
169 | 1 << xkb_map_mod_get_index(edev->xkb.keymap, XKB_LED_NAME_NUM); | 169 | 1 << xkb_map_mod_get_index(edev->xkb.keymap, XKB_LED_NAME_NUM); |
170 | edev->xkb.caps_mask = | 170 | edev->xkb.caps_mask = |
171 | 1 << xkb_map_mod_get_index(edev->xkb.keymap, XKB_MOD_NAME_CAPS); | 171 | 1 << xkb_map_mod_get_index(edev->xkb.keymap, XKB_MOD_NAME_CAPS); |
172 | edev->xkb.altgr_mask = | 172 | edev->xkb.altgr_mask = |
173 | 1 << xkb_map_mod_get_index(edev->xkb.keymap, "ISO_Level3_Shift"); | 173 | 1 << xkb_map_mod_get_index(edev->xkb.keymap, "ISO_Level3_Shift"); |
174 | } | 174 | } |
175 | 175 | ||
176 | static int | 176 | static int |
177 | _device_keysym_translate(xkb_keysym_t keysym, unsigned int modifiers, char *buffer, int bytes) | 177 | _device_keysym_translate(xkb_keysym_t keysym, unsigned int modifiers, char *buffer, int bytes) |
178 | { | 178 | { |
179 | unsigned long hbytes = 0; | 179 | unsigned long hbytes = 0; |
@@ -222,13 +222,13 @@ _device_modifiers_update_device(Ecore_Drm_Evdev *edev, Ecore_Drm_Evdev *from) | |||
222 | { | 222 | { |
223 | xkb_mod_mask_t mask; | 223 | xkb_mod_mask_t mask; |
224 | 224 | ||
225 | edev->xkb.depressed = | 225 | edev->xkb.depressed = |
226 | xkb_state_serialize_mods(from->xkb.state, XKB_STATE_DEPRESSED); | 226 | xkb_state_serialize_mods(from->xkb.state, XKB_STATE_DEPRESSED); |
227 | edev->xkb.latched = | 227 | edev->xkb.latched = |
228 | xkb_state_serialize_mods(from->xkb.state, XKB_STATE_LATCHED); | 228 | xkb_state_serialize_mods(from->xkb.state, XKB_STATE_LATCHED); |
229 | edev->xkb.locked = | 229 | edev->xkb.locked = |
230 | xkb_state_serialize_mods(from->xkb.state, XKB_STATE_LOCKED); | 230 | xkb_state_serialize_mods(from->xkb.state, XKB_STATE_LOCKED); |
231 | edev->xkb.group = | 231 | edev->xkb.group = |
232 | xkb_state_serialize_mods(from->xkb.state, XKB_STATE_EFFECTIVE); | 232 | xkb_state_serialize_mods(from->xkb.state, XKB_STATE_EFFECTIVE); |
233 | 233 | ||
234 | mask = (edev->xkb.depressed | edev->xkb.latched); | 234 | mask = (edev->xkb.depressed | edev->xkb.latched); |
@@ -251,7 +251,7 @@ _device_modifiers_update_device(Ecore_Drm_Evdev *edev, Ecore_Drm_Evdev *from) | |||
251 | edev->xkb.modifiers |= ECORE_EVENT_MODIFIER_ALTGR; | 251 | edev->xkb.modifiers |= ECORE_EVENT_MODIFIER_ALTGR; |
252 | } | 252 | } |
253 | 253 | ||
254 | static void | 254 | static void |
255 | _device_modifiers_update(Ecore_Drm_Evdev *edev) | 255 | _device_modifiers_update(Ecore_Drm_Evdev *edev) |
256 | { | 256 | { |
257 | edev->xkb.modifiers = 0; | 257 | edev->xkb.modifiers = 0; |
@@ -322,7 +322,7 @@ _device_handle_key(struct libinput_device *device, struct libinput_event_keyboar | |||
322 | ((state == LIBINPUT_KEY_STATE_RELEASED) && (key_count != 0))) | 322 | ((state == LIBINPUT_KEY_STATE_RELEASED) && (key_count != 0))) |
323 | return; | 323 | return; |
324 | 324 | ||
325 | xkb_state_update_key(edev->xkb.state, code, | 325 | xkb_state_update_key(edev->xkb.state, code, |
326 | (state ? XKB_KEY_DOWN : XKB_KEY_UP)); | 326 | (state ? XKB_KEY_DOWN : XKB_KEY_UP)); |
327 | 327 | ||
328 | /* get the keysym for this code */ | 328 | /* get the keysym for this code */ |
@@ -340,8 +340,8 @@ _device_handle_key(struct libinput_device *device, struct libinput_event_keyboar | |||
340 | snprintf(keyname, sizeof(keyname), "Keycode-%u", code); | 340 | snprintf(keyname, sizeof(keyname), "Keycode-%u", code); |
341 | 341 | ||
342 | /* if shift is active, we need to transform the key to lower */ | 342 | /* if shift is active, we need to transform the key to lower */ |
343 | if (xkb_state_mod_index_is_active(edev->xkb.state, | 343 | if (xkb_state_mod_index_is_active(edev->xkb.state, |
344 | xkb_map_mod_get_index(edev->xkb.keymap, | 344 | xkb_map_mod_get_index(edev->xkb.keymap, |
345 | XKB_MOD_NAME_SHIFT), | 345 | XKB_MOD_NAME_SHIFT), |
346 | XKB_STATE_MODS_EFFECTIVE)) | 346 | XKB_STATE_MODS_EFFECTIVE)) |
347 | { | 347 | { |
@@ -350,7 +350,7 @@ _device_handle_key(struct libinput_device *device, struct libinput_event_keyboar | |||
350 | } | 350 | } |
351 | 351 | ||
352 | memset(compose_buffer, 0, sizeof(compose_buffer)); | 352 | memset(compose_buffer, 0, sizeof(compose_buffer)); |
353 | if (_device_keysym_translate(sym, edev->xkb.modifiers, | 353 | if (_device_keysym_translate(sym, edev->xkb.modifiers, |
354 | compose_buffer, sizeof(compose_buffer))) | 354 | compose_buffer, sizeof(compose_buffer))) |
355 | { | 355 | { |
356 | compose = eina_str_convert("ISO8859-1", "UTF-8", compose_buffer); | 356 | compose = eina_str_convert("ISO8859-1", "UTF-8", compose_buffer); |
@@ -398,7 +398,7 @@ err: | |||
398 | if (tmp) free(tmp); | 398 | if (tmp) free(tmp); |
399 | } | 399 | } |
400 | 400 | ||
401 | static void | 401 | static void |
402 | _device_pointer_motion(Ecore_Drm_Evdev *edev, struct libinput_event_pointer *event) | 402 | _device_pointer_motion(Ecore_Drm_Evdev *edev, struct libinput_event_pointer *event) |
403 | { | 403 | { |
404 | Ecore_Drm_Input *input; | 404 | Ecore_Drm_Input *input; |
@@ -455,7 +455,7 @@ _ecore_drm_pointer_motion_post(Ecore_Drm_Evdev *edev) | |||
455 | _device_pointer_motion(edev, NULL); | 455 | _device_pointer_motion(edev, NULL); |
456 | } | 456 | } |
457 | 457 | ||
458 | static void | 458 | static void |
459 | _device_handle_pointer_motion(struct libinput_device *device, struct libinput_event_pointer *event) | 459 | _device_handle_pointer_motion(struct libinput_device *device, struct libinput_event_pointer *event) |
460 | { | 460 | { |
461 | Ecore_Drm_Evdev *edev; | 461 | Ecore_Drm_Evdev *edev; |
@@ -476,7 +476,7 @@ _device_handle_pointer_motion(struct libinput_device *device, struct libinput_ev | |||
476 | _device_pointer_motion(edev, event); | 476 | _device_pointer_motion(edev, event); |
477 | } | 477 | } |
478 | 478 | ||
479 | static void | 479 | static void |
480 | _device_handle_pointer_motion_absolute(struct libinput_device *device, struct libinput_event_pointer *event) | 480 | _device_handle_pointer_motion_absolute(struct libinput_device *device, struct libinput_event_pointer *event) |
481 | { | 481 | { |
482 | Ecore_Drm_Evdev *edev; | 482 | Ecore_Drm_Evdev *edev; |
@@ -498,7 +498,7 @@ _device_handle_pointer_motion_absolute(struct libinput_device *device, struct li | |||
498 | _device_pointer_motion(edev, event); | 498 | _device_pointer_motion(edev, event); |
499 | } | 499 | } |
500 | 500 | ||
501 | static void | 501 | static void |
502 | _device_handle_button(struct libinput_device *device, struct libinput_event_pointer *event) | 502 | _device_handle_button(struct libinput_device *device, struct libinput_event_pointer *event) |
503 | { | 503 | { |
504 | Ecore_Drm_Evdev *edev; | 504 | Ecore_Drm_Evdev *edev; |
@@ -557,7 +557,7 @@ _device_handle_button(struct libinput_device *device, struct libinput_event_poin | |||
557 | (button == edev->mouse.prev_button)) | 557 | (button == edev->mouse.prev_button)) |
558 | { | 558 | { |
559 | edev->mouse.did_double = EINA_TRUE; | 559 | edev->mouse.did_double = EINA_TRUE; |
560 | if (((current - edev->mouse.last) <= (2 * edev->mouse.threshold)) && | 560 | if (((current - edev->mouse.last) <= (2 * edev->mouse.threshold)) && |
561 | (button == edev->mouse.last_button)) | 561 | (button == edev->mouse.last_button)) |
562 | { | 562 | { |
563 | edev->mouse.did_triple = EINA_TRUE; | 563 | edev->mouse.did_triple = EINA_TRUE; |
@@ -600,7 +600,7 @@ _event_scroll_get(struct libinput_event_pointer *pe, enum libinput_pointer_axis | |||
600 | return 0.0; | 600 | return 0.0; |
601 | } | 601 | } |
602 | 602 | ||
603 | static void | 603 | static void |
604 | _device_handle_axis(struct libinput_device *device, struct libinput_event_pointer *event) | 604 | _device_handle_axis(struct libinput_device *device, struct libinput_event_pointer *event) |
605 | { | 605 | { |
606 | Ecore_Drm_Evdev *edev; | 606 | Ecore_Drm_Evdev *edev; |
@@ -635,7 +635,7 @@ _device_handle_axis(struct libinput_device *device, struct libinput_event_pointe | |||
635 | ev->z = _event_scroll_get(event, axis); | 635 | ev->z = _event_scroll_get(event, axis); |
636 | 636 | ||
637 | axis = LIBINPUT_POINTER_AXIS_SCROLL_HORIZONTAL; | 637 | axis = LIBINPUT_POINTER_AXIS_SCROLL_HORIZONTAL; |
638 | if (libinput_event_pointer_has_axis(event, axis)) | 638 | if (libinput_event_pointer_has_axis(event, axis)) |
639 | { | 639 | { |
640 | ev->direction = 1; | 640 | ev->direction = 1; |
641 | ev->z = _event_scroll_get(event, axis); | 641 | ev->z = _event_scroll_get(event, axis); |
@@ -771,7 +771,7 @@ _device_handle_touch_event_send(Ecore_Drm_Evdev *edev, struct libinput_event_tou | |||
771 | (button == edev->mouse.prev_button)) | 771 | (button == edev->mouse.prev_button)) |
772 | { | 772 | { |
773 | edev->mouse.did_double = EINA_TRUE; | 773 | edev->mouse.did_double = EINA_TRUE; |
774 | if (((current - edev->mouse.last) <= (2 * edev->mouse.threshold)) && | 774 | if (((current - edev->mouse.last) <= (2 * edev->mouse.threshold)) && |
775 | (button == edev->mouse.last_button)) | 775 | (button == edev->mouse.last_button)) |
776 | { | 776 | { |
777 | edev->mouse.did_triple = EINA_TRUE; | 777 | edev->mouse.did_triple = EINA_TRUE; |
@@ -877,7 +877,7 @@ _device_handle_touch_motion(struct libinput_device *device, struct libinput_even | |||
877 | _device_handle_touch_motion_send(edev, event); | 877 | _device_handle_touch_motion_send(edev, event); |
878 | } | 878 | } |
879 | 879 | ||
880 | static void | 880 | static void |
881 | _device_handle_touch_up(struct libinput_device *device, struct libinput_event_touch *event) | 881 | _device_handle_touch_up(struct libinput_device *device, struct libinput_event_touch *event) |
882 | { | 882 | { |
883 | Ecore_Drm_Evdev *edev; | 883 | Ecore_Drm_Evdev *edev; |
@@ -889,13 +889,13 @@ _device_handle_touch_up(struct libinput_device *device, struct libinput_event_to | |||
889 | _device_handle_touch_event_send(edev, event, ECORE_EVENT_MOUSE_BUTTON_UP); | 889 | _device_handle_touch_event_send(edev, event, ECORE_EVENT_MOUSE_BUTTON_UP); |
890 | } | 890 | } |
891 | 891 | ||
892 | static void | 892 | static void |
893 | _device_handle_touch_frame(struct libinput_device *device EINA_UNUSED, struct libinput_event_touch *event EINA_UNUSED) | 893 | _device_handle_touch_frame(struct libinput_device *device EINA_UNUSED, struct libinput_event_touch *event EINA_UNUSED) |
894 | { | 894 | { |
895 | /* DBG("Unhandled Touch Frame Event"); */ | 895 | /* DBG("Unhandled Touch Frame Event"); */ |
896 | } | 896 | } |
897 | 897 | ||
898 | void | 898 | void |
899 | _ecore_drm_evdev_device_destroy(Ecore_Drm_Evdev *edev) | 899 | _ecore_drm_evdev_device_destroy(Ecore_Drm_Evdev *edev) |
900 | { | 900 | { |
901 | EINA_SAFETY_ON_NULL_RETURN(edev); | 901 | EINA_SAFETY_ON_NULL_RETURN(edev); |
@@ -913,7 +913,7 @@ _ecore_drm_evdev_device_destroy(Ecore_Drm_Evdev *edev) | |||
913 | free(edev); | 913 | free(edev); |
914 | } | 914 | } |
915 | 915 | ||
916 | Eina_Bool | 916 | Eina_Bool |
917 | _ecore_drm_evdev_event_process(struct libinput_event *event) | 917 | _ecore_drm_evdev_event_process(struct libinput_event *event) |
918 | { | 918 | { |
919 | struct libinput_device *device; | 919 | struct libinput_device *device; |
@@ -926,11 +926,11 @@ _ecore_drm_evdev_event_process(struct libinput_event *event) | |||
926 | _device_handle_key(device, libinput_event_get_keyboard_event(event)); | 926 | _device_handle_key(device, libinput_event_get_keyboard_event(event)); |
927 | break; | 927 | break; |
928 | case LIBINPUT_EVENT_POINTER_MOTION: | 928 | case LIBINPUT_EVENT_POINTER_MOTION: |
929 | _device_handle_pointer_motion(device, | 929 | _device_handle_pointer_motion(device, |
930 | libinput_event_get_pointer_event(event)); | 930 | libinput_event_get_pointer_event(event)); |
931 | break; | 931 | break; |
932 | case LIBINPUT_EVENT_POINTER_MOTION_ABSOLUTE: | 932 | case LIBINPUT_EVENT_POINTER_MOTION_ABSOLUTE: |
933 | _device_handle_pointer_motion_absolute(device, | 933 | _device_handle_pointer_motion_absolute(device, |
934 | libinput_event_get_pointer_event(event)); | 934 | libinput_event_get_pointer_event(event)); |
935 | break; | 935 | break; |
936 | case LIBINPUT_EVENT_POINTER_BUTTON: | 936 | case LIBINPUT_EVENT_POINTER_BUTTON: |
@@ -943,7 +943,7 @@ _ecore_drm_evdev_event_process(struct libinput_event *event) | |||
943 | _device_handle_touch_down(device, libinput_event_get_touch_event(event)); | 943 | _device_handle_touch_down(device, libinput_event_get_touch_event(event)); |
944 | break; | 944 | break; |
945 | case LIBINPUT_EVENT_TOUCH_MOTION: | 945 | case LIBINPUT_EVENT_TOUCH_MOTION: |
946 | _device_handle_touch_motion(device, | 946 | _device_handle_touch_motion(device, |
947 | libinput_event_get_touch_event(event)); | 947 | libinput_event_get_touch_event(event)); |
948 | break; | 948 | break; |
949 | case LIBINPUT_EVENT_TOUCH_UP: | 949 | case LIBINPUT_EVENT_TOUCH_UP: |
@@ -985,7 +985,7 @@ ecore_drm_inputs_device_axis_size_set(Ecore_Drm_Evdev *edev, int w, int h) | |||
985 | EINA_SAFETY_ON_NULL_RETURN(edev); | 985 | EINA_SAFETY_ON_NULL_RETURN(edev); |
986 | EINA_SAFETY_ON_TRUE_RETURN((w == 0) || (h == 0)); | 986 | EINA_SAFETY_ON_TRUE_RETURN((w == 0) || (h == 0)); |
987 | 987 | ||
988 | if ((!libinput_device_config_calibration_has_matrix(edev->device)) || | 988 | if ((!libinput_device_config_calibration_has_matrix(edev->device)) || |
989 | (libinput_device_config_calibration_get_default_matrix(edev->device, cal) != 0)) | 989 | (libinput_device_config_calibration_get_default_matrix(edev->device, cal) != 0)) |
990 | return; | 990 | return; |
991 | 991 | ||
@@ -997,7 +997,7 @@ ecore_drm_inputs_device_axis_size_set(Ecore_Drm_Evdev *edev, int w, int h) | |||
997 | EINA_LIST_FREE(devices, device) | 997 | EINA_LIST_FREE(devices, device) |
998 | { | 998 | { |
999 | vals = eeze_udev_syspath_get_property(device, "WL_CALIBRATION"); | 999 | vals = eeze_udev_syspath_get_property(device, "WL_CALIBRATION"); |
1000 | if ((!vals) || | 1000 | if ((!vals) || |
1001 | (sscanf(vals, "%f %f %f %f %f %f", | 1001 | (sscanf(vals, "%f %f %f %f %f %f", |
1002 | &cal[0], &cal[1], &cal[2], &cal[3], &cal[4], &cal[5]) != 6)) | 1002 | &cal[0], &cal[1], &cal[2], &cal[3], &cal[4], &cal[5]) != 6)) |
1003 | goto cont; | 1003 | goto cont; |
@@ -1005,7 +1005,7 @@ ecore_drm_inputs_device_axis_size_set(Ecore_Drm_Evdev *edev, int w, int h) | |||
1005 | cal[2] /= w; | 1005 | cal[2] /= w; |
1006 | cal[5] /= h; | 1006 | cal[5] /= h; |
1007 | 1007 | ||
1008 | status = | 1008 | status = |
1009 | libinput_device_config_calibration_set_matrix(edev->device, cal); | 1009 | libinput_device_config_calibration_set_matrix(edev->device, cal); |
1010 | 1010 | ||
1011 | if (status != LIBINPUT_CONFIG_STATUS_SUCCESS) | 1011 | if (status != LIBINPUT_CONFIG_STATUS_SUCCESS) |
diff --git a/src/lib/ecore_drm/ecore_drm_fb.c b/src/lib/ecore_drm/ecore_drm_fb.c index 7f3d32360e..cf9c9e5ffd 100644 --- a/src/lib/ecore_drm/ecore_drm_fb.c +++ b/src/lib/ecore_drm/ecore_drm_fb.c | |||
@@ -30,9 +30,9 @@ | |||
30 | 30 | ||
31 | /** | 31 | /** |
32 | * @defgroup Ecore_Drm_Fb_Group Frame buffer manipulation | 32 | * @defgroup Ecore_Drm_Fb_Group Frame buffer manipulation |
33 | * | 33 | * |
34 | * Functions that deal with frame buffers. | 34 | * Functions that deal with frame buffers. |
35 | * | 35 | * |
36 | */ | 36 | */ |
37 | 37 | ||
38 | static Eina_Bool | 38 | static Eina_Bool |
@@ -148,7 +148,7 @@ create_err: | |||
148 | return NULL; | 148 | return NULL; |
149 | } | 149 | } |
150 | 150 | ||
151 | EAPI void | 151 | EAPI void |
152 | ecore_drm_fb_destroy(Ecore_Drm_Fb *fb) | 152 | ecore_drm_fb_destroy(Ecore_Drm_Fb *fb) |
153 | { | 153 | { |
154 | struct drm_mode_destroy_dumb darg; | 154 | struct drm_mode_destroy_dumb darg; |
diff --git a/src/lib/ecore_drm/ecore_drm_inputs.c b/src/lib/ecore_drm/ecore_drm_inputs.c index d0896eced3..c01126ab39 100644 --- a/src/lib/ecore_drm/ecore_drm_inputs.c +++ b/src/lib/ecore_drm/ecore_drm_inputs.c | |||
@@ -32,7 +32,7 @@ EAPI int ECORE_DRM_EVENT_SEAT_ADD = -1; | |||
32 | static Eina_Hash *_fd_hash = NULL; | 32 | static Eina_Hash *_fd_hash = NULL; |
33 | 33 | ||
34 | /* local functions */ | 34 | /* local functions */ |
35 | static int | 35 | static int |
36 | _cb_open_restricted(const char *path, int flags, void *data) | 36 | _cb_open_restricted(const char *path, int flags, void *data) |
37 | { | 37 | { |
38 | Ecore_Drm_Input *input; | 38 | Ecore_Drm_Input *input; |
@@ -49,7 +49,7 @@ _cb_open_restricted(const char *path, int flags, void *data) | |||
49 | return fd; | 49 | return fd; |
50 | } | 50 | } |
51 | 51 | ||
52 | static void | 52 | static void |
53 | _cb_close_restricted(int fd, void *data) | 53 | _cb_close_restricted(int fd, void *data) |
54 | { | 54 | { |
55 | Ecore_Drm_Input *input; | 55 | Ecore_Drm_Input *input; |
@@ -108,7 +108,7 @@ _seat_get(Ecore_Drm_Input *input, const char *seat) | |||
108 | return _seat_create(input, seat); | 108 | return _seat_create(input, seat); |
109 | } | 109 | } |
110 | 110 | ||
111 | static void | 111 | static void |
112 | _device_added(Ecore_Drm_Input *input, struct libinput_device *device) | 112 | _device_added(Ecore_Drm_Input *input, struct libinput_device *device) |
113 | { | 113 | { |
114 | struct libinput_seat *libinput_seat; | 114 | struct libinput_seat *libinput_seat; |
@@ -139,7 +139,7 @@ _device_added(Ecore_Drm_Input *input, struct libinput_device *device) | |||
139 | seat->devices = eina_list_append(seat->devices, edev); | 139 | seat->devices = eina_list_append(seat->devices, edev); |
140 | } | 140 | } |
141 | 141 | ||
142 | static void | 142 | static void |
143 | _device_removed(Ecore_Drm_Input *input EINA_UNUSED, struct libinput_device *device) | 143 | _device_removed(Ecore_Drm_Input *input EINA_UNUSED, struct libinput_device *device) |
144 | { | 144 | { |
145 | Ecore_Drm_Evdev *edev; | 145 | Ecore_Drm_Evdev *edev; |
@@ -161,7 +161,7 @@ _device_removed(Ecore_Drm_Input *input EINA_UNUSED, struct libinput_device *devi | |||
161 | _ecore_drm_evdev_device_destroy(edev); | 161 | _ecore_drm_evdev_device_destroy(edev); |
162 | } | 162 | } |
163 | 163 | ||
164 | static int | 164 | static int |
165 | _udev_event_process(struct libinput_event *event) | 165 | _udev_event_process(struct libinput_event *event) |
166 | { | 166 | { |
167 | struct libinput *libinput; | 167 | struct libinput *libinput; |
@@ -188,14 +188,14 @@ _udev_event_process(struct libinput_event *event) | |||
188 | return ret; | 188 | return ret; |
189 | } | 189 | } |
190 | 190 | ||
191 | static void | 191 | static void |
192 | _input_event_process(struct libinput_event *event) | 192 | _input_event_process(struct libinput_event *event) |
193 | { | 193 | { |
194 | if (_udev_event_process(event)) return; | 194 | if (_udev_event_process(event)) return; |
195 | if (_ecore_drm_evdev_event_process(event)) return; | 195 | if (_ecore_drm_evdev_event_process(event)) return; |
196 | } | 196 | } |
197 | 197 | ||
198 | static void | 198 | static void |
199 | _input_events_process(Ecore_Drm_Input *input) | 199 | _input_events_process(Ecore_Drm_Input *input) |
200 | { | 200 | { |
201 | struct libinput_event *event; | 201 | struct libinput_event *event; |
@@ -207,7 +207,7 @@ _input_events_process(Ecore_Drm_Input *input) | |||
207 | } | 207 | } |
208 | } | 208 | } |
209 | 209 | ||
210 | static Eina_Bool | 210 | static Eina_Bool |
211 | _cb_input_dispatch(void *data, Ecore_Fd_Handler *hdlr EINA_UNUSED) | 211 | _cb_input_dispatch(void *data, Ecore_Fd_Handler *hdlr EINA_UNUSED) |
212 | { | 212 | { |
213 | Ecore_Drm_Input *input; | 213 | Ecore_Drm_Input *input; |
@@ -223,14 +223,14 @@ _cb_input_dispatch(void *data, Ecore_Fd_Handler *hdlr EINA_UNUSED) | |||
223 | return EINA_TRUE; | 223 | return EINA_TRUE; |
224 | } | 224 | } |
225 | 225 | ||
226 | const struct libinput_interface _input_interface = | 226 | const struct libinput_interface _input_interface = |
227 | { | 227 | { |
228 | _cb_open_restricted, | 228 | _cb_open_restricted, |
229 | _cb_close_restricted, | 229 | _cb_close_restricted, |
230 | }; | 230 | }; |
231 | 231 | ||
232 | /* public functions */ | 232 | /* public functions */ |
233 | EAPI Eina_Bool | 233 | EAPI Eina_Bool |
234 | ecore_drm_inputs_create(Ecore_Drm_Device *dev) | 234 | ecore_drm_inputs_create(Ecore_Drm_Device *dev) |
235 | { | 235 | { |
236 | Ecore_Drm_Input *input; | 236 | Ecore_Drm_Input *input; |
@@ -246,7 +246,7 @@ ecore_drm_inputs_create(Ecore_Drm_Device *dev) | |||
246 | input->dev = dev; | 246 | input->dev = dev; |
247 | 247 | ||
248 | /* try to create libinput context */ | 248 | /* try to create libinput context */ |
249 | input->libinput = | 249 | input->libinput = |
250 | libinput_udev_create_context(&_input_interface, input, eeze_udev_get()); | 250 | libinput_udev_create_context(&_input_interface, input, eeze_udev_get()); |
251 | if (!input->libinput) | 251 | if (!input->libinput) |
252 | { | 252 | { |
@@ -285,7 +285,7 @@ err: | |||
285 | return EINA_FALSE; | 285 | return EINA_FALSE; |
286 | } | 286 | } |
287 | 287 | ||
288 | EAPI void | 288 | EAPI void |
289 | ecore_drm_inputs_destroy(Ecore_Drm_Device *dev) | 289 | ecore_drm_inputs_destroy(Ecore_Drm_Device *dev) |
290 | { | 290 | { |
291 | Ecore_Drm_Input *input; | 291 | Ecore_Drm_Input *input; |
@@ -313,7 +313,7 @@ ecore_drm_inputs_destroy(Ecore_Drm_Device *dev) | |||
313 | } | 313 | } |
314 | } | 314 | } |
315 | 315 | ||
316 | EAPI Eina_Bool | 316 | EAPI Eina_Bool |
317 | ecore_drm_inputs_enable(Ecore_Drm_Input *input) | 317 | ecore_drm_inputs_enable(Ecore_Drm_Input *input) |
318 | { | 318 | { |
319 | EINA_SAFETY_ON_NULL_RETURN_VAL(input, EINA_FALSE); | 319 | EINA_SAFETY_ON_NULL_RETURN_VAL(input, EINA_FALSE); |
@@ -323,14 +323,14 @@ ecore_drm_inputs_enable(Ecore_Drm_Input *input) | |||
323 | 323 | ||
324 | if (!input->hdlr) | 324 | if (!input->hdlr) |
325 | { | 325 | { |
326 | input->hdlr = | 326 | input->hdlr = |
327 | ecore_main_fd_handler_add(input->fd, ECORE_FD_READ, | 327 | ecore_main_fd_handler_add(input->fd, ECORE_FD_READ, |
328 | _cb_input_dispatch, input, NULL, NULL); | 328 | _cb_input_dispatch, input, NULL, NULL); |
329 | } | 329 | } |
330 | 330 | ||
331 | if (input->suspended) | 331 | if (input->suspended) |
332 | { | 332 | { |
333 | if (libinput_resume(input->libinput) != 0) | 333 | if (libinput_resume(input->libinput) != 0) |
334 | goto err; | 334 | goto err; |
335 | 335 | ||
336 | input->suspended = EINA_FALSE; | 336 | input->suspended = EINA_FALSE; |
@@ -351,7 +351,7 @@ err: | |||
351 | return EINA_FALSE; | 351 | return EINA_FALSE; |
352 | } | 352 | } |
353 | 353 | ||
354 | EAPI void | 354 | EAPI void |
355 | ecore_drm_inputs_disable(Ecore_Drm_Input *input) | 355 | ecore_drm_inputs_disable(Ecore_Drm_Input *input) |
356 | { | 356 | { |
357 | EINA_SAFETY_ON_NULL_RETURN(input); | 357 | EINA_SAFETY_ON_NULL_RETURN(input); |
diff --git a/src/lib/ecore_drm/ecore_drm_launcher.c b/src/lib/ecore_drm/ecore_drm_launcher.c index 7c70d240cb..256eacc892 100644 --- a/src/lib/ecore_drm/ecore_drm_launcher.c +++ b/src/lib/ecore_drm/ecore_drm_launcher.c | |||
@@ -30,7 +30,7 @@ | |||
30 | 30 | ||
31 | static Eina_Bool logind = EINA_FALSE; | 31 | static Eina_Bool logind = EINA_FALSE; |
32 | 32 | ||
33 | static Eina_Bool | 33 | static Eina_Bool |
34 | _ecore_drm_launcher_cb_vt_switch(void *data, int type EINA_UNUSED, void *event) | 34 | _ecore_drm_launcher_cb_vt_switch(void *data, int type EINA_UNUSED, void *event) |
35 | { | 35 | { |
36 | Ecore_Drm_Device *dev; | 36 | Ecore_Drm_Device *dev; |
@@ -81,7 +81,7 @@ _ecore_drm_launcher_device_flags_set(int fd, int flags) | |||
81 | return fd; | 81 | return fd; |
82 | } | 82 | } |
83 | 83 | ||
84 | EAPI Eina_Bool | 84 | EAPI Eina_Bool |
85 | ecore_drm_launcher_connect(Ecore_Drm_Device *dev) | 85 | ecore_drm_launcher_connect(Ecore_Drm_Device *dev) |
86 | { | 86 | { |
87 | EINA_SAFETY_ON_NULL_RETURN_VAL(dev, EINA_FALSE); | 87 | EINA_SAFETY_ON_NULL_RETURN_VAL(dev, EINA_FALSE); |
@@ -106,14 +106,14 @@ ecore_drm_launcher_connect(Ecore_Drm_Device *dev) | |||
106 | } | 106 | } |
107 | } | 107 | } |
108 | 108 | ||
109 | dev->tty.switch_hdlr = | 109 | dev->tty.switch_hdlr = |
110 | ecore_event_handler_add(ECORE_EVENT_KEY_DOWN, | 110 | ecore_event_handler_add(ECORE_EVENT_KEY_DOWN, |
111 | _ecore_drm_launcher_cb_vt_switch, dev); | 111 | _ecore_drm_launcher_cb_vt_switch, dev); |
112 | 112 | ||
113 | return EINA_TRUE; | 113 | return EINA_TRUE; |
114 | } | 114 | } |
115 | 115 | ||
116 | EAPI void | 116 | EAPI void |
117 | ecore_drm_launcher_disconnect(Ecore_Drm_Device *dev) | 117 | ecore_drm_launcher_disconnect(Ecore_Drm_Device *dev) |
118 | { | 118 | { |
119 | EINA_SAFETY_ON_NULL_RETURN(dev); | 119 | EINA_SAFETY_ON_NULL_RETURN(dev); |
diff --git a/src/lib/ecore_drm/ecore_drm_logind.c b/src/lib/ecore_drm/ecore_drm_logind.c index 4266239a84..07db06049b 100644 --- a/src/lib/ecore_drm/ecore_drm_logind.c +++ b/src/lib/ecore_drm/ecore_drm_logind.c | |||
@@ -102,7 +102,7 @@ _ecore_drm_logind_vt_get(Ecore_Drm_Device *dev) | |||
102 | } | 102 | } |
103 | #endif | 103 | #endif |
104 | 104 | ||
105 | static Eina_Bool | 105 | static Eina_Bool |
106 | _ecore_drm_logind_vt_setup(Ecore_Drm_Device *dev) | 106 | _ecore_drm_logind_vt_setup(Ecore_Drm_Device *dev) |
107 | { | 107 | { |
108 | char buff[64]; | 108 | char buff[64]; |
@@ -116,7 +116,7 @@ _ecore_drm_logind_vt_setup(Ecore_Drm_Device *dev) | |||
116 | return EINA_TRUE; | 116 | return EINA_TRUE; |
117 | } | 117 | } |
118 | 118 | ||
119 | static Eina_Bool | 119 | static Eina_Bool |
120 | _ecore_drm_logind_cb_vt_signal(void *data, int type EINA_UNUSED, void *event) | 120 | _ecore_drm_logind_cb_vt_signal(void *data, int type EINA_UNUSED, void *event) |
121 | { | 121 | { |
122 | Ecore_Drm_Device *dev; | 122 | Ecore_Drm_Device *dev; |
@@ -146,7 +146,7 @@ _ecore_drm_logind_cb_vt_signal(void *data, int type EINA_UNUSED, void *event) | |||
146 | return ECORE_CALLBACK_RENEW; | 146 | return ECORE_CALLBACK_RENEW; |
147 | } | 147 | } |
148 | 148 | ||
149 | static Eina_Bool | 149 | static Eina_Bool |
150 | _ecore_drm_logind_cb_activate(void *data, int type EINA_UNUSED, void *event) | 150 | _ecore_drm_logind_cb_activate(void *data, int type EINA_UNUSED, void *event) |
151 | { | 151 | { |
152 | Ecore_Drm_Event_Activate *ev; | 152 | Ecore_Drm_Event_Activate *ev; |
@@ -245,15 +245,15 @@ _ecore_drm_logind_connect(Ecore_Drm_Device *dev) | |||
245 | /* setup handler for vt signals */ | 245 | /* setup handler for vt signals */ |
246 | if (!dev->tty.event_hdlr) | 246 | if (!dev->tty.event_hdlr) |
247 | { | 247 | { |
248 | dev->tty.event_hdlr = | 248 | dev->tty.event_hdlr = |
249 | ecore_event_handler_add(ECORE_EVENT_SIGNAL_USER, | 249 | ecore_event_handler_add(ECORE_EVENT_SIGNAL_USER, |
250 | _ecore_drm_logind_cb_vt_signal, dev); | 250 | _ecore_drm_logind_cb_vt_signal, dev); |
251 | } | 251 | } |
252 | 252 | ||
253 | if (!active_hdlr) | 253 | if (!active_hdlr) |
254 | { | 254 | { |
255 | active_hdlr = | 255 | active_hdlr = |
256 | ecore_event_handler_add(ECORE_DRM_EVENT_ACTIVATE, | 256 | ecore_event_handler_add(ECORE_DRM_EVENT_ACTIVATE, |
257 | _ecore_drm_logind_cb_activate, dev); | 257 | _ecore_drm_logind_cb_activate, dev); |
258 | } | 258 | } |
259 | 259 | ||
@@ -266,7 +266,7 @@ take_err: | |||
266 | return EINA_FALSE; | 266 | return EINA_FALSE; |
267 | } | 267 | } |
268 | 268 | ||
269 | void | 269 | void |
270 | _ecore_drm_logind_disconnect(Ecore_Drm_Device *dev) | 270 | _ecore_drm_logind_disconnect(Ecore_Drm_Device *dev) |
271 | { | 271 | { |
272 | if (active_hdlr) ecore_event_handler_del(active_hdlr); | 272 | if (active_hdlr) ecore_event_handler_del(active_hdlr); |
@@ -277,7 +277,7 @@ _ecore_drm_logind_disconnect(Ecore_Drm_Device *dev) | |||
277 | _ecore_drm_dbus_shutdown(); | 277 | _ecore_drm_dbus_shutdown(); |
278 | } | 278 | } |
279 | 279 | ||
280 | void | 280 | void |
281 | _ecore_drm_logind_restore(Ecore_Drm_Device *dev) | 281 | _ecore_drm_logind_restore(Ecore_Drm_Device *dev) |
282 | { | 282 | { |
283 | _ecore_drm_tty_restore(dev); | 283 | _ecore_drm_tty_restore(dev); |
@@ -291,7 +291,7 @@ _ecore_drm_logind_device_open(const char *device, Ecore_Drm_Open_Cb callback, vo | |||
291 | if (stat(device, &st) < 0) return EINA_FALSE; | 291 | if (stat(device, &st) < 0) return EINA_FALSE; |
292 | if (!S_ISCHR(st.st_mode)) return EINA_FALSE; | 292 | if (!S_ISCHR(st.st_mode)) return EINA_FALSE; |
293 | 293 | ||
294 | if (_ecore_drm_dbus_device_take(major(st.st_rdev), minor(st.st_rdev), | 294 | if (_ecore_drm_dbus_device_take(major(st.st_rdev), minor(st.st_rdev), |
295 | callback, data) < 0) | 295 | callback, data) < 0) |
296 | return EINA_FALSE; | 296 | return EINA_FALSE; |
297 | 297 | ||
diff --git a/src/lib/ecore_drm/ecore_drm_output.c b/src/lib/ecore_drm/ecore_drm_output.c index 5fbc809053..7cad23557d 100644 --- a/src/lib/ecore_drm/ecore_drm_output.c +++ b/src/lib/ecore_drm/ecore_drm_output.c | |||
@@ -37,7 +37,7 @@ | |||
37 | #define EDID_OFFSET_PNPID 0x08 | 37 | #define EDID_OFFSET_PNPID 0x08 |
38 | #define EDID_OFFSET_SERIAL 0x0c | 38 | #define EDID_OFFSET_SERIAL 0x0c |
39 | 39 | ||
40 | static const char *conn_types[] = | 40 | static const char *conn_types[] = |
41 | { | 41 | { |
42 | "None", "VGA", "DVI-I", "DVI-D", "DVI-A", | 42 | "None", "VGA", "DVI-I", "DVI-D", "DVI-A", |
43 | "Composite", "S-Video", "LVDS", "Component", "DIN", | 43 | "Composite", "S-Video", "LVDS", "Component", "DIN", |
@@ -111,7 +111,7 @@ _ecore_drm_output_property_get(int fd, drmModeConnectorPtr conn, const char *nam | |||
111 | return NULL; | 111 | return NULL; |
112 | } | 112 | } |
113 | 113 | ||
114 | static void | 114 | static void |
115 | _ecore_drm_output_edid_parse_string(const uint8_t *data, char text[]) | 115 | _ecore_drm_output_edid_parse_string(const uint8_t *data, char text[]) |
116 | { | 116 | { |
117 | int i = 0, rep = 0; | 117 | int i = 0, rep = 0; |
@@ -139,7 +139,7 @@ _ecore_drm_output_edid_parse_string(const uint8_t *data, char text[]) | |||
139 | if (rep > 4) text[0] = '\0'; | 139 | if (rep > 4) text[0] = '\0'; |
140 | } | 140 | } |
141 | 141 | ||
142 | static int | 142 | static int |
143 | _ecore_drm_output_edid_parse(Ecore_Drm_Output *output, const uint8_t *data, size_t len) | 143 | _ecore_drm_output_edid_parse(Ecore_Drm_Output *output, const uint8_t *data, size_t len) |
144 | { | 144 | { |
145 | int i = 0; | 145 | int i = 0; |
@@ -149,8 +149,8 @@ _ecore_drm_output_edid_parse(Ecore_Drm_Output *output, const uint8_t *data, size | |||
149 | if ((data[0] != 0x00) || (data[1] != 0xff)) return -1; | 149 | if ((data[0] != 0x00) || (data[1] != 0xff)) return -1; |
150 | 150 | ||
151 | output->edid.pnp[0] = 'A' + ((data[EDID_OFFSET_PNPID + 0] & 0x7c) / 4) - 1; | 151 | output->edid.pnp[0] = 'A' + ((data[EDID_OFFSET_PNPID + 0] & 0x7c) / 4) - 1; |
152 | output->edid.pnp[1] = | 152 | output->edid.pnp[1] = |
153 | 'A' + ((data[EDID_OFFSET_PNPID + 0] & 0x3) * 8) + | 153 | 'A' + ((data[EDID_OFFSET_PNPID + 0] & 0x3) * 8) + |
154 | ((data[EDID_OFFSET_PNPID + 1] & 0xe0) / 32) - 1; | 154 | ((data[EDID_OFFSET_PNPID + 1] & 0xe0) / 32) - 1; |
155 | output->edid.pnp[2] = 'A' + (data[EDID_OFFSET_PNPID + 1] & 0x1f) - 1; | 155 | output->edid.pnp[2] = 'A' + (data[EDID_OFFSET_PNPID + 1] & 0x1f) - 1; |
156 | output->edid.pnp[3] = '\0'; | 156 | output->edid.pnp[3] = '\0'; |
@@ -178,7 +178,7 @@ _ecore_drm_output_edid_parse(Ecore_Drm_Output *output, const uint8_t *data, size | |||
178 | return 0; | 178 | return 0; |
179 | } | 179 | } |
180 | 180 | ||
181 | static void | 181 | static void |
182 | _ecore_drm_output_edid_find(Ecore_Drm_Output *output, drmModeConnector *conn) | 182 | _ecore_drm_output_edid_find(Ecore_Drm_Output *output, drmModeConnector *conn) |
183 | { | 183 | { |
184 | drmModePropertyBlobPtr blob = NULL; | 184 | drmModePropertyBlobPtr blob = NULL; |
@@ -189,10 +189,10 @@ _ecore_drm_output_edid_find(Ecore_Drm_Output *output, drmModeConnector *conn) | |||
189 | { | 189 | { |
190 | if (!(prop = drmModeGetProperty(output->dev->drm.fd, conn->props[i]))) | 190 | if (!(prop = drmModeGetProperty(output->dev->drm.fd, conn->props[i]))) |
191 | continue; | 191 | continue; |
192 | if ((prop->flags & DRM_MODE_PROP_BLOB) && | 192 | if ((prop->flags & DRM_MODE_PROP_BLOB) && |
193 | (!strcmp(prop->name, "EDID"))) | 193 | (!strcmp(prop->name, "EDID"))) |
194 | { | 194 | { |
195 | blob = drmModeGetPropertyBlob(output->dev->drm.fd, | 195 | blob = drmModeGetPropertyBlob(output->dev->drm.fd, |
196 | conn->prop_values[i]); | 196 | conn->prop_values[i]); |
197 | } | 197 | } |
198 | drmModeFreeProperty(prop); | 198 | drmModeFreeProperty(prop); |
@@ -217,7 +217,7 @@ _ecore_drm_output_edid_find(Ecore_Drm_Output *output, drmModeConnector *conn) | |||
217 | drmModeFreePropertyBlob(blob); | 217 | drmModeFreePropertyBlob(blob); |
218 | } | 218 | } |
219 | 219 | ||
220 | static void | 220 | static void |
221 | _ecore_drm_output_software_render(Ecore_Drm_Output *output) | 221 | _ecore_drm_output_software_render(Ecore_Drm_Output *output) |
222 | { | 222 | { |
223 | if (!output) return; | 223 | if (!output) return; |
@@ -637,7 +637,7 @@ _ecore_drm_output_create(Ecore_Drm_Device *dev, drmModeRes *res, drmModeConnecto | |||
637 | output->current_mode->flags |= DRM_MODE_TYPE_DEFAULT; | 637 | output->current_mode->flags |= DRM_MODE_TYPE_DEFAULT; |
638 | 638 | ||
639 | /* try to init backlight */ | 639 | /* try to init backlight */ |
640 | output->backlight = | 640 | output->backlight = |
641 | _ecore_drm_output_backlight_init(output, conn->connector_type); | 641 | _ecore_drm_output_backlight_init(output, conn->connector_type); |
642 | 642 | ||
643 | /* parse edid */ | 643 | /* parse edid */ |
@@ -692,7 +692,7 @@ err: | |||
692 | return NULL; | 692 | return NULL; |
693 | } | 693 | } |
694 | 694 | ||
695 | static void | 695 | static void |
696 | _ecore_drm_output_free(Ecore_Drm_Output *output) | 696 | _ecore_drm_output_free(Ecore_Drm_Output *output) |
697 | { | 697 | { |
698 | Ecore_Drm_Output_Mode *mode; | 698 | Ecore_Drm_Output_Mode *mode; |
@@ -708,7 +708,7 @@ _ecore_drm_output_free(Ecore_Drm_Output *output) | |||
708 | } | 708 | } |
709 | 709 | ||
710 | /* delete the backlight struct */ | 710 | /* delete the backlight struct */ |
711 | if (output->backlight) | 711 | if (output->backlight) |
712 | _ecore_drm_output_backlight_shutdown(output->backlight); | 712 | _ecore_drm_output_backlight_shutdown(output->backlight); |
713 | 713 | ||
714 | /* turn off hardware cursor */ | 714 | /* turn off hardware cursor */ |
@@ -743,7 +743,7 @@ _ecore_drm_output_free(Ecore_Drm_Output *output) | |||
743 | free(output); | 743 | free(output); |
744 | } | 744 | } |
745 | 745 | ||
746 | void | 746 | void |
747 | _ecore_drm_output_frame_finish(Ecore_Drm_Output *output) | 747 | _ecore_drm_output_frame_finish(Ecore_Drm_Output *output) |
748 | { | 748 | { |
749 | if (!output) return; | 749 | if (!output) return; |
@@ -753,7 +753,7 @@ _ecore_drm_output_frame_finish(Ecore_Drm_Output *output) | |||
753 | output->repaint_scheduled = EINA_FALSE; | 753 | output->repaint_scheduled = EINA_FALSE; |
754 | } | 754 | } |
755 | 755 | ||
756 | void | 756 | void |
757 | _ecore_drm_output_fb_release(Ecore_Drm_Output *output, Ecore_Drm_Fb *fb) | 757 | _ecore_drm_output_fb_release(Ecore_Drm_Output *output, Ecore_Drm_Fb *fb) |
758 | { | 758 | { |
759 | if ((!output) || (!fb)) return; | 759 | if ((!output) || (!fb)) return; |
@@ -763,7 +763,7 @@ _ecore_drm_output_fb_release(Ecore_Drm_Output *output, Ecore_Drm_Fb *fb) | |||
763 | ecore_drm_fb_destroy(fb); | 763 | ecore_drm_fb_destroy(fb); |
764 | } | 764 | } |
765 | 765 | ||
766 | void | 766 | void |
767 | _ecore_drm_output_repaint_start(Ecore_Drm_Output *output) | 767 | _ecore_drm_output_repaint_start(Ecore_Drm_Output *output) |
768 | { | 768 | { |
769 | unsigned int fb; | 769 | unsigned int fb; |
@@ -780,7 +780,7 @@ _ecore_drm_output_repaint_start(Ecore_Drm_Output *output) | |||
780 | } | 780 | } |
781 | 781 | ||
782 | fb = output->dev->current->id; | 782 | fb = output->dev->current->id; |
783 | if (drmModePageFlip(output->dev->drm.fd, output->crtc_id, fb, | 783 | if (drmModePageFlip(output->dev->drm.fd, output->crtc_id, fb, |
784 | DRM_MODE_PAGE_FLIP_EVENT, output) < 0) | 784 | DRM_MODE_PAGE_FLIP_EVENT, output) < 0) |
785 | { | 785 | { |
786 | ERR("Could not schedule output page flip event"); | 786 | ERR("Could not schedule output page flip event"); |
@@ -920,12 +920,12 @@ _ecore_drm_output_render_disable(Ecore_Drm_Output *output) | |||
920 | 920 | ||
921 | /** | 921 | /** |
922 | * @defgroup Ecore_Drm_Output_Group Ecore DRM Output | 922 | * @defgroup Ecore_Drm_Output_Group Ecore DRM Output |
923 | * | 923 | * |
924 | * Functions to manage DRM outputs. | 924 | * Functions to manage DRM outputs. |
925 | * | 925 | * |
926 | */ | 926 | */ |
927 | 927 | ||
928 | EAPI Eina_Bool | 928 | EAPI Eina_Bool |
929 | ecore_drm_outputs_create(Ecore_Drm_Device *dev) | 929 | ecore_drm_outputs_create(Ecore_Drm_Device *dev) |
930 | { | 930 | { |
931 | Eina_Bool ret = EINA_TRUE; | 931 | Eina_Bool ret = EINA_TRUE; |
@@ -998,13 +998,13 @@ next: | |||
998 | return ret; | 998 | return ret; |
999 | } | 999 | } |
1000 | 1000 | ||
1001 | EAPI void | 1001 | EAPI void |
1002 | ecore_drm_output_free(Ecore_Drm_Output *output) | 1002 | ecore_drm_output_free(Ecore_Drm_Output *output) |
1003 | { | 1003 | { |
1004 | _ecore_drm_output_free(output); | 1004 | _ecore_drm_output_free(output); |
1005 | } | 1005 | } |
1006 | 1006 | ||
1007 | EAPI void | 1007 | EAPI void |
1008 | ecore_drm_output_cursor_size_set(Ecore_Drm_Output *output, int handle, int w, int h) | 1008 | ecore_drm_output_cursor_size_set(Ecore_Drm_Output *output, int handle, int w, int h) |
1009 | { | 1009 | { |
1010 | EINA_SAFETY_ON_NULL_RETURN(output); | 1010 | EINA_SAFETY_ON_NULL_RETURN(output); |
@@ -1012,7 +1012,7 @@ ecore_drm_output_cursor_size_set(Ecore_Drm_Output *output, int handle, int w, in | |||
1012 | drmModeSetCursor(output->dev->drm.fd, output->crtc_id, handle, w, h); | 1012 | drmModeSetCursor(output->dev->drm.fd, output->crtc_id, handle, w, h); |
1013 | } | 1013 | } |
1014 | 1014 | ||
1015 | EAPI Eina_Bool | 1015 | EAPI Eina_Bool |
1016 | ecore_drm_output_enable(Ecore_Drm_Output *output) | 1016 | ecore_drm_output_enable(Ecore_Drm_Output *output) |
1017 | { | 1017 | { |
1018 | EINA_SAFETY_ON_NULL_RETURN_VAL(output, EINA_FALSE); | 1018 | EINA_SAFETY_ON_NULL_RETURN_VAL(output, EINA_FALSE); |
@@ -1036,7 +1036,7 @@ ecore_drm_output_disable(Ecore_Drm_Output *output) | |||
1036 | _ecore_drm_output_event_send(output, EINA_FALSE); | 1036 | _ecore_drm_output_event_send(output, EINA_FALSE); |
1037 | } | 1037 | } |
1038 | 1038 | ||
1039 | EAPI void | 1039 | EAPI void |
1040 | ecore_drm_output_fb_release(Ecore_Drm_Output *output, Ecore_Drm_Fb *fb) | 1040 | ecore_drm_output_fb_release(Ecore_Drm_Output *output, Ecore_Drm_Fb *fb) |
1041 | { | 1041 | { |
1042 | EINA_SAFETY_ON_NULL_RETURN(output); | 1042 | EINA_SAFETY_ON_NULL_RETURN(output); |
@@ -1044,7 +1044,7 @@ ecore_drm_output_fb_release(Ecore_Drm_Output *output, Ecore_Drm_Fb *fb) | |||
1044 | _ecore_drm_output_fb_release(output, fb); | 1044 | _ecore_drm_output_fb_release(output, fb); |
1045 | } | 1045 | } |
1046 | 1046 | ||
1047 | EAPI void | 1047 | EAPI void |
1048 | ecore_drm_output_repaint(Ecore_Drm_Output *output) | 1048 | ecore_drm_output_repaint(Ecore_Drm_Output *output) |
1049 | { | 1049 | { |
1050 | Ecore_Drm_Device *dev; | 1050 | Ecore_Drm_Device *dev; |
@@ -1070,7 +1070,7 @@ ecore_drm_output_repaint(Ecore_Drm_Output *output) | |||
1070 | 1070 | ||
1071 | output->need_repaint = EINA_FALSE; | 1071 | output->need_repaint = EINA_FALSE; |
1072 | 1072 | ||
1073 | if ((!dev->current) || | 1073 | if ((!dev->current) || |
1074 | (dev->current->stride != dev->next->stride)) | 1074 | (dev->current->stride != dev->next->stride)) |
1075 | { | 1075 | { |
1076 | Ecore_Drm_Output_Mode *mode; | 1076 | Ecore_Drm_Output_Mode *mode; |
@@ -1099,13 +1099,13 @@ ecore_drm_output_repaint(Ecore_Drm_Output *output) | |||
1099 | EINA_LIST_FOREACH(dev->sprites, l, sprite) | 1099 | EINA_LIST_FOREACH(dev->sprites, l, sprite) |
1100 | { | 1100 | { |
1101 | unsigned int flags = 0, id = 0; | 1101 | unsigned int flags = 0, id = 0; |
1102 | drmVBlank vbl = | 1102 | drmVBlank vbl = |
1103 | { | 1103 | { |
1104 | .request.type = (DRM_VBLANK_RELATIVE | DRM_VBLANK_EVENT), | 1104 | .request.type = (DRM_VBLANK_RELATIVE | DRM_VBLANK_EVENT), |
1105 | .request.sequence = 1, | 1105 | .request.sequence = 1, |
1106 | }; | 1106 | }; |
1107 | 1107 | ||
1108 | if (((!sprite->current_fb) && (!sprite->next_fb)) || | 1108 | if (((!sprite->current_fb) && (!sprite->next_fb)) || |
1109 | (!ecore_drm_sprites_crtc_supported(output, sprite->crtcs))) | 1109 | (!ecore_drm_sprites_crtc_supported(output, sprite->crtcs))) |
1110 | continue; | 1110 | continue; |
1111 | 1111 | ||
@@ -1132,7 +1132,7 @@ err: | |||
1132 | } | 1132 | } |
1133 | } | 1133 | } |
1134 | 1134 | ||
1135 | EAPI void | 1135 | EAPI void |
1136 | ecore_drm_output_size_get(Ecore_Drm_Device *dev, int output, int *w, int *h) | 1136 | ecore_drm_output_size_get(Ecore_Drm_Device *dev, int output, int *w, int *h) |
1137 | { | 1137 | { |
1138 | drmModeFB *fb; | 1138 | drmModeFB *fb; |
@@ -1147,7 +1147,7 @@ ecore_drm_output_size_get(Ecore_Drm_Device *dev, int output, int *w, int *h) | |||
1147 | drmModeFreeFB(fb); | 1147 | drmModeFreeFB(fb); |
1148 | } | 1148 | } |
1149 | 1149 | ||
1150 | EAPI void | 1150 | EAPI void |
1151 | ecore_drm_outputs_geometry_get(Ecore_Drm_Device *dev, int *x, int *y, int *w, int *h) | 1151 | ecore_drm_outputs_geometry_get(Ecore_Drm_Device *dev, int *x, int *y, int *w, int *h) |
1152 | { | 1152 | { |
1153 | Ecore_Drm_Output *output; | 1153 | Ecore_Drm_Output *output; |
diff --git a/src/lib/ecore_drm/ecore_drm_private.h b/src/lib/ecore_drm/ecore_drm_private.h index 0be6a61ef8..90699559ee 100644 --- a/src/lib/ecore_drm/ecore_drm_private.h +++ b/src/lib/ecore_drm/ecore_drm_private.h | |||
@@ -173,7 +173,7 @@ struct _Ecore_Drm_Output | |||
173 | char serial[13]; | 173 | char serial[13]; |
174 | } edid; | 174 | } edid; |
175 | 175 | ||
176 | Ecore_Drm_Backlight *backlight; | 176 | Ecore_Drm_Backlight *backlight; |
177 | Ecore_Drm_Fb *current, *next; | 177 | Ecore_Drm_Fb *current, *next; |
178 | 178 | ||
179 | Eina_Bool primary : 1; | 179 | Eina_Bool primary : 1; |
@@ -237,7 +237,7 @@ struct _Ecore_Drm_Evdev | |||
237 | /* } pt[EVDEV_MAX_SLOTS]; */ | 237 | /* } pt[EVDEV_MAX_SLOTS]; */ |
238 | /* } abs; */ | 238 | /* } abs; */ |
239 | 239 | ||
240 | struct | 240 | struct |
241 | { | 241 | { |
242 | int ix, iy; | 242 | int ix, iy; |
243 | int minx, miny, maxw, maxh; | 243 | int minx, miny, maxw, maxh; |
@@ -249,7 +249,7 @@ struct _Ecore_Drm_Evdev | |||
249 | uint32_t prev_button, last_button; | 249 | uint32_t prev_button, last_button; |
250 | } mouse; | 250 | } mouse; |
251 | 251 | ||
252 | struct | 252 | struct |
253 | { | 253 | { |
254 | struct xkb_keymap *keymap; | 254 | struct xkb_keymap *keymap; |
255 | struct xkb_state *state; | 255 | struct xkb_state *state; |
@@ -282,7 +282,7 @@ struct _Ecore_Drm_Sprite | |||
282 | unsigned int crtcs; | 282 | unsigned int crtcs; |
283 | unsigned int plane_id; | 283 | unsigned int plane_id; |
284 | 284 | ||
285 | struct | 285 | struct |
286 | { | 286 | { |
287 | int x, y; | 287 | int x, y; |
288 | unsigned int w, h; | 288 | unsigned int w, h; |
diff --git a/src/lib/ecore_drm/ecore_drm_sprites.c b/src/lib/ecore_drm/ecore_drm_sprites.c index bcc6669765..523d787c4f 100644 --- a/src/lib/ecore_drm/ecore_drm_sprites.c +++ b/src/lib/ecore_drm/ecore_drm_sprites.c | |||
@@ -30,14 +30,14 @@ | |||
30 | 30 | ||
31 | /** | 31 | /** |
32 | * @defgroup Ecore_Drm_Sprites_Group Ecore DRM Sprites | 32 | * @defgroup Ecore_Drm_Sprites_Group Ecore DRM Sprites |
33 | * | 33 | * |
34 | * Functions for managing DRM sprites. | 34 | * Functions for managing DRM sprites. |
35 | * | 35 | * |
36 | */ | 36 | */ |
37 | 37 | ||
38 | /* TODO: DOXY !! */ | 38 | /* TODO: DOXY !! */ |
39 | 39 | ||
40 | EAPI Eina_Bool | 40 | EAPI Eina_Bool |
41 | ecore_drm_sprites_create(Ecore_Drm_Device *dev) | 41 | ecore_drm_sprites_create(Ecore_Drm_Device *dev) |
42 | { | 42 | { |
43 | drmModePlaneRes *res; | 43 | drmModePlaneRes *res; |
@@ -58,8 +58,8 @@ ecore_drm_sprites_create(Ecore_Drm_Device *dev) | |||
58 | continue; | 58 | continue; |
59 | 59 | ||
60 | /* allocate space for sprite */ | 60 | /* allocate space for sprite */ |
61 | if (!(sprite = | 61 | if (!(sprite = |
62 | malloc(sizeof(Ecore_Drm_Sprite) + | 62 | malloc(sizeof(Ecore_Drm_Sprite) + |
63 | ((sizeof(unsigned int)) * p->count_formats)))) | 63 | ((sizeof(unsigned int)) * p->count_formats)))) |
64 | { | 64 | { |
65 | drmModeFreePlane(p); | 65 | drmModeFreePlane(p); |
@@ -71,7 +71,7 @@ ecore_drm_sprites_create(Ecore_Drm_Device *dev) | |||
71 | sprite->crtcs = p->possible_crtcs; | 71 | sprite->crtcs = p->possible_crtcs; |
72 | sprite->plane_id = p->plane_id; | 72 | sprite->plane_id = p->plane_id; |
73 | sprite->num_formats = p->count_formats; | 73 | sprite->num_formats = p->count_formats; |
74 | memcpy(sprite->formats, p->formats, | 74 | memcpy(sprite->formats, p->formats, |
75 | p->count_formats * sizeof(p->formats[0])); | 75 | p->count_formats * sizeof(p->formats[0])); |
76 | drmModeFreePlane(p); | 76 | drmModeFreePlane(p); |
77 | 77 | ||
@@ -84,7 +84,7 @@ ecore_drm_sprites_create(Ecore_Drm_Device *dev) | |||
84 | return EINA_TRUE; | 84 | return EINA_TRUE; |
85 | } | 85 | } |
86 | 86 | ||
87 | EAPI void | 87 | EAPI void |
88 | ecore_drm_sprites_destroy(Ecore_Drm_Device *dev) | 88 | ecore_drm_sprites_destroy(Ecore_Drm_Device *dev) |
89 | { | 89 | { |
90 | Ecore_Drm_Sprite *sprite; | 90 | Ecore_Drm_Sprite *sprite; |
@@ -106,28 +106,28 @@ ecore_drm_sprites_destroy(Ecore_Drm_Device *dev) | |||
106 | } | 106 | } |
107 | } | 107 | } |
108 | 108 | ||
109 | EAPI void | 109 | EAPI void |
110 | ecore_drm_sprites_fb_set(Ecore_Drm_Sprite *sprite, int fb_id, int flags) | 110 | ecore_drm_sprites_fb_set(Ecore_Drm_Sprite *sprite, int fb_id, int flags) |
111 | { | 111 | { |
112 | EINA_SAFETY_ON_TRUE_RETURN((!sprite) || (!sprite->output)); | 112 | EINA_SAFETY_ON_TRUE_RETURN((!sprite) || (!sprite->output)); |
113 | 113 | ||
114 | if (fb_id) | 114 | if (fb_id) |
115 | { | 115 | { |
116 | drmModeSetPlane(sprite->drm_fd, sprite->plane_id, | 116 | drmModeSetPlane(sprite->drm_fd, sprite->plane_id, |
117 | sprite->output->crtc_id, fb_id, flags, | 117 | sprite->output->crtc_id, fb_id, flags, |
118 | sprite->dest.x, sprite->dest.y, sprite->dest.w, | 118 | sprite->dest.x, sprite->dest.y, sprite->dest.w, |
119 | sprite->dest.h, sprite->src.x, sprite->src.y, | 119 | sprite->dest.h, sprite->src.x, sprite->src.y, |
120 | sprite->src.w, sprite->src.h); | 120 | sprite->src.w, sprite->src.h); |
121 | } | 121 | } |
122 | else | 122 | else |
123 | { | 123 | { |
124 | drmModeSetPlane(sprite->drm_fd, sprite->plane_id, | 124 | drmModeSetPlane(sprite->drm_fd, sprite->plane_id, |
125 | sprite->output->crtc_id, 0, 0, | 125 | sprite->output->crtc_id, 0, 0, |
126 | 0, 0, 0, 0, 0, 0, 0, 0); | 126 | 0, 0, 0, 0, 0, 0, 0, 0); |
127 | } | 127 | } |
128 | } | 128 | } |
129 | 129 | ||
130 | EAPI Eina_Bool | 130 | EAPI Eina_Bool |
131 | ecore_drm_sprites_crtc_supported(Ecore_Drm_Output *output, unsigned int supported) | 131 | ecore_drm_sprites_crtc_supported(Ecore_Drm_Output *output, unsigned int supported) |
132 | { | 132 | { |
133 | Ecore_Drm_Device *dev; | 133 | Ecore_Drm_Device *dev; |
diff --git a/src/lib/ecore_drm/ecore_drm_tty.c b/src/lib/ecore_drm/ecore_drm_tty.c index b950ba1de7..822ee3bbbe 100644 --- a/src/lib/ecore_drm/ecore_drm_tty.c +++ b/src/lib/ecore_drm/ecore_drm_tty.c | |||
@@ -34,7 +34,7 @@ | |||
34 | 34 | ||
35 | static int kbd_mode = 0; | 35 | static int kbd_mode = 0; |
36 | 36 | ||
37 | static Eina_Bool | 37 | static Eina_Bool |
38 | _ecore_drm_tty_cb_vt_signal(void *data, int type EINA_UNUSED, void *event) | 38 | _ecore_drm_tty_cb_vt_signal(void *data, int type EINA_UNUSED, void *event) |
39 | { | 39 | { |
40 | Ecore_Drm_Device *dev; | 40 | Ecore_Drm_Device *dev; |
@@ -77,14 +77,14 @@ _ecore_drm_tty_switch(Ecore_Drm_Device *dev, int activate_vt) | |||
77 | return ioctl(dev->tty.fd, VT_ACTIVATE, activate_vt) >= 0; | 77 | return ioctl(dev->tty.fd, VT_ACTIVATE, activate_vt) >= 0; |
78 | } | 78 | } |
79 | 79 | ||
80 | static Eina_Bool | 80 | static Eina_Bool |
81 | _ecore_drm_tty_setup(Ecore_Drm_Device *dev) | 81 | _ecore_drm_tty_setup(Ecore_Drm_Device *dev) |
82 | { | 82 | { |
83 | struct stat st; | 83 | struct stat st; |
84 | int kmode; | 84 | int kmode; |
85 | struct vt_mode vtmode = { 0, 0, SIGUSR1, SIGUSR2, 0 }; | 85 | struct vt_mode vtmode = { 0, 0, SIGUSR1, SIGUSR2, 0 }; |
86 | 86 | ||
87 | if ((fstat(dev->tty.fd, &st) == -1) || | 87 | if ((fstat(dev->tty.fd, &st) == -1) || |
88 | (major(st.st_rdev) != TTY_MAJOR) || (minor(st.st_rdev) <= 0) || | 88 | (major(st.st_rdev) != TTY_MAJOR) || (minor(st.st_rdev) <= 0) || |
89 | (minor(st.st_rdev) >= 64)) | 89 | (minor(st.st_rdev) >= 64)) |
90 | { | 90 | { |
@@ -121,7 +121,7 @@ _ecore_drm_tty_setup(Ecore_Drm_Device *dev) | |||
121 | else if (dev->tty.kbd_mode == K_OFF) | 121 | else if (dev->tty.kbd_mode == K_OFF) |
122 | dev->tty.kbd_mode = K_UNICODE; | 122 | dev->tty.kbd_mode = K_UNICODE; |
123 | 123 | ||
124 | if (ioctl(dev->tty.fd, KDSKBMUTE, 1) && | 124 | if (ioctl(dev->tty.fd, KDSKBMUTE, 1) && |
125 | ioctl(dev->tty.fd, KDSKBMODE, K_OFF)) | 125 | ioctl(dev->tty.fd, KDSKBMODE, K_OFF)) |
126 | { | 126 | { |
127 | ERR("Could not set K_OFF keyboard mode: %m"); | 127 | ERR("Could not set K_OFF keyboard mode: %m"); |
@@ -156,11 +156,11 @@ err_kmode: | |||
156 | 156 | ||
157 | /** | 157 | /** |
158 | * @defgroup Ecore_Drm_Tty_Group Tty manipulation functions | 158 | * @defgroup Ecore_Drm_Tty_Group Tty manipulation functions |
159 | * | 159 | * |
160 | * Functions that deal with opening, closing, and otherwise using a tty | 160 | * Functions that deal with opening, closing, and otherwise using a tty |
161 | */ | 161 | */ |
162 | 162 | ||
163 | EAPI Eina_Bool | 163 | EAPI Eina_Bool |
164 | ecore_drm_tty_open(Ecore_Drm_Device *dev, const char *name) | 164 | ecore_drm_tty_open(Ecore_Drm_Device *dev, const char *name) |
165 | { | 165 | { |
166 | char tty[32] = "<stdin>"; | 166 | char tty[32] = "<stdin>"; |
@@ -219,8 +219,8 @@ ecore_drm_tty_open(Ecore_Drm_Device *dev, const char *name) | |||
219 | return EINA_FALSE; | 219 | return EINA_FALSE; |
220 | } | 220 | } |
221 | 221 | ||
222 | dev->tty.event_hdlr = | 222 | dev->tty.event_hdlr = |
223 | ecore_event_handler_add(ECORE_EVENT_SIGNAL_USER, | 223 | ecore_event_handler_add(ECORE_EVENT_SIGNAL_USER, |
224 | _ecore_drm_tty_cb_vt_signal, dev); | 224 | _ecore_drm_tty_cb_vt_signal, dev); |
225 | 225 | ||
226 | /* set current tty into env */ | 226 | /* set current tty into env */ |
@@ -240,7 +240,7 @@ _ecore_drm_tty_restore(Ecore_Drm_Device *dev) | |||
240 | if (ioctl(fd, KDSETMODE, KD_TEXT)) | 240 | if (ioctl(fd, KDSETMODE, KD_TEXT)) |
241 | ERR("Could not set KD_TEXT mode on tty: %m\n"); | 241 | ERR("Could not set KD_TEXT mode on tty: %m\n"); |
242 | 242 | ||
243 | if (ioctl(dev->tty.fd, KDSKBMUTE, 0) && | 243 | if (ioctl(dev->tty.fd, KDSKBMUTE, 0) && |
244 | ioctl(dev->tty.fd, KDSKBMODE, kbd_mode)) | 244 | ioctl(dev->tty.fd, KDSKBMODE, kbd_mode)) |
245 | { | 245 | { |
246 | ERR("Could not restore keyboard mode: %m"); | 246 | ERR("Could not restore keyboard mode: %m"); |
@@ -253,7 +253,7 @@ _ecore_drm_tty_restore(Ecore_Drm_Device *dev) | |||
253 | ERR("Could not reset VT handling\n"); | 253 | ERR("Could not reset VT handling\n"); |
254 | } | 254 | } |
255 | 255 | ||
256 | EAPI Eina_Bool | 256 | EAPI Eina_Bool |
257 | ecore_drm_tty_close(Ecore_Drm_Device *dev) | 257 | ecore_drm_tty_close(Ecore_Drm_Device *dev) |
258 | { | 258 | { |
259 | /* check for valid device */ | 259 | /* check for valid device */ |
@@ -276,7 +276,7 @@ ecore_drm_tty_close(Ecore_Drm_Device *dev) | |||
276 | return EINA_TRUE; | 276 | return EINA_TRUE; |
277 | } | 277 | } |
278 | 278 | ||
279 | EAPI Eina_Bool | 279 | EAPI Eina_Bool |
280 | ecore_drm_tty_release(Ecore_Drm_Device *dev) | 280 | ecore_drm_tty_release(Ecore_Drm_Device *dev) |
281 | { | 281 | { |
282 | /* check for valid device */ | 282 | /* check for valid device */ |
@@ -284,7 +284,7 @@ ecore_drm_tty_release(Ecore_Drm_Device *dev) | |||
284 | (dev->tty.fd < 0), EINA_FALSE); | 284 | (dev->tty.fd < 0), EINA_FALSE); |
285 | 285 | ||
286 | /* send ioctl for vt release */ | 286 | /* send ioctl for vt release */ |
287 | if (ioctl(dev->tty.fd, VT_RELDISP, 1) < 0) | 287 | if (ioctl(dev->tty.fd, VT_RELDISP, 1) < 0) |
288 | { | 288 | { |
289 | ERR("Could not release VT: %m"); | 289 | ERR("Could not release VT: %m"); |
290 | return EINA_FALSE; | 290 | return EINA_FALSE; |
@@ -293,7 +293,7 @@ ecore_drm_tty_release(Ecore_Drm_Device *dev) | |||
293 | return EINA_TRUE; | 293 | return EINA_TRUE; |
294 | } | 294 | } |
295 | 295 | ||
296 | EAPI Eina_Bool | 296 | EAPI Eina_Bool |
297 | ecore_drm_tty_acquire(Ecore_Drm_Device *dev) | 297 | ecore_drm_tty_acquire(Ecore_Drm_Device *dev) |
298 | { | 298 | { |
299 | /* check for valid device */ | 299 | /* check for valid device */ |
@@ -301,7 +301,7 @@ ecore_drm_tty_acquire(Ecore_Drm_Device *dev) | |||
301 | (dev->tty.fd < 0), EINA_FALSE); | 301 | (dev->tty.fd < 0), EINA_FALSE); |
302 | 302 | ||
303 | /* send ioctl for vt acquire */ | 303 | /* send ioctl for vt acquire */ |
304 | if (ioctl(dev->tty.fd, VT_RELDISP, VT_ACKACQ) < 0) | 304 | if (ioctl(dev->tty.fd, VT_RELDISP, VT_ACKACQ) < 0) |
305 | { | 305 | { |
306 | ERR("Could not acquire VT: %m"); | 306 | ERR("Could not acquire VT: %m"); |
307 | return EINA_FALSE; | 307 | return EINA_FALSE; |
@@ -310,7 +310,7 @@ ecore_drm_tty_acquire(Ecore_Drm_Device *dev) | |||
310 | return EINA_TRUE; | 310 | return EINA_TRUE; |
311 | } | 311 | } |
312 | 312 | ||
313 | EAPI int | 313 | EAPI int |
314 | ecore_drm_tty_get(Ecore_Drm_Device *dev) | 314 | ecore_drm_tty_get(Ecore_Drm_Device *dev) |
315 | { | 315 | { |
316 | /* check for valid device */ | 316 | /* check for valid device */ |
diff --git a/src/lib/ecore_evas/Ecore_Evas_Types.h b/src/lib/ecore_evas/Ecore_Evas_Types.h index fae0b0e16f..aa93c97164 100644 --- a/src/lib/ecore_evas/Ecore_Evas_Types.h +++ b/src/lib/ecore_evas/Ecore_Evas_Types.h | |||
@@ -12,7 +12,7 @@ | |||
12 | typedef unsigned int Ecore_X_Window; | 12 | typedef unsigned int Ecore_X_Window; |
13 | typedef unsigned int Ecore_X_Pixmap; | 13 | typedef unsigned int Ecore_X_Pixmap; |
14 | typedef unsigned int Ecore_X_Atom; | 14 | typedef unsigned int Ecore_X_Atom; |
15 | typedef struct _Ecore_X_Icon | 15 | typedef struct _Ecore_X_Icon |
16 | { | 16 | { |
17 | unsigned int width, height; | 17 | unsigned int width, height; |
18 | unsigned int *data; | 18 | unsigned int *data; |
diff --git a/src/lib/ecore_evas/ecore_evas_buffer.c b/src/lib/ecore_evas/ecore_evas_buffer.c index 390ddd4a99..2f3f2ff72b 100644 --- a/src/lib/ecore_evas/ecore_evas_buffer.c +++ b/src/lib/ecore_evas/ecore_evas_buffer.c | |||
@@ -239,7 +239,7 @@ _ecore_evas_buffer_coord_translate(Ecore_Evas *ee, Evas_Coord *x, Evas_Coord *y) | |||
239 | fw = ee->w; fh = ee->h; | 239 | fw = ee->w; fh = ee->h; |
240 | ww = ee->w; hh = ee->h; | 240 | ww = ee->w; hh = ee->h; |
241 | } | 241 | } |
242 | 242 | ||
243 | if ((fx == 0) && (fy == 0) && (fw == ww) && (fh == hh)) | 243 | if ((fx == 0) && (fy == 0) && (fw == ww) && (fh == hh)) |
244 | { | 244 | { |
245 | *x = (ee->w * (*x - xx)) / fw; | 245 | *x = (ee->w * (*x - xx)) / fw; |
@@ -262,12 +262,12 @@ _ecore_evas_buffer_coord_translate(Ecore_Evas *ee, Evas_Coord *x, Evas_Coord *y) | |||
262 | static void | 262 | static void |
263 | _ecore_evas_buffer_transfer_modifiers_locks(Evas *e, Evas *e2) | 263 | _ecore_evas_buffer_transfer_modifiers_locks(Evas *e, Evas *e2) |
264 | { | 264 | { |
265 | const char *mods[] = | 265 | const char *mods[] = |
266 | { "Shift", "Control", "Alt", "Meta", "Hyper", "Super", NULL }; | 266 | { "Shift", "Control", "Alt", "Meta", "Hyper", "Super", NULL }; |
267 | const char *locks[] = | 267 | const char *locks[] = |
268 | { "Scroll_Lock", "Num_Lock", "Caps_Lock", NULL }; | 268 | { "Scroll_Lock", "Num_Lock", "Caps_Lock", NULL }; |
269 | int i; | 269 | int i; |
270 | 270 | ||
271 | for (i = 0; mods[i]; i++) | 271 | for (i = 0; mods[i]; i++) |
272 | { | 272 | { |
273 | if (evas_key_modifier_is_set(evas_key_modifier_get(e), mods[i])) | 273 | if (evas_key_modifier_is_set(evas_key_modifier_get(e), mods[i])) |
@@ -532,7 +532,7 @@ _ecore_evas_buffer_alpha_set(Ecore_Evas *ee, int alpha) | |||
532 | else | 532 | else |
533 | { | 533 | { |
534 | Evas_Engine_Info_Buffer *einfo; | 534 | Evas_Engine_Info_Buffer *einfo; |
535 | 535 | ||
536 | einfo = (Evas_Engine_Info_Buffer *)evas_engine_info_get(ee->evas); | 536 | einfo = (Evas_Engine_Info_Buffer *)evas_engine_info_get(ee->evas); |
537 | if (einfo) | 537 | if (einfo) |
538 | { | 538 | { |
@@ -639,13 +639,13 @@ _ecore_evas_buffer_pointer_warp(const Ecore_Evas *ee, Evas_Coord x, Evas_Coord y | |||
639 | ev->root.y = y; | 639 | ev->root.y = y; |
640 | 640 | ||
641 | { | 641 | { |
642 | const char *mods[] = | 642 | const char *mods[] = |
643 | { "Shift", "Control", "Alt", "Super", NULL }; | 643 | { "Shift", "Control", "Alt", "Super", NULL }; |
644 | int modifiers[] = | 644 | int modifiers[] = |
645 | { ECORE_EVENT_MODIFIER_SHIFT, ECORE_EVENT_MODIFIER_CTRL, ECORE_EVENT_MODIFIER_ALT, | 645 | { ECORE_EVENT_MODIFIER_SHIFT, ECORE_EVENT_MODIFIER_CTRL, ECORE_EVENT_MODIFIER_ALT, |
646 | ECORE_EVENT_MODIFIER_WIN, 0 }; | 646 | ECORE_EVENT_MODIFIER_WIN, 0 }; |
647 | int i; | 647 | int i; |
648 | 648 | ||
649 | for (i = 0; mods[i]; i++) | 649 | for (i = 0; mods[i]; i++) |
650 | if (evas_key_modifier_is_set(evas_key_modifier_get(ee->evas), mods[i])) | 650 | if (evas_key_modifier_is_set(evas_key_modifier_get(ee->evas), mods[i])) |
651 | ev->modifiers |= modifiers[i]; | 651 | ev->modifiers |= modifiers[i]; |
diff --git a/src/lib/ecore_evas/ecore_evas_ews.c b/src/lib/ecore_evas/ecore_evas_ews.c index 77a33f7094..86e939f765 100644 --- a/src/lib/ecore_evas/ecore_evas_ews.c +++ b/src/lib/ecore_evas/ecore_evas_ews.c | |||
@@ -644,7 +644,7 @@ static const Ecore_Evas_Engine_Func _ecore_ews_engine_func = | |||
644 | _ecore_evas_ews_transparent_set, | 644 | _ecore_evas_ews_transparent_set, |
645 | NULL, // profiles_set | 645 | NULL, // profiles_set |
646 | NULL, // profile_set | 646 | NULL, // profile_set |
647 | 647 | ||
648 | NULL, | 648 | NULL, |
649 | NULL, | 649 | NULL, |
650 | NULL, | 650 | NULL, |
diff --git a/src/lib/ecore_evas/ecore_evas_extn.h b/src/lib/ecore_evas/ecore_evas_extn.h index 67d9dffb76..dab82f69d9 100644 --- a/src/lib/ecore_evas/ecore_evas_extn.h +++ b/src/lib/ecore_evas/ecore_evas_extn.h | |||
@@ -3,7 +3,7 @@ | |||
3 | 3 | ||
4 | typedef struct _Ecore_Evas_Interface_Extn Ecore_Evas_Interface_Extn; | 4 | typedef struct _Ecore_Evas_Interface_Extn Ecore_Evas_Interface_Extn; |
5 | 5 | ||
6 | struct _Ecore_Evas_Interface_Extn | 6 | struct _Ecore_Evas_Interface_Extn |
7 | { | 7 | { |
8 | Ecore_Evas_Interface base; | 8 | Ecore_Evas_Interface base; |
9 | 9 | ||
diff --git a/src/lib/ecore_evas/ecore_evas_wayland.h b/src/lib/ecore_evas/ecore_evas_wayland.h index 2d6faa2ea8..b36d93cff0 100644 --- a/src/lib/ecore_evas/ecore_evas_wayland.h +++ b/src/lib/ecore_evas/ecore_evas_wayland.h | |||
@@ -3,7 +3,7 @@ | |||
3 | 3 | ||
4 | typedef struct _Ecore_Evas_Interface_Wayland Ecore_Evas_Interface_Wayland; | 4 | typedef struct _Ecore_Evas_Interface_Wayland Ecore_Evas_Interface_Wayland; |
5 | 5 | ||
6 | struct _Ecore_Evas_Interface_Wayland | 6 | struct _Ecore_Evas_Interface_Wayland |
7 | { | 7 | { |
8 | Ecore_Evas_Interface base; | 8 | Ecore_Evas_Interface base; |
9 | 9 | ||
diff --git a/src/lib/ecore_fb/ecore_fb.c b/src/lib/ecore_fb/ecore_fb.c index 0d90242d0b..c3f1014129 100644 --- a/src/lib/ecore_fb/ecore_fb.c +++ b/src/lib/ecore_fb/ecore_fb.c | |||
@@ -57,7 +57,7 @@ ecore_fb_init(const char *name) | |||
57 | { | 57 | { |
58 | oldhand = signal(SIGINT, nosigint); | 58 | oldhand = signal(SIGINT, nosigint); |
59 | } | 59 | } |
60 | 60 | ||
61 | _ecore_fb_size_get(name, &_ecore_fb_console_w, &_ecore_fb_console_h); | 61 | _ecore_fb_size_get(name, &_ecore_fb_console_w, &_ecore_fb_console_h); |
62 | 62 | ||
63 | return _ecore_fb_init_count; | 63 | return _ecore_fb_init_count; |
diff --git a/src/lib/ecore_fb/ecore_fb_li.c b/src/lib/ecore_fb/ecore_fb_li.c index 9e8025df77..bc253522b7 100644 --- a/src/lib/ecore_fb/ecore_fb_li.c +++ b/src/lib/ecore_fb/ecore_fb_li.c | |||
@@ -47,7 +47,7 @@ _ecore_fb_li_device_event_key(Ecore_Fb_Input_Device *dev, struct input_event *ie | |||
47 | { | 47 | { |
48 | int offset = 0; | 48 | int offset = 0; |
49 | const char *keyname = _ecore_fb_li_kbd_syms[iev->code * 7]; | 49 | const char *keyname = _ecore_fb_li_kbd_syms[iev->code * 7]; |
50 | 50 | ||
51 | /* check the key table */ | 51 | /* check the key table */ |
52 | if (iev->value) | 52 | if (iev->value) |
53 | { | 53 | { |
@@ -102,11 +102,11 @@ _ecore_fb_li_device_event_key(Ecore_Fb_Input_Device *dev, struct input_event *ie | |||
102 | 102 | ||
103 | const char *key = _ecore_fb_li_kbd_syms[(iev->code * 7) + offset]; | 103 | const char *key = _ecore_fb_li_kbd_syms[(iev->code * 7) + offset]; |
104 | const char *compose = _ecore_fb_li_kbd_syms[(iev->code * 7) + 3 + offset]; | 104 | const char *compose = _ecore_fb_li_kbd_syms[(iev->code * 7) + 3 + offset]; |
105 | 105 | ||
106 | if (dev->keyboard.ctrl) | 106 | if (dev->keyboard.ctrl) |
107 | { | 107 | { |
108 | const char *ts = _ecore_fb_li_kbd_syms[(iev->code * 7) + 3 + 3]; | 108 | const char *ts = _ecore_fb_li_kbd_syms[(iev->code * 7) + 3 + 3]; |
109 | 109 | ||
110 | if (ts) compose = ts; | 110 | if (ts) compose = ts; |
111 | } | 111 | } |
112 | 112 | ||
diff --git a/src/lib/ecore_fb/ecore_fb_private.h b/src/lib/ecore_fb/ecore_fb_private.h index e48c7b09f8..b9bdd6d70a 100644 --- a/src/lib/ecore_fb/ecore_fb_private.h +++ b/src/lib/ecore_fb/ecore_fb_private.h | |||
@@ -18,7 +18,7 @@ | |||
18 | #include <linux/vt.h> | 18 | #include <linux/vt.h> |
19 | #include <linux/fb.h> | 19 | #include <linux/fb.h> |
20 | #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,15)) && (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,18)) | 20 | #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,15)) && (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,18)) |
21 | #define kernel_ulong_t unsigned long | 21 | #define kernel_ulong_t unsigned long |
22 | #define BITS_PER_LONG 32 | 22 | #define BITS_PER_LONG 32 |
23 | #include <linux/input.h> | 23 | #include <linux/input.h> |
24 | #undef kernel_ulong_t | 24 | #undef kernel_ulong_t |
@@ -53,7 +53,7 @@ struct _Ecore_Fb_Input_Device | |||
53 | int fd; | 53 | int fd; |
54 | Ecore_Fd_Handler *handler; | 54 | Ecore_Fd_Handler *handler; |
55 | int listen; | 55 | int listen; |
56 | struct | 56 | struct |
57 | { | 57 | { |
58 | Ecore_Fb_Input_Device_Cap cap; | 58 | Ecore_Fb_Input_Device_Cap cap; |
59 | char *name; | 59 | char *name; |
@@ -105,7 +105,7 @@ void ecore_fb_vt_shutdown(void); | |||
105 | #ifndef TS_GET_CAL | 105 | #ifndef TS_GET_CAL |
106 | #define TS_GET_CAL 0x8014660a | 106 | #define TS_GET_CAL 0x8014660a |
107 | #endif | 107 | #endif |
108 | 108 | ||
109 | #undef EAPI | 109 | #undef EAPI |
110 | #define EAPI | 110 | #define EAPI |
111 | 111 | ||
diff --git a/src/lib/ecore_file/Ecore_File.h b/src/lib/ecore_file/Ecore_File.h index 37f3bd8a0c..8c17daa58a 100644 --- a/src/lib/ecore_file/Ecore_File.h +++ b/src/lib/ecore_file/Ecore_File.h | |||
@@ -92,7 +92,7 @@ typedef void (*Ecore_File_Download_Completion_Cb)(void *data, const char *file, | |||
92 | 92 | ||
93 | /** | 93 | /** |
94 | * @typedef _Ecore_File_Progress_Return | 94 | * @typedef _Ecore_File_Progress_Return |
95 | * What to do with the download as a return from the | 95 | * What to do with the download as a return from the |
96 | * Ecore_File_Download_Progress_Cb function, if provided. | 96 | * Ecore_File_Download_Progress_Cb function, if provided. |
97 | */ | 97 | */ |
98 | typedef enum _Ecore_File_Progress_Return | 98 | typedef enum _Ecore_File_Progress_Return |
@@ -518,7 +518,7 @@ EAPI int ecore_file_dir_is_empty (const char *dir); | |||
518 | * This function monitors @p path. If @p path is @c NULL, or is an | 518 | * This function monitors @p path. If @p path is @c NULL, or is an |
519 | * empty string, or none of the notify methods (Inotify, Windows | 519 | * empty string, or none of the notify methods (Inotify, Windows |
520 | * notification or polling) is available, or if @p path does not exist | 520 | * notification or polling) is available, or if @p path does not exist |
521 | * the function returns @c NULL. Otherwise, it returns a newly | 521 | * the function returns @c NULL. Otherwise, it returns a newly |
522 | * allocated Ecore_File_Monitor object and the monitoring begins. | 522 | * allocated Ecore_File_Monitor object and the monitoring begins. |
523 | * When one of the Ecore_File_Event event is notified, @p func is called | 523 | * When one of the Ecore_File_Event event is notified, @p func is called |
524 | * and @p data is passed to @p func.Call ecore_file_monitor_del() to | 524 | * and @p data is passed to @p func.Call ecore_file_monitor_del() to |
diff --git a/src/lib/ecore_file/ecore_file_monitor_poll.c b/src/lib/ecore_file/ecore_file_monitor_poll.c index d2034dc7ab..84e82d4694 100644 --- a/src/lib/ecore_file/ecore_file_monitor_poll.c +++ b/src/lib/ecore_file/ecore_file_monitor_poll.c | |||
@@ -119,8 +119,8 @@ ecore_file_monitor_backend_add(const char *path, | |||
119 | f->name = file; | 119 | f->name = file; |
120 | f->mtime = ecore_file_mod_time(buf); | 120 | f->mtime = ecore_file_mod_time(buf); |
121 | f->is_dir = ecore_file_is_dir(buf); | 121 | f->is_dir = ecore_file_is_dir(buf); |
122 | em->files = | 122 | em->files = |
123 | (Ecore_File *) eina_inlist_append(EINA_INLIST_GET(em->files), | 123 | (Ecore_File *) eina_inlist_append(EINA_INLIST_GET(em->files), |
124 | EINA_INLIST_GET(f)); | 124 | EINA_INLIST_GET(f)); |
125 | } | 125 | } |
126 | } | 126 | } |
diff --git a/src/lib/ecore_imf/ecore_imf_context.c b/src/lib/ecore_imf/ecore_imf_context.c index 270004e81b..5ade47002b 100644 --- a/src/lib/ecore_imf/ecore_imf_context.c +++ b/src/lib/ecore_imf/ecore_imf_context.c | |||
@@ -906,7 +906,7 @@ ecore_imf_context_input_panel_show(Ecore_IMF_Context *ctx) | |||
906 | } | 906 | } |
907 | 907 | ||
908 | show_req_ctx = ctx; | 908 | show_req_ctx = ctx; |
909 | if ((ctx->input_panel_enabled) || | 909 | if ((ctx->input_panel_enabled) || |
910 | (getenv("ECORE_IMF_INPUT_PANEL_ENABLED"))) | 910 | (getenv("ECORE_IMF_INPUT_PANEL_ENABLED"))) |
911 | { | 911 | { |
912 | if (ctx->klass && ctx->klass->show) ctx->klass->show(ctx); | 912 | if (ctx->klass && ctx->klass->show) ctx->klass->show(ctx); |
@@ -923,7 +923,7 @@ ecore_imf_context_input_panel_hide(Ecore_IMF_Context *ctx) | |||
923 | return; | 923 | return; |
924 | } | 924 | } |
925 | 925 | ||
926 | if ((ctx->input_panel_enabled) || | 926 | if ((ctx->input_panel_enabled) || |
927 | (getenv("ECORE_IMF_INPUT_PANEL_ENABLED"))) | 927 | (getenv("ECORE_IMF_INPUT_PANEL_ENABLED"))) |
928 | { | 928 | { |
929 | if (ctx->klass && ctx->klass->hide) ctx->klass->hide(ctx); | 929 | if (ctx->klass && ctx->klass->hide) ctx->klass->hide(ctx); |
diff --git a/src/lib/ecore_input/Ecore_Input.h b/src/lib/ecore_input/Ecore_Input.h index 0e28909729..1c8763818b 100644 --- a/src/lib/ecore_input/Ecore_Input.h +++ b/src/lib/ecore_input/Ecore_Input.h | |||
@@ -130,7 +130,7 @@ extern "C" { | |||
130 | * An enum of Compose states. | 130 | * An enum of Compose states. |
131 | */ | 131 | */ |
132 | typedef enum _Ecore_Compose_State | 132 | typedef enum _Ecore_Compose_State |
133 | { | 133 | { |
134 | ECORE_COMPOSE_NONE, | 134 | ECORE_COMPOSE_NONE, |
135 | ECORE_COMPOSE_MIDDLE, | 135 | ECORE_COMPOSE_MIDDLE, |
136 | ECORE_COMPOSE_DONE | 136 | ECORE_COMPOSE_DONE |
@@ -202,10 +202,10 @@ extern "C" { | |||
202 | Ecore_Window window; /**< The main window where event happened */ | 202 | Ecore_Window window; /**< The main window where event happened */ |
203 | Ecore_Window root_window; /**< The root window where event happened */ | 203 | Ecore_Window root_window; /**< The root window where event happened */ |
204 | Ecore_Window event_window; /**< The child window where event happened */ | 204 | Ecore_Window event_window; /**< The child window where event happened */ |
205 | 205 | ||
206 | unsigned int timestamp; /**< Time when the event occurred */ | 206 | unsigned int timestamp; /**< Time when the event occurred */ |
207 | unsigned int modifiers; /**< The combination of modifiers key (SHIFT,CTRL,ALT,..)*/ | 207 | unsigned int modifiers; /**< The combination of modifiers key (SHIFT,CTRL,ALT,..)*/ |
208 | 208 | ||
209 | int same_screen; /**< same screen flag */ | 209 | int same_screen; /**< same screen flag */ |
210 | 210 | ||
211 | unsigned int keycode; /**< Key scan code numeric value @since 1.10 */ | 211 | unsigned int keycode; /**< Key scan code numeric value @since 1.10 */ |
@@ -231,14 +231,14 @@ extern "C" { | |||
231 | unsigned int double_click; /**< Double click event */ | 231 | unsigned int double_click; /**< Double click event */ |
232 | unsigned int triple_click; /**< Triple click event */ | 232 | unsigned int triple_click; /**< Triple click event */ |
233 | int same_screen; /**< Same screen flag */ | 233 | int same_screen; /**< Same screen flag */ |
234 | 234 | ||
235 | int x; /**< x coordinate relative to window where event happened */ | 235 | int x; /**< x coordinate relative to window where event happened */ |
236 | int y; /**< y coordinate relative to window where event happened */ | 236 | int y; /**< y coordinate relative to window where event happened */ |
237 | struct { | 237 | struct { |
238 | int x; | 238 | int x; |
239 | int y; | 239 | int y; |
240 | } root; /**< Coordinates relative to root window */ | 240 | } root; /**< Coordinates relative to root window */ |
241 | 241 | ||
242 | struct { | 242 | struct { |
243 | int device; /**< 0 if normal mouse, 1+ for other mouse-devices (eg multi-touch - other fingers) */ | 243 | int device; /**< 0 if normal mouse, 1+ for other mouse-devices (eg multi-touch - other fingers) */ |
244 | double radius, radius_x, radius_y; /**< radius of press point - radius_x and y if its an ellipse (radius is the average of the 2) */ | 244 | double radius, radius_x, radius_y; /**< radius of press point - radius_x and y if its an ellipse (radius is the average of the 2) */ |
@@ -262,14 +262,14 @@ extern "C" { | |||
262 | Ecore_Window window; /**< The main window where event happened */ | 262 | Ecore_Window window; /**< The main window where event happened */ |
263 | Ecore_Window root_window; /**< The root window where event happened */ | 263 | Ecore_Window root_window; /**< The root window where event happened */ |
264 | Ecore_Window event_window; /**< The child window where event happened */ | 264 | Ecore_Window event_window; /**< The child window where event happened */ |
265 | 265 | ||
266 | unsigned int timestamp; /**< Time when the event occurred */ | 266 | unsigned int timestamp; /**< Time when the event occurred */ |
267 | unsigned int modifiers; /**< The combination of modifiers key (SHIFT,CTRL,ALT,..)*/ | 267 | unsigned int modifiers; /**< The combination of modifiers key (SHIFT,CTRL,ALT,..)*/ |
268 | 268 | ||
269 | int same_screen; /**< Same screen flag */ | 269 | int same_screen; /**< Same screen flag */ |
270 | int direction; /**< Orientation of the wheel (horizontal/vertical) */ | 270 | int direction; /**< Orientation of the wheel (horizontal/vertical) */ |
271 | int z; /**< Value of the wheel event (+1/-1) */ | 271 | int z; /**< Value of the wheel event (+1/-1) */ |
272 | 272 | ||
273 | int x; /**< x coordinate relative to window where event happened */ | 273 | int x; /**< x coordinate relative to window where event happened */ |
274 | int y; /**< y coordinate relative to window where event happened */ | 274 | int y; /**< y coordinate relative to window where event happened */ |
275 | struct { | 275 | struct { |
@@ -289,19 +289,19 @@ extern "C" { | |||
289 | Ecore_Window window; /**< The main window where event happened */ | 289 | Ecore_Window window; /**< The main window where event happened */ |
290 | Ecore_Window root_window; /**< The root window where event happened */ | 290 | Ecore_Window root_window; /**< The root window where event happened */ |
291 | Ecore_Window event_window; /**< The child window where event happened */ | 291 | Ecore_Window event_window; /**< The child window where event happened */ |
292 | 292 | ||
293 | unsigned int timestamp; /**< Time when the event occurred */ | 293 | unsigned int timestamp; /**< Time when the event occurred */ |
294 | unsigned int modifiers; /**< The combination of modifiers key (SHIFT,CTRL,ALT,..)*/ | 294 | unsigned int modifiers; /**< The combination of modifiers key (SHIFT,CTRL,ALT,..)*/ |
295 | 295 | ||
296 | int same_screen; /**< Same screen flag */ | 296 | int same_screen; /**< Same screen flag */ |
297 | 297 | ||
298 | int x; /**< x coordinate relative to window where event happened */ | 298 | int x; /**< x coordinate relative to window where event happened */ |
299 | int y; /**< y coordinate relative to window where event happened */ | 299 | int y; /**< y coordinate relative to window where event happened */ |
300 | struct { | 300 | struct { |
301 | int x; | 301 | int x; |
302 | int y; | 302 | int y; |
303 | } root; /**< Coordinates relative to root window */ | 303 | } root; /**< Coordinates relative to root window */ |
304 | 304 | ||
305 | struct { | 305 | struct { |
306 | int device; /**< 0 if normal mouse, 1+ for other mouse-devices (eg multi-touch - other fingers) */ | 306 | int device; /**< 0 if normal mouse, 1+ for other mouse-devices (eg multi-touch - other fingers) */ |
307 | double radius, radius_x, radius_y; /**< radius of press point - radius_x and y if its an ellipse (radius is the average of the 2) */ | 307 | double radius, radius_x, radius_y; /**< radius of press point - radius_x and y if its an ellipse (radius is the average of the 2) */ |
@@ -367,10 +367,10 @@ extern "C" { | |||
367 | { | 367 | { |
368 | Ecore_Window window; /**< The main window where event happened */ | 368 | Ecore_Window window; /**< The main window where event happened */ |
369 | Ecore_Window event_window; /**< The child window where event happened */ | 369 | Ecore_Window event_window; /**< The child window where event happened */ |
370 | 370 | ||
371 | unsigned int timestamp; /**< Time when the event occurred */ | 371 | unsigned int timestamp; /**< Time when the event occurred */ |
372 | unsigned int modifiers; /**< The combination of modifiers key (SHIFT,CTRL,ALT,..)*/ | 372 | unsigned int modifiers; /**< The combination of modifiers key (SHIFT,CTRL,ALT,..)*/ |
373 | 373 | ||
374 | int x; /**< x coordinate relative to window where event happened */ | 374 | int x; /**< x coordinate relative to window where event happened */ |
375 | int y; /**< y coordinate relative to window where event happened */ | 375 | int y; /**< y coordinate relative to window where event happened */ |
376 | 376 | ||
diff --git a/src/lib/ecore_input/ecore_input_compose.c b/src/lib/ecore_input/ecore_input_compose.c index 13b90bca09..1c52f550dd 100644 --- a/src/lib/ecore_input/ecore_input_compose.c +++ b/src/lib/ecore_input/ecore_input_compose.c | |||
@@ -52,7 +52,7 @@ ecore_compose_get(const Eina_List *seq, char **seqstr_ret) | |||
52 | for (p = comp; (p < pend) && s;) | 52 | for (p = comp; (p < pend) && s;) |
53 | { | 53 | { |
54 | int len, jump = -1, bsize = -1; | 54 | int len, jump = -1, bsize = -1; |
55 | 55 | ||
56 | len = strlen(p); | 56 | len = strlen(p); |
57 | psz = (unsigned char *)(p + len + 1); | 57 | psz = (unsigned char *)(p + len + 1); |
58 | // decode jump amount to next entry | 58 | // decode jump amount to next entry |
diff --git a/src/lib/ecore_input/ecore_input_private.h b/src/lib/ecore_input/ecore_input_private.h index 4d085a19b4..8f53892ac7 100644 --- a/src/lib/ecore_input/ecore_input_private.h +++ b/src/lib/ecore_input/ecore_input_private.h | |||
@@ -4,7 +4,7 @@ | |||
4 | extern int _ecore_input_log_dom; | 4 | extern int _ecore_input_log_dom; |
5 | 5 | ||
6 | #ifdef ECORE_INPUT_DEFAULT_LOG_COLOR | 6 | #ifdef ECORE_INPUT_DEFAULT_LOG_COLOR |
7 | # undef ECORE_INPUT_DEFAULT_LOG_COLOR | 7 | # undef ECORE_INPUT_DEFAULT_LOG_COLOR |
8 | #endif | 8 | #endif |
9 | 9 | ||
10 | #define ECORE_INPUT_DEFAULT_LOG_COLOR EINA_COLOR_BLUE | 10 | #define ECORE_INPUT_DEFAULT_LOG_COLOR EINA_COLOR_BLUE |
diff --git a/src/lib/ecore_input_evas/Ecore_Input_Evas.h b/src/lib/ecore_input_evas/Ecore_Input_Evas.h index 1ec065613f..27765e6982 100644 --- a/src/lib/ecore_input_evas/Ecore_Input_Evas.h +++ b/src/lib/ecore_input_evas/Ecore_Input_Evas.h | |||
@@ -37,7 +37,7 @@ typedef void (*Ecore_Event_Mouse_Move_Cb)(void *window, int x, int y, unsigned i | |||
37 | typedef void (*Ecore_Event_Multi_Move_Cb)(void *window, int device, int x, int y, double radius, double radius_x, double radius_y, double pressure, double angle, double mx, double my, unsigned int timestamp); | 37 | typedef void (*Ecore_Event_Multi_Move_Cb)(void *window, int device, int x, int y, double radius, double radius_x, double radius_y, double pressure, double angle, double mx, double my, unsigned int timestamp); |
38 | typedef void (*Ecore_Event_Multi_Down_Cb)(void *window, int device, int x, int y, double radius, double radius_x, double radius_y, double pressure, double angle, double mx, double my, Evas_Button_Flags flags, unsigned int timestamp); | 38 | typedef void (*Ecore_Event_Multi_Down_Cb)(void *window, int device, int x, int y, double radius, double radius_x, double radius_y, double pressure, double angle, double mx, double my, Evas_Button_Flags flags, unsigned int timestamp); |
39 | typedef void (*Ecore_Event_Multi_Up_Cb)(void *window, int device, int x, int y, double radius, double radius_x, double radius_y, double pressure, double angle, double mx, double my, Evas_Button_Flags flags, unsigned int timestamp); | 39 | typedef void (*Ecore_Event_Multi_Up_Cb)(void *window, int device, int x, int y, double radius, double radius_x, double radius_y, double pressure, double angle, double mx, double my, Evas_Button_Flags flags, unsigned int timestamp); |
40 | 40 | ||
41 | EAPI int ecore_event_evas_init(void); | 41 | EAPI int ecore_event_evas_init(void); |
42 | EAPI int ecore_event_evas_shutdown(void); | 42 | EAPI int ecore_event_evas_shutdown(void); |
43 | 43 | ||
diff --git a/src/lib/ecore_input_evas/ecore_input_evas_private.h b/src/lib/ecore_input_evas/ecore_input_evas_private.h index 1956e10664..972cf3e7af 100644 --- a/src/lib/ecore_input_evas/ecore_input_evas_private.h +++ b/src/lib/ecore_input_evas/ecore_input_evas_private.h | |||
@@ -4,7 +4,7 @@ | |||
4 | extern int _ecore_input_evas_log_dom; | 4 | extern int _ecore_input_evas_log_dom; |
5 | 5 | ||
6 | #ifdef ECORE_INPUT_EVAS_DEFAULT_LOG_COLOR | 6 | #ifdef ECORE_INPUT_EVAS_DEFAULT_LOG_COLOR |
7 | #undef ECORE_INPUT_EVAS_DEFAULT_LOG_COLOR | 7 | #undef ECORE_INPUT_EVAS_DEFAULT_LOG_COLOR |
8 | #endif | 8 | #endif |
9 | 9 | ||
10 | #define ECORE_INPUT_EVAS_DEFAULT_LOG_COLOR EINA_COLOR_BLUE | 10 | #define ECORE_INPUT_EVAS_DEFAULT_LOG_COLOR EINA_COLOR_BLUE |
diff --git a/src/lib/ecore_ipc/Ecore_Ipc.h b/src/lib/ecore_ipc/Ecore_Ipc.h index 5da43c7639..6881141cf6 100644 --- a/src/lib/ecore_ipc/Ecore_Ipc.h +++ b/src/lib/ecore_ipc/Ecore_Ipc.h | |||
@@ -133,7 +133,7 @@ EAPI unsigned long long _ecore_ipc_swap_64(unsigned long long v) EINA_DEPRECATED | |||
133 | p->v = (char *)ptr; \ | 133 | p->v = (char *)ptr; \ |
134 | ptr += strlen(p->v) + 1; \ | 134 | ptr += strlen(p->v) + 1; \ |
135 | } \ | 135 | } \ |
136 | } | 136 | } |
137 | #define ECORE_IPC_PUTS(v, l)\ | 137 | #define ECORE_IPC_PUTS(v, l)\ |
138 | { \ | 138 | { \ |
139 | strcpy((char *)ptr, p->v); \ | 139 | strcpy((char *)ptr, p->v); \ |
@@ -234,7 +234,7 @@ typedef enum _Ecore_Ipc_Type | |||
234 | ECORE_IPC_USE_SSL = (1 << 4), | 234 | ECORE_IPC_USE_SSL = (1 << 4), |
235 | ECORE_IPC_NO_PROXY = (1 << 5) | 235 | ECORE_IPC_NO_PROXY = (1 << 5) |
236 | } Ecore_Ipc_Type; | 236 | } Ecore_Ipc_Type; |
237 | 237 | ||
238 | typedef struct _Ecore_Ipc_Event_Client_Add Ecore_Ipc_Event_Client_Add; | 238 | typedef struct _Ecore_Ipc_Event_Client_Add Ecore_Ipc_Event_Client_Add; |
239 | typedef struct _Ecore_Ipc_Event_Client_Del Ecore_Ipc_Event_Client_Del; | 239 | typedef struct _Ecore_Ipc_Event_Client_Del Ecore_Ipc_Event_Client_Del; |
240 | typedef struct _Ecore_Ipc_Event_Server_Add Ecore_Ipc_Event_Server_Add; | 240 | typedef struct _Ecore_Ipc_Event_Server_Add Ecore_Ipc_Event_Server_Add; |
@@ -318,7 +318,7 @@ struct _Ecore_Ipc_Event_Server_Data | |||
318 | void *data; /**< The message data */ | 318 | void *data; /**< The message data */ |
319 | int size; /**< The data length (in bytes) */ | 319 | int size; /**< The data length (in bytes) */ |
320 | }; | 320 | }; |
321 | 321 | ||
322 | EAPI extern int ECORE_IPC_EVENT_CLIENT_ADD; | 322 | EAPI extern int ECORE_IPC_EVENT_CLIENT_ADD; |
323 | EAPI extern int ECORE_IPC_EVENT_CLIENT_DEL; | 323 | EAPI extern int ECORE_IPC_EVENT_CLIENT_DEL; |
324 | EAPI extern int ECORE_IPC_EVENT_SERVER_ADD; | 324 | EAPI extern int ECORE_IPC_EVENT_SERVER_ADD; |
diff --git a/src/lib/ecore_ipc/ecore_ipc.c b/src/lib/ecore_ipc/ecore_ipc.c index bd4d76bc65..c21cbcc965 100644 --- a/src/lib/ecore_ipc/ecore_ipc.c +++ b/src/lib/ecore_ipc/ecore_ipc.c | |||
@@ -277,7 +277,7 @@ ecore_ipc_post_event_client_del(Ecore_Ipc_Client *cl) | |||
277 | Ecore_Ipc_Event_Client_Del *ev; | 277 | Ecore_Ipc_Event_Client_Del *ev; |
278 | 278 | ||
279 | if (cl->delete_me) return; | 279 | if (cl->delete_me) return; |
280 | 280 | ||
281 | cl->delete_me = EINA_TRUE; | 281 | cl->delete_me = EINA_TRUE; |
282 | 282 | ||
283 | ev = calloc(1, sizeof(Ecore_Ipc_Event_Client_Del)); | 283 | ev = calloc(1, sizeof(Ecore_Ipc_Event_Client_Del)); |
diff --git a/src/lib/ecore_ipc/ecore_ipc_private.h b/src/lib/ecore_ipc/ecore_ipc_private.h index c964acd733..b918f3dd64 100644 --- a/src/lib/ecore_ipc/ecore_ipc_private.h +++ b/src/lib/ecore_ipc/ecore_ipc_private.h | |||
@@ -79,15 +79,15 @@ struct _Ecore_Ipc_Client | |||
79 | unsigned char *buf; | 79 | unsigned char *buf; |
80 | int buf_size; | 80 | int buf_size; |
81 | int max_buf_size; | 81 | int max_buf_size; |
82 | 82 | ||
83 | struct { | 83 | struct { |
84 | Ecore_Ipc_Msg_Head i, o; | 84 | Ecore_Ipc_Msg_Head i, o; |
85 | } prev; | 85 | } prev; |
86 | 86 | ||
87 | int event_count; | 87 | int event_count; |
88 | Eina_Bool delete_me : 1; | 88 | Eina_Bool delete_me : 1; |
89 | }; | 89 | }; |
90 | 90 | ||
91 | struct _Ecore_Ipc_Server | 91 | struct _Ecore_Ipc_Server |
92 | { | 92 | { |
93 | ECORE_MAGIC; | 93 | ECORE_MAGIC; |
@@ -112,7 +112,7 @@ struct _Ecore_Ipc_Server | |||
112 | struct { | 112 | struct { |
113 | Ecore_Ipc_Msg_Head i, o; | 113 | Ecore_Ipc_Msg_Head i, o; |
114 | } prev; | 114 | } prev; |
115 | 115 | ||
116 | int event_count; | 116 | int event_count; |
117 | Eina_Bool delete_me : 1; | 117 | Eina_Bool delete_me : 1; |
118 | }; | 118 | }; |
diff --git a/src/lib/ecore_sdl/Ecore_Sdl.h b/src/lib/ecore_sdl/Ecore_Sdl.h index 50b87069ad..c110f14f3d 100644 --- a/src/lib/ecore_sdl/Ecore_Sdl.h +++ b/src/lib/ecore_sdl/Ecore_Sdl.h | |||
@@ -100,7 +100,7 @@ struct _Ecore_Sdl_Event_Mouse_Button_Up /** SDL Mouse Up event */ | |||
100 | }; | 100 | }; |
101 | 101 | ||
102 | typedef struct _Ecore_Sdl_Event_Mouse_Move Ecore_Sdl_Event_Mouse_Move; | 102 | typedef struct _Ecore_Sdl_Event_Mouse_Move Ecore_Sdl_Event_Mouse_Move; |
103 | struct _Ecore_Sdl_Event_Mouse_Move /** SDL Mouse Move event */ | 103 | struct _Ecore_Sdl_Event_Mouse_Move /** SDL Mouse Move event */ |
104 | { | 104 | { |
105 | int x; /**< Mouse co-ordinates where the mouse cursor moved to */ | 105 | int x; /**< Mouse co-ordinates where the mouse cursor moved to */ |
106 | int y; /**< Mouse co-ordinates where the mouse cursor moved to */ | 106 | int y; /**< Mouse co-ordinates where the mouse cursor moved to */ |
diff --git a/src/lib/ecore_sdl/ecore_sdl_private.h b/src/lib/ecore_sdl/ecore_sdl_private.h index 593083a957..8d584e53cb 100644 --- a/src/lib/ecore_sdl/ecore_sdl_private.h +++ b/src/lib/ecore_sdl/ecore_sdl_private.h | |||
@@ -4,33 +4,33 @@ | |||
4 | extern int _ecore_sdl_log_dom; | 4 | extern int _ecore_sdl_log_dom; |
5 | 5 | ||
6 | # ifdef ECORE_SDL_DEFAULT_LOG_COLOR | 6 | # ifdef ECORE_SDL_DEFAULT_LOG_COLOR |
7 | # undef ECORE_SDL_DEFAULT_LOG_COLOR | 7 | # undef ECORE_SDL_DEFAULT_LOG_COLOR |
8 | # endif | 8 | # endif |
9 | # define ECORE_SDL_DEFAULT_LOG_COLOR EINA_COLOR_BLUE | 9 | # define ECORE_SDL_DEFAULT_LOG_COLOR EINA_COLOR_BLUE |
10 | 10 | ||
11 | # ifdef ERR | 11 | # ifdef ERR |
12 | # undef ERR | 12 | # undef ERR |
13 | # endif | 13 | # endif |
14 | # define ERR(...) EINA_LOG_DOM_ERR(_ecore_sdl_log_dom, __VA_ARGS__) | 14 | # define ERR(...) EINA_LOG_DOM_ERR(_ecore_sdl_log_dom, __VA_ARGS__) |
15 | 15 | ||
16 | # ifdef DBG | 16 | # ifdef DBG |
17 | # undef DBG | 17 | # undef DBG |
18 | # endif | 18 | # endif |
19 | # define DBG(...) EINA_LOG_DOM_DBG(_ecore_sdl_log_dom, __VA_ARGS__) | 19 | # define DBG(...) EINA_LOG_DOM_DBG(_ecore_sdl_log_dom, __VA_ARGS__) |
20 | 20 | ||
21 | # ifdef INF | 21 | # ifdef INF |
22 | # undef INF | 22 | # undef INF |
23 | # endif | 23 | # endif |
24 | # define INF(...) EINA_LOG_DOM_INFO(_ecore_sdl_log_dom, __VA_ARGS__) | 24 | # define INF(...) EINA_LOG_DOM_INFO(_ecore_sdl_log_dom, __VA_ARGS__) |
25 | 25 | ||
26 | # ifdef WRN | 26 | # ifdef WRN |
27 | # undef WRN | 27 | # undef WRN |
28 | # endif | 28 | # endif |
29 | # define WRN(...) EINA_LOG_DOM_WARN(_ecore_sdl_log_dom, __VA_ARGS__) | 29 | # define WRN(...) EINA_LOG_DOM_WARN(_ecore_sdl_log_dom, __VA_ARGS__) |
30 | 30 | ||
31 | # ifdef CRI | 31 | # ifdef CRI |
32 | # undef CRI | 32 | # undef CRI |
33 | # endif | 33 | # endif |
34 | # define CRI(...) EINA_LOG_DOM_CRIT(_ecore_sdl_log_dom, __VA_ARGS__) | 34 | # define CRI(...) EINA_LOG_DOM_CRIT(_ecore_sdl_log_dom, __VA_ARGS__) |
35 | 35 | ||
36 | #endif | 36 | #endif |
diff --git a/src/lib/ecore_wayland/xdg-shell-client-protocol.h b/src/lib/ecore_wayland/xdg-shell-client-protocol.h index 2b20845db5..aa98e593a3 100644 --- a/src/lib/ecore_wayland/xdg-shell-client-protocol.h +++ b/src/lib/ecore_wayland/xdg-shell-client-protocol.h | |||
@@ -1,9 +1,9 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright © 2008-2013 Kristian Høgsberg | 2 | * Copyright © 2008-2013 Kristian Høgsberg |
3 | * Copyright © 2013 Rafael Antognolli | 3 | * Copyright © 2013 Rafael Antognolli |
4 | * Copyright © 2013 Jasper St. Pierre | 4 | * Copyright © 2013 Jasper St. Pierre |
5 | * Copyright © 2010-2013 Intel Corporation | 5 | * Copyright © 2010-2013 Intel Corporation |
6 | * | 6 | * |
7 | * Permission to use, copy, modify, distribute, and sell this | 7 | * Permission to use, copy, modify, distribute, and sell this |
8 | * software and its documentation for any purpose is hereby granted | 8 | * software and its documentation for any purpose is hereby granted |
9 | * without fee, provided that the above copyright notice appear in | 9 | * without fee, provided that the above copyright notice appear in |
@@ -15,7 +15,7 @@ | |||
15 | * representations about the suitability of this software for any | 15 | * representations about the suitability of this software for any |
16 | * purpose. It is provided "as is" without express or implied | 16 | * purpose. It is provided "as is" without express or implied |
17 | * warranty. | 17 | * warranty. |
18 | * | 18 | * |
19 | * THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS | 19 | * THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS |
20 | * SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND | 20 | * SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND |
21 | * FITNESS, IN NO EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY | 21 | * FITNESS, IN NO EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY |
diff --git a/src/lib/ecore_wayland/xdg-shell-protocol.c b/src/lib/ecore_wayland/xdg-shell-protocol.c index 82433ea5b8..43545d6e33 100644 --- a/src/lib/ecore_wayland/xdg-shell-protocol.c +++ b/src/lib/ecore_wayland/xdg-shell-protocol.c | |||
@@ -1,9 +1,9 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright © 2008-2013 Kristian Høgsberg | 2 | * Copyright © 2008-2013 Kristian Høgsberg |
3 | * Copyright © 2013 Rafael Antognolli | 3 | * Copyright © 2013 Rafael Antognolli |
4 | * Copyright © 2013 Jasper St. Pierre | 4 | * Copyright © 2013 Jasper St. Pierre |
5 | * Copyright © 2010-2013 Intel Corporation | 5 | * Copyright © 2010-2013 Intel Corporation |
6 | * | 6 | * |
7 | * Permission to use, copy, modify, distribute, and sell this | 7 | * Permission to use, copy, modify, distribute, and sell this |
8 | * software and its documentation for any purpose is hereby granted | 8 | * software and its documentation for any purpose is hereby granted |
9 | * without fee, provided that the above copyright notice appear in | 9 | * without fee, provided that the above copyright notice appear in |
@@ -15,7 +15,7 @@ | |||
15 | * representations about the suitability of this software for any | 15 | * representations about the suitability of this software for any |
16 | * purpose. It is provided "as is" without express or implied | 16 | * purpose. It is provided "as is" without express or implied |
17 | * warranty. | 17 | * warranty. |
18 | * | 18 | * |
19 | * THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS | 19 | * THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS |
20 | * SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND | 20 | * SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND |
21 | * FITNESS, IN NO EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY | 21 | * FITNESS, IN NO EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY |
diff --git a/src/lib/ecore_wl2/ecore_wl2_display.c b/src/lib/ecore_wl2/ecore_wl2_display.c index cc92b8f871..a91285e466 100644 --- a/src/lib/ecore_wl2/ecore_wl2_display.c +++ b/src/lib/ecore_wl2/ecore_wl2_display.c | |||
@@ -437,7 +437,7 @@ _cb_create_prepare(void *data, Ecore_Fd_Handler *hdlr EINA_UNUSED) | |||
437 | wl_display_flush_clients(ewd->wl.display); | 437 | wl_display_flush_clients(ewd->wl.display); |
438 | } | 438 | } |
439 | 439 | ||
440 | static Eina_Bool | 440 | static Eina_Bool |
441 | _recovery_timer(Ecore_Wl2_Display *ewd) | 441 | _recovery_timer(Ecore_Wl2_Display *ewd) |
442 | { | 442 | { |
443 | if (!_ecore_wl2_display_connect(ewd, 1)) | 443 | if (!_ecore_wl2_display_connect(ewd, 1)) |
diff --git a/src/lib/ecore_x/ecore_x.c b/src/lib/ecore_x/ecore_x.c index 573322a57f..0ad3befd22 100644 --- a/src/lib/ecore_x/ecore_x.c +++ b/src/lib/ecore_x/ecore_x.c | |||
@@ -2431,7 +2431,7 @@ ecore_x_pointer_root_xy_get(int *x, int *y) | |||
2431 | LOGFN; | 2431 | LOGFN; |
2432 | EINA_SAFETY_ON_NULL_RETURN(_ecore_x_disp); | 2432 | EINA_SAFETY_ON_NULL_RETURN(_ecore_x_disp); |
2433 | root = ecore_x_window_root_list(&num); | 2433 | root = ecore_x_window_root_list(&num); |
2434 | for (i = 0; i < num; i++) | 2434 | for (i = 0; i < num; i++) |
2435 | { | 2435 | { |
2436 | ret = XQueryPointer(_ecore_x_disp, root[i], &rwin, &cwin, | 2436 | ret = XQueryPointer(_ecore_x_disp, root[i], &rwin, &cwin, |
2437 | &rx, &ry, &wx, &wy, &mask); | 2437 | &rx, &ry, &wx, &wy, &mask); |
diff --git a/src/lib/ecore_x/ecore_x_e.c b/src/lib/ecore_x/ecore_x_e.c index 0444010c88..8ba71739f0 100644 --- a/src/lib/ecore_x/ecore_x_e.c +++ b/src/lib/ecore_x/ecore_x_e.c | |||
@@ -397,7 +397,7 @@ ecore_x_e_illume_access_action_next_send(Ecore_X_Window win) | |||
397 | ecore_x_client_message32_send(win, ECORE_X_ATOM_E_ILLUME_ACCESS_CONTROL, | 397 | ecore_x_client_message32_send(win, ECORE_X_ATOM_E_ILLUME_ACCESS_CONTROL, |
398 | ECORE_X_EVENT_MASK_WINDOW_CONFIGURE, | 398 | ECORE_X_EVENT_MASK_WINDOW_CONFIGURE, |
399 | win, | 399 | win, |
400 | ECORE_X_ATOM_E_ILLUME_ACCESS_ACTION_NEXT, | 400 | ECORE_X_ATOM_E_ILLUME_ACCESS_ACTION_NEXT, |
401 | 0, 0, 0); | 401 | 0, 0, 0); |
402 | } | 402 | } |
403 | 403 | ||
@@ -419,7 +419,7 @@ ecore_x_e_illume_access_action_activate_send(Ecore_X_Window win) | |||
419 | ecore_x_client_message32_send(win, ECORE_X_ATOM_E_ILLUME_ACCESS_CONTROL, | 419 | ecore_x_client_message32_send(win, ECORE_X_ATOM_E_ILLUME_ACCESS_CONTROL, |
420 | ECORE_X_EVENT_MASK_WINDOW_CONFIGURE, | 420 | ECORE_X_EVENT_MASK_WINDOW_CONFIGURE, |
421 | win, | 421 | win, |
422 | ECORE_X_ATOM_E_ILLUME_ACCESS_ACTION_ACTIVATE, | 422 | ECORE_X_ATOM_E_ILLUME_ACCESS_ACTION_ACTIVATE, |
423 | 0, 0, 0); | 423 | 0, 0, 0); |
424 | } | 424 | } |
425 | 425 | ||
@@ -988,17 +988,17 @@ ecore_x_e_illume_clipboard_geometry_get(Ecore_X_Window win, | |||
988 | } | 988 | } |
989 | 989 | ||
990 | /* for sliding window */ | 990 | /* for sliding window */ |
991 | EAPI void | 991 | EAPI void |
992 | ecore_x_e_illume_sliding_win_state_set(Ecore_X_Window win, | 992 | ecore_x_e_illume_sliding_win_state_set(Ecore_X_Window win, |
993 | unsigned int is_visible) | 993 | unsigned int is_visible) |
994 | { | 994 | { |
995 | LOGFN; | 995 | LOGFN; |
996 | ecore_x_window_prop_card32_set(win, | 996 | ecore_x_window_prop_card32_set(win, |
997 | ECORE_X_ATOM_E_ILLUME_SLIDING_WIN_STATE, | 997 | ECORE_X_ATOM_E_ILLUME_SLIDING_WIN_STATE, |
998 | &is_visible, 1); | 998 | &is_visible, 1); |
999 | } /* ecore_x_e_illume_sliding_win_state_set */ | 999 | } /* ecore_x_e_illume_sliding_win_state_set */ |
1000 | 1000 | ||
1001 | EAPI int | 1001 | EAPI int |
1002 | ecore_x_e_illume_sliding_win_state_get(Ecore_X_Window win) | 1002 | ecore_x_e_illume_sliding_win_state_get(Ecore_X_Window win) |
1003 | { | 1003 | { |
1004 | unsigned int is_visible = 0; | 1004 | unsigned int is_visible = 0; |
@@ -1006,7 +1006,7 @@ ecore_x_e_illume_sliding_win_state_get(Ecore_X_Window win) | |||
1006 | 1006 | ||
1007 | LOGFN; | 1007 | LOGFN; |
1008 | ret = ecore_x_window_prop_card32_get(win, | 1008 | ret = ecore_x_window_prop_card32_get(win, |
1009 | ECORE_X_ATOM_E_ILLUME_SLIDING_WIN_STATE, | 1009 | ECORE_X_ATOM_E_ILLUME_SLIDING_WIN_STATE, |
1010 | &is_visible, 1); | 1010 | &is_visible, 1); |
1011 | if ((ret == 0) || (ret == -1)) | 1011 | if ((ret == 0) || (ret == -1)) |
1012 | return 0; | 1012 | return 0; |
@@ -1029,11 +1029,11 @@ ecore_x_e_illume_sliding_win_geometry_set(Ecore_X_Window win, | |||
1029 | geom[2] = w; | 1029 | geom[2] = w; |
1030 | geom[3] = h; | 1030 | geom[3] = h; |
1031 | ecore_x_window_prop_card32_set(win, | 1031 | ecore_x_window_prop_card32_set(win, |
1032 | ECORE_X_ATOM_E_ILLUME_SLIDING_WIN_GEOMETRY, | 1032 | ECORE_X_ATOM_E_ILLUME_SLIDING_WIN_GEOMETRY, |
1033 | geom, 4); | 1033 | geom, 4); |
1034 | } /* ecore_x_e_illume_sliding_win_geometry_set */ | 1034 | } /* ecore_x_e_illume_sliding_win_geometry_set */ |
1035 | 1035 | ||
1036 | EAPI int | 1036 | EAPI int |
1037 | ecore_x_e_illume_sliding_win_geometry_get(Ecore_X_Window win, | 1037 | ecore_x_e_illume_sliding_win_geometry_get(Ecore_X_Window win, |
1038 | int *x, | 1038 | int *x, |
1039 | int *y, | 1039 | int *y, |
@@ -1042,27 +1042,27 @@ ecore_x_e_illume_sliding_win_geometry_get(Ecore_X_Window win, | |||
1042 | { | 1042 | { |
1043 | int ret = 0; | 1043 | int ret = 0; |
1044 | unsigned int geom[4]; | 1044 | unsigned int geom[4]; |
1045 | 1045 | ||
1046 | LOGFN; | 1046 | LOGFN; |
1047 | ret = | 1047 | ret = |
1048 | ecore_x_window_prop_card32_get(win, | 1048 | ecore_x_window_prop_card32_get(win, |
1049 | ECORE_X_ATOM_E_ILLUME_SLIDING_WIN_GEOMETRY, | 1049 | ECORE_X_ATOM_E_ILLUME_SLIDING_WIN_GEOMETRY, |
1050 | geom, 4); | 1050 | geom, 4); |
1051 | if (ret != 4) | 1051 | if (ret != 4) |
1052 | return 0; | 1052 | return 0; |
1053 | 1053 | ||
1054 | if (x) | 1054 | if (x) |
1055 | *x = geom[0]; | 1055 | *x = geom[0]; |
1056 | 1056 | ||
1057 | if (y) | 1057 | if (y) |
1058 | *y = geom[1]; | 1058 | *y = geom[1]; |
1059 | 1059 | ||
1060 | if (w) | 1060 | if (w) |
1061 | *w = geom[2]; | 1061 | *w = geom[2]; |
1062 | 1062 | ||
1063 | if (h) | 1063 | if (h) |
1064 | *h = geom[3]; | 1064 | *h = geom[3]; |
1065 | 1065 | ||
1066 | return 1; | 1066 | return 1; |
1067 | }/* ecore_x_e_illume_sliding_win_geometry_get */ | 1067 | }/* ecore_x_e_illume_sliding_win_geometry_get */ |
1068 | 1068 | ||
@@ -1269,7 +1269,7 @@ ecore_x_e_window_profile_set(Ecore_X_Window win, | |||
1269 | } | 1269 | } |
1270 | 1270 | ||
1271 | /* | 1271 | /* |
1272 | * @since 1.3 | 1272 | * @since 1.3 |
1273 | */ | 1273 | */ |
1274 | EAPI char * | 1274 | EAPI char * |
1275 | ecore_x_e_window_profile_get(Ecore_X_Window win) | 1275 | ecore_x_e_window_profile_get(Ecore_X_Window win) |
diff --git a/src/lib/ecore_x/ecore_x_events.c b/src/lib/ecore_x/ecore_x_events.c index a777b48053..aee6d1b9b2 100644 --- a/src/lib/ecore_x/ecore_x_events.c +++ b/src/lib/ecore_x/ecore_x_events.c | |||
@@ -2375,7 +2375,7 @@ _ecore_x_event_handle_fixes_selection_notify(XEvent *event) | |||
2375 | void | 2375 | void |
2376 | _ecore_x_event_handle_damage_notify(XEvent *event) | 2376 | _ecore_x_event_handle_damage_notify(XEvent *event) |
2377 | { | 2377 | { |
2378 | XDamageNotifyEvent *damage_event; | 2378 | XDamageNotifyEvent *damage_event; |
2379 | Ecore_X_Event_Damage *e; | 2379 | Ecore_X_Event_Damage *e; |
2380 | 2380 | ||
2381 | _ecore_x_last_event_mouse_move = EINA_FALSE; | 2381 | _ecore_x_last_event_mouse_move = EINA_FALSE; |
diff --git a/src/lib/ecore_x/ecore_x_icccm.c b/src/lib/ecore_x/ecore_x_icccm.c index 3a12409876..9f1c6c87af 100644 --- a/src/lib/ecore_x/ecore_x_icccm.c +++ b/src/lib/ecore_x/ecore_x_icccm.c | |||
@@ -583,7 +583,7 @@ ecore_x_icccm_protocol_atoms_set(Ecore_X_Window win, | |||
583 | { | 583 | { |
584 | Atom *protos2 = alloca(sizeof(Atom) * num); | 584 | Atom *protos2 = alloca(sizeof(Atom) * num); |
585 | int i; | 585 | int i; |
586 | 586 | ||
587 | for (i = 0; i < num; i++) protos2[i] = protos[i]; | 587 | for (i = 0; i < num; i++) protos2[i] = protos[i]; |
588 | LOGFN; | 588 | LOGFN; |
589 | if (num > 0) | 589 | if (num > 0) |
diff --git a/src/lib/ecore_x/ecore_x_image.c b/src/lib/ecore_x/ecore_x_image.c index a2f0c27c60..99f53d6e1b 100644 --- a/src/lib/ecore_x/ecore_x_image.c +++ b/src/lib/ecore_x/ecore_x_image.c | |||
@@ -101,7 +101,7 @@ _ecore_x_image_shm_check(void) | |||
101 | _ecore_x_image_shm_can = 0; | 101 | _ecore_x_image_shm_can = 0; |
102 | return _ecore_x_image_shm_can; | 102 | return _ecore_x_image_shm_can; |
103 | } | 103 | } |
104 | 104 | ||
105 | XSync(_ecore_x_disp, False); | 105 | XSync(_ecore_x_disp, False); |
106 | _ecore_x_image_err = 0; | 106 | _ecore_x_image_err = 0; |
107 | 107 | ||
@@ -691,7 +691,7 @@ ecore_x_image_to_argb_convert(void *src, | |||
691 | break; | 691 | break; |
692 | } | 692 | } |
693 | break; | 693 | break; |
694 | 694 | ||
695 | case 32: | 695 | case 32: |
696 | s32 = ((unsigned int *)(((unsigned char *)src) + ((y + row) * sbpl))) + x; | 696 | s32 = ((unsigned int *)(((unsigned char *)src) + ((y + row) * sbpl))) + x; |
697 | switch (mode) | 697 | switch (mode) |
diff --git a/src/lib/ecore_x/ecore_x_netwm.c b/src/lib/ecore_x/ecore_x_netwm.c index b939017039..60e8e0315f 100644 --- a/src/lib/ecore_x/ecore_x_netwm.c +++ b/src/lib/ecore_x/ecore_x_netwm.c | |||
@@ -669,7 +669,7 @@ ecore_x_netwm_icons_set(Ecore_X_Window win, | |||
669 | { | 669 | { |
670 | unsigned int *data, *p, *p2; | 670 | unsigned int *data, *p, *p2; |
671 | unsigned int i, size, x, y; | 671 | unsigned int i, size, x, y; |
672 | 672 | ||
673 | LOGFN; | 673 | LOGFN; |
674 | size = 0; | 674 | size = 0; |
675 | for (i = 0; i < (unsigned int)num; i++) | 675 | for (i = 0; i < (unsigned int)num; i++) |
@@ -690,7 +690,7 @@ ecore_x_netwm_icons_set(Ecore_X_Window win, | |||
690 | for (x = 0; x < icon[i].width; x++) | 690 | for (x = 0; x < icon[i].width; x++) |
691 | { | 691 | { |
692 | unsigned int r, g, b, a; | 692 | unsigned int r, g, b, a; |
693 | 693 | ||
694 | a = (*p2 >> 24) & 0xff; | 694 | a = (*p2 >> 24) & 0xff; |
695 | r = (*p2 >> 16) & 0xff; | 695 | r = (*p2 >> 16) & 0xff; |
696 | g = (*p2 >> 8 ) & 0xff; | 696 | g = (*p2 >> 8 ) & 0xff; |
diff --git a/src/lib/ecore_x/ecore_x_randr.c b/src/lib/ecore_x/ecore_x_randr.c index f2288cc404..faab344eb5 100644 --- a/src/lib/ecore_x/ecore_x_randr.c +++ b/src/lib/ecore_x/ecore_x_randr.c | |||
@@ -7,10 +7,10 @@ | |||
7 | #include "Ecore_X.h" | 7 | #include "Ecore_X.h" |
8 | 8 | ||
9 | /* NB: FIXME: | 9 | /* NB: FIXME: |
10 | * | 10 | * |
11 | * A lot of this code uses XRRGetScreenInfo and then calls | 11 | * A lot of this code uses XRRGetScreenInfo and then calls |
12 | * XRRFreeScreenConfigInfo. Typically this is not an Unheard of thing to do, | 12 | * XRRFreeScreenConfigInfo. Typically this is not an Unheard of thing to do, |
13 | * however this process of getting config and freeing config does force a | 13 | * however this process of getting config and freeing config does force a |
14 | * round-trip to the X server */ | 14 | * round-trip to the X server */ |
15 | 15 | ||
16 | /* local variables */ | 16 | /* local variables */ |
@@ -33,7 +33,7 @@ static Ecore_X_Atom connector_number = 0; | |||
33 | # define RANDR_EDID_MANUFACTURER 0x08 | 33 | # define RANDR_EDID_MANUFACTURER 0x08 |
34 | # define RANDR_EDID_BLOCK 0x36 | 34 | # define RANDR_EDID_BLOCK 0x36 |
35 | 35 | ||
36 | typedef enum _Ecore_X_Randr_Edid_Aspect_Ratio_Preferred | 36 | typedef enum _Ecore_X_Randr_Edid_Aspect_Ratio_Preferred |
37 | { | 37 | { |
38 | RANDR_EDID_ASPECT_RATIO_PREFERRED_4_3 = 0x00, | 38 | RANDR_EDID_ASPECT_RATIO_PREFERRED_4_3 = 0x00, |
39 | RANDR_EDID_ASPECT_RATIO_PREFERRED_16_9 = 0x01, | 39 | RANDR_EDID_ASPECT_RATIO_PREFERRED_16_9 = 0x01, |
@@ -49,7 +49,7 @@ XRRScreenResources *(*_ecore_x_randr_screen_resources_get)(Display *disp, Window | |||
49 | #endif | 49 | #endif |
50 | 50 | ||
51 | /* local functions */ | 51 | /* local functions */ |
52 | void | 52 | void |
53 | _ecore_x_randr_init(void) | 53 | _ecore_x_randr_init(void) |
54 | { | 54 | { |
55 | #ifdef ECORE_XRANDR | 55 | #ifdef ECORE_XRANDR |
@@ -76,7 +76,7 @@ _ecore_x_randr_init(void) | |||
76 | } | 76 | } |
77 | 77 | ||
78 | /* public functions */ | 78 | /* public functions */ |
79 | EAPI int | 79 | EAPI int |
80 | ecore_x_randr_version_get(void) | 80 | ecore_x_randr_version_get(void) |
81 | { | 81 | { |
82 | #ifdef ECORE_XRANDR | 82 | #ifdef ECORE_XRANDR |
@@ -85,23 +85,23 @@ ecore_x_randr_version_get(void) | |||
85 | return -1; | 85 | return -1; |
86 | } | 86 | } |
87 | 87 | ||
88 | EAPI Eina_Bool | 88 | EAPI Eina_Bool |
89 | ecore_x_randr_query(void) | 89 | ecore_x_randr_query(void) |
90 | { | 90 | { |
91 | return _randr_avail; | 91 | return _randr_avail; |
92 | } | 92 | } |
93 | 93 | ||
94 | /** | 94 | /** |
95 | * @brief This function returns the current config timestamp from | 95 | * @brief This function returns the current config timestamp from |
96 | * XRRScreenConfiguration. | 96 | * XRRScreenConfiguration. |
97 | * | 97 | * |
98 | * @param root root window to query screen configuration from | 98 | * @param root root window to query screen configuration from |
99 | * | 99 | * |
100 | * @returns The screen configuration timestamp | 100 | * @returns The screen configuration timestamp |
101 | * | 101 | * |
102 | * @since 1.8 | 102 | * @since 1.8 |
103 | */ | 103 | */ |
104 | EAPI Ecore_X_Time | 104 | EAPI Ecore_X_Time |
105 | ecore_x_randr_config_timestamp_get(Ecore_X_Window root) | 105 | ecore_x_randr_config_timestamp_get(Ecore_X_Window root) |
106 | { | 106 | { |
107 | Ecore_X_Time timestamp = 0; | 107 | Ecore_X_Time timestamp = 0; |
@@ -133,14 +133,14 @@ ecore_x_randr_config_timestamp_get(Ecore_X_Window root) | |||
133 | /* | 133 | /* |
134 | * @param root window which's primary output will be queried | 134 | * @param root window which's primary output will be queried |
135 | */ | 135 | */ |
136 | EAPI Ecore_X_Randr_Orientation | 136 | EAPI Ecore_X_Randr_Orientation |
137 | ecore_x_randr_screen_primary_output_orientations_get(Ecore_X_Window root) | 137 | ecore_x_randr_screen_primary_output_orientations_get(Ecore_X_Window root) |
138 | { | 138 | { |
139 | #ifdef ECORE_XRANDR | 139 | #ifdef ECORE_XRANDR |
140 | Rotation ret = 0, crot = 0; | 140 | Rotation ret = 0, crot = 0; |
141 | 141 | ||
142 | /* get the rotations available from XRandr */ | 142 | /* get the rotations available from XRandr */ |
143 | ret = XRRRotations(_ecore_x_disp, | 143 | ret = XRRRotations(_ecore_x_disp, |
144 | XRRRootToScreen(_ecore_x_disp, root), &crot); | 144 | XRRRootToScreen(_ecore_x_disp, root), &crot); |
145 | 145 | ||
146 | return ret; | 146 | return ret; |
@@ -153,14 +153,14 @@ ecore_x_randr_screen_primary_output_orientations_get(Ecore_X_Window root) | |||
153 | * @param root window which's primary output will be queried | 153 | * @param root window which's primary output will be queried |
154 | * @return the current orientation of the root window's screen primary output | 154 | * @return the current orientation of the root window's screen primary output |
155 | */ | 155 | */ |
156 | EAPI Ecore_X_Randr_Orientation | 156 | EAPI Ecore_X_Randr_Orientation |
157 | ecore_x_randr_screen_primary_output_orientation_get(Ecore_X_Window root) | 157 | ecore_x_randr_screen_primary_output_orientation_get(Ecore_X_Window root) |
158 | { | 158 | { |
159 | #ifdef ECORE_XRANDR | 159 | #ifdef ECORE_XRANDR |
160 | Rotation ret = 0; | 160 | Rotation ret = 0; |
161 | 161 | ||
162 | /* get the current rotation available from XRandr */ | 162 | /* get the current rotation available from XRandr */ |
163 | XRRRotations(_ecore_x_disp, | 163 | XRRRotations(_ecore_x_disp, |
164 | XRRRootToScreen(_ecore_x_disp, root), &ret); | 164 | XRRRootToScreen(_ecore_x_disp, root), &ret); |
165 | 165 | ||
166 | return ret; | 166 | return ret; |
@@ -178,7 +178,7 @@ ecore_x_randr_screen_primary_output_orientation_get(Ecore_X_Window root) | |||
178 | * @return @c EINA_TRUE if the primary output's orientation could be | 178 | * @return @c EINA_TRUE if the primary output's orientation could be |
179 | * successfully altered. | 179 | * successfully altered. |
180 | */ | 180 | */ |
181 | EAPI Eina_Bool | 181 | EAPI Eina_Bool |
182 | ecore_x_randr_screen_primary_output_orientation_set(Ecore_X_Window root, Ecore_X_Randr_Orientation orient) | 182 | ecore_x_randr_screen_primary_output_orientation_set(Ecore_X_Window root, Ecore_X_Randr_Orientation orient) |
183 | { | 183 | { |
184 | #ifdef ECORE_XRANDR | 184 | #ifdef ECORE_XRANDR |
@@ -223,7 +223,7 @@ ecore_x_randr_screen_primary_output_sizes_get(Ecore_X_Window root, int *num) | |||
223 | int n = 0, i = 0; | 223 | int n = 0, i = 0; |
224 | 224 | ||
225 | /* retrieve the number of sizes from X, and the sizes themselves. | 225 | /* retrieve the number of sizes from X, and the sizes themselves. |
226 | * | 226 | * |
227 | * NB: don't have to free the returned sizes */ | 227 | * NB: don't have to free the returned sizes */ |
228 | sizes = XRRSizes(_ecore_x_disp, XRRRootToScreen(_ecore_x_disp, root), &n); | 228 | sizes = XRRSizes(_ecore_x_disp, XRRRootToScreen(_ecore_x_disp, root), &n); |
229 | if (!sizes) return NULL; | 229 | if (!sizes) return NULL; |
@@ -250,7 +250,7 @@ ecore_x_randr_screen_primary_output_sizes_get(Ecore_X_Window root, int *num) | |||
250 | #endif | 250 | #endif |
251 | } | 251 | } |
252 | 252 | ||
253 | EAPI void | 253 | EAPI void |
254 | ecore_x_randr_screen_primary_output_current_size_get(Ecore_X_Window root, int *w, int *h, int *w_mm, int *h_mm, int *size_index) | 254 | ecore_x_randr_screen_primary_output_current_size_get(Ecore_X_Window root, int *w, int *h, int *w_mm, int *h_mm, int *size_index) |
255 | { | 255 | { |
256 | #ifdef ECORE_XRANDR | 256 | #ifdef ECORE_XRANDR |
@@ -264,9 +264,9 @@ ecore_x_randr_screen_primary_output_current_size_get(Ecore_X_Window root, int *w | |||
264 | int n = 0; | 264 | int n = 0; |
265 | 265 | ||
266 | /* retrieve the number of sizes from X, and the sizes themselves. | 266 | /* retrieve the number of sizes from X, and the sizes themselves. |
267 | * | 267 | * |
268 | * NB: don't have to free the returned sizes */ | 268 | * NB: don't have to free the returned sizes */ |
269 | sizes = | 269 | sizes = |
270 | XRRSizes(_ecore_x_disp, XRRRootToScreen(_ecore_x_disp, root), &n); | 270 | XRRSizes(_ecore_x_disp, XRRRootToScreen(_ecore_x_disp, root), &n); |
271 | if ((sizes) && (n > 0)) | 271 | if ((sizes) && (n > 0)) |
272 | { | 272 | { |
@@ -275,7 +275,7 @@ ecore_x_randr_screen_primary_output_current_size_get(Ecore_X_Window root, int *w | |||
275 | /* get the index of the current configuration */ | 275 | /* get the index of the current configuration */ |
276 | idx = XRRConfigCurrentConfiguration(cfg, &crot); | 276 | idx = XRRConfigCurrentConfiguration(cfg, &crot); |
277 | 277 | ||
278 | /* if the index is valid, then fill in the return variables with | 278 | /* if the index is valid, then fill in the return variables with |
279 | * the size information for this index */ | 279 | * the size information for this index */ |
280 | if ((idx < n) && (idx >= 0)) | 280 | if ((idx < n) && (idx >= 0)) |
281 | { | 281 | { |
@@ -303,7 +303,7 @@ ecore_x_randr_screen_primary_output_current_size_get(Ecore_X_Window root, int *w | |||
303 | * @return @c EINA_TRUE on success, @c EINA_FALSE on failure due to e.g. | 303 | * @return @c EINA_TRUE on success, @c EINA_FALSE on failure due to e.g. |
304 | * invalid times. | 304 | * invalid times. |
305 | */ | 305 | */ |
306 | EAPI Eina_Bool | 306 | EAPI Eina_Bool |
307 | ecore_x_randr_screen_primary_output_size_set(Ecore_X_Window root, int size_index) | 307 | ecore_x_randr_screen_primary_output_size_set(Ecore_X_Window root, int size_index) |
308 | { | 308 | { |
309 | #ifdef ECORE_XRANDR | 309 | #ifdef ECORE_XRANDR |
@@ -325,10 +325,10 @@ ecore_x_randr_screen_primary_output_size_set(Ecore_X_Window root, int size_index | |||
325 | if ((cfg = XRRGetScreenInfo(_ecore_x_disp, root))) | 325 | if ((cfg = XRRGetScreenInfo(_ecore_x_disp, root))) |
326 | { | 326 | { |
327 | /* try to set the new screen config | 327 | /* try to set the new screen config |
328 | * | 328 | * |
329 | * NB: Returns Success (0) if it works */ | 329 | * NB: Returns Success (0) if it works */ |
330 | if (!XRRSetScreenConfig(_ecore_x_disp, cfg, root, size_index, | 330 | if (!XRRSetScreenConfig(_ecore_x_disp, cfg, root, size_index, |
331 | ECORE_X_RANDR_ORIENTATION_ROT_0, | 331 | ECORE_X_RANDR_ORIENTATION_ROT_0, |
332 | CurrentTime)) | 332 | CurrentTime)) |
333 | { | 333 | { |
334 | ret = EINA_TRUE; | 334 | ret = EINA_TRUE; |
@@ -349,7 +349,7 @@ ecore_x_randr_screen_primary_output_size_set(Ecore_X_Window root, int size_index | |||
349 | * @param root window which's primary output will be queried | 349 | * @param root window which's primary output will be queried |
350 | * @return currently used refresh rate or - if request failed or RandRR is not available - 0.0 | 350 | * @return currently used refresh rate or - if request failed or RandRR is not available - 0.0 |
351 | */ | 351 | */ |
352 | EAPI Ecore_X_Randr_Refresh_Rate | 352 | EAPI Ecore_X_Randr_Refresh_Rate |
353 | ecore_x_randr_screen_primary_output_current_refresh_rate_get(Ecore_X_Window root) | 353 | ecore_x_randr_screen_primary_output_current_refresh_rate_get(Ecore_X_Window root) |
354 | { | 354 | { |
355 | #ifdef ECORE_XRANDR | 355 | #ifdef ECORE_XRANDR |
@@ -385,7 +385,7 @@ ecore_x_randr_screen_primary_output_refresh_rates_get(Ecore_X_Window root, int s | |||
385 | int n = 0; | 385 | int n = 0; |
386 | 386 | ||
387 | /* try to get the refresh rates for this screen */ | 387 | /* try to get the refresh rates for this screen */ |
388 | if ((rates = XRRRates(_ecore_x_disp, | 388 | if ((rates = XRRRates(_ecore_x_disp, |
389 | XRRRootToScreen(_ecore_x_disp, root), size_index, &n))) | 389 | XRRRootToScreen(_ecore_x_disp, root), size_index, &n))) |
390 | { | 390 | { |
391 | Ecore_X_Randr_Refresh_Rate *ret = NULL; | 391 | Ecore_X_Randr_Refresh_Rate *ret = NULL; |
@@ -418,7 +418,7 @@ ecore_x_randr_screen_primary_output_refresh_rates_get(Ecore_X_Window root, int s | |||
418 | * @param rate The refresh rate to be set. | 418 | * @param rate The refresh rate to be set. |
419 | * @return @c EINA_TRUE on success, @c EINA_FALSE otherwise. | 419 | * @return @c EINA_TRUE on success, @c EINA_FALSE otherwise. |
420 | */ | 420 | */ |
421 | EAPI Eina_Bool | 421 | EAPI Eina_Bool |
422 | ecore_x_randr_screen_primary_output_refresh_rate_set(Ecore_X_Window root, int size_index, Ecore_X_Randr_Refresh_Rate rate) | 422 | ecore_x_randr_screen_primary_output_refresh_rate_set(Ecore_X_Window root, int size_index, Ecore_X_Randr_Refresh_Rate rate) |
423 | { | 423 | { |
424 | #ifdef ECORE_XRANDR | 424 | #ifdef ECORE_XRANDR |
@@ -434,11 +434,11 @@ ecore_x_randr_screen_primary_output_refresh_rate_set(Ecore_X_Window root, int si | |||
434 | 434 | ||
435 | /* get the current rotation */ | 435 | /* get the current rotation */ |
436 | XRRConfigRotations(cfg, &rot); | 436 | XRRConfigRotations(cfg, &rot); |
437 | 437 | ||
438 | /* try to set the new screen config | 438 | /* try to set the new screen config |
439 | * | 439 | * |
440 | * NB: Returns Success (0) if it works */ | 440 | * NB: Returns Success (0) if it works */ |
441 | if (!XRRSetScreenConfigAndRate(_ecore_x_disp, cfg, root, | 441 | if (!XRRSetScreenConfigAndRate(_ecore_x_disp, cfg, root, |
442 | size_index, rot, rate, CurrentTime)) | 442 | size_index, rot, rate, CurrentTime)) |
443 | { | 443 | { |
444 | ret = EINA_TRUE; | 444 | ret = EINA_TRUE; |
@@ -465,7 +465,7 @@ ecore_x_randr_screen_primary_output_refresh_rate_set(Ecore_X_Window root, int si | |||
465 | * @param win Select this window's properties for RandR events. | 465 | * @param win Select this window's properties for RandR events. |
466 | * @param on Enable/disable selecting. | 466 | * @param on Enable/disable selecting. |
467 | */ | 467 | */ |
468 | EAPI void | 468 | EAPI void |
469 | ecore_x_randr_events_select(Ecore_X_Window win, Eina_Bool on) | 469 | ecore_x_randr_events_select(Ecore_X_Window win, Eina_Bool on) |
470 | { | 470 | { |
471 | #ifdef ECORE_XRANDR | 471 | #ifdef ECORE_XRANDR |
@@ -475,7 +475,7 @@ ecore_x_randr_events_select(Ecore_X_Window win, Eina_Bool on) | |||
475 | { | 475 | { |
476 | mask = RRScreenChangeNotifyMask; | 476 | mask = RRScreenChangeNotifyMask; |
477 | if (_randr_version >= RANDR_VERSION_1_2) | 477 | if (_randr_version >= RANDR_VERSION_1_2) |
478 | mask |= (RRCrtcChangeNotifyMask | RROutputChangeNotifyMask | | 478 | mask |= (RRCrtcChangeNotifyMask | RROutputChangeNotifyMask | |
479 | RROutputPropertyNotifyMask); | 479 | RROutputPropertyNotifyMask); |
480 | } | 480 | } |
481 | 481 | ||
@@ -488,7 +488,7 @@ ecore_x_randr_events_select(Ecore_X_Window win, Eina_Bool on) | |||
488 | * @param w width of screen in px | 488 | * @param w width of screen in px |
489 | * @param h height of screen in px | 489 | * @param h height of screen in px |
490 | */ | 490 | */ |
491 | EAPI void | 491 | EAPI void |
492 | ecore_x_randr_screen_current_size_get(Ecore_X_Window root, int *w, int *h, int *w_mm, int *h_mm) | 492 | ecore_x_randr_screen_current_size_get(Ecore_X_Window root, int *w, int *h, int *w_mm, int *h_mm) |
493 | { | 493 | { |
494 | #ifdef ECORE_XRANDR | 494 | #ifdef ECORE_XRANDR |
@@ -514,7 +514,7 @@ ecore_x_randr_screen_current_size_get(Ecore_X_Window root, int *w, int *h, int * | |||
514 | * @param wmax maximum width the screen can be set to | 514 | * @param wmax maximum width the screen can be set to |
515 | * @param hmax maximum height the screen can be set to | 515 | * @param hmax maximum height the screen can be set to |
516 | */ | 516 | */ |
517 | EAPI void | 517 | EAPI void |
518 | ecore_x_randr_screen_size_range_get(Ecore_X_Window root, int *wmin, int *hmin, int *wmax, int *hmax) | 518 | ecore_x_randr_screen_size_range_get(Ecore_X_Window root, int *wmin, int *hmin, int *wmax, int *hmax) |
519 | { | 519 | { |
520 | #ifdef ECORE_XRANDR | 520 | #ifdef ECORE_XRANDR |
@@ -523,9 +523,9 @@ ecore_x_randr_screen_size_range_get(Ecore_X_Window root, int *wmin, int *hmin, i | |||
523 | int swmin = 0, shmin = 0, swmax = 0, shmax = 0; | 523 | int swmin = 0, shmin = 0, swmax = 0, shmax = 0; |
524 | 524 | ||
525 | /* try to get the screen size range from XRandr | 525 | /* try to get the screen size range from XRandr |
526 | * | 526 | * |
527 | * NB: returns 1 on success */ | 527 | * NB: returns 1 on success */ |
528 | if ((XRRGetScreenSizeRange(_ecore_x_disp, root, &swmin, &shmin, | 528 | if ((XRRGetScreenSizeRange(_ecore_x_disp, root, &swmin, &shmin, |
529 | &swmax, &shmax))) | 529 | &swmax, &shmax))) |
530 | { | 530 | { |
531 | /* fill in the return variables */ | 531 | /* fill in the return variables */ |
@@ -543,7 +543,7 @@ ecore_x_randr_screen_size_range_get(Ecore_X_Window root, int *wmin, int *hmin, i | |||
543 | * and all other CRTCs dx,dy respectively. | 543 | * and all other CRTCs dx,dy respectively. |
544 | * @param root the window's screen which will be reset. | 544 | * @param root the window's screen which will be reset. |
545 | */ | 545 | */ |
546 | EAPI void | 546 | EAPI void |
547 | ecore_x_randr_screen_reset(Ecore_X_Window root) | 547 | ecore_x_randr_screen_reset(Ecore_X_Window root) |
548 | { | 548 | { |
549 | #ifdef ECORE_XRANDR | 549 | #ifdef ECORE_XRANDR |
@@ -612,7 +612,7 @@ ecore_x_randr_screen_reset(Ecore_X_Window root) | |||
612 | } | 612 | } |
613 | 613 | ||
614 | /* | 614 | /* |
615 | * @param root Window which's screen's size should be set. If invalid (e.g. | 615 | * @param root Window which's screen's size should be set. If invalid (e.g. |
616 | * @c NULL) no action is taken. | 616 | * @c NULL) no action is taken. |
617 | * @param w Width in px the screen should be set to. If out of valid | 617 | * @param w Width in px the screen should be set to. If out of valid |
618 | * boundaries, current value is assumed. | 618 | * boundaries, current value is assumed. |
@@ -625,7 +625,7 @@ ecore_x_randr_screen_reset(Ecore_X_Window root) | |||
625 | * @return @c EINA_TRUE if request was successfully sent or screen is already | 625 | * @return @c EINA_TRUE if request was successfully sent or screen is already |
626 | * in requested size, @c EINA_FALSE if parameters are invalid. | 626 | * in requested size, @c EINA_FALSE if parameters are invalid. |
627 | */ | 627 | */ |
628 | EAPI Eina_Bool | 628 | EAPI Eina_Bool |
629 | ecore_x_randr_screen_current_size_set(Ecore_X_Window root, int w, int h, int w_mm, int h_mm) | 629 | ecore_x_randr_screen_current_size_set(Ecore_X_Window root, int w, int h, int w_mm, int h_mm) |
630 | { | 630 | { |
631 | #ifdef ECORE_XRANDR | 631 | #ifdef ECORE_XRANDR |
@@ -733,7 +733,7 @@ ecore_x_randr_modes_info_get(Ecore_X_Window root, int *num) | |||
733 | ret[i]->vTotal = res->modes[i].vTotal; | 733 | ret[i]->vTotal = res->modes[i].vTotal; |
734 | if (res->modes[i].nameLength > 0) | 734 | if (res->modes[i].nameLength > 0) |
735 | { | 735 | { |
736 | if ((ret[i]->name = | 736 | if ((ret[i]->name = |
737 | (malloc(res->modes[i].nameLength + 1)))) | 737 | (malloc(res->modes[i].nameLength + 1)))) |
738 | strncpy(ret[i]->name, res->modes[i].name, | 738 | strncpy(ret[i]->name, res->modes[i].name, |
739 | (res->modes[i].nameLength + 1)); | 739 | (res->modes[i].nameLength + 1)); |
@@ -775,7 +775,7 @@ ecore_x_randr_modes_info_get(Ecore_X_Window root, int *num) | |||
775 | * adding failed. | 775 | * adding failed. |
776 | * @since 1.2.0 | 776 | * @since 1.2.0 |
777 | */ | 777 | */ |
778 | EAPI Ecore_X_Randr_Mode | 778 | EAPI Ecore_X_Randr_Mode |
779 | ecore_x_randr_mode_info_add(Ecore_X_Window root, Ecore_X_Randr_Mode_Info *mode_info) | 779 | ecore_x_randr_mode_info_add(Ecore_X_Window root, Ecore_X_Randr_Mode_Info *mode_info) |
780 | { | 780 | { |
781 | #ifdef ECORE_XRANDR | 781 | #ifdef ECORE_XRANDR |
@@ -783,7 +783,7 @@ ecore_x_randr_mode_info_add(Ecore_X_Window root, Ecore_X_Randr_Mode_Info *mode_i | |||
783 | { | 783 | { |
784 | Ecore_X_Randr_Mode mode = 0; | 784 | Ecore_X_Randr_Mode mode = 0; |
785 | 785 | ||
786 | /* if we have valid mode_info from the user, then ask XRandr to | 786 | /* if we have valid mode_info from the user, then ask XRandr to |
787 | * create the new mode using that as base */ | 787 | * create the new mode using that as base */ |
788 | if (mode_info) | 788 | if (mode_info) |
789 | mode = XRRCreateMode(_ecore_x_disp, root, (XRRModeInfo *)mode_info); | 789 | mode = XRRCreateMode(_ecore_x_disp, root, (XRRModeInfo *)mode_info); |
@@ -800,7 +800,7 @@ ecore_x_randr_mode_info_add(Ecore_X_Window root, Ecore_X_Randr_Mode_Info *mode_i | |||
800 | * @param mode_info | 800 | * @param mode_info |
801 | * @since 1.2.0 | 801 | * @since 1.2.0 |
802 | */ | 802 | */ |
803 | EAPI void | 803 | EAPI void |
804 | ecore_x_randr_mode_del(Ecore_X_Randr_Mode mode) | 804 | ecore_x_randr_mode_del(Ecore_X_Randr_Mode mode) |
805 | { | 805 | { |
806 | #ifdef ECORE_XRANDR | 806 | #ifdef ECORE_XRANDR |
@@ -887,7 +887,7 @@ ecore_x_randr_mode_info_get(Ecore_X_Window root, Ecore_X_Randr_Mode mode) | |||
887 | * | 887 | * |
888 | * @param mode_info The mode information that should be freed. | 888 | * @param mode_info The mode information that should be freed. |
889 | */ | 889 | */ |
890 | EAPI void | 890 | EAPI void |
891 | ecore_x_randr_mode_info_free(Ecore_X_Randr_Mode_Info *mode_info) | 891 | ecore_x_randr_mode_info_free(Ecore_X_Randr_Mode_Info *mode_info) |
892 | { | 892 | { |
893 | #ifdef ECORE_XRANDR | 893 | #ifdef ECORE_XRANDR |
@@ -1024,9 +1024,9 @@ ecore_x_randr_window_outputs_get(Ecore_X_Window window, int *num) | |||
1024 | Ecore_X_Randr_Output *ret = NULL; | 1024 | Ecore_X_Randr_Output *ret = NULL; |
1025 | 1025 | ||
1026 | /* try to get the screen resources from Xrandr | 1026 | /* try to get the screen resources from Xrandr |
1027 | * | 1027 | * |
1028 | * NB: We do this ONCE here as we reuse it for every crtc. | 1028 | * NB: We do this ONCE here as we reuse it for every crtc. |
1029 | * NB: The old code used to loop and fetch the screen resources on | 1029 | * NB: The old code used to loop and fetch the screen resources on |
1030 | * every crtc */ | 1030 | * every crtc */ |
1031 |