Changeset 664

Show
Ignore:
Timestamp:
01/30/08 10:42:21 (7 months ago)
Author:
takkaria
Message:

Remove main-xaw.c. (#62)

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/src/Makefile.src

    r652 r664  
    4646         z-util.o z-virt.o z-blockfile.o z-smap.o  
    4747MAINFILES = main.o maid-x11.o main-crb.o main-gcu.o main-gtk.o cairo-utils.o \ 
    48             main-ros.o main-sdl.o main-win.o main-x11.o main-xaw.o snd-sdl.o 
     48            main-ros.o main-sdl.o main-win.o main-x11.o snd-sdl.o 
    4949 
    5050ANGFILES = \ 

  • trunk/src/Makefile.std

    r569 r664  
    3333SYS_gcu = -DUSE_GCU -DUSE_NCURSES -lncurses 
    3434#SYS_gcu = -DUSE_GCU -lcurses -ltermcap 
    35  
    36 # Support Xaw motif (main-xaw.c) 
    37 #SYS_xaw = -DUSE_XAW -lXaw -lXext -lSM -lICE -lXmu -lXt -lX11 
    3835 
    3936# Support the GTK2 graphical tookit (main-gtk.c) 
    …… 
    7774 
    7875# Extract CFLAGS and LIBS from the system definitions 
    79 MODULES = $(SYS_x11) $(SYS_gcu) $(SYS_xaw) $(SYS_gtk) $(SYS_sdl) $(SOUND_sdl) 
     76MODULES = $(SYS_x11) $(SYS_gcu) $(SYS_gtk) $(SYS_sdl) $(SOUND_sdl) 
    8077CFLAGS += $(patsubst -l%,,$(MODULES)) $(INCLUDES) 
    8178LIBS += $(patsubst -D%,,$(patsubst -I%,, $(MODULES))) 
    …… 
    8380 
    8481# Object definitions 
    85 X11OBJS = maid-x11.o main-x11.o main-xaw.o main-gtk.o cairo-utils.o 
     82X11OBJS = maid-x11.o main-x11.o main-gtk.o cairo-utils.o 
    8683MAINOBJS = main.o main-gcu.o main-sdl.o snd-sdl.o $(X11OBJS) 
    8784OBJS = $(BASEOBJS) $(MAINOBJS) 

  • trunk/src/maid-x11.c

    r346 r664  
    1919 * Major fixes and cleanup by Ben Harrison (benh@phial.com). 
    2020 * 
    21  * This file is designed to be "included" by "main-x11.c" or "main-xaw.c", 
     21 * This file is designed to be "included" by "main-x11.c", 
    2222 * which will have already "included" several relevant header files. 
    2323 */ 

  • trunk/src/main-x11.c

    r517 r664  
    1515 * To use this file, compile with "USE_X11" defined, and link against all 
    1616 * the various "X11" libraries which may be needed. 
    17  * 
    18  * See also "main-xaw.c". 
    1917 * 
    2018 * Part of this file provides a user interface package composed of several 
    …… 
    15151513/* 
    15161514 * Process a keypress event 
    1517  * 
    1518  * Also appears in "main-xaw.c". 
    15191515 */ 
    15201516static void react_keypress(XKeyEvent *ev) 

  • trunk/src/main-xxx.c

    r507 r664  
    635635 * Help message. 
    636636 *   1st line = max 68 chars. 
    637  *   Start next lines with 11 spaces, as in main-xaw.c. 
     637 *   Start next lines with 11 spaces 
    638638 */ 
    639639const char help_xxx[] = "Describe XXX, subopts -describe suboptions here"; 

  • trunk/src/main.c

    r560 r664  
    4040        { "gtk", help_gtk, init_gtk }, 
    4141#endif /* USE_GTK */ 
    42  
    43 #ifdef USE_XAW 
    44         { "xaw", help_xaw, init_xaw }, 
    45 #endif /* USE_XAW */ 
    4642 
    4743#ifdef USE_X11 

  • trunk/src/main.h

    r141 r664  
    1919extern errr init_lfb(int argc, char **argv); 
    2020extern errr init_gtk(int argc, char **argv); 
    21 extern errr init_xaw(int argc, char **argv); 
    2221extern errr init_x11(int argc, char **argv); 
    2322extern errr init_xpj(int argc, char **argv); 
    …… 
    3736extern const char help_lfb[]; 
    3837extern const char help_xpj[]; 
    39 extern const char help_xaw[]; 
    4038extern const char help_x11[]; 
    4139extern const char help_vcs[]; 

  • trunk/src/util.c

    r544 r664  
    31413141 * as 2/4 Red, 1/4 Green, 0/4 Blue. 
    31423142 * 
    3143  * The following info is from "Torbjorn Lindgren" (see "main-xaw.c"). 
    3144  * 
    31453143 * These values are NOT gamma-corrected.  On most machines (with the 
    31463144 * Macintosh being an important exception), you must "gamma-correct"