1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
|
Index: gbatnav-1.0.4cvs20051004/gbnclient/g_interface.c
===================================================================
--- gbatnav-1.0.4cvs20051004.orig/gbnclient/g_interface.c 2002-04-19 12:12:18.000000000 +0800
+++ gbatnav-1.0.4cvs20051004/gbnclient/g_interface.c 2011-09-17 22:39:21.056581973 +0800
@@ -147,19 +147,21 @@
{
GtkWidget *href, *hbox;
static GtkWidget *about = NULL;
+ static GdkPixbuf *gnome_gbatnav=NULL;
static const char *authors[] = {
"Ricardo C. Quesada (riq@core-sdi.com)",
NULL
};
if (!about) {
-
+ gnome_gbatnav = gdk_pixbuf_new_from_file("/usr/share/pixmaps/" "gnome-gbatnav.png",NULL);
about = gnome_about_new (_("Batalla Naval client"),
VERSION,
_("(C) 1998-2001 Ricardo C. Quesada"),
- (const char**) authors,
_("A multiplayer networked battleship game."),
- "gnome-gbatnav.png");
+ (const char**) authors,
+ NULL, NULL,
+ gnome_gbatnav);
gtk_signal_connect (GTK_OBJECT (about), "destroy",
GTK_SIGNAL_FUNC (gtk_widget_destroyed),
@@ -307,6 +309,8 @@
GtkTooltips *tooltips;
GtkWidget *inputline;
GtkWidget *vbox_buttons;
+ GtkScrolledWindow *scrolledWindow=NULL;
+ GtkTextIter text_iter;
#ifdef ENABLE_NLS
# define ELEMENTS(x) (sizeof(x) / sizeof(x[0]))
@@ -376,16 +380,19 @@
/* respecto al drawing_about */
+ scrolledWindow = GTK_SCROLLED_WINDOW(gtk_scrolled_window_new(NULL,NULL));
hbox_text_help = gtk_hbox_new ( FALSE, 0);
gtk_widget_show( hbox_text_help );
- text_help = gtk_text_new(NULL,NULL);
- gtk_box_pack_start( GTK_BOX(hbox_text_help), text_help, FALSE,TRUE,0);
+ text_help = GTK_WIDGET(gtk_text_view_new());
+ gtk_container_add(GTK_CONTAINER(scrolledWindow),text_help);
gtk_widget_show(text_help);
+ gtk_box_pack_start( GTK_BOX(hbox_text_help), GTK_WIDGET(scrolledWindow), TRUE,TRUE,0);
+ gtk_widget_show(GTK_WIDGET(scrolledWindow));
- vscrollbar_help = gtk_vscrollbar_new (GTK_TEXT (text_help)->vadj);
- gtk_box_pack_start( GTK_BOX(hbox_text_help), vscrollbar_help, FALSE,TRUE,0);
- gtk_widget_show (vscrollbar_help);
+ vscrollbar_help = gtk_scrolled_window_get_vscrollbar(scrolledWindow);
+ /*gtk_box_pack_start( GTK_BOX(hbox_text_help), vscrollbar_help, FALSE,TRUE,0);*/
+ /*gtk_widget_show (vscrollbar_help);*/
label_left = gtk_label_new(_("My board"));
gtk_notebook_append_page ( GTK_NOTEBOOK(notebook_left),drawing_left,label_left);
@@ -432,23 +439,28 @@
gtk_widget_show(separator);
+ scrolledWindow = GTK_SCROLLED_WINDOW(gtk_scrolled_window_new(NULL,NULL));
hbox_text = gtk_hbox_new ( FALSE, 0);
gtk_container_add ( GTK_CONTAINER(vbox), hbox_text );
gtk_widget_show( hbox_text );
- text = gtk_text_new(NULL,NULL);
- gtk_box_pack_start( GTK_BOX(hbox_text), text, TRUE,TRUE,0);
+ text = GTK_WIDGET(gtk_text_view_new());
+ gtk_container_add(GTK_CONTAINER(scrolledWindow),text);
gtk_widget_show(text);
-
- vscrollbar = gtk_vscrollbar_new (GTK_TEXT (text)->vadj);
+ gtk_box_pack_start( GTK_BOX(hbox_text), GTK_WIDGET(scrolledWindow), TRUE,TRUE,0);
+ gtk_widget_show(GTK_WIDGET(scrolledWindow));
+
+ vscrollbar = gtk_scrolled_window_get_vscrollbar(scrolledWindow);
gtk_range_set_update_policy( GTK_RANGE( vscrollbar ), GTK_UPDATE_CONTINUOUS );
- gtk_box_pack_start( GTK_BOX(hbox_text), vscrollbar, FALSE,TRUE,0);
- gtk_widget_show (vscrollbar);
+ /*gtk_box_pack_start( GTK_BOX(hbox_text), vscrollbar, FALSE,TRUE,0);
+ gtk_widget_show (vscrollbar);*/
- gtk_text_freeze(GTK_TEXT(text));
+ /*gtk_text_freeze(GTK_TEXT(text));*/
gtk_widget_realize(text);
- gtk_text_insert( GTK_TEXT(text),NULL,NULL,NULL,"Gnome Batalla Naval client v"IPVERSION" by riq (c) 1998-2001" ,-1);
- gtk_text_thaw(GTK_TEXT(text));
+ /*gtk_text_insert( GTK_TEXT(text),NULL,NULL,NULL,"Gnome Batalla Naval client v"IPVERSION" by riq (c) 1998-2001" ,-1);*/
+ gtk_text_buffer_get_end_iter(gtk_text_view_get_buffer(GTK_TEXT_VIEW(text)),&text_iter);
+ gtk_text_buffer_insert(gtk_text_view_get_buffer(GTK_TEXT_VIEW(text)),&text_iter,"Gnome Batalla Naval client v"IPVERSION" by riq (c) 1998-2001" ,-1);
+ /*gtk_text_thaw(GTK_TEXT(text));*/
inputline = gtk_entry_new();
Index: gbatnav-1.0.4cvs20051004/gbnclient/gbnclient.c
===================================================================
--- gbatnav-1.0.4cvs20051004.orig/gbnclient/gbnclient.c 2011-09-17 22:39:18.504542902 +0800
+++ gbatnav-1.0.4cvs20051004/gbnclient/gbnclient.c 2011-09-17 22:39:21.056581973 +0800
@@ -111,9 +111,10 @@
/* Quick Help tab */
void bn_help( void )
{
- gtk_text_freeze(GTK_TEXT(text_help));
+ GtkTextIter text_help_iter;
+ /*gtk_text_freeze(GTK_TEXT(text_help));*/
gtk_widget_realize(text_help);
- gtk_text_insert( GTK_TEXT(text_help),NULL,NULL,NULL
+ /*gtk_text_insert( GTK_TEXT(text_help),NULL,NULL,NULL
,_("Batnav Quick Help -\n"
"Use this to hide your ships\n"
"Fill the board with:\n"
@@ -126,8 +127,22 @@
"Send bugs,comments, etc to:\n"
" riq@core-sdi.com\n"
) ,-1 );
-
- gtk_text_thaw(GTK_TEXT(text_help));
+ */
+ gtk_text_buffer_get_end_iter(gtk_text_view_get_buffer(GTK_TEXT_VIEW(text_help)),&text_help_iter);
+ gtk_text_buffer_insert(gtk_text_view_get_buffer(GTK_TEXT_VIEW(text_help)),&text_help_iter
+ ,_("Batnav Quick Help -\n"
+ "Use this to hide your ships\n"
+ "Fill the board with:\n"
+ " 4 ships of 1 unit\n"
+ " 3 ships of 2 units\n"
+ " 2 ships of 3 units\n"
+ " 1 ship of 4 units\n"
+ " or press 'Random'\n"
+ "Then press 'Send ships' and 'Start'\n"
+ "Send bugs,comments, etc to:\n"
+ " riq@core-sdi.com\n"
+ ) ,-1 );
+ /*gtk_text_thaw(GTK_TEXT(text_help));*/
}
/****************************************************************************
Index: gbatnav-1.0.4cvs20051004/gbnclient/pantalla.c
===================================================================
--- gbatnav-1.0.4cvs20051004.orig/gbnclient/pantalla.c 2002-04-19 12:12:18.000000000 +0800
+++ gbatnav-1.0.4cvs20051004/gbnclient/pantalla.c 2011-09-17 22:39:21.056581973 +0800
@@ -174,6 +174,7 @@
gchar messg2[200];
gfloat new_value ;
gint h,w;
+ GtkTextIter text_iter;
va_list args;
@@ -185,12 +186,16 @@
strncat(messg,messg2,200);
va_end( args );
- gtk_text_freeze(GTK_TEXT(text));
+ /*gtk_text_freeze(GTK_TEXT(text));*/
gtk_widget_realize(text);
- gtk_text_insert( GTK_TEXT(text),NULL,NULL,NULL,messg,-1);
- gtk_text_thaw(GTK_TEXT(text));
+ /*gtk_text_insert( GTK_TEXT(text),NULL,NULL,NULL,messg,-1);*/
+ gtk_text_buffer_get_end_iter(gtk_text_view_get_buffer(GTK_TEXT_VIEW(text)),&text_iter);
+ gtk_text_buffer_insert(gtk_text_view_get_buffer(GTK_TEXT_VIEW(text)),&text_iter,messg,-1);
+ /*gtk_text_thaw(GTK_TEXT(text));*/
- gdk_window_get_size( GTK_TEXT( text )->text_area, &w, &h );
+ /*gdk_window_get_size( GTK_TEXT( text )->text_area, &w, &h );*/
+ gtk_text_buffer_get_end_iter(gtk_text_view_get_buffer(GTK_TEXT_VIEW(text)),&text_iter);
+ gtk_text_view_get_line_yrange( GTK_TEXT_VIEW(text), &text_iter,&w,&h);
if( GTK_RANGE( vscrollbar )->adjustment->upper >= h ) {
new_value = GTK_RANGE( vscrollbar )-> adjustment->upper - h;
Index: gbatnav-1.0.4cvs20051004/gbnserver/g_interface.c
===================================================================
--- gbatnav-1.0.4cvs20051004.orig/gbnserver/g_interface.c 2001-04-12 07:53:32.000000000 +0800
+++ gbatnav-1.0.4cvs20051004/gbnserver/g_interface.c 2011-09-17 22:39:21.056581973 +0800
@@ -49,17 +49,24 @@
static void about(GtkWidget *widget, gpointer data)
{
GtkWidget *about;
+ GdkPixbuf *gnome_gbatnav=NULL;
gchar *authors[] = {
"riq (riq@core-sdi.com)",
NULL
};
+ gnome_gbatnav = gdk_pixbuf_new_from_file("/usr/share/pixmaps/" "gnome-gbatnav.png",NULL);
about = gnome_about_new (_("Batalla Naval server"), VERSION,
"(C) 1998-2001 Ricardo C. Quesada",
- (const char**) authors,
_("A multiplayer, multirobot, networked battleship game"),
- "gnome-gbatnav.png");
+ (const char**) authors,
+ NULL, NULL,
+ gnome_gbatnav);
gtk_widget_show (about);
+ if (gnome_gbatnav !=NULL) {
+ g_object_unref(gnome_gbatnav);
+ gnome_gbatnav=NULL;
+ }
}
GnomeUIInfo gamemenu[] =
@@ -163,7 +170,8 @@
gtk_clist_append (GTK_CLIST (clist), clist_texts);
}
- boton = gnome_stock_button(GNOME_STOCK_BUTTON_OK);
+ /*boton = gnome_stock_button(GNOME_STOCK_BUTTON_OK);*/
+ boton = GTK_WIDGET(gtk_button_new_from_stock(GTK_STOCK_OK));
gtk_box_pack_start( GTK_BOX( clist_box), boton, TRUE, TRUE, 0);
gtk_widget_show_all (window);
Index: gbatnav-1.0.4cvs20051004/gbnserver/play.h
===================================================================
--- gbatnav-1.0.4cvs20051004.orig/gbnserver/play.h 2000-02-13 08:56:49.000000000 +0800
+++ gbatnav-1.0.4cvs20051004/gbnserver/play.h 2011-09-17 22:39:21.056581973 +0800
@@ -1,6 +1,7 @@
/* $Id: play.h,v 1.1.1.1 2000/02/13 00:56:49 riq Exp $ */
#ifndef __BN_PLAY_H__
# define __BN_PLAY_H__
+#include <gdk/gdk.h>
void play_batnav( gpointer , gint , GdkInputCondition );
gint quejugador( gint );
|
