m/grafX2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

X11: fix for Mac OS X

Browse Source
This commit is contained in:
Thomas Bernard 2018-07-04 16:00:01 +02:00
parent 153363d52f
commit d0ac732d8e
2 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/Makefile
View File

@ -697,6 +697,9 @@ $(MACAPPEXE) : $(BIN) $(OBJDIR)/versiontag
echo 'APPL????' > Grafx2.app/Contents/PkgInfo echo 'APPL????' > Grafx2.app/Contents/PkgInfo
cp ../Info.plist Grafx2.app/Contents cp ../Info.plist Grafx2.app/Contents
cp -r Grafx2.icns Grafx2.app/Contents/Resources cp -r Grafx2.icns Grafx2.app/Contents/Resources
ifeq ($(API),x11)
cp ../share/grafx2/gfx2.png Grafx2.app/Contents/Resources
endif
mkdir -p Grafx2.app/Contents/Resources/English.lproj mkdir -p Grafx2.app/Contents/Resources/English.lproj
iconv -f UTF-16BE English.lproj/InfoPlist.strings | sed -e 's/Grafx2 version [.0-9]*/Grafx2 version $(shell cat $(OBJDIR)/versiontag)/' | iconv -t UTF-16BE > Grafx2.app/Contents/Resources/English.lproj/InfoPlist.strings iconv -f UTF-16BE English.lproj/InfoPlist.strings | sed -e 's/Grafx2 version [.0-9]*/Grafx2 version $(shell cat $(OBJDIR)/versiontag)/' | iconv -t UTF-16BE > Grafx2.app/Contents/Resources/English.lproj/InfoPlist.strings
cp -r ../share/grafx2/fonts Grafx2.app/Contents/Resources cp -r ../share/grafx2/fonts Grafx2.app/Contents/Resources

2
src/input.c
View File

@ -1251,6 +1251,8 @@ int Get_input(int sleep_time)
Input_new_mouse_Y = Mouse_Y; Input_new_mouse_Y = Mouse_Y;
Input_new_mouse_K = Mouse_K; Input_new_mouse_K = Mouse_K;
if (X11_display == NULL)
return 0;
XFlush(X11_display); XFlush(X11_display);
while(!user_feedback_required && XPending(X11_display) > 0) while(!user_feedback_required && XPending(X11_display) > 0)
{ {