Skip to content

Commit a98ba2c

Browse files
Robert PancoastRobert Pancoast
authored andcommitted
support highDPI displays retina
1 parent 334161d commit a98ba2c

File tree

4 files changed

+24
-11
lines changed

4 files changed

+24
-11
lines changed

src/libprojectM/libprojectM.xcodeproj/project.pbxproj

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -671,7 +671,7 @@
671671
161789B8207A675B00D3B0C8 /* Project object */ = {
672672
isa = PBXProject;
673673
attributes = {
674-
LastUpgradeCheck = 0920;
674+
LastUpgradeCheck = 1130;
675675
ORGANIZATIONNAME = MVSTG;
676676
TargetAttributes = {
677677
1612C9A3207A855D00862A3A = {
@@ -698,6 +698,7 @@
698698
hasScannedForEncodings = 0;
699699
knownRegions = (
700700
en,
701+
Base,
701702
);
702703
mainGroup = 161789B7207A675B00D3B0C8;
703704
productRefGroup = 161789C1207A675B00D3B0C8 /* Products */;
@@ -884,13 +885,15 @@
884885
CLANG_WARN_BOOL_CONVERSION = YES;
885886
CLANG_WARN_COMMA = YES;
886887
CLANG_WARN_CONSTANT_CONVERSION = YES;
888+
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
887889
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
888890
CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
889891
CLANG_WARN_EMPTY_BODY = YES;
890892
CLANG_WARN_ENUM_CONVERSION = YES;
891893
CLANG_WARN_INFINITE_RECURSION = YES;
892894
CLANG_WARN_INT_CONVERSION = YES;
893895
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
896+
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
894897
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
895898
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
896899
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
@@ -949,13 +952,15 @@
949952
CLANG_WARN_BOOL_CONVERSION = YES;
950953
CLANG_WARN_COMMA = YES;
951954
CLANG_WARN_CONSTANT_CONVERSION = YES;
955+
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
952956
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
953957
CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
954958
CLANG_WARN_EMPTY_BODY = YES;
955959
CLANG_WARN_ENUM_CONVERSION = YES;
956960
CLANG_WARN_INFINITE_RECURSION = YES;
957961
CLANG_WARN_INT_CONVERSION = YES;
958962
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
963+
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
959964
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
960965
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
961966
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;

src/projectM-sdl/SDLprojectM.xcodeproj/project.pbxproj

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -310,7 +310,7 @@
310310
C345213C1BF02293001707D2 /* Project object */ = {
311311
isa = PBXProject;
312312
attributes = {
313-
LastUpgradeCheck = 0920;
313+
LastUpgradeCheck = 1130;
314314
ORGANIZATIONNAME = int80;
315315
TargetAttributes = {
316316
168F714821120210001806E7 = {
@@ -325,11 +325,11 @@
325325
};
326326
buildConfigurationList = C345213F1BF02293001707D2 /* Build configuration list for PBXProject "SDLprojectM" */;
327327
compatibilityVersion = "Xcode 3.2";
328-
developmentRegion = English;
328+
developmentRegion = en;
329329
hasScannedForEncodings = 0;
330330
knownRegions = (
331-
English,
332331
en,
332+
Base,
333333
);
334334
mainGroup = C345213B1BF02293001707D2;
335335
productRefGroup = C34521451BF02294001707D2 /* Products */;
@@ -529,6 +529,7 @@
529529
C34521491BF02294001707D2 /* Debug */ = {
530530
isa = XCBuildConfiguration;
531531
buildSettings = {
532+
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
532533
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
533534
CLANG_CXX_LIBRARY = "libc++";
534535
CLANG_ENABLE_MODULES = YES;
@@ -537,12 +538,14 @@
537538
CLANG_WARN_BOOL_CONVERSION = YES;
538539
CLANG_WARN_COMMA = YES;
539540
CLANG_WARN_CONSTANT_CONVERSION = YES;
541+
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
540542
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
541543
CLANG_WARN_EMPTY_BODY = YES;
542544
CLANG_WARN_ENUM_CONVERSION = YES;
543545
CLANG_WARN_INFINITE_RECURSION = YES;
544546
CLANG_WARN_INT_CONVERSION = YES;
545547
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
548+
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
546549
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
547550
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
548551
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
@@ -586,6 +589,7 @@
586589
C345214A1BF02294001707D2 /* Release */ = {
587590
isa = XCBuildConfiguration;
588591
buildSettings = {
592+
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
589593
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
590594
CLANG_CXX_LIBRARY = "libc++";
591595
CLANG_ENABLE_MODULES = YES;
@@ -594,12 +598,14 @@
594598
CLANG_WARN_BOOL_CONVERSION = YES;
595599
CLANG_WARN_COMMA = YES;
596600
CLANG_WARN_CONSTANT_CONVERSION = YES;
601+
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
597602
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
598603
CLANG_WARN_EMPTY_BODY = YES;
599604
CLANG_WARN_ENUM_CONVERSION = YES;
600605
CLANG_WARN_INFINITE_RECURSION = YES;
601606
CLANG_WARN_INT_CONVERSION = YES;
602607
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
608+
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
603609
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
604610
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
605611
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;

src/projectM-sdl/pmSDL.cpp

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -432,12 +432,14 @@ void projectMSDL::pollEvent() {
432432
{
433433
switch (evt.type) {
434434
case SDL_WINDOWEVENT:
435+
int h, w;
436+
SDL_GL_GetDrawableSize(win,&w,&h);
435437
switch (evt.window.event) {
436-
case SDL_WINDOWEVENT_RESIZED:
437-
resize(evt.window.data1, evt.window.data2);
438+
case SDL_WINDOWEVENT_RESIZED:
439+
resize(w, h);
438440
break;
439-
case SDL_WINDOWEVENT_SIZE_CHANGED:
440-
resize(evt.window.data1, evt.window.data2);
441+
case SDL_WINDOWEVENT_SIZE_CHANGED:
442+
resize(w, h);
441443
break;
442444
}
443445
break;

src/projectM-sdl/projectM_SDL_main.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -244,7 +244,6 @@ srand((int)(time(NULL)));
244244
#if UNLOCK_FPS
245245
setenv("vblank_mode", "0", 1);
246246
#endif
247-
248247
SDL_Init(SDL_INIT_VIDEO | SDL_INIT_AUDIO);
249248

250249
if (! SDL_VERSION_ATLEAST(2, 0, 5)) {
@@ -278,9 +277,10 @@ srand((int)(time(NULL)));
278277
#endif
279278

280279

281-
SDL_Window *win = SDL_CreateWindow("projectM", 0, 0, width, height, SDL_WINDOW_OPENGL | SDL_WINDOW_RESIZABLE);
280+
SDL_Window *win = SDL_CreateWindow("projectM", 0, 0, width, height, SDL_WINDOW_OPENGL | SDL_WINDOW_RESIZABLE | SDL_WINDOW_ALLOW_HIGHDPI);
281+
282+
SDL_GL_GetDrawableSize(win,&width,&height);
282283

283-
284284
#if STEREOSCOPIC_SBS
285285

286286
// enable stereo

0 commit comments

Comments
 (0)