?  search:
summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
blame | history | raw | HEAD
libattr: remove libattr because it is clashing with udev/attr and is not used by...
[openembedded.git] / recipes / gweled / gweled-0.5 / de-gnome.patch
blob51176330319275c832062b675a930213f275bd63
1 diff -urNd ../gweled-0.5-r0/gweled-0.5/configure.in gweled-0.5/configure.in
2 --- ../gweled-0.5-r0/gweled-0.5/configure.in 2004-01-22 20:14:23.000000000 +0000
3 +++ gweled-0.5/configure.in 2004-09-28 12:32:39.000000000 +0100
4 @@ -10,7 +10,7 @@
5 AM_PROG_CC_STDC
6 AC_HEADER_STDC
7
8 -pkg_modules="libglade-2.0,libgnomeui-2.0,librsvg-2.0"
9 +pkg_modules="gtk+-2.0 librsvg-2.0"
10 PKG_CHECK_MODULES(PACKAGE, [$pkg_modules])
11 AC_SUBST(PACKAGE_CFLAGS)
12 AC_SUBST(PACKAGE_LIBS)
13 diff -urNd ../gweled-0.5-r0/gweled-0.5/src/board_engine.c gweled-0.5/src/board_engine.c
14 --- ../gweled-0.5-r0/gweled-0.5/src/board_engine.c 2004-01-25 08:23:54.000000000 +0000
15 +++ gweled-0.5/src/board_engine.c 2004-09-28 15:56:32.000000000 +0100
16 @@ -1,4 +1,4 @@
17 -#include <gnome.h>
18 +#include <gtk/gtk.h>
19
20 #include "sge_core.h"
21 #include "board_engine.h"
22 @@ -512,7 +512,7 @@
23 if (gi_total_gems_removed <= gi_previous_bonus_at) {
24 gweled_draw_message ("time's up #");
25 gi_game_running = 0;
26 - gnome_score_log ((gfloat) gi_score, "timed", TRUE);
27 +// gnome_score_log ((gfloat) gi_score, "timed", TRUE);
28 g_do_not_score = FALSE;
29 gi_state = _IDLE;
30 } else
31 @@ -661,7 +661,7 @@
32 } else {
33 gweled_draw_message ("no moves left #");
34 gi_game_running = 0;
35 - gnome_score_log ((gfloat) gi_score, "easy", TRUE);
36 +// gnome_score_log ((gfloat) gi_score, "easy", TRUE);
37 g_do_not_score = FALSE;
38 gi_state = _IDLE;
39 }
40 diff -urNd ../gweled-0.5-r0/gweled-0.5/src/callbacks.c gweled-0.5/src/callbacks.c
41 --- ../gweled-0.5-r0/gweled-0.5/src/callbacks.c 2004-01-21 17:25:34.000000000 +0000
42 +++ gweled-0.5/src/callbacks.c 2004-09-28 13:20:55.000000000 +0100
43 @@ -2,8 +2,7 @@
44 # include <config.h>
45 #endif
46
47 -#include <gnome.h>
48 -#include <glade/glade.h>
49 +#include <gtk/gtk.h>
50
51 #include "callbacks.h"
52
53 @@ -15,7 +14,7 @@
54 extern gint gi_score;
55 extern gboolean g_do_not_score;
56
57 -extern GladeXML *gweled_xml;
58 +//extern GladeXML *gweled_xml;
59 extern GtkWidget *g_main_window;
60 extern GtkWidget *g_pref_window;
61 extern GtkWidget *g_score_window;
62 @@ -29,7 +28,7 @@
63
64
65 void
66 -on_new1_activate (GtkMenuItem * menuitem, gpointer user_data)
67 +on_new1_activate (GtkWidget * w, gpointer user_data)
68 {
69 GtkWidget *box;
70 gint response;
71 @@ -39,7 +38,7 @@
72 GTK_DIALOG_DESTROY_WITH_PARENT,
73 GTK_MESSAGE_QUESTION,
74 GTK_BUTTONS_YES_NO,
75 - _("Do you really want to abort this game ?"));
76 + "Do you really want to abort this game ?");
77
78 gtk_dialog_set_default_response (GTK_DIALOG (box),
79 GTK_RESPONSE_NO);
80 @@ -54,7 +53,7 @@
81 gweled_draw_board ();
82 gweled_start_new_game ();
83 }
84 -
85 +/*
86 void
87 on_scores1_activate (GtkMenuItem * menuitem, gpointer user_data)
88 {
89 @@ -103,7 +102,7 @@
90 gtk_widget_destroy (box);
91 }
92 }
93 -
94 +*/
95 void
96 on_quit1_activate (GtkMenuItem * menuitem, gpointer user_data)
97 {
98 @@ -115,6 +114,7 @@
99 {
100 gtk_widget_show (g_pref_window);
101 }
102 +/*
103 void
104 on_about1_activate (GtkMenuItem * menuitem, gpointer user_data)
105 {
106 @@ -152,7 +152,7 @@
107
108 gtk_widget_show(about);
109 }
110 -
111 +*/
112 gboolean
113 drawing_area_expose_event_cb (GtkWidget * widget, GdkEventExpose * event, gpointer user_data)
114 {
115 @@ -177,23 +177,28 @@
116 case GDK_BUTTON_PRESS:
117 x_press = event->x / gi_tile_width;
118 y_press = event->y / gi_tile_height;
119 - if (gi_game_running) {
120 - gi_x_click = x_press;
121 - gi_y_click = y_press;
122 - gi_gem_clicked = -1;
123 - } else {
124 - on_new1_activate (NULL, NULL);
125 + if ((x_press <= BOARD_WIDTH) && (y_press <= BOARD_HEIGHT)) {
126 + if (gi_game_running) {
127 + gi_x_click = x_press;
128 + gi_y_click = y_press;
129 + gi_gem_clicked = -1;
130 + } else {
131 + on_new1_activate (NULL, NULL);
132 + }
133 }
134 break;
135
136 case GDK_BUTTON_RELEASE:
137 x_release = event->x / gi_tile_width;
138 y_release = event->y / gi_tile_height;
139 - if((x_press != x_release) || (y_press != y_release)) {
140 - if (gi_game_running) {
141 - gi_x_click = x_release;
142 - gi_y_click = y_release;
143 - gi_gem_clicked = -1;
144 + if ((x_release <= BOARD_WIDTH) && (y_release <= BOARD_HEIGHT) &&
145 + (x_press <= BOARD_WIDTH) && (y_press <= BOARD_HEIGHT)) {
146 + if((x_press != x_release) || (y_press != y_release)) {
147 + if (gi_game_running) {
148 + gi_x_click = x_release;
149 + gi_y_click = y_release;
150 + gi_gem_clicked = -1;
151 + }
152 }
153 }
154 break;
155 diff -urNd ../gweled-0.5-r0/gweled-0.5/src/callbacks.h gweled-0.5/src/callbacks.h
156 --- ../gweled-0.5-r0/gweled-0.5/src/callbacks.h 2003-11-05 21:01:08.000000000 +0000
157 +++ gweled-0.5/src/callbacks.h 2004-09-28 11:26:44.000000000 +0100
158 @@ -1,8 +1,8 @@
159 -#include <gnome.h>
160 +#include <gtk/gtk.h>
161
162
163 void
164 -on_new1_activate (GtkMenuItem *menuitem,
165 +on_new1_activate (GtkWidget *w,
166 gpointer user_data);
167
168 void
169 @@ -35,7 +35,7 @@
170 gpointer user_data);
171
172 gboolean
173 -drawing_area_button_press_event_cb (GtkWidget *widget,
174 +drawing_area_button_event_cb (GtkWidget *widget,
175 GdkEventButton *event,
176 gpointer user_data);
177
178 diff -urNd ../gweled-0.5-r0/gweled-0.5/src/graphic_engine.c gweled-0.5/src/graphic_engine.c
179 --- ../gweled-0.5-r0/gweled-0.5/src/graphic_engine.c 2004-01-22 22:09:05.000000000 +0000
180 +++ gweled-0.5/src/graphic_engine.c 2004-09-28 15:56:00.000000000 +0100
181 @@ -1,9 +1,13 @@
182 -#include <gnome.h>
183 +#include <gtk/gtk.h>
184 #include "sge_core.h"
185 #include "sge_utils.h"
186
187 #include "graphic_engine.h"
188
189 +#ifndef PREFIX
190 +#define PREFIX "/usr/local/"
191 +#endif
192 +
193 extern gi_game_running;
194 extern gchar gpc_game_board[BOARD_WIDTH][BOARD_HEIGHT];
195 extern GRand *g_random_generator;
196 @@ -11,7 +15,7 @@
197 extern GtkWidget *g_drawing_area;
198 extern GdkPixmap *g_buffer_pixmap;
199 extern T_SGEObject *g_gem_objects[BOARD_WIDTH][BOARD_HEIGHT];
200 -extern GnomeProgram *g_program;
201 +//extern GnomeProgram *g_program;
202 signed char gpc_font_glyphs[256];
203 gint gi_tiles_bg_pixbuf[2];
204 gint gi_gems_pixbuf[7];
205 @@ -29,7 +33,7 @@
206 int i;
207
208 pixbuf =
209 - sge_load_file_to_pixbuf (g_program, "gweled/font_24_20.png");
210 + sge_load_file_to_pixbuf (PREFIX "/share/pixmaps/" "gweled/font_24_20.png");
211 if (pixbuf) {
212 for (i = 0; i < 50; i++)
213 gi_charset_pixbuf[i] =
214 @@ -49,9 +53,9 @@
215 int i;
216
217 for (i = 0; i < 7; i++) {
218 - filename = g_strdup_printf ("gweled/gem%02d.svg", i + 1);
219 + filename = g_strdup_printf (PREFIX "/share/pixmaps/" "gweled/gem%02d.svg", i + 1);
220 pixbuf =
221 - sge_load_svg_to_pixbuf (g_program, filename,
222 + sge_load_svg_to_pixbuf (filename,
223 gi_tile_width, gi_tile_height);
224 if (pixbuf == NULL)
225 exit (-1);
226 @@ -61,21 +65,21 @@
227 }
228
229 pixbuf =
230 - sge_load_svg_to_pixbuf (g_program, "gweled/tile_odd.svg",
231 + sge_load_svg_to_pixbuf (PREFIX "/share/pixmaps/" "gweled/tile_odd.svg",
232 gi_tile_width, gi_tile_height);
233 if (pixbuf == NULL)
234 exit (-1);
235 gi_tiles_bg_pixbuf[0] = sge_register_pixbuf (pixbuf, -1);
236
237 pixbuf =
238 - sge_load_svg_to_pixbuf (g_program, "gweled/tile_even.svg",
239 + sge_load_svg_to_pixbuf (PREFIX "/share/pixmaps/" "gweled/tile_even.svg",
240 gi_tile_width, gi_tile_height);
241 if (pixbuf == NULL)
242 exit (-1);
243 gi_tiles_bg_pixbuf[1] = sge_register_pixbuf (pixbuf, -1);
244
245 pixbuf =
246 - sge_load_svg_to_pixbuf (g_program, "gweled/cursor.svg",
247 + sge_load_svg_to_pixbuf (PREFIX "/share/pixmaps/" "gweled/cursor.svg",
248 gi_tile_width, gi_tile_height);
249 if (pixbuf == NULL)
250 exit (-1);
251 @@ -91,9 +95,9 @@
252 int i;
253
254 for (i = 0; i < 7; i++) {
255 - filename = g_strdup_printf ("gweled/gem%02d.svg", i + 1);
256 + filename = g_strdup_printf (PREFIX "/share/pixmaps/" "gweled/gem%02d.svg", i + 1);
257 pixbuf =
258 - sge_load_svg_to_pixbuf (g_program, filename,
259 + sge_load_svg_to_pixbuf (filename,
260 gi_tile_width, gi_tile_height);
261 if (pixbuf == NULL)
262 exit (-1);
263 @@ -103,21 +107,21 @@
264 }
265
266 pixbuf =
267 - sge_load_svg_to_pixbuf (g_program, "gweled/tile_odd.svg",
268 + sge_load_svg_to_pixbuf (PREFIX "/share/pixmaps/" "gweled/tile_odd.svg",
269 gi_tile_width, gi_tile_height);
270 if (pixbuf == NULL)
271 exit (-1);
272 sge_register_pixbuf (pixbuf, gi_tiles_bg_pixbuf[0]);
273
274 pixbuf =
275 - sge_load_svg_to_pixbuf (g_program, "gweled/tile_even.svg",
276 + sge_load_svg_to_pixbuf (PREFIX "/share/pixmaps/" "gweled/tile_even.svg",
277 gi_tile_width, gi_tile_height);
278 if (pixbuf == NULL)
279 exit (-1);
280 sge_register_pixbuf (pixbuf, gi_tiles_bg_pixbuf[1]);
281
282 pixbuf =
283 - sge_load_svg_to_pixbuf (g_program, "gweled/cursor.svg",
284 + sge_load_svg_to_pixbuf (PREFIX "/share/pixmaps/" "gweled/cursor.svg",
285 gi_tile_width, gi_tile_height);
286 if (pixbuf == NULL)
287 exit (-1);
288 @@ -258,10 +262,10 @@
289 gweled_gems_fall_into_place (void)
290 {
291 gint i, j;
292 - for (i = 0; i < BOARD_WIDTH; i++)
293 - for (j = 0; j < BOARD_HEIGHT; j++)
294 - sge_object_fall_to (g_gem_objects[i][j],
295 - j * gi_tile_height);
296 + for (i = 0; i < BOARD_WIDTH; i++)
297 + for (j = 0; j < BOARD_HEIGHT; j++)
298 + sge_object_fall_to (g_gem_objects[i][j],
299 + j * gi_tile_height);
300 }
301
302
303 diff -urNd ../gweled-0.5-r0/gweled-0.5/src/main.c gweled-0.5/src/main.c
304 --- ../gweled-0.5-r0/gweled-0.5/src/main.c 2004-01-22 20:16:10.000000000 +0000
305 +++ gweled-0.5/src/main.c 2004-10-13 10:17:43.000000000 +0100
306 @@ -25,19 +25,22 @@
307 # include <config.h>
308 #endif
309
310 -#include <gnome.h>
311 -#include <glade/glade.h>
312 +#include <gtk/gtk.h>
313
314 +#include "callbacks.h"
315 #include "sge_core.h"
316 #include "board_engine.h"
317 #include "graphic_engine.h"
318
319 // GLOBALS
320 -GnomeProgram *g_program;
321 -GladeXML *gweled_xml;
322 +//GnomeProgram *g_program;
323 +//GladeXML *gweled_xml;
324 GtkWidget *g_main_window;
325 +GtkWidget *g_toolbar;
326 GtkWidget *g_pref_window;
327 GtkWidget *g_score_window;
328 +GtkWidget *button;
329 +GtkWidget *vbox, *hbox;
330
331 GtkWidget *g_drawing_area;
332 GtkWidget *g_progress_bar;
333 @@ -45,7 +48,7 @@
334 GtkWidget *g_bonus_label;
335 GdkPixmap *g_buffer_pixmap = NULL;
336 GRand *g_random_generator;
337 -
338 +/*
339 void init_pref_window(void)
340 {
341 GtkWidget *radio_button = NULL;
342 @@ -56,13 +59,13 @@
343 radio_button = glade_xml_get_widget(gweled_xml, "hardRadiobutton");
344 if (radio_button)
345 gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON(radio_button), TRUE);
346 -
347 +*/
348 /* radio_button = glade_xml_get_widget(gweled_xml, "easyRadiobutton");
349 gtk_widget_set_state (radio_button, GTK_STATE_INSENSITIVE);
350 radio_button = glade_xml_get_widget(gweled_xml, "hardRadiobutton");
351 gtk_widget_set_state (radio_button, GTK_STATE_INSENSITIVE);
352 */
353 - radio_button = NULL;
354 +/* radio_button = NULL;
355 switch (gi_tile_width) {
356 case 32:
357 radio_button = glade_xml_get_widget(gweled_xml, "smallRadiobutton");
358 @@ -75,47 +78,147 @@
359 break;
360 }
361 if (radio_button)
362 - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON(radio_button), TRUE);
363 -}
364 + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON(radio_button), TRUE);*/
365 +/*}*/
366
367 int
368 main (int argc, char **argv)
369 {
370 guint board_engine_id;
371
372 - gnome_score_init ("gweled");
373 -
374 - g_program =
375 - gnome_program_init (PACKAGE, VERSION, LIBGNOMEUI_MODULE, argc,
376 - argv, GNOME_PARAM_APP_DATADIR,
377 - PACKAGE_DATA_DIR, NULL);
378 + gtk_init (&argc, &argv);
379 +// exit (1);
380 +// gnome_score_init ("gweled");
381
382 sge_init ();
383
384 g_random_generator = g_rand_new_with_seed (time (NULL));
385
386 // let's do that before calling init_pref_window
387 - gi_tile_width = 48;
388 - gi_tile_height = 48;
389 - gweled_in_timer_mode = FALSE;
390 + gi_tile_width = 26; // This should be calculated via window-size... But for now, hard-code it for 240x320 PDAs
391 + gi_tile_height = 26;
392 + gweled_in_timer_mode = TRUE; // Let's default to a timed game too :)
393
394 - gweled_xml = glade_xml_new(PACKAGE_DATA_DIR "/gweled/gweled.glade", NULL, NULL);
395 - g_pref_window = glade_xml_get_widget(gweled_xml, "preferencesDialog");
396 +// gweled_xml = glade_xml_new(PACKAGE_DATA_DIR "/gweled/gweled.glade", NULL, NULL);
397 +
398 +// Configure main window
399 + g_main_window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
400 + gtk_window_set_title (GTK_WINDOW (g_main_window), "Gweled");
401 + vbox = gtk_vbox_new (FALSE, 0);
402 + hbox = gtk_hbox_new (FALSE, 0);
403 +
404 + g_toolbar = gtk_toolbar_new ();
405 + gtk_window_set_default_size (GTK_WINDOW (g_main_window), 240, 300);
406 + gtk_toolbar_set_style (GTK_TOOLBAR (g_toolbar), GTK_TOOLBAR_ICONS);
407 +
408 +// Populate tool-bar
409 + gtk_toolbar_insert_stock (GTK_TOOLBAR (g_toolbar), GTK_STOCK_NEW,
410 + "New game", "Tap here to start a new game.",
411 + G_CALLBACK (on_new1_activate), NULL, -1);
412 + gtk_toolbar_insert_stock (GTK_TOOLBAR (g_toolbar), GTK_STOCK_PROPERTIES,
413 + "Preferences", "Tap here to configure Gweled.",
414 + G_CALLBACK (on_preferences1_activate), NULL, -1);
415 + gtk_toolbar_insert_stock (GTK_TOOLBAR (g_toolbar), GTK_STOCK_QUIT,
416 + "Quit", "Tap here to quit the game.",
417 + G_CALLBACK (on_quit1_activate), NULL, -1);
418 + g_signal_connect (G_OBJECT (g_main_window), "destroy",
419 + G_CALLBACK (on_quit1_activate), NULL);
420 +
421 +// Score label
422 + g_score_label = gtk_label_new (NULL);
423 + gtk_label_set_markup (g_score_label, "<span weight=\"bold\">000000</span>");
424 + gtk_label_set_justify (g_score_label, GTK_JUSTIFY_RIGHT);
425 + gtk_label_set_line_wrap (g_score_label, FALSE);
426 + gtk_label_set_selectable (g_score_label, FALSE);
427 +
428 +// Drawing area
429 + g_drawing_area = gtk_drawing_area_new ();
430 + g_signal_connect (G_OBJECT (g_drawing_area), "expose_event",
431 + G_CALLBACK (drawing_area_expose_event_cb), NULL);
432 + g_signal_connect (G_OBJECT (g_drawing_area), "button_press_event",
433 + G_CALLBACK (drawing_area_button_event_cb), NULL);
434 + g_signal_connect (G_OBJECT (g_drawing_area), "button_release_event",
435 + G_CALLBACK (drawing_area_button_event_cb), NULL);
436 +
437 +// Progress bar
438 + g_progress_bar = gtk_progress_bar_new ();
439 + gtk_progress_bar_set_orientation (g_progress_bar, GTK_PROGRESS_LEFT_TO_RIGHT);
440 + gtk_progress_bar_set_fraction (g_progress_bar, 0);
441 + gtk_progress_bar_set_pulse_step (g_progress_bar, 0.1);
442 +
443 +// Bonus label
444 + g_bonus_label = gtk_label_new (NULL);
445 + gtk_label_set_markup (g_bonus_label, "<span weight=\"bold\">x1</span>");
446 + gtk_label_set_use_markup (g_bonus_label, TRUE);
447 + gtk_label_set_justify (g_bonus_label, GTK_JUSTIFY_RIGHT);
448 + gtk_label_set_line_wrap (g_bonus_label, FALSE);
449 + gtk_label_set_selectable (g_bonus_label, FALSE);
450 +
451 +// Add components to vbox/hbox and window
452 + gtk_container_add (GTK_CONTAINER (g_main_window), GTK_WIDGET (vbox));
453 + gtk_box_pack_start (GTK_BOX (vbox), g_toolbar, FALSE, FALSE, 0);
454 + gtk_box_pack_start (GTK_BOX (vbox), g_score_label, FALSE, FALSE, 0);
455 + gtk_box_pack_start (GTK_BOX (vbox), g_drawing_area, TRUE, FALSE, 0);
456 + gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
457 + gtk_box_pack_start (GTK_BOX (hbox), g_progress_bar, TRUE, TRUE, 0);
458 + gtk_box_pack_start (GTK_BOX (hbox), g_bonus_label, FALSE, FALSE, 0);
459 + gtk_widget_show (vbox);
460 + gtk_widget_show (g_toolbar);
461 + gtk_widget_show (g_score_label);
462 + gtk_widget_show (g_drawing_area);
463 + gtk_widget_show (hbox);
464 + gtk_widget_show (g_progress_bar);
465 + gtk_widget_show (g_bonus_label);
466 +
467 +// Who needs glade? :)
468 +/* g_pref_window = glade_xml_get_widget(gweled_xml, "preferencesDialog");
469 g_main_window = glade_xml_get_widget(gweled_xml, "gweledApp");
470 g_score_window = glade_xml_get_widget(gweled_xml, "highscoresDialog");
471 g_progress_bar = glade_xml_get_widget(gweled_xml, "bonusProgressbar");
472 g_score_label = glade_xml_get_widget(gweled_xml, "scoreLabel");
473 g_bonus_label = glade_xml_get_widget(gweled_xml, "bonusLabel");
474 - g_drawing_area = glade_xml_get_widget(gweled_xml, "boardDrawingarea");
475 + g_drawing_area = glade_xml_get_widget(gweled_xml, "boardDrawingarea");*/
476
477 - init_pref_window();
478 +// Configure preferences window
479 + g_pref_window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
480 + gtk_window_set_title (g_pref_window, "Preferences");
481 + gtk_window_set_transient_for (g_pref_window, g_main_window);
482 + gtk_window_set_position (g_pref_window, GTK_WIN_POS_CENTER_ON_PARENT);
483 + vbox = gtk_vbox_new (TRUE, 0);
484
485 - glade_xml_signal_autoconnect(gweled_xml);
486 + button = gtk_radio_button_new_with_label (NULL, "Normal");
487 + gtk_signal_connect (GTK_OBJECT (button), "clicked",
488 + GTK_SIGNAL_FUNC (on_easyRadiobutton_toggled), NULL);
489 + gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0);
490 + gtk_widget_show (button);
491 +
492 + GSList *radio_group = gtk_radio_button_get_group (button);
493 + button = gtk_radio_button_new_with_label (NULL, "Timed");
494 + gtk_signal_connect (GTK_OBJECT (button), "clicked",
495 + GTK_SIGNAL_FUNC (on_hardRadiobutton_toggled), NULL);
496 + gtk_radio_button_set_group (GTK_RADIO_BUTTON (button), radio_group);
497 + if (gweled_in_timer_mode == TRUE)
498 + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button), TRUE);
499 + gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0);
500 + gtk_widget_show (button);
501 +
502 + button = gtk_button_new_from_stock (GTK_STOCK_CLOSE);
503 + gtk_signal_connect (GTK_OBJECT (button), "clicked",
504 + GTK_SIGNAL_FUNC (on_closebutton1_clicked), NULL);
505 + gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0);
506 + gtk_widget_show (button);
507 +
508 + gtk_container_add (GTK_CONTAINER (g_pref_window), vbox);
509 + gtk_widget_show (vbox);
510 +
511 +// init_pref_window();
512 +
513 +// glade_xml_signal_autoconnect(gweled_xml);
514
515 gtk_widget_add_events (GTK_WIDGET (g_drawing_area),
516 GDK_BUTTON_RELEASE_MASK | GDK_BUTTON_PRESS_MASK);
517
518 - gtk_window_set_resizable (GTK_WINDOW (g_main_window), FALSE);
519 +// gtk_window_set_resizable (GTK_WINDOW (g_main_window), FALSE);
520 gtk_widget_show (g_main_window);
521
522 gtk_widget_set_size_request (GTK_WIDGET (g_drawing_area),
523 @@ -133,7 +236,7 @@
524
525 gi_game_running = 0;
526
527 - board_engine_id = gtk_timeout_add (100, board_engine_loop, NULL);
528 + board_engine_id = g_timeout_add_full (G_PRIORITY_HIGH, 100, board_engine_loop, NULL, NULL);
529 sge_set_drawing_area (g_drawing_area, g_buffer_pixmap,
530 BOARD_WIDTH * gi_tile_width,
531 BOARD_HEIGHT * gi_tile_height);
532 @@ -144,9 +247,9 @@
533 gtk_main ();
534
535 sge_destroy ();
536 - gtk_timeout_remove (board_engine_id);
537 + g_source_remove (board_engine_id);
538 g_rand_free (g_random_generator);
539 - g_object_unref(G_OBJECT(gweled_xml));
540 +// g_object_unref(G_OBJECT(gweled_xml));
541
542 return 0;
543 }
544 diff -urNd ../gweled-0.5-r0/gweled-0.5/src/Makefile.am gweled-0.5/src/Makefile.am
545 --- ../gweled-0.5-r0/gweled-0.5/src/Makefile.am 2003-12-11 21:34:19.000000000 +0000
546 +++ gweled-0.5/src/Makefile.am 2004-09-28 12:30:51.000000000 +0100
547 @@ -3,6 +3,7 @@
548 INCLUDES = \
549 -DPACKAGE_DATA_DIR=\""$(datadir)"\" \
550 -DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
551 + -DPREFIX=\""$(prefix)"\" \
552 @PACKAGE_CFLAGS@
553
554 bin_PROGRAMS = gweled
555 diff -urNd ../gweled-0.5-r0/gweled-0.5/src/sge_core.c gweled-0.5/src/sge_core.c
556 --- ../gweled-0.5-r0/gweled-0.5/src/sge_core.c 2004-01-22 22:10:40.000000000 +0000
557 +++ gweled-0.5/src/sge_core.c 2004-10-13 10:20:45.000000000 +0100
558 @@ -18,11 +18,11 @@
559 Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
560 */
561
562 -#include <gnome.h>
563 +#include <gtk/gtk.h>
564 #include <math.h>
565 #include "sge_core.h"
566
567 -#define ACCELERATION 1.0
568 +#define ACCELERATION 2.0
569
570 // LOCAL FUNCTIONS
571 void invalidate_objects_above (T_SGEObject * object);
572 @@ -128,7 +128,7 @@
573 sge_init (void)
574 {
575 g_rand_generator = g_rand_new_with_seed (time (NULL));
576 - g_main_loop_id = gtk_timeout_add (20, sge_main_loop, NULL);
577 + g_main_loop_id = g_timeout_add (50, sge_main_loop, NULL);
578 gi_nb_pixbufs = 0;
579 g_pixbufs = NULL;
580 }
581 @@ -174,7 +174,7 @@
582 {
583 int i;
584
585 - gtk_timeout_remove (g_main_loop_id);
586 + g_source_remove (g_main_loop_id);
587 g_rand_free (g_rand_generator);
588 for (i = 0; i < gi_nb_pixbufs; i++)
589 gdk_pixbuf_unref (g_pixbufs[i]);
590 diff -urNd ../gweled-0.5-r0/gweled-0.5/src/sge_utils.c gweled-0.5/src/sge_utils.c
591 --- ../gweled-0.5-r0/gweled-0.5/src/sge_utils.c 2003-12-07 19:28:57.000000000 +0000
592 +++ gweled-0.5/src/sge_utils.c 2004-09-28 11:20:54.000000000 +0100
593 @@ -1,47 +1,30 @@
594 -#include <gnome.h>
595 +#include <gtk/gtk.h>
596 #include <librsvg/rsvg.h>
597
598 #include "sge_utils.h"
599
600 GdkPixbuf *
601 -sge_load_svg_to_pixbuf (GnomeProgram * program, char *filename, int width,
602 - int height)
603 +sge_load_svg_to_pixbuf (char *filename, int width, int height)
604 {
605 - gchar *full_pathname;
606 GdkPixbuf *pixbuf = NULL;
607 GError *error;
608
609 - full_pathname = gnome_program_locate_file (program,
610 - GNOME_FILE_DOMAIN_APP_PIXMAP,
611 - filename, TRUE, NULL);
612 - if (full_pathname) {
613 - pixbuf =
614 - rsvg_pixbuf_from_file_at_size (full_pathname, width,
615 - height, &error);
616 - g_free (full_pathname);
617 - if (pixbuf == NULL) {
618 - g_free (error);
619 - }
620 - } else
621 - printf ("%s not found\n", filename);
622 + pixbuf =
623 + rsvg_pixbuf_from_file_at_size (filename, width,
624 + height, &error);
625 + if (pixbuf == NULL) {
626 + g_free (error);
627 + }
628
629 return pixbuf;
630 }
631
632 GdkPixbuf *
633 -sge_load_file_to_pixbuf (GnomeProgram * program, char *filename)
634 +sge_load_file_to_pixbuf (char *filename)
635 {
636 - gchar *full_pathname;
637 GdkPixbuf *pixbuf = NULL;
638
639 - full_pathname = gnome_program_locate_file (program,
640 - GNOME_FILE_DOMAIN_APP_PIXMAP,
641 - filename, TRUE, NULL);
642 - if (full_pathname) {
643 - pixbuf = gdk_pixbuf_new_from_file (full_pathname, NULL);
644 - g_free (full_pathname);
645 - } else
646 - printf ("%s not found\n", filename);
647 + pixbuf = gdk_pixbuf_new_from_file (filename, NULL);
648
649 return pixbuf;
650 }
651 diff -urNd ../gweled-0.5-r0/gweled-0.5/src/sge_utils.h gweled-0.5/src/sge_utils.h
652 --- ../gweled-0.5-r0/gweled-0.5/src/sge_utils.h 2003-11-05 20:31:27.000000000 +0000
653 +++ gweled-0.5/src/sge_utils.h 2004-09-28 11:14:27.000000000 +0100
654 @@ -1,3 +1,3 @@
655
656 -GdkPixbuf *sge_load_file_to_pixbuf(GnomeProgram *program, char *filename);
657 -GdkPixbuf *sge_load_svg_to_pixbuf(GnomeProgram *program, char *filename, int width, int height);
658 +GdkPixbuf *sge_load_file_to_pixbuf(char *filename);
659 +GdkPixbuf *sge_load_svg_to_pixbuf(char *filename, int width, int height);
openembedded.net git repo