Changeset 197

Timestamp:

06/21/07 19:00:36 (2 years ago)

Author:

takkaria

Message:

Commit the current GTK2 code (doesn't run on my machine, but I hope that can be fixed fairly soon.)

Files:

• trunk/configure.ac (modified) (4 diffs)
• trunk/lib/pref/font-gtk.prf (added)
• trunk/lib/pref/font.prf (modified) (1 diff)
• trunk/lib/xtra/angband.glade (added)
• trunk/src/Makefile.std (modified) (1 diff)
• trunk/src/main-gtk.c (modified) (24 diffs)

trunk/configure.ac

@@ -16 +16 @@
-
-test "$GCC" = "yes" && CFLAGS="$CFLAGS -Wall -pipe -g -fno-strength-reduce"
-PICFLAGS="-fPIC"
-AC_SUBST(PICFLAGS)
-
-dnl Checks for various programs
@@ -137 +135 @@
-fi
-
-
-dnl SDL checking
-if test "$enable_sdl" = "yes"; then
@@ -159 +156 @@
-dnl GTK checking
-if test "$enable_gtk" = "yes"; then
-
+ libglade
-                [with_gtk=yes],
-                [with_gtk=no]
@@ -189 +186 @@
-
-dnl Check for headers, types, functions
-
+ dirent.h
-AC_HEADER_STDBOOL
-AC_C_CONST

trunk/lib/pref/font.prf

@@ -32 +32 @@
-%:font-mac.prf
-
+?:[EQU $SYS gtk]
+%:font-gtk.prf
+
-?:[EQU $SYS win]
-%:font-win.prf

trunk/src/Makefile.std

@@ -38 +38 @@
-
-# Support the GTK2 graphical tookit (main-gtk.c)
-DUSE_GTK $(shell pkg-config gtk+-2.0 --libs --cflags)
+rdynamic -export-dynamic -DUSE_GTK $(shell pkg-config libglade-2.0 gtk+-2.0  --libs  --cflags) 
-
-# Support SDL frontend

trunk/src/main-gtk.c

@@ -1 +1 @@
-/*
- * File: main-gtk.c
-Angband GTK2 port
+GTK port for Angband
- *
-Andrew Sidwell, Shanon
+Shano
- *
- * This work is free software; you can redistribute it and/or modify it
@@ -25 +25 @@
-#include <gtk/gtk.h>
-#include <gdk/gdkkeysyms.h>
-
-
-
-
-
-
-
-
-
-
-
+
+
+
-/*
- * Extra data to associate with each "window"
@@ -52 +44 @@
-        GtkWidget *window;
-        GtkWidget *drawing_area;
-
+
+
+
+
+
-        GdkPixmap *pixmap;
-
+, *back_color
-
-        int font_wid;
-        int font_hgt;
-
+
+
+
+
+
-        int rows;
-        int cols;
@@ -71 +71 @@
-static term_data data[MAX_TERM_DATA];
-
-
-/*
- * game in progress
@@ -82 +81 @@
-static int num_term = 1;
-
+/* Our glade file */
+GladeXML *xml;
+
+
+/*
+ * Path to the Gtk settings file
+ */
+char settings[1024];
+
+/*
+ * Set foreground color
+ */
+static void set_foreground_color(term_data *td, byte a)
+{
+        static unsigned int failed = 0;
+        GdkColor color;
+        /*int red, green, blue;*/
+
+        color.red     = angband_color_table[a][1] * 256;
+        color.green = angband_color_table[a][2] * 256;
+        color.blue    = angband_color_table[a][3] * 256;
+        
+        g_assert(td->cairo_draw != 0);
+
+        if (gdk_colormap_alloc_color(gdk_colormap_get_system(), &color, FALSE, TRUE)) 
+        {
+                gdk_gc_set_foreground(td->gc, &color);
+                cairo_set_source_rgb (td->cairo_draw, color.red, color.green, color.blue);
+        }
+        else if (!failed++)
+                g_print("Couldn't allocate color.\n");
+}
+
+/* 
+ * Set a GdkRectangle 
+ */
+
+static void init_gdk_rect(GdkRectangle *r, int x, int y, int w, int h)
+{
+        r->x = x;
+        r->y = y;
+        r->width = w;
+        r->height = h;
+}
+
+/*
+ * Draw a cairo rectangle from a GdkRectangle object.
+ */
+static void c_rect(cairo_t *cr, GdkRectangle r)
+{
+        cairo_rectangle (cr, r.x, r.y, r.width, r.height);
+}
-
-/*
@@ -88 +139 @@
-static errr Term_clear_gtk(void)
-{
-int width, height
+GdkRectangle r
-
-        term_data *td = (term_data*)(Term->data);
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        g_assert(td->pixmap != NULL);
-        g_assert(td->drawing_area->window != 0);
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-
-        /* Success */
@@ -110 +196 @@
-}
-
-
-
-
-
-
+
+
+
+
-{
-        term_data *td = (term_data*)(Term->data);
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        /* Success */
-        return (0);
-}
-
-
-/*
- * Set foreground color
- */
-static void set_foreground_color(term_data *td, byte a)
-{
-        static unsigned int failed = 0;
-
-        GdkColor color;
-
-        color.red   = angband_color_table[a][1] * 256;
-        color.green = angband_color_table[a][2] * 256;
-        color.blue  = angband_color_table[a][3] * 256;
-
-        g_assert(td->pixmap != NULL);
-        g_assert(td->drawing_area->window != 0);
-
-        if (gdk_colormap_alloc_color(gdk_colormap_get_system(), &color, FALSE, TRUE))
-                gdk_gc_set_foreground(td->gc, &color);
-        else if (!failed++)
-                g_print("Couldn't allocate color.\n");
-}
-
-
-/*
- * Draw some textual characters.
- */
-static errr Term_text_gtk(int x, int y, int n, byte a, cptr s)
-{
-        int i;
-        term_data *td = (term_data*)(Term->data);
-        
-        set_foreground_color(td, a);
-
-        /* Clear the line */
-        Term_wipe_gtk(x, y, n);
-
-        /* Draw the text to the pixmap */
-        for (i = 0; i < n; i++)
-        {
-                gdk_draw_text(td->pixmap, td->font, td->gc,
-                              (x + i) * td->font_wid,
-                              td->font->ascent + y * td->font_hgt,
-                              s + i, 1);
-        }
-
-        /* Copy it to the window */
-        gdk_draw_pixmap(td->drawing_area->window, td->gc, td->pixmap,
-                        x * td->font_wid, y * td->font_hgt,
-                        x * td->font_wid, y * td->font_hgt,
-                        n * td->font_wid, td->font_hgt);
-
-        /* Success */
-        return (0);
-}
-
-
-static errr CheckEvent(bool wait)
-{
@@ -210 +250 @@
-static errr Term_flush_gtk(void)
-{
+        gdk_flush();
-        /* XXX */
-        return (0);
@@ -261 +302 @@
-{
-        term_data *td = (term_data*)(Term->data);
-
+
+
+
+
+
+
+
+
-        set_foreground_color(td, TERM_YELLOW);
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-        /* Success */
-        return (0);
-}
-
+/*
+ * Hack -- redraw a term_data
+ *
+ * Note that "Term_redraw()" calls "TERM_XTRA_CLEAR"
+ */
+static void term_data_redraw(term_data *td)
+{
+        term *old = Term;
+        /* Activate the term */
+        Term_activate(&data[0].t);
+
+        /* Redraw the contents */
+        Term_redraw();
+
+        /* Flush the output */
+        Term_fresh();
+        Term_activate(old);
+}
-
-static void save_game_gtk(void)
@@ -290 +354 @@
-                /* Hack -- Forget messages */
-                msg_flag = FALSE;
-
+
-                /* Save the game */
-#ifdef ZANGBAND
@@ -307 +371 @@
-
-
-static 
+
-{
-        save_game_gtk();
-
-        quit(NULL);
-
-
-
-
+
+
+
+
+
-{
-        quit(NULL);
-
-
-
-
+
+
+
+
+
-{
-        gtk_widget_hide(window);
@@ -327 +392 @@
-
-
-static 
+
-{
-        if (game_in_progress)
@@ -349 +414 @@
-/*** Callbacks: font selector */
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-{
-        gchar *fontname;
-tk_object_get_data(GTK
+_object_get_data(G
-
-        g_assert(td != NULL);
-
-        fontname = gtk_font_selection_dialog_get_font_name(GTK_FONT_SELECTION_DIALOG(font_selector));
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-{
-        GtkWidget *font_selector;
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-        /* Ensure that the dialog box is destroyed when the user clicks a button. */
-
-
-
-
-
-
-
+
+
+
+
+
-
-        gtk_widget_show(GTK_WIDGET(font_selector));
@@ -428 +549 @@
-}
-
-
-
-
+
+
+
+
-{
-        GtkWidget *selector_wid;
-        GtkFileChooser *selector;
-
+
+
-        char buf[1024];
-        const char *filename;
@@ -440 +563 @@
-        /* Forget it if the game is in progress */
-        /* XXX Should disable the menu entry */
-
+ && !save
-        {
-                plog("You can't open a new game while you're still playing!");
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        /* Create a new file selector dialogue box, with no parent */
+        if (!save)
+        {
-        selector_wid = gtk_file_chooser_dialog_new("Select a savefile", NULL,
-                                               GTK_FILE_CHOOSER_ACTION_OPEN,
@@ -452 +589 @@
-                                               GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT,
-                                               NULL);
-
+
+
+
+
+
+
+
+
+
-        /* For convenience */
-        selector = GTK_FILE_CHOOSER(selector_wid);
-
+
+
-        /* Get the current directory (so we can find lib/save/) */
-        filename = gtk_file_chooser_get_current_folder(selector);
@@ -467 +613 @@
-        gtk_file_filter_add_custom(filter, GTK_FILE_FILTER_DISPLAY_NAME, file_open_filter, NULL, NULL);
-        gtk_file_chooser_set_filter(selector, filter);
-
+
+
-        /* Run the dialogue */
-gtk_dialog_run(GTK_DIALOG(selector_wid)) == GTK_RESPONSE_ACCEPT
+accepted
-        {
-                /* Get the filename, copy it into the savefile name */
-                filename = gtk_file_chooser_get_filename(selector);
-                my_strcpy(savefile, filename, sizeof(savefile));
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                /* Start playing the game */
-                game_in_progress = TRUE;
-                Term_flush();
-                play_game(FALSE);
+#ifdef HAS_CLEANUP
-                cleanup_angband();
+#endif /* HAS_CLEANUP */
-                quit(NULL);
-        }
-
-
-
-
+
-        /* Done */
-        return;
-}
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-{
-        save_game_gtk();
-
-        /* Don't prevent closure */
-        return (FALSE);
-}
-
-
-
+
+
+
+
+
+
-{
-        int i, mc, ms, mo, mx;
@@ -577 +749 @@
-                        return (TRUE);
-                }
-
-                case GDK_Shift_L:
-                case GDK_Shift_R:
@@ -617 +788 @@
-}
-
-
-
+
-{
-        term_data *td = user_data;
-
-
-
+
+
-        if (pixmap)
-        {
-                /* Restrict the area - Don't forget to reset it! XXX */
-                /* gdk_gc_set_clip_rectangle(td->gc, &(event->area)); */
-
-                g_assert(widget->window != 0);
-
-pixmap
+
+drawable
-                                event->area.x, event->area.y,
-                                event->area.x, event->area.y,
@@ -640 +806 @@
-}
-
-
-static errr term_data_init(term_data *td, int i)
-{
@@ -657 +822 @@
-        t->soft_cursor = TRUE;
-
-white
-WHITE
+dark
+DARK
-        t->char_blank = ' ';
-
@@ -676 +841 @@
-}
-
-
-static void init_gtk_window(term_data *td, int i)
-{
-        cptr font;
-
+
+
-        bool main_window = (i == 0) ? TRUE : FALSE;
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        /* Set attributes */
-        gtk_window_set_title(GTK_WINDOW(td->window), td->name);
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        /* Show the widgets */
-        gtk_widget_show_all(td->window);
-
-        /* Create a pixmap as buffer for screenupdates */
-        td->pixmap = gdk_pixmap_new(td->drawing_area->window, td->cols * td->font_wid, td->rows * td->font_hgt, -1);
-        gtk_object_set_data(GTK_OBJECT(td->drawing_area), "pixmap", td->pixmap);
-        td->gc = gdk_gc_new(td->drawing_area->window);
-
-        /* Clear the pixmap */
-        gdk_draw_rectangle(td->pixmap, td->drawing_area->style->black_gc, TRUE,
-                           0, 0,
-                           td->cols * td->font_wid, td->rows * td->font_hgt);
-
-        /* Copy it to the window */
-        gdk_draw_pixmap(td->drawing_area->window, td->gc, td->pixmap,
-                        0, 0, 0, 0,
-                        td->cols * td->font_wid, td->rows * td->font_hgt);
-}
-
@@ -784 +919 @@
-        /* Initialize the environment */
-        gtk_init(&argc, &argv);
-
+
-        /* Parse args */
-        for (i = 1; i < argc; i++)
@@ -798 +933 @@
-                plog_fmt("Ignoring option: %s", argv[i]);
-        }
-
+
-        /* Initialize the windows */
-        for (i = 0; i < num_term; i++)