summaryrefslogtreecommitdiff
path: root/legacy
diff options
context:
space:
mode:
authorChristopher Michael <cpmichael1@comcast.net>2011-10-04 21:54:36 +0000
committerChristopher Michael <cpmichael1@comcast.net>2011-10-04 21:54:36 +0000
commita4b22379b00ee8468d877c642a55f5b01a870de1 (patch)
treee7ec8ba40b2f88d17994f722d4a7f0818243bc73 /legacy
parented291bafe103b600b04134eb0deb8cb9fc27fe3c (diff)
Ecore_X(cb): Readd missing connection checks.
SVN revision: 63813
Diffstat (limited to '')
-rw-r--r--legacy/ecore/src/lib/ecore_x/xcb/ecore_xcb_randr.c52
1 files changed, 52 insertions, 0 deletions
diff --git a/legacy/ecore/src/lib/ecore_x/xcb/ecore_xcb_randr.c b/legacy/ecore/src/lib/ecore_x/xcb/ecore_xcb_randr.c
index 9dd911cefa..55afb6187f 100644
--- a/legacy/ecore/src/lib/ecore_x/xcb/ecore_xcb_randr.c
+++ b/legacy/ecore/src/lib/ecore_x/xcb/ecore_xcb_randr.c
@@ -166,6 +166,8 @@ _ecore_xcb_randr_root_to_screen(Ecore_X_Window root)
166{ 166{
167 int count = 0, num = 0; 167 int count = 0, num = 0;
168 168
169 CHECK_XCB_CONN;
170
169 count = xcb_setup_roots_length(xcb_get_setup(_ecore_xcb_conn)); 171 count = xcb_setup_roots_length(xcb_get_setup(_ecore_xcb_conn));
170 for (num = 0; num < count; num++) 172 for (num = 0; num < count; num++)
171 if (_ecore_xcb_window_root_of_screen_get(num) == root) 173 if (_ecore_xcb_window_root_of_screen_get(num) == root)
@@ -210,6 +212,7 @@ ecore_x_randr_screen_primary_output_orientations_get(Ecore_X_Window root)
210#endif 212#endif
211 213
212 LOGFN(__FILE__, __LINE__, __FUNCTION__); 214 LOGFN(__FILE__, __LINE__, __FUNCTION__);
215 CHECK_XCB_CONN;
213 216
214#ifdef ECORE_XCB_RANDR 217#ifdef ECORE_XCB_RANDR
215 cookie = xcb_randr_get_screen_info_unchecked(_ecore_xcb_conn, root); 218 cookie = xcb_randr_get_screen_info_unchecked(_ecore_xcb_conn, root);
@@ -238,6 +241,7 @@ ecore_x_randr_screen_primary_output_orientation_get(Ecore_X_Window root)
238#endif 241#endif
239 242
240 LOGFN(__FILE__, __LINE__, __FUNCTION__); 243 LOGFN(__FILE__, __LINE__, __FUNCTION__);
244 CHECK_XCB_CONN;
241 245
242#ifdef ECORE_XCB_RANDR 246#ifdef ECORE_XCB_RANDR
243 cookie = xcb_randr_get_screen_info_unchecked(_ecore_xcb_conn, root); 247 cookie = xcb_randr_get_screen_info_unchecked(_ecore_xcb_conn, root);
@@ -268,6 +272,7 @@ ecore_x_randr_screen_primary_output_orientation_set(Ecore_X_Window root, Ecore_X
268#endif 272#endif
269 273
270 LOGFN(__FILE__, __LINE__, __FUNCTION__); 274 LOGFN(__FILE__, __LINE__, __FUNCTION__);
275 CHECK_XCB_CONN;
271 276
272#ifdef ECORE_XCB_RANDR 277#ifdef ECORE_XCB_RANDR
273 cookie = xcb_randr_get_screen_info_unchecked(_ecore_xcb_conn, root); 278 cookie = xcb_randr_get_screen_info_unchecked(_ecore_xcb_conn, root);
@@ -316,6 +321,7 @@ ecore_x_randr_screen_primary_output_sizes_get(Ecore_X_Window root, int *num)
316#endif 321#endif
317 322
318 LOGFN(__FILE__, __LINE__, __FUNCTION__); 323 LOGFN(__FILE__, __LINE__, __FUNCTION__);
324 CHECK_XCB_CONN;
319 325
320#ifdef ECORE_XCB_RANDR 326#ifdef ECORE_XCB_RANDR
321 cookie = xcb_randr_get_screen_info_unchecked(_ecore_xcb_conn, root); 327 cookie = xcb_randr_get_screen_info_unchecked(_ecore_xcb_conn, root);
@@ -374,6 +380,7 @@ ecore_x_randr_screen_primary_output_current_size_get(Ecore_X_Window root, int *w
374#endif 380#endif
375 381
376 LOGFN(__FILE__, __LINE__, __FUNCTION__); 382 LOGFN(__FILE__, __LINE__, __FUNCTION__);
383 CHECK_XCB_CONN;
377 384
378#ifdef ECORE_XCB_RANDR 385#ifdef ECORE_XCB_RANDR
379 cookie = xcb_randr_get_screen_info_unchecked(_ecore_xcb_conn, root); 386 cookie = xcb_randr_get_screen_info_unchecked(_ecore_xcb_conn, root);
@@ -421,6 +428,7 @@ ecore_x_randr_screen_primary_output_size_set(Ecore_X_Window root, int size_index
421#endif 428#endif
422 429
423 LOGFN(__FILE__, __LINE__, __FUNCTION__); 430 LOGFN(__FILE__, __LINE__, __FUNCTION__);
431 CHECK_XCB_CONN;
424 432
425#ifdef ECORE_XCB_RANDR 433#ifdef ECORE_XCB_RANDR
426 if (!((size_index >= 0) && (_ecore_xcb_randr_root_validate(root)))) 434 if (!((size_index >= 0) && (_ecore_xcb_randr_root_validate(root))))
@@ -483,6 +491,7 @@ ecore_x_randr_screen_primary_output_current_refresh_rate_get(Ecore_X_Window root
483#endif 491#endif
484 492
485 LOGFN(__FILE__, __LINE__, __FUNCTION__); 493 LOGFN(__FILE__, __LINE__, __FUNCTION__);
494 CHECK_XCB_CONN;
486 495
487#ifdef ECORE_XCB_RANDR 496#ifdef ECORE_XCB_RANDR
488 if (!_ecore_xcb_randr_root_validate(root)) return ret; 497 if (!_ecore_xcb_randr_root_validate(root)) return ret;
@@ -516,6 +525,7 @@ ecore_x_randr_screen_primary_output_refresh_rates_get(Ecore_X_Window root, int s
516#endif 525#endif
517 526
518 LOGFN(__FILE__, __LINE__, __FUNCTION__); 527 LOGFN(__FILE__, __LINE__, __FUNCTION__);
528 CHECK_XCB_CONN;
519 529
520#ifdef ECORE_XCB_RANDR 530#ifdef ECORE_XCB_RANDR
521 if (!_ecore_xcb_randr_root_validate(root)) return ret; 531 if (!_ecore_xcb_randr_root_validate(root)) return ret;
@@ -568,6 +578,7 @@ ecore_x_randr_screen_primary_output_refresh_rate_set(Ecore_X_Window root, int si
568#endif 578#endif
569 579
570 LOGFN(__FILE__, __LINE__, __FUNCTION__); 580 LOGFN(__FILE__, __LINE__, __FUNCTION__);
581 CHECK_XCB_CONN;
571 582
572#ifdef ECORE_XCB_RANDR 583#ifdef ECORE_XCB_RANDR
573 if (_randr_version < RANDR_1_1) return EINA_FALSE; 584 if (_randr_version < RANDR_1_1) return EINA_FALSE;
@@ -612,6 +623,7 @@ EAPI void
612ecore_x_randr_mode_info_free(Ecore_X_Randr_Mode_Info *mode_info) 623ecore_x_randr_mode_info_free(Ecore_X_Randr_Mode_Info *mode_info)
613{ 624{
614 LOGFN(__FILE__, __LINE__, __FUNCTION__); 625 LOGFN(__FILE__, __LINE__, __FUNCTION__);
626 CHECK_XCB_CONN;
615 627
616 RANDR_CHECK_1_2_RET(); 628 RANDR_CHECK_1_2_RET();
617 629
@@ -636,6 +648,7 @@ ecore_x_randr_primary_output_get(Ecore_X_Window root)
636#endif 648#endif
637 649
638 LOGFN(__FILE__, __LINE__, __FUNCTION__); 650 LOGFN(__FILE__, __LINE__, __FUNCTION__);
651 CHECK_XCB_CONN;
639 652
640#ifdef ECORE_XCB_RANDR 653#ifdef ECORE_XCB_RANDR
641 RANDR_CHECK_1_3_RET(Ecore_X_Randr_None); 654 RANDR_CHECK_1_3_RET(Ecore_X_Randr_None);
@@ -662,6 +675,7 @@ EAPI void
662ecore_x_randr_primary_output_set(Ecore_X_Window root, Ecore_X_Randr_Output output) 675ecore_x_randr_primary_output_set(Ecore_X_Window root, Ecore_X_Randr_Output output)
663{ 676{
664 LOGFN(__FILE__, __LINE__, __FUNCTION__); 677 LOGFN(__FILE__, __LINE__, __FUNCTION__);
678 CHECK_XCB_CONN;
665 679
666#ifdef ECORE_XCB_RANDR 680#ifdef ECORE_XCB_RANDR
667 RANDR_CHECK_1_3_RET(); 681 RANDR_CHECK_1_3_RET();
@@ -677,6 +691,7 @@ ecore_x_randr_output_modes_get(Ecore_X_Window root, Ecore_X_Randr_Output output,
677 Ecore_X_Randr_Mode *modes = NULL; 691 Ecore_X_Randr_Mode *modes = NULL;
678 692
679 LOGFN(__FILE__, __LINE__, __FUNCTION__); 693 LOGFN(__FILE__, __LINE__, __FUNCTION__);
694 CHECK_XCB_CONN;
680 695
681#ifdef ECORE_XCB_RANDR 696#ifdef ECORE_XCB_RANDR
682 RANDR_CHECK_1_2_RET(NULL); 697 RANDR_CHECK_1_2_RET(NULL);
@@ -708,6 +723,7 @@ ecore_x_randr_mode_info_get(Ecore_X_Window root, Ecore_X_Randr_Mode mode)
708 Ecore_X_Randr_Mode_Info *ret = NULL; 723 Ecore_X_Randr_Mode_Info *ret = NULL;
709 724
710 LOGFN(__FILE__, __LINE__, __FUNCTION__); 725 LOGFN(__FILE__, __LINE__, __FUNCTION__);
726 CHECK_XCB_CONN;
711 727
712#ifdef ECORE_XCB_RANDR 728#ifdef ECORE_XCB_RANDR
713 RANDR_CHECK_1_2_RET(NULL); 729 RANDR_CHECK_1_2_RET(NULL);
@@ -734,6 +750,7 @@ ecore_x_randr_modes_info_get(Ecore_X_Window root, int *num)
734 Ecore_X_Randr_Mode_Info **ret = NULL; 750 Ecore_X_Randr_Mode_Info **ret = NULL;
735 751
736 LOGFN(__FILE__, __LINE__, __FUNCTION__); 752 LOGFN(__FILE__, __LINE__, __FUNCTION__);
753 CHECK_XCB_CONN;
737 754
738 if (num) *num = 0; 755 if (num) *num = 0;
739 756
@@ -760,6 +777,7 @@ EAPI void
760ecore_x_randr_mode_size_get(Ecore_X_Window root, Ecore_X_Randr_Mode mode, int *w, int *h) 777ecore_x_randr_mode_size_get(Ecore_X_Window root, Ecore_X_Randr_Mode mode, int *w, int *h)
761{ 778{
762 LOGFN(__FILE__, __LINE__, __FUNCTION__); 779 LOGFN(__FILE__, __LINE__, __FUNCTION__);
780 CHECK_XCB_CONN;
763 781
764#ifdef ECORE_XCB_RANDR 782#ifdef ECORE_XCB_RANDR
765 RANDR_CHECK_1_2_RET(); 783 RANDR_CHECK_1_2_RET();
@@ -792,6 +810,7 @@ ecore_x_randr_output_edid_get(Ecore_X_Window root, Ecore_X_Randr_Output output,
792#endif 810#endif
793 811
794 LOGFN(__FILE__, __LINE__, __FUNCTION__); 812 LOGFN(__FILE__, __LINE__, __FUNCTION__);
813 CHECK_XCB_CONN;
795 814
796#ifdef ECORE_XCB_RANDR 815#ifdef ECORE_XCB_RANDR
797 RANDR_CHECK_1_2_RET(NULL); 816 RANDR_CHECK_1_2_RET(NULL);
@@ -836,6 +855,7 @@ ecore_x_randr_output_clones_get(Ecore_X_Window root, Ecore_X_Randr_Output output
836 Ecore_X_Randr_Output *outputs = NULL; 855 Ecore_X_Randr_Output *outputs = NULL;
837 856
838 LOGFN(__FILE__, __LINE__, __FUNCTION__); 857 LOGFN(__FILE__, __LINE__, __FUNCTION__);
858 CHECK_XCB_CONN;
839 859
840#ifdef ECORE_XCB_RANDR 860#ifdef ECORE_XCB_RANDR
841 RANDR_CHECK_1_2_RET(NULL); 861 RANDR_CHECK_1_2_RET(NULL);
@@ -856,6 +876,7 @@ ecore_x_randr_output_possible_crtcs_get(Ecore_X_Window root, Ecore_X_Randr_Outpu
856 Ecore_X_Randr_Crtc *crtcs = NULL; 876 Ecore_X_Randr_Crtc *crtcs = NULL;
857 877
858 LOGFN(__FILE__, __LINE__, __FUNCTION__); 878 LOGFN(__FILE__, __LINE__, __FUNCTION__);
879 CHECK_XCB_CONN;
859 880
860#ifdef ECORE_XCB_RANDR 881#ifdef ECORE_XCB_RANDR
861 RANDR_CHECK_1_2_RET(NULL); 882 RANDR_CHECK_1_2_RET(NULL);
@@ -880,6 +901,7 @@ EAPI char *
880ecore_x_randr_output_name_get(Ecore_X_Window root, Ecore_X_Randr_Output output, int *len) 901ecore_x_randr_output_name_get(Ecore_X_Window root, Ecore_X_Randr_Output output, int *len)
881{ 902{
882 LOGFN(__FILE__, __LINE__, __FUNCTION__); 903 LOGFN(__FILE__, __LINE__, __FUNCTION__);
904 CHECK_XCB_CONN;
883 905
884#ifdef ECORE_XCB_RANDR 906#ifdef ECORE_XCB_RANDR
885 RANDR_CHECK_1_2_RET(NULL); 907 RANDR_CHECK_1_2_RET(NULL);
@@ -899,6 +921,7 @@ EAPI Ecore_X_Randr_Connection_Status
899ecore_x_randr_output_connection_status_get(Ecore_X_Window root, Ecore_X_Randr_Output output) 921ecore_x_randr_output_connection_status_get(Ecore_X_Window root, Ecore_X_Randr_Output output)
900{ 922{
901 LOGFN(__FILE__, __LINE__, __FUNCTION__); 923 LOGFN(__FILE__, __LINE__, __FUNCTION__);
924 CHECK_XCB_CONN;
902 925
903#ifdef ECORE_XCB_RANDR 926#ifdef ECORE_XCB_RANDR
904 RANDR_CHECK_1_2_RET(ECORE_X_RANDR_CONNECTION_STATUS_UNKNOWN); 927 RANDR_CHECK_1_2_RET(ECORE_X_RANDR_CONNECTION_STATUS_UNKNOWN);
@@ -919,6 +942,7 @@ EAPI Ecore_X_Randr_Output *
919ecore_x_randr_outputs_get(Ecore_X_Window root, int *num) 942ecore_x_randr_outputs_get(Ecore_X_Window root, int *num)
920{ 943{
921 LOGFN(__FILE__, __LINE__, __FUNCTION__); 944 LOGFN(__FILE__, __LINE__, __FUNCTION__);
945 CHECK_XCB_CONN;
922 946
923#ifdef ECORE_XCB_RANDR 947#ifdef ECORE_XCB_RANDR
924 RANDR_CHECK_1_2_RET(NULL); 948 RANDR_CHECK_1_2_RET(NULL);
@@ -936,6 +960,7 @@ EAPI Ecore_X_Randr_Crtc
936ecore_x_randr_output_crtc_get(Ecore_X_Window root, Ecore_X_Randr_Output output) 960ecore_x_randr_output_crtc_get(Ecore_X_Window root, Ecore_X_Randr_Output output)
937{ 961{
938 LOGFN(__FILE__, __LINE__, __FUNCTION__); 962 LOGFN(__FILE__, __LINE__, __FUNCTION__);
963 CHECK_XCB_CONN;
939 964
940#ifdef ECORE_XCB_RANDR 965#ifdef ECORE_XCB_RANDR
941 RANDR_CHECK_1_2_RET(Ecore_X_Randr_None); 966 RANDR_CHECK_1_2_RET(Ecore_X_Randr_None);
@@ -982,6 +1007,7 @@ ecore_x_randr_crtc_settings_set(Ecore_X_Window root, Ecore_X_Randr_Crtc crtc, Ec
982#endif 1007#endif
983 1008
984 LOGFN(__FILE__, __LINE__, __FUNCTION__); 1009 LOGFN(__FILE__, __LINE__, __FUNCTION__);
1010 CHECK_XCB_CONN;
985 1011
986#ifdef ECORE_XCB_RANDR 1012#ifdef ECORE_XCB_RANDR
987 RANDR_CHECK_1_2_RET(EINA_FALSE); 1013 RANDR_CHECK_1_2_RET(EINA_FALSE);
@@ -1057,6 +1083,7 @@ ecore_x_randr_crtc_mode_set(Ecore_X_Window root, Ecore_X_Randr_Crtc crtc, Ecore_
1057 Eina_Bool ret = EINA_FALSE; 1083 Eina_Bool ret = EINA_FALSE;
1058 1084
1059 LOGFN(__FILE__, __LINE__, __FUNCTION__); 1085 LOGFN(__FILE__, __LINE__, __FUNCTION__);
1086 CHECK_XCB_CONN;
1060 1087
1061#ifdef ECORE_XCB_RANDR 1088#ifdef ECORE_XCB_RANDR
1062 RANDR_CHECK_1_2_RET(EINA_FALSE); 1089 RANDR_CHECK_1_2_RET(EINA_FALSE);
@@ -1089,6 +1116,7 @@ ecore_x_randr_crtc_mode_get(Ecore_X_Window root, Ecore_X_Randr_Crtc crtc)
1089#endif 1116#endif
1090 1117
1091 LOGFN(__FILE__, __LINE__, __FUNCTION__); 1118 LOGFN(__FILE__, __LINE__, __FUNCTION__);
1119 CHECK_XCB_CONN;
1092 1120
1093#ifdef ECORE_XCB_RANDR 1121#ifdef ECORE_XCB_RANDR
1094 RANDR_CHECK_1_2_RET(Ecore_X_Randr_Unset); 1122 RANDR_CHECK_1_2_RET(Ecore_X_Randr_Unset);
@@ -1124,6 +1152,7 @@ ecore_x_randr_crtc_orientation_get(Ecore_X_Window root, Ecore_X_Randr_Crtc crtc)
1124#endif 1152#endif
1125 1153
1126 LOGFN(__FILE__, __LINE__, __FUNCTION__); 1154 LOGFN(__FILE__, __LINE__, __FUNCTION__);
1155 CHECK_XCB_CONN;
1127 1156
1128#ifdef ECORE_XCB_RANDR 1157#ifdef ECORE_XCB_RANDR
1129 RANDR_CHECK_1_2_RET(Ecore_X_Randr_None); 1158 RANDR_CHECK_1_2_RET(Ecore_X_Randr_None);
@@ -1154,6 +1183,7 @@ ecore_x_randr_crtc_orientation_set(Ecore_X_Window root, Ecore_X_Randr_Crtc crtc,
1154 Eina_Bool ret = EINA_FALSE; 1183 Eina_Bool ret = EINA_FALSE;
1155 1184
1156 LOGFN(__FILE__, __LINE__, __FUNCTION__); 1185 LOGFN(__FILE__, __LINE__, __FUNCTION__);
1186 CHECK_XCB_CONN;
1157 1187
1158#ifdef ECORE_XCB_RANDR 1188#ifdef ECORE_XCB_RANDR
1159 RANDR_CHECK_1_2_RET(EINA_FALSE); 1189 RANDR_CHECK_1_2_RET(EINA_FALSE);
@@ -1181,6 +1211,7 @@ ecore_x_randr_crtc_orientations_get(Ecore_X_Window root, Ecore_X_Randr_Crtc crtc
1181#endif 1211#endif
1182 1212
1183 LOGFN(__FILE__, __LINE__, __FUNCTION__); 1213 LOGFN(__FILE__, __LINE__, __FUNCTION__);
1214 CHECK_XCB_CONN;
1184 1215
1185#ifdef ECORE_XCB_RANDR 1216#ifdef ECORE_XCB_RANDR
1186 RANDR_CHECK_1_2_RET(Ecore_X_Randr_None); 1217 RANDR_CHECK_1_2_RET(Ecore_X_Randr_None);
@@ -1222,6 +1253,7 @@ ecore_x_randr_crtc_possible_outputs_get(Ecore_X_Window root, Ecore_X_Randr_Crtc
1222#endif 1253#endif
1223 1254
1224 LOGFN(__FILE__, __LINE__, __FUNCTION__); 1255 LOGFN(__FILE__, __LINE__, __FUNCTION__);
1256 CHECK_XCB_CONN;
1225 1257
1226#ifdef ECORE_XCB_RANDR 1258#ifdef ECORE_XCB_RANDR
1227 RANDR_CHECK_1_2_RET(NULL); 1259 RANDR_CHECK_1_2_RET(NULL);
@@ -1266,6 +1298,7 @@ ecore_x_randr_crtcs_get(Ecore_X_Window root, int *num)
1266 Ecore_X_Randr_Crtc *ret = NULL; 1298 Ecore_X_Randr_Crtc *ret = NULL;
1267 1299
1268 LOGFN(__FILE__, __LINE__, __FUNCTION__); 1300 LOGFN(__FILE__, __LINE__, __FUNCTION__);
1301 CHECK_XCB_CONN;
1269 1302
1270#ifdef ECORE_XCB_RANDR 1303#ifdef ECORE_XCB_RANDR
1271 RANDR_CHECK_1_2_RET(NULL); 1304 RANDR_CHECK_1_2_RET(NULL);
@@ -1321,6 +1354,7 @@ ecore_x_randr_crtc_outputs_get(Ecore_X_Window root, Ecore_X_Randr_Crtc crtc, int
1321#endif 1354#endif
1322 1355
1323 LOGFN(__FILE__, __LINE__, __FUNCTION__); 1356 LOGFN(__FILE__, __LINE__, __FUNCTION__);
1357 CHECK_XCB_CONN;
1324 1358
1325#ifdef ECORE_XCB_RANDR 1359#ifdef ECORE_XCB_RANDR
1326 RANDR_CHECK_1_2_RET(NULL); 1360 RANDR_CHECK_1_2_RET(NULL);
@@ -1359,6 +1393,7 @@ ecore_x_randr_crtc_geometry_get(Ecore_X_Window root, Ecore_X_Randr_Crtc crtc, in
1359#endif 1393#endif
1360 1394
1361 LOGFN(__FILE__, __LINE__, __FUNCTION__); 1395 LOGFN(__FILE__, __LINE__, __FUNCTION__);
1396 CHECK_XCB_CONN;
1362 1397
1363#ifdef ECORE_XCB_RANDR 1398#ifdef ECORE_XCB_RANDR
1364 RANDR_CHECK_1_2_RET(); 1399 RANDR_CHECK_1_2_RET();
@@ -1403,6 +1438,7 @@ ecore_x_randr_crtc_pos_relative_set(Ecore_X_Window root, Ecore_X_Randr_Crtc crtc
1403#endif 1438#endif
1404 1439
1405 LOGFN(__FILE__, __LINE__, __FUNCTION__); 1440 LOGFN(__FILE__, __LINE__, __FUNCTION__);
1441 CHECK_XCB_CONN;
1406 1442
1407#ifdef ECORE_XCB_RANDR 1443#ifdef ECORE_XCB_RANDR
1408 RANDR_CHECK_1_2_RET(EINA_FALSE); 1444 RANDR_CHECK_1_2_RET(EINA_FALSE);
@@ -1485,6 +1521,7 @@ ecore_x_randr_move_all_crtcs_but(Ecore_X_Window root, const Ecore_X_Randr_Crtc *
1485#endif 1521#endif
1486 1522
1487 LOGFN(__FILE__, __LINE__, __FUNCTION__); 1523 LOGFN(__FILE__, __LINE__, __FUNCTION__);
1524 CHECK_XCB_CONN;
1488 1525
1489#ifdef ECORE_XCB_RANDR 1526#ifdef ECORE_XCB_RANDR
1490 if ((num <= 0) || (!not_moved) || (!_ecore_xcb_randr_root_validate(root))) 1527 if ((num <= 0) || (!not_moved) || (!_ecore_xcb_randr_root_validate(root)))
@@ -1515,6 +1552,7 @@ EAPI void
1515ecore_x_randr_crtc_pos_get(Ecore_X_Window root, Ecore_X_Randr_Crtc crtc, int *x, int *y) 1552ecore_x_randr_crtc_pos_get(Ecore_X_Window root, Ecore_X_Randr_Crtc crtc, int *x, int *y)
1516{ 1553{
1517 LOGFN(__FILE__, __LINE__, __FUNCTION__); 1554 LOGFN(__FILE__, __LINE__, __FUNCTION__);
1555 CHECK_XCB_CONN;
1518 1556
1519#ifdef ECORE_XCB_RANDR 1557#ifdef ECORE_XCB_RANDR
1520 RANDR_CHECK_1_2_RET(); 1558 RANDR_CHECK_1_2_RET();
@@ -1541,6 +1579,7 @@ ecore_x_randr_crtc_pos_set(Ecore_X_Window root, Ecore_X_Randr_Crtc crtc, int x,
1541#endif 1579#endif
1542 1580
1543 LOGFN(__FILE__, __LINE__, __FUNCTION__); 1581 LOGFN(__FILE__, __LINE__, __FUNCTION__);
1582 CHECK_XCB_CONN;
1544 1583
1545#ifdef ECORE_XCB_RANDR 1584#ifdef ECORE_XCB_RANDR
1546 RANDR_CHECK_1_2_RET(EINA_FALSE); 1585 RANDR_CHECK_1_2_RET(EINA_FALSE);
@@ -1571,6 +1610,7 @@ EAPI void
1571ecore_x_randr_crtc_size_get(Ecore_X_Window root, Ecore_X_Randr_Crtc crtc, int *w, int *h) 1610ecore_x_randr_crtc_size_get(Ecore_X_Window root, Ecore_X_Randr_Crtc crtc, int *w, int *h)
1572{ 1611{
1573 LOGFN(__FILE__, __LINE__, __FUNCTION__); 1612 LOGFN(__FILE__, __LINE__, __FUNCTION__);
1613 CHECK_XCB_CONN;
1574 1614
1575#ifdef ECORE_XCB_RANDR 1615#ifdef ECORE_XCB_RANDR
1576 RANDR_CHECK_1_2_RET(); 1616 RANDR_CHECK_1_2_RET();
@@ -1584,6 +1624,7 @@ ecore_x_randr_crtc_refresh_rate_get(Ecore_X_Window root, Ecore_X_Randr_Crtc crtc
1584 Ecore_X_Randr_Refresh_Rate ret = 0.0; 1624 Ecore_X_Randr_Refresh_Rate ret = 0.0;
1585 1625
1586 LOGFN(__FILE__, __LINE__, __FUNCTION__); 1626 LOGFN(__FILE__, __LINE__, __FUNCTION__);
1627 CHECK_XCB_CONN;
1587 1628
1588#ifdef ECORE_XCB_RANDR 1629#ifdef ECORE_XCB_RANDR
1589 RANDR_CHECK_1_2_RET(0.0); 1630 RANDR_CHECK_1_2_RET(0.0);
@@ -1676,6 +1717,7 @@ ecore_x_randr_move_crtcs(Ecore_X_Window root, const Ecore_X_Randr_Crtc *crtcs, i
1676#endif 1717#endif
1677 1718
1678 LOGFN(__FILE__, __LINE__, __FUNCTION__); 1719 LOGFN(__FILE__, __LINE__, __FUNCTION__);
1720 CHECK_XCB_CONN;
1679 1721
1680#ifdef ECORE_XCB_RANDR 1722#ifdef ECORE_XCB_RANDR
1681 RANDR_CHECK_1_2_RET(EINA_FALSE); 1723 RANDR_CHECK_1_2_RET(EINA_FALSE);
@@ -1774,6 +1816,7 @@ ecore_x_randr_events_select(Ecore_X_Window win, Eina_Bool on)
1774#endif 1816#endif
1775 1817
1776 LOGFN(__FILE__, __LINE__, __FUNCTION__); 1818 LOGFN(__FILE__, __LINE__, __FUNCTION__);
1819 CHECK_XCB_CONN;
1777 1820
1778#ifdef ECORE_XCB_RANDR 1821#ifdef ECORE_XCB_RANDR
1779 if (on) 1822 if (on)
@@ -1807,6 +1850,7 @@ ecore_x_randr_screen_reset(Ecore_X_Window root)
1807#endif 1850#endif
1808 1851
1809 LOGFN(__FILE__, __LINE__, __FUNCTION__); 1852 LOGFN(__FILE__, __LINE__, __FUNCTION__);
1853 CHECK_XCB_CONN;
1810 1854
1811#ifdef ECORE_XCB_RANDR 1855#ifdef ECORE_XCB_RANDR
1812 if (!_ecore_xcb_randr_root_validate(root)) return; 1856 if (!_ecore_xcb_randr_root_validate(root)) return;
@@ -1879,6 +1923,7 @@ ecore_x_randr_screen_size_range_get(Ecore_X_Window root, int *minw, int *minh, i
1879#endif 1923#endif
1880 1924
1881 LOGFN(__FILE__, __LINE__, __FUNCTION__); 1925 LOGFN(__FILE__, __LINE__, __FUNCTION__);
1926 CHECK_XCB_CONN;
1882 1927
1883#ifdef ECORE_XCB_RANDR 1928#ifdef ECORE_XCB_RANDR
1884 RANDR_CHECK_1_2_RET(); 1929 RANDR_CHECK_1_2_RET();
@@ -1911,6 +1956,7 @@ ecore_x_randr_screen_current_size_get(Ecore_X_Window root, int *w, int *h, int *
1911#endif 1956#endif
1912 1957
1913 LOGFN(__FILE__, __LINE__, __FUNCTION__); 1958 LOGFN(__FILE__, __LINE__, __FUNCTION__);
1959 CHECK_XCB_CONN;
1914 1960
1915#ifdef ECORE_XCB_RANDR 1961#ifdef ECORE_XCB_RANDR
1916 RANDR_CHECK_1_2_RET(); 1962 RANDR_CHECK_1_2_RET();
@@ -1947,6 +1993,7 @@ ecore_x_randr_screen_current_size_set(Ecore_X_Window root, int w, int h, int w_m
1947#endif 1993#endif
1948 1994
1949 LOGFN(__FILE__, __LINE__, __FUNCTION__); 1995 LOGFN(__FILE__, __LINE__, __FUNCTION__);
1996 CHECK_XCB_CONN;
1950 1997
1951#ifdef ECORE_XCB_RANDR 1998#ifdef ECORE_XCB_RANDR
1952 RANDR_CHECK_1_2_RET(EINA_FALSE); 1999 RANDR_CHECK_1_2_RET(EINA_FALSE);
@@ -1998,6 +2045,7 @@ ecore_x_randr_window_outputs_get(Ecore_X_Window window, int *num)
1998#endif 2045#endif
1999 2046
2000 LOGFN(__FILE__, __LINE__, __FUNCTION__); 2047 LOGFN(__FILE__, __LINE__, __FUNCTION__);
2048 CHECK_XCB_CONN;
2001 2049
2002 if (num) *num = 0; 2050 if (num) *num = 0;
2003 2051
@@ -2087,6 +2135,7 @@ ecore_x_randr_output_backlight_level_get(Ecore_X_Window root, Ecore_X_Randr_Outp
2087#endif 2135#endif
2088 2136
2089 LOGFN(__FILE__, __LINE__, __FUNCTION__); 2137 LOGFN(__FILE__, __LINE__, __FUNCTION__);
2138 CHECK_XCB_CONN;
2090 2139
2091#ifdef ECORE_XCB_RANDR 2140#ifdef ECORE_XCB_RANDR
2092 RANDR_CHECK_1_2_RET(-1); 2141 RANDR_CHECK_1_2_RET(-1);
@@ -2182,6 +2231,7 @@ ecore_x_randr_output_backlight_level_set(Ecore_X_Window root, Ecore_X_Randr_Outp
2182#endif 2231#endif
2183 2232
2184 LOGFN(__FILE__, __LINE__, __FUNCTION__); 2233 LOGFN(__FILE__, __LINE__, __FUNCTION__);
2234 CHECK_XCB_CONN;
2185 2235
2186#ifdef ECORE_XCB_RANDR 2236#ifdef ECORE_XCB_RANDR
2187 RANDR_CHECK_1_2_RET(EINA_FALSE); 2237 RANDR_CHECK_1_2_RET(EINA_FALSE);
@@ -2254,6 +2304,7 @@ _ecore_xcb_randr_output_validate(Ecore_X_Window root, Ecore_X_Randr_Output outpu
2254 Eina_Bool ret = EINA_FALSE; 2304 Eina_Bool ret = EINA_FALSE;
2255 2305
2256 LOGFN(__FILE__, __LINE__, __FUNCTION__); 2306 LOGFN(__FILE__, __LINE__, __FUNCTION__);
2307 CHECK_XCB_CONN;
2257 2308
2258#ifdef ECORE_XCB_RANDR 2309#ifdef ECORE_XCB_RANDR
2259 RANDR_CHECK_1_2_RET(EINA_FALSE); 2310 RANDR_CHECK_1_2_RET(EINA_FALSE);
@@ -2325,6 +2376,7 @@ _ecore_xcb_randr_crtc_validate(Ecore_X_Window root, Ecore_X_Randr_Crtc crtc)
2325 Eina_Bool ret = EINA_FALSE; 2376 Eina_Bool ret = EINA_FALSE;
2326 2377
2327 LOGFN(__FILE__, __LINE__, __FUNCTION__); 2378 LOGFN(__FILE__, __LINE__, __FUNCTION__);
2379 CHECK_XCB_CONN;
2328 2380
2329#ifdef ECORE_XCB_RANDR 2381#ifdef ECORE_XCB_RANDR
2330 RANDR_CHECK_1_2_RET(EINA_FALSE); 2382 RANDR_CHECK_1_2_RET(EINA_FALSE);