Mercurial > sdl-ios-xcode
comparison src/video/Xext/Xxf86vm/XF86VMode.c @ 690:b87d8d4c205d
Fixed use of SDL with XInitThreads()
author | Sam Lantinga <slouken@libsdl.org> |
---|---|
date | Sat, 23 Aug 2003 23:12:19 +0000 |
parents | eadc0746dfaf |
children | 045f186426e1 |
comparison
equal
deleted
inserted
replaced
689:5bb080d35049 | 690:b87d8d4c205d |
---|---|
342 if (majorVersion < 2) | 342 if (majorVersion < 2) |
343 _XEatData(dpy, (rep.modecount) * sizeof(xXF86OldVidModeModeInfo)); | 343 _XEatData(dpy, (rep.modecount) * sizeof(xXF86OldVidModeModeInfo)); |
344 else | 344 else |
345 _XEatData(dpy, (rep.modecount) * sizeof(xXF86VidModeModeInfo)); | 345 _XEatData(dpy, (rep.modecount) * sizeof(xXF86VidModeModeInfo)); |
346 Xfree(modelines); | 346 Xfree(modelines); |
347 UnlockDisplay(dpy); | |
348 SyncHandle(); | |
347 return False; | 349 return False; |
348 } | 350 } |
349 mdinfptr = (SDL_NAME(XF86VidModeModeInfo) *) ( | 351 mdinfptr = (SDL_NAME(XF86VidModeModeInfo) *) ( |
350 (char *) modelines | 352 (char *) modelines |
351 + rep.modecount*sizeof(SDL_NAME(XF86VidModeModeInfo) *) | 353 + rep.modecount*sizeof(SDL_NAME(XF86VidModeModeInfo) *) |
923 #endif | 925 #endif |
924 if (rep.vendorLength) { | 926 if (rep.vendorLength) { |
925 if (!(monitor->vendor = (char *)Xcalloc(rep.vendorLength + 1, 1))) { | 927 if (!(monitor->vendor = (char *)Xcalloc(rep.vendorLength + 1, 1))) { |
926 _XEatData(dpy, (rep.nhsync + rep.nvsync) * 4 + | 928 _XEatData(dpy, (rep.nhsync + rep.nvsync) * 4 + |
927 ((rep.vendorLength+3) & ~3) + ((rep.modelLength+3) & ~3)); | 929 ((rep.vendorLength+3) & ~3) + ((rep.modelLength+3) & ~3)); |
930 UnlockDisplay(dpy); | |
931 SyncHandle(); | |
928 return False; | 932 return False; |
929 } | 933 } |
930 } else { | 934 } else { |
931 monitor->vendor = NULL; | 935 monitor->vendor = NULL; |
932 } | 936 } |
934 if (!(monitor->model = Xcalloc(rep.modelLength + 1, 1))) { | 938 if (!(monitor->model = Xcalloc(rep.modelLength + 1, 1))) { |
935 _XEatData(dpy, (rep.nhsync + rep.nvsync) * 4 + | 939 _XEatData(dpy, (rep.nhsync + rep.nvsync) * 4 + |
936 ((rep.vendorLength+3) & ~3) + ((rep.modelLength+3) & ~3)); | 940 ((rep.vendorLength+3) & ~3) + ((rep.modelLength+3) & ~3)); |
937 if (monitor->vendor) | 941 if (monitor->vendor) |
938 Xfree(monitor->vendor); | 942 Xfree(monitor->vendor); |
943 UnlockDisplay(dpy); | |
944 SyncHandle(); | |
939 return False; | 945 return False; |
940 } | 946 } |
941 } else { | 947 } else { |
942 monitor->model = NULL; | 948 monitor->model = NULL; |
943 } | 949 } |
947 | 953 |
948 if (monitor->vendor) | 954 if (monitor->vendor) |
949 Xfree(monitor->vendor); | 955 Xfree(monitor->vendor); |
950 if (monitor->model) | 956 if (monitor->model) |
951 Xfree(monitor->model); | 957 Xfree(monitor->model); |
958 UnlockDisplay(dpy); | |
959 SyncHandle(); | |
952 return False; | 960 return False; |
953 } | 961 } |
954 if (!(monitor->vsync = Xcalloc(rep.nvsync, sizeof(SDL_NAME(XF86VidModeSyncRange))))) { | 962 if (!(monitor->vsync = Xcalloc(rep.nvsync, sizeof(SDL_NAME(XF86VidModeSyncRange))))) { |
955 _XEatData(dpy, (rep.nhsync + rep.nvsync) * 4 + | 963 _XEatData(dpy, (rep.nhsync + rep.nvsync) * 4 + |
956 ((rep.vendorLength+3) & ~3) + ((rep.modelLength+3) & ~3)); | 964 ((rep.vendorLength+3) & ~3) + ((rep.modelLength+3) & ~3)); |
957 if (monitor->vendor) | 965 if (monitor->vendor) |
958 Xfree(monitor->vendor); | 966 Xfree(monitor->vendor); |
959 if (monitor->model) | 967 if (monitor->model) |
960 Xfree(monitor->model); | 968 Xfree(monitor->model); |
961 Xfree(monitor->hsync); | 969 Xfree(monitor->hsync); |
970 UnlockDisplay(dpy); | |
971 SyncHandle(); | |
962 return False; | 972 return False; |
963 } | 973 } |
964 for (i = 0; i < rep.nhsync; i++) { | 974 for (i = 0; i < rep.nhsync; i++) { |
965 _XRead(dpy, (char *)&syncrange, 4); | 975 _XRead(dpy, (char *)&syncrange, 4); |
966 monitor->hsync[i].lo = (float)(syncrange & 0xFFFF) / 100.0; | 976 monitor->hsync[i].lo = (float)(syncrange & 0xFFFF) / 100.0; |
1094 *flagsPtr = rep.flags; | 1104 *flagsPtr = rep.flags; |
1095 | 1105 |
1096 if (!(dotclocks = (int*) Xcalloc(rep.clocks, sizeof(int)))) { | 1106 if (!(dotclocks = (int*) Xcalloc(rep.clocks, sizeof(int)))) { |
1097 _XEatData(dpy, (rep.clocks) * 4); | 1107 _XEatData(dpy, (rep.clocks) * 4); |
1098 Xfree(dotclocks); | 1108 Xfree(dotclocks); |
1109 UnlockDisplay(dpy); | |
1110 SyncHandle(); | |
1099 return False; | 1111 return False; |
1100 } | 1112 } |
1101 | 1113 |
1102 for (i = 0; i < rep.clocks; i++) { | 1114 for (i = 0; i < rep.clocks; i++) { |
1103 _XRead(dpy, (char*)&dotclk, 4); | 1115 _XRead(dpy, (char*)&dotclk, 4); |