From 635105d142dc16e25b44a230eb4bb391e440a4b7 Mon Sep 17 00:00:00 2001 From: Owen Taylor Date: Mon, 19 Feb 2001 21:31:43 +0000 Subject: [PATCH] Fix incorrect mask. (#51039, fix from Martin Maierhofer) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Mon Feb 19 14:20:36 2001 Owen Taylor * gdk/gdkrgb.c (gdk_rgb_convert_555_br): Fix incorrect mask. (#51039, fix from Martin Maierhofer) Fri Feb 16 20:09:42 2001 Owen Taylor * gtk/gtkctree.c (gtk_ctree_class_init): Add bindings for unshifted + and shifted = for non-us keyboards. Make + and - work as well as KP_Plus, KP_Minus for recursive open/close. (#2682, René Seindal) --- ChangeLog | 13 +++++++++++++ ChangeLog.pre-2-0 | 13 +++++++++++++ ChangeLog.pre-2-10 | 13 +++++++++++++ ChangeLog.pre-2-2 | 13 +++++++++++++ ChangeLog.pre-2-4 | 13 +++++++++++++ ChangeLog.pre-2-6 | 13 +++++++++++++ ChangeLog.pre-2-8 | 13 +++++++++++++ gdk/gdkrgb.c | 2 +- gtk/gtkctree.c | 21 +++++++++++++++++++++ 9 files changed, 113 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 0a33970755..7e9c3fabbc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,16 @@ +Mon Feb 19 14:20:36 2001 Owen Taylor + + * gdk/gdkrgb.c (gdk_rgb_convert_555_br): Fix incorrect + mask. (#51039, fix from Martin Maierhofer) + +Fri Feb 16 20:09:42 2001 Owen Taylor + + * gtk/gtkctree.c (gtk_ctree_class_init): Add bindings + for unshifted + and shifted = for non-us keyboards. + Make + and - work as well as + KP_Plus, KP_Minus for recursive + open/close. (#2682, René Seindal) + Fri Feb 16 18:50:59 2001 Owen Taylor * gtk/gtkmenushell.c (gtk_real_menu_shell_cancel): Unset diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index 0a33970755..7e9c3fabbc 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,16 @@ +Mon Feb 19 14:20:36 2001 Owen Taylor + + * gdk/gdkrgb.c (gdk_rgb_convert_555_br): Fix incorrect + mask. (#51039, fix from Martin Maierhofer) + +Fri Feb 16 20:09:42 2001 Owen Taylor + + * gtk/gtkctree.c (gtk_ctree_class_init): Add bindings + for unshifted + and shifted = for non-us keyboards. + Make + and - work as well as + KP_Plus, KP_Minus for recursive + open/close. (#2682, René Seindal) + Fri Feb 16 18:50:59 2001 Owen Taylor * gtk/gtkmenushell.c (gtk_real_menu_shell_cancel): Unset diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 0a33970755..7e9c3fabbc 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,16 @@ +Mon Feb 19 14:20:36 2001 Owen Taylor + + * gdk/gdkrgb.c (gdk_rgb_convert_555_br): Fix incorrect + mask. (#51039, fix from Martin Maierhofer) + +Fri Feb 16 20:09:42 2001 Owen Taylor + + * gtk/gtkctree.c (gtk_ctree_class_init): Add bindings + for unshifted + and shifted = for non-us keyboards. + Make + and - work as well as + KP_Plus, KP_Minus for recursive + open/close. (#2682, René Seindal) + Fri Feb 16 18:50:59 2001 Owen Taylor * gtk/gtkmenushell.c (gtk_real_menu_shell_cancel): Unset diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 0a33970755..7e9c3fabbc 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,16 @@ +Mon Feb 19 14:20:36 2001 Owen Taylor + + * gdk/gdkrgb.c (gdk_rgb_convert_555_br): Fix incorrect + mask. (#51039, fix from Martin Maierhofer) + +Fri Feb 16 20:09:42 2001 Owen Taylor + + * gtk/gtkctree.c (gtk_ctree_class_init): Add bindings + for unshifted + and shifted = for non-us keyboards. + Make + and - work as well as + KP_Plus, KP_Minus for recursive + open/close. (#2682, René Seindal) + Fri Feb 16 18:50:59 2001 Owen Taylor * gtk/gtkmenushell.c (gtk_real_menu_shell_cancel): Unset diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 0a33970755..7e9c3fabbc 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,16 @@ +Mon Feb 19 14:20:36 2001 Owen Taylor + + * gdk/gdkrgb.c (gdk_rgb_convert_555_br): Fix incorrect + mask. (#51039, fix from Martin Maierhofer) + +Fri Feb 16 20:09:42 2001 Owen Taylor + + * gtk/gtkctree.c (gtk_ctree_class_init): Add bindings + for unshifted + and shifted = for non-us keyboards. + Make + and - work as well as + KP_Plus, KP_Minus for recursive + open/close. (#2682, René Seindal) + Fri Feb 16 18:50:59 2001 Owen Taylor * gtk/gtkmenushell.c (gtk_real_menu_shell_cancel): Unset diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 0a33970755..7e9c3fabbc 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,16 @@ +Mon Feb 19 14:20:36 2001 Owen Taylor + + * gdk/gdkrgb.c (gdk_rgb_convert_555_br): Fix incorrect + mask. (#51039, fix from Martin Maierhofer) + +Fri Feb 16 20:09:42 2001 Owen Taylor + + * gtk/gtkctree.c (gtk_ctree_class_init): Add bindings + for unshifted + and shifted = for non-us keyboards. + Make + and - work as well as + KP_Plus, KP_Minus for recursive + open/close. (#2682, René Seindal) + Fri Feb 16 18:50:59 2001 Owen Taylor * gtk/gtkmenushell.c (gtk_real_menu_shell_cancel): Unset diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 0a33970755..7e9c3fabbc 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,16 @@ +Mon Feb 19 14:20:36 2001 Owen Taylor + + * gdk/gdkrgb.c (gdk_rgb_convert_555_br): Fix incorrect + mask. (#51039, fix from Martin Maierhofer) + +Fri Feb 16 20:09:42 2001 Owen Taylor + + * gtk/gtkctree.c (gtk_ctree_class_init): Add bindings + for unshifted + and shifted = for non-us keyboards. + Make + and - work as well as + KP_Plus, KP_Minus for recursive + open/close. (#2682, René Seindal) + Fri Feb 16 18:50:59 2001 Owen Taylor * gtk/gtkmenushell.c (gtk_real_menu_shell_cancel): Unset diff --git a/gdk/gdkrgb.c b/gdk/gdkrgb.c index 9f0f94d043..39d0530662 100644 --- a/gdk/gdkrgb.c +++ b/gdk/gdkrgb.c @@ -1774,7 +1774,7 @@ gdk_rgb_convert_555_br (GdkImage *image, */ ((unsigned short *)obuf)[x] = ((r & 0xf8) >> 1) | ((g & 0xc0) >> 6) | - ((g & 0x18) << 10) | + ((g & 0x38) << 10) | ((b & 0xf8) << 5); } bptr += rowstride; diff --git a/gtk/gtkctree.c b/gtk/gtkctree.c index 37483feacf..783015443c 100644 --- a/gtk/gtkctree.c +++ b/gtk/gtkctree.c @@ -473,6 +473,18 @@ gtk_ctree_class_init (GtkCTreeClass *klass) '+', GDK_SHIFT_MASK, "change_focus_row_expansion", 1, GTK_TYPE_ENUM, GTK_CTREE_EXPANSION_EXPAND); + gtk_binding_entry_add_signal (binding_set, + '+', 0, + "change_focus_row_expansion", 1, + GTK_TYPE_ENUM, GTK_CTREE_EXPANSION_EXPAND); + gtk_binding_entry_add_signal (binding_set, + '+', GDK_CONTROL_MASK | GDK_SHIFT_MASK, + "change_focus_row_expansion", 1, + GTK_TYPE_ENUM, GTK_CTREE_EXPANSION_EXPAND_RECURSIVE); + gtk_binding_entry_add_signal (binding_set, + '+', GDK_CONTROL_MASK, + "change_focus_row_expansion", 1, + GTK_TYPE_ENUM, GTK_CTREE_EXPANSION_EXPAND_RECURSIVE); gtk_binding_entry_add_signal (binding_set, GDK_KP_Add, 0, "change_focus_row_expansion", 1, @@ -486,6 +498,11 @@ gtk_ctree_class_init (GtkCTreeClass *klass) '-', 0, "change_focus_row_expansion", 1, GTK_TYPE_ENUM, GTK_CTREE_EXPANSION_COLLAPSE); + gtk_binding_entry_add_signal (binding_set, + '-', GDK_CONTROL_MASK, + "change_focus_row_expansion", 1, + GTK_TYPE_ENUM, + GTK_CTREE_EXPANSION_COLLAPSE_RECURSIVE); gtk_binding_entry_add_signal (binding_set, GDK_KP_Subtract, 0, "change_focus_row_expansion", 1, @@ -499,6 +516,10 @@ gtk_ctree_class_init (GtkCTreeClass *klass) '=', 0, "change_focus_row_expansion", 1, GTK_TYPE_ENUM, GTK_CTREE_EXPANSION_TOGGLE); + gtk_binding_entry_add_signal (binding_set, + '=', GDK_SHIFT_MASK, + "change_focus_row_expansion", 1, + GTK_TYPE_ENUM, GTK_CTREE_EXPANSION_TOGGLE); gtk_binding_entry_add_signal (binding_set, GDK_KP_Multiply, 0, "change_focus_row_expansion", 1,