Tor Lillqvist [Thu, 10 Jan 2002 00:53:39 +0000 (00:53 +0000)]
Apply the same fixes and improvements as to the gtk-1-3-win32-production
2002-01-10 Tor Lillqvist <tml@iki.fi>
Apply the same fixes and improvements as to the
gtk-1-3-win32-production branch: Bug fixes and cleanup of
selection and DND functionality. Still doesn't work as well as the
win32-production branch, though, but getting closer.
After this, need to add Archaeopteryx Software's OLE2 DND support.
* gdk/win32/gdkselection-win32.c (gdk_selection_owner_set,
gdk_selection_send_notify, generate_selection_notify): Don't use
SendMessage() to generate events for the same app, instead use
gdk_event_put().
* gdk/win32/gdkprivate-win32.h
* gdk/win32/gdkglobals-win32.c
* gdk/win32/gdkmain-win32.c
* gdk/win32/gdkevents-win32.c: Thus, remove declaration, definition,
initialisation and handling of gdk_selection_notify_msg,
gdk_selection_request_msg and gdk_selection_clear_msg.
* gdk/win32/gdkselection-win32.c (gdk_text_property_to_text_list,
gdk_free_text_list, gdk_string_to_compound_text,
gdk_free_compound_text): Implement trivially, witrh a text_list
always having a single element, and a compound text always
consisting of just a single (UTF-8!) string. Let's see how well
this works.
* gdk/win32/gdkselection-win32.c (gdk_selection_convert): Fix
non-ASCII paste from the clipboard: Try getting the same formats
from the Windows clipboard that gdk_property_change() puts there:
CF_UNICODETEXT, UTF8_STRING or CF_TEXT+CF_LOCALE.
* gdk/win32/gdkproperty-win32.c (gdk_property_change): When
storing text on the clipboard, handle non-ASCII text
correctly. The logic is as follows:
If we have only ASCII characters, use CF_TEXT.
Else, if we are on NT, use CF_UNICODETEXT.
Else (we are on Win9x), if all the characters are present in the
code page of some installed locale, use CF_TEXT and also set
CF_LOCALE to that locale.
Else (still on Win9x) store as RTF. We use a very simple RTF
string, just the text, no fonts or other crap, with the non-ASCII
characters as Unicode \uN keywords. Additionally, also store the
UTF-8 string as such, under the format "UTF8_STRING", so that GDK
can also paste from the Clipboard what it has copied there. (Thus
no need to implement any RTF parser.)
(find_common_locale): New function, implements the search for a
locale for case 3 above.
* gdk/win32/gdkglobals-win32.c: New global variables
compound_text, text_uri_list, utf8_string, cf_rtf and
cf_utf8_string.
* gdk/win32/gdkim-win32.c (_gdk_ucs2_to_utf8): New function,
converts from a wchar_t string to UTF-8.
(_gdk_utf8_to_ucs2): Rename from _gdk_win32_nmbstowchar_ts.
(_gdk_utf8_to_wcs): Rename from gdk_nmbstowchar_ts.
* gdk/win32/gdkevents-win32.c (build_keypress_event): Use
_gdk_ucs2_to_utf8().
* gdk/win32/gdkselection-win32.c: Remove some unnecessary logging.
* gdk/win32/gdkdnd-win32.c: Plug memory leaks, the
gdk_drag_context_ref() was called unnecessarily in a couple of
places, meaning drag contexts were never freed. The same memory
leaks seem to be present in gdk/linux-fb/gdkselection-fb.c, BTW.
(gdk_drop_reply): For WIN32_DROPFILES drops, free the temporarily
stored file list.
* gdk/win32/gdkselection-win32.c: Clarify the use of the
sel_prop_table. Now it is used only for storing the GDK_SELECTION
"properties".
The file names dropped with WM_DROPFILES -style DND is stored
temporarily (between the drop and the target picking them up) in a
separate place.
Have a separate hash table to map selection atoms to owner
windows. This used to be quite mixed up.
(_gdk_dropfiles_store): New function, to store the dropped file
list for the drop target to possibly fetch, and clear it
afterwards, from gdk_drop_reply().
Now we test we can unselect nodes before selecting new ones.
Wed Jan 9 19:10:07 2002 Jonathan Blandford <jrb@redhat.com>
* gtk/gtktreeselection.c
(_gtk_tree_selection_internal_select_node): Now we test we can
unselect nodes before selecting new ones.
(gtk_tree_selection_real_select_node): be careful comparing booleans.
pass NULL to gtk_tree_model_rows_reordered and not an iter with user_data
Wed Jan 9 21:31:44 2002 Kristian Rietveld <kris@gtk.org>
* gtk/gtkliststore.c (gtk_list_store_sort): pass NULL to
gtk_tree_model_rows_reordered and not an iter with user_data
set to NULL (which is an invalid liststore iter, so
iter_n_children failed, etc)
Owen Taylor [Wed, 9 Jan 2002 16:15:21 +0000 (16:15 +0000)]
Fix problem with menus without accel groups, such as the menus for option
Wed Jan 9 11:13:12 2002 Owen Taylor <otaylor@redhat.com>
* gtk/gtkmenuitem.c (_gtk_menu_item_refresh_accel_path):
Fix problem with menus without accel groups, such as the
menus for option menus.
* gtk/gtkpaned.c (gtk_paned_expose): Only conditionalize
drawing of handle on whether both children are visible,
not the drawing of the other child!. (#68325, Diego Gonzalez)
Owen Taylor [Wed, 9 Jan 2002 15:23:30 +0000 (15:23 +0000)]
Check for RENDER before trying to use it... XRenderFindFormat() prints
Wed Jan 9 10:20:16 2002 Owen Taylor <otaylor@redhat.com>
* gdk/x11/gdkdrawable-x11.c gdk/x11/gdkgc-c11.c: Check for
RENDER before trying to use it... XRenderFindFormat() prints
warnings if called when extension isn't present.
Tim Janik [Wed, 9 Jan 2002 12:24:03 +0000 (12:24 +0000)]
small but important fix to force vadjustments at size_alocate time from
Wed Jan 9 13:20:14 2002 Tim Janik <timj@gtk.org>
* gtk/gtkviewport.c (gtk_viewport_size_allocate): small but important
fix to force vadjustments at size_alocate time from Xavier Ordoquy
<mcarkan@users.sourceforge.net>.
Owen Taylor [Tue, 8 Jan 2002 19:21:55 +0000 (19:21 +0000)]
Fix problem where child->requisition was accessed directly instead of
Tue Jan 8 14:19:43 2002 Owen Taylor <otaylor@redhat.com>
* gtk/gtkcheckbutton.c (gtk_check_button_size_allocate):
Fix problem where child->requisition was accessed
directly instead of calling get_child_requisition()
(#68199, Damon Chaplin)
Owen Taylor [Tue, 8 Jan 2002 16:12:49 +0000 (16:12 +0000)]
- Massive cleanup, make actually legible. - Fix some clamp-to-range bugs
Tue Jan 8 10:58:04 2002 Owen Taylor <otaylor@redhat.com>
* gdk-pixbuf-util.c (gdk_pixbuf_saturate_and_pixelate):
- Massive cleanup, make actually legible.
- Fix some clamp-to-range bugs found by Jim Cape (#68231).
- Add a g_return_if_fail() if src and dest alpha don't match.
- Allow for src_rowstride != dest_rowstride.
Owen Taylor [Tue, 8 Jan 2002 03:22:13 +0000 (03:22 +0000)]
Fix a problem where were the offset into the image was passed into
Mon Jan 7 22:19:32 2002 Owen Taylor <otaylor@redhat.com>
* gdk/x11/gdkdrawable-x11.c (draw_with_pixmaps): Fix a
problem where were the offset into the image was passed
into convert_to_format() wrong.
* gdk/x11/gdkdrawable-x11.c (gdk_x11_draw_pixbuf): Call
gdk_x11_drawable_update_picture_clip () before using
the picture; allow update_picture_clip() to take a NULL gc
to mean no clipping.
* gtk/gtkrc.c (gtk_rc_get_style_by_paths),
gtk/gtkwidget.c (gtk_widget_get_toplevel,
gtk_widget_push_composite_child), gtk/gtkdialog.c
(gtk_dialog_new_with_buttons, gtk_dialog_run): Keep gtk-doc
from messing up the indentation of inline examples.
* gtk/gtkmain.c, gtk/gtkrc.c: Consistently call g_getenv()
instead of getenv().
remove gtk- prefix from TreeView and a few other entities, more consistent
2002-01-06 Havoc Pennington <hp@pobox.com>
* gtk/gtk-docs.sgml: remove gtk- prefix from TreeView and a few
other entities, more consistent anyway (I thought this would make
links to "GtkTreeView" etc. go to the ref page, not the struct,
but it wasn't the problem, the issue is the way gtkdoc-mkdb
decides what's an object, see CheckIsObject() routine)
* gtk/changes-1.2.sgml: sgml fixes to get rid of warnings
Hans Breuer [Sat, 5 Jan 2002 19:07:13 +0000 (19:07 +0000)]
need to cast image->mem away from void* to avoid 'error C2036: 'void *' :
2002-01-04 Hans Breuer <hans@breuer.org>
* gdk/gdkdraw.c gdk/gdkpixbuf-drawable.c :
need to cast image->mem away from void* to avoid
'error C2036: 'void *' : unknown size'. Doing pointer
arithmetics on void pointers is a GCCism afaik.
* gdk/gdkpixbuf-render.c : #include "gdkinternals.h" for
_gdk_draw_pixbuf ()
* gdk/makefile.msc gdk/win32/makefile.msc
gdk/gtk/makefile.msc.in : use -FI msvc_recommended_pragmas.h
* gdk/win32/gdkdrawable-win32.c : use _gkd_win32_copy_to_image
and take care of image->visual possibly NULL.
* gdk/win32/gdkimage-win32.c : implement _gdk_image_new_for_depth(),
_gdk_win32_copy_to_image() and _gdk_windowing_bits_for_depth().
Again take care of image->visual possibly NULL.
Owen Taylor [Fri, 4 Jan 2002 18:28:18 +0000 (18:28 +0000)]
At least don't infinite loop if the widget and window heirarchies don't
Fri Jan 4 13:05:15 2002 Owen Taylor <otaylor@redhat.com>
* gtk/gtkdnd.c (gtk_drag_find_widget): At least
don't infinite loop if the widget and window heirarchies
don't correspond.
* gtk/gtkdnd.c (gtk_drag_find_widget): Handle changes
in heirarchy in ::drag_motion, ::drag_drop callbacks
by referencing child widget lists. (Patch from Tim)
* gtk/gtkdnd.c (gtk_drag_find_widget): Fix a problem
with widgets where window.x != widget->allocation.
* gdk/gdkdraw.c gdk/gdkdrawable.h gdk/gdkpixmap.c gdk/gdkwindow.c
gdk/gdkinternals.h: Add a private copy_to_image() virtual function
to the GdkDrawable vtable that extends get_image() to allow
copying onto existing images. Make the default implementation of
get_image() use this so that backends don't have to implement
both. Add private wrapper _gdk_drawable_copy_to_image().
* gdk/x11/gdkimage-x11.c gdk/x11/gdkprivate-x11.c
gdk/x11/gdkdrawable-x11.c (_gdk_x11_copy_to_image): Implement
copy_to_image() semantics, speed up by using ShmPixmaps and
XCopyArea when possible, XFlush() after ungrabbing the server,
generally redo the logic once again.
* gdk/gdkinternals.h gdk/x11/gdkimage-x11.c
_gdk_windowing_bits_per_depth(): Function to convert from depth to
bits-per-pixel. (We assume only one bpp per depth - X requires
this.)
* gdk/gdkinternals.h gdk/gdkrgb.c gdk/gdkimage.c: Move the GdkRGB
scratch image code into a generic _gdk_image_get_scratch() chunk
of code that we can use other places we need scratch images.
* gdk/gdkimage.c gdk/x11/gdkimage.c gdk/gdkinternals.h:
Add _gdk_image_new_for_depth() as the backend
to _gdk_image_new() to allowing creating images with
a depth and no visual.
* gdk/gdkpixbuf-drawable.c: Fix so that getting
parts of images not at 0,0 actually works.
* gdk/gdkdrawable.h gdk/gdkinternals.h gdk/gdkdraw.c
gdk/gdkwindow.c gdk/gdkpixmap.c gdk/gdkpixbuf-render.c:
- Add a new GdkDrawableClass vfunc _draw_pixbuf, and
_gdk_draw_pixbuf() [ will be made public later ], to allow
backends to accelerate drawing pixbufs.
- Move the implementation of gdk_pixbuf_render_to_drawable_alpha()
to be the default implementation.
- Update docs for gdk_pixbuf_render_to_drawable_alpha().
- Optimize the default implementation by using
_gdk_image_copy_to_pixmap() and scratch shared images, and
special casing the compositing.
* gdk/x11/gdkdrawable-x11.c: Accelerate _gdk_draw_pixbuf()
with alpha using the RENDER extension.
* gdk/gdkpixbuf-drawable.c (gdk_pixbuf_get_from_drawable):
Optimize by _gdk_image_copy_to_pixmap() and scratch images.
* tests/testrgb.c: Add test for speed of alpha composition,
reduce the number of iterations since alpha composition
can be a bit slow.
* gdk/x11/gdkimage-x11.c gdk/gdkprivate-x11.h (_gdk_x11_image_get_shm_pixmap):
Private function to get a ShmPixmap for an image, if possible.
Anders Carlsson [Wed, 2 Jan 2002 23:51:03 +0000 (23:51 +0000)]
Rename gtk_tree_view_queue_draw_node to _gtk_tree_view_queue_draw_node.
2002-01-03 Anders Carlsson <andersca@gnu.org>
* gtk/gtktreeview.c: Rename gtk_tree_view_queue_draw_node to
_gtk_tree_view_queue_draw_node.
(gtk_tree_view_row_has_child_toggled): Only redraw one node.
* gtk/gtktreesortable.c (gtk_tree_sortable_set_sort_func):
sort_column_id can be 0.
* gtk/gtktreeselection.c (gtk_tree_selection_real_select_node):
Only redraw one the node being selected.
Tim Janik [Wed, 2 Jan 2002 22:08:49 +0000 (22:08 +0000)]
don't ignore realized but visible && !mapped resize containers (which is
Wed Jan 2 23:09:06 2002 Tim Janik <timj@gtk.org>
* gtk/gtkcontainer.c (_gtk_container_queue_resize): don't ignore
realized but visible && !mapped resize containers (which is
possible with unset CHILD_VISIBLE now).
propagate exposes to no window children not in the buffer window.
2002-01-01 Havoc Pennington <hp@pobox.com>
* gtk/gtktextview.c (gtk_text_view_expose_event): propagate
exposes to no window children not in the buffer window.
(gtk_text_view_class_init): add move_focus bindings for Ctrl-Tab
- is this the right way to do it?
(gtk_text_view_focus): add focus method, just chains up for now,
I'm not sure why the GtkContainer implementation doesn't work
* gtk/gtktextbtree.c (_gtk_text_btree_insert_child_anchor): fill
in the text line for the child anchor segment
* tests/testtext.c (do_add_focus_children): add another test
example (to put focusable buttons into the widget)
* gtk/framebuffer.sgml: move README.linux-fb in here
* gtk/tmpl/gtkpreview.sgml: explain what to use instead
* gtk/tmpl/gtkseparator.sgml: typo fix
* gtk/tmpl/gtkstock.sgml: add some overview docs
* gtk/Makefile.am (content_files): add new files
* gtk/changes-1.2.sgml: move Changes-1.2.txt in here
* gtk/changes-2.0.sgml: move Changes-2.0.txt in here
* gdk/tmpl/threads.sgml: mention gdk_threads_init() in the
overview docs, copy in the examples from the FAQ
* gtk/gtk-docs.sgml: change DTD to 3.1, and add
question_index.sgml and changes-1.2, changes-2.0
* gtk/tmpl/gtkdrawingarea.sgml: fixups to reflect 2.0 changes
* gtk/question_index.sgml: new section with question-based
index of the manual
* gtk/text_widget.sgml: fix some cross-references
2002-01-01 Havoc Pennington <hp@pobox.com>
* docs/README.linux-fb: note that this file is obsolete
* docs/Changes-2.0.txt, docs/Changes-1.2.txt: Add notes to these
files that they should not be edited and look in the reference
manual instead. Probably these files should just be replaced by
the note, and their main contents deleted.
* gtk/gtktextview.c: docs
* gtk/gtktextmark.c: docs
* gtk/gtktextchild.c: docs
* gtk/gtktextbuffer.c: docs stuff
* gtk/gtkclipboard.c (gtk_clipboard_get): fool with docs to maybe
give people more leads in sorting out PRIMARY vs. CLIPBOARD
Replace call to gtk_widget_size_request() that expected to actually
2002-01-01 Havoc Pennington <hp@pobox.com>
* gtk/gtktextview.c (changed_handler): Replace call to
gtk_widget_size_request() that expected to actually compute the
request with a direct use of widget_class->size_request, so we get
our size request right; fixes remaining part of #63065 reported by
Matthias Clasen
Havoc Pennington [Mon, 31 Dec 2001 22:35:20 +0000 (22:35 +0000)]
remove backward_char since we no longer have bogus newline
2001-12-31 Havoc Pennington <hp@pobox.com>
* tests/testtext.c (do_insert_and_scroll): remove backward_char
since we no longer have bogus newline
(dialog_response_callback): remove another backward_char horkage,
reported by Matthias Clasen #63065
Havoc Pennington [Mon, 31 Dec 2001 22:17:26 +0000 (22:17 +0000)]
fix an incorrect assertion that the "valid" flag is always correct in a
2001-12-31 Havoc Pennington <hp@pobox.com>
* gtk/gtktextbtree.c (gtk_text_btree_node_view_check_consistency):
fix an incorrect assertion that the "valid" flag is always correct
in a node and add explanatory comment. This keeps me from
reproducing #59101, but I'm remembering that 59101 was actually
about incorrect pixel totals, so I'm not sure 59101 is actually
fixed. May just have stopped happening due to some change in
how C-k works.
Havoc Pennington [Mon, 31 Dec 2001 17:58:04 +0000 (17:58 +0000)]
extend selection if shift is down, bug #50939
2001-12-31 Havoc Pennington <hp@pobox.com>
* gtk/gtktextview.c (gtk_text_view_start_selection_drag): extend
selection if shift is down, bug #50939
(gtk_text_view_button_press_event): add double/triple click
selection to the current selection if shift is down
Havoc Pennington [Mon, 31 Dec 2001 16:31:51 +0000 (16:31 +0000)]
fix to use ensure_byte_offsets not ensure_char_offsets, patch from Padraig
2001-12-31 Havoc Pennington <hp@pobox.com>
* gtk/gtktextiter.c (gtk_text_iter_get_visible_line_index): fix
to use ensure_byte_offsets not ensure_char_offsets, patch
from Padraig O'Briain bug #67356
Tor Lillqvist [Fri, 28 Dec 2001 21:52:04 +0000 (21:52 +0000)]
Use G_N_ELEMENTS(). (unicode_classify): Don't return -1 on encountering an
2001-12-28 Tor Lillqvist <tml@iki.fi>
* gdk/win32/gdkfont-win32.c: Use G_N_ELEMENTS().
(unicode_classify): Don't return -1 on encountering an
unclassified character, but play it safe and return U_BASIC_LATIN.
Vitaly Tishkov [Fri, 28 Dec 2001 15:48:45 +0000 (15:48 +0000)]
additional fix for #59314 ('<programlisting>' is changed to '<literal>' in
2001-12-28 Vitaly Tishkov <tvv@sparc.spb.su>
* gtkwindow.sgml: additional fix for #59314 ('<programlisting>' is
changed to '<literal>' in docs for gtk_window_set_policy ())
Owen Taylor [Thu, 27 Dec 2001 21:42:02 +0000 (21:42 +0000)]
Make interpretation of misc->xpad/ypad consistent with GtkLabel. Do
Thu Dec 27 16:05:30 2001 Owen Taylor <otaylor@redhat.com>
* gtk/gtkarrow.c gtk/gtkimage.c gtkpixmap.c: Make interpretation
of misc->xpad/ypad consistent with GtkLabel. Do
directional flipping when interpreting misc->xalign/yalign.
Fix off-by-one error for negative x,y. (#67472, reported
by Mathieu Lacage)
Owen Taylor [Thu, 27 Dec 2001 20:50:49 +0000 (20:50 +0000)]
Remove optimization that was causing problems because we called
Thu Dec 27 15:45:41 2001 Owen Taylor <otaylor@redhat.com>
* gtk/gtkwidget.c (gtk_widget_set_style_internal):
Remove optimization that was causing problems because
we called gtk_widget_size_request() before we called
gtk_widget_queue_resize() so RESIZE_NEEDED was not
set. Optimization shouldn't mattter now that we
are smart about needlessly size requesting or allocating
widgets. (#67598, reported by Jacob Berkman)
Owen Taylor [Thu, 27 Dec 2001 20:43:58 +0000 (20:43 +0000)]
Call gdk_window_get_pointer() on menu->bin_window not menu->window, so we
Thu Dec 27 15:38:20 2001 Owen Taylor <otaylor@redhat.com>
* gtk/gtkmenu.c (gtk_menu_stop_navigating_submenu_cb):
Call gdk_window_get_pointer() on menu->bin_window not
menu->window, so we get the correct window for the
menu item. (#65213, Guillermo S. Romero)
Owen Taylor [Thu, 27 Dec 2001 20:22:16 +0000 (20:22 +0000)]
Allow unsetting the title by setting to NULL. Move docs inline. Update the
Thu Dec 27 15:13:44 2001 Owen Taylor <otaylor@redhat.com>
* gtk/gtkmenu.c (gtk_menu_set_title): Allow unsetting
the title by setting to NULL. Move docs inline.
Update the title if the tearoff window already
exists. Code cleanup. (Fixes #65190, reported by
Vitaly Tishkov.)
Owen Taylor [Thu, 27 Dec 2001 19:20:23 +0000 (19:20 +0000)]
gtk/gtkplug.c (gtk_plug_key_press_event): Don't do special handling of key
Thu Dec 27 14:04:22 2001 Owen Taylor <otaylor@redhat.com>
* gtk/gtksocket.c (gtk_socket_key_press_event):
gtk/gtkplug.c (gtk_plug_key_press_event): Don't do
special handling of key presses unless we are doing
iter-app embedding. (Fixes #67590, Anders Carlsson)
fix a few places where I was confused between modelsort iters and other
Thu Dec 27 16:37:04 2001 Kristian Rietveld <kris@gtk.org>
* gtk/gtktreemodelsort.c (gtk_tree_model_sort_row_deleted),
(gtk_tree_model_sort_sort_level),
(gtk_tree_model_sort_insert_value): fix a few places where
I was confused between modelsort iters and other iters. This was
really going to happen someday ;)
Owen Taylor [Wed, 26 Dec 2001 17:38:39 +0000 (17:38 +0000)]
Document the fact that gtk_paned_set_handle_size() has been removed.
Wed Dec 26 12:32:31 2001 Owen Taylor <otaylor@redhat.com>
* docs/Changes-2.0.txt: Document the fact that
gtk_paned_set_handle_size() has been removed.
* gtk/gtkpaned.h Remove gtk_paned_handle_size() compat macro,
since it pointed to gtk_paned_set_handle_size(), which
was removed. (#66760, Matt Wilson)
Matthias Clasen [Thu, 20 Dec 2001 23:09:29 +0000 (23:09 +0000)]
More precise documentation about underscores and mnemonics. (#66380)
* gtk/gtklabel.c (gtk_label_new_with_mnemonic),
gtk/gtkbutton.c (gtk_button_new_with_mnemonic): More precise
documentation about underscores and mnemonics. (#66380)
* gtk/gtktextiter.c (gtk_text_iter_backward_word_starts): Fix
cyclic reference in docs.
* gtk/gtklabel.c (gtk_label_set_justify): Correct documentation
of default value. (#65402)
projects / ~andy / gtk / log