diff --git a/Makefile b/Makefile index 4949d99..bad2486 100644 --- a/Makefile +++ b/Makefile @@ -40,14 +40,10 @@ override BASE_CFLAGS += -Dstricmp=strcasecmp -Wunused -I./include/ `pkg-config - RELEASE_CFLAGS=$(BASE_CFLAGS) -funroll-loops -ffast-math -fomit-frame-pointer -funsigned-char -fno-strength-reduce DEBUG_CFLAGS=$(BASE_CFLAGS) -g override LDFLAGS += -lm -ldl -XLDFLAGS=-L/usr/X11R6/lib -lX11 -lXext -lXxf86dga `pkg-config --libs gtk+-2.0` -XCFLAGS=-DX11 +XLDFLAGS=`pkg-config --libs gtk+-2.0` DO_CC=$(CC) $(CFLAGS) -o $@ -c $< DO_DEBUG_CC=$(CC) $(DEBUG_CFLAGS) -o $@ -c $< -DO_X11_CC=$(CC) $(CFLAGS) $(XCFLAGS) -o $@ -c $< -DO_X11_DEBUG_CC=$(CC) $(DEBUG_CFLAGS) $(XCFLAGS) -o $@ -c $< -DO_O_CC=$(CC) $(CFLAGS) -o $@ -c $< DO_AS=$(CC) $(CFLAGS) -DELF -x assembler-with-cpp -o $@ -c $< DO_DUMB=$(CC) $(CFLAGS) -o $@ -c $< @@ -553,7 +549,7 @@ $(BUILDDIR)/sys_linux.o :$(MOUNT_DIR)/../system/sys_linux.c $(DO_CC) $(BUILDDIR)/vid_x.o: $(MOUNT_DIR)/../video/vid_gdk.c - $(DO_O_CC) + $(DO_CC) $(BUILDDIR)/snd_dma.o : $(MOUNT_DIR)/../audio/snd_dma.c $(DO_CC) diff --git a/icon.xpm b/icon.xpm new file mode 100644 index 0000000..4c20c01 --- /dev/null +++ b/icon.xpm @@ -0,0 +1,62 @@ +/* XPM */ +static char * icon_xpm[] = { +"48 48 11 1", +" c #000000", +". c #EEEEEC", +"+ c #204A87", +"@ c #888A85", +"# c #3465A4", +"$ c #BABDB6", +"% c #729FCF", +"& c #555753", +"* c #D3D7CF", +"= c #4E9A06", +"- c #E9B96E", +" ", +" ", +" ", +" ", +" ", +" .++++++++++ ..+++++++++++ ", +" .++++++++++ @.++++++++++++ ", +" .++++++++++ ..++++++++++++ ", +" .+#+#+#+#+# @.#+#+#+#+#+#+# ", +" .#+#+#+#+#+ ..+#+#+#+#+#+#+ ", +" .+#+#+#+#+# @.+#+#+#+#+#+#+# ", +" .########## ..############## ", +" .########## $.############### ", +" .########## ..############### ", +" .#%###%#%#% @.#%#%#%###%#%#%## ", +" .########## ..################ ", +" .+%+%+%+%+% $.%+%+%+%#%#%+%+%+% ", +" .%###%###%# .##%###%.##%###%### ", +" .@%&%&%&%&% $.&%&%&%&.&%&%&%%%&% ", +" .%@%@%@%@%@ .@%@%@%@ .%@%@%@%@%@ ", +" .%%@%%%@%%% *.%@%%%@% .@%%%@%%%@% ", +" .%@%@%@%@%@ &.%@%@%@% .%@%@%@%@%@ ", +" .$$$$$$$$$$ *.$$$$$$$ .$$$$$$$$$$ ", +" .$$$$$$$$$$ &.$$$$$$$ .$$$$$$$$$$ ", +" .$*$*$*$*$* *.*$*$*$* .$*$*$*$*$* ", +" .=*=*=*=*=* &.=*=*=*= .=*=*=*=*=* ", +" .*=*=*=*=*= *.*=*=*=* .*=*=*=*=*= ", +" .********** &.*=***** .=********* ", +" .********** ..******* .********** ", +" .**********@.******* .********** ", +" .**********..***.*.. ...*....-.. ", +" .**********.******* .********** ", +" .*=*=*=*=*=.=*=*=*= .*=*=*=*=*= ", +" .$$$$$$$$$$$$$$$$$ .$$$$$$$$$$ ", +" .$=$=$=$=$=$=$=$= .$=$=$=$=$= ", +" .=*=*=*=*=*=*=*=* .=*=*=*=*=* ", +" .==$===$===$===$ .$===$===$= ", +" .=$=$=$=$=$=$=$= .=$=$=$=$=$ ", +" .@===@===@===@= .==@===@=== ", +" .=@=@=@=@=@=@=@ .=@=@=@=@=@ ", +" .============= .========== ", +" .=&=&=&=&=&=&= .=&=&=&=&=& ", +" .====&======= .==&===&=== ", +" .============ .========== ", +" .=========== .========== ", +" ", +" ", +" "}; diff --git a/video/vid_gdk.c b/video/vid_gdk.c index b3bf1b4..57e239f 100644 --- a/video/vid_gdk.c +++ b/video/vid_gdk.c @@ -419,13 +419,13 @@ void GetEvent(void) keyq_head = (keyq_head + 1) & 63; break; case GDK_ENTER_NOTIFY: - XSetInputFocus(GDK_WINDOW_XDISPLAY(gtk_widget_get_window(x_win)), - GDK_WINDOW_XWINDOW(gtk_widget_get_window(x_win)), RevertToNone, - CurrentTime); + //XSetInputFocus(GDK_WINDOW_XDISPLAY(gtk_widget_get_window(x_win)), + // GDK_WINDOW_XWINDOW(gtk_widget_get_window(x_win)), RevertToNone, + // CurrentTime); break; case GDK_LEAVE_NOTIFY: - XSetInputFocus(GDK_WINDOW_XDISPLAY(gtk_widget_get_window(x_win)), - None, RevertToNone, CurrentTime); + //XSetInputFocus(GDK_WINDOW_XDISPLAY(gtk_widget_get_window(x_win)), + // None, RevertToNone, CurrentTime); break; default: break;