summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorJose Antonio Ortega Ruiz <jao@gnu.org>2006-03-20 23:01:19 +0000
committerJose Antonio Ortega Ruiz <jao@gnu.org>2006-03-20 23:01:19 +0000
commitde560a216043fa3857be68f955244fefd1b62ab9 (patch)
treeb13a040c9715b9c8c4dc503ab62ce37cb3194758
parent3b4716c7497157d682280810a778d90b77e4104c (diff)
downloadmdk-de560a216043fa3857be68f955244fefd1b62ab9.tar.gz
mdk-de560a216043fa3857be68f955244fefd1b62ab9.tar.bz2
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
Diffstat
-rw-r--r--ChangeLog.223
-rw-r--r--NEWS18
-rw-r--r--configure.in12
-rw-r--r--misc/mixal-mode.el21
-rw-r--r--mixgtk/mixgtk.glade227
-rw-r--r--mixgtk/mixgtk_device.c6
-rw-r--r--mixgtk/mixgtk_mixvm.c10
-rw-r--r--mixlib/mix.c32
8 files changed, 282 insertions, 67 deletions
diff --git a/ChangeLog.2 b/ChangeLog.2
index 2991320..fb8cbb0 100644
--- a/ChangeLog.2
+++ b/ChangeLog.2
@@ -1,3 +1,26 @@
+2006-03-16 Jose Antonio Ortega Ruiz <jao@gnu.org>
+
+ * 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).
+
+2006-03-14 Jose Antonio Ortega Ruiz <jao@gnu.org>
+
+ * configure.in: obsolete C flags for Darwin deleted.
+
+2005-10-08 Jose Antonio Ortega Ruiz <jao@gnu.org>
+
+ * misc/mixal-mode.el (Module): sync with Emacs CVS (Pieter).
+
+2005-09-29 Jose Antonio Ortega Ruiz <jao@gnu.org>
+
+ * mixlib/mix.c: copyright year in console message updated.
+
+ * mixgtk/mixgtk_device.c (write_char_): buffer size was
+ insufficient.
+
2005-09-20 Jose Antonio Ortega Ruiz <jao@gnu.org>
* mdk: version 1.2.1 tagged (v1r2_1).
diff --git a/NEWS b/NEWS
index 5aee4ec..cbd3cc3 100644
--- a/NEWS
+++ b/NEWS
@@ -1,11 +1,23 @@
GNU MDK -- History of visible changes.
-Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, Free Software Foundation, Inc.
+Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, Free Software Foundation, Inc.
See the end for copying conditions.
Please send mdk bug reports to bug-mdk@gnu.org.
---------------------------------------------------------------------------
+* Version 1.2.2
+
+** Bug fixes
+
+ - I1 and I2 in mixvm swapped to their correct position (closes #15746).
+ - Obsolete CFLAGS for Darwin removed.
+ - mixal-mode.el syncronised with Emacs CVS.
+ - Segmentation fault when clicking Memory title (closes #15910).
+ - Writing to char devices caused an out-of-bounds array access
+ (thanks to Aleix Conchillo).
+
+---------------------------------------------------------------------------
* Version 1.2.1 (20/09/05)
** MIXAL compliance improvements (Sergey Poznyakoff):
@@ -433,7 +445,7 @@ Please send mdk bug reports to bug-mdk@gnu.org.
---------------------------------------------------------------------------
Copying information:
-Copyright (C) 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
+Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
Permission is granted to anyone to make or distribute verbatim copies
of this document as received, in any medium, provided that the
@@ -447,4 +459,4 @@ Copyright (C) 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
---
-$Id: NEWS,v 1.55 2005/09/20 20:18:58 jao Exp $
+$Id: NEWS,v 1.56 2006/03/16 00:59:44 jao Exp $
diff --git a/configure.in b/configure.in
index 4e38888..a564100 100644
--- a/configure.in
+++ b/configure.in
@@ -1,6 +1,6 @@
-# Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+# Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
#
-# $Id: configure.in,v 1.38 2005/09/20 20:18:58 jao Exp $
+# $Id: configure.in,v 1.40 2006/03/12 23:23:38 jao Exp $
#
# This file is free software; as a special exception the author gives
# unlimited permission to copy and/or distribute it, with or without
@@ -113,7 +113,7 @@ dnl Check for gtk+
if test x$gui = xtrue; then
PKG_CHECK_MODULES(GTK, gtk+-2.0 >= 2.4.0 libglade-2.0 >= 2.0.0 pango >= 1.4,
[LIBS="$LIBS $GTK_LIBS" CFLAGS="$CFLAGS $GTK_CFLAGS"],
- [AC_MSG_WARN(Cannot find GTK+: the GUI shall not be built)
+ [AC_MSG_WARN(Cannot find GTK+/Glade/Pango: the GUI shall not be built)
gui=false])
fi
@@ -126,11 +126,7 @@ AC_REPLACE_FUNCS(getopt_long)
AM_CONDITIONAL(MAKE_GUI, test x$gui = xtrue)
-dnl AC_CANONICAL_HOST
-case "${host_os}" in
-darwin*) CFLAGS="$CFLAGS -Wall -traditional-cpp";;
-*) CFLAGS="$CFLAGS -Wall";;
-esac
+CFLAGS="$CFLAGS -Wall"
AC_SUBST(CFLAGS)
diff --git a/misc/mixal-mode.el b/misc/mixal-mode.el
index 638947a..180cf83 100644
--- a/misc/mixal-mode.el
+++ b/misc/mixal-mode.el
@@ -1,6 +1,6 @@
;;; mixal-mode.el --- Major mode for the mix asm language.
-;; Copyright (C) 2003, 2005 Free Software Foundation
+;; Copyright (C) 2003, 2004, 2005 Free Software Foundation
;; This program is free software; you can redistribute it and/or
;; modify it under the terms of the GNU General Public License as
@@ -17,8 +17,8 @@
;; Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
;; MA 02110-1301 USA
-;; Author: Pieter E.J. Pareit <pieter.pareit@skynet.be>
-;; Maintainer: Pieter E.J. Pareit <pieter.pareit@skynet.be>
+;; Author: Pieter E.J. Pareit <pieter.pareit@gmail.com>
+;; Maintainer: Pieter E.J. Pareit <pieter.pareit@gmail.com>
;; Created: 09 Nov 2002
;; Version: 0.1
;; Keywords: Knuth mix mixal asm mixvm "The Art Of Computer Programming"
@@ -45,6 +45,11 @@
;; Have fun.
;;; History:
+;; Version 0.3:
+;; 08/10/05: sync mdk and emacs cvs
+;; from emacs: compile-command and require-final-newline
+;; from mdk: see version 0.2
+;; correct my email address
;; Version 0.2:
;; 06/04/05: mixasm no longer needs -g option
;; fontlocking of comments works in all? cases now
@@ -58,6 +63,7 @@
;; 09/11/02: started mixal-mode.
;;; Code:
+(defvar compile-command)
;;; Key map
(defvar mixal-mode-map
@@ -146,11 +152,11 @@ value.")
(defvar mixal-operation-codes-alist '()
"Alist that contains all the possible operation codes for mix.
Each elt has the form (OP-CODE GROUP FULL-NAME C-BYTE F-BYTE DESCRIPTION EXECUTION-TIME)
-Where OP-CODE is the text of the opcode as an symbol, FULL NAME is the human readable name
+Where OP-CODE is the text of the opcode as an symbol, FULL-NAME is the human readable name
as a string, C-BYTE is the operation code telling what operation is to be performed, F-BYTE holds
an modification of the operation code which can be a symbol or a number, DESCRIPTION contains
an string with a description about the operation code and EXECUTION-TIME holds info
-about the time it takes, number or string")
+about the time it takes, number or string.")
; (makunbound 'mixal-operation-codes-alist)
(defun mixal-add-operation-code (op-code group full-name C-byte F-byte description execution-time)
@@ -1311,8 +1317,9 @@ The converted character representation is stored in rAX."
(set (make-local-variable 'compile-command) (concat "mixasm "
buffer-file-name))
;; mixasm will do strange when there is no final newline,
- ;; let emacs ensure that it is always there
- (set (make-local-variable 'require-final-newline) t))
+ ;; so let Emacs ensure that it is always there
+ (set (make-local-variable 'require-final-newline)
+ mode-require-final-newline))
;;;###autoload
(add-to-list 'auto-mode-alist '("\\.mixal\\'" . mixal-mode))
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 @@
<property name="skip_pager_hint">False</property>
<property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property>
<property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
+ <property name="focus_on_map">True</property>
+ <property name="urgency_hint">False</property>
<child>
<widget class="GtkVBox" id="main_vbox">
@@ -29,6 +31,8 @@
<child>
<widget class="GtkMenuBar" id="mainmenubar">
<property name="visible">True</property>
+ <property name="pack_direction">GTK_PACK_DIRECTION_LTR</property>
+ <property name="child_pack_direction">GTK_PACK_DIRECTION_LTR</property>
<child>
<widget class="GtkMenuItem" id="file">
@@ -911,7 +915,7 @@
<property name="max_length">0</property>
<property name="text" translatable="yes"></property>
<property name="has_frame">True</property>
- <property name="invisible_char" translatable="yes">*</property>
+ <property name="invisible_char">*</property>
<property name="activates_default">False</property>
<signal name="key_press_event" handler="on_command_prompt_key_press_event" after="yes"/>
<signal name="activate" handler="on_command_prompt_activate" last_modification_time="Sat, 19 Jun 2004 00:00:22 GMT"/>
@@ -963,6 +967,8 @@
<property name="skip_pager_hint">False</property>
<property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
<property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
+ <property name="focus_on_map">True</property>
+ <property name="urgency_hint">False</property>
<property name="has_separator">True</property>
<signal name="destroy" handler="gtk_widget_hide"/>
<signal name="destroy_event" handler="gtk_widget_hide"/>
@@ -1047,7 +1053,7 @@
<property name="max_length">0</property>
<property name="text" translatable="yes">0</property>
<property name="has_frame">True</property>
- <property name="invisible_char" translatable="yes">*</property>
+ <property name="invisible_char">*</property>
<property name="activates_default">False</property>
<property name="width_chars">28</property>
<signal name="changed" handler="on_word_dec_changed" after="yes" last_modification_time="Sun, 20 Jun 2004 23:47:46 GMT"/>
@@ -1070,7 +1076,7 @@
<property name="max_length">2</property>
<property name="text" translatable="yes">0</property>
<property name="has_frame">True</property>
- <property name="invisible_char" translatable="yes">*</property>
+ <property name="invisible_char">*</property>
<property name="activates_default">False</property>
<property name="width_chars">3</property>
<signal name="changed" handler="on_word_byte_changed" last_modification_time="Sun, 20 Jun 2004 23:20:10 GMT"/>
@@ -1093,7 +1099,7 @@
<property name="max_length">2</property>
<property name="text" translatable="yes">0</property>
<property name="has_frame">True</property>
- <property name="invisible_char" translatable="yes">*</property>
+ <property name="invisible_char">*</property>
<property name="activates_default">False</property>
<property name="width_chars">3</property>
<signal name="changed" handler="on_word_byte_changed" last_modification_time="Sun, 20 Jun 2004 23:20:28 GMT"/>
@@ -1116,7 +1122,7 @@
<property name="max_length">2</property>
<property name="text" translatable="yes">0</property>
<property name="has_frame">True</property>
- <property name="invisible_char" translatable="yes">*</property>
+ <property name="invisible_char">*</property>
<property name="activates_default">False</property>
<property name="width_chars">3</property>
<signal name="changed" handler="on_word_byte_changed" last_modification_time="Sun, 20 Jun 2004 23:20:57 GMT"/>
@@ -1139,7 +1145,7 @@
<property name="max_length">2</property>
<property name="text" translatable="yes">0</property>
<property name="has_frame">True</property>
- <property name="invisible_char" translatable="yes">*</property>
+ <property name="invisible_char">*</property>
<property name="activates_default">False</property>
<property name="width_chars">3</property>
<signal name="changed" handler="on_word_byte_changed" last_modification_time="Sun, 20 Jun 2004 23:21:18 GMT"/>
@@ -1162,7 +1168,7 @@
<property name="max_length">2</property>
<property name="text" translatable="yes">0</property>
<property name="has_frame">True</property>
- <property name="invisible_char" translatable="yes">*</property>
+ <property name="invisible_char">*</property>
<property name="activates_default">False</property>
<property name="width_chars">3</property>
<signal name="changed" handler="on_word_byte_changed" last_modification_time="Sun, 20 Jun 2004 23:19:50 GMT"/>
@@ -1185,7 +1191,7 @@
<property name="max_length">1</property>
<property name="text" translatable="yes">+</property>
<property name="has_frame">True</property>
- <property name="invisible_char" translatable="yes">*</property>
+ <property name="invisible_char">*</property>
<property name="activates_default">False</property>
<property name="width_chars">2</property>
<signal name="changed" handler="on_word_sign_changed" last_modification_time="Sun, 20 Jun 2004 23:19:23 GMT"/>
@@ -1211,6 +1217,10 @@
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
<property name="x">14</property>
@@ -1233,6 +1243,10 @@
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
<property name="x">15</property>
@@ -1255,6 +1269,10 @@
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
<property name="x">112</property>
@@ -1286,6 +1304,8 @@
<property name="skip_pager_hint">False</property>
<property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property>
<property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
+ <property name="focus_on_map">True</property>
+ <property name="urgency_hint">False</property>
<signal name="delete_event" handler="gtk_widget_hide"/>
<signal name="destroy_event" handler="gtk_widget_hide"/>
<signal name="destroy" handler="gtk_widget_hide"/>
@@ -1313,6 +1333,10 @@
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
<property name="x">56</property>
@@ -1335,6 +1359,10 @@
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
<property name="x">96</property>
@@ -1361,6 +1389,10 @@ bug-mdk@gnu.org</property>
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
<property name="x">24</property>
@@ -1383,6 +1415,8 @@ bug-mdk@gnu.org</property>
<property name="skip_pager_hint">False</property>
<property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
<property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
+ <property name="focus_on_map">True</property>
+ <property name="urgency_hint">False</property>
<property name="has_separator">True</property>
<signal name="destroy_event" handler="gtk_widget_hide"/>
<signal name="delete_event" handler="gtk_widget_hide"/>
@@ -1454,6 +1488,10 @@ bug-mdk@gnu.org</property>
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
<property name="padding">0</property>
@@ -1472,7 +1510,7 @@ bug-mdk@gnu.org</property>
<property name="max_length">0</property>
<property name="text" translatable="yes"></property>
<property name="has_frame">True</property>
- <property name="invisible_char" translatable="yes">*</property>
+ <property name="invisible_char">*</property>
<property name="activates_default">True</property>
</widget>
<packing>
@@ -1505,6 +1543,8 @@ bug-mdk@gnu.org</property>
<property name="skip_pager_hint">False</property>
<property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
<property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
+ <property name="focus_on_map">True</property>
+ <property name="urgency_hint">False</property>
<signal name="delete_event" handler="gtk_widget_hide"/>
<signal name="destroy_event" handler="gtk_widget_hide"/>
<signal name="destroy" handler="gtk_widget_hide"/>
@@ -1567,6 +1607,8 @@ bug-mdk@gnu.org</property>
<property name="skip_pager_hint">False</property>
<property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
<property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
+ <property name="focus_on_map">True</property>
+ <property name="urgency_hint">False</property>
<property name="has_separator">True</property>
<signal name="delete_event" handler="gtk_widget_hide"/>
<signal name="destroy_event" handler="gtk_widget_hide"/>
@@ -1668,6 +1710,10 @@ bug-mdk@gnu.org</property>
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
<property name="x">24</property>
@@ -1690,6 +1736,10 @@ bug-mdk@gnu.org</property>
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
<property name="x">24</property>
@@ -1718,6 +1768,9 @@ disk4
disk5
disk6
disk7</property>
+ <property name="add_tearoffs">False</property>
+ <property name="has_frame">True</property>
+ <property name="focus_on_click">True</property>
<signal name="changed" handler="on_dev_combo_changed" last_modification_time="Wed, 23 Jun 2004 11:34:16 GMT"/>
</widget>
<packing>
@@ -1793,6 +1846,8 @@ disk7</property>
<property name="skip_pager_hint">False</property>
<property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
<property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
+ <property name="focus_on_map">True</property>
+ <property name="urgency_hint">False</property>
<property name="has_separator">True</property>
<signal name="delete_event" handler="gtk_widget_hide"/>
<signal name="destroy_event" handler="gtk_widget_hide"/>
@@ -1864,7 +1919,7 @@ disk7</property>
<property name="max_length">0</property>
<property name="text" translatable="yes">xterm -e vi %s</property>
<property name="has_frame">True</property>
- <property name="invisible_char" translatable="yes">*</property>
+ <property name="invisible_char">*</property>
<property name="activates_default">False</property>
</widget>
<packing>
@@ -1888,6 +1943,10 @@ disk7</property>
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
<property name="x">8</property>
@@ -1917,7 +1976,7 @@ disk7</property>
<property name="max_length">0</property>
<property name="text" translatable="yes">mixasm %s</property>
<property name="has_frame">True</property>
- <property name="invisible_char" translatable="yes">*</property>
+ <property name="invisible_char">*</property>
<property name="activates_default">False</property>
</widget>
<packing>
@@ -1941,6 +2000,10 @@ disk7</property>
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
<property name="x">8</property>
@@ -1979,6 +2042,8 @@ disk7</property>
<property name="skip_pager_hint">False</property>
<property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
<property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
+ <property name="focus_on_map">True</property>
+ <property name="urgency_hint">False</property>
<property name="has_separator">True</property>
<signal name="delete_event" handler="gtk_widget_hide"/>
<signal name="destroy_event" handler="gtk_widget_hide"/>
@@ -2052,6 +2117,10 @@ disk7</property>
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
<property name="padding">0</property>
@@ -2090,6 +2159,9 @@ disk7</property>
<property name="rules_hint">True</property>
<property name="reorderable">True</property>
<property name="enable_search">True</property>
+ <property name="fixed_height_mode">False</property>
+ <property name="hover_selection">False</property>
+ <property name="hover_expand">False</property>
</widget>
</child>
</widget>
@@ -2117,6 +2189,8 @@ disk7</property>
<property name="skip_pager_hint">False</property>
<property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property>
<property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
+ <property name="focus_on_map">True</property>
+ <property name="urgency_hint">False</property>
<child>
<widget class="GtkVBox" id="vbox5">
@@ -2329,6 +2403,8 @@ disk7</property>
<property name="skip_pager_hint">False</property>
<property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property>
<property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
+ <property name="focus_on_map">True</property>
+ <property name="urgency_hint">False</property>
<signal name="delete_event" handler="on_window_hide"/>
<signal name="destroy_event" handler="on_window_hide"/>
<signal name="destroy" handler="on_window_hide"/>
@@ -2493,6 +2569,8 @@ disk7</property>
<property name="skip_pager_hint">False</property>
<property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
<property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
+ <property name="focus_on_map">True</property>
+ <property name="urgency_hint">False</property>
<property name="has_separator">True</property>
<signal name="delete_event" handler="gtk_widget_hide"/>
<signal name="destroy_event" handler="gtk_widget_hide"/>
@@ -2565,6 +2643,10 @@ disk7</property>
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
<property name="padding">0</property>
@@ -2582,7 +2664,7 @@ disk7</property>
<property name="max_length">0</property>
<property name="text" translatable="yes"></property>
<property name="has_frame">True</property>
- <property name="invisible_char" translatable="yes">*</property>
+ <property name="invisible_char">*</property>
<property name="activates_default">False</property>
</widget>
<packing>
@@ -2633,6 +2715,8 @@ disk7</property>
<property name="skip_pager_hint">False</property>
<property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property>
<property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
+ <property name="focus_on_map">True</property>
+ <property name="urgency_hint">False</property>
<child>
<widget class="GtkVBox" id="vbox8">
@@ -2765,6 +2849,10 @@ disk7</property>
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
<property name="left_attach">0</property>
@@ -2791,6 +2879,10 @@ disk7</property>
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
<property name="left_attach">2</property>
@@ -2817,6 +2909,10 @@ disk7</property>
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
<property name="left_attach">2</property>
@@ -2840,7 +2936,7 @@ disk7</property>
<property name="max_length">0</property>
<property name="text" translatable="yes"></property>
<property name="has_frame">True</property>
- <property name="invisible_char" translatable="yes">*</property>
+ <property name="invisible_char">*</property>
<property name="activates_default">False</property>
<property name="width_chars">19</property>
<signal name="button_press_event" handler="on_register_click"/>
@@ -2856,7 +2952,7 @@ disk7</property>
</child>
<child>
- <widget class="GtkEntry" id="rI1_entry">
+ <widget class="GtkEntry" id="rI2_entry">
<property name="width_request">0</property>
<property name="height_request">0</property>
<property name="visible">True</property>
@@ -2866,7 +2962,7 @@ disk7</property>
<property name="max_length">0</property>
<property name="text" translatable="yes"></property>
<property name="has_frame">True</property>
- <property name="invisible_char" translatable="yes">*</property>
+ <property name="invisible_char">*</property>
<property name="activates_default">False</property>
<property name="width_chars">9</property>
<signal name="button_press_event" handler="on_register_click"/>
@@ -2882,7 +2978,7 @@ disk7</property>
</child>
<child>
- <widget class="GtkEntry" id="rI2_entry">
+ <widget class="GtkEntry" id="rI1_entry">
<property name="width_request">0</property>
<property name="height_request">0</property>
<property name="visible">True</property>
@@ -2892,7 +2988,7 @@ disk7</property>
<property name="max_length">0</property>
<property name="text" translatable="yes"></property>
<property name="has_frame">True</property>
- <property name="invisible_char" translatable="yes">*</property>
+ <property name="invisible_char">*</property>
<property name="activates_default">False</property>
<property name="width_chars">9</property>
<signal name="button_press_event" handler="on_register_click"/>
@@ -2922,6 +3018,10 @@ disk7</property>
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
<property name="left_attach">0</property>
@@ -2948,6 +3048,10 @@ disk7</property>
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
<property name="left_attach">2</property>
@@ -2974,6 +3078,10 @@ disk7</property>
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
<property name="left_attach">4</property>
@@ -3000,6 +3108,10 @@ disk7</property>
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
<property name="left_attach">4</property>
@@ -3026,6 +3138,10 @@ disk7</property>
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
<property name="left_attach">4</property>
@@ -3052,6 +3168,10 @@ disk7</property>
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
<property name="left_attach">0</property>
@@ -3074,7 +3194,7 @@ disk7</property>
<property name="max_length">0</property>
<property name="text" translatable="yes"></property>
<property name="has_frame">True</property>
- <property name="invisible_char" translatable="yes">*</property>
+ <property name="invisible_char">*</property>
<property name="activates_default">False</property>
<property name="width_chars">19</property>
<signal name="button_press_event" handler="on_register_click"/>
@@ -3100,7 +3220,7 @@ disk7</property>
<property name="max_length">0</property>
<property name="text" translatable="yes"></property>
<property name="has_frame">True</property>
- <property name="invisible_char" translatable="yes">*</property>
+ <property name="invisible_char">*</property>
<property name="activates_default">False</property>
<property name="width_chars">9</property>
<signal name="button_press_event" handler="on_register_click"/>
@@ -3126,7 +3246,7 @@ disk7</property>
<property name="max_length">0</property>
<property name="text" translatable="yes"></property>
<property name="has_frame">True</property>
- <property name="invisible_char" translatable="yes">*</property>
+ <property name="invisible_char">*</property>
<property name="activates_default">False</property>
<property name="width_chars">9</property>
<signal name="button_press_event" handler="on_register_click"/>
@@ -3152,7 +3272,7 @@ disk7</property>
<property name="max_length">0</property>
<property name="text" translatable="yes"></property>
<property name="has_frame">True</property>
- <property name="invisible_char" translatable="yes">*</property>
+ <property name="invisible_char">*</property>
<property name="activates_default">False</property>
<property name="width_chars">9</property>
<signal name="button_press_event" handler="on_register_click"/>
@@ -3178,7 +3298,7 @@ disk7</property>
<property name="max_length">0</property>
<property name="text" translatable="yes"></property>
<property name="has_frame">True</property>
- <property name="invisible_char" translatable="yes">*</property>
+ <property name="invisible_char">*</property>
<property name="activates_default">False</property>
<property name="width_chars">9</property>
<signal name="button_press_event" handler="on_register_click"/>
@@ -3210,7 +3330,7 @@ disk7</property>
<property name="max_length">0</property>
<property name="text" translatable="yes"></property>
<property name="has_frame">True</property>
- <property name="invisible_char" translatable="yes">*</property>
+ <property name="invisible_char">*</property>
<property name="activates_default">False</property>
<property name="width_chars">9</property>
<signal name="button_press_event" handler="on_register_click"/>
@@ -3251,6 +3371,10 @@ disk7</property>
<property name="yalign">0.5</property>
<property name="xpad">2</property>
<property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
<property name="type">label_item</property>
@@ -3406,6 +3530,10 @@ disk7</property>
<property name="yalign">0.5</property>
<property name="xpad">2</property>
<property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
<property name="type">label_item</property>
@@ -3449,7 +3577,7 @@ disk7</property>
<property name="max_length">4</property>
<property name="text" translatable="yes">0</property>
<property name="has_frame">True</property>
- <property name="invisible_char" translatable="yes">*</property>
+ <property name="invisible_char">*</property>
<property name="activates_default">False</property>
<property name="width_chars">6</property>
</widget>
@@ -3503,6 +3631,10 @@ disk7</property>
<property name="yalign">0.5</property>
<property name="xpad">2</property>
<property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
<property name="type">label_item</property>
@@ -3554,6 +3686,10 @@ disk7</property>
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
<property name="padding">0</property>
@@ -3577,6 +3713,10 @@ disk7</property>
<property name="yalign">0.5</property>
<property name="xpad">5</property>
<property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
<property name="padding">0</property>
@@ -3600,6 +3740,10 @@ disk7</property>
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
<property name="padding">3</property>
@@ -3623,6 +3767,10 @@ disk7</property>
<property name="yalign">0.5</property>
<property name="xpad">5</property>
<property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
<property name="padding">0</property>
@@ -3646,6 +3794,10 @@ disk7</property>
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
<property name="padding">2</property>
@@ -3669,6 +3821,10 @@ disk7</property>
<property name="yalign">0.5</property>
<property name="xpad">5</property>
<property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
<property name="padding">0</property>
@@ -3692,6 +3848,10 @@ disk7</property>
<property name="yalign">0.5</property>
<property name="xpad">2</property>
<property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
<property name="type">label_item</property>
@@ -3739,6 +3899,9 @@ disk7</property>
<property name="rules_hint">True</property>
<property name="reorderable">False</property>
<property name="enable_search">True</property>
+ <property name="fixed_height_mode">False</property>
+ <property name="hover_selection">False</property>
+ <property name="hover_expand">False</property>
</widget>
</child>
</widget>
@@ -3757,6 +3920,10 @@ disk7</property>
<property name="yalign">0.5</property>
<property name="xpad">2</property>
<property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
<property name="type">label_item</property>
@@ -3786,6 +3953,10 @@ disk7</property>
<property name="yalign">0.5</property>
<property name="xpad">2</property>
<property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
<property name="type">label_item</property>
@@ -3815,6 +3986,8 @@ disk7</property>
<property name="skip_pager_hint">False</property>
<property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
<property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
+ <property name="focus_on_map">True</property>
+ <property name="urgency_hint">False</property>
<property name="has_separator">True</property>
<signal name="destroy_event" handler="gtk_widget_hide" last_modification_time="Wed, 23 Jun 2004 20:54:59 GMT"/>
<signal name="close" handler="gtk_widget_hide" last_modification_time="Wed, 23 Jun 2004 20:55:16 GMT"/>
@@ -3872,6 +4045,10 @@ disk7</property>
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
<property name="padding">0</property>
@@ -3889,7 +4066,7 @@ disk7</property>
<property name="max_length">70</property>
<property name="text" translatable="yes"></property>
<property name="has_frame">True</property>
- <property name="invisible_char" translatable="yes">*</property>
+ <property name="invisible_char">*</property>
<property name="activates_default">True</property>
<property name="width_chars">70</property>
</widget>
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_));
diff --git a/mixlib/mix.c b/mixlib/mix.c
index 3578a57..f5b2c0f 100644
--- a/mixlib/mix.c
+++ b/mixlib/mix.c
@@ -1,24 +1,24 @@
/* -*-c-*- -------------- mix.c :
* Implementation of the functions declared in mix.h
* ------------------------------------------------------------------
- * $Id: mix.c,v 1.6 2005/09/20 19:43:13 jao Exp $
+ * $Id: mix.c,v 1.8 2006/03/16 00:26:11 jao Exp $
* ------------------------------------------------------------------
- * Copyright (C) 2000, 2001, 2002 Free Software Foundation, Inc.
- *
+ * Copyright (C) 2000, 2001, 2002, 2005, 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
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
+ *
*/
#include <sys/types.h>
@@ -34,7 +34,7 @@
/* This function must be called before using the library */
-void
+void
mix_init_lib(void)
{
mix_init_types ();
@@ -44,18 +44,18 @@ mix_init_lib(void)
/* This function must be called for deallocating the lib resources
- when it is no longer in use
+ when it is no longer in use
*/
void
mix_release_lib (void)
{
/* clean the user defined code file extension (if any) */
- mix_code_file_set_defext (NULL);
+ mix_code_file_set_defext (NULL);
mix_release_ins ();
}
-const char *MIX_GPL_LICENSE =
-"Copyright (C) 2001 Free Software Foundation, Inc.\n"
+const char *MIX_GPL_LICENSE =
+"Copyright (C) 2000-2006 Free Software Foundation, Inc.\n"
"There is NO warranty. You may redistribute this software\n"
"under the terms of the GNU General Public License.\n"
"For more information about these matters, see the files named COPYING.\n";
@@ -63,7 +63,7 @@ const char *MIX_GPL_LICENSE =
void
mix_print_license (const gchar *program)
{
- fprintf (stderr, _("%s (GNU MDK %s)\n\n"),
+ fprintf (stderr, _("%s (GNU MDK %s)\n\n"),
program, VERSION);
fprintf (stderr, MIX_GPL_LICENSE);
}
@@ -73,10 +73,10 @@ gboolean
mix_stat_dir (const gchar *dirname, const gchar *alias)
{
struct stat statbuf;
-
+
g_return_val_if_fail (dirname != NULL, FALSE);
if (alias == NULL) alias = "";
-
+
if (stat (dirname, &statbuf) == -1)
{
if (errno != ENOENT || mkdir (dirname, S_IRWXU | S_IRWXG | S_IRWXO))
@@ -87,13 +87,13 @@ mix_stat_dir (const gchar *dirname, const gchar *alias)
}
stat (dirname, &statbuf);
}
-
+
if (!(statbuf.st_mode & S_IFDIR))
{
g_warning (_("Error setting %s dir: %s is not a directory"),
alias, dirname);
return FALSE;
}
-
+
return TRUE;
}
generated by cgit v1.2.3 (git 2.39.1) at 2024-04-19 12:59:37 +0000