Changeset 588

Timestamp:

09/29/07 15:15:16 (1 year ago)

Author:

takkaria

Message:

Clean up some of the code in the gtk port a bit.

Files:

• trunk/src/main-gtk.c (modified) (67 diffs)
• trunk/src/main-gtk.h (modified) (2 diffs)

trunk/src/main-gtk.c

@@ -375 +375 @@
-        /* Set dimensions */
-        init_cairo_rect(&r, (td->actual.w * x), (td->actual.h * y),  (td->actual.w * n), (td->actual.h));
-
+
-        /* I can't count on at all the td fields names being the same for everything that uses cairo-utils,
-            hence a lot of variables being passed. */
@@ -564 +564 @@
-        if ((td != NULL) && (td->window == widget))
-        {
-16+1
+sizeof(item_name)
-        menu_item = glade_xml_get_widget(gtk_xml, item_name);
-        gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menu_item), FALSE);
@@ -604 +604 @@
-        char buf[80];
-        int i, j = 0;
-
+
-        my_strcpy(td->font.name, font_name, sizeof(td->font.name));
-
-
-(i = 0; i < (strlen(font_name)
+
+
+ (i = 0; i < strlen(font_name
-        {
-                if (font_name[i] == ' ') j = i;
-        }
-        
-
-
+
-                buf[i - j] = font_name[i];
-
+
-        
-        temp_font = pango_font_description_from_string(font_name);
-name
+family
-        td->font.size = atof(buf);
-        if (td->font.size == 0) td->font.size = 12;
@@ -637 +636 @@
-        if ((old_font_height == 0) || (old_font_width == 0))
-        {
- 
- 
-
-       
+
+
+
+
-        {
-                td->size.w = (double)td->size.w * (double)((double)td->font.w / (double)old_font_width);
@@ -650 +649 @@
-        if (td->window != NULL) 
-        {
-
+
-
-        gtk_widget_hide(td->window);
@@ -665 +664 @@
-void set_term_font(GtkFontButton *widget, gpointer user_data)   
-{
-
+
+
+
+
-        int t;
-        
-(char*)
+
-        sscanf(s, "term_font_%d", &t);
-
-erm_data *td=
-
+
+d = 
+
-        font_name = gtk_font_button_get_font_name(widget);
-        load_font_by_name(td, font_name);
@@ -709 +711 @@
-
-        /* Count out known non-savefiles */
-strcmp(name, "Makefile") == 0
-strcmp(name, "delete.me") == 0
+!strcmp(name, "Makefile")
+!strcmp(name, "delete.me")
-        {
-                return FALSE;
@@ -854 +856 @@
-        {
-                /* Build the macro trigger string */
--1
-
+sizeof(msg)
+
-                /* Enqueue the "macro trigger" string */
-                for (i = 0; msg[i]; i++) Term_keypress(msg[i]);
@@ -909 +911 @@
-                        return (TRUE);
-                }
+
-                case GDK_Shift_L:
-                case GDK_Shift_R:
@@ -961 +964 @@
-        /* Open the settings file */
-        fff = file_open(settings, MODE_WRITE, FTYPE_TEXT);
-
-        /* Oops */
-        if (!fff) return;
-
@@ -1197 +1198 @@
-        
-                /* Set defaults if not initialized, or if funny values are there */
-
-
-
+
+
-                if (td->tile.w <= 0) td->tile.w = td->font.w;
-                if (td->tile.h <= 0) td->tile.h = td->font.h;
-
+
-                /* The main window should always be visible */
-                if (i == 0) td->visible = 1;
-
+
-                /* Discard the old cols & rows values, and recalculate. */
-                set_row_and_cols(td);
@@ -1217 +1217 @@
-                if ((xd->font.name == "") || (strlen(xd->font.name)<2)) 
-                        my_strcpy(xd->font.name, "Monospace 10", sizeof(xd->font.name));
+
-                get_font_size(&xd->font);
-                
@@ -1238 +1239 @@
-{
-        int z = 0;
-(term_data*)(Term->data)
-
+Term->data
+
-        /* Where is the mouse */
-        int x = event->x;
@@ -1253 +1254 @@
-        /* The co-ordinates are only used in Angband format. */
-        pixel_to_square(&x, &y, x, y);
-        
-        Term_mousepress(x, y, z);
-
+
+
-}
-
@@ -1266 +1267 @@
-        
-        g_assert(td->drawing_area->window != 0);
-
-
+
-        if (td->window)
-        {
@@ -1303 +1303 @@
-        return (TRUE);
-}
+
-gboolean hide_options(GtkWidget *widget, GdkEvent *event, gpointer user_data)
-{
@@ -1311 +1312 @@
-static void create_term_cairo(term_data *td)
-{       
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-static void destroy_term_cairo(term_data *td)
-{
@@ -1330 +1332 @@
-        }
-}
+
-gboolean toggle_term_window(GtkWidget *widget, GdkEvent *event, gpointer user_data)
-{
+        term_data *td;
+
-        int t;
-        bool window_is_visible;
-har* 
-
-(char*)
+onst char *
+
+
-        sscanf(s, "term_menu_item_%d", &t);
-erm_data *t
-
+
+
-        window_is_visible = (GTK_WIDGET_VISIBLE(GTK_WIDGET(td->window)));
-
+
-        /* I'm assuming this is only called by a menu item. I may want to put a check in for that. */
-        td->visible = gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM(widget));
-
+
-        if (td->visible)
-        {
@@ -1355 +1360 @@
-                destroy_term_cairo(td);
-        }
-
-(td->visible)
+
+ td->visible
-}
-
@@ -1406 +1411 @@
-                        break;
-                }
+
-                case GRAPHICS_ORIGINAL:
-                {
@@ -1417 +1423 @@
-                        break;
-                }
+
-                case GRAPHICS_ADAM_BOLT:
-                {
@@ -1428 +1435 @@
-                        break;
-                }
+
-                case GRAPHICS_DAVID_GERVAIS:
-                {
@@ -1439 +1447 @@
-                        break;
-                }
-
+
+
-        graphical_tiles = cairo_image_surface_create_from_png(buf);
-        tile_pattern = cairo_pattern_create_for_surface(graphical_tiles);
@@ -1465 +1474 @@
-} 
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-                bool checked = (i == arg_graphics);
-
-12
+
+sizeof(s)
-                menu = glade_xml_get_widget(gtk_xml, s);
-
-       if (
-       
+
+if (checked && 
+
-        }
-}
@@ -1487 +1497 @@
-{
-        int g;
-har* 
-
-(char*)
+onst char *
+
+
-        sscanf(s, "graphics_%d", &g);
-
+
-        /* Free up old graphics */
-        if (graphical_tiles != NULL)
@@ -1497 +1507 @@
-        if (tile_pattern != NULL)
-                cairo_pattern_destroy(tile_pattern);
-
+
-        init_graf(g);
-(FALSE)
+ FALSE
-}
-
@@ -1507 +1517 @@
-static void white_on_black_textview(xtra_win_data *xd)
-{
- 
+
-        GdkColor white = { 0, 0xffff, 0xffff, 0xffff };
-        
@@ -1528 +1538 @@
-{
-        int i = 0;
-
+ 
-        char temp[20];
-        GtkWidget *temp_widget;
@@ -1536 +1546 @@
-                xtra_win_data *xd = &xdata[i];
-                
-14
+sizeof(temp)
-                temp_widget = glade_xml_get_widget(gtk_xml, temp);
-                gtk_font_button_set_font_name(GTK_FONT_BUTTON (temp_widget), xd->font.name);
@@ -1572 +1582 @@
-static void init_gtk_windows(void)
-{
+        GtkWidget *options, *temp_widget;
+        GdkColor black = { 0, 0x0000, 0x0000, 0x0000 };
+
-        char buf[1024], logo[1024], temp[20];
-        GtkWidget *options, *temp_widget;
-        int i = 0;
-        bool err;
@@ -1623 +1635 @@
-                
-                /* Set title and name */
-14
+sizeof(temp)
-                gtk_widget_set_name(td->window, temp);
-                gtk_window_set_title(GTK_WINDOW(td->window), td->name);
@@ -1641 +1653 @@
-        {
-                term_data *td = &data[i];
-
-
+
-                gtk_widget_realize(td->window);
-                gtk_widget_realize(td->drawing_area); 
@@ -1648 +1659 @@
-                gtk_widget_modify_bg(td->window, GTK_STATE_NORMAL, &black);
-                gtk_widget_modify_bg(td->drawing_area, GTK_STATE_NORMAL, &black);
-
-14
+
+sizeof(temp)
-                temp_widget = glade_xml_get_widget(gtk_xml, temp);
-                gtk_widget_realize(temp_widget);
-                
-
-
-
-
+
+
+
+
+
-{
-        int i;
+
-        GtkWidget *menu_item;
+        char item_name[20];
-        
-        /* Initialize the windows */
@@ -1665 +1679 @@
-        {
-                term_data *td = &data[i];
-                char item_name[20];
-                
-                /* Activate the window screen */
@@ -1672 +1685 @@
-                set_window_size(td);
-                
-16+1
+sizeof(item_name)
-                menu_item = glade_xml_get_widget(gtk_xml, item_name);
-                
-
+       
-                        create_term_cairo(td);
-                        
-                if (i == 0)
-                {
-                        gtk_widget_show(td->window);
-                }
-                else if (gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM(menu_item)) != td->visible)
-                        gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menu_item), td->visible);
@@ -1692 +1703 @@
-                xtra_win_data *xd = &xdata[i];
-                
-       
-
-       
-       
+
+
+
+
-        }
-        
@@ -1706 +1717 @@
-static void xtra_data_destroy(xtra_win_data *xd)
-{
-GTK_IS_WIDGET(xd->win
+(GTK_IS_WIDGET(xd->win)
-                gtk_widget_destroy(xd->win);
-GTK_IS_WIDGET(xd->text_view
+(GTK_IS_WIDGET(xd->text_view)
-                gtk_widget_destroy(xd->text_view);
-GTK_IS_WIDGET(xd->menu
+(GTK_IS_WIDGET(xd->menu)
-                gtk_widget_destroy(xd->menu);
-GTK_IS_WIDGET(xd->drawing_area
+(GTK_IS_WIDGET(xd->drawing_area)
-                gtk_widget_destroy(xd->drawing_area);
-        
@@ -1721 +1732 @@
-static void term_data_destroy(term_data *td)
-{       
-GTK_IS_WIDGET(td->window
+(GTK_IS_WIDGET(td->window)
-                gtk_widget_destroy(td->window);
-GTK_IS_WIDGET(td->drawing_area
+(GTK_IS_WIDGET(td->drawing_area)
-                gtk_widget_destroy(td->drawing_area);
-        
@@ -1741 +1752 @@
-        {
-                xtra_win_data *xd = &xdata[i];
-
+
-                xtra_data_destroy(xd);
-        }
@@ -1749 +1760 @@
-        {
-                term_data *td = &data[i];
-
+
-                term_data_destroy(td);
-        }
@@ -1829 +1840 @@
-{
-        int i;
-
+
+
+
-        GtkTextTagTable *tags;
-
+
-        tags = gtk_text_buffer_get_tag_table(xd->buf);
-        
-        for (i = 0; i <= 15; i++)
-        {
-8 + 1
-c, 14
-
+sizeof(colorname)
+str, sizeof(str)
+
-                if (gtk_text_tag_table_lookup(tags, colorname) != NULL)
-                        gtk_text_tag_table_remove(tags, gtk_text_tag_table_lookup(tags, colorname));
-                
-                if (gtk_text_tag_table_lookup(tags, colorname) == NULL)
-c
+str
-        }
-}
@@ -1853 +1866 @@
-        
-        /* Get the color tag ready, and tack a line feed on the line we're printing */
-8 + 1
+sizeof(colorname)
-        
-        /* Print it at the end of the window */
@@ -1861 +1874 @@
-
-static void text_view_print(xtra_win_data *xd, const char *str, byte color)
-
-
+
-        text_view_put(xd, str, color);
+        text_view_put(xd, "\n", color);
-}
-
@@ -1870 +1883 @@
-        xtra_win_data *xd = &xdata[4];
-        
-*res, 
+
-        va_list vp;
-        int n;
-        
-        if (GTK_IS_TEXT_VIEW(xd->text_view))
@@ -1885 +1897 @@
-        }
-        
-        /* Begin the Varargs Stuff */
-        va_start(vp, fmt);
-
-
-
-
-
+
-        va_end(vp);
-
-        n = my_strcpy(str, res, strlen(res) + 1);
-        
-        #ifdef VERBOSE_DEBUG
-        if (GTK_IS_TEXT_VIEW(xd->text_view))
@@ -1913 +1918 @@
-{
-        xtra_win_data *xd = &xdata[0];
-
+
-        u16b num;
-
-
-
-
-
+
+
+
+
-        xd->buf = gtk_text_buffer_new(NULL);
-        gtk_text_view_set_buffer(GTK_TEXT_VIEW (xd->text_view), xd->buf);
@@ -1928 +1932 @@
-        
-        for (i = 0; i < num; i++)
-
-
-
-
-
-
-
+
-}
-
@@ -1960 +1958 @@
-}
-
-
+size_t len, 
-{
-        object_type *o_ptr;
@@ -1971 +1969 @@
-
-        /* Is this item "acceptable"? */
- 
+
-        {
-                /* Obtain an item description */
@@ -1978 +1976 @@
-                /* Obtain the length of the description */
-                n = strlen(o_name);
-
-3 + 1, "%c) ",
+
+sizeof(label), "%c) ", 
-                
-                if (equip && show_labels)
@@ -1987 +1985 @@
-                if (o_ptr->weight) 
-                {
-
+int wgt = o_ptr->weight * o_ptr->number;                       
-                        name_size = name_size - 4 - 9 - 9 - 5;
-                        int wgt = o_ptr->weight * o_ptr->number;
-                        
-                        if (equip && show_labels)
-80, 
+len,
-                        else
-
-
+
-                }
-                else
-                {
-                        name_size = name_size - 4 - 9 - 5;
+
-                        if (equip && show_labels)
-80
+len
-                        else
-80
+len
-                }
-        }
@@ -2011 +2008 @@
-{
-        xtra_win_data *xd = &xdata[1];
-
+
+
+
-        register int i, z;
-        byte attr;
-
-
-xd != NULL)
-
+
+
+!xd) return;
+
-        xd->buf = gtk_text_buffer_new(NULL);
- 
+
-        
-        init_color_tags(xd);
@@ -2028 +2027 @@
-        for (i = 0; i < z; i++)
-        {
-                char str[80];
-        
-                /* Examine the item */
-
+bject_type *o
-
-                /* Is this item "acceptable"? */
@@ -2039 +2036 @@
-                        attr = tval_to_attr[o_ptr->tval % N_ELEMENTS(tval_to_attr)];
-                        
-
+sizeof(str), 
-                        text_view_print(xd, str, attr);
-                }
-        }
-}
-}
-
-static void handle_equip(game_event_type type, game_event_data *data, void *user)
@@ -2052 +2048 @@
-        register int i;
-        byte attr;
-object_type *o_ptr
-
-xd != NULL)
-
+       char str[80]
+
+!xd) return;
+
-        xd->buf = gtk_text_buffer_new(NULL);
- 
+
-        
-        init_color_tags(xd);
@@ -2064 +2060 @@
-        for (i = INVEN_WIELD; i < INVEN_TOTAL; i++)
-        {
-
-
-
-
-
-
+
+
-                attr = tval_to_attr[o_ptr->tval % N_ELEMENTS(tval_to_attr)];
-
-
+
+
+
-                text_view_print(xd, str, attr);
-        }
-       
-
+
+
-static void handle_mons_list(game_event_type type, game_event_data *data, void *user)
-{
@@ -2096 +2089 @@
-        u16b *race_count;
-        
-
-
+
+
+
+
-        xd->buf = gtk_text_buffer_new(NULL);
-        gtk_text_view_set_buffer(GTK_TEXT_VIEW (xd->text_view), xd->buf);
@@ -2122 +2117 @@
-        if (!total_count)
-        {
-20 + 1
+sizeof(str)
-                text_view_print(xd, str, TERM_SLATE);
-
@@ -2132 +2127 @@
-        }
-        
-25 + 1, "You can see %d monster%s:", total_count, (total_count > 1 ? "s" : ""
+sizeof(str), "You can see %d monster%s:", total_count, PLURAL(total_count
-        text_view_print(xd, str, 1);
-        
@@ -2162 +2157 @@
-                else
-                        strnfmt(buf, sizeof(buf), "%s (x%d) ", m_name, race_count[i]);
-
+
-                text_view_print(xd, buf, attr);
-                line++;
@@ -2169 +2164 @@
-        /* Free the race counters */
-        FREE(race_count);
-
-
-
-
-
-
+
+
+
+
-        byte attr = TERM_WHITE;
-
-
+
+
+
+
+
+
-        /* Badly wounded */
-        if (pct >= 10) attr = TERM_L_RED;
@@ -2189 +2186 @@
-        /* Healthy */
-        if (pct >= 100) attr = TERM_L_GREEN;
+
-
-        /* Afraid */
@@ -2296 +2294 @@
-        char str[80], str2[80];
-        byte color;
-        float m_cur_hp, m_max_hp, percent;
-        cairo_rectangle_t r;
-        
@@ -2392 +2389 @@
-                else
-                        color = TERM_RED;
-
-
-
-
-
+
-                cr_aligned_text_print(xd, 0, 16, str, TERM_WHITE, str2, color, sidebar_length);
-                xtra_drawn_progress_bar(xd, 0, 17, p_ptr->chp, p_ptr->mhp, color, 13);
@@ -2411 +2404 @@
-                cr_aligned_text_print(xd, 0, 18, str, TERM_WHITE, str2, color, sidebar_length);
-                
-                percent = 0;
-                if (p_ptr->msp > 0)
-                        percent = p_ptr->csp/p_ptr->msp;
-                
-                xtra_drawn_progress_bar(xd, 0, 19, p_ptr->csp, p_ptr->msp, color, 13);
-        
-                /* 20 is blank */
-        
-
-
-
-
-
-
-
-
-
-
-
+
+
-                /* Print the level */
-                strnfmt(str, sizeof(str), "%d' (L%d)", p_ptr->depth * 50, p_ptr->depth); 
-, sizeof(str
-
+2, sizeof(str2
+2
-                
-                invalidate_drawing_area(xd->drawing_area, r);
@@ -2480 +2460 @@
-        /* Set command hook */
-        get_game_command = get_init_cmd;
-
+
-        /* I plan to put everything on the sidebar together, so... */
-        event_add_handler_set(my_player_events, N_ELEMENTS(my_player_events), handle_sidebar, NULL);
@@ -2608 +2588 @@
-}
-
- /*
+/* 

trunk/src/main-gtk.h

@@ -377 +377 @@
-
-/* Return an inventory slot */
-
+size_t len, 
-
-/* Print the inventory */
@@ -389 +389 @@
-
-/* Return the color of the monster bar */
-float percent
+const monster_type *m_ptr
-
-/* Print the sidebar */