From de560a216043fa3857be68f955244fefd1b62ab9 Mon Sep 17 00:00:00 2001 From: Jose Antonio Ortega Ruiz Date: Mon, 20 Mar 2006 23:01:19 +0000 Subject: Bug fixes for 1.2.2 (latest CVS version) * mixgtk/mixgtk.glade (Module): I1 and I2 in mixvm swapped to their correct position (closes #15746). * mixgtk/mixgtk_mixvm.c (init_mem_): fixed segfault when clicking Memory title bar (closes #15910). * configure.in: obsolete C flags for Darwin deleted. * misc/mixal-mode.el (Module): sync with Emacs CVS (Pieter). * mixlib/mix.c: copyright year in console message updated. * mixgtk/mixgtk_device.c (write_char_): buffer size was insufficient. git-archimport-id: mdk@sv.gnu.org/mdk--devel--1--patch-3 --- mixgtk/mixgtk.glade | 227 +++++++++++++++++++++++++++++++++++++++++++------ mixgtk/mixgtk_device.c | 6 +- mixgtk/mixgtk_mixvm.c | 10 +-- 3 files changed, 210 insertions(+), 33 deletions(-) (limited to 'mixgtk') diff --git a/mixgtk/mixgtk.glade b/mixgtk/mixgtk.glade index f16f441..005bb75 100644 --- a/mixgtk/mixgtk.glade +++ b/mixgtk/mixgtk.glade @@ -18,6 +18,8 @@ False GDK_WINDOW_TYPE_HINT_NORMAL GDK_GRAVITY_NORTH_WEST + True + False @@ -29,6 +31,8 @@ True + GTK_PACK_DIRECTION_LTR + GTK_PACK_DIRECTION_LTR @@ -911,7 +915,7 @@ 0 True - * + * False @@ -963,6 +967,8 @@ False GDK_WINDOW_TYPE_HINT_DIALOG GDK_GRAVITY_NORTH_WEST + True + False True @@ -1047,7 +1053,7 @@ 0 0 True - * + * False 28 @@ -1070,7 +1076,7 @@ 2 0 True - * + * False 3 @@ -1093,7 +1099,7 @@ 2 0 True - * + * False 3 @@ -1116,7 +1122,7 @@ 2 0 True - * + * False 3 @@ -1139,7 +1145,7 @@ 2 0 True - * + * False 3 @@ -1162,7 +1168,7 @@ 2 0 True - * + * False 3 @@ -1185,7 +1191,7 @@ 1 + True - * + * False 2 @@ -1211,6 +1217,10 @@ 0.5 0 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 14 @@ -1233,6 +1243,10 @@ 0.5 0 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 15 @@ -1255,6 +1269,10 @@ 0.5 0 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 112 @@ -1286,6 +1304,8 @@ False GDK_WINDOW_TYPE_HINT_NORMAL GDK_GRAVITY_NORTH_WEST + True + False @@ -1313,6 +1333,10 @@ 0.5 0 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 56 @@ -1335,6 +1359,10 @@ 0.5 0 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 96 @@ -1361,6 +1389,10 @@ bug-mdk@gnu.org 0.5 0 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 24 @@ -1383,6 +1415,8 @@ bug-mdk@gnu.org False GDK_WINDOW_TYPE_HINT_DIALOG GDK_GRAVITY_NORTH_WEST + True + False True @@ -1454,6 +1488,10 @@ bug-mdk@gnu.org 0.5 0 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 0 @@ -1472,7 +1510,7 @@ bug-mdk@gnu.org 0 True - * + * True @@ -1505,6 +1543,8 @@ bug-mdk@gnu.org False GDK_WINDOW_TYPE_HINT_DIALOG GDK_GRAVITY_NORTH_WEST + True + False @@ -1567,6 +1607,8 @@ bug-mdk@gnu.org False GDK_WINDOW_TYPE_HINT_DIALOG GDK_GRAVITY_NORTH_WEST + True + False True @@ -1668,6 +1710,10 @@ bug-mdk@gnu.org 0.5 0 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 24 @@ -1690,6 +1736,10 @@ bug-mdk@gnu.org 0.5 0 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 24 @@ -1718,6 +1768,9 @@ disk4 disk5 disk6 disk7 + False + True + True @@ -1793,6 +1846,8 @@ disk7 False GDK_WINDOW_TYPE_HINT_DIALOG GDK_GRAVITY_NORTH_WEST + True + False True @@ -1864,7 +1919,7 @@ disk7 0 xterm -e vi %s True - * + * False @@ -1888,6 +1943,10 @@ disk7 0.5 0 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 8 @@ -1917,7 +1976,7 @@ disk7 0 mixasm %s True - * + * False @@ -1941,6 +2000,10 @@ disk7 0.5 0 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 8 @@ -1979,6 +2042,8 @@ disk7 False GDK_WINDOW_TYPE_HINT_DIALOG GDK_GRAVITY_NORTH_WEST + True + False True @@ -2052,6 +2117,10 @@ disk7 0.5 0 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 0 @@ -2090,6 +2159,9 @@ disk7 True True True + False + False + False @@ -2117,6 +2189,8 @@ disk7 False GDK_WINDOW_TYPE_HINT_NORMAL GDK_GRAVITY_NORTH_WEST + True + False @@ -2329,6 +2403,8 @@ disk7 False GDK_WINDOW_TYPE_HINT_NORMAL GDK_GRAVITY_NORTH_WEST + True + False @@ -2493,6 +2569,8 @@ disk7 False GDK_WINDOW_TYPE_HINT_DIALOG GDK_GRAVITY_NORTH_WEST + True + False True @@ -2565,6 +2643,10 @@ disk7 0.5 0 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 0 @@ -2582,7 +2664,7 @@ disk7 0 True - * + * False @@ -2633,6 +2715,8 @@ disk7 False GDK_WINDOW_TYPE_HINT_NORMAL GDK_GRAVITY_NORTH_WEST + True + False @@ -2765,6 +2849,10 @@ disk7 0.5 0 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 0 @@ -2791,6 +2879,10 @@ disk7 0.5 0 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 2 @@ -2817,6 +2909,10 @@ disk7 0.5 0 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 2 @@ -2840,7 +2936,7 @@ disk7 0 True - * + * False 19 @@ -2856,7 +2952,7 @@ disk7 - + 0 0 True @@ -2866,7 +2962,7 @@ disk7 0 True - * + * False 9 @@ -2882,7 +2978,7 @@ disk7 - + 0 0 True @@ -2892,7 +2988,7 @@ disk7 0 True - * + * False 9 @@ -2922,6 +3018,10 @@ disk7 0.5 0 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 0 @@ -2948,6 +3048,10 @@ disk7 0.5 0 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 2 @@ -2974,6 +3078,10 @@ disk7 0.5 0 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 4 @@ -3000,6 +3108,10 @@ disk7 0.5 0 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 4 @@ -3026,6 +3138,10 @@ disk7 0.5 0 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 4 @@ -3052,6 +3168,10 @@ disk7 0.5 0 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 0 @@ -3074,7 +3194,7 @@ disk7 0 True - * + * False 19 @@ -3100,7 +3220,7 @@ disk7 0 True - * + * False 9 @@ -3126,7 +3246,7 @@ disk7 0 True - * + * False 9 @@ -3152,7 +3272,7 @@ disk7 0 True - * + * False 9 @@ -3178,7 +3298,7 @@ disk7 0 True - * + * False 9 @@ -3210,7 +3330,7 @@ disk7 0 True - * + * False 9 @@ -3251,6 +3371,10 @@ disk7 0.5 2 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 label_item @@ -3406,6 +3530,10 @@ disk7 0.5 2 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 label_item @@ -3449,7 +3577,7 @@ disk7 4 0 True - * + * False 6 @@ -3503,6 +3631,10 @@ disk7 0.5 2 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 label_item @@ -3554,6 +3686,10 @@ disk7 0.5 0 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 0 @@ -3577,6 +3713,10 @@ disk7 0.5 5 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 0 @@ -3600,6 +3740,10 @@ disk7 0.5 0 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 3 @@ -3623,6 +3767,10 @@ disk7 0.5 5 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 0 @@ -3646,6 +3794,10 @@ disk7 0.5 0 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 2 @@ -3669,6 +3821,10 @@ disk7 0.5 5 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 0 @@ -3692,6 +3848,10 @@ disk7 0.5 2 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 label_item @@ -3739,6 +3899,9 @@ disk7 True False True + False + False + False @@ -3757,6 +3920,10 @@ disk7 0.5 2 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 label_item @@ -3786,6 +3953,10 @@ disk7 0.5 2 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 label_item @@ -3815,6 +3986,8 @@ disk7 False GDK_WINDOW_TYPE_HINT_DIALOG GDK_GRAVITY_NORTH_WEST + True + False True @@ -3872,6 +4045,10 @@ disk7 0.5 0 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 0 @@ -3889,7 +4066,7 @@ disk7 70 True - * + * True 70 diff --git a/mixgtk/mixgtk_device.c b/mixgtk/mixgtk_device.c index 203933c..a27c5a0 100644 --- a/mixgtk/mixgtk_device.c +++ b/mixgtk/mixgtk_device.c @@ -1,9 +1,9 @@ /* -*-c-*- ---------------- mixgtk_device.c : * actual types for mixgtk devices * ------------------------------------------------------------------ - * $Id: mixgtk_device.c,v 1.26 2005/09/20 19:43:14 jao Exp $ + * $Id: mixgtk_device.c,v 1.27 2005/09/29 21:12:07 jao Exp $ * ------------------------------------------------------------------ - * Copyright (C) 2001, 2002, 2004 Free Software Foundation, Inc. + * Copyright (C) 2001, 2002, 2004, 2005 Free Software Foundation, Inc. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -88,7 +88,7 @@ struct mixgtk_bin_device_t static void write_char_ (struct mixgtk_device_t *dev, const mix_word_t *block) { - enum {MAX_BLOCK = 16, BUFF_SIZE = MAX_BLOCK * 5 + 2}; + enum {MAX_BLOCK = 24, BUFF_SIZE = MAX_BLOCK * 5 + 2}; static gchar BUFFER[BUFF_SIZE]; guint k, j; diff --git a/mixgtk/mixgtk_mixvm.c b/mixgtk/mixgtk_mixvm.c index cc74e27..6b4d6b9 100644 --- a/mixgtk/mixgtk_mixvm.c +++ b/mixgtk/mixgtk_mixvm.c @@ -1,9 +1,9 @@ /* -*-c-*- -------------- mixgtk_mixvm.c : * Implementation of the functions declared in mixgtk_mixvm.h * ------------------------------------------------------------------ - * $Id: mixgtk_mixvm.c,v 1.16 2005/09/20 19:43:14 jao Exp $ + * $Id: mixgtk_mixvm.c,v 1.17 2006/03/15 23:31:34 jao Exp $ * ------------------------------------------------------------------ - * Copyright (C) 2001, 2002, 2004 Free Software Foundation, Inc. + * Copyright (C) 2001, 2002, 2004, 2006 Free Software Foundation, Inc. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -440,7 +440,7 @@ cont_clicked_ (GtkWidget *w, GdkEvent *event, gpointer data) enum {SIZE = 30}; static gchar BUFFER[SIZE]; - if (event->type == GDK_BUTTON_PRESS) + if (event && event->type == GDK_BUTTON_PRESS) { GtkTreeIter iter; GtkTreeModel *model; @@ -519,8 +519,8 @@ init_mem_ (void) gtk_tree_view_append_column (memory_, col); - g_signal_connect (G_OBJECT (memory_), "event-after", - G_CALLBACK (cont_clicked_), NULL); + g_signal_connect_after (G_OBJECT (memory_), "event-after", + G_CALLBACK (cont_clicked_), NULL); mixgtk_fontsel_set_font (MIX_FONT_MIXVM, GTK_WIDGET (memory_)); -- cgit v1.2.3