Gnome updates (from <Someone> <Someone> Simon)

- fix destruction of primary game windows - One, it makes the color of the cursor box dynamic (these are the gnmap.c changes), based on hp/hpmax (continuous colors white -> yellow -> red -> magenta rather than discrete like in Qt). - Two, it adds a new window, NHW_WORN (all the other changes and new files gnworn.[ch]), placed at the end of the first row, to the right of the status, with tiles of all the items currently equiped. I had to change the spacing of the first row (no longer homogeneous) to accomodate this, but I think it still looks okay. It's mostly like the Qt version but the equiped items are in slightly different places, and a bit more compactly (added quiver, ball/chain, monster skin armor; see the definition in gnworn.c for the layout).
2002-04-21 17:09:34 +00:00
parent a277db8f73
commit b1055ae7c1
11 changed files with 169 additions and 9 deletions
@@ -0,0 +1,105 @@
+/*	SCCS Id: @(#)gnbind.c	3.4	2002/04/15	*/
+/* Copyright (C) 2002, Dylan Alex Simon			*/
+/* NetHack may be freely redistributed.  See license for details. */
+
+#include "gnworn.h"
+#include "gnglyph.h"
+#include "gnsignal.h"
+#include "gnomeprv.h"
+
+#define WORN_WIDTH	3
+#define WORN_HEIGHT	6
+
+#ifdef TOURIST
+#define WORN_OBJECT_LIST /* struct obj *[WORN_HEIGHT][WORN_WIDTH] = */ { \
+    { uquiver,	uarmh,	    u.twoweap ? NULL : uswapwep }, \
+    { u.twoweap ? uswapwep : NULL,  ublindf,	uwep	    }, \
+    { uleft,	uamul,	    uright	}, \
+    { uarms,	uarmc,	    uarmg	}, \
+    { uarmu,	uarm,	    uskin	}, \
+    { uball,	uarmf,	    uchain	} \
+}
+#else
+#define WORN_OBJECT_LIST /* struct obj *[WORN_HEIGHT][WORN_WIDTH] = */ { \
+    { uquiver,	uarmh,	    u.twoweap ? NULL : uswapwep }, \
+    { u.twoweap ? uswapwep : NULL,	ublindf,    uwep    }, \
+    { uleft,	uamul,	    uright	}, \
+    { uarms,	uarmc,	    uarmg	}, \
+    { NULL,	uarm,	    uskin	}, \
+    { uball,	uarmf,	    uchain	} \
+}
+#endif
+
+static GtkWidget *worn_contents[WORN_HEIGHT][WORN_WIDTH];
+static struct obj *last_worn_objects[WORN_HEIGHT][WORN_WIDTH];
+
+GdkImlibImage *image_of_worn_object(struct obj *o);
+void ghack_worn_display(GtkWidget *win, boolean block, gpointer data);
+
+GtkWidget*
+ghack_init_worn_window()
+{
+    GtkWidget *top;
+    GtkWidget *table;
+    GtkWidget *tablealign;
+    GtkWidget *label;
+    int i,j;
+
+    top = gtk_vbox_new(FALSE, 2);
+
+    table = gtk_table_new(WORN_HEIGHT, WORN_WIDTH, TRUE);
+    for (i = 0; i < WORN_HEIGHT; i++) {
+	for (j = 0; j < WORN_WIDTH; j++) {
+	    worn_contents[i][j] =
+		gnome_pixmap_new_from_imlib(image_of_worn_object(NULL));
+	    last_worn_objects[i][j] = NULL; /* a pointer that will never be */
+	    gtk_table_attach(GTK_TABLE(table), GTK_WIDGET(worn_contents[i][j]),
+			     j, j+1, i, i+1, 0, 0, 0, 0);
+	}
+    }
+    tablealign = gtk_alignment_new(0.5, 0.0, 0.0, 1.0);
+    gtk_box_pack_start(GTK_BOX(top), tablealign, FALSE, FALSE, 0);
+    gtk_container_add(GTK_CONTAINER(tablealign), table);
+
+    label = gtk_label_new("Equipment");
+    gtk_label_set_justify(GTK_LABEL(label), GTK_JUSTIFY_CENTER);
+    gtk_box_pack_start(GTK_BOX(top), label, FALSE, FALSE, 0);
+
+    gtk_signal_connect(GTK_OBJECT(top), "ghack_display",
+		       GTK_SIGNAL_FUNC(ghack_worn_display), NULL);
+
+    return top;
+}
+
+GdkImlibImage*
+image_of_worn_object(struct obj *o)
+{
+    int glyph;
+    GdkImlibImage *im;
+
+    if (o)
+	glyph = obj_to_glyph(o);
+    else
+	glyph = cmap_to_glyph(S_stone);
+
+    im = ghack_image_from_glyph(glyph, FALSE);
+
+    return im;
+}
+
+void
+ghack_worn_display(GtkWidget *win, boolean block, gpointer data)
+{
+    int i, j;
+    struct obj *worn_objects[WORN_HEIGHT][WORN_WIDTH] = WORN_OBJECT_LIST;
+
+    for (i = 0; i < WORN_HEIGHT; i++) {
+	for (j = 0; j < WORN_WIDTH; j++) {
+	    if (worn_objects[i][j] != last_worn_objects[i][j]) {
+		last_worn_objects[i][j] = worn_objects[i][j];
+		gnome_pixmap_load_imlib(GNOME_PIXMAP(worn_contents[i][j]),
+				image_of_worn_object(worn_objects[i][j]));
+	    }
+	}
+    }
+}