diff options
author | David Walter Seikel | 2012-01-23 23:30:42 +1000 |
---|---|---|
committer | David Walter Seikel | 2012-01-23 23:30:42 +1000 |
commit | 825a3d837a33f226c879cd02ad15c3fba57e8b2c (patch) | |
tree | 75f57bd9c4253508d338dc79ba8e57a7abc42255 /libraries/ecore/src/lib/ecore_directfb/ecore_directfb.c | |
parent | Add ability to disable the test harness, or the Lua compile test. (diff) | |
download | SledjHamr-825a3d837a33f226c879cd02ad15c3fba57e8b2c.zip SledjHamr-825a3d837a33f226c879cd02ad15c3fba57e8b2c.tar.gz SledjHamr-825a3d837a33f226c879cd02ad15c3fba57e8b2c.tar.bz2 SledjHamr-825a3d837a33f226c879cd02ad15c3fba57e8b2c.tar.xz |
Update the EFL to what I'm actually using, coz I'm using some stuff not yet released.
Diffstat (limited to '')
-rw-r--r-- | libraries/ecore/src/lib/ecore_directfb/ecore_directfb.c | 70 |
1 files changed, 35 insertions, 35 deletions
diff --git a/libraries/ecore/src/lib/ecore_directfb/ecore_directfb.c b/libraries/ecore/src/lib/ecore_directfb/ecore_directfb.c index f45b3c3..7c56b5d 100644 --- a/libraries/ecore/src/lib/ecore_directfb/ecore_directfb.c +++ b/libraries/ecore/src/lib/ecore_directfb/ecore_directfb.c | |||
@@ -80,7 +80,7 @@ _ecore_directfb_event_free_key_down(void *data __UNUSED__, void *ev) | |||
80 | free(e->key_compose); | 80 | free(e->key_compose); |
81 | 81 | ||
82 | free(e); | 82 | free(e); |
83 | } /* _ecore_directfb_event_free_key_down */ | 83 | } |
84 | 84 | ||
85 | static void | 85 | static void |
86 | _ecore_directfb_event_free_key_up(void *data __UNUSED__, void *ev) | 86 | _ecore_directfb_event_free_key_up(void *data __UNUSED__, void *ev) |
@@ -98,7 +98,7 @@ _ecore_directfb_event_free_key_up(void *data __UNUSED__, void *ev) | |||
98 | free(e->key_compose); | 98 | free(e->key_compose); |
99 | 99 | ||
100 | free(e); | 100 | free(e); |
101 | } /* _ecore_directfb_event_free_key_up */ | 101 | } |
102 | 102 | ||
103 | /* directfb window input events handler */ | 103 | /* directfb window input events handler */ |
104 | /****************************************/ | 104 | /****************************************/ |
@@ -131,7 +131,7 @@ _ecore_directfb_event_handle_motion(DFBEvent *evt) | |||
131 | 131 | ||
132 | default: | 132 | default: |
133 | return; | 133 | return; |
134 | } /* switch */ | 134 | } |
135 | e->win = _ecore_directfb_fullscreen_window_id; | 135 | e->win = _ecore_directfb_fullscreen_window_id; |
136 | e->time = 0; | 136 | e->time = 0; |
137 | break; | 137 | break; |
@@ -146,9 +146,9 @@ _ecore_directfb_event_handle_motion(DFBEvent *evt) | |||
146 | 146 | ||
147 | default: | 147 | default: |
148 | break; | 148 | break; |
149 | } /* switch */ | 149 | } |
150 | ecore_event_add(ECORE_DIRECTFB_EVENT_MOTION, e, NULL, NULL); | 150 | ecore_event_add(ECORE_DIRECTFB_EVENT_MOTION, e, NULL, NULL); |
151 | } /* _ecore_directfb_event_handle_motion */ | 151 | } |
152 | 152 | ||
153 | static void | 153 | static void |
154 | _ecore_directfb_event_handle_key_down(DFBEvent *evt) | 154 | _ecore_directfb_event_handle_key_down(DFBEvent *evt) |
@@ -197,10 +197,10 @@ _ecore_directfb_event_handle_key_down(DFBEvent *evt) | |||
197 | 197 | ||
198 | default: | 198 | default: |
199 | break; | 199 | break; |
200 | } /* switch */ | 200 | } |
201 | 201 | ||
202 | ecore_event_add(ECORE_DIRECTFB_EVENT_KEY_DOWN, e, _ecore_directfb_event_free_key_down, NULL); | 202 | ecore_event_add(ECORE_DIRECTFB_EVENT_KEY_DOWN, e, _ecore_directfb_event_free_key_down, NULL); |
203 | } /* _ecore_directfb_event_handle_key_down */ | 203 | } |
204 | 204 | ||
205 | static void | 205 | static void |
206 | _ecore_directfb_event_handle_key_up(DFBEvent *evt) | 206 | _ecore_directfb_event_handle_key_up(DFBEvent *evt) |
@@ -249,9 +249,9 @@ _ecore_directfb_event_handle_key_up(DFBEvent *evt) | |||
249 | 249 | ||
250 | default: | 250 | default: |
251 | break; | 251 | break; |
252 | } /* switch */ | 252 | } |
253 | ecore_event_add(ECORE_DIRECTFB_EVENT_KEY_UP, e, _ecore_directfb_event_free_key_up, NULL); | 253 | ecore_event_add(ECORE_DIRECTFB_EVENT_KEY_UP, e, _ecore_directfb_event_free_key_up, NULL); |
254 | } /* _ecore_directfb_event_handle_key_up */ | 254 | } |
255 | 255 | ||
256 | static void | 256 | static void |
257 | _ecore_directfb_event_handle_button_down(DFBEvent *evt) | 257 | _ecore_directfb_event_handle_button_down(DFBEvent *evt) |
@@ -283,10 +283,10 @@ _ecore_directfb_event_handle_button_down(DFBEvent *evt) | |||
283 | 283 | ||
284 | default: | 284 | default: |
285 | break; | 285 | break; |
286 | } /* switch */ | 286 | } |
287 | 287 | ||
288 | ecore_event_add(ECORE_DIRECTFB_EVENT_BUTTON_DOWN, e, NULL, NULL); | 288 | ecore_event_add(ECORE_DIRECTFB_EVENT_BUTTON_DOWN, e, NULL, NULL); |
289 | } /* _ecore_directfb_event_handle_button_down */ | 289 | } |
290 | 290 | ||
291 | static void | 291 | static void |
292 | _ecore_directfb_event_handle_button_up(DFBEvent *evt) | 292 | _ecore_directfb_event_handle_button_up(DFBEvent *evt) |
@@ -317,9 +317,9 @@ _ecore_directfb_event_handle_button_up(DFBEvent *evt) | |||
317 | 317 | ||
318 | default: | 318 | default: |
319 | break; | 319 | break; |
320 | } /* switch */ | 320 | } |
321 | ecore_event_add(ECORE_DIRECTFB_EVENT_BUTTON_UP, e, NULL, NULL); | 321 | ecore_event_add(ECORE_DIRECTFB_EVENT_BUTTON_UP, e, NULL, NULL); |
322 | } /* _ecore_directfb_event_handle_button_up */ | 322 | } |
323 | 323 | ||
324 | static void | 324 | static void |
325 | _ecore_directfb_event_handle_enter(DFBWindowEvent *evt) | 325 | _ecore_directfb_event_handle_enter(DFBWindowEvent *evt) |
@@ -334,7 +334,7 @@ _ecore_directfb_event_handle_enter(DFBWindowEvent *evt) | |||
334 | e->time = 0; | 334 | e->time = 0; |
335 | 335 | ||
336 | ecore_event_add(ECORE_DIRECTFB_EVENT_ENTER, e, NULL, NULL); | 336 | ecore_event_add(ECORE_DIRECTFB_EVENT_ENTER, e, NULL, NULL); |
337 | } /* _ecore_directfb_event_handle_enter */ | 337 | } |
338 | 338 | ||
339 | static void | 339 | static void |
340 | _ecore_directfb_event_handle_leave(DFBWindowEvent *evt) | 340 | _ecore_directfb_event_handle_leave(DFBWindowEvent *evt) |
@@ -349,7 +349,7 @@ _ecore_directfb_event_handle_leave(DFBWindowEvent *evt) | |||
349 | e->time = 0; | 349 | e->time = 0; |
350 | 350 | ||
351 | ecore_event_add(ECORE_DIRECTFB_EVENT_LEAVE, e, NULL, NULL); | 351 | ecore_event_add(ECORE_DIRECTFB_EVENT_LEAVE, e, NULL, NULL); |
352 | } /* _ecore_directfb_event_handle_leave */ | 352 | } |
353 | 353 | ||
354 | static void | 354 | static void |
355 | _ecore_directfb_event_handle_wheel(DFBWindowEvent *evt) | 355 | _ecore_directfb_event_handle_wheel(DFBWindowEvent *evt) |
@@ -365,7 +365,7 @@ _ecore_directfb_event_handle_wheel(DFBWindowEvent *evt) | |||
365 | e->time = 0; | 365 | e->time = 0; |
366 | 366 | ||
367 | ecore_event_add(ECORE_DIRECTFB_EVENT_WHEEL, e, NULL, NULL); | 367 | ecore_event_add(ECORE_DIRECTFB_EVENT_WHEEL, e, NULL, NULL); |
368 | } /* _ecore_directfb_event_handle_wheel */ | 368 | } |
369 | 369 | ||
370 | static void | 370 | static void |
371 | _ecore_directfb_event_handle_got_focus(DFBWindowEvent *evt) | 371 | _ecore_directfb_event_handle_got_focus(DFBWindowEvent *evt) |
@@ -377,7 +377,7 @@ _ecore_directfb_event_handle_got_focus(DFBWindowEvent *evt) | |||
377 | e->time = 0; | 377 | e->time = 0; |
378 | 378 | ||
379 | ecore_event_add(ECORE_DIRECTFB_EVENT_GOT_FOCUS, e, NULL, NULL); | 379 | ecore_event_add(ECORE_DIRECTFB_EVENT_GOT_FOCUS, e, NULL, NULL); |
380 | } /* _ecore_directfb_event_handle_got_focus */ | 380 | } |
381 | 381 | ||
382 | static void | 382 | static void |
383 | _ecore_directfb_event_handle_lost_focus(DFBWindowEvent *evt) | 383 | _ecore_directfb_event_handle_lost_focus(DFBWindowEvent *evt) |
@@ -389,7 +389,7 @@ _ecore_directfb_event_handle_lost_focus(DFBWindowEvent *evt) | |||
389 | e->time = 0; | 389 | e->time = 0; |
390 | 390 | ||
391 | ecore_event_add(ECORE_DIRECTFB_EVENT_LOST_FOCUS, e, NULL, NULL); | 391 | ecore_event_add(ECORE_DIRECTFB_EVENT_LOST_FOCUS, e, NULL, NULL); |
392 | } /* _ecore_directfb_event_handle_lost_focus */ | 392 | } |
393 | 393 | ||
394 | /* inputs and windows fds handlers */ | 394 | /* inputs and windows fds handlers */ |
395 | /***********************************/ | 395 | /***********************************/ |
@@ -428,7 +428,7 @@ _ecore_directfb_input_event_fd_handler(void *data __UNUSED__,Ecore_Fd_Handler *f | |||
428 | _ecore_directfb_event_handle_motion(&evt); | 428 | _ecore_directfb_event_handle_motion(&evt); |
429 | 429 | ||
430 | return EINA_TRUE; | 430 | return EINA_TRUE; |
431 | } /* _ecore_directfb_input_event_fd_handler */ | 431 | } |
432 | 432 | ||
433 | static Eina_Bool | 433 | static Eina_Bool |
434 | _ecore_directfb_window_event_fd_handler(void *data __UNUSED__,Ecore_Fd_Handler *fd_handler __UNUSED__) | 434 | _ecore_directfb_window_event_fd_handler(void *data __UNUSED__,Ecore_Fd_Handler *fd_handler __UNUSED__) |
@@ -486,7 +486,7 @@ _ecore_directfb_window_event_fd_handler(void *data __UNUSED__,Ecore_Fd_Handler * | |||
486 | _ecore_directfb_event_handle_wheel(&evt.window); | 486 | _ecore_directfb_event_handle_wheel(&evt.window); |
487 | 487 | ||
488 | return EINA_TRUE; | 488 | return EINA_TRUE; |
489 | } /* _ecore_directfb_window_event_fd_handler */ | 489 | } |
490 | 490 | ||
491 | /* api functions */ | 491 | /* api functions */ |
492 | /*****************/ | 492 | /*****************/ |
@@ -495,7 +495,7 @@ EAPI IDirectFB * | |||
495 | ecore_directfb_interface_get(void) | 495 | ecore_directfb_interface_get(void) |
496 | { | 496 | { |
497 | return _dfb; | 497 | return _dfb; |
498 | } /* ecore_directfb_interface_get */ | 498 | } |
499 | 499 | ||
500 | EAPI Ecore_DirectFB_Window * | 500 | EAPI Ecore_DirectFB_Window * |
501 | ecore_directfb_window_new(int x, int y, int w, int h) | 501 | ecore_directfb_window_new(int x, int y, int w, int h) |
@@ -530,7 +530,7 @@ ecore_directfb_window_new(int x, int y, int w, int h) | |||
530 | window->cursor = NULL; | 530 | window->cursor = NULL; |
531 | 531 | ||
532 | return window; | 532 | return window; |
533 | } /* ecore_directfb_window_new */ | 533 | } |
534 | 534 | ||
535 | EAPI void | 535 | EAPI void |
536 | ecore_directfb_window_free(Ecore_DirectFB_Window *ecore_window) | 536 | ecore_directfb_window_free(Ecore_DirectFB_Window *ecore_window) |
@@ -538,37 +538,37 @@ ecore_directfb_window_free(Ecore_DirectFB_Window *ecore_window) | |||
538 | DFBCHECK(ecore_window->surface->Release(ecore_window->surface)); | 538 | DFBCHECK(ecore_window->surface->Release(ecore_window->surface)); |
539 | DFBCHECK(ecore_window->window->Release(ecore_window->window)); | 539 | DFBCHECK(ecore_window->window->Release(ecore_window->window)); |
540 | free(ecore_window); | 540 | free(ecore_window); |
541 | } /* ecore_directfb_window_free */ | 541 | } |
542 | 542 | ||
543 | EAPI void | 543 | EAPI void |
544 | ecore_directfb_window_move(Ecore_DirectFB_Window *ecore_window, int x, int y) | 544 | ecore_directfb_window_move(Ecore_DirectFB_Window *ecore_window, int x, int y) |
545 | { | 545 | { |
546 | DFBCHECK(ecore_window->window->MoveTo(ecore_window->window, x, y)); | 546 | DFBCHECK(ecore_window->window->MoveTo(ecore_window->window, x, y)); |
547 | } /* ecore_directfb_window_move */ | 547 | } |
548 | 548 | ||
549 | EAPI void | 549 | EAPI void |
550 | ecore_directfb_window_resize(Ecore_DirectFB_Window *ecore_window, int w, int h) | 550 | ecore_directfb_window_resize(Ecore_DirectFB_Window *ecore_window, int w, int h) |
551 | { | 551 | { |
552 | DFBCHECK(ecore_window->window->Resize(ecore_window->window, w, h)); | 552 | DFBCHECK(ecore_window->window->Resize(ecore_window->window, w, h)); |
553 | } /* ecore_directfb_window_resize */ | 553 | } |
554 | 554 | ||
555 | EAPI void | 555 | EAPI void |
556 | ecore_directfb_window_focus(Ecore_DirectFB_Window *ecore_window) | 556 | ecore_directfb_window_focus(Ecore_DirectFB_Window *ecore_window) |
557 | { | 557 | { |
558 | DFBCHECK(ecore_window->window->RequestFocus(ecore_window->window)); | 558 | DFBCHECK(ecore_window->window->RequestFocus(ecore_window->window)); |
559 | } /* ecore_directfb_window_focus */ | 559 | } |
560 | 560 | ||
561 | EAPI void | 561 | EAPI void |
562 | ecore_directfb_window_hide(Ecore_DirectFB_Window *ecore_window) | 562 | ecore_directfb_window_hide(Ecore_DirectFB_Window *ecore_window) |
563 | { | 563 | { |
564 | DFBCHECK(ecore_window->window->SetOpacity(ecore_window->window, 0)); | 564 | DFBCHECK(ecore_window->window->SetOpacity(ecore_window->window, 0)); |
565 | } /* ecore_directfb_window_hide */ | 565 | } |
566 | 566 | ||
567 | EAPI void | 567 | EAPI void |
568 | ecore_directfb_window_show(Ecore_DirectFB_Window *ecore_window) | 568 | ecore_directfb_window_show(Ecore_DirectFB_Window *ecore_window) |
569 | { | 569 | { |
570 | DFBCHECK(ecore_window->window->SetOpacity(ecore_window->window, 0xFF)); | 570 | DFBCHECK(ecore_window->window->SetOpacity(ecore_window->window, 0xFF)); |
571 | } /* ecore_directfb_window_show */ | 571 | } |
572 | 572 | ||
573 | EAPI void | 573 | EAPI void |
574 | ecore_directfb_window_shaped_set(Ecore_DirectFB_Window *ecore_window, Eina_Bool set) | 574 | ecore_directfb_window_shaped_set(Ecore_DirectFB_Window *ecore_window, Eina_Bool set) |
@@ -588,7 +588,7 @@ ecore_directfb_window_shaped_set(Ecore_DirectFB_Window *ecore_window, Eina_Bool | |||
588 | opts &= ~DWOP_ALPHACHANNEL; | 588 | opts &= ~DWOP_ALPHACHANNEL; |
589 | DFBCHECK(ecore_window->window->SetOptions(ecore_window->window, opts)); | 589 | DFBCHECK(ecore_window->window->SetOptions(ecore_window->window, opts)); |
590 | } | 590 | } |
591 | } /* ecore_directfb_window_shaped_set */ | 591 | } |
592 | 592 | ||
593 | EAPI void | 593 | EAPI void |
594 | ecore_directfb_window_cursor_show(Ecore_DirectFB_Window *ecore_window, Eina_Bool show) | 594 | ecore_directfb_window_cursor_show(Ecore_DirectFB_Window *ecore_window, Eina_Bool show) |
@@ -622,7 +622,7 @@ ecore_directfb_window_cursor_show(Ecore_DirectFB_Window *ecore_window, Eina_Bool | |||
622 | DFBCHECK(ecore_window->window->SetCursorShape(ecore_window->window, NULL, 0, 0)); | 622 | DFBCHECK(ecore_window->window->SetCursorShape(ecore_window->window, NULL, 0, 0)); |
623 | } | 623 | } |
624 | } | 624 | } |
625 | } /* ecore_directfb_window_cursor_show */ | 625 | } |
626 | 626 | ||
627 | EAPI void | 627 | EAPI void |
628 | ecore_directfb_window_cursor_set(Ecore_DirectFB_Window *ecore_window, Ecore_DirectFB_Cursor *cursor) | 628 | ecore_directfb_window_cursor_set(Ecore_DirectFB_Window *ecore_window, Ecore_DirectFB_Cursor *cursor) |
@@ -639,7 +639,7 @@ ecore_directfb_window_cursor_set(Ecore_DirectFB_Window *ecore_window, Ecore_Dire | |||
639 | ecore_window->cursor = cursor; | 639 | ecore_window->cursor = cursor; |
640 | DFBCHECK(ecore_window->window->SetCursorShape(ecore_window->window, cursor->surface, cursor->hot_x, cursor->hot_y)); | 640 | DFBCHECK(ecore_window->window->SetCursorShape(ecore_window->window, cursor->surface, cursor->hot_x, cursor->hot_y)); |
641 | } | 641 | } |
642 | } /* ecore_directfb_window_cursor_set */ | 642 | } |
643 | 643 | ||
644 | EAPI void | 644 | EAPI void |
645 | ecore_directfb_window_fullscreen_set(Ecore_DirectFB_Window *ecore_window, Eina_Bool on) | 645 | ecore_directfb_window_fullscreen_set(Ecore_DirectFB_Window *ecore_window, Eina_Bool on) |
@@ -666,14 +666,14 @@ ecore_directfb_window_fullscreen_set(Ecore_DirectFB_Window *ecore_window, Eina_B | |||
666 | DFBCHECK(ecore_window->window->GetSurface(ecore_window->window, &ecore_window->surface)); | 666 | DFBCHECK(ecore_window->window->GetSurface(ecore_window->window, &ecore_window->surface)); |
667 | _ecore_directfb_fullscreen_window_id = 0; | 667 | _ecore_directfb_fullscreen_window_id = 0; |
668 | } | 668 | } |
669 | } /* ecore_directfb_window_fullscreen_set */ | 669 | } |
670 | 670 | ||
671 | EAPI void | 671 | EAPI void |
672 | ecore_directfb_window_size_get(Ecore_DirectFB_Window *ecore_window, int *w, int *h) | 672 | ecore_directfb_window_size_get(Ecore_DirectFB_Window *ecore_window, int *w, int *h) |
673 | { | 673 | { |
674 | DFBCHECK(ecore_window->surface->GetSize(ecore_window->surface,w,h)); | 674 | DFBCHECK(ecore_window->surface->GetSize(ecore_window->surface,w,h)); |
675 | return; | 675 | return; |
676 | } /* ecore_directfb_window_size_get */ | 676 | } |
677 | 677 | ||
678 | EAPI int | 678 | EAPI int |
679 | ecore_directfb_init(const char *name __UNUSED__) | 679 | ecore_directfb_init(const char *name __UNUSED__) |
@@ -730,7 +730,7 @@ ecore_directfb_init(const char *name __UNUSED__) | |||
730 | } | 730 | } |
731 | /* create the hash for the windows(key = windowid, val = Ecore_DirectFB_Window struct) */ | 731 | /* create the hash for the windows(key = windowid, val = Ecore_DirectFB_Window struct) */ |
732 | return _ecore_directfb_init_count; | 732 | return _ecore_directfb_init_count; |
733 | } /* ecore_directfb_init */ | 733 | } |
734 | 734 | ||
735 | EAPI int | 735 | EAPI int |
736 | ecore_directfb_shutdown(void) | 736 | ecore_directfb_shutdown(void) |
@@ -753,5 +753,5 @@ ecore_directfb_shutdown(void) | |||
753 | eina_log_domain_unregister(_ecore_directfb_log_dom); | 753 | eina_log_domain_unregister(_ecore_directfb_log_dom); |
754 | _ecore_directfb_log_dom = -1; | 754 | _ecore_directfb_log_dom = -1; |
755 | return _ecore_directfb_init_count; | 755 | return _ecore_directfb_init_count; |
756 | } /* ecore_directfb_shutdown */ | 756 | } |
757 | 757 | ||