summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristopher Michael <devilhorns@comcast.net>2020-04-28 12:09:12 -0400
committerChristopher Michael <devilhorns@comcast.net>2020-04-28 12:39:24 -0400
commit590d5745a984ab3001f30d97d9573edf7fc2f606 (patch)
tree61f6d6aa11e18e5119140327b2cfc423b5fbc70e
parent410fb16d6cf2f65f4e1c6de12712359547e67862 (diff)
ecore-evas: Fix formatting
NB: No functional changes
-rw-r--r--src/lib/ecore_evas/ecore_evas_private.h346
1 files changed, 183 insertions, 163 deletions
diff --git a/src/lib/ecore_evas/ecore_evas_private.h b/src/lib/ecore_evas/ecore_evas_private.h
index aba98b4a10..1a35e62a5c 100644
--- a/src/lib/ecore_evas/ecore_evas_private.h
+++ b/src/lib/ecore_evas/ecore_evas_private.h
@@ -84,11 +84,13 @@ typedef struct _Ecore_Evas_Cursor Ecore_Evas_Cursor;
84 84
85typedef Eina_Bool (*Ecore_Evas_Selection_Internal_Delivery)(Ecore_Evas *ee, unsigned int seat, Ecore_Evas_Selection_Buffer buffer, const char *type, Eina_Rw_Slice *slice); 85typedef Eina_Bool (*Ecore_Evas_Selection_Internal_Delivery)(Ecore_Evas *ee, unsigned int seat, Ecore_Evas_Selection_Buffer buffer, const char *type, Eina_Rw_Slice *slice);
86typedef void (*Ecore_Evas_Selection_Internal_Cancel)(Ecore_Evas *ee, unsigned int seat, Ecore_Evas_Selection_Buffer buffer); 86typedef void (*Ecore_Evas_Selection_Internal_Cancel)(Ecore_Evas *ee, unsigned int seat, Ecore_Evas_Selection_Buffer buffer);
87typedef struct { 87typedef struct
88{
88 Ecore_Evas_Selection_Internal_Delivery delivery; 89 Ecore_Evas_Selection_Internal_Delivery delivery;
89 Ecore_Evas_Selection_Internal_Cancel cancel; 90 Ecore_Evas_Selection_Internal_Cancel cancel;
90 Eina_Array *available_types; 91 Eina_Array *available_types;
91} Ecore_Evas_Selection_Callbacks; 92} Ecore_Evas_Selection_Callbacks;
93
92/* Engines interfaces */ 94/* Engines interfaces */
93struct _Ecore_Evas_Engine_Func 95struct _Ecore_Evas_Engine_Func
94{ 96{
@@ -203,23 +205,27 @@ struct _Ecore_Evas_Engine
203 Eina_List *ifaces; 205 Eina_List *ifaces;
204 Ecore_Timer *idle_flush_timer; 206 Ecore_Timer *idle_flush_timer;
205#ifdef BUILD_ECORE_EVAS_EWS 207#ifdef BUILD_ECORE_EVAS_EWS
206 struct { 208 struct
207 Evas_Object *image; 209 {
208 } ews; 210 Evas_Object *image;
211 } ews;
209#endif 212#endif
210}; 213};
211 214
212struct _Ecore_Evas_Cursor { 215struct _Ecore_Evas_Cursor
216{
213 Evas_Object *object; 217 Evas_Object *object;
214 int layer; 218 int layer;
215 struct { 219 struct
216 int x, y; 220 {
217 } hot; 221 int x, y;
222 } hot;
218 int pos_x; 223 int pos_x;
219 int pos_y; 224 int pos_y;
220}; 225};
221 226
222typedef struct { 227typedef struct
228{
223 unsigned int seat; 229 unsigned int seat;
224 Eina_Content *selection_buffer[ECORE_EVAS_SELECTION_BUFFER_LAST]; 230 Eina_Content *selection_buffer[ECORE_EVAS_SELECTION_BUFFER_LAST];
225} Ecore_Evas_Selection_Seat_Buffers; 231} Ecore_Evas_Selection_Seat_Buffers;
@@ -248,110 +254,121 @@ struct _Ecore_Evas
248 254
249 Eina_Hash *selection_buffers; 255 Eina_Hash *selection_buffers;
250 256
251 struct { 257 struct
252 int x, y, w, h; 258 {
253 } req; 259 int x, y, w, h;
254 260 } req;
255 struct { 261
256 int l, r, t, b; 262 struct
257 int changed : 1; 263 {
258 } shadow; 264 int l, r, t, b;
259 265 int changed : 1;
260 struct { 266 } shadow;
261 int w, h; 267
262 } expecting_resize; 268 struct
263 269 {
264 struct { 270 int w, h;
265 int w, h; 271 } expecting_resize;
266 } framespace; 272
267 273 struct
268 struct { 274 {
269 Eina_Hash *cursors; 275 int w, h;
270 char *title; 276 } framespace;
271 char *name; 277
272 char *clas; 278 struct
273 struct { 279 {
274 char *name; 280 Eina_Hash *cursors;
275 char **available_list; 281 char *title;
276 int count; 282 char *name;
277 } profile; 283 char *clas;
278 struct { 284 struct
279 int w, h; 285 {
280 } min, max, base, step; 286 char *name;
281 Ecore_Evas_Cursor cursor_cache; 287 char **available_list;
282 struct { 288 int count;
283 Eina_Bool supported; // indicate that the underlying window system supports window manager rotation protocol 289 } profile;
284 Eina_Bool app_set; // indicate that the ee supports window manager rotation protocol 290 struct
285 Eina_Bool win_resize; // indicate that the ee will be resized by the WM 291 {
286 int angle; // rotation value which is decided by the WM 292 int w, h;
287 int w, h; // window size to rotate 293 } min, max, base, step;
288 int preferred_rot; // preferred rotation hint 294 Ecore_Evas_Cursor cursor_cache;
289 int *available_rots; // array of avaialable rotation values 295 struct
290 unsigned int count; // number of elements of available_rots 296 {
291 struct { 297 Eina_Bool supported; // indicate that the underlying window system supports window manager rotation protocol
292 Eina_Bool set; 298 Eina_Bool app_set; // indicate that the ee supports window manager rotation protocol
293 Eina_Bool wait_for_done; 299 Eina_Bool win_resize; // indicate that the ee will be resized by the WM
294 Ecore_Timer *timer; 300 int angle; // rotation value which is decided by the WM
295 } manual_mode; 301 int w, h; // window size to rotate
296 } wm_rot; 302 int preferred_rot; // preferred rotation hint
297 struct { 303 int *available_rots; // array of avaialable rotation values
298 Eina_List *supported_list; 304 unsigned int count; // number of elements of available_rots
299 Eina_List *hints; 305 struct
300 int id; 306 {
301 } aux_hint; 307 Eina_Bool set;
302 Eina_List *focused_by; 308 Eina_Bool wait_for_done;
303 int layer; 309 Ecore_Timer *timer;
304 Ecore_Window window; 310 } manual_mode;
305 unsigned char avoid_damage; 311 } wm_rot;
306 Ecore_Evas *group_ee; 312 struct
307 Ecore_Window group_ee_win; 313 {
308 double aspect; 314 Eina_List *supported_list;
309 Eina_Bool iconified : 1; 315 Eina_List *hints;
310 Eina_Bool borderless : 1; 316 int id;
311 Eina_Bool override : 1; 317 } aux_hint;
312 Eina_Bool maximized : 1; 318 Eina_List *focused_by;
313 Eina_Bool fullscreen : 1; 319 int layer;
314 Eina_Bool withdrawn : 1; 320 Ecore_Window window;
315 Eina_Bool sticky : 1; 321 unsigned char avoid_damage;
316 Eina_Bool request_pos : 1; 322 Ecore_Evas *group_ee;
317 Eina_Bool hwsurface : 1; 323 Ecore_Window group_ee_win;
318 Eina_Bool urgent : 1; 324 double aspect;
319 Eina_Bool modal : 1; 325 Eina_Bool iconified : 1;
320 Eina_Bool demand_attention : 1; 326 Eina_Bool borderless : 1;
321 Eina_Bool focus_skip : 1; 327 Eina_Bool override : 1;
322 Eina_Bool focused : 1; 328 Eina_Bool maximized : 1;
323 } prop; 329 Eina_Bool fullscreen : 1;
324 330 Eina_Bool withdrawn : 1;
325 struct { 331 Eina_Bool sticky : 1;
326 void (*fn_resize) (Ecore_Evas *ee); 332 Eina_Bool request_pos : 1;
327 void (*fn_move) (Ecore_Evas *ee); 333 Eina_Bool hwsurface : 1;
328 void (*fn_show) (Ecore_Evas *ee); 334 Eina_Bool urgent : 1;
329 void (*fn_hide) (Ecore_Evas *ee); 335 Eina_Bool modal : 1;
330 void (*fn_delete_request) (Ecore_Evas *ee); 336 Eina_Bool demand_attention : 1;
331 void (*fn_destroy) (Ecore_Evas *ee); 337 Eina_Bool focus_skip : 1;
332 void (*fn_focus_in) (Ecore_Evas *ee); 338 Eina_Bool focused : 1;
333 void (*fn_focus_out) (Ecore_Evas *ee); 339 } prop;
334 void (*fn_sticky) (Ecore_Evas *ee); 340
335 void (*fn_unsticky) (Ecore_Evas *ee); 341 struct
336 void (*fn_mouse_in) (Ecore_Evas *ee); 342 {
337 void (*fn_mouse_out) (Ecore_Evas *ee); 343 void (*fn_resize) (Ecore_Evas *ee);
338 void (*fn_pre_render) (Ecore_Evas *ee); 344 void (*fn_move) (Ecore_Evas *ee);
339 void (*fn_post_render) (Ecore_Evas *ee); 345 void (*fn_show) (Ecore_Evas *ee);
340 void (*fn_pre_free) (Ecore_Evas *ee); 346 void (*fn_hide) (Ecore_Evas *ee);
341 void (*fn_state_change) (Ecore_Evas *ee); 347 void (*fn_delete_request) (Ecore_Evas *ee);
342 void (*fn_msg_parent_handle) (Ecore_Evas *ee, int maj, int min, void *data, int size); 348 void (*fn_destroy) (Ecore_Evas *ee);
343 void (*fn_msg_handle) (Ecore_Evas *ee, int maj, int min, void *data, int size); 349 void (*fn_focus_in) (Ecore_Evas *ee);
344 void (*fn_pointer_xy_get) (const Ecore_Evas *ee, Evas_Coord *x, Evas_Coord *y); 350 void (*fn_focus_out) (Ecore_Evas *ee);
345 Eina_Bool (*fn_pointer_warp) (const Ecore_Evas *ee, Evas_Coord x, Evas_Coord y); 351 void (*fn_sticky) (Ecore_Evas *ee);
346 void (*fn_focus_device_in) (Ecore_Evas *ee, Efl_Input_Device *seat); 352 void (*fn_unsticky) (Ecore_Evas *ee);
347 void (*fn_focus_device_out) (Ecore_Evas *ee, Efl_Input_Device *seat); 353 void (*fn_mouse_in) (Ecore_Evas *ee);
348 void (*fn_device_mouse_in) (Ecore_Evas *ee, Efl_Input_Device *mouse); 354 void (*fn_mouse_out) (Ecore_Evas *ee);
349 void (*fn_device_mouse_out) (Ecore_Evas *ee, Efl_Input_Device *mouse); 355 void (*fn_pre_render) (Ecore_Evas *ee);
350 void (*fn_selection_changed) (Ecore_Evas *ee, unsigned int seat, Ecore_Evas_Selection_Buffer selection); 356 void (*fn_post_render) (Ecore_Evas *ee);
351 void (*fn_dnd_motion) (Ecore_Evas *ee, unsigned int seat, Eina_Position2D p); 357 void (*fn_pre_free) (Ecore_Evas *ee);
352 void (*fn_dnd_state_change) (Ecore_Evas *ee, unsigned int seat, Eina_Position2D p, Eina_Bool inside); 358 void (*fn_state_change) (Ecore_Evas *ee);
353 void (*fn_dnd_drop)(Ecore_Evas *ee, unsigned int seat, Eina_Position2D p, const char *action); 359 void (*fn_msg_parent_handle) (Ecore_Evas *ee, int maj, int min, void *data, int size);
354 } func; 360 void (*fn_msg_handle) (Ecore_Evas *ee, int maj, int min, void *data, int size);
361 void (*fn_pointer_xy_get) (const Ecore_Evas *ee, Evas_Coord *x, Evas_Coord *y);
362 Eina_Bool (*fn_pointer_warp) (const Ecore_Evas *ee, Evas_Coord x, Evas_Coord y);
363 void (*fn_focus_device_in) (Ecore_Evas *ee, Efl_Input_Device *seat);
364 void (*fn_focus_device_out) (Ecore_Evas *ee, Efl_Input_Device *seat);
365 void (*fn_device_mouse_in) (Ecore_Evas *ee, Efl_Input_Device *mouse);
366 void (*fn_device_mouse_out) (Ecore_Evas *ee, Efl_Input_Device *mouse);
367 void (*fn_selection_changed) (Ecore_Evas *ee, unsigned int seat, Ecore_Evas_Selection_Buffer selection);
368 void (*fn_dnd_motion) (Ecore_Evas *ee, unsigned int seat, Eina_Position2D p);
369 void (*fn_dnd_state_change) (Ecore_Evas *ee, unsigned int seat, Eina_Position2D p, Eina_Bool inside);
370 void (*fn_dnd_drop)(Ecore_Evas *ee, unsigned int seat, Eina_Position2D p, const char *action);
371 } func;
355 372
356 Ecore_Evas_Engine engine; 373 Ecore_Evas_Engine engine;
357 Eina_List *sub_ecore_evas; 374 Eina_List *sub_ecore_evas;
@@ -360,34 +377,37 @@ struct _Ecore_Evas
360 Ecore_Animator *anim; 377 Ecore_Animator *anim;
361 unsigned int animator_count; 378 unsigned int animator_count;
362 379
363 struct { 380 struct
364 Eina_Inlist *active; 381 {
365 Eina_Inlist *deleted; 382 Eina_Inlist *active;
366 Eina_Inlist *suspended; 383 Eina_Inlist *deleted;
367 Eina_Inlist *run_list; 384 Eina_Inlist *suspended;
368 } ee_anim; 385 Eina_Inlist *run_list;
369 386 } ee_anim;
370 struct { 387
371 unsigned char avoid_damage; 388 struct
372 unsigned char resize_shape : 1; 389 {
373 unsigned char shaped : 1; 390 unsigned char avoid_damage;
374 unsigned char shaped_changed : 1; 391 unsigned char resize_shape : 1;
375 unsigned char alpha : 1; 392 unsigned char shaped : 1;
376 unsigned char alpha_changed : 1; 393 unsigned char shaped_changed : 1;
377 unsigned char transparent : 1; 394 unsigned char alpha : 1;
378 unsigned char transparent_changed : 1; 395 unsigned char alpha_changed : 1;
379 int rotation; 396 unsigned char transparent : 1;
380 int rotation_resize; 397 unsigned char transparent_changed : 1;
381 unsigned char rotation_changed : 1; 398 int rotation;
382 } delayed; 399 int rotation_resize;
400 unsigned char rotation_changed : 1;
401 } delayed;
383 402
384 Eina_Hash *active_drags; 403 Eina_Hash *active_drags;
385 struct { 404 struct
386 Ecore_Evas *rep; 405 {
387 void *data; 406 Ecore_Evas *rep;
388 Ecore_Evas_Drag_Finished_Cb free; 407 void *data;
389 Eina_Bool accepted; 408 Ecore_Evas_Drag_Finished_Cb free;
390 } drag; 409 Eina_Bool accepted;
410 } drag;
391 411
392 int refcount; 412 int refcount;
393//#define ECORE_EVAS_ASYNC_RENDER_DEBUG 1 /* TODO: remove me */ 413//#define ECORE_EVAS_ASYNC_RENDER_DEBUG 1 /* TODO: remove me */
@@ -438,31 +458,31 @@ EAPI void _ecore_evas_mouse_move_process(Ecore_Evas *ee, int x, int y, unsigned
438EAPI void _ecore_evas_mouse_device_move_process(Ecore_Evas *ee, Efl_Input_Device *pointer, 458EAPI void _ecore_evas_mouse_device_move_process(Ecore_Evas *ee, Efl_Input_Device *pointer,
439 int x, int y, unsigned int timestamp); 459 int x, int y, unsigned int timestamp);
440EAPI void _ecore_evas_mouse_multi_move_process(Ecore_Evas *ee, int device, 460EAPI void _ecore_evas_mouse_multi_move_process(Ecore_Evas *ee, int device,
441 int x, int y, 461 int x, int y,
442 double radius, 462 double radius,
443 double radius_x, double radius_y, 463 double radius_x, double radius_y,
444 double pressure, 464 double pressure,
445 double angle, 465 double angle,
446 double mx, double my, 466 double mx, double my,
447 unsigned int timestamp); 467 unsigned int timestamp);
448EAPI void _ecore_evas_mouse_multi_down_process(Ecore_Evas *ee, int device, 468EAPI void _ecore_evas_mouse_multi_down_process(Ecore_Evas *ee, int device,
449 int x, int y, 469 int x, int y,
450 double radius, 470 double radius,
451 double radius_x, double radius_y, 471 double radius_x, double radius_y,
452 double pressure, 472 double pressure,
453 double angle, 473 double angle,
454 double mx, double my, 474 double mx, double my,
455 Evas_Button_Flags flags, 475 Evas_Button_Flags flags,
456 unsigned int timestamp); 476 unsigned int timestamp);
457EAPI void _ecore_evas_mouse_multi_up_process(Ecore_Evas *ee, int device, 477EAPI void _ecore_evas_mouse_multi_up_process(Ecore_Evas *ee, int device,
458 int x, int y, 478 int x, int y,
459 double radius, 479 double radius,
460 double radius_x, double radius_y, 480 double radius_x, double radius_y,
461 double pressure, 481 double pressure,
462 double angle, 482 double angle,
463 double mx, double my, 483 double mx, double my,
464 Evas_Button_Flags flags, 484 Evas_Button_Flags flags,
465 unsigned int timestamp); 485 unsigned int timestamp);
466EAPI Eina_Bool _ecore_evas_input_direct_cb(void *window, int type, const void *info); 486EAPI Eina_Bool _ecore_evas_input_direct_cb(void *window, int type, const void *info);
467 487
468EAPI extern Eina_Bool _ecore_evas_app_comp_sync; 488EAPI extern Eina_Bool _ecore_evas_app_comp_sync;