Changeset 834

Timestamp:

04/09/08 14:34:08 (4 months ago)

Author:

takkaria

Message:

Remove the maid-x11.* files, incorporate into main-x11.c.

Files:

• trunk/src/Makefile.inc (modified) (2 diffs)
• trunk/src/Makefile.src (modified) (2 diffs)
• trunk/src/Makefile.std (modified) (2 diffs)
• trunk/src/maid-x11.c (deleted)
• trunk/src/maid-x11.h (deleted)
• trunk/src/main-x11.c (modified) (2 diffs)

trunk/src/Makefile.inc

@@ -62 +62 @@
-dungeon.o: dungeon.c angband.h h-basic.h z-file.h z-form.h z-util.h \
-  z-virt.h z-rand.h z-term.h ui-event.h z-quark.h z-msg.h config.h \
-
+
+
-effects.o: effects.c angband.h h-basic.h z-file.h z-form.h z-util.h \
-  z-virt.h z-rand.h z-term.h ui-event.h z-quark.h z-msg.h config.h \
@@ -207 +208 @@
-xtra3.o: xtra3.c angband.h h-basic.h z-file.h z-form.h z-util.h z-virt.h \
-  z-rand.h z-term.h ui-event.h z-quark.h z-msg.h config.h defines.h \
-
+
+
-z-file.o: z-file.c z-file.h h-basic.h z-virt.h z-util.h z-form.h
-z-form.o: z-form.c z-form.h h-basic.h z-type.h z-util.h z-virt.h

trunk/src/Makefile.src

@@ -22 +22 @@
-        h-basic.h \
-        init.h \
-        maid-x11.h \
-        main.h \
-        option.h \
@@ -49 +48 @@
-ZFILES = z-file.o z-form.o z-msg.o z-quark.o z-rand.o z-term.o z-type.o \
-         z-util.o z-virt.o z-blockfile.o z-smap.o 
-d-x11.o mai
+
-            main-ros.o main-sdl.o main-win.o main-x11.o snd-sdl.o
-

trunk/src/Makefile.std

@@ -79 +79 @@
-
-# Object definitions
-X11OBJS = maid-x11.o main-x11.o
-GTKOBJS = gtk/main-gtk.o gtk/cairo-utils.o
-sdl.o snd-sdl.o $(X11OBJS)
+x11.o main-sdl.o snd-sdl.o
-OBJS = $(BASEOBJS) $(MAINOBJS)
-
@@ -159 +158 @@
-
-# X11 dependencies
-$(X11OBJS) : $(HEADERS) maid-x11.h
+main-x11.o: $(HEADERS)
-
-# Basic dependencies for main-xxx.c, main.c

trunk/src/main-x11.c

@@ -100 +100 @@
-#ifdef USE_X11
-
-#include "main.h"
-
-#ifndef __MAKEDEPEND__
-#include <X11/Xlib.h>
-#include <X11/Xutil.h>
-#include <X11/keysym.h>
-#include <X11/keysymdef.h>
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
@@ -459 +486 @@
- */
-static infoclr *clr[MAX_COLORS];
+
+
+
+/**** Code imported from the old maid-x11.c ****/
+
+#ifdef SUPPORT_GAMMA
+static bool gamma_table_ready = FALSE;
+static int gamma_val = 0;
+#endif /* SUPPORT_GAMMA */
+
+
+/*
+ * Hack -- Convert an RGB value to an X11 Pixel, or die.
+ */
+u32b create_pixel(Display *dpy, byte red, byte green, byte blue)
+{
+        Colormap cmap = DefaultColormapOfScreen(DefaultScreenOfDisplay(dpy));
+
+        XColor xcolour;
+
+#ifdef SUPPORT_GAMMA
+
+        if (!gamma_table_ready)
+        {
+                cptr str = getenv("ANGBAND_X11_GAMMA");
+                if (str != NULL) gamma_val = atoi(str);
+
+                gamma_table_ready = TRUE;
+
+                /* Only need to build the table if gamma exists */
+                if (gamma_val) build_gamma_table(gamma_val);
+        }
+
+        /* Hack -- Gamma Correction */
+        if (gamma_val > 0)
+        {
+                red = gamma_table[red];
+                green = gamma_table[green];
+                blue = gamma_table[blue];
+        }
+
+#endif /* SUPPORT_GAMMA */
+
+        /* Build the color */
+
+        xcolour.red = red * 255;
+        xcolour.green = green * 255;
+        xcolour.blue = blue * 255;
+        xcolour.flags = DoRed | DoGreen | DoBlue;
+
+        /* Attempt to Allocate the Parsed color */
+        if (!(XAllocColor(dpy, cmap, &xcolour)))
+        {
+                quit_fmt("Couldn't allocate bitmap color #%04x%04x%04x\n",
+                         xcolour.red, xcolour.green, xcolour.blue);
+        }
+
+        return (xcolour.pixel);
+}
+
+
+/*
+ * Get the name of the default font to use for the term.
+ */
+const char *get_default_font(int term_num)
+{
+        const char *font;
+        char buf[80];
+
+        /* Window specific font name */
+        strnfmt(buf, sizeof(buf), "ANGBAND_X11_FONT_%d", term_num);
+
+        /* Check environment for that font */
+        font = getenv(buf);
+        if (font) return font;
+
+        /* Check environment for "base" font */
+        font = getenv("ANGBAND_X11_FONT");
+        if (font) return font;
+
+        switch (term_num)
+        {
+                case 0:
+                        return DEFAULT_X11_FONT_0;
+                case 1:
+                        return DEFAULT_X11_FONT_1;
+                case 2:
+                        return DEFAULT_X11_FONT_2;
+                case 3:
+                        return DEFAULT_X11_FONT_3;
+                case 4:
+                        return DEFAULT_X11_FONT_4;
+                case 5:
+                        return DEFAULT_X11_FONT_5;
+                case 6:
+                        return DEFAULT_X11_FONT_6;
+                case 7:
+                        return DEFAULT_X11_FONT_7;
+        }
+
+        return DEFAULT_X11_FONT;
+}
-
-