Commits

commits@lists.geany.org

1 participants
11547 discussions

SF.net SVN: geany: [480] trunk
by ntrel＠users.sourceforge.net 25 Jun '06

25 Jun '06

Revision: 480 Author: ntrel Date: 2006-06-25 05:48:38 -0700 (Sun, 25 Jun 2006) ViewCVS: http://svn.sourceforge.net/geany/?rev=480&view=rev Log Message: ----------- Fix close tab button bug introduced in last commit Modified Paths: -------------- trunk/ChangeLog trunk/src/notebook.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2006-06-25 12:13:35 UTC (rev 479) +++ trunk/ChangeLog 2006-06-25 12:48:38 UTC (rev 480) @@ -6,6 +6,7 @@ workaround for GTK+2.6. Add notebook_new_tab and update document_create_new_sci to use it; also remove on_tab_close_clicked. + * src/notebook.c: Fix close tab button bug introduced in last commit. 2006-06-24 Enrico Troeger <enrico.troeger(a)uvena.de> Modified: trunk/src/notebook.c =================================================================== --- trunk/src/notebook.c 2006-06-25 12:13:35 UTC (rev 479) +++ trunk/src/notebook.c 2006-06-25 12:48:38 UTC (rev 480) @@ -44,7 +44,10 @@ static gint notebook_find_tab_num_at_pos(GtkNotebook *notebook, gint x, gint y); +static void +notebook_tab_close_clicked_cb(GtkButton *button, gpointer user_data); + /* There is a bug with drag reordering notebook tabs. * Clicking (not dragging) on a notebook tab, then making a selection in the * Scintilla widget will cause a strange selection bug. @@ -231,8 +234,8 @@ GTK_WIDGET(page), hbox, this->tabmenu_label, 0); // signal for clicking the tab-close button - g_signal_connect_swapped(G_OBJECT(but), "clicked", - G_CALLBACK(document_remove), GINT_TO_POINTER(tabnum)); + g_signal_connect(G_OBJECT(but), "clicked", + G_CALLBACK(notebook_tab_close_clicked_cb), page); // motion notify for GTK+2.6 (workaround child widgets don't pass on signal) // doesn't seem to work //g_signal_connect(G_OBJECT(this->tab_label), "motion-notify-event", @@ -240,3 +243,11 @@ return tabnum; } + +static void +notebook_tab_close_clicked_cb(GtkButton *button, gpointer user_data) +{ + gint cur_page = gtk_notebook_page_num(GTK_NOTEBOOK(app->notebook), + GTK_WIDGET(user_data)); + document_remove(cur_page); +} This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany: [479] trunk
by ntrel＠users.sourceforge.net 25 Jun '06

25 Jun '06

Revision: 479 Author: ntrel Date: 2006-06-25 05:13:35 -0700 (Sun, 25 Jun 2006) ViewCVS: http://svn.sourceforge.net/geany/?rev=479&view=rev Log Message: ----------- Enable drag reordering of tabs for GTK+2.8, and a temporary workaround for GTK+2.6. Add notebook_new_tab and update document_create_new_sci to use it; also remove on_tab_close_clicked Modified Paths: -------------- trunk/ChangeLog trunk/src/callbacks.c trunk/src/callbacks.h trunk/src/document.c trunk/src/notebook.c trunk/src/notebook.h Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2006-06-24 19:37:43 UTC (rev 478) +++ trunk/ChangeLog 2006-06-25 12:13:35 UTC (rev 479) @@ -1,3 +1,13 @@ +2006-06-25 Nick Treleaven <nick.treleaven(a)btinternet.com> + + * src/notebook.c, src/notebook.h, src/document.c, src/callbacks.c, + src/callbacks.h: + Enable drag reordering of tabs for GTK+2.8, and a temporary + workaround for GTK+2.6. + Add notebook_new_tab and update document_create_new_sci to use it; + also remove on_tab_close_clicked. + + 2006-06-24 Enrico Troeger <enrico.troeger(a)uvena.de> * src/utils.c: Replaced 'blank' by 'include "..."'. Fixed a bug in Modified: trunk/src/callbacks.c =================================================================== --- trunk/src/callbacks.c 2006-06-24 19:37:43 UTC (rev 478) +++ trunk/src/callbacks.c 2006-06-25 12:13:35 UTC (rev 479) @@ -656,16 +656,6 @@ } -// close tab -void -on_tab_close_clicked (GtkButton *button, - gpointer user_data) -{ - gint cur_page = gtk_notebook_page_num(GTK_NOTEBOOK(app->notebook), GTK_WIDGET(user_data)); - document_remove(cur_page); -} - - // changes window-title on switching tabs and lots of other things void on_notebook1_switch_page (GtkNotebook *notebook, Modified: trunk/src/callbacks.h =================================================================== --- trunk/src/callbacks.h 2006-06-24 19:37:43 UTC (rev 478) +++ trunk/src/callbacks.h 2006-06-25 12:13:35 UTC (rev 479) @@ -89,10 +89,6 @@ gpointer user_data); void -on_tab_close_clicked (GtkButton *button, - gpointer user_data); - -void on_file_open_dialog_response (GtkDialog *dialog, gint response, gpointer user_data); Modified: trunk/src/document.c =================================================================== --- trunk/src/document.c 2006-06-24 19:37:43 UTC (rev 478) +++ trunk/src/document.c 2006-06-25 12:13:35 UTC (rev 479) @@ -53,6 +53,7 @@ #include "treeviews.h" #include "utils.h" #include "encodings.h" +#include "notebook.h" @@ -196,32 +197,13 @@ gint document_create_new_sci(const gchar *filename) { ScintillaObject *sci; - GtkWidget *hbox, *but; - GtkWidget *align; PangoFontDescription *pfd; gchar *title, *fname; GtkTreeIter iter; gint new_idx = document_get_new_idx(); document *this = &(doc_list[new_idx]); - - title = (filename) ? g_path_get_basename(filename) : g_strdup(GEANY_STRING_UNTITLED); - this->tab_label = gtk_label_new(title); + gint tabnum; - hbox = gtk_hbox_new(FALSE, 0); - but = gtk_button_new(); - gtk_container_add(GTK_CONTAINER(but), utils_new_image_from_inline(GEANY_IMAGE_SMALL_CROSS, FALSE)); - gtk_container_set_border_width(GTK_CONTAINER(but), 0); - gtk_widget_set_size_request(but, 17, 15); - - align = gtk_alignment_new(1.0, 0.0, 0.0, 0.0); - gtk_container_add(GTK_CONTAINER(align), but); - - gtk_button_set_relief(GTK_BUTTON(but), GTK_RELIEF_NONE); - gtk_box_pack_start(GTK_BOX(hbox), this->tab_label, FALSE, FALSE, 0); - gtk_box_pack_start(GTK_BOX(hbox), align, TRUE, TRUE, 0); - gtk_widget_show_all(hbox); - - /* SCI - Code */ sci = SCINTILLA(scintilla_new()); scintilla_set_id(sci, new_idx); @@ -260,21 +242,11 @@ SSM(sci, SCI_SETTWOPHASEDRAW, 0, 0); } - this->tabmenu_label = gtk_label_new(title); - gtk_misc_set_alignment(GTK_MISC(this->tabmenu_label), 0.0, 0); - if (app->tab_order_ltr) - { - gint npage; - npage = gtk_notebook_append_page_menu(GTK_NOTEBOOK(app->notebook), GTK_WIDGET(sci), - hbox, this->tabmenu_label); - gtk_notebook_set_current_page(GTK_NOTEBOOK(app->notebook), npage); - } - else - { - gtk_notebook_insert_page_menu(GTK_NOTEBOOK(app->notebook), GTK_WIDGET(sci), hbox, - this->tabmenu_label, 0); - gtk_notebook_set_current_page(GTK_NOTEBOOK(app->notebook), 0); - } + title = (filename) ? g_path_get_basename(filename) : g_strdup(GEANY_STRING_UNTITLED); + + tabnum = notebook_new_tab(new_idx, title, GTK_WIDGET(sci)); + gtk_notebook_set_current_page(GTK_NOTEBOOK(app->notebook), tabnum); + iter = treeviews_openfiles_add(new_idx, title); g_free(title); @@ -290,8 +262,6 @@ */ // signal for the popup menu g_signal_connect((GtkWidget*) sci, "button-press-event", G_CALLBACK(on_editor_button_press_event), GINT_TO_POINTER(new_idx)); - // signal for clicking the tab-close button - g_signal_connect(G_OBJECT(but), "clicked", G_CALLBACK(on_tab_close_clicked), sci); utils_close_buttons_toggle(); Modified: trunk/src/notebook.c =================================================================== --- trunk/src/notebook.c 2006-06-24 19:37:43 UTC (rev 478) +++ trunk/src/notebook.c 2006-06-25 12:13:35 UTC (rev 479) @@ -22,6 +22,8 @@ #include "geany.h" #include "notebook.h" +#include "document.h" +#include "utils.h" #define GEANY_DND_NOTEBOOK_TAB_TYPE "geany_dnd_notebook_tab" @@ -31,41 +33,81 @@ }; -gboolean -notebook_drag_motion_cb(GtkWidget *notebook, GdkDragContext *dc, +static gboolean +notebook_drag_motion_cb(GtkWidget *widget, GdkDragContext *dc, gint x, gint y, guint time, gpointer user_data); +static gboolean +notebook_motion_notify_event_cb(GtkWidget *widget, GdkEventMotion *event, + gpointer user_data); +static gint +notebook_find_tab_num_at_pos(GtkNotebook *notebook, gint x, gint y); + + +/* There is a bug with drag reordering notebook tabs. + * Clicking (not dragging) on a notebook tab, then making a selection in the + * Scintilla widget will cause a strange selection bug. + * It seems there is a conflict; the drag cursor is shown, + * and the selection is blocked; however, when releasing the + * mouse button, the selection continues. + * Bug present with gtk+2.6.8, not gtk+2.8.? - ntrel */ void notebook_init() { GtkWidget *notebook = app->notebook; + // don't allow focusing tab labels, focus sci instead g_object_set(G_OBJECT(notebook), "can-focus", FALSE, NULL); - /* There is a bug with drag reordering notebook tabs. - * Clicking on a notebook tab, then making a selection in the - * Scintilla widget will cause a strange selection bug. - * It seems there is a conflict; the drag cursor is shown, - * and the selection is blocked; however, when releasing the - * mouse button, the selection continues. - * Maybe a bug in Scintilla 1.68? - ntrel */ -#ifndef TEST_TAB_DND - return; -#endif - // Set up drag movement callback g_signal_connect(G_OBJECT(notebook), "drag-motion", G_CALLBACK(notebook_drag_motion_cb), NULL); +#if ! GTK_CHECK_VERSION(2, 8, 0) + // workaround GTK+2.6 drag start bug when over sci widget: + g_signal_connect(G_OBJECT(notebook), "motion-notify-event", + G_CALLBACK(notebook_motion_notify_event_cb), NULL); +#endif + // set up drag motion for moving notebook pages + gtk_drag_dest_set(notebook, GTK_DEST_DEFAULT_MOTION | GTK_DEST_DEFAULT_DROP, + drag_targets, G_N_ELEMENTS(drag_targets), GDK_ACTION_MOVE); + // set drag source, but for GTK+2.6 it's changed in motion-notify-event handler gtk_drag_source_set(notebook, GDK_BUTTON1_MASK, drag_targets, G_N_ELEMENTS(drag_targets), GDK_ACTION_MOVE); - gtk_drag_dest_set(notebook, GTK_DEST_DEFAULT_MOTION | GTK_DEST_DEFAULT_DROP, - drag_targets, G_N_ELEMENTS(drag_targets), GDK_ACTION_MOVE); } -gboolean +/* N.B. With GTK+2.6, we don't get notebook motion-notify-event for tab child + * widgets. */ +static gboolean +notebook_motion_notify_event_cb(GtkWidget *widget, GdkEventMotion *event, + gpointer user_data) +{ + static gboolean drag_enabled = TRUE; //stores current state + GtkWidget *page = gtk_notebook_get_nth_page(GTK_NOTEBOOK(app->notebook), + gtk_notebook_get_current_page(GTK_NOTEBOOK(app->notebook))); + + //g_print("%g, %g; %p (%p)\n", event->x, event->y, event->window, page->window); + if (page == NULL || event->x < 0 || event->y < 0) return FALSE; + + if (event->window == page->window) //cursor over sci widget + { + if (drag_enabled) gtk_drag_source_unset(widget); //disable + drag_enabled = FALSE; + } + else //assume cursor over notebook tab + { + if (! drag_enabled) + gtk_drag_source_set(widget, GDK_BUTTON1_MASK, + drag_targets, G_N_ELEMENTS(drag_targets), GDK_ACTION_MOVE); + drag_enabled = TRUE; + } + return FALSE; //propagate event +} + + +static gboolean notebook_drag_motion_cb(GtkWidget *widget, GdkDragContext *dc, gint x, gint y, guint time, gpointer user_data) { @@ -101,10 +143,13 @@ } -/* x,y are co-ordinates local to the notebook, not including border padding - * adapted from Epiphany absolute version in ephy-notebook.c, thanks - * notebook tab label widgets must not be NULL */ -gint notebook_find_tab_num_at_pos(GtkNotebook *notebook, gint x, gint y) +/* Adapted from Epiphany absolute version in ephy-notebook.c, thanks. + * x,y are co-ordinates local to the notebook (not including border padding) + * notebook tab label widgets must not be NULL. + * N.B. This only checks the dimension that the tabs are in, + * e.g. for GTK_POS_TOP it does not check the y coordinate. */ +static gint +notebook_find_tab_num_at_pos(GtkNotebook *notebook, gint x, gint y) { GtkPositionType tab_pos; int page_num = 0; @@ -146,3 +191,52 @@ } return -1; } + + +/* Returns index of notebook page, or -1 on error */ +gint notebook_new_tab(gint doc_idx, gchar *title, GtkWidget *page) +{ + GtkWidget *hbox, *but; + GtkWidget *align; + gint tabnum; + document *this = &(doc_list[doc_idx]); + + g_return_val_if_fail(doc_idx >= 0 && this != NULL, -1); + + this->tab_label = gtk_label_new(title); + + hbox = gtk_hbox_new(FALSE, 0); + but = gtk_button_new(); + gtk_container_add(GTK_CONTAINER(but), + utils_new_image_from_inline(GEANY_IMAGE_SMALL_CROSS, FALSE)); + gtk_container_set_border_width(GTK_CONTAINER(but), 0); + gtk_widget_set_size_request(but, 17, 15); + + align = gtk_alignment_new(1.0, 0.0, 0.0, 0.0); + gtk_container_add(GTK_CONTAINER(align), but); + + gtk_button_set_relief(GTK_BUTTON(but), GTK_RELIEF_NONE); + gtk_box_pack_start(GTK_BOX(hbox), this->tab_label, FALSE, FALSE, 0); + gtk_box_pack_start(GTK_BOX(hbox), align, TRUE, TRUE, 0); + gtk_widget_show_all(hbox); + + this->tabmenu_label = gtk_label_new(title); + gtk_misc_set_alignment(GTK_MISC(this->tabmenu_label), 0.0, 0); + + if (app->tab_order_ltr) + tabnum = gtk_notebook_append_page_menu(GTK_NOTEBOOK(app->notebook), + GTK_WIDGET(page), hbox, this->tabmenu_label); + else + tabnum = gtk_notebook_insert_page_menu(GTK_NOTEBOOK(app->notebook), + GTK_WIDGET(page), hbox, this->tabmenu_label, 0); + + // signal for clicking the tab-close button + g_signal_connect_swapped(G_OBJECT(but), "clicked", + G_CALLBACK(document_remove), GINT_TO_POINTER(tabnum)); + // motion notify for GTK+2.6 (workaround child widgets don't pass on signal) + // doesn't seem to work + //g_signal_connect(G_OBJECT(this->tab_label), "motion-notify-event", + //G_CALLBACK(notebook_motion_notify_event_cb), NULL); + return tabnum; +} + Modified: trunk/src/notebook.h =================================================================== --- trunk/src/notebook.h 2006-06-24 19:37:43 UTC (rev 478) +++ trunk/src/notebook.h 2006-06-25 12:13:35 UTC (rev 479) @@ -25,6 +25,7 @@ void notebook_init(); -gint notebook_find_tab_num_at_pos(GtkNotebook *notebook, gint x, gint y); +/* Returns index of notebook page, or -1 on error */ +gint notebook_new_tab(gint doc_idx, gchar *title, GtkWidget *page); #endif This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany: [478] trunk
by eht16＠users.sourceforge.net 24 Jun '06

24 Jun '06

Revision: 478 Author: eht16 Date: 2006-06-24 12:37:43 -0700 (Sat, 24 Jun 2006) ViewCVS: http://svn.sourceforge.net/geany/?rev=478&view=rev Log Message: ----------- Added Scintilla license file. Modified Paths: -------------- trunk/ChangeLog trunk/Makefile.am trunk/doc/Makefile.am trunk/scintilla/Makefile.am Added Paths: ----------- trunk/scintilla/License.txt Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2006-06-24 18:46:08 UTC (rev 477) +++ trunk/ChangeLog 2006-06-24 19:37:43 UTC (rev 478) @@ -17,6 +17,8 @@ * src/sci_cb.c, src/highlighting.c: Removed URL highlighting code(useless feature, never was enabled). * src/treeviews.c: Set policy settings for the scolledwindow. + * scintilla/License.txt, scintilla/Makefile.am, doc/Makefile.am: + Added Scintilla license file. 2006-06-23 Nick Treleaven <nick.treleaven(a)btinternet.com> Modified: trunk/Makefile.am =================================================================== --- trunk/Makefile.am 2006-06-24 18:46:08 UTC (rev 477) +++ trunk/Makefile.am 2006-06-24 19:37:43 UTC (rev 478) @@ -9,7 +9,7 @@ geany.glade \ geany.gladep \ data/global.tags \ - data/global.tags \ + data/php.tags \ data/latex.tags \ data/filetypes.* Modified: trunk/doc/Makefile.am =================================================================== --- trunk/doc/Makefile.am 2006-06-24 18:46:08 UTC (rev 477) +++ trunk/doc/Makefile.am 2006-06-24 19:37:43 UTC (rev 478) @@ -52,4 +52,5 @@ $(INSTALL_DATA) ../COPYING $(DOCDIR) $(INSTALL_DATA) ../AUTHORS $(DOCDIR) $(INSTALL_DATA) ../TODO $(DOCDIR) + $(INSTALL_DATA) ../scintilla/License.txt $(DOCDIR)/ScintillaLicense.txt Added: trunk/scintilla/License.txt =================================================================== --- trunk/scintilla/License.txt (rev 0) +++ trunk/scintilla/License.txt 2006-06-24 19:37:43 UTC (rev 478) @@ -0,0 +1,20 @@ +License for Scintilla and SciTE + +Copyright 1998-2003 by Neil Hodgson <neilh(a)scintilla.org> + +All Rights Reserved + +Permission to use, copy, modify, and distribute this software and its +documentation for any purpose and without fee is hereby granted, +provided that the above copyright notice appear in all copies and that +both that copyright notice and this permission notice appear in +supporting documentation. + +NEIL HODGSON DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS +SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY +AND FITNESS, IN NO EVENT SHALL NEIL HODGSON BE LIABLE FOR ANY +SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES +WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, +WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER +TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE +OR PERFORMANCE OF THIS SOFTWARE. \ No newline at end of file Modified: trunk/scintilla/Makefile.am =================================================================== --- trunk/scintilla/Makefile.am 2006-06-24 18:46:08 UTC (rev 477) +++ trunk/scintilla/Makefile.am 2006-06-24 19:37:43 UTC (rev 478) @@ -67,4 +67,4 @@ glib-genmarshal --prefix scintilla_marshal scintilla-marshal.list --header > scintilla-marshal.h glib-genmarshal --prefix scintilla_marshal scintilla-marshal.list --body > scintilla-marshal.c -EXTRA_DIST=scintilla-marshal.list scintilla-marshal.c scintilla-marshal.h +EXTRA_DIST=scintilla-marshal.list scintilla-marshal.c scintilla-marshal.h License.txt This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany: [477] trunk/src
by eht16＠users.sourceforge.net 24 Jun '06

24 Jun '06

Revision: 477 Author: eht16 Date: 2006-06-24 11:46:08 -0700 (Sat, 24 Jun 2006) ViewCVS: http://svn.sourceforge.net/geany/?rev=477&view=rev Log Message: ----------- Added some sanity checks to prevent crashes. Modified Paths: -------------- trunk/src/callbacks.c trunk/src/dialogs.c trunk/src/geany.h trunk/src/keybindings.c trunk/src/main.c trunk/src/sci_cb.h Modified: trunk/src/callbacks.c =================================================================== --- trunk/src/callbacks.c 2006-06-24 18:43:56 UTC (rev 476) +++ trunk/src/callbacks.c 2006-06-24 18:46:08 UTC (rev 477) @@ -356,6 +356,7 @@ gpointer user_data) { gint idx = document_get_cur_idx(); + if (idx == -1 || ! doc_list[idx].is_valid) return; if (sci_can_undo(doc_list[idx].sci)) sci_undo(doc_list[idx].sci); } @@ -365,6 +366,7 @@ gpointer user_data) { gint idx = document_get_cur_idx(); + if (idx == -1 || ! doc_list[idx].is_valid) return; if (sci_can_redo(doc_list[idx].sci)) sci_redo(doc_list[idx].sci); } @@ -454,8 +456,11 @@ gpointer user_data) { gint idx = document_get_cur_idx(); - gchar *basename = g_path_get_basename(doc_list[idx].file_name); + gchar *basename; + if (idx == -1 || ! doc_list[idx].is_valid || doc_list[idx].file_name == NULL) return; + + basename = g_path_get_basename(doc_list[idx].file_name); if (dialogs_show_question(_ ("Are you sure you want to reload '%s'?\nAny unsaved changes will be lost."), basename)) @@ -605,7 +610,7 @@ gint idx = document_get_cur_idx(); static gboolean done = 1; - if (doc_list[idx].is_valid) + if (idx >= 0 && doc_list[idx].is_valid) { if (done++ % 3 == 0) sci_set_line_numbers(doc_list[idx].sci, app->show_linenumber_margin, (sci_get_zoom(doc_list[idx].sci) / 2)); @@ -619,7 +624,7 @@ gpointer user_data) { gint idx = document_get_cur_idx(); - if (doc_list[idx].is_valid) + if (idx >= 0 && doc_list[idx].is_valid) { if (sci_get_zoom(doc_list[idx].sci) == 0) sci_set_line_numbers(doc_list[idx].sci, app->show_linenumber_margin, 0); @@ -633,7 +638,7 @@ gpointer user_data) { gint idx = document_get_cur_idx(); - if (doc_list[idx].is_valid) + if (idx >= 0 && doc_list[idx].is_valid) { sci_zoom_off(doc_list[idx].sci); sci_set_line_numbers(doc_list[idx].sci, app->show_linenumber_margin, 0); @@ -2390,4 +2395,3 @@ utils_update_statusbar(idx, -1); } - Modified: trunk/src/dialogs.c =================================================================== --- trunk/src/dialogs.c 2006-06-24 18:43:56 UTC (rev 476) +++ trunk/src/dialogs.c 2006-06-24 18:46:08 UTC (rev 477) @@ -487,7 +487,7 @@ G_CALLBACK(gtk_widget_hide), NULL); } // We make sure the dialog is visible. - gtk_window_present (GTK_WINDOW(app->open_colorsel)); + gtk_window_present(GTK_WINDOW(app->open_colorsel)); #endif } @@ -879,6 +879,8 @@ gint idx = document_get_cur_idx(); gchar *sel = NULL; + if (idx == -1 || ! doc_list[idx].is_valid) return; + if (sci_get_lines_selected(doc_list[idx].sci) == 1) { sel = g_malloc(sci_get_selected_text_length(doc_list[idx].sci)); Modified: trunk/src/geany.h =================================================================== --- trunk/src/geany.h 2006-06-24 18:43:56 UTC (rev 476) +++ trunk/src/geany.h 2006-06-24 18:46:08 UTC (rev 477) @@ -205,7 +205,7 @@ GtkWidget *redo_items[2]; GtkWidget *undo_items[2]; GtkWidget *save_buttons[2]; - GtkWidget *sensitive_buttons[31]; + GtkWidget *sensitive_buttons[32]; GtkWidget *open_colorsel; GtkWidget *open_fontsel; GtkWidget *open_filesel; Modified: trunk/src/keybindings.c =================================================================== --- trunk/src/keybindings.c 2006-06-24 18:43:56 UTC (rev 476) +++ trunk/src/keybindings.c 2006-06-24 18:46:08 UTC (rev 477) @@ -340,7 +340,6 @@ return TRUE; } } - return FALSE; } @@ -464,18 +463,21 @@ static void cb_func_menu_foldall(void) { gint idx = document_get_cur_idx(); + if (idx == -1 || ! doc_list[idx].is_valid) return; document_fold_all(idx); } static void cb_func_menu_unfoldall(void) { gint idx = document_get_cur_idx(); + if (idx == -1 || ! doc_list[idx].is_valid) return; document_unfold_all(idx); } static void cb_func_build_compile(void) { gint idx = document_get_cur_idx(); + if (idx == -1 || ! doc_list[idx].is_valid) return; if (doc_list[idx].file_type->menu_items->can_compile && doc_list[idx].file_name != NULL) on_build_compile_activate(NULL, NULL); } @@ -483,6 +485,7 @@ static void cb_func_build_link(void) { gint idx = document_get_cur_idx(); + if (idx == -1 || ! doc_list[idx].is_valid) return; if (doc_list[idx].file_type->menu_items->can_link && doc_list[idx].file_name != NULL) on_build_build_activate(NULL, NULL); } @@ -490,6 +493,7 @@ static void cb_func_build_make(void) { gint idx = document_get_cur_idx(); + if (idx == -1 || ! doc_list[idx].is_valid) return; if (doc_list[idx].file_name != NULL) on_build_make_activate(NULL, GINT_TO_POINTER(0)); } @@ -497,6 +501,7 @@ static void cb_func_build_makeowntarget(void) { gint idx = document_get_cur_idx(); + if (idx == -1 || ! doc_list[idx].is_valid) return; if (doc_list[idx].file_name != NULL) on_build_make_activate(NULL, GINT_TO_POINTER(1)); } @@ -504,6 +509,7 @@ static void cb_func_build_run(void) { gint idx = document_get_cur_idx(); + if (idx == -1 || ! doc_list[idx].is_valid) return; if (doc_list[idx].file_type->menu_items->can_exec && doc_list[idx].file_name != NULL) on_build_execute_activate(NULL, GINT_TO_POINTER(0)); } @@ -511,6 +517,7 @@ static void cb_func_build_run2(void) { gint idx = document_get_cur_idx(); + if (idx == -1 || ! doc_list[idx].is_valid) return; if (doc_list[idx].file_type->menu_items->can_exec && doc_list[idx].file_name != NULL) on_build_execute_activate(NULL, GINT_TO_POINTER(1)); } @@ -518,6 +525,7 @@ static void cb_func_build_options(void) { gint idx = document_get_cur_idx(); + if (idx == -1 || ! doc_list[idx].is_valid) return; if ((doc_list[idx].file_type->menu_items->can_compile || doc_list[idx].file_type->menu_items->can_link || doc_list[idx].file_type->menu_items->can_exec) && @@ -528,6 +536,7 @@ static void cb_func_reloadtaglist(void) { gint idx = document_get_cur_idx(); + if (idx == -1 || ! doc_list[idx].is_valid) return; document_update_tag_list(idx, TRUE); } @@ -585,6 +594,7 @@ static void cb_func_switch_editor(void) { gint idx = document_get_cur_idx(); + if (idx == -1 || ! doc_list[idx].is_valid) return; gtk_widget_grab_focus(GTK_WIDGET(doc_list[idx].sci)); } @@ -641,6 +651,7 @@ static void cb_func_edit_duplicateline(void) { gint idx = document_get_cur_idx(); + if (idx == -1 || ! doc_list[idx].is_valid) return; if (sci_can_copy(doc_list[idx].sci)) sci_selection_duplicate(doc_list[idx].sci); else @@ -650,30 +661,35 @@ static void cb_func_edit_commentline(void) { gint idx = document_get_cur_idx(); + if (idx == -1 || ! doc_list[idx].is_valid) return; sci_cb_do_comment(idx); } static void cb_func_edit_autocomplete(void) { gint idx = document_get_cur_idx(); + if (idx == -1 || ! doc_list[idx].is_valid) return; sci_cb_start_auto_complete(doc_list[idx].sci, sci_get_current_position(doc_list[idx].sci)); } static void cb_func_edit_calltip(void) { gint idx = document_get_cur_idx(); + if (idx == -1 || ! doc_list[idx].is_valid) return; sci_cb_show_calltip(doc_list[idx].sci, -1); } static void cb_func_edit_macrolist(void) { gint idx = document_get_cur_idx(); + if (idx == -1 || ! doc_list[idx].is_valid) return; sci_cb_show_macro_list(doc_list[idx].sci); } static void cb_func_edit_suppresscompletion(void) { gint idx = document_get_cur_idx(); + if (idx == -1 || ! doc_list[idx].is_valid) return; sci_add_text(doc_list[idx].sci, " "); } Modified: trunk/src/main.c =================================================================== --- trunk/src/main.c 2006-06-24 18:43:56 UTC (rev 476) +++ trunk/src/main.c 2006-06-24 18:46:08 UTC (rev 477) @@ -291,21 +291,22 @@ app->sensitive_buttons[13] = lookup_widget(app->window, "menu_count_words1"); app->sensitive_buttons[14] = lookup_widget(app->window, "menu_build1"); app->sensitive_buttons[15] = lookup_widget(app->window, "add_comments1"); - app->sensitive_buttons[16] = lookup_widget(app->window, "find1"); - app->sensitive_buttons[17] = lookup_widget(app->window, "find_next1"); - app->sensitive_buttons[18] = lookup_widget(app->window, "replace1"); - app->sensitive_buttons[19] = lookup_widget(app->window, "menu_paste1"); - app->sensitive_buttons[20] = lookup_widget(app->window, "menu_undo2"); - app->sensitive_buttons[21] = lookup_widget(app->window, "preferences2"); - app->sensitive_buttons[22] = lookup_widget(app->window, "revert1"); - app->sensitive_buttons[23] = lookup_widget(app->window, "menu_item4"); - app->sensitive_buttons[24] = lookup_widget(app->window, "menu_markers_margin1"); - app->sensitive_buttons[25] = lookup_widget(app->window, "menu_linenumber_margin1"); - app->sensitive_buttons[26] = lookup_widget(app->window, "menu_choose_color1"); - app->sensitive_buttons[27] = lookup_widget(app->window, "menu_zoom_in1"); - app->sensitive_buttons[28] = lookup_widget(app->window, "menu_zoom_out1"); - app->sensitive_buttons[29] = lookup_widget(app->window, "normal_size1"); - app->sensitive_buttons[30] = lookup_widget(app->window, "toolbutton24"); + app->sensitive_buttons[16] = lookup_widget(app->window, "search1"); + app->sensitive_buttons[17] = lookup_widget(app->window, "menu_paste1"); + app->sensitive_buttons[18] = lookup_widget(app->window, "menu_undo2"); + app->sensitive_buttons[19] = lookup_widget(app->window, "preferences2"); + app->sensitive_buttons[20] = lookup_widget(app->window, "revert1"); + app->sensitive_buttons[21] = lookup_widget(app->window, "menu_item4"); + app->sensitive_buttons[22] = lookup_widget(app->window, "menu_markers_margin1"); + app->sensitive_buttons[23] = lookup_widget(app->window, "menu_linenumber_margin1"); + app->sensitive_buttons[24] = lookup_widget(app->window, "menu_choose_color1"); + app->sensitive_buttons[25] = lookup_widget(app->window, "menu_zoom_in1"); + app->sensitive_buttons[26] = lookup_widget(app->window, "menu_zoom_out1"); + app->sensitive_buttons[27] = lookup_widget(app->window, "normal_size1"); + app->sensitive_buttons[28] = lookup_widget(app->window, "toolbutton24"); + app->sensitive_buttons[29] = lookup_widget(app->window, "toolbutton25"); + app->sensitive_buttons[30] = lookup_widget(app->window, "entry_goto_line"); + app->sensitive_buttons[31] = lookup_widget(app->window, "treeview6"); app->redo_items[0] = lookup_widget(app->popup_menu, "redo1"); app->redo_items[1] = lookup_widget(app->window, "menu_redo2"); app->undo_items[0] = lookup_widget(app->popup_menu, "undo1"); Modified: trunk/src/sci_cb.h =================================================================== --- trunk/src/sci_cb.h 2006-06-24 18:43:56 UTC (rev 476) +++ trunk/src/sci_cb.h 2006-06-24 18:46:08 UTC (rev 477) @@ -40,8 +40,6 @@ gboolean sci_cb_handle_xml(ScintillaObject *sci, gchar ch); -gboolean sci_cb_handle_uri(ScintillaObject *sci, gint pos); - gboolean sci_cb_show_calltip(ScintillaObject *sci, gint pos); void sci_cb_do_comment(gint idx); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany: [476] trunk
by eht16＠users.sourceforge.net 24 Jun '06

24 Jun '06

Revision: 476 Author: eht16 Date: 2006-06-24 11:43:56 -0700 (Sat, 24 Jun 2006) ViewCVS: http://svn.sourceforge.net/geany/?rev=476&view=rev Log Message: ----------- Removed URL highlighting code(useless feature, never was enabled). Set policy settings for the scolledwindow. Modified Paths: -------------- trunk/ChangeLog trunk/src/highlighting.c trunk/src/sci_cb.c trunk/src/treeviews.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2006-06-24 14:42:56 UTC (rev 475) +++ trunk/ChangeLog 2006-06-24 18:43:56 UTC (rev 476) @@ -10,7 +10,13 @@ tagmanager/tm_tag.c, tagmanager/tm_project, tagmanager/parsers.h, tagmanager/tm_file_entry.c, tagmanager/entry.c, src/highlighting.c, data/latex.tags, data/php.tags, Makefile.am: - Added global auto completion tags for PHP and LaTeX. + Added global auto completion tags for PHP and LaTeX. + * src/keybindings.c, src/callbacks.c, src/sci_cb.c, src/main.c, + src/geany.h, src/dialogs.c: + Added some sanity checks to prevent crashes. + * src/sci_cb.c, src/highlighting.c: + Removed URL highlighting code(useless feature, never was enabled). + * src/treeviews.c: Set policy settings for the scolledwindow. 2006-06-23 Nick Treleaven <nick.treleaven(a)btinternet.com> Modified: trunk/src/highlighting.c =================================================================== --- trunk/src/highlighting.c 2006-06-24 14:42:56 UTC (rev 475) +++ trunk/src/highlighting.c 2006-06-24 18:43:56 UTC (rev 476) @@ -801,9 +801,6 @@ SSM (sci, SCI_SETPROPERTY, (sptr_t) "phpscript.mode", (sptr_t) "1"); SSM (sci, SCI_SETLEXER, SCLEX_HTML, 0); - // DWELL notification for URL highlighting - //SSM(sci, SCI_SETMOUSEDWELLTIME, 500, 0); - // use the same colouring for HTML; XML and so on styleset_markup(sci); Modified: trunk/src/sci_cb.c =================================================================== --- trunk/src/sci_cb.c 2006-06-24 14:42:56 UTC (rev 475) +++ trunk/src/sci_cb.c 2006-06-24 18:43:56 UTC (rev 476) @@ -31,7 +31,6 @@ #include "sciwrappers.h" #include "utils.h" -static gint link_start, link_end, style; static gchar indent[100]; @@ -212,19 +211,6 @@ } break; } - case SCN_DWELLSTART: - { - //sci_cb_handle_uri(sci, nt->position); - break; - } - case SCN_DWELLEND: - { -/* gint end_of_styling = SSM(sci, SCI_GETENDSTYLED, 0, 0); - SSM(sci, SCI_STARTSTYLING, link_start, 31); - SSM(sci, SCI_SETSTYLING, (link_end - link_start) + 1, style); - SSM(sci, SCI_STARTSTYLING, end_of_styling, 31); -*/ break; - } /* case SCN_STYLENEEDED: { geany_debug("style"); @@ -363,12 +349,17 @@ gboolean sci_cb_show_calltip(ScintillaObject *sci, gint pos) { - gint lexer = SSM(sci, SCI_GETLEXER, 0, 0); + gint lexer; gint style; gchar word[GEANY_MAX_WORD_LENGTH]; - gint idx = document_find_by_sci(sci); + gint idx; const GPtrArray *tags; + if (sci == NULL) return FALSE; + + lexer = SSM(sci, SCI_GETLEXER, 0, 0); + idx = document_find_by_sci(sci); + word[0] = '\0'; if (pos == -1) { // position of '(' is unknown, so go backwards to find it @@ -409,6 +400,16 @@ gchar *root; const GPtrArray *tags; + if (sci == NULL) return FALSE; + + line = sci_get_line_from_position(sci, pos); + line_start = sci_get_position_from_line(sci, line); + line_len = sci_get_line_length(sci, line); + line_pos = pos - line_start - 1; + current = pos - line_start; + startword = current, lexer = SSM(sci, SCI_GETLEXER, 0, 0); + style = SSM(sci, SCI_GETSTYLEAT, pos, 0); + //if (lexer != SCLEX_CPP && lexer != SCLEX_HTML && lexer != SCLEX_PASCAL) return FALSE; if (lexer == SCLEX_HTML && style == SCE_H_DEFAULT) return FALSE; if (lexer == SCLEX_CPP && (style == SCE_C_COMMENT || @@ -669,9 +670,14 @@ { guint j, i; const GPtrArray *tags; - GPtrArray *ftags = g_ptr_array_sized_new(50); - GString *words = g_string_sized_new(200); + GPtrArray *ftags; + GString *words; + if (sci == NULL) return; + + ftags = g_ptr_array_sized_new(50); + words = g_string_sized_new(200); + for (j = 0; j < app->tm_workspace->work_objects->len; j++) { tags = tm_tags_extract(TM_WORK_OBJECT(app->tm_workspace->work_objects->pdata[j])->tags_array, @@ -795,94 +801,6 @@ } -/** - * This routine will find an uri like http://www.example.com or file:///tmp/test.c - * @parm pos The position where to start looking for an URI - * @return the position where the URI starts, or -1 if no URI was found - */ -gint sci_cb_handle_uri(ScintillaObject *sci, gint pos) -{ - gint lexer = SSM(sci, SCI_GETLEXER, 0, 0); - gint min, sel_start, sel_end, end_of_text, end_of_styling; - gint line = sci_get_line_from_position(sci, pos); - gint line_start = sci_get_position_from_line(sci, line); - gint line_end = line_start + sci_get_line_length(sci, line) - 1; - gchar sel[300], *begin, *cur, *uri; - - // This may make sense only in certain languages - if ((lexer != SCLEX_HTML && lexer != SCLEX_XML)) - return -1; - - if (pos < 0) return -1; - - if (SSM(sci, SCI_GETSTYLEAT, pos, 0) == SCE_H_VALUE || SSM(sci, SCI_GETSTYLEAT, pos, 0) == SCE_H_CDATA) - return -1; - - // Grab some characters around pos - min = pos - 149; - if (min < 0) min = 0; - end_of_text = pos + 149; - if (end_of_text > sci_get_length(sci)) end_of_text = sci_get_length(sci); - - sci_get_text_range(sci, min, end_of_text, sel); - sel[sizeof(sel) - 1] = '\0'; - - begin = &sel[0]; - cur = &sel[149]; - - sel_start = pos; - while (cur > begin) - { - if (*cur == '>') break; - else if (*cur == ' ') break; - else if (*cur == '"') break; - else if (*cur == '=') break; - --cur; - --sel_start; - } - // stay in the current line - if (sel_start < line_start) sel_start = line_start - 1; - sel_end = sel_start++; - - cur++; - while(cur > begin) - { - if (*cur == '\0') break; - else if (*cur == ' ') break; - else if (*cur == '"') break; - else if (*cur == '<') break; - else if (*cur == '>') break; - sel_end++; - cur++; - } - // stay in the current line - if (sel_end > line_end) sel_end = line_end - 1; - - // check wether uri contains ://, otherwise give up - uri = g_malloc0(sel_end - sel_start + 1); - sci_get_text_range(sci, sel_start, sel_end, uri); - if (strstr(uri, "://") == NULL) - { - g_free(uri); - return -1; - } - g_free(uri); - - end_of_styling = SSM(sci, SCI_GETENDSTYLED, 0, 0); - SSM(sci, SCI_STARTSTYLING, sel_start, 31); - SSM(sci, SCI_SETSTYLING, (sel_end - sel_start) + 1, SCE_H_QUESTION); - SSM(sci, SCI_STARTSTYLING, end_of_styling, 31); - - link_start = sel_start; - link_end = sel_end + 1; - style = SSM(sci, SCI_GETSTYLEAT, pos, 0); - - //geany_debug("pos: %d start: %d end: %d length: %d", pos, sel_start, sel_end, sel_end - sel_start); - - return -1; -} - - void sci_cb_do_comment(gint idx) { gint first_line; @@ -890,8 +808,12 @@ gint x, i, line_start, line_len; gchar sel[64], *co, *cc; gboolean break_loop = FALSE; - filetype *ft = doc_list[idx].file_type; + filetype *ft; + if (idx == -1 || ! doc_list[idx].is_valid) return; + + ft = doc_list[idx].file_type; + first_line = sci_get_line_from_position(doc_list[idx].sci, sci_get_selection_start(doc_list[idx].sci)); // Find the last line with chars selected (not EOL char) Modified: trunk/src/treeviews.c =================================================================== --- trunk/src/treeviews.c 2006-06-24 14:42:56 UTC (rev 475) +++ trunk/src/treeviews.c 2006-06-24 18:43:56 UTC (rev 476) @@ -176,6 +176,12 @@ tv.store_openfiles = gtk_list_store_new(2, G_TYPE_STRING, G_TYPE_INT); gtk_tree_view_set_model(GTK_TREE_VIEW(tv.tree_openfiles), GTK_TREE_MODEL(tv.store_openfiles)); + // set policy settings for the scolledwindow around the treeview again, because glade + // doesn't keep the settings + gtk_scrolled_window_set_policy( + GTK_SCROLLED_WINDOW(lookup_widget(app->window, "scrolledwindow7")), + GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC); + renderer = gtk_cell_renderer_text_new(); column = gtk_tree_view_column_new_with_attributes(_("Open files"), renderer, "text", 0, NULL); gtk_tree_view_append_column(GTK_TREE_VIEW(tv.tree_openfiles), column); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany: [475] trunk
by eht16＠users.sourceforge.net 24 Jun '06

24 Jun '06

Revision: 475 Author: eht16 Date: 2006-06-24 07:42:56 -0700 (Sat, 24 Jun 2006) ViewCVS: http://svn.sourceforge.net/geany/?rev=475&view=rev Log Message: ----------- Added global auto completion tags for PHP and LaTeX. Modified Paths: -------------- trunk/Makefile.am trunk/src/highlighting.c trunk/tagmanager/entry.c trunk/tagmanager/include/tm_source_file.h trunk/tagmanager/include/tm_tag.h trunk/tagmanager/include/tm_workspace.h trunk/tagmanager/parsers.h trunk/tagmanager/tm_file_entry.c trunk/tagmanager/tm_project.c trunk/tagmanager/tm_source_file.c trunk/tagmanager/tm_tag.c trunk/tagmanager/tm_workspace.c Added Paths: ----------- trunk/data/global.tags trunk/data/latex.tags trunk/data/php.tags Removed Paths: ------------- trunk/global.tags Modified: trunk/Makefile.am =================================================================== --- trunk/Makefile.am 2006-06-24 14:36:35 UTC (rev 474) +++ trunk/Makefile.am 2006-06-24 14:42:56 UTC (rev 475) @@ -8,7 +8,9 @@ geany.spec \ geany.glade \ geany.gladep \ - global.tags \ + data/global.tags \ + data/global.tags \ + data/latex.tags \ data/filetypes.* uninstall-local: @@ -26,7 +28,9 @@ done \ fi $(mkinstalldirs) $(DESTDIR)$(pkgdatadir); \ - $(INSTALL_DATA) global.tags $(DESTDIR)$(pkgdatadir); \ + $(INSTALL_DATA) data/global.tags $(DESTDIR)$(pkgdatadir); \ + $(INSTALL_DATA) data/php.tags $(DESTDIR)$(pkgdatadir); \ + $(INSTALL_DATA) data/latex.tags $(DESTDIR)$(pkgdatadir); \ $(INSTALL_DATA) COPYING $(DESTDIR)$(pkgdatadir)/GPL-2; \ for file in $(srcdir)/data/*; do \ if test -f $$file; then \ Added: trunk/data/global.tags =================================================================== --- trunk/data/global.tags (rev 0) +++ trunk/data/global.tags 2006-06-24 14:42:56 UTC (rev 475) @@ -0,0 +1,18304 @@ +ABS\xCC131072\xCD(a) +ALLOCATE_LOCAL\xCC131072\xCD(size) +ARRAY16\xCC4096\xCF_ARRAY16 +ARRAY16Ptr\xCC4096\xCF_ARRAY16 +ARRAY32\xCC4096\xCF_ARRAY32 +ARRAY32Ptr\xCC4096\xCF_ARRAY32 +ARRAY8\xCC4096\xCF_ARRAY8 +ARRAY8Ptr\xCC4096\xCF_ARRAY8 +ARRAYofARRAY8\xCC4096\xCF_ARRAYofARRAY8 +ARRAYofARRAY8Ptr\xCC4096\xCF_ARRAYofARRAY8 +ART_GNUC_PRINTF\xCC131072\xCD(format_idx,arg_idx) +ART_PIX_8_FROM_MAX\xCC131072\xCD(x) +ART_PIX_MAX_FROM_8\xCC131072\xCD(x) +ART_UTA_BBOX_CONS\xCC131072\xCD(x0,y0,x1,y1) +ART_UTA_BBOX_X0\xCC131072\xCD(ub) +ART_UTA_BBOX_X1\xCC131072\xCD(ub) +ART_UTA_BBOX_Y0\xCC131072\xCD(ub) +ART_UTA_BBOX_Y1\xCC131072\xCD(ub) +ATEXIT\xCC131072\xCD(proc) +ATK_ACTION\xCC131072\xCD(obj) +ATK_ACTION_GET_IFACE\xCC131072\xCD(obj) +ATK_COMPONENT\xCC131072\xCD(obj) +ATK_COMPONENT_GET_IFACE\xCC131072\xCD(obj) +ATK_DOCUMENT\xCC131072\xCD(obj) +ATK_DOCUMENT_GET_IFACE\xCC131072\xCD(obj) +ATK_EDITABLE_TEXT\xCC131072\xCD(obj) +ATK_EDITABLE_TEXT_GET_IFACE\xCC131072\xCD(obj) +ATK_GOBJECT_ACCESSIBLE\xCC131072\xCD(obj) +ATK_GOBJECT_ACCESSIBLE_CLASS\xCC131072\xCD(klass) +ATK_GOBJECT_ACCESSIBLE_GET_CLASS\xCC131072\xCD(obj) +ATK_HYPERLINK\xCC131072\xCD(obj) +ATK_HYPERLINK_CLASS\xCC131072\xCD(klass) +ATK_HYPERLINK_GET_CLASS\xCC131072\xCD(obj) +ATK_HYPERTEXT\xCC131072\xCD(obj) +ATK_HYPERTEXT_GET_IFACE\xCC131072\xCD(obj) +ATK_IMAGE\xCC131072\xCD(obj) +ATK_IMAGE_GET_IFACE\xCC131072\xCD(obj) +ATK_IMPLEMENTOR\xCC131072\xCD(obj) +ATK_IMPLEMENTOR_GET_IFACE\xCC131072\xCD(obj) +ATK_IS_ACTION\xCC131072\xCD(obj) +ATK_IS_COMPONENT\xCC131072\xCD(obj) +ATK_IS_DOCUMENT\xCC131072\xCD(obj) +ATK_IS_EDITABLE_TEXT\xCC131072\xCD(obj) +ATK_IS_GOBJECT_ACCESSIBLE\xCC131072\xCD(obj) +ATK_IS_GOBJECT_ACCESSIBLE_CLASS\xCC131072\xCD(klass) +ATK_IS_HYPERLINK\xCC131072\xCD(obj) +ATK_IS_HYPERLINK_CLASS\xCC131072\xCD(klass) +ATK_IS_HYPERTEXT\xCC131072\xCD(obj) +ATK_IS_IMAGE\xCC131072\xCD(obj) +ATK_IS_IMPLEMENTOR\xCC131072\xCD(obj) +ATK_IS_NO_OP_OBJECT\xCC131072\xCD(obj) +ATK_IS_NO_OP_OBJECT_CLASS\xCC131072\xCD(klass) +ATK_IS_NO_OP_OBJECT_FACTORY\xCC131072\xCD(obj) +ATK_IS_NO_OP_OBJECT_FACTORY_CLASS\xCC131072\xCD(klass) +ATK_IS_OBJECT\xCC131072\xCD(obj) +ATK_IS_OBJECT_CLASS\xCC131072\xCD(klass) +ATK_IS_OBJECT_FACTORY\xCC131072\xCD(obj) +ATK_IS_OBJECT_FACTORY_CLASS\xCC131072\xCD(klass) +ATK_IS_REGISTRY\xCC131072\xCD(obj) +ATK_IS_REGISTRY_CLASS\xCC131072\xCD(klass) +ATK_IS_RELATION\xCC131072\xCD(obj) +ATK_IS_RELATION_CLASS\xCC131072\xCD(klass) +ATK_IS_RELATION_SET\xCC131072\xCD(obj) +ATK_IS_RELATION_SET_CLASS\xCC131072\xCD(klass) +ATK_IS_SELECTION\xCC131072\xCD(obj) +ATK_IS_STATE_SET\xCC131072\xCD(obj) +ATK_IS_STATE_SET_CLASS\xCC131072\xCD(klass) +ATK_IS_STREAMABLE_CONTENT\xCC131072\xCD(obj) +ATK_IS_TABLE\xCC131072\xCD(obj) +ATK_IS_TEXT\xCC131072\xCD(obj) +ATK_IS_UTIL\xCC131072\xCD(obj) +ATK_IS_UTIL_CLASS\xCC131072\xCD(klass) +ATK_IS_VALUE\xCC131072\xCD(obj) +ATK_NO_OP_OBJECT\xCC131072\xCD(obj) +ATK_NO_OP_OBJECT_CLASS\xCC131072\xCD(klass) +ATK_NO_OP_OBJECT_FACTORY\xCC131072\xCD(obj) +ATK_NO_OP_OBJECT_FACTORY_CLASS\xCC131072\xCD(klass) +ATK_NO_OP_OBJECT_FACTORY_GET_CLASS\xCC131072\xCD(obj) +ATK_NO_OP_OBJECT_GET_CLASS\xCC131072\xCD(obj) +ATK_OBJECT\xCC131072\xCD(obj) +ATK_OBJECT_CLASS\xCC131072\xCD(klass) +ATK_OBJECT_FACTORY\xCC131072\xCD(obj) +ATK_OBJECT_FACTORY_CLASS\xCC131072\xCD(klass) +ATK_OBJECT_FACTORY_GET_CLASS\xCC131072\xCD(obj) +ATK_OBJECT_GET_CLASS\xCC131072\xCD(obj) +ATK_REGISTRY\xCC131072\xCD(obj) +ATK_REGISTRY_CLASS\xCC131072\xCD(klass) +ATK_REGISTRY_GET_CLASS\xCC131072\xCD(obj) +ATK_RELATION\xCC131072\xCD(obj) +ATK_RELATION_CLASS\xCC131072\xCD(klass) +ATK_RELATION_GET_CLASS\xCC131072\xCD(obj) +ATK_RELATION_SET\xCC131072\xCD(obj) +ATK_RELATION_SET_CLASS\xCC131072\xCD(klass) +ATK_RELATION_SET_GET_CLASS\xCC131072\xCD(obj) +ATK_SELECTION\xCC131072\xCD(obj) +ATK_SELECTION_GET_IFACE\xCC131072\xCD(obj) +ATK_STATE_SET\xCC131072\xCD(obj) +ATK_STATE_SET_CLASS\xCC131072\xCD(klass) +ATK_STATE_SET_GET_CLASS\xCC131072\xCD(obj) +ATK_STREAMABLE_CONTENT\xCC131072\xCD(obj) +ATK_STREAMABLE_CONTENT_GET_IFACE\xCC131072\xCD(obj) +ATK_TABLE\xCC131072\xCD(obj) +ATK_TABLE_GET_IFACE\xCC131072\xCD(obj) +ATK_TEXT\xCC131072\xCD(obj) +ATK_TEXT_GET_IFACE\xCC131072\xCD(obj) +ATK_UTIL\xCC131072\xCD(obj) +ATK_UTIL_CLASS\xCC131072\xCD(klass) +ATK_UTIL_GET_CLASS\xCC131072\xCD(obj) +ATK_VALUE\xCC131072\xCD(obj) +ATK_VALUE_GET_IFACE\xCC131072\xCD(obj) +AccContext\xCC4096\xCFFSID +ArtAlphaGamma\xCC4096\xCF_ArtAlphaGamma +ArtAlphaType\xCC4096 +ArtBpath\xCC4096\xCF_ArtBpath +ArtCompositingMode\xCC4096 +ArtDRect\xCC4096\xCF_ArtDRect +ArtDestroyNotify\xCC4096\xCFvoid +ArtFilterLevel\xCC4096 +ArtGradientLinear\xCC4096\xCF_ArtGradientLinear +ArtGradientRadial\xCC4096\xCF_ArtGradientRadial +ArtGradientSpread\xCC4096 +ArtGradientStop\xCC4096\xCF_ArtGradientStop +ArtIRect\xCC4096\xCF_ArtIRect +ArtImageSource\xCC4096\xCF_ArtImageSource +ArtImageSourceFlags\xCC4096 +ArtMaskSource\xCC4096\xCF_ArtMaskSource +ArtPathStrokeCapType\xCC4096 +ArtPathStrokeJoinType\xCC4096 +ArtPathcode\xCC4096 +ArtPixBuf\xCC4096\xCF_ArtPixBuf +ArtPixFormat\xCC4096 +ArtPixMaxDepth\xCC4096\xCFart_u16 +ArtPoint\xCC4096\xCF_ArtPoint +ArtRender\xCC4096\xCF_ArtRender +ArtRenderCallback\xCC4096\xCF_ArtRenderCallback +ArtRenderMaskRun\xCC4096\xCF_ArtRenderMaskRun +ArtSVP\xCC4096\xCF_ArtSVP +ArtSVPRenderAAIter\xCC4096\xCF_ArtSVPRenderAAIter +ArtSVPRenderAAStep\xCC4096\xCF_ArtSVPRenderAAStep +ArtSVPSeg\xCC4096\xCF_ArtSVPSeg +ArtSvpWriter\xCC4096\xCF_ArtSvpWriter +ArtUta\xCC4096\xCF_ArtUta +ArtUtaBbox\xCC4096\xCFart_u32 +ArtVpath\xCC4096\xCF_ArtVpath +ArtVpathDash\xCC4096\xCF_ArtVpathDash +ArtWindRule\xCC4096 +AtkAction\xCC4096\xCF_AtkAction +AtkActionIface\xCC4096\xCF_AtkActionIface +AtkAttribute\xCC4096\xCF_AtkAttribute +AtkAttributeSet\xCC4096\xCFGSList +AtkComponent\xCC4096\xCF_AtkComponent +AtkComponentIface\xCC4096\xCF_AtkComponentIface +AtkCoordType\xCC4096 +AtkDocument\xCC4096\xCF_AtkDocument +AtkDocumentIface\xCC4096\xCF_AtkDocumentIface +AtkEditableText\xCC4096\xCF_AtkEditableText +AtkEditableTextIface\xCC4096\xCF_AtkEditableTextIface +AtkEventListener\xCC4096\xCFvoid +AtkEventListenerInit\xCC4096\xCFvoid +AtkFocusHandler\xCC4096\xCFvoid +AtkFunction\xCC4096\xCFgboolean +AtkGObjectAccessible\xCC4096\xCF_AtkGObjectAccessible +AtkGObjectAccessibleClass\xCC4096\xCF_AtkGObjectAccessibleClass +AtkHyperlink\xCC4096\xCF_AtkHyperlink +AtkHyperlinkClass\xCC4096\xCF_AtkHyperlinkClass +AtkHyperlinkStateFlags\xCC4096 +AtkHypertext\xCC4096\xCF_AtkHypertext +AtkHypertextIface\xCC4096\xCF_AtkHypertextIface +AtkImage\xCC4096\xCF_AtkImage +AtkImageIface\xCC4096\xCF_AtkImageIface +AtkImplementor\xCC4096\xCF_AtkImplementor +AtkImplementorIface\xCC4096\xCF_AtkImplementorIface +AtkKeyEventStruct\xCC4096\xCF_AtkKeyEventStruct +AtkKeyEventType\xCC4096 +AtkKeySnoopFunc\xCC4096\xCFgint +AtkLayer\xCC4096 +AtkNoOpObject\xCC4096\xCF_AtkNoOpObject +AtkNoOpObjectClass\xCC4096\xCF_AtkNoOpObjectClass +AtkNoOpObjectFactory\xCC4096\xCF_AtkNoOpObjectFactory +AtkNoOpObjectFactoryClass\xCC4096\xCF_AtkNoOpObjectFactoryClass +AtkObject\xCC4096\xCF_AtkObject +AtkObjectClass\xCC4096\xCF_AtkObjectClass +AtkObjectFactory\xCC4096\xCF_AtkObjectFactory +AtkObjectFactoryClass\xCC4096\xCF_AtkObjectFactoryClass +AtkPropertyChangeHandler\xCC4096\xCFvoid +AtkPropertyValues\xCC4096\xCF_AtkPropertyValues +AtkRectangle\xCC4096\xCF_AtkRectangle +AtkRegistry\xCC4096\xCF_AtkRegistry +AtkRegistryClass\xCC4096\xCF_AtkRegistryClass +AtkRelation\xCC4096\xCF_AtkRelation +AtkRelationClass\xCC4096\xCF_AtkRelationClass +AtkRelationSet\xCC4096\xCF_AtkRelationSet +AtkRelationSetClass\xCC4096\xCF_AtkRelationSetClass +AtkRelationType\xCC4096 +AtkRole\xCC4096 +AtkSelection\xCC4096\xCF_AtkSelection +AtkSelectionIface\xCC4096\xCF_AtkSelectionIface +AtkState\xCC4096\xCFguint64 +AtkStateSet\xCC4096\xCF_AtkStateSet +AtkStateSetClass\xCC4096\xCF_AtkStateSetClass +AtkStateType\xCC4096 +AtkStreamableContent\xCC4096\xCF_AtkStreamableContent +AtkStreamableContentIface\xCC4096\xCF_AtkStreamableContentIface +AtkTable\xCC4096\xCF_AtkTable +AtkTableIface\xCC4096\xCF_AtkTableIface +AtkText\xCC4096\xCF_AtkText +AtkTextAttribute\xCC4096 +AtkTextBoundary\xCC4096 +AtkTextClipType\xCC4096 +AtkTextIface\xCC4096\xCF_AtkTextIface +AtkTextRange\xCC4096\xCF_AtkTextRange +AtkTextRectangle\xCC4096\xCF_AtkTextRectangle +AtkUtil\xCC4096\xCF_AtkUtil +AtkUtilClass\xCC4096\xCF_AtkUtilClass +AtkValue\xCC4096\xCF_AtkValue +AtkValueIface\xCC4096\xCF_AtkValueIface +Atom\xCC4096\xCFlong +BDF_Property\xCC4096\xCFBDF_PropertyRec_ +BDF_PropertyRec\xCC4096\xCFBDF_PropertyRec_ +BDF_PropertyType\xCC4096\xCFFT_END_HEADER +BDF_PropertyType_\xCC2 +BITS16\xCC4096\xCFCARD16 +BITS32\xCC4096\xCFCARD32 +BONOBO_ACTIVATION_FACTORY\xCC131072\xCD(oafiid,descr,version,callback,data) +BONOBO_ACTIVATION_FACTORY_TIMEOUT\xCC131072\xCD(oafiid,descr,version,callback,data,quit_timeout) +BONOBO_ACTIVATION_SHLIB_FACTORY\xCC131072\xCD(oafiid,descr,fn,data) +BONOBO_APPLICATION\xCC131072\xCD(o) +BONOBO_APPLICATION_CLASS\xCC131072\xCD(k) +BONOBO_APPLICATION_GET_CLASS\xCC131072\xCD(o) +BONOBO_APP_CLIENT\xCC131072\xCD(obj) +BONOBO_APP_CLIENT_CLASS\xCC131072\xCD(klass) +BONOBO_APP_CLIENT_GET_CLASS\xCC131072\xCD(obj) +BONOBO_ARG_GET_BOOLEAN\xCC131072\xCD(a) +BONOBO_ARG_GET_CHAR\xCC131072\xCD(a) +BONOBO_ARG_GET_DOUBLE\xCC131072\xCD(a) +BONOBO_ARG_GET_FLOAT\xCC131072\xCD(a) +BONOBO_ARG_GET_GENERAL\xCC131072\xCD(a,c,t,e) +BONOBO_ARG_GET_INT\xCC131072\xCD(a) +BONOBO_ARG_GET_LONG\xCC131072\xCD(a) +BONOBO_ARG_GET_LONGLONG\xCC131072\xCD(a) +BONOBO_ARG_GET_SHORT\xCC131072\xCD(a) +BONOBO_ARG_GET_STRING\xCC131072\xCD(a) +BONOBO_ARG_GET_ULONG\xCC131072\xCD(a) +BONOBO_ARG_SET_BOOLEAN\xCC131072\xCD(a,v) +BONOBO_ARG_SET_CHAR\xCC131072\xCD(a,v) +BONOBO_ARG_SET_DOUBLE\xCC131072\xCD(a,v) +BONOBO_ARG_SET_FLOAT\xCC131072\xCD(a,v) +BONOBO_ARG_SET_GENERAL\xCC131072\xCD(a,v,c,t,e) +BONOBO_ARG_SET_INT\xCC131072\xCD(a,v) +BONOBO_ARG_SET_LONG\xCC131072\xCD(a,v) +BONOBO_ARG_SET_LONGLONG\xCC131072\xCD(a,v) +BONOBO_ARG_SET_SHORT\xCC131072\xCD(a,v) +BONOBO_ARG_SET_STRING\xCC131072\xCD(a,v) +BONOBO_ARG_SET_ULONG\xCC131072\xCD(a,v) +BONOBO_BOILERPLATE\xCC131072\xCD(type,type_as_function,corba_type,parent_type,parent_type_macro,register_type_macro) +BONOBO_CALL_PARENT\xCC131072\xCD(parent_class_cast,name,args) +BONOBO_CALL_PARENT_WITH_DEFAULT\xCC131072\xCD(parent_class_cast,name,args,def_return) +BONOBO_CANVAS_COMPONENT\xCC131072\xCD(o) +BONOBO_CANVAS_COMPONENT_CLASS\xCC131072\xCD(k) +BONOBO_CANVAS_ITEM\xCC131072\xCD(obj) +BONOBO_CANVAS_ITEM_CLASS\xCC131072\xCD(k) +BONOBO_CLASS_BOILERPLATE\xCC131072\xCD(type,type_as_function,parent_type,parent_type_macro) +BONOBO_CLASS_BOILERPLATE_FULL\xCC131072\xCD(type,type_as_function,corba_type,parent_type,parent_type_macro) +BONOBO_CONTROL\xCC131072\xCD(o) +BONOBO_CONTROL_CLASS\xCC131072\xCD(k) +BONOBO_CONTROL_FRAME\xCC131072\xCD(o) +BONOBO_CONTROL_FRAME_CLASS\xCC131072\xCD(k) +BONOBO_COPY_FUNC\xCC131072\xCD(fn) +BONOBO_DOCK\xCC131072\xCD(obj) +BONOBO_DOCK_BAND\xCC131072\xCD(obj) +BONOBO_DOCK_BAND_CLASS\xCC131072\xCD(klass) +BONOBO_DOCK_BAND_GET_CLASS\xCC131072\xCD(obj) +BONOBO_DOCK_CLASS\xCC131072\xCD(klass) +BONOBO_DOCK_GET_CLASS\xCC131072\xCD(obj) +BONOBO_DOCK_ITEM\xCC131072\xCD(obj) +BONOBO_DOCK_ITEM_CLASS\xCC131072\xCD(klass) +BONOBO_DOCK_ITEM_GET_CLASS\xCC131072\xCD(obj) +BONOBO_DOCK_ITEM_NOT_LOCKED\xCC131072\xCD(x) +BONOBO_DOCK_LAYOUT\xCC131072\xCD(obj) +BONOBO_DOCK_LAYOUT_CLASS\xCC131072\xCD(klass) +BONOBO_DOCK_LAYOUT_GET_CLASS\xCC131072\xCD(obj) +BONOBO_EVENT_SOURCE\xCC131072\xCD(o) +BONOBO_EVENT_SOURCE_CLASS\xCC131072\xCD(k) +BONOBO_EX\xCC131072\xCD(ev) +BONOBO_EX_REPOID\xCC131072\xCD(ev) +BONOBO_FACTORY_INIT\xCC131072\xCD(desc,version,argcp,argv) +BONOBO_FOREIGN_OBJECT\xCC131072\xCD(o) +BONOBO_FOREIGN_OBJECT_CLASS\xCC131072\xCD(k) +BONOBO_FOREIGN_OBJECT_GET_CLASS\xCC131072\xCD(o) +BONOBO_GENERIC_FACTORY\xCC131072\xCD(o) +BONOBO_GENERIC_FACTORY_CLASS\xCC131072\xCD(k) +BONOBO_IS_APPLICATION\xCC131072\xCD(o) +BONOBO_IS_APPLICATION_CLASS\xCC131072\xCD(k) +BONOBO_IS_APP_CLIENT\xCC131072\xCD(obj) +BONOBO_IS_APP_CLIENT_CLASS\xCC131072\xCD(klass) +BONOBO_IS_CANVAS_COMPONENT\xCC131072\xCD(o) +BONOBO_IS_CANVAS_COMPONENT_CLASS\xCC131072\xCD(k) +BONOBO_IS_CANVAS_ITEM\xCC131072\xCD(o) +BONOBO_IS_CONTROL\xCC131072\xCD(o) +BONOBO_IS_CONTROL_CLASS\xCC131072\xCD(k) +BONOBO_IS_CONTROL_FRAME\xCC131072\xCD(o) +BONOBO_IS_CONTROL_FRAME_CLASS\xCC131072\xCD(k) +BONOBO_IS_DOCK\xCC131072\xCD(obj) +BONOBO_IS_DOCK_BAND\xCC131072\xCD(obj) +BONOBO_IS_DOCK_BAND_CLASS\xCC131072\xCD(klass) +BONOBO_IS_DOCK_CLASS\xCC131072\xCD(klass) +BONOBO_IS_DOCK_ITEM\xCC131072\xCD(obj) +BONOBO_IS_DOCK_ITEM_CLASS\xCC131072\xCD(klass) +BONOBO_IS_DOCK_LAYOUT\xCC131072\xCD(obj) +BONOBO_IS_DOCK_LAYOUT_CLASS\xCC131072\xCD(klass) +BONOBO_IS_EVENT_SOURCE\xCC131072\xCD(o) +BONOBO_IS_EVENT_SOURCE_CLASS\xCC131072\xCD(k) +BONOBO_IS_FOREIGN_OBJECT\xCC131072\xCD(o) +BONOBO_IS_FOREIGN_OBJECT_CLASS\xCC131072\xCD(k) +BONOBO_IS_GENERIC_FACTORY\xCC131072\xCD(o) +BONOBO_IS_GENERIC_FACTORY_CLASS\xCC131072\xCD(k) +BONOBO_IS_ITEM_CONTAINER\xCC131072\xCD(o) +BONOBO_IS_ITEM_CONTAINER_CLASS\xCC131072\xCD(k) +BONOBO_IS_ITEM_HANDLER\xCC131072\xCD(o) +BONOBO_IS_ITEM_HANDLER_CLASS\xCC131072\xCD(k) +BONOBO_IS_LISTENER\xCC131072\xCD(o) +BONOBO_IS_LISTENER_CLASS\xCC131072\xCD(k) +BONOBO_IS_MONIKER\xCC131072\xCD(o) +BONOBO_IS_MONIKER_CLASS\xCC131072\xCD(k) +BONOBO_IS_MONIKER_EXTENDER\xCC131072\xCD(o) +BONOBO_IS_MONIKER_EXTENDER_CLASS\xCC131072\xCD(k) +BONOBO_IS_MONIKER_SIMPLE\xCC131072\xCD(o) +BONOBO_IS_MONIKER_SIMPLE_CLASS\xCC131072\xCD(k) +BONOBO_IS_OBJECT\xCC131072\xCD(o) +BONOBO_IS_OBJECT_CLASS\xCC131072\xCD(k) +BONOBO_IS_PERSIST\xCC131072\xCD(o) +BONOBO_IS_PERSIST_CLASS\xCC131072\xCD(k) +BONOBO_IS_PERSIST_FILE\xCC131072\xCD(o) +BONOBO_IS_PERSIST_FILE_CLASS\xCC131072\xCD(k) +BONOBO_IS_PERSIST_STREAM\xCC131072\xCD(o) +BONOBO_IS_PERSIST_STREAM_CLASS\xCC131072\xCD(k) +BONOBO_IS_PLUG\xCC131072\xCD(obj) +BONOBO_IS_PROPERTY_BAG\xCC131072\xCD(o) +BONOBO_IS_PROPERTY_BAG_CLASS\xCC131072\xCD(k) +BONOBO_IS_PROPERTY_CONTROL\xCC131072\xCD(o) +BONOBO_IS_PROPERTY_CONTROL_CLASS\xCC131072\xCD(k) +BONOBO_IS_SELECTOR\xCC131072\xCD(obj) +BONOBO_IS_SELECTOR_WIDGET\xCC131072\xCD(obj) +BONOBO_IS_SHLIB_FACTORY\xCC131072\xCD(o) +BONOBO_IS_SHLIB_FACTORY_CLASS\xCC131072\xCD(k) +BONOBO_IS_SOCKET\xCC131072\xCD(obj) +BONOBO_IS_STORAGE_MEM\xCC131072\xCD(o) +BONOBO_IS_STORAGE_MEM_CLASS\xCC131072\xCD(k) +BONOBO_IS_STREAM_MEM\xCC131072\xCD(o) +BONOBO_IS_STREAM_MEM_CLASS\xCC131072\xCD(k) +BONOBO_IS_UI_COMPONENT\xCC131072\xCD(o) +BONOBO_IS_UI_COMPONENT_CLASS\xCC131072\xCD(k) +BONOBO_IS_UI_CONFIG_WIDGET\xCC131072\xCD(obj) +BONOBO_IS_UI_CONTAINER\xCC131072\xCD(o) +BONOBO_IS_UI_CONTAINER_CLASS\xCC131072\xCD(k) +BONOBO_IS_UI_ENGINE\xCC131072\xCD(obj) +BONOBO_IS_UI_ENGINE_CLASS\xCC131072\xCD(klass) +BONOBO_IS_UI_TOOLBAR\xCC131072\xCD(obj) +BONOBO_IS_UI_TOOLBAR_BUTTON_ITEM\xCC131072\xCD(obj) +BONOBO_IS_UI_TOOLBAR_BUTTON_ITEM_CLASS\xCC131072\xCD(klass) +BONOBO_IS_UI_TOOLBAR_CLASS\xCC131072\xCD(klass) +BONOBO_IS_UI_TOOLBAR_ITEM\xCC131072\xCD(obj) +BONOBO_IS_UI_TOOLBAR_ITEM_CLASS\xCC131072\xCD(klass) +BONOBO_IS_UI_TOOLBAR_TOGGLE_BUTTON_ITEM\xCC131072\xCD(obj) +BONOBO_IS_UI_TOOLBAR_TOGGLE_BUTTON_ITEM_CLASS\xCC131072\xCD(klass) +BONOBO_IS_WIDGET\xCC131072\xCD(o) +BONOBO_IS_WIDGET_CLASS\xCC131072\xCD(k) +BONOBO_IS_WINDOW\xCC131072\xCD(o) +BONOBO_IS_WINDOW_CLASS\xCC131072\xCD(k) +BONOBO_IS_X_OBJECT\xCC131072\xCD(o) +BONOBO_IS_X_OBJECT_CLASS\xCC131072\xCD(k) +BONOBO_IS_ZOOMABLE\xCC131072\xCD(o) +BONOBO_IS_ZOOMABLE_CLASS\xCC131072\xCD(k) +BONOBO_IS_ZOOMABLE_FRAME\xCC131072\xCD(o) +BONOBO_IS_ZOOMABLE_FRAME_CLASS\xCC131072\xCD(k) +BONOBO_ITEM_CONTAINER\xCC131072\xCD(o) +BONOBO_ITEM_CONTAINER_CLASS\xCC131072\xCD(k) +BONOBO_ITEM_HANDLER\xCC131072\xCD(o) +BONOBO_ITEM_HANDLER_CLASS\xCC131072\xCD(k) +BONOBO_LISTENER\xCC131072\xCD(o) +BONOBO_LISTENER_CLASS\xCC131072\xCD(k) +BONOBO_MONIKER\xCC131072\xCD(o) +BONOBO_MONIKER_CLASS\xCC131072\xCD(k) +BONOBO_MONIKER_EXTENDER\xCC131072\xCD(o) +BONOBO_MONIKER_EXTENDER_CLASS\xCC131072\xCD(k) +BONOBO_MONIKER_SIMPLE\xCC131072\xCD(o) +BONOBO_MONIKER_SIMPLE_CLASS\xCC131072\xCD(k) +BONOBO_OAF_FACTORY\xCC131072\xCD(oafiid,descr,version,callback,data) +BONOBO_OAF_FACTORY_MULTI\xCC131072\xCD(oafiid,descr,version,callback,data) +BONOBO_OAF_SHLIB_FACTORY\xCC131072\xCD(oafiid,descr,fn,data) +BONOBO_OAF_SHLIB_FACTORY_MULTI\xCC131072\xCD(oafiid,descr,fn,data) +BONOBO_OBJECT\xCC131072\xCD(o) +BONOBO_OBJECT_CHECK\xCC131072\xCD(o,c,e) +BONOBO_OBJECT_CLASS\xCC131072\xCD(k) +BONOBO_OBJECT_GET_CLASS\xCC131072\xCD(o) +BONOBO_OBJREF\xCC131072\xCD(o) +BONOBO_PERSIST\xCC131072\xCD(o) +BONOBO_PERSIST_CLASS\xCC131072\xCD(k) +BONOBO_PERSIST_FILE\xCC131072\xCD(o) +BONOBO_PERSIST_FILE_CLASS\xCC131072\xCD(k) +BONOBO_PERSIST_STREAM\xCC131072\xCD(o) +BONOBO_PERSIST_STREAM_CLASS\xCC131072\xCD(k) +BONOBO_PLUG\xCC131072\xCD(obj) +BONOBO_PLUG_CLASS\xCC131072\xCD(klass) +BONOBO_PROPERTY_BAG\xCC131072\xCD(o) +BONOBO_PROPERTY_BAG_CLASS\xCC131072\xCD(k) +BONOBO_PROPERTY_CONTROL\xCC131072\xCD(o) +BONOBO_PROPERTY_CONTROL_CLASS\xCC131072\xCD(k) +BONOBO_REGISTER_TYPE\xCC131072\xCD(type,type_as_function,corba_type,parent_type,parent_type_macro) +BONOBO_REGISTER_TYPE_FULL\xCC131072\xCD(type,type_as_function,corba_type,parent_type,parent_type_macro) +BONOBO_RET_EX\xCC131072\xCD(ev) +BONOBO_RET_VAL_EX\xCC131072\xCD(ev,v) +BONOBO_SELECTOR\xCC131072\xCD(obj) +BONOBO_SELECTOR_CLASS\xCC131072\xCD(klass) +BONOBO_SELECTOR_WIDGET\xCC131072\xCD(obj) +BONOBO_SELECTOR_WIDGET_CLASS\xCC131072\xCD(klass) +BONOBO_SHLIB_FACTORY\xCC131072\xCD(o) +BONOBO_SHLIB_FACTORY_CLASS\xCC131072\xCD(k) +BONOBO_SOCKET\xCC131072\xCD(obj) +BONOBO_SOCKET_CLASS\xCC131072\xCD(klass) +BONOBO_STORAGE\xCC131072\xCD(o) +BONOBO_STORAGE_CLASS\xCC131072\xCD(k) +BONOBO_STORAGE_MEM\xCC131072\xCD(o) +BONOBO_STORAGE_MEM_CLASS\xCC131072\xCD(k) +BONOBO_STREAM\xCC131072\xCD(o) +BONOBO_STREAM_CLASS\xCC131072\xCD(k) +BONOBO_STREAM_MEM\xCC131072\xCD(o) +BONOBO_STREAM_MEM_CLASS\xCC131072\xCD(k) +BONOBO_TYPE_FUNC\xCC131072\xCD(class_name,parent,prefix) +BONOBO_TYPE_FUNC_FULL\xCC131072\xCD(class_name,corba_name,parent,prefix) +BONOBO_UI_COMPONENT\xCC131072\xCD(o) +BONOBO_UI_COMPONENT_CLASS\xCC131072\xCD(k) +BONOBO_UI_CONFIG_WIDGET\xCC131072\xCD(obj) +BONOBO_UI_CONFIG_WIDGET_CLASS\xCC131072\xCD(klass) +BONOBO_UI_CONTAINER\xCC131072\xCD(o) +BONOBO_UI_CONTAINER_CLASS\xCC131072\xCD(k) +BONOBO_UI_ENGINE\xCC131072\xCD(obj) +BONOBO_UI_ENGINE_CLASS\xCC131072\xCD(klass) +BONOBO_UI_TOOLBAR\xCC131072\xCD(obj) +BONOBO_UI_TOOLBAR_BUTTON_ITEM\xCC131072\xCD(obj) +BONOBO_UI_TOOLBAR_BUTTON_ITEM_CLASS\xCC131072\xCD(klass) +BONOBO_UI_TOOLBAR_CLASS\xCC131072\xCD(klass) +BONOBO_UI_TOOLBAR_ITEM\xCC131072\xCD(obj) +BONOBO_UI_TOOLBAR_ITEM_CLASS\xCC131072\xCD(klass) +BONOBO_UI_TOOLBAR_TOGGLE_BUTTON_ITEM\xCC131072\xCD(obj) +BONOBO_UI_TOOLBAR_TOGGLE_BUTTON_ITEM_CLASS\xCC131072\xCD(klass) +BONOBO_UI_UNSAFE_VERB\xCC131072\xCD(name,cb) +BONOBO_UI_UNSAFE_VERB_DATA\xCC131072\xCD(name,cb,data) +BONOBO_UI_VERB\xCC131072\xCD(name,cb) +BONOBO_UI_VERB_DATA\xCC131072\xCD(name,cb,data) +BONOBO_USER_EX\xCC131072\xCD(ev,id) +BONOBO_VALUE_HOLDS_CORBA_ANY\xCC131072\xCD(value) +BONOBO_VALUE_HOLDS_CORBA_EXCEPTION\xCC131072\xCD(value) +BONOBO_VALUE_HOLDS_CORBA_OBJECT\xCC131072\xCD(value) +BONOBO_VALUE_HOLDS_CORBA_TYPECODE\xCC131072\xCD(value) +BONOBO_VALUE_HOLDS_UNKNOWN\xCC131072\xCD(value) +BONOBO_WIDGET\xCC131072\xCD(o) +BONOBO_WIDGET_CLASS\xCC131072\xCD(k) +BONOBO_WINDOW\xCC131072\xCD(o) +BONOBO_WINDOW_CLASS\xCC131072\xCD(k) +BONOBO_X_OBJECT\xCC131072\xCD(o) +BONOBO_X_OBJECT_CLASS\xCC131072\xCD(k) +BONOBO_X_OBJECT_GET_SERVANT\xCC131072\xCD(o) +BONOBO_X_SERVANT_GET_OBJECT\xCC131072\xCD(o) +BONOBO_X_TYPE_FUNC\xCC131072\xCD(class_name,parent,prefix) +BONOBO_X_TYPE_FUNC_FULL\xCC131072\xCD(class_name,corba_name,parent,prefix) +BONOBO_ZOOMABLE\xCC131072\xCD(o) +BONOBO_ZOOMABLE_CLASS\xCC131072\xCD(k) +BONOBO_ZOOMABLE_FRAME\xCC131072\xCD(o) +BONOBO_ZOOMABLE_FRAME_CLASS\xCC131072\xCD(k) +BONOBO_ZOOMABLE_GET_CLASS\xCC131072\xCD(o) +BOOL\xCC4096\xCFCARD8 +BYTE\xCC4096\xCFCARD8 +BeforeFlushType\xCC4096\xCFvoid +BitmapBitOrder\xCC131072\xCD(dpy) +BitmapPad\xCC131072\xCD(dpy) +BitmapUnit\xCC131072\xCD(dpy) +BlackPixel\xCC131072\xCD(dpy,scr) +BlackPixelOfScreen\xCC131072\xCD(s) +BlockHandlerProcPtr\xCC4096\xCFvoid +BonoboActivationCallback\xCC4096\xCFvoid +BonoboActivationPlugin\xCC4096 +BonoboActivationPluginObject\xCC4096 +BonoboAppClient\xCC4096\xCF_BonoboAppClient +BonoboAppClientClass\xCC4096\xCF_BonoboAppClientClass +BonoboAppClientMsgDesc\xCC4096\xCF_BonoboAppClientMsgDesc +BonoboAppHookFunc\xCC4096\xCFvoid +BonoboApplication\xCC4096\xCF_BonoboApplication +BonoboApplicationClass\xCC4096\xCF_BonoboApplicationClass +BonoboArg\xCC4096\xCFCORBA_any +BonoboArgFromGValueFn\xCC4096\xCFvoid +BonoboArgToGValueFn\xCC4096\xCFvoid +BonoboArgType\xCC4096\xCFCORBA_TypeCode +BonoboCanvasComponent\xCC4096 +BonoboCanvasComponentClass\xCC4096 +BonoboCanvasComponentPrivate\xCC4096\xCF_BonoboCanvasComponentPrivate +BonoboCanvasItem\xCC4096\xCF_BonoboCanvasItem +BonoboCanvasItemClass\xCC4096 +BonoboCanvasItemPrivate\xCC4096\xCF_BonoboCanvasItemPrivate +BonoboControl\xCC4096\xCF_BonoboControl +BonoboControlClass\xCC4096 +BonoboControlFrame\xCC4096\xCF_BonoboControlFrame +BonoboControlFrameClass\xCC4096 +BonoboControlFramePrivate\xCC4096\xCF_BonoboControlFramePrivate +BonoboControlLifeCallback\xCC4096\xCFvoid +BonoboControlPrivate\xCC4096\xCF_BonoboControlPrivate +BonoboCopyFunc\xCC4096\xCFgpointer +BonoboDock\xCC4096\xCF_BonoboDock +BonoboDockBand\xCC4096\xCF_BonoboDockBand +BonoboDockBandChild\xCC4096\xCF_BonoboDockBandChild +BonoboDockBandClass\xCC4096\xCF_BonoboDockBandClass +BonoboDockBandPrivate\xCC4096\xCF_BonoboDockBandPrivate +BonoboDockClass\xCC4096\xCF_BonoboDockClass +BonoboDockItem\xCC4096\xCF_BonoboDockItem +BonoboDockItemBehavior\xCC4096 +BonoboDockItemClass\xCC4096\xCF_BonoboDockItemClass +BonoboDockItemPrivate\xCC4096\xCF_BonoboDockItemPrivate +BonoboDockLayout\xCC4096\xCF_BonoboDockLayout +BonoboDockLayoutClass\xCC4096\xCF_BonoboDockLayoutClass +BonoboDockLayoutItem\xCC4096\xCF_BonoboDockLayoutItem +BonoboDockLayoutPrivate\xCC4096\xCF_BonoboDockLayoutPrivate +BonoboDockPlacement\xCC4096 +BonoboDockPrivate\xCC4096\xCF_BonoboDockPrivate +BonoboEventSource\xCC4096\xCF_BonoboEventSource +BonoboEventSourceClass\xCC4096 +BonoboEventSourcePrivate\xCC4096\xCF_BonoboEventSourcePrivate +BonoboExceptionFn\xCC4096\xCFchar +BonoboFactoryCallback\xCC4096\xCFBonoboObject +BonoboForeignObject\xCC4096\xCF_BonoboForeignObject +BonoboForeignObjectClass\xCC4096 +BonoboGenericFactory\xCC4096\xCF_BonoboGenericFactory +BonoboGenericFactoryClass\xCC4096 +BonoboGenericFactoryPrivate\xCC4096\xCF_BonoboGenericFactoryPrivate +BonoboItemContainer\xCC4096\xCF_BonoboItemContainer +BonoboItemContainerClass\xCC4096 +BonoboItemContainerPrivate\xCC4096\xCF_BonoboItemContainerPrivate +BonoboItemHandler\xCC4096\xCF_BonoboItemHandler +BonoboItemHandlerClass\xCC4096 +BonoboItemHandlerEnumObjectsFn\xCC4096\xCFBonobo_ItemContainer_ObjectNames +BonoboItemHandlerGetObjectFn\xCC4096\xCFBonobo_Unknown +BonoboItemHandlerPrivate\xCC4096\xCF_BonoboItemHandlerPrivate +BonoboItemOption\xCC4096 +BonoboListener\xCC4096\xCF_BonoboListener +BonoboListenerCallbackFn\xCC4096\xCFvoid +BonoboListenerClass\xCC4096 +BonoboListenerPrivate\xCC4096\xCF_BonoboListenerPrivate +BonoboMoniker\xCC4096\xCF_BonoboMoniker +BonoboMonikerAsyncFn\xCC4096\xCFvoid +BonoboMonikerClass\xCC4096 +BonoboMonikerExtender\xCC4096\xCF_BonoboMonikerExtender +BonoboMonikerExtenderClass\xCC4096 +BonoboMonikerExtenderFn\xCC4096\xCFBonobo_Unknown +BonoboMonikerPrivate\xCC4096\xCF_BonoboMonikerPrivate +BonoboMonikerSimple\xCC4096\xCF_BonoboMonikerSimple +BonoboMonikerSimpleClass\xCC4096 +BonoboMonikerSimplePrivate\xCC4096\xCF_BonoboMonikerSimplePrivate +BonoboMonikerSimpleResolveFn\xCC4096\xCFBonobo_Unknown +BonoboObject\xCC4096\xCF_BonoboObject +BonoboObjectBag\xCC4096\xCF_BonoboObjectBag +BonoboObjectClass\xCC4096 +BonoboObjectHeader\xCC4096 +BonoboObjectPOAFn\xCC4096\xCFvoid +BonoboObjectPrivate\xCC4096\xCF_BonoboObjectPrivate +BonoboPersist\xCC4096\xCF_BonoboPersist +BonoboPersistClass\xCC4096 +BonoboPersistFile\xCC4096\xCF_BonoboPersistFile +BonoboPersistFileClass\xCC4096 +BonoboPersistFileIOFn\xCC4096\xCFint +BonoboPersistFilePrivate\xCC4096\xCF_BonoboPersistFilePrivate +BonoboPersistPrivate\xCC4096\xCF_BonoboPersistPrivate +BonoboPersistStream\xCC4096\xCF_BonoboPersistStream +BonoboPersistStreamClass\xCC4096 +BonoboPersistStreamIOFn\xCC4096\xCFvoid +BonoboPersistStreamPrivate\xCC4096\xCF_BonoboPersistStreamPrivate +BonoboPersistStreamTypesFn\xCC4096\xCFBonobo_Persist_ContentTypeList +BonoboPlug\xCC4096\xCF_BonoboPlug +BonoboPlugClass\xCC4096 +BonoboPlugPrivate\xCC4096\xCF_BonoboPlugPrivate +BonoboProperty\xCC4096\xCF_BonoboProperty +BonoboPropertyBag\xCC4096\xCF_BonoboPropertyBag +BonoboPropertyBagClass\xCC4096 +BonoboPropertyBagPrivate\xCC4096\xCF_BonoboPropertyBagPrivate +BonoboPropertyControl\xCC4096\xCF_BonoboPropertyControl +BonoboPropertyControlClass\xCC4096 +BonoboPropertyControlGetControlFn\xCC4096\xCFBonoboControl +BonoboPropertyControlPrivate\xCC4096\xCF_BonoboPropertyControlPrivate +BonoboPropertyGetFn\xCC4096\xCFvoid +BonoboPropertyPrivate\xCC4096\xCF_BonoboPropertyPrivate +BonoboPropertySetFn\xCC4096\xCFvoid +BonoboSelector\xCC4096\xCF_BonoboSelector +BonoboSelectorClass\xCC4096 +BonoboSelectorPrivate\xCC4096\xCF_BonoboSelectorPrivate +BonoboSelectorWidget\xCC4096 +BonoboSelectorWidgetClass\xCC4096 +BonoboSelectorWidgetPrivate\xCC4096\xCF_BonoboSelectorWidgetPrivate +BonoboShlibFactory\xCC4096\xCF_BonoboShlibFactory +BonoboShlibFactoryClass\xCC4096 +BonoboShlibFactoryPrivate\xCC4096\xCF_BonoboShlibFactoryPrivate +BonoboSocket\xCC4096\xCF_BonoboSocket +BonoboSocketClass\xCC4096 +BonoboStorageMem\xCC4096\xCF_BonoboStorageMem +BonoboStorageMemClass\xCC4096 +BonoboStorageMemPriv\xCC4096\xCF_BonoboStorageMemPriv +BonoboStreamMem\xCC4096\xCF_BonoboStreamMem +BonoboStreamMemClass\xCC4096 +BonoboStreamMemPrivate\xCC4096\xCF_BonoboStreamMemPrivate +BonoboUIComponent\xCC4096\xCF_BonoboUIComponent +BonoboUIComponentClass\xCC4096 +BonoboUIComponentPrivate\xCC4096\xCF_BonoboUIComponentPrivate +BonoboUIConfigWidget\xCC4096 +BonoboUIConfigWidgetClass\xCC4096 +BonoboUIConfigWidgetPrivate\xCC4096\xCF_BonoboUIConfigWidgetPrivate +BonoboUIContainer\xCC4096\xCF_BonoboUIContainer +BonoboUIContainerClass\xCC4096 +BonoboUIContainerPrivate\xCC4096\xCF_BonoboUIContainerPrivate +BonoboUIEngine\xCC4096\xCF_BonoboUIEngine +BonoboUIListenerFn\xCC4096\xCFvoid +BonoboUINode\xCC4096\xCF_BonoboUINode +BonoboUIToolbar\xCC4096 +BonoboUIToolbarButtonItem\xCC4096 +BonoboUIToolbarButtonItemClass\xCC4096 +BonoboUIToolbarButtonItemPrivate\xCC4096\xCF_BonoboUIToolbarButtonItemPrivate +BonoboUIToolbarClass\xCC4096 +BonoboUIToolbarItem\xCC4096 +BonoboUIToolbarItemClass\xCC4096 +BonoboUIToolbarItemPrivate\xCC4096\xCF_BonoboUIToolbarItemPrivate +BonoboUIToolbarItemStyle\xCC4096 +BonoboUIToolbarPrivate\xCC4096\xCF_BonoboUIToolbarPrivate +BonoboUIToolbarStyle\xCC4096 +BonoboUIToolbarToggleButtonItem\xCC4096 +BonoboUIToolbarToggleButtonItemClass\xCC4096 +BonoboUIToolbarToggleButtonItemPrivate\xCC4096\xCF_BonoboUIToolbarToggleButtonItemPrivate +BonoboUIVerb\xCC4096 +BonoboUIVerbFn\xCC4096\xCFvoid +BonoboWidget\xCC4096\xCF_BonoboWidget +BonoboWidgetAsyncFn\xCC4096\xCFvoid +BonoboWidgetClass\xCC4096 +BonoboWidgetPrivate\xCC4096\xCF_BonoboWidgetPrivate +BonoboWindow\xCC4096\xCF_BonoboWindow +BonoboWindowClass\xCC4096 +BonoboWindowPrivate\xCC4096\xCF_BonoboWindowPrivate +BonoboZoomable\xCC4096 +BonoboZoomableClass\xCC4096 +BonoboZoomableFrame\xCC4096 +BonoboZoomableFrameClass\xCC4096 +BonoboZoomableFramePrivate\xCC4096\xCF_BonoboZoomableFramePrivate +BonoboZoomablePrivate\xCC4096\xCF_BonoboZoomablePrivate +Bonobo_ActivationEnvValue\xCC4096\xCFBonobo_ActivationEnvValue_type +Bonobo_ActivationEnvValue__alloc\xCC131072\xCD() +Bonobo_ActivationEnvValue__freekids\xCC131072\xCD(m,d) +Bonobo_ActivationEnvironment\xCC4096\xCFCORBA_sequence_Bonobo_ActivationEnvValue +Bonobo_ActivationEnvironment__alloc\xCC131072\xCD() +Bonobo_ActivationEnvironment__freekids\xCC131072\xCD(m,d) +Bonobo_ActivationEnvironment_allocbuf\xCC131072\xCD(l) +Bonobo_ActivationEnvironment_demarshal\xCC131072\xCD(x,y,z,i) +Bonobo_ActivationEnvironment_marshal\xCC131072\xCD(x,y,z) +Bonobo_ActivationFlags\xCC4096\xCFCORBA_long +Bonobo_ActivationFlags__alloc\xCC131072\xCD() +Bonobo_ActivationFlags__freekids\xCC131072\xCD(m,d) +Bonobo_ActivationFlags_demarshal\xCC131072\xCD(x,y,z,i) +Bonobo_ActivationFlags_marshal\xCC131072\xCD(x,y,z) +Bonobo_ActivationID\xCC4096\xCFCORBA_string +Bonobo_ActivationID__alloc\xCC131072\xCD() +Bonobo_ActivationID__freekids\xCC131072\xCD(m,d) +Bonobo_ActivationID_demarshal\xCC131072\xCD(x,y,z,i) +Bonobo_ActivationID_marshal\xCC131072\xCD(x,y,z) +Bonobo_ActivationProperty\xCC4096\xCFBonobo_ActivationProperty_type +Bonobo_ActivationPropertyType\xCC4096 +Bonobo_ActivationPropertyValue\xCC4096\xCFBonobo_ActivationPropertyValue_type +Bonobo_ActivationPropertyValue__alloc\xCC131072\xCD() +Bonobo_ActivationPropertyValue__freekids\xCC131072\xCD(m,d) +Bonobo_ActivationPropertyValue_copy\xCC1024\xCD(Bonobo_ActivationPropertyValue *copy, const Bonobo_ActivationPropertyValue *original)\xCFvoid +Bonobo_ActivationProperty__alloc\xCC131072\xCD() +Bonobo_ActivationProperty__freekids\xCC131072\xCD(m,d) +Bonobo_ActivationProperty_copy\xCC1024\xCD(Bonobo_ActivationProperty *copy, const Bonobo_ActivationProperty *original)\xCFvoid +Bonobo_ActivationResult\xCC4096\xCFBonobo_ActivationResult_type +Bonobo_ActivationResultData\xCC4096\xCFBonobo_ActivationResultData_type +Bonobo_ActivationResultData__alloc\xCC131072\xCD() +Bonobo_ActivationResultData__freekids\xCC131072\xCD(m,d) +Bonobo_ActivationResultType\xCC4096 +Bonobo_ActivationResult__alloc\xCC131072\xCD() +Bonobo_ActivationResult__freekids\xCC131072\xCD(m,d) +Bonobo_Activation_AlreadyListed\xCC4096\xCFBonobo_Activation_AlreadyListed_type +Bonobo_Activation_AlreadyListed__alloc\xCC131072\xCD() +Bonobo_Activation_AlreadyListed__freekids\xCC131072\xCD(m,d) +Bonobo_Activation_IncompleteContext\xCC4096\xCFBonobo_Activation_IncompleteContext_type +Bonobo_Activation_IncompleteContext__alloc\xCC131072\xCD() +Bonobo_Activation_IncompleteContext__freekids\xCC131072\xCD(m,d) +Bonobo_Activation_NotListed\xCC4096\xCFBonobo_Activation_NotListed_type +Bonobo_Activation_NotListed__alloc\xCC131072\xCD() +Bonobo_Activation_NotListed__freekids\xCC131072\xCD(m,d) +Bonobo_Activation_ParseFailed\xCC4096\xCFBonobo_Activation_ParseFailed_type +Bonobo_Activation_ParseFailed__alloc\xCC131072\xCD() +Bonobo_Activation_ParseFailed__freekids\xCC131072\xCD(m,d) +Bonobo_Application\xCC4096\xCFCORBA_Object +Bonobo_Application_ArgList\xCC4096\xCFCORBA_sequence_CORBA_any +Bonobo_Application_ArgList__alloc\xCC131072\xCD() +Bonobo_Application_ArgList__freekids\xCC131072\xCD(m,d) +Bonobo_Application_ArgList_allocbuf\xCC131072\xCD(l) +Bonobo_Application_ArgList_demarshal\xCC131072\xCD(x,y,z,i) +Bonobo_Application_ArgList_marshal\xCC131072\xCD(x,y,z) +Bonobo_Application_MessageDesc\xCC4096\xCFBonobo_Application_MessageDesc_type +Bonobo_Application_MessageDesc__alloc\xCC131072\xCD() +Bonobo_Application_MessageDesc__freekids\xCC131072\xCD(m,d) +Bonobo_Application_MessageList\xCC4096\xCFCORBA_sequence_Bonobo_Application_MessageDesc +Bonobo_Application_MessageList__alloc\xCC131072\xCD() +Bonobo_Application_MessageList__freekids\xCC131072\xCD(m,d) +Bonobo_Application_MessageList_allocbuf\xCC131072\xCD(l) +Bonobo_Application_MessageList_demarshal\xCC131072\xCD(x,y,z,i) +Bonobo_Application_MessageList_marshal\xCC131072\xCD(x,y,z) +Bonobo_Application_argv_t\xCC4096\xCFCORBA_sequence_CORBA_string +Bonobo_Application_argv_t__alloc\xCC131072\xCD() +Bonobo_Application_argv_t__freekids\xCC131072\xCD(m,d) +Bonobo_Application_argv_t_allocbuf\xCC131072\xCD(l) +Bonobo_Application_argv_t_demarshal\xCC131072\xCD(x,y,z,i) +Bonobo_Application_argv_t_marshal\xCC131072\xCD(x,y,z) +Bonobo_Application_getName\xCC1024\xCD(Bonobo_Application _obj, CORBA_Environment * ev)\xCFCORBA_string +Bonobo_Application_listMessages\xCC1024\xCD(Bonobo_Application _obj, CORBA_Environment * ev)\xCFBonobo_Application_MessageList +Bonobo_Application_message\xCC1024\xCD(Bonobo_Application _obj, const CORBA_char * msg, const Bonobo_Application_ArgList * args, CORBA_Environment * ev)\xCFCORBA_any +Bonobo_Application_newInstance\xCC1024\xCD(Bonobo_Application _obj, const Bonobo_Application_argv_t * argv, CORBA_Environment * ev)\xCFCORBA_long +Bonobo_Application_unimplemented1\xCC1024\xCD(Bonobo_Application _obj, CORBA_Environment * ev)\xCFvoid +Bonobo_Application_unimplemented2\xCC1024\xCD(Bonobo_Application _obj, CORBA_Environment * ev)\xCFvoid +Bonobo_Application_unimplemented3\xCC1024\xCD(Bonobo_Application _obj, CORBA_Environment * ev)\xCFvoid +Bonobo_Application_unimplemented4\xCC1024\xCD(Bonobo_Application _obj, CORBA_Environment * ev)\xCFvoid +Bonobo_Application_unimplemented5\xCC1024\xCD(Bonobo_Application _obj, CORBA_Environment * ev)\xCFvoid +Bonobo_Application_unimplemented6\xCC1024\xCD(Bonobo_Application _obj, CORBA_Environment * ev)\xCFvoid +Bonobo_Application_unimplemented7\xCC1024\xCD(Bonobo_Application _obj, CORBA_Environment * ev)\xCFvoid +Bonobo_Application_unimplemented8\xCC1024\xCD(Bonobo_Application _obj, CORBA_Environment * ev)\xCFvoid +Bonobo_BadArg\xCC4096\xCFBonobo_BadArg_type +Bonobo_BadArg__alloc\xCC131072\xCD() +Bonobo_BadArg__freekids\xCC131072\xCD(m,d) +Bonobo_CanvasComponentFactory\xCC4096\xCFCORBA_Object +Bonobo_CanvasComponentFactory_createCanvasComponent\xCC1024\xCD(Bonobo_CanvasComponentFactory _obj, const CORBA_boolean aa, const Bonobo_Canvas_ComponentProxy proxy, CORBA_Environment * ev)\xCFBonobo_Canvas_Component +Bonobo_CanvasComponentFactory_unImplemented1\xCC1024\xCD(Bonobo_CanvasComponentFactory _obj, CORBA_Environment * ev)\xCFvoid +Bonobo_CanvasComponentFactory_unImplemented2\xCC1024\xCD(Bonobo_CanvasComponentFactory _obj, CORBA_Environment * ev)\xCFvoid +Bonobo_Canvas_ArtUTA\xCC4096\xCFBonobo_Canvas_ArtUTA_type +Bonobo_Canvas_ArtUTA__alloc\xCC131072\xCD() +Bonobo_Canvas_ArtUTA__freekids\xCC131072\xCD(m,d) +Bonobo_Canvas_Buf\xCC4096\xCFBonobo_Canvas_Buf_type +Bonobo_Canvas_Buf__alloc\xCC131072\xCD() +Bonobo_Canvas_Buf__freekids\xCC131072\xCD(m,d) +Bonobo_Canvas_Component\xCC4096\xCFCORBA_Object +Bonobo_Canvas_ComponentProxy\xCC4096\xCFCORBA_Object +Bonobo_Canvas_ComponentProxy_getUIContainer\xCC1024\xCD(Bonobo_Canvas_ComponentProxy _obj, CORBA_Environment * ev)\xCFBonobo_UIContainer +Bonobo_Canvas_ComponentProxy_grabFocus\xCC1024\xCD(Bonobo_Canvas_ComponentProxy _obj, const CORBA_unsigned_long mask, const CORBA_long cursor, const CORBA_unsigned_long time, CORBA_Environment * ev)\xCFvoid +Bonobo_Canvas_ComponentProxy_requestUpdate\xCC1024\xCD(Bonobo_Canvas_ComponentProxy _obj, CORBA_Environment * ev)\xCFvoid +Bonobo_Canvas_ComponentProxy_unImplemented1\xCC1024\xCD(Bonobo_Canvas_ComponentProxy _obj, CORBA_Environment * ev)\xCFvoid +Bonobo_Canvas_ComponentProxy_unImplemented2\xCC1024\xCD(Bonobo_Canvas_ComponentProxy _obj, CORBA_Environment * ev)\xCFvoid +Bonobo_Canvas_ComponentProxy_unImplemented3\xCC1024\xCD(Bonobo_Canvas_ComponentProxy _obj, CORBA_Environment * ev)\xCFvoid +Bonobo_Canvas_ComponentProxy_unImplemented4\xCC1024\xCD(Bonobo_Canvas_ComponentProxy _obj, CORBA_Environment * ev)\xCFvoid +Bonobo_Canvas_ComponentProxy_unImplemented5\xCC1024\xCD(Bonobo_Canvas_ComponentProxy _obj, CORBA_Environment * ev)\xCFvoid +Bonobo_Canvas_ComponentProxy_unImplemented6\xCC1024\xCD(Bonobo_Canvas_ComponentProxy _obj, CORBA_Environment * ev)\xCFvoid +Bonobo_Canvas_ComponentProxy_unImplemented7\xCC1024\xCD(Bonobo_Canvas_ComponentProxy _obj, CORBA_Environment * ev)\xCFvoid +Bonobo_Canvas_ComponentProxy_unImplemented8\xCC1024\xCD(Bonobo_Canvas_ComponentProxy _obj, CORBA_Environment * ev)\xCFvoid +Bonobo_Canvas_ComponentProxy_ungrabFocus\xCC1024\xCD(Bonobo_Canvas_ComponentProxy _obj, const CORBA_unsigned_long time, CORBA_Environment * ev)\xCFvoid +Bonobo_Canvas_Component_bounds\xCC1024\xCD(Bonobo_Canvas_Component _obj, const Bonobo_Canvas_State * state, CORBA_double * x1, CORBA_double * x2, CORBA_double * y1, CORBA_double * y2, CORBA_Environment * ev)\xCFvoid +Bonobo_Canvas_Component_contains\xCC1024\xCD(Bonobo_Canvas_Component _obj, const CORBA_double x, const CORBA_double y, CORBA_Environment * ev)\xCFCORBA_boolean +Bonobo_Canvas_Component_draw\xCC1024\xCD(Bonobo_Canvas_Component _obj, const Bonobo_Canvas_State * state, const CORBA_char * drawable, const CORBA_short x, const CORBA_short y, const CORBA_short width, const CORBA_short height, CORBA_Environment * ev)\xCFvoid +Bonobo_Canvas_Component_event\xCC1024\xCD(Bonobo_Canvas_Component _obj, const Bonobo_Canvas_State * state, const Bonobo_Gdk_Event * event, CORBA_Environment * ev)\xCFCORBA_boolean +Bonobo_Canvas_Component_map\xCC1024\xCD(Bonobo_Canvas_Component _obj, CORBA_Environment * ev)\xCFvoid +Bonobo_Canvas_Component_realize\xCC1024\xCD(Bonobo_Canvas_Component _obj, const CORBA_char * drawable, CORBA_Environment * ev)\xCFvoid +Bonobo_Canvas_Component_render\xCC1024\xCD(Bonobo_Canvas_Component _obj, Bonobo_Canvas_Buf * buf, CORBA_Environment * ev)\xCFvoid +Bonobo_Canvas_Component_setBounds\xCC1024\xCD(Bonobo_Canvas_Component _obj, const Bonobo_Canvas_DRect * bbox, CORBA_Environment * ev)\xCFvoid +Bonobo_Canvas_Component_setCanvasSize\xCC1024\xCD(Bonobo_Canvas_Component _obj, const CORBA_short x, const CORBA_short y, const CORBA_short width, const CORBA_short height, CORBA_Environment * ev)\xCFvoid +Bonobo_Canvas_Component_unImplemented1\xCC1024\xCD(Bonobo_Canvas_Component _obj, CORBA_Environment * ev)\xCFvoid +Bonobo_Canvas_Component_unImplemented2\xCC1024\xCD(Bonobo_Canvas_Component _obj, CORBA_Environment * ev)\xCFvoid +Bonobo_Canvas_Component_unImplemented3\xCC1024\xCD(Bonobo_Canvas_Component _obj, CORBA_Environment * ev)\xCFvoid +Bonobo_Canvas_Component_unImplemented4\xCC1024\xCD(Bonobo_Canvas_Component _obj, CORBA_Environment * ev)\xCFvoid +Bonobo_Canvas_Component_unImplemented5\xCC1024\xCD(Bonobo_Canvas_Component _obj, CORBA_Environment * ev)\xCFvoid +Bonobo_Canvas_Component_unImplemented6\xCC1024\xCD(Bonobo_Canvas_Component _obj, CORBA_Environment * ev)\xCFvoid +Bonobo_Canvas_Component_unImplemented7\xCC1024\xCD(Bonobo_Canvas_Component _obj, CORBA_Environment * ev)\xCFvoid +Bonobo_Canvas_Component_unImplemented8\xCC1024\xCD(Bonobo_Canvas_Component _obj, CORBA_Environment * ev)\xCFvoid +Bonobo_Canvas_Component_unmap\xCC1024\xCD(Bonobo_Canvas_Component _obj, CORBA_Environment * ev)\xCFvoid +Bonobo_Canvas_Component_unrealize\xCC1024\xCD(Bonobo_Canvas_Component _obj, CORBA_Environment * ev)\xCFvoid +Bonobo_Canvas_Component_update\xCC1024\xCD(Bonobo_Canvas_Component _obj, const Bonobo_Canvas_State * state, const Bonobo_Canvas_affine aff, const Bonobo_Canvas_SVP * clip_path, const CORBA_long flags, CORBA_double * x1, CORBA_double * y1, CORBA_double * x2, CORBA_double * y2, CORBA_Environment * ev)\xCFBonobo_Canvas_ArtUTA +Bonobo_Canvas_DRect\xCC4096\xCFBonobo_Canvas_DRect_type +Bonobo_Canvas_DRect__alloc\xCC131072\xCD() +Bonobo_Canvas_DRect__freekids\xCC131072\xCD(m,d) +Bonobo_Canvas_IRect\xCC4096\xCFBonobo_Canvas_IRect_type +Bonobo_Canvas_IRect__alloc\xCC131072\xCD() +Bonobo_Canvas_IRect__freekids\xCC131072\xCD(m,d) +Bonobo_Canvas_Point\xCC4096\xCFBonobo_Canvas_Point_type +Bonobo_Canvas_Point__alloc\xCC131072\xCD() +Bonobo_Canvas_Point__freekids\xCC131072\xCD(m,d) +Bonobo_Canvas_Points\xCC4096\xCFCORBA_sequence_Bonobo_Canvas_Point +Bonobo_Canvas_Points__alloc\xCC131072\xCD() +Bonobo_Canvas_Points__freekids\xCC131072\xCD(m,d) +Bonobo_Canvas_Points_allocbuf\xCC131072\xCD(l) +Bonobo_Canvas_Points_demarshal\xCC131072\xCD(x,y,z,i) +Bonobo_Canvas_Points_marshal\xCC131072\xCD(x,y,z) +Bonobo_Canvas_SVP\xCC4096\xCFCORBA_sequence_Bonobo_Canvas_SVPSegment +Bonobo_Canvas_SVPSegment\xCC4096\xCFBonobo_Canvas_SVPSegment_type +Bonobo_Canvas_SVPSegment__alloc\xCC131072\xCD() +Bonobo_Canvas_SVPSegment__freekids\xCC131072\xCD(m,d) +Bonobo_Canvas_SVP__alloc\xCC131072\xCD() +Bonobo_Canvas_SVP__freekids\xCC131072\xCD(m,d) +Bonobo_Canvas_SVP_allocbuf\xCC131072\xCD(l) +Bonobo_Canvas_SVP_demarshal\xCC131072\xCD(x,y,z,i) +Bonobo_Canvas_SVP_marshal\xCC131072\xCD(x,y,z) +Bonobo_Canvas_State\xCC4096\xCFBonobo_Canvas_State_type +Bonobo_Canvas_State__alloc\xCC131072\xCD() +Bonobo_Canvas_State__freekids\xCC131072\xCD(m,d) +Bonobo_Canvas_affine\xCC4096\xCFCORBA_double +Bonobo_Canvas_affine__alloc\xCC131072\xCD() +Bonobo_Canvas_affine__freekids\xCC131072\xCD(m,d) +Bonobo_Canvas_affine_slice\xCC4096\xCFCORBA_double +Bonobo_Canvas_int32\xCC4096\xCFCORBA_long +Bonobo_Canvas_int32__alloc\xCC131072\xCD() +Bonobo_Canvas_int32__freekids\xCC131072\xCD(m,d) +Bonobo_Canvas_int32_demarshal\xCC131072\xCD(x,y,z,i) +Bonobo_Canvas_int32_marshal\xCC131072\xCD(x,y,z) +Bonobo_Canvas_pixbuf\xCC4096\xCFCORBA_sequence_CORBA_octet +Bonobo_Canvas_pixbuf__alloc\xCC131072\xCD() +Bonobo_Canvas_pixbuf__freekids\xCC131072\xCD(m,d) +Bonobo_Canvas_pixbuf_allocbuf\xCC131072\xCD(l) +Bonobo_Canvas_pixbuf_demarshal\xCC131072\xCD(x,y,z,i) +Bonobo_Canvas_pixbuf_marshal\xCC131072\xCD(x,y,z) +Bonobo_Clipboard\xCC4096\xCFCORBA_Object +Bonobo_ClipboardStore\xCC4096\xCFCORBA_Object +Bonobo_ClipboardStore_fetchStorage\xCC1024\xCD(Bonobo_ClipboardStore _obj, const Bonobo_PersistStorage source, const Bonobo_Moniker linking_moniker, CORBA_Environment * ev)\xCFvoid +Bonobo_ClipboardStore_fetchStream\xCC1024\xCD(Bonobo_ClipboardStore _obj, const Bonobo_PersistStream source, const Bonobo_Moniker linking_moniker, CORBA_Environment * ev)\xCFvoid +Bonobo_ClipboardStore_unImplemented1\xCC1024\xCD(Bonobo_ClipboardStore _obj, CORBA_Environment * ev)\xCFvoid +Bonobo_ClipboardStore_unImplemented2\xCC1024\xCD(Bonobo_ClipboardStore _obj, CORBA_Environment * ev)\xCFvoid +Bonobo_ClipboardStore_unImplemented3\xCC1024\xCD(Bonobo_ClipboardStore _obj, CORBA_Environment * ev)\xCFvoid +Bonobo_ClipboardStore_unImplemented4\xCC1024\xCD(Bonobo_ClipboardStore _obj, CORBA_Environment * ev)\xCFvoid +Bonobo_Clipboard_link\xCC1024\xCD(Bonobo_Clipboard _obj, CORBA_Environment * ev)\xCFBonobo_Moniker +Bonobo_Clipboard_paste\xCC1024\xCD(Bonobo_Clipboard _obj, CORBA_Environment * ev)\xCFBonobo_Moniker +Bonobo_Clipboard_setClipboard\xCC1024\xCD(Bonobo_Clipboard _obj, const Bonobo_Moniker pasting_moniker, const Bonobo_Moniker linking_moniker, CORBA_Environment * ev)\xCFvoid +Bonobo_Clipboard_unImplemented1\xCC1024\xCD(Bonobo_Clipboard _obj, CORBA_Environment * ev)\xCFvoid +Bonobo_Clipboard_unImplemented2\xCC1024\xCD(Bonobo_Clipboard _obj, CORBA_Environment * ev)\xCFvoid +Bonobo_Clipboard_unImplemented3\xCC1024\xCD(Bonobo_Clipboard _obj, CORBA_Environment * ev)\xCFvoid +Bonobo_Clipboard_unImplemented4\xCC1024\xCD(Bonobo_Clipboard _obj, CORBA_Environment * ev)\xCFvoid +Bonobo_ConfigDatabase\xCC4096\xCFCORBA_Object +Bonobo_ConfigDatabase_DBFlags\xCC4096 +Bonobo_ConfigDatabase__get_isWriteable\xCC1024\xCD(Bonobo_ConfigDatabase _obj, CORBA_Environment * ev)\xCFCORBA_boolean +Bonobo_ConfigDatabase_addDatabase\xCC1024\xCD(Bonobo_ConfigDatabase _obj, const Bonobo_ConfigDatabase db, const CORBA_char * key, const Bonobo_ConfigDatabase_DBFlags flags, CORBA_Environment * ev)\xCFvoid +Bonobo_ConfigDatabase_getDirs\xCC1024\xCD(Bonobo_ConfigDatabase _obj, const CORBA_char * dir, CORBA_Environment * ev)\xCFBonobo_KeyList +Bonobo_ConfigDatabase_hasDir\xCC1024\xCD(Bonobo_ConfigDatabase _obj, const CORBA_char * dir, CORBA_Environment * ev)\xCFCORBA_boolean +Bonobo_ConfigDatabase_removeDir\xCC1024\xCD(Bonobo_ConfigDatabase _obj, const CORBA_char * dir, CORBA_Environment * ev)\xCFvoid +Bonobo_ConfigDatabase_removeValue\xCC1024\xCD(Bonobo_ConfigDatabase _obj, const CORBA_char * key, CORBA_Environment * ev)\xCFvoid +Bonobo_ConfigDatabase_sync\xCC1024\xCD(Bonobo_ConfigDatabase _obj, CORBA_Environment * ev)\xCFvoid +Bonobo_ConfigDatabase_unImplemented5\xCC1024\xCD(Bonobo_ConfigDatabase _obj, CORBA_Environment * ev)\xCFvoid +Bonobo_ConfigDatabase_unImplemented6\xCC1024\xCD(Bonobo_ConfigDatabase _obj, CORBA_Environment * ev)\xCFvoid +Bonobo_ConfigDatabase_unImplemented7\xCC1024\xCD(Bonobo_ConfigDatabase _obj, CORBA_Environment * ev)\xCFvoid +Bonobo_ConfigDatabase_unImplemented8\xCC1024\xCD(Bonobo_ConfigDatabase _obj, CORBA_Environment * ev)\xCFvoid +Bonobo_ContentType\xCC4096\xCFCORBA_string +Bonobo_ContentType__alloc\xCC131072\xCD() +Bonobo_ContentType__freekids\xCC131072\xCD(m,d) +Bonobo_ContentType_demarshal\xCC131072\xCD(x,y,z,i) +Bonobo_ContentType_marshal\xCC131072\xCD(x,y,z) +Bonobo_Control\xCC4096\xCFCORBA_Object +Bonobo_ControlFactory\xCC4096\xCFCORBA_Object +Bonobo_ControlFactory_createControl\xCC1024\xCD(Bonobo_ControlFactory _obj, const Bonobo_ControlFrame frame, const Bonobo_UIContainer uic, CORBA_Environment * ev)\xCFBonobo_Control +Bonobo_ControlFactory_unImplemented1\xCC1024\xCD(Bonobo_ControlFactory _obj, CORBA_Environment * ev)\xCFvoid +Bonobo_ControlFactory_unImplemented2\xCC1024\xCD(Bonobo_ControlFactory _obj, CORBA_Environment * ev)\xCFvoid +Bonobo_ControlFrame\xCC4096\xCFCORBA_Object +Bonobo_ControlFrame_activateURI\xCC1024\xCD(Bonobo_ControlFrame _obj, const CORBA_char * uri, const CORBA_boolean relative, CORBA_Environment * ev)\xCFvoid +Bonobo_ControlFrame_getAmbientProperties\xCC1024\xCD(Bonobo_ControlFrame _obj, CORBA_Environment * ev)\xCFBonobo_PropertyBag +Bonobo_ControlFrame_getParentAccessible\xCC1024\xCD(Bonobo_ControlFrame _obj, CORBA_Environment * ev)\xCFBonobo_Unknown +Bonobo_ControlFrame_getToplevelId\xCC1024\xCD(Bonobo_ControlFrame _obj, CORBA_Environment * ev)\xCFBonobo_Gdk_WindowId +Bonobo_ControlFrame_getUIContainer\xCC1024\xCD(Bonobo_ControlFrame _obj, CORBA_Environment * ev)\xCFBonobo_UIContainer +Bonobo_ControlFrame_notifyActivated\xCC1024\xCD(Bonobo_ControlFrame _obj, const CORBA_boolean state, CORBA_Environment * ev)\xCFvoid +Bonobo_ControlFrame_queueResize\xCC1024\xCD(Bonobo_ControlFrame _obj, CORBA_Environment * ev)\xCFvoid +Bonobo_ControlFrame_unImplemented\xCC1024\xCD(Bonobo_ControlFrame _obj, CORBA_Environment * ev)\xCFvoid +Bonobo_ControlFrame_unImplemented2\xCC1024\xCD(Bonobo_ControlFrame _obj, CORBA_Environment * ev)\xCFvoid +Bonobo_Control_NoContents\xCC4096\xCFBonobo_Control_NoContents_type +Bonobo_Control_NoContents__alloc\xCC131072\xCD() +Bonobo_Control_NoContents__freekids\xCC131072\xCD(m,d) +Bonobo_Control_activate\xCC1024\xCD(Bonobo_Control _obj, const CORBA_boolean activate, CORBA_Environment * ev)\xCFvoid +Bonobo_Control_focus\xCC1024\xCD(Bonobo_Control _obj, const Bonobo_Gtk_Direction direction, CORBA_Environment * ev)\xCFCORBA_boolean +Bonobo_Control_getAccessible\xCC1024\xCD(Bonobo_Control _obj, CORBA_Environment * ev)\xCFBonobo_Unknown +Bonobo_Control_getDesiredSize\xCC1024\xCD(Bonobo_Control _obj, CORBA_Environment * ev)\xCFBonobo_Gtk_Requisition +Bonobo_Control_getPopupContainer\xCC1024\xCD(Bonobo_Control _obj, CORBA_Environment * ev)\xCFBonobo_UIContainer +Bonobo_Control_getProperties\xCC1024\xCD(Bonobo_Control _obj, CORBA_Environment * ev)\xCFBonobo_PropertyBag +Bonobo_Control_getWindowId\xCC1024\xCD(Bonobo_Control _obj, const CORBA_char * cookie, CORBA_Environment * ev)\xCFBonobo_Gdk_WindowId +Bonobo_Control_setFrame\xCC1024\xCD(Bonobo_Control _obj, const Bonobo_ControlFrame frame, CORBA_Environment * ev)\xCFvoid +Bonobo_Control_setSize\xCC1024\xCD(Bonobo_Control _obj, const CORBA_short width, const CORBA_short height, CORBA_Environment * ev)\xCFvoid +Bonobo_Control_setState\xCC1024\xCD(Bonobo_Control _obj, const Bonobo_Gtk_State state, CORBA_Environment * ev)\xCFvoid +Bonobo_Control_unImplemented\xCC1024\xCD(Bonobo_Control _obj, CORBA_Environment * ev)\xCFvoid +Bonobo_Control_unImplemented2\xCC1024\xCD(Bonobo_Control _obj, CORBA_Environment * ev)\xCFvoid +Bonobo_Control_unImplemented3\xCC1024\xCD(Bonobo_Control _obj, CORBA_Environment * ev)\xCFvoid +Bonobo_DynamicPathLoadResult\xCC4096 +Bonobo_Embeddable\xCC4096\xCFCORBA_Object +Bonobo_Embeddable_unImplemented1\xCC1024\xCD(Bonobo_Embeddable _obj, CORBA_Environment * ev)\xCFvoid +Bonobo_Embeddable_unImplemented2\xCC1024\xCD(Bonobo_Embeddable _obj, CORBA_Environment * ev)\xCFvoid +Bonobo_Embeddable_unImplemented3\xCC1024\xCD(Bonobo_Embeddable _obj, CORBA_Environment * ev)\xCFvoid +Bonobo_Embeddable_unImplemented4\xCC1024\xCD(Bonobo_Embeddable _obj, CORBA_Environment * ev)\xCFvoid +Bonobo_Embeddable_unImplemented5\xCC1024\xCD(Bonobo_Embeddable _obj, CORBA_Environment * ev)\xCFvoid +Bonobo_Embeddable_unImplemented6\xCC1024\xCD(Bonobo_Embeddable _obj, CORBA_Environment * ev)\xCFvoid +Bonobo_Embeddable_unImplemented7\xCC1024\xCD(Bonobo_Embeddable _obj, CORBA_Environment * ev)\xCFvoid +Bonobo_Embeddable_unImplemented8\xCC1024\xCD(Bonobo_Embeddable _obj, CORBA_Environment * ev)\xCFvoid +Bonobo_EventSource\xCC4096\xCFCORBA_Object +Bonobo_EventSource_UnknownListener\xCC4096\xCFBonobo_EventSource_UnknownListener_type +Bonobo_EventSource_UnknownListener__alloc\xCC131072\xCD() +Bonobo_EventSource_UnknownListener__freekids\xCC131072\xCD(m,d) +Bonobo_EventSource_addListener\xCC1024\xCD(Bonobo_EventSource _obj, const Bonobo_Listener l, CORBA_Environment * ev)\xCFvoid +Bonobo_EventSource_addListenerWithMask\xCC1024\xCD(Bonobo_EventSource _obj, const Bonobo_Listener l, const CORBA_char * event_mask, CORBA_Environment * ev)\xCFvoid +Bonobo_EventSource_removeListener\xCC1024\xCD(Bonobo_EventSource _obj, const Bonobo_Listener l, CORBA_Environment * ev)\xCFvoid +Bonobo_EventSource_unImplemented\xCC1024\xCD(Bonobo_EventSource _obj, CORBA_Environment * ev)\xCFvoid +Bonobo_EventSource_unImplemented2\xCC1024\xCD(Bonobo_EventSource _obj, CORBA_Environment * ev)\xCFvoid +Bonobo_Gdk_ButtonEvent\xCC4096\xCFBonobo_Gdk_ButtonEvent_type +Bonobo_Gdk_ButtonEvent__alloc\xCC131072\xCD() +Bonobo_Gdk_ButtonEvent__freekids\xCC131072\xCD(m,d) +Bonobo_Gdk_ButtonType\xCC4096 +Bonobo_Gdk_CrossMode\xCC4096 +Bonobo_Gdk_CrossType\xCC4096 +Bonobo_Gdk_CrossingEvent\xCC4096\xCFBonobo_Gdk_CrossingEvent_type +Bonobo_Gdk_CrossingEvent__alloc\xCC131072\xCD() +Bonobo_Gdk_CrossingEvent__freekids\xCC131072\xCD(m,d) +Bonobo_Gdk_Event\xCC4096\xCFBonobo_Gdk_Event_type +Bonobo_Gdk_EventType\xCC4096 +Bonobo_Gdk_Event__alloc\xCC131072\xCD() +Bonobo_Gdk_Event__freekids\xCC131072\xCD(m,d) +Bonobo_Gdk_FocusEvent\xCC4096\xCFBonobo_Gdk_FocusEvent_type +Bonobo_Gdk_FocusEvent__alloc\xCC131072\xCD() +Bonobo_Gdk_FocusEvent__freekids\xCC131072\xCD(m,d) +Bonobo_Gdk_KeyEvent\xCC4096\xCFBonobo_Gdk_KeyEvent_type +Bonobo_Gdk_KeyEvent__alloc\xCC131072\xCD() +Bonobo_Gdk_KeyEvent__freekids\xCC131072\xCD(m,d) +Bonobo_Gdk_KeyType\xCC4096 +Bonobo_Gdk_MotionEvent\xCC4096\xCFBonobo_Gdk_MotionEvent_type +Bonobo_Gdk_MotionEvent__alloc\xCC131072\xCD() +Bonobo_Gdk_MotionEvent__freekids\xCC131072\xCD(m,d) +Bonobo_Gdk_Time\xCC4096\xCFCORBA_long +Bonobo_Gdk_Time__alloc\xCC131072\xCD() +Bonobo_Gdk_Time__freekids\xCC131072\xCD(m,d) +Bonobo_Gdk_Time_demarshal\xCC131072\xCD(x,y,z,i) +Bonobo_Gdk_Time_marshal\xCC131072\xCD(x,y,z) +Bonobo_Gdk_WindowId\xCC4096\xCFCORBA_string +Bonobo_Gdk_WindowId__alloc\xCC131072\xCD() +Bonobo_Gdk_WindowId__freekids\xCC131072\xCD(m,d) +Bonobo_Gdk_WindowId_demarshal\xCC131072\xCD(x,y,z,i) +Bonobo_Gdk_WindowId_marshal\xCC131072\xCD(x,y,z) +Bonobo_GeneralError\xCC4096\xCFBonobo_GeneralError_type +Bonobo_GeneralError__alloc\xCC131072\xCD() +Bonobo_GeneralError__freekids\xCC131072\xCD(m,d) +Bonobo_GenericFactory\xCC4096\xCFCORBA_Object +Bonobo_GenericFactory_CannotActivate\xCC4096\xCFBonobo_GenericFactory_CannotActivate_type +Bonobo_GenericFactory_CannotActivate__alloc\xCC131072\xCD() +Bonobo_GenericFactory_CannotActivate__freekids\xCC131072\xCD(m,d) +Bonobo_GenericFactory_createObject\xCC1024\xCD(Bonobo_GenericFactory _obj, const CORBA_char * iid, CORBA_Environment * ev)\xCFCORBA_Object +Bonobo_Gtk_Direction\xCC4096 +Bonobo_Gtk_Requisition\xCC4096\xCFBonobo_Gtk_Requisition_type +Bonobo_Gtk_Requisition__alloc\xCC131072\xCD() +Bonobo_Gtk_Requisition__freekids\xCC131072\xCD(m,d) +Bonobo_Gtk_State\xCC4096 +Bonobo_IOError\xCC4096\xCFBonobo_IOError_type +Bonobo_IOError__alloc\xCC131072\xCD() +Bonobo_IOError__freekids\xCC131072\xCD(m,d) +Bonobo_ImplementationID\xCC4096\xCFCORBA_string +Bonobo_ImplementationID__alloc\xCC131072\xCD() +Bonobo_ImplementationID__freekids\xCC131072\xCD(m,d) +Bonobo_ImplementationID_demarshal\xCC131072\xCD(x,y,z,i) +Bonobo_ImplementationID_marshal\xCC131072\xCD(x,y,z) +Bonobo_ItemContainer\xCC4096\xCFCORBA_Object +Bonobo_ItemContainer_NotFound\xCC4096\xCFBonobo_ItemContainer_NotFound_type +Bonobo_ItemContainer_NotFound__alloc\xCC131072\xCD() +Bonobo_ItemContainer_NotFound__freekids\xCC131072\xCD(m,d) +Bonobo_ItemContainer_ObjectNames\xCC4096\xCFCORBA_sequence_CORBA_string +Bonobo_ItemContainer_ObjectNames__alloc\xCC131072\xCD() +Bonobo_ItemContainer_ObjectNames__freekids\xCC131072\xCD(m,d) +Bonobo_ItemContainer_ObjectNames_allocbuf\xCC131072\xCD(l) +Bonobo_ItemContainer_ObjectNames_demarshal\xCC131072\xCD(x,y,z,i) +Bonobo_ItemContainer_ObjectNames_marshal\xCC131072\xCD(x,y,z) +Bonobo_ItemContainer_SyntaxError\xCC4096\xCFBonobo_ItemContainer_SyntaxError_type +Bonobo_ItemContainer_SyntaxError__alloc\xCC131072\xCD() +Bonobo_ItemContainer_SyntaxError__freekids\xCC131072\xCD(m,d) +Bonobo_ItemContainer_enumObjects\xCC1024\xCD(Bonobo_ItemContainer _obj, CORBA_Environment * ev)\xCFBonobo_ItemContainer_ObjectNames +Bonobo_ItemContainer_getObjectByName\xCC1024\xCD(Bonobo_ItemContainer _obj, const CORBA_char * item_name, const CORBA_boolean only_if_exists, CORBA_Environment * ev)\xCFBonobo_Unknown +Bonobo_ItemContainer_unImplemented1\xCC1024\xCD(Bonobo_ItemContainer _obj, CORBA_Environment * ev)\xCFvoid +Bonobo_ItemContainer_unImplemented2\xCC1024\xCD(Bonobo_ItemContainer _obj, CORBA_Environment * ev)\xCFvoid +Bonobo_ItemContainer_unImplemented3\xCC1024\xCD(Bonobo_ItemContainer _obj, CORBA_Environment * ev)\xCFvoid +Bonobo_ItemContainer_unImplemented4\xCC1024\xCD(Bonobo_ItemContainer _obj, CORBA_Environment * ev)\xCFvoid +Bonobo_KeyList\xCC4096\xCFCORBA_sequence_CORBA_string +Bonobo_KeyList__alloc\xCC131072\xCD() +Bonobo_KeyList__freekids\xCC131072\xCD(m,d) +Bonobo_KeyList_allocbuf\xCC131072\xCD(l) +Bonobo_KeyList_demarshal\xCC131072\xCD(x,y,z,i) +Bonobo_KeyList_marshal\xCC131072\xCD(x,y,z) +Bonobo_Listener\xCC4096\xCFCORBA_Object +Bonobo_Listener_event\xCC1024\xCD(Bonobo_Listener _obj, const CORBA_char * event_name, const CORBA_any * args, CORBA_Environment * ev)\xCFvoid +Bonobo_Listener_unImplemented\xCC1024\xCD(Bonobo_Listener _obj, CORBA_Environment * ev)\xCFvoid +Bonobo_Listener_unImplemented2\xCC1024\xCD(Bonobo_Listener _obj, CORBA_Environment * ev)\xCFvoid +Bonobo_Moniker\xCC4096\xCFCORBA_Object +Bonobo_MonikerContext\xCC4096\xCFCORBA_Object +Bonobo_MonikerContext_createFromName\xCC1024\xCD(Bonobo_MonikerContext _obj, const CORBA_char * name, CORBA_Environment * ev)\xCFBonobo_Moniker +Bonobo_MonikerContext_getExtender\xCC1024\xCD(Bonobo_MonikerContext _obj, const CORBA_char * monikerPrefix, const CORBA_char * interfaceId, CORBA_Environment * ev)\xCFBonobo_MonikerExtender +Bonobo_MonikerContext_getObject\xCC1024\xCD(Bonobo_MonikerContext _obj, const CORBA_char * name, const CORBA_char * repoId, CORBA_Environment * ev)\xCFBonobo_Unknown +Bonobo_MonikerContext_unImplemented1\xCC1024\xCD(Bonobo_MonikerContext _obj, CORBA_Environment * ev)\xCFvoid +Bonobo_MonikerContext_unImplemented2\xCC1024\xCD(Bonobo_MonikerContext _obj, CORBA_Environment * ev)\xCFvoid +Bonobo_MonikerContext_unImplemented3\xCC1024\xCD(Bonobo_MonikerContext _obj, CORBA_Environment * ev)\xCFvoid +Bonobo_MonikerContext_unImplemented4\xCC1024\xCD(Bonobo_MonikerContext _obj, CORBA_Environment * ev)\xCFvoid +Bonobo_MonikerContext_unImplemented5\xCC1024\xCD(Bonobo_MonikerContext _obj, CORBA_Environment * ev)\xCFvoid +Bonobo_MonikerContext_unImplemented6\xCC1024\xCD(Bonobo_MonikerContext _obj, CORBA_Environment * ev)\xCFvoid +Bonobo_MonikerExtender\xCC4096\xCFCORBA_Object +Bonobo_MonikerExtender_resolve\xCC1024\xCD(Bonobo_MonikerExtender _obj, const Bonobo_Moniker m, const Bonobo_ResolveOptions * options, const CORBA_char * name, const CORBA_char * requestedInterface, CORBA_Environment * ev)\xCFBonobo_Unknown +Bonobo_MonikerExtender_unImplemented1\xCC1024\xCD(Bonobo_MonikerExtender _obj, CORBA_Environment * ev)\xCFvoid +Bonobo_MonikerExtender_unImplemented2\xCC1024\xCD(Bonobo_MonikerExtender _obj, CORBA_Environment * ev)\xCFvoid +Bonobo_MonikerExtender_unImplemented3\xCC1024\xCD(Bonobo_MonikerExtender _obj, CORBA_Environment * ev)\xCFvoid +Bonobo_MonikerExtender_unImplemented4\xCC1024\xCD(Bonobo_MonikerExtender _obj, CORBA_Environment * ev)\xCFvoid +Bonobo_Moniker_InterfaceNotFound\xCC4096\xCFBonobo_Moniker_InterfaceNotFound_type +Bonobo_Moniker_InterfaceNotFound__alloc\xCC131072\xCD() +Bonobo_Moniker_InterfaceNotFound__freekids\xCC131072\xCD(m,d) +Bonobo_Moniker_InvalidSyntax\xCC4096\xCFBonobo_Moniker_InvalidSyntax_type +Bonobo_Moniker_InvalidSyntax__alloc\xCC131072\xCD() +Bonobo_Moniker_InvalidSyntax__freekids\xCC131072\xCD(m,d) +Bonobo_Moniker_TimeOut\xCC4096\xCFBonobo_Moniker_TimeOut_type +Bonobo_Moniker_TimeOut__alloc\xCC131072\xCD() +Bonobo_Moniker_TimeOut__freekids\xCC131072\xCD(m,d) +Bonobo_Moniker_UnknownPrefix\xCC4096\xCFBonobo_Moniker_UnknownPrefix_type +Bonobo_Moniker_UnknownPrefix__alloc\xCC131072\xCD() +Bonobo_Moniker_UnknownPrefix__freekids\xCC131072\xCD(m,d) +Bonobo_Moniker_equal\xCC1024\xCD(Bonobo_Moniker _obj, const CORBA_char * name, CORBA_Environment * ev)\xCFCORBA_long +Bonobo_Moniker_getName\xCC1024\xCD(Bonobo_Moniker _obj, CORBA_Environment * ev)\xCFCORBA_string +Bonobo_Moniker_getParent\xCC1024\xCD(Bonobo_Moniker _obj, CORBA_Environment * ev)\xCFBonobo_Moniker +Bonobo_Moniker_resolve\xCC1024\xCD(Bonobo_Moniker _obj, const Bonobo_ResolveOptions * options, const CORBA_char * requestedInterface, CORBA_Environment * ev)\xCFBonobo_Unknown +Bonobo_Moniker_setName\xCC1024\xCD(Bonobo_Moniker _obj, const CORBA_char * name, CORBA_Environment * ev)\xCFvoid +Bonobo_Moniker_setParent\xCC1024\xCD(Bonobo_Moniker _obj, const Bonobo_Moniker parent, CORBA_Environment * ev)\xCFvoid +Bonobo_Moniker_unImplemented1\xCC1024\xCD(Bonobo_Moniker _obj, CORBA_Environment * ev)\xCFvoid +Bonobo_Moniker_unImplemented2\xCC1024\xCD(Bonobo_Moniker _obj, CORBA_Environment * ev)\xCFvoid +Bonobo_NotImplemented\xCC4096\xCFBonobo_NotImplemented_type +Bonobo_NotImplemented__alloc\xCC131072\xCD() +Bonobo_NotImplemented__freekids\xCC131072\xCD(m,d) +Bonobo_NotSupported\xCC4096\xCFBonobo_NotSupported_type +Bonobo_NotSupported__alloc\xCC131072\xCD() +Bonobo_NotSupported__freekids\xCC131072\xCD(m,d) +Bonobo_Pair\xCC4096\xCFBonobo_Pair_type +Bonobo_Pair__alloc\xCC131072\xCD() +Bonobo_Pair__freekids\xCC131072\xCD(m,d) +Bonobo_Persist\xCC4096\xCFCORBA_Object +Bonobo_PersistFile\xCC4096\xCFCORBA_Object +Bonobo_PersistFile_NoCurrentName\xCC4096\xCFBonobo_PersistFile_NoCurrentName_type +Bonobo_PersistFile_NoCurrentName__alloc\xCC131072\xCD() +Bonobo_PersistFile_NoCurrentName__freekids\xCC131072\xCD(m,d) +Bonobo_PersistFile_getCurrentFile\xCC1024\xCD(Bonobo_PersistFile _obj, CORBA_Environment * ev)\xCFCORBA_string +Bonobo_PersistFile_load\xCC1024\xCD(Bonobo_PersistFile _obj, const CORBA_char * uri, CORBA_Environment * ev)\xCFvoid +Bonobo_PersistFile_save\xCC1024\xCD(Bonobo_PersistFile _obj, const CORBA_char * uri, CORBA_Environment * ev)\xCFvoid +Bonobo_PersistFile_unImplemented3\xCC1024\xCD(Bonobo_PersistFile _obj, CORBA_Environment * ev)\xCFvoid +Bonobo_PersistFile_unImplemented4\xCC1024\xCD(Bonobo_PersistFile _obj, CORBA_Environment * ev)\xCFvoid +Bonobo_PersistStorage\xCC4096\xCFCORBA_Object +Bonobo_PersistStorage_load\xCC1024\xCD(Bonobo_PersistStorage _obj, const Bonobo_Storage storage, CORBA_Environment * ev)\xCFvoid +Bonobo_PersistStorage_save\xCC1024\xCD(Bonobo_PersistStorage _obj, const Bonobo_Storage storage, const CORBA_boolean same_as_loaded, CORBA_Environment * ev)\xCFvoid +Bonobo_PersistStream\xCC4096\xCFCORBA_Object +Bonobo_PersistStream_load\xCC1024\xCD(Bonobo_PersistStream _obj, const Bonobo_Stream stream, const CORBA_char * type, CORBA_Environment * ev)\xCFvoid +Bonobo_PersistStream_save\xCC1024\xCD(Bonobo_PersistStream _obj, const Bonobo_Stream stream, const CORBA_char * type, CORBA_Environment * ev)\xCFvoid +Bonobo_PersistStream_unImplemented3\xCC1024\xCD(Bonobo_PersistStream _obj, CORBA_Environment * ev)\xCFvoid +Bonobo_PersistStream_unImplemented4\xCC1024\xCD(Bonobo_PersistStream _obj, CORBA_Environment * ev)\xCFvoid +Bonobo_Persist_ContentType\xCC4096\xCFCORBA_string +Bonobo_Persist_ContentTypeList\xCC4096\xCFCORBA_sequence_Bonobo_Persist_ContentType +Bonobo_Persist_ContentTypeList__alloc\xCC131072\xCD() +Bonobo_Persist_ContentTypeList__freekids\xCC131072\xCD(m,d) +Bonobo_Persist_ContentTypeList_allocbuf\xCC131072\xCD(l) +Bonobo_Persist_ContentTypeList_demarshal\xCC131072\xCD(x,y,z,i) +Bonobo_Persist_ContentTypeList_marshal\xCC131072\xCD(x,y,z) +Bonobo_Persist_ContentType__alloc\xCC131072\xCD() +Bonobo_Persist_ContentType__freekids\xCC131072\xCD(m,d) +Bonobo_Persist_ContentType_demarshal\xCC131072\xCD(x,y,z,i) +Bonobo_Persist_ContentType_marshal\xCC131072\xCD(x,y,z) +Bonobo_Persist_FileNotFound\xCC4096\xCFBonobo_Persist_FileNotFound_type +Bonobo_Persist_FileNotFound__alloc\xCC131072\xCD() +Bonobo_Persist_FileNotFound__freekids\xCC131072\xCD(m,d) +Bonobo_Persist_IID\xCC4096\xCFCORBA_string +Bonobo_Persist_IID__alloc\xCC131072\xCD() +Bonobo_Persist_IID__freekids\xCC131072\xCD(m,d) +Bonobo_Persist_IID_demarshal\xCC131072\xCD(x,y,z,i) +Bonobo_Persist_IID_marshal\xCC131072\xCD(x,y,z) +Bonobo_Persist_Status\xCC4096 +Bonobo_Persist_WrongDataType\xCC4096\xCFBonobo_Persist_WrongDataType_type +Bonobo_Persist_WrongDataType__alloc\xCC131072\xCD() +Bonobo_Persist_WrongDataType__freekids\xCC131072\xCD(m,d) +Bonobo_Persist_getContentTypes\xCC1024\xCD(Bonobo_Persist _obj, CORBA_Environment * ev)\xCFBonobo_Persist_ContentTypeList +Bonobo_Persist_getIId\xCC1024\xCD(Bonobo_Persist _obj, CORBA_Environment * ev)\xCFBonobo_Persist_IID +Bonobo_Persist_isDirty\xCC1024\xCD(Bonobo_Persist _obj, CORBA_Environment * ev)\xCFCORBA_boolean +Bonobo_Persist_unImplemented1\xCC1024\xCD(Bonobo_Persist _obj, CORBA_Environment * ev)\xCFvoid +Bonobo_Persist_unImplemented2\xCC1024\xCD(Bonobo_Persist _obj, CORBA_Environment * ev)\xCFvoid +Bonobo_Print\xCC4096\xCFCORBA_Object +Bonobo_PrintDimensions\xCC4096\xCFBonobo_PrintDimensions_type +Bonobo_PrintDimensions__alloc\xCC131072\xCD() +Bonobo_PrintDimensions__freekids\xCC131072\xCD(m,d) +Bonobo_PrintScissor\xCC4096\xCFBonobo_PrintScissor_type +Bonobo_PrintScissor__alloc\xCC131072\xCD() +Bonobo_PrintScissor__freekids\xCC131072\xCD(m,d) +Bonobo_Print_render\xCC1024\xCD(Bonobo_Print _obj, const Bonobo_PrintDimensions * pd, const Bonobo_PrintScissor * scissor, CORBA_Environment * ev)\xCFBonobo_Stream +Bonobo_Print_unImplemented1\xCC1024\xCD(Bonobo_Print _obj, CORBA_Environment * ev)\xCFvoid +Bonobo_Print_unImplemented2\xCC1024\xCD(Bonobo_Print _obj, CORBA_Environment * ev)\xCFvoid +Bonobo_Print_unImplemented3\xCC1024\xCD(Bonobo_Print _obj, CORBA_Environment * ev)\xCFvoid +Bonobo_Print_unImplemented4\xCC1024\xCD(Bonobo_Print _obj, CORBA_Environment * ev)\xCFvoid +Bonobo_PropertyBag\xCC4096\xCFCORBA_Object +Bonobo_PropertyBag_BackendFailed\xCC4096\xCFBonobo_PropertyBag_BackendFailed_type +Bonobo_PropertyBag_BackendFailed__alloc\xCC131072\xCD() +Bonobo_PropertyBag_BackendFailed__freekids\xCC131072\xCD(m,d) +Bonobo_PropertyBag_InvalidType\xCC4096\xCFBonobo_PropertyBag_InvalidType_type +Bonobo_PropertyBag_InvalidType__alloc\xCC131072\xCD() +Bonobo_PropertyBag_InvalidType__freekids\xCC131072\xCD(m,d) +Bonobo_PropertyBag_NotFound\xCC4096\xCFBonobo_PropertyBag_NotFound_type +Bonobo_PropertyBag_NotFound__alloc\xCC131072\xCD() +Bonobo_PropertyBag_NotFound__freekids\xCC131072\xCD(m,d) +Bonobo_PropertyBag_ReadOnly\xCC4096\xCFBonobo_PropertyBag_ReadOnly_type +Bonobo_PropertyBag_ReadOnly__alloc\xCC131072\xCD() +Bonobo_PropertyBag_ReadOnly__freekids\xCC131072\xCD(m,d) +Bonobo_PropertyBag_getDefault\xCC1024\xCD(Bonobo_PropertyBag _obj, const CORBA_char * key, CORBA_Environment * ev)\xCFCORBA_any +Bonobo_PropertyBag_getDoc\xCC1024\xCD(Bonobo_PropertyBag _obj, const CORBA_char * key, CORBA_Environment * ev)\xCFCORBA_string +Bonobo_PropertyBag_getDocTitle\xCC1024\xCD(Bonobo_PropertyBag _obj, const CORBA_char * key, CORBA_Environment * ev)\xCFCORBA_string +Bonobo_PropertyBag_getFlags\xCC1024\xCD(Bonobo_PropertyBag _obj, const CORBA_char * key, CORBA_Environment * ev)\xCFBonobo_PropertyFlags +Bonobo_PropertyBag_getKeys\xCC1024\xCD(Bonobo_PropertyBag _obj, const CORBA_char * filter, CORBA_Environment * ev)\xCFBonobo_KeyList +Bonobo_PropertyBag_getType\xCC1024\xCD(Bonobo_PropertyBag _obj, const CORBA_char * key, CORBA_Environment * ev)\xCFCORBA_TypeCode +Bonobo_PropertyBag_getValue\xCC1024\xCD(Bonobo_PropertyBag _obj, const CORBA_char * key, CORBA_Environment * ev)\xCFCORBA_any +Bonobo_PropertyBag_getValues\xCC1024\xCD(Bonobo_PropertyBag _obj, const CORBA_char * filter, CORBA_Environment * ev)\xCFBonobo_PropertySet +Bonobo_PropertyBag_setValue\xCC1024\xCD(Bonobo_PropertyBag _obj, const CORBA_char * key, const CORBA_any * value, CORBA_Environment * ev)\xCFvoid +Bonobo_PropertyBag_setValues\xCC1024\xCD(Bonobo_PropertyBag _obj, const Bonobo_PropertySet * set, CORBA_Environment * ev)\xCFvoid +Bonobo_PropertyBag_unImplemented1\xCC1024\xCD(Bonobo_PropertyBag _obj, CORBA_Environment * ev)\xCFvoid +Bonobo_PropertyBag_unImplemented2\xCC1024\xCD(Bonobo_PropertyBag _obj, CORBA_Environment * ev)\xCFvoid +Bonobo_PropertyBag_unImplemented3\xCC1024\xCD(Bonobo_PropertyBag _obj, CORBA_Environment * ev)\xCFvoid +Bonobo_PropertyBag_unImplemented4\xCC1024\xCD(Bonobo_PropertyBag _obj, CORBA_Environment * ev)\xCFvoid +Bonobo_PropertyControl\xCC4096\xCFCORBA_Object +Bonobo_PropertyControl_Action\xCC4096 +Bonobo_PropertyControl_NoPage\xCC4096\xCFBonobo_PropertyControl_NoPage_type +Bonobo_PropertyControl_NoPage__alloc\xCC131072\xCD() +Bonobo_PropertyControl_NoPage__freekids\xCC131072\xCD(m,d) +Bonobo_PropertyControl__get_pageCount\xCC1024\xCD(Bonobo_PropertyControl _obj, CORBA_Environment * ev)\xCFCORBA_long +Bonobo_PropertyControl_getControl\xCC1024\xCD(Bonobo_PropertyControl _obj, const CORBA_long pagenumber, CORBA_Environment * ev)\xCFBonobo_Control +Bonobo_PropertyControl_notifyAction\xCC1024\xCD(Bonobo_PropertyControl _obj, const CORBA_long pagenumber, const Bonobo_PropertyControl_Action action, CORBA_Environment * ev)\xCFvoid +Bonobo_PropertyControl_unImplemented\xCC1024\xCD(Bonobo_PropertyControl _obj, CORBA_Environment * ev)\xCFvoid +Bonobo_PropertyControl_unImplemented2\xCC1024\xCD(Bonobo_PropertyControl _obj, CORBA_Environment * ev)\xCFvoid +Bonobo_PropertyFlags\xCC4096\xCFCORBA_long +Bonobo_PropertyFlags__alloc\xCC131072\xCD() +Bonobo_PropertyFlags__freekids\xCC131072\xCD(m,d) +Bonobo_PropertyFlags_demarshal\xCC131072\xCD(x,y,z,i) +Bonobo_PropertyFlags_marshal\xCC131072\xCD(x,y,z) +Bonobo_PropertySet\xCC4096\xCFCORBA_sequence_Bonobo_Pair +Bonobo_PropertySet__alloc\xCC131072\xCD() +Bonobo_PropertySet__freekids\xCC131072\xCD(m,d) +Bonobo_PropertySet_allocbuf\xCC131072\xCD(l) +Bonobo_PropertySet_demarshal\xCC131072\xCD(x,y,z,i) +Bonobo_PropertySet_marshal\xCC131072\xCD(x,y,z) +Bonobo_RegistrationFlags\xCC4096\xCFCORBA_long +Bonobo_RegistrationFlags__alloc\xCC131072\xCD() +Bonobo_RegistrationFlags__freekids\xCC131072\xCD(m,d) +Bonobo_RegistrationFlags_demarshal\xCC131072\xCD(x,y,z,i) +Bonobo_RegistrationFlags_marshal\xCC131072\xCD(x,y,z) +Bonobo_RegistrationResult\xCC4096 +Bonobo_ResolveFlag\xCC4096\xCFCORBA_long +Bonobo_ResolveFlag__alloc\xCC131072\xCD() +Bonobo_ResolveFlag__freekids\xCC131072\xCD(m,d) +Bonobo_ResolveFlag_demarshal\xCC131072\xCD(x,y,z,i) +Bonobo_ResolveFlag_marshal\xCC131072\xCD(x,y,z) +Bonobo_ResolveOptions\xCC4096\xCFBonobo_ResolveOptions_type +Bonobo_ResolveOptions__alloc\xCC131072\xCD() +Bonobo_ResolveOptions__freekids\xCC131072\xCD(m,d) +Bonobo_RunningContext\xCC4096\xCFCORBA_Object +Bonobo_RunningContext_addKey\xCC1024\xCD(Bonobo_RunningContext _obj, const CORBA_char * key, CORBA_Environment * ev)\xCFvoid +Bonobo_RunningContext_addObject\xCC1024\xCD(Bonobo_RunningContext _obj, const CORBA_Object obj, CORBA_Environment * ev)\xCFvoid +Bonobo_RunningContext_atExitUnref\xCC1024\xCD(Bonobo_RunningContext _obj, const CORBA_Object obj, CORBA_Environment * ev)\xCFvoid +Bonobo_RunningContext_removeKey\xCC1024\xCD(Bonobo_RunningContext _obj, const CORBA_char * key, CORBA_Environment * ev)\xCFvoid +Bonobo_RunningContext_removeObject\xCC1024\xCD(Bonobo_RunningContext _obj, const CORBA_Object obj, CORBA_Environment * ev)\xCFvoid +Bonobo_RunningContext_unImplemented1\xCC1024\xCD(Bonobo_RunningContext _obj, CORBA_Environment * ev)\xCFvoid +Bonobo_RunningContext_unImplemented2\xCC1024\xCD(Bonobo_RunningContext _obj, CORBA_Environment * ev)\xCFvoid +Bonobo_ServerInfo\xCC4096\xCFBonobo_ServerInfo_type +Bonobo_ServerInfoList\xCC4096\xCFCORBA_sequence_Bonobo_ServerInfo +Bonobo_ServerInfoList__alloc\xCC131072\xCD() +Bonobo_ServerInfoList__freekids\xCC131072\xCD(m,d) +Bonobo_ServerInfoList_allocbuf\xCC131072\xCD(l) +Bonobo_ServerInfoList_demarshal\xCC131072\xCD(x,y,z,i) +Bonobo_ServerInfoList_duplicate\xCC1024\xCD(const Bonobo_ServerInfoList *original)\xCFBonobo_ServerInfoList +Bonobo_ServerInfoList_marshal\xCC131072\xCD(x,y,z) +Bonobo_ServerInfo__alloc\xCC131072\xCD() +Bonobo_ServerInfo__freekids\xCC131072\xCD(m,d) +Bonobo_ServerInfo_copy\xCC1024\xCD(Bonobo_ServerInfo *copy, const Bonobo_ServerInfo *original)\xCFvoid +Bonobo_ServerInfo_duplicate\xCC1024\xCD(const Bonobo_ServerInfo *original)\xCFBonobo_ServerInfo +Bonobo_Storage\xCC4096\xCFCORBA_Object +Bonobo_StorageInfo\xCC4096\xCFBonobo_StorageInfo_type +Bonobo_StorageInfoFields\xCC4096\xCFCORBA_long +Bonobo_StorageInfoFields__alloc\xCC131072\xCD() +Bonobo_StorageInfoFields__freekids\xCC131072\xCD(m,d) +Bonobo_StorageInfoFields_demarshal\xCC131072\xCD(x,y,z,i) +Bonobo_StorageInfoFields_marshal\xCC131072\xCD(x,y,z) +Bonobo_StorageInfo__alloc\xCC131072\xCD() +Bonobo_StorageInfo__freekids\xCC131072\xCD(m,d) +Bonobo_StorageType\xCC4096 +Bonobo_Storage_DirectoryList\xCC4096\xCFCORBA_sequence_Bonobo_StorageInfo +Bonobo_Storage_DirectoryList__alloc\xCC131072\xCD() +Bonobo_Storage_DirectoryList__freekids\xCC131072\xCD(m,d) +Bonobo_Storage_DirectoryList_allocbuf\xCC131072\xCD(l) +Bonobo_Storage_DirectoryList_demarshal\xCC131072\xCD(x,y,z,i) +Bonobo_Storage_DirectoryList_marshal\xCC131072\xCD(x,y,z) +Bonobo_Storage_IOError\xCC4096\xCFBonobo_Storage_IOError_type +Bonobo_Storage_IOError__alloc\xCC131072\xCD() +Bonobo_Storage_IOError__freekids\xCC131072\xCD(m,d) +Bonobo_Storage_NameExists\xCC4096\xCFBonobo_Storage_NameExists_type +Bonobo_Storage_NameExists__alloc\xCC131072\xCD() +Bonobo_Storage_NameExists__freekids\xCC131072\xCD(m,d) +Bonobo_Storage_NoPermission\xCC4096\xCFBonobo_Storage_NoPermission_type +Bonobo_Storage_NoPermission__alloc\xCC131072\xCD() +Bonobo_Storage_NoPermission__freekids\xCC131072\xCD(m,d) +Bonobo_Storage_NotEmpty\xCC4096\xCFBonobo_Storage_NotEmpty_type +Bonobo_Storage_NotEmpty__alloc\xCC131072\xCD() +Bonobo_Storage_NotEmpty__freekids\xCC131072\xCD(m,d) +Bonobo_Storage_NotFound\xCC4096\xCFBonobo_Storage_NotFound_type +Bonobo_Storage_NotFound__alloc\xCC131072\xCD() +Bonobo_Storage_NotFound__freekids\xCC131072\xCD(m,d) +Bonobo_Storage_NotStorage\xCC4096\xCFBonobo_Storage_NotStorage_type +Bonobo_Storage_NotStorage__alloc\xCC131072\xCD() +Bonobo_Storage_NotStorage__freekids\xCC131072\xCD(m,d) +Bonobo_Storage_NotStream\xCC4096\xCFBonobo_Storage_NotStream_type +Bonobo_Storage_NotStream__alloc\xCC131072\xCD() +Bonobo_Storage_NotStream__freekids\xCC131072\xCD(m,d) +Bonobo_Storage_NotSupported\xCC4096\xCFBonobo_Storage_NotSupported_type +Bonobo_Storage_NotSupported__alloc\xCC131072\xCD() +Bonobo_Storage_NotSupported__freekids\xCC131072\xCD(m,d) +Bonobo_Storage_OpenMode\xCC4096\xCFCORBA_long +Bonobo_Storage_OpenMode__alloc\xCC131072\xCD() +Bonobo_Storage_OpenMode__freekids\xCC131072\xCD(m,d) +Bonobo_Storage_OpenMode_demarshal\xCC131072\xCD(x,y,z,i) +Bonobo_Storage_OpenMode_marshal\xCC131072\xCD(x,y,z) +Bonobo_Storage_commit\xCC1024\xCD(Bonobo_Storage _obj, CORBA_Environment * ev)\xCFvoid +Bonobo_Storage_copyTo\xCC1024\xCD(Bonobo_Storage _obj, const Bonobo_Storage target, CORBA_Environment * ev)\xCFvoid +Bonobo_Storage_erase\xCC1024\xCD(Bonobo_Storage _obj, const CORBA_char * path, CORBA_Environment * ev)\xCFvoid +Bonobo_Storage_getInfo\xCC1024\xCD(Bonobo_Storage _obj, const CORBA_char * path, const Bonobo_StorageInfoFields mask, CORBA_Environment * ev)\xCFBonobo_StorageInfo +Bonobo_Storage_listContents\xCC1024\xCD(Bonobo_Storage _obj, const CORBA_char * path, const Bonobo_StorageInfoFields mask, CORBA_Environment * ev)\xCFBonobo_Storage_DirectoryList +Bonobo_Storage_openStorage\xCC1024\xCD(Bonobo_Storage _obj, const CORBA_char * path, const Bonobo_Storage_OpenMode mode, CORBA_Environment * ev)\xCFBonobo_Storage +Bonobo_Storage_openStream\xCC1024\xCD(Bonobo_Storage _obj, const CORBA_char * path, const Bonobo_Storage_OpenMode mode, CORBA_Environment * ev)\xCFBonobo_Stream +Bonobo_Storage_rename\xCC1024\xCD(Bonobo_Storage _obj, const CORBA_char * path_name, const CORBA_char * new_path_name, CORBA_Environment * ev)\xCFvoid +Bonobo_Storage_revert\xCC1024\xCD(Bonobo_Storage _obj, CORBA_Environment * ev)\xCFvoid +Bonobo_Storage_setInfo\xCC1024\xCD(Bonobo_Storage _obj, const CORBA_char * path, const Bonobo_StorageInfo * info, const Bonobo_StorageInfoFields mask, CORBA_Environment * ev)\xCFvoid +Bonobo_Storage_unImplemented1\xCC1024\xCD(Bonobo_Storage _obj, CORBA_Environment * ev)\xCFvoid +Bonobo_Storage_unImplemented2\xCC1024\xCD(Bonobo_Storage _obj, CORBA_Environment * ev)\xCFvoid +Bonobo_Stream\xCC4096\xCFCORBA_Object +Bonobo_Stream_IOError\xCC4096\xCFBonobo_Stream_IOError_type +Bonobo_Stream_IOError__alloc\xCC131072\xCD() +Bonobo_Stream_IOError__freekids\xCC131072\xCD(m,d) +Bonobo_Stream_NoPermission\xCC4096\xCFBonobo_Stream_NoPermission_type +Bonobo_Stream_NoPermission__alloc\xCC131072\xCD() +Bonobo_Stream_NoPermission__freekids\xCC131072\xCD(m,d) +Bonobo_Stream_NotSupported\xCC4096\xCFBonobo_Stream_NotSupported_type +Bonobo_Stream_NotSupported__alloc\xCC131072\xCD() +Bonobo_Stream_NotSupported__freekids\xCC131072\xCD(m,d) +Bonobo_Stream_SeekType\xCC4096 +Bonobo_Stream_commit\xCC1024\xCD(Bonobo_Stream _obj, CORBA_Environment * ev)\xCFvoid +Bonobo_Stream_getInfo\xCC1024\xCD(Bonobo_Stream _obj, const Bonobo_StorageInfoFields mask, CORBA_Environment * ev)\xCFBonobo_StorageInfo +Bonobo_Stream_iobuf\xCC4096\xCFCORBA_sequence_CORBA_octet +Bonobo_Stream_iobuf__alloc\xCC131072\xCD() +Bonobo_Stream_iobuf__freekids\xCC131072\xCD(m,d) +Bonobo_Stream_iobuf_allocbuf\xCC131072\xCD(l) +Bonobo_Stream_iobuf_demarshal\xCC131072\xCD(x,y,z,i) +Bonobo_Stream_iobuf_marshal\xCC131072\xCD(x,y,z) +Bonobo_Stream_read\xCC1024\xCD(Bonobo_Stream _obj, const CORBA_long count, Bonobo_Stream_iobuf ** buffer, CORBA_Environment * ev)\xCFvoid +Bonobo_Stream_revert\xCC1024\xCD(Bonobo_Stream _obj, CORBA_Environment * ev)\xCFvoid +Bonobo_Stream_seek\xCC1024\xCD(Bonobo_Stream _obj, const CORBA_long offset, const Bonobo_Stream_SeekType whence, CORBA_Environment * ev)\xCFCORBA_long +Bonobo_Stream_setInfo\xCC1024\xCD(Bonobo_Stream _obj, const Bonobo_StorageInfo * info, const Bonobo_StorageInfoFields mask, CORBA_Environment * ev)\xCFvoid +Bonobo_Stream_truncate\xCC1024\xCD(Bonobo_Stream _obj, const CORBA_long length, CORBA_Environment * ev)\xCFvoid +Bonobo_Stream_unImplemented1\xCC1024\xCD(Bonobo_Stream _obj, CORBA_Environment * ev)\xCFvoid +Bonobo_Stream_unImplemented2\xCC1024\xCD(Bonobo_Stream _obj, CORBA_Environment * ev)\xCFvoid +Bonobo_Stream_write\xCC1024\xCD(Bonobo_Stream _obj, const Bonobo_Stream_iobuf * buffer, CORBA_Environment * ev)\xCFvoid +Bonobo_StringList\xCC4096\xCFCORBA_sequence_CORBA_string +Bonobo_StringList__alloc\xCC131072\xCD() +Bonobo_StringList__freekids\xCC131072\xCD(m,d) +Bonobo_StringList_allocbuf\xCC131072\xCD(l) +Bonobo_StringList_demarshal\xCC131072\xCD(x,y,z,i) +Bonobo_StringList_marshal\xCC131072\xCD(x,y,z) +Bonobo_UIComponent\xCC4096\xCFCORBA_Object +Bonobo_UIComponent_EventType\xCC4096 +Bonobo_UIComponent__get_name\xCC1024\xCD(Bonobo_UIComponent _obj, CORBA_Environment * ev)\xCFCORBA_string +Bonobo_UIComponent_describeVerbs\xCC1024\xCD(Bonobo_UIComponent _obj, CORBA_Environment * ev)\xCFCORBA_string +Bonobo_UIComponent_execVerb\xCC1024\xCD(Bonobo_UIComponent _obj, const CORBA_char * cname, CORBA_Environment * ev)\xCFvoid +Bonobo_UIComponent_setContainer\xCC1024\xCD(Bonobo_UIComponent _obj, const Bonobo_UIContainer container, CORBA_Environment * ev)\xCFvoid +Bonobo_UIComponent_uiEvent\xCC1024\xCD(Bonobo_UIComponent _obj, const CORBA_char * id, const Bonobo_UIComponent_EventType type, const CORBA_char * state, CORBA_Environment * ev)\xCFvoid +Bonobo_UIComponent_unImplemented\xCC1024\xCD(Bonobo_UIComponent _obj, CORBA_Environment * ev)\xCFvoid +Bonobo_UIComponent_unImplemented2\xCC1024\xCD(Bonobo_UIComponent _obj, CORBA_Environment * ev)\xCFvoid +Bonobo_UIComponent_unImplemented3\xCC1024\xCD(Bonobo_UIComponent _obj, CORBA_Environment * ev)\xCFvoid +Bonobo_UIComponent_unImplemented4\xCC1024\xCD(Bonobo_UIComponent _obj, CORBA_Environment * ev)\xCFvoid +Bonobo_UIComponent_unsetContainer\xCC1024\xCD(Bonobo_UIComponent _obj, CORBA_Environment * ev)\xCFvoid +Bonobo_UIContainer\xCC4096\xCFCORBA_Object +Bonobo_UIContainer_Insensitive\xCC4096\xCFBonobo_UIContainer_Insensitive_type +Bonobo_UIContainer_Insensitive__alloc\xCC131072\xCD() +Bonobo_UIContainer_Insensitive__freekids\xCC131072\xCD(m,d) +Bonobo_UIContainer_InvalidPath\xCC4096\xCFBonobo_UIContainer_InvalidPath_type +Bonobo_UIContainer_InvalidPath__alloc\xCC131072\xCD() +Bonobo_UIContainer_InvalidPath__freekids\xCC131072\xCD(m,d) +Bonobo_UIContainer_MalformedXML\xCC4096\xCFBonobo_UIContainer_MalformedXML_type +Bonobo_UIContainer_MalformedXML__alloc\xCC131072\xCD() +Bonobo_UIContainer_MalformedXML__freekids\xCC131072\xCD(m,d) +Bonobo_UIContainer_NonExistentAttr\xCC4096\xCFBonobo_UIContainer_NonExistentAttr_type +Bonobo_UIContainer_NonExistentAttr__alloc\xCC131072\xCD() +Bonobo_UIContainer_NonExistentAttr__freekids\xCC131072\xCD(m,d) +Bonobo_UIContainer_Unknown\xCC4096\xCFBonobo_UIContainer_Unknown_type +Bonobo_UIContainer_Unknown__alloc\xCC131072\xCD() +Bonobo_UIContainer_Unknown__freekids\xCC131072\xCD(m,d) +Bonobo_UIContainer_deregisterComponent\xCC1024\xCD(Bonobo_UIContainer _obj, const CORBA_char * component_name, CORBA_Environment * ev)\xCFvoid +Bonobo_UIContainer_execVerb\xCC1024\xCD(Bonobo_UIContainer _obj, const CORBA_char * cname, CORBA_Environment * ev)\xCFvoid +Bonobo_UIContainer_exists\xCC1024\xCD(Bonobo_UIContainer _obj, const CORBA_char * path, CORBA_Environment * ev)\xCFCORBA_boolean +Bonobo_UIContainer_freeze\xCC1024\xCD(Bonobo_UIContainer _obj, CORBA_Environment * ev)\xCFvoid +Bonobo_UIContainer_getAttr\xCC1024\xCD(Bonobo_UIContainer _obj, const CORBA_char * path, const CORBA_char * attr, CORBA_Environment * ev)\xCFCORBA_string +Bonobo_UIContainer_getNode\xCC1024\xCD(Bonobo_UIContainer _obj, const CORBA_char * path, const CORBA_boolean nodeOnly, CORBA_Environment * ev)\xCFCORBA_string +Bonobo_UIContainer_getObject\xCC1024\xCD(Bonobo_UIContainer _obj, const CORBA_char * path, CORBA_Environment * ev)\xCFBonobo_Unknown +Bonobo_UIContainer_registerComponent\xCC1024\xCD(Bonobo_UIContainer _obj, const CORBA_char * component_name, const Bonobo_UIComponent component, CORBA_Environment * ev)\xCFvoid +Bonobo_UIContainer_removeNode\xCC1024\xCD(Bonobo_UIContainer _obj, const CORBA_char * path, const CORBA_char * by_component_name, CORBA_Environment * ev)\xCFvoid +Bonobo_UIContainer_setAttr\xCC1024\xCD(Bonobo_UIContainer _obj, const CORBA_char * path, const CORBA_char * attr, const CORBA_char * value, const CORBA_char * component_name, CORBA_Environment * ev)\xCFvoid +Bonobo_UIContainer_setNode\xCC1024\xCD(Bonobo_UIContainer _obj, const CORBA_char * path, const CORBA_char * xml, const CORBA_char * component_name, CORBA_Environment * ev)\xCFvoid +Bonobo_UIContainer_setObject\xCC1024\xCD(Bonobo_UIContainer _obj, const CORBA_char * path, const Bonobo_Unknown control, CORBA_Environment * ev)\xCFvoid +Bonobo_UIContainer_thaw\xCC1024\xCD(Bonobo_UIContainer _obj, CORBA_Environment * ev)\xCFvoid +Bonobo_UIContainer_uiEvent\xCC1024\xCD(Bonobo_UIContainer _obj, const CORBA_char * id, const Bonobo_UIComponent_EventType type, const CORBA_char * state, CORBA_Environment * ev)\xCFvoid +Bonobo_UIContainer_unImplemented\xCC1024\xCD(Bonobo_UIContainer _obj, CORBA_Environment * ev)\xCFvoid +Bonobo_UIContainer_unImplemented2\xCC1024\xCD(Bonobo_UIContainer _obj, CORBA_Environment * ev)\xCFvoid +Bonobo_UIContainer_unImplemented3\xCC1024\xCD(Bonobo_UIContainer _obj, CORBA_Environment * ev)\xCFvoid +Bonobo_UIContainer_unImplemented4\xCC1024\xCD(Bonobo_UIContainer _obj, CORBA_Environment * ev)\xCFvoid +Bonobo_Unknown\xCC4096\xCFCORBA_Object +Bonobo_Unknown_queryInterface\xCC1024\xCD(Bonobo_Unknown _obj, const CORBA_char * repoid, CORBA_Environment * ev)\xCFBonobo_Unknown +Bonobo_Unknown_ref\xCC1024\xCD(Bonobo_Unknown _obj, CORBA_Environment * ev)\xCFvoid +Bonobo_Unknown_unref\xCC1024\xCD(Bonobo_Unknown _obj, CORBA_Environment * ev)\xCFvoid +Bonobo_ZoomLevel\xCC4096\xCFCORBA_float +Bonobo_ZoomLevelList\xCC4096\xCFCORBA_sequence_Bonobo_ZoomLevel +Bonobo_ZoomLevelList__alloc\xCC131072\xCD() +Bonobo_ZoomLevelList__freekids\xCC131072\xCD(m,d) +Bonobo_ZoomLevelList_allocbuf\xCC131072\xCD(l) +Bonobo_ZoomLevelList_demarshal\xCC131072\xCD(x,y,z,i) +Bonobo_ZoomLevelList_marshal\xCC131072\xCD(x,y,z) +Bonobo_ZoomLevelName\xCC4096\xCFCORBA_string +Bonobo_ZoomLevelNameList\xCC4096\xCFCORBA_sequence_Bonobo_ZoomLevelName +Bonobo_ZoomLevelNameList__alloc\xCC131072\xCD() +Bonobo_ZoomLevelNameList__freekids\xCC131072\xCD(m,d) +Bonobo_ZoomLevelNameList_allocbuf\xCC131072\xCD(l) +Bonobo_ZoomLevelNameList_demarshal\xCC131072\xCD(x,y,z,i) +Bonobo_ZoomLevelNameList_marshal\xCC131072\xCD(x,y,z) +Bonobo_ZoomLevelName__alloc\xCC131072\xCD() +Bonobo_ZoomLevelName__freekids\xCC131072\xCD(m,d) +Bonobo_ZoomLevelName_demarshal\xCC131072\xCD(x,y,z,i) +Bonobo_ZoomLevelName_marshal\xCC131072\xCD(x,y,z) +Bonobo_ZoomLevel__alloc\xCC131072\xCD() +Bonobo_ZoomLevel__freekids\xCC131072\xCD(m,d) +Bonobo_ZoomLevel_demarshal\xCC131072\xCD(x,y,z,i) +Bonobo_ZoomLevel_marshal\xCC131072\xCD(x,y,z) +Bonobo_Zoomable\xCC4096\xCFCORBA_Object +Bonobo_ZoomableFrame\xCC4096\xCFCORBA_Object +Bonobo_ZoomableFrame_onLevelChanged\xCC1024\xCD(Bonobo_ZoomableFrame _obj, const CORBA_float zoom_level, CORBA_Environment * ev)\xCFvoid +Bonobo_ZoomableFrame_onParametersChanged\xCC1024\xCD(Bonobo_ZoomableFrame _obj, CORBA_Environment * ev)\xCFvoid +Bonobo_ZoomableFrame_unImplemented1\xCC1024\xCD(Bonobo_ZoomableFrame _obj, CORBA_Environment * ev)\xCFvoid +Bonobo_ZoomableFrame_unImplemented2\xCC1024\xCD(Bonobo_ZoomableFrame _obj, CORBA_Environment * ev)\xCFvoid +Bonobo_ZoomableFrame_unImplemented3\xCC1024\xCD(Bonobo_ZoomableFrame _obj, CORBA_Environment * ev)\xCFvoid +Bonobo_ZoomableFrame_unImplemented4\xCC1024\xCD(Bonobo_ZoomableFrame _obj, CORBA_Environment * ev)\xCFvoid +Bonobo_Zoomable__get_hasMaxLevel\xCC1024\xCD(Bonobo_Zoomable _obj, CORBA_Environment * ev)\xCFCORBA_boolean +Bonobo_Zoomable__get_hasMinLevel\xCC1024\xCD(Bonobo_Zoomable _obj, CORBA_Environment * ev)\xCFCORBA_boolean +Bonobo_Zoomable__get_isContinuous\xCC1024\xCD(Bonobo_Zoomable _obj, CORBA_Environment * ev)\xCFCORBA_boolean +Bonobo_Zoomable__get_level\xCC1024\xCD(Bonobo_Zoomable _obj, CORBA_Environment * ev)\xCFCORBA_float +Bonobo_Zoomable__get_maxLevel\xCC1024\xCD(Bonobo_Zoomable _obj, CORBA_Environment * ev)\xCFCORBA_float +Bonobo_Zoomable__get_minLevel\xCC1024\xCD(Bonobo_Zoomable _obj, CORBA_Environment * ev)\xCFCORBA_float +Bonobo_Zoomable__get_preferredLevelNames\xCC1024\xCD(Bonobo_Zoomable _obj, CORBA_Environment * ev)\xCFBonobo_ZoomLevelNameList +Bonobo_Zoomable__get_preferredLevels\xCC1024\xCD(Bonobo_Zoomable _obj, CORBA_Environment * ev)\xCFBonobo_ZoomLevelList +Bonobo_Zoomable_setFrame\xCC1024\xCD(Bonobo_Zoomable _obj, const Bonobo_ZoomableFrame zoomable_frame, CORBA_Environment * ev)\xCFvoid +Bonobo_Zoomable_setLevel\xCC1024\xCD(Bonobo_Zoomable _obj, const CORBA_float zoom_level, CORBA_Environment * ev)\xCFvoid +Bonobo_Zoomable_unImplemented1\xCC1024\xCD(Bonobo_Zoomable _obj, CORBA_Environment * ev)\xCFvoid +Bonobo_Zoomable_unImplemented2\xCC1024\xCD(Bonobo_Zoomable _obj, CORBA_Environment * ev)\xCFvoid +Bonobo_Zoomable_unImplemented3\xCC1024\xCD(Bonobo_Zoomable _obj, CORBA_Environment * ev)\xCFvoid +Bonobo_Zoomable_unImplemented4\xCC1024\xCD(Bonobo_Zoomable _obj, CORBA_Environment * ev)\xCFvoid +Bonobo_Zoomable_zoomDefault\xCC1024\xCD(Bonobo_Zoomable _obj, CORBA_Environment * ev)\xCFvoid +Bonobo_Zoomable_zoomFit\xCC1024\xCD(Bonobo_Zoomable _obj, CORBA_Environment * ev)\xCFvoid +Bonobo_Zoomable_zoomIn\xCC1024\xCD(Bonobo_Zoomable _obj, CORBA_Environment * ev)\xCFvoid +Bonobo_Zoomable_zoomOut\xCC1024\xCD(Bonobo_Zoomable _obj, CORBA_Environment * ev)\xCFvoid +BufAlloc\xCC131072\xCD(type,ptr,n) +CARD16\xCC4096\xCFshort +CARD16Ptr\xCC4096\xCFCARD16 +CARD32\xCC4096\xCFlong +CARD32Ptr\xCC4096\xCFCARD32 +CARD8\xCC4096\xCFchar +CARD8Ptr\xCC4096\xCFCARD8 +CID_FaceDict\xCC4096\xCFCID_FaceDictRec_ +CID_FaceDictRec\xCC4096\xCFCID_FaceDictRec_ +CID_FaceInfo\xCC4096\xCFCID_FaceInfoRec_ +CID_FaceInfoRec\xCC4096\xCFCID_FaceInfoRec_ +CID_FontDict\xCC4096\xCFCID_FaceDictRec +CID_Info\xCC4096\xCFCID_FaceInfoRec +CI_GET_CHAR_INFO_1D\xCC131072\xCD(fs,col,def,cs) +CI_GET_CHAR_INFO_2D\xCC131072\xCD(fs,row,col,def,cs) +CI_GET_DEFAULT_INFO_1D\xCC131072\xCD(fs,cs) +CI_GET_DEFAULT_INFO_2D\xCC131072\xCD(fs,cs) +CI_NONEXISTCHAR\xCC131072\xCD(cs) +CLAMP\xCC131072\xCD(x,low,high) +CMSG_ALIGN\xCC131072\xCD(len) +CMSG_DATA\xCC131072\xCD(cmsg) +CMSG_FIRSTHDR\xCC131072\xCD(mhdr) +CMSG_LEN\xCC131072\xCD(len) +CMSG_NXTHDR\xCC131072\xCD(mhdr,cmsg) +CMSG_SPACE\xCC131072\xCD(len) +CORBA_sequence_Bonobo_ActivationEnvValue\xCC4096 +CORBA_sequence_Bonobo_ActivationEnvValue__alloc\xCC131072\xCD() +CORBA_sequence_Bonobo_ActivationEnvValue__freekids\xCC131072\xCD(m,d) +CORBA_sequence_Bonobo_ActivationEnvValue_allocbuf\xCC131072\xCD(l) +CORBA_sequence_Bonobo_ActivationProperty\xCC4096 +CORBA_sequence_Bonobo_ActivationProperty__alloc\xCC131072\xCD() +CORBA_sequence_Bonobo_ActivationProperty__freekids\xCC131072\xCD(m,d) +CORBA_sequence_Bonobo_ActivationProperty_allocbuf\xCC131072\xCD(l) +CORBA_sequence_Bonobo_ActivationProperty_copy\xCC1024\xCD(CORBA_sequence_Bonobo_ActivationProperty *copy, const CORBA_sequence_Bonobo_ActivationProperty *original)\xCFvoid +CORBA_sequence_Bonobo_Application_MessageDesc\xCC4096 +CORBA_sequence_Bonobo_Application_MessageDesc__alloc\xCC131072\xCD() +CORBA_sequence_Bonobo_Application_MessageDesc__freekids\xCC131072\xCD(m,d) +CORBA_sequence_Bonobo_Application_MessageDesc_allocbuf\xCC131072\xCD(l) +CORBA_sequence_Bonobo_Canvas_Point\xCC4096 +CORBA_sequence_Bonobo_Canvas_Point__alloc\xCC131072\xCD() +CORBA_sequence_Bonobo_Canvas_Point__freekids\xCC131072\xCD(m,d) +CORBA_sequence_Bonobo_Canvas_Point_allocbuf\xCC131072\xCD(l) +CORBA_sequence_Bonobo_Canvas_SVPSegment\xCC4096 +CORBA_sequence_Bonobo_Canvas_SVPSegment__alloc\xCC131072\xCD() +CORBA_sequence_Bonobo_Canvas_SVPSegment__freekids\xCC131072\xCD(m,d) +CORBA_sequence_Bonobo_Canvas_SVPSegment_allocbuf\xCC131072\xCD(l) +CORBA_sequence_Bonobo_Canvas_int32\xCC4096\xCFCORBA_sequence_CORBA_long +CORBA_sequence_Bonobo_Canvas_int32_demarshal\xCC131072\xCD(x,y,z,i) +CORBA_sequence_Bonobo_Canvas_int32_marshal\xCC131072\xCD(x,y,z) +CORBA_sequence_Bonobo_Pair\xCC4096 +CORBA_sequence_Bonobo_Pair__alloc\xCC131072\xCD() +CORBA_sequence_Bonobo_Pair__freekids\xCC131072\xCD(m,d) +CORBA_sequence_Bonobo_Pair_allocbuf\xCC131072\xCD(l) +CORBA_sequence_Bonobo_Persist_ContentType\xCC4096\xCFCORBA_sequence_CORBA_string +CORBA_sequence_Bonobo_Persist_ContentType_demarshal\xCC131072\xCD(x,y,z,i) +CORBA_sequence_Bonobo_Persist_ContentType_marshal\xCC131072\xCD(x,y,z) +CORBA_sequence_Bonobo_ServerInfo\xCC4096 +CORBA_sequence_Bonobo_ServerInfo__alloc\xCC131072\xCD() +CORBA_sequence_Bonobo_ServerInfo__freekids\xCC131072\xCD(m,d) +CORBA_sequence_Bonobo_ServerInfo_allocbuf\xCC131072\xCD(l) +CORBA_sequence_Bonobo_StorageInfo\xCC4096 +CORBA_sequence_Bonobo_StorageInfo__alloc\xCC131072\xCD() +CORBA_sequence_Bonobo_StorageInfo__freekids\xCC131072\xCD(m,d) +CORBA_sequence_Bonobo_StorageInfo_allocbuf\xCC131072\xCD(l) +CORBA_sequence_Bonobo_ZoomLevel\xCC4096\xCFCORBA_sequence_CORBA_float +CORBA_sequence_Bonobo_ZoomLevelName\xCC4096\xCFCORBA_sequence_CORBA_string +CORBA_sequence_Bonobo_ZoomLevelName_demarshal\xCC131072\xCD(x,y,z,i) +CORBA_sequence_Bonobo_ZoomLevelName_marshal\xCC131072\xCD(x,y,z) +CORBA_sequence_Bonobo_ZoomLevel_demarshal\xCC131072\xCD(x,y,z,i) +CORBA_sequence_Bonobo_ZoomLevel_marshal\xCC131072\xCD(x,y,z) +CORBA_sequence_CORBA_TypeCode\xCC4096 +CORBA_sequence_CORBA_TypeCode__alloc\xCC131072\xCD() +CORBA_sequence_CORBA_TypeCode__freekids\xCC131072\xCD(m,d) +CORBA_sequence_CORBA_TypeCode_allocbuf\xCC131072\xCD(l) +CORBA_sequence_CORBA_any\xCC4096 +CORBA_sequence_CORBA_any__alloc\xCC131072\xCD() +CORBA_sequence_CORBA_any__freekids\xCC131072\xCD(m,d) +CORBA_sequence_CORBA_any_allocbuf\xCC131072\xCD(l) +CORBA_sequence_CORBA_float\xCC4096 +CORBA_sequence_CORBA_float__alloc\xCC131072\xCD() +CORBA_sequence_CORBA_float__freekids\xCC131072\xCD(m,d) +CORBA_sequence_CORBA_float_allocbuf\xCC131072\xCD(l) +CORBA_sequence_CORBA_long\xCC4096 +CORBA_sequence_CORBA_long__alloc\xCC131072\xCD() +CORBA_sequence_CORBA_long__freekids\xCC131072\xCD(m,d) +CORBA_sequence_CORBA_long_allocbuf\xCC131072\xCD(l) +CORBA_sequence_CORBA_octet\xCC4096 +CORBA_sequence_CORBA_octet__alloc\xCC131072\xCD() +CORBA_sequence_CORBA_octet__freekids\xCC131072\xCD(m,d) +CORBA_sequence_CORBA_octet_allocbuf\xCC131072\xCD(l) +CORBA_sequence_CORBA_string\xCC4096 +CORBA_sequence_CORBA_string__alloc\xCC131072\xCD() +CORBA_sequence_CORBA_string__freekids\xCC131072\xCD(m,d) +CORBA_sequence_CORBA_string_allocbuf\xCC131072\xCD(l) +CORBA_sequence_CosNaming_Binding\xCC4096 +CORBA_sequence_CosNaming_Binding__alloc\xCC131072\xCD() +CORBA_sequence_CosNaming_Binding__freekids\xCC131072\xCD(m,d) +CORBA_sequence_CosNaming_Binding_allocbuf\xCC131072\xCD(l) +CORBA_sequence_CosNaming_NameComponent\xCC4096 +CORBA_sequence_CosNaming_NameComponent__alloc\xCC131072\xCD() +CORBA_sequence_CosNaming_NameComponent__freekids\xCC131072\xCD(m,d) +CORBA_sequence_CosNaming_NameComponent_allocbuf\xCC131072\xCD(l) +CPU_CLR\xCC131072\xCD(cpu,cpusetp) +CPU_ISSET\xCC131072\xCD(cpu,cpusetp) +CPU_SET\xCC131072\xCD(cpu,cpusetp) +CPU_ZERO\xCC131072\xCD(cpusetp) +CellsOfScreen\xCC131072\xCD(s) +ClientPtr\xCC4096\xCF_Client +ClientWhitePointOfCCC\xCC131072\xCD(ccc) +CloseDisplayType\xCC4096\xCFint +Colormap\xCC4096\xCFXID +ConnectionNumber\xCC131072\xCD(dpy) +CopyGCType\xCC4096\xCFint +CosNaming_Binding\xCC4096\xCFCosNaming_Binding_type +CosNaming_BindingIterator\xCC4096\xCFCORBA_Object +CosNaming_BindingIterator_destroy\xCC1024\xCD(CosNaming_BindingIterator _obj, CORBA_Environment *ev)\xCFvoid +CosNaming_BindingIterator_next_n\xCC1024\xCD(CosNaming_BindingIterator _obj, const CORBA_unsigned_long how_many, CosNaming_BindingList** bl, CORBA_Environment *ev)\xCFCORBA_boolean +CosNaming_BindingIterator_next_one\xCC1024\xCD(CosNaming_BindingIterator _obj, CosNaming_Binding** b, CORBA_Environment *ev)\xCFCORBA_boolean +CosNaming_BindingList\xCC4096\xCFCORBA_sequence_CosNaming_Binding +CosNaming_BindingList__alloc\xCC131072\xCD() +CosNaming_BindingList__freekids\xCC131072\xCD(m,d) +CosNaming_BindingList_allocbuf\xCC131072\xCD(l) +CosNaming_BindingList_demarshal\xCC131072\xCD(x,y,z,i) +CosNaming_BindingList_marshal\xCC131072\xCD(x,y,z) +CosNaming_BindingType\xCC4096 +CosNaming_Binding__alloc\xCC131072\xCD() +CosNaming_Binding__freekids\xCC131072\xCD(m,d) +CosNaming_Istring\xCC4096\xCFCORBA_string +CosNaming_Istring__alloc\xCC131072\xCD() +CosNaming_Istring__freekids\xCC131072\xCD(m,d) +CosNaming_Istring_demarshal\xCC131072\xCD(x,y,z,i) +CosNaming_Istring_marshal\xCC131072\xCD(x,y,z) +CosNaming_Name\xCC4096\xCFCORBA_sequence_CosNaming_NameComponent +CosNaming_NameComponent\xCC4096\xCFCosNaming_NameComponent_type +CosNaming_NameComponent__alloc\xCC131072\xCD() +CosNaming_NameComponent__freekids\xCC131072\xCD(m,d) +CosNaming_Name__alloc\xCC131072\xCD() +CosNaming_Name__freekids\xCC131072\xCD(m,d) +CosNaming_Name_allocbuf\xCC131072\xCD(l) +CosNaming_Name_demarshal\xCC131072\xCD(x,y,z,i) +CosNaming_Name_marshal\xCC131072\xCD(x,y,z) +CosNaming_NamingContext\xCC4096\xCFCORBA_Object +CosNaming_NamingContextExt\xCC4096\xCFCORBA_Object +CosNaming_NamingContextExt_Address\xCC4096\xCFCORBA_string +CosNaming_NamingContextExt_Address__alloc\xCC131072\xCD() +CosNaming_NamingContextExt_Address__freekids\xCC131072\xCD(m,d) +CosNaming_NamingContextExt_Address_demarshal\xCC131072\xCD(x,y,z,i) +CosNaming_NamingContextExt_Address_marshal\xCC131072\xCD(x,y,z) +CosNaming_NamingContextExt_InvalidAddress\xCC4096\xCFCosNaming_NamingContextExt_InvalidAddress_type +CosNaming_NamingContextExt_InvalidAddress__alloc\xCC131072\xCD() +CosNaming_NamingContextExt_InvalidAddress__freekids\xCC131072\xCD(m,d) +CosNaming_NamingContextExt_StringName\xCC4096\xCFCORBA_string +CosNaming_NamingContextExt_StringName__alloc\xCC131072\xCD() +CosNaming_NamingContextExt_StringName__freekids\xCC131072\xCD(m,d) +CosNaming_NamingContextExt_StringName_demarshal\xCC131072\xCD(x,y,z,i) +CosNaming_NamingContextExt_StringName_marshal\xCC131072\xCD(x,y,z) +CosNaming_NamingContextExt_URLString\xCC4096\xCFCORBA_string +CosNaming_NamingContextExt_URLString__alloc\xCC131072\xCD() +CosNaming_NamingContextExt_URLString__freekids\xCC131072\xCD(m,d) +CosNaming_NamingContextExt_URLString_demarshal\xCC131072\xCD(x,y,z,i) +CosNaming_NamingContextExt_URLString_marshal\xCC131072\xCD(x,y,z) +CosNaming_NamingContextExt_resolve_str\xCC1024\xCD(CosNaming_NamingContextExt _obj, const CORBA_char * n, CORBA_Environment *ev)\xCFCORBA_Object +CosNaming_NamingContextExt_to_name\xCC1024\xCD(CosNaming_NamingContextExt _obj, const CORBA_char * sn, CORBA_Environment *ev)\xCFCosNaming_Name +CosNaming_NamingContextExt_to_string\xCC1024\xCD(CosNaming_NamingContextExt _obj, const CosNaming_Name* n, CORBA_Environment *ev)\xCFCosNaming_NamingContextExt_StringName +CosNaming_NamingContextExt_to_url\xCC1024\xCD(CosNaming_NamingContextExt _obj, const CORBA_char * addr, const CORBA_char * sn, CORBA_Environment *ev)\xCFCosNaming_NamingContextExt_URLString +CosNaming_NamingContext_AlreadyBound\xCC4096\xCFCosNaming_NamingContext_AlreadyBound_type +CosNaming_NamingContext_AlreadyBound__alloc\xCC131072\xCD() +CosNaming_NamingContext_AlreadyBound__freekids\xCC131072\xCD(m,d) +CosNaming_NamingContext_CannotProceed\xCC4096\xCFCosNaming_NamingContext_CannotProceed_type +CosNaming_NamingContext_CannotProceed__alloc\xCC131072\xCD() +CosNaming_NamingContext_CannotProceed__freekids\xCC131072\xCD(m,d) +CosNaming_NamingContext_InvalidName\xCC4096\xCFCosNaming_NamingContext_InvalidName_type +CosNaming_NamingContext_InvalidName__alloc\xCC131072\xCD() +CosNaming_NamingContext_InvalidName__freekids\xCC131072\xCD(m,d) +CosNaming_NamingContext_NotEmpty\xCC4096\xCFCosNaming_NamingContext_NotEmpty_type +CosNaming_NamingContext_NotEmpty__alloc\xCC131072\xCD() +CosNaming_NamingContext_NotEmpty__freekids\xCC131072\xCD(m,d) +CosNaming_NamingContext_NotFound\xCC4096\xCFCosNaming_NamingContext_NotFound_type +CosNaming_NamingContext_NotFoundReason\xCC4096 +CosNaming_NamingContext_NotFound__alloc\xCC131072\xCD() +CosNaming_NamingContext_NotFound__freekids\xCC131072\xCD(m,d) +CosNaming_NamingContext_bind\xCC1024\xCD(CosNaming_NamingContext _obj, const CosNaming_Name* n, const CORBA_Object obj, CORBA_Environment *ev)\xCFvoid +CosNaming_NamingContext_bind_context\xCC1024\xCD(CosNaming_NamingContext _obj, const CosNaming_Name* n, const CosNaming_NamingContext nc, CORBA_Environment *ev)\xCFvoid +CosNaming_NamingContext_bind_new_context\xCC1024\xCD(CosNaming_NamingContext _obj, const CosNaming_Name* n, CORBA_Environment *ev)\xCFCosNaming_NamingContext +CosNaming_NamingContext_destroy\xCC1024\xCD(CosNaming_NamingContext _obj, CORBA_Environment *ev)\xCFvoid +CosNaming_NamingContext_list\xCC1024\xCD(CosNaming_NamingContext _obj, const CORBA_unsigned_long how_many, CosNaming_BindingList** bl, CosNaming_BindingIterator* bi, CORBA_Environment *ev)\xCFvoid +CosNaming_NamingContext_new_context\xCC1024\xCD(CosNaming_NamingContext _obj, CORBA_Environment *ev)\xCFCosNaming_NamingContext +CosNaming_NamingContext_rebind\xCC1024\xCD(CosNaming_NamingContext _obj, const CosNaming_Name* n, const CORBA_Object obj, CORBA_Environment *ev)\xCFvoid +CosNaming_NamingContext_rebind_context\xCC1024\xCD(CosNaming_NamingContext _obj, const CosNaming_Name* n, const CosNaming_NamingContext nc, CORBA_Environment *ev)\xCFvoid +CosNaming_NamingContext_resolve\xCC1024\xCD(CosNaming_NamingContext _obj, const CosNaming_Name* n, CORBA_Environment *ev)\xCFCORBA_Object +CosNaming_NamingContext_unbind\xCC1024\xCD(CosNaming_NamingContext _obj, const CosNaming_Name* n, CORBA_Environment *ev)\xCFvoid +CreateFontType\xCC4096\xCFint +CreateGCType\xCC4096\xCFint +Cursor\xCC4096\xCFXID +DEALLOCATE_LOCAL\xCC131072\xCD(_ptr) +D_\xCC131072\xCD(x) +Data\xCC131072\xCD(dpy,data,len) +Data16\xCC131072\xCD(dpy,data,len) +Data32\xCC131072\xCD(dpy,data,len) +DefaultColormap\xCC131072\xCD(dpy,scr) +DefaultColormapOfScreen\xCC131072\xCD(s) +DefaultDepth\xCC131072\xCD(dpy,scr) +DefaultDepthOfScreen\xCC131072\xCD(s) +DefaultGC\xCC131072\xCD(dpy,scr) +DefaultGCOfScreen\xCC131072\xCD(s) +DefaultRootWindow\xCC131072\xCD(dpy) +DefaultScreen\xCC131072\xCD(dpy) +DefaultScreenOfDisplay\xCC131072\xCD(dpy) +DefaultVisual\xCC131072\xCD(dpy,scr) +DefaultVisualOfScreen\xCC131072\xCD(s) +Depth\xCC4096 +DeqAsyncHandler\xCC131072\xCD(dpy,handler) +Display\xCC4096\xCF_XDisplay +DisplayCells\xCC131072\xCD(dpy,scr) +DisplayHeight\xCC131072\xCD(dpy,scr) +DisplayHeightMM\xCC131072\xCD(dpy,scr) +DisplayOfCCC\xCC131072\xCD(ccc) +DisplayOfScreen\xCC131072\xCD(s) +DisplayPlanes\xCC131072\xCD(dpy,scr) +DisplayString\xCC131072\xCD(dpy) +DisplayWidth\xCC131072\xCD(dpy,scr) +DisplayWidthMM\xCC131072\xCD(dpy,scr) +DoesBackingStore\xCC131072\xCD(s) +DoesSaveUnders\xCC131072\xCD(s) +Drawable\xCC4096\xCFXID +ErrorStringType\xCC4096\xCFchar +ErrorType\xCC4096\xCFint +EventMaskOfScreen\xCC131072\xCD(s) +FD_CLR\xCC131072\xCD(fd,fdsetp) +FD_ISSET\xCC131072\xCD(fd,fdsetp) +FD_SET\xCC131072\xCD(fd,fdsetp) +FD_ZERO\xCC131072\xCD(fdsetp) +FILE\xCC4096\xCF_IO_FILE +FSID\xCC4096\xCFlong +FTC_FACE_ID_HASH\xCC131072\xCD(i) +FTC_FONT_COMPARE\xCC131072\xCD(f1,f2) +FTC_FONT_HASH\xCC131072\xCD(f) +FTC_FaceID\xCC4096\xCFFT_END_HEADER +FTC_Face_Requester\xCC4096\xCFFT_Error +FTC_Font\xCC4096\xCFFTC_FontRec +FTC_FontRec\xCC4096\xCFFTC_FontRec_ +FTC_Manager\xCC4096\xCFFTC_ManagerRec_ +FTC_Node\xCC4096\xCFFTC_NodeRec_ +FT_Alloc_Func\xCC4096\xCFvoid +FT_Angle\xCC4096\xCFFT_END_HEADER +FT_BBox\xCC4096\xCFFT_BBox_ +FT_BOOL\xCC131072\xCD(x) +FT_Bitmap\xCC4096\xCFFT_Bitmap_ +FT_BitmapGlyph\xCC4096\xCFFT_BitmapGlyphRec_ +FT_BitmapGlyphRec\xCC4096\xCFFT_BitmapGlyphRec_ +FT_Bitmap_Size\xCC4096\xCFFT_Bitmap_Size_ +FT_Bool\xCC4096\xCFFT_END_HEADER +FT_Byte\xCC4096\xCFchar +FT_CURVE_TAG\xCC131072\xCD(flag) +FT_Char\xCC4096\xCFchar +FT_CharMap\xCC4096\xCFFT_CharMapRec_ +FT_CharMapRec\xCC4096\xCFFT_CharMapRec_ +FT_Data\xCC4096\xCFFT_Data_ +FT_DebugHook_Func\xCC4096\xCFFT_EXPORT +FT_Driver\xCC4096\xCFFT_DriverRec_ +FT_ENC_TAG\xCC131072\xCD(value,a,b,c,d) +FT_ERRORDEF\xCC131072\xCD(e,v,s) +FT_ERRORDEF_\xCC131072\xCD(e,v,s) +FT_ERROR_BASE\xCC131072\xCD(x) +FT_ERROR_MODULE\xCC131072\xCD(x) +FT_ERR_CAT\xCC131072\xCD(x,y) +FT_ERR_XCAT\xCC131072\xCD(x,y) +FT_Encoding\xCC4096\xCFFT_Encoding_ +FT_Encoding_\xCC2 +FT_Error\xCC4096\xCFint +FT_F26Dot6\xCC4096\xCFlong +FT_F2Dot14\xCC4096\xCFshort +FT_FWord\xCC4096\xCFshort +FT_Face\xCC4096\xCFFT_FaceRec_ +FT_FaceRec\xCC4096\xCFFT_FaceRec_ +FT_Face_Internal\xCC4096\xCFFT_Face_InternalRec_ +FT_Fixed\xCC4096\xCFlong +FT_Free_Func\xCC4096\xCFvoid +FT_Generic\xCC4096\xCFFT_Generic_ +FT_Generic_Finalizer\xCC4096\xCFvoid +FT_Glyph\xCC4096\xCFFT_GlyphRec_ +FT_GlyphRec\xCC4096\xCFFT_GlyphRec_ +FT_GlyphSlot\xCC4096\xCFFT_GlyphSlotRec_ +FT_GlyphSlotRec\xCC4096\xCFFT_GlyphSlotRec_ +FT_Glyph_BBox_Mode\xCC4096\xCFFT_EXPORT +FT_Glyph_BBox_Mode_\xCC2 +FT_Glyph_Class\xCC4096\xCFFT_BEGIN_HEADER +FT_Glyph_CopyFunc\xCC4096\xCFFT_Error +FT_Glyph_DoneFunc\xCC4096\xCFvoid +FT_Glyph_Format\xCC4096\xCFFT_Glyph_Format_ +FT_Glyph_Format_\xCC2 +FT_Glyph_GetBBoxFunc\xCC4096\xCFvoid +FT_Glyph_InitFunc\xCC4096\xCFFT_BEGIN_HEADER @@ Diff output truncated at 100000 characters. @@ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany: [474] trunk
by eht16＠users.sourceforge.net 24 Jun '06

24 Jun '06

Revision: 474 Author: eht16 Date: 2006-06-24 07:36:35 -0700 (Sat, 24 Jun 2006) ViewCVS: http://svn.sourceforge.net/geany/?rev=474&view=rev Log Message: ----------- Replaced 'blank' by 'include "..."'. Fixed a bug in utils_brace_match() which prevents correctly matching. Made auto completion work only for the current filetype (i.e. it hides symbols from other filetypes). Removed unneeded code. Modified Paths: -------------- trunk/ChangeLog trunk/src/document.c trunk/src/filetypes.c trunk/src/filetypes.h trunk/src/geany.h trunk/src/sci_cb.c trunk/src/utils.c trunk/tagmanager/options.c trunk/tagmanager/options.h trunk/tagmanager/parse.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2006-06-23 14:00:22 UTC (rev 473) +++ trunk/ChangeLog 2006-06-24 14:36:35 UTC (rev 474) @@ -1,3 +1,18 @@ +2006-06-24 Enrico Troeger <enrico.troeger(a)uvena.de> + + * src/utils.c: Replaced 'blank' by 'include "..."'. Fixed a bug in + utils_brace_match() which prevents correctly matching. + * src/document.c, src/sci_cb.c, src/filetypes.c: + Made auto completion work only for the current filetype + (i.e. it hides symbols from other filetypes). + * tagmanager/options.c, tagmanager/parse.c: Removed unneeded code. + * tagmanager/tm_workspace.c, tagmanager/tm_source_file + tagmanager/tm_tag.c, tagmanager/tm_project, tagmanager/parsers.h, + tagmanager/tm_file_entry.c, tagmanager/entry.c, src/highlighting.c, + data/latex.tags, data/php.tags, Makefile.am: + Added global auto completion tags for PHP and LaTeX. + + 2006-06-23 Nick Treleaven <nick.treleaven(a)btinternet.com> * src/msgwindow.c: Add a timestamp to messages in the Status window Modified: trunk/src/document.c =================================================================== --- trunk/src/document.c 2006-06-23 14:00:22 UTC (rev 473) +++ trunk/src/document.c 2006-06-24 14:36:35 UTC (rev 474) @@ -930,17 +930,13 @@ if (doc_list[idx].tm_file == NULL) { gchar *locale_filename = g_locale_from_utf8(doc_list[idx].file_name, -1, NULL, NULL, NULL); - doc_list[idx].tm_file = tm_source_file_new(locale_filename, FALSE); + doc_list[idx].tm_file = tm_source_file_new(locale_filename, FALSE, + doc_list[idx].file_type->name); g_free(locale_filename); if (! doc_list[idx].tm_file) return; tm_workspace_add_object(doc_list[idx].tm_file); if (update) - { - // parse the file after setting the filetype - // this is necessary to switch between filetypes - TM_SOURCE_FILE(doc_list[idx].tm_file)->lang = getNamedLanguage((doc_list[idx].file_type)->name); tm_source_file_update(doc_list[idx].tm_file, TRUE, FALSE, TRUE); - } utils_update_tag_list(idx, TRUE); } else Modified: trunk/src/filetypes.c =================================================================== --- trunk/src/filetypes.c 2006-06-23 14:00:22 UTC (rev 473) +++ trunk/src/filetypes.c 2006-06-24 14:36:35 UTC (rev 474) @@ -48,6 +48,7 @@ #define C // these macros are only to ease navigation filetypes[GEANY_FILETYPES_C] = g_new0(filetype, 1); filetypes[GEANY_FILETYPES_C]->id = GEANY_FILETYPES_C; + filetypes[GEANY_FILETYPES_C]->lang = 0; filetypes[GEANY_FILETYPES_C]->name = g_strdup("C"); filetypes[GEANY_FILETYPES_C]->has_tags = TRUE; filetypes[GEANY_FILETYPES_C]->title = g_strdup(_("C source file")); @@ -66,6 +67,8 @@ #define CPP filetypes[GEANY_FILETYPES_CPP] = g_new0(filetype, 1); filetypes[GEANY_FILETYPES_CPP]->id = GEANY_FILETYPES_CPP; + // C++ has langType 1, but to get the global tags for C, too, we use the langType of C + filetypes[GEANY_FILETYPES_CPP]->lang = 0; filetypes[GEANY_FILETYPES_CPP]->name = g_strdup("C++"); filetypes[GEANY_FILETYPES_CPP]->has_tags = TRUE; filetypes[GEANY_FILETYPES_CPP]->title = g_strdup(_("C++ source file")); @@ -93,6 +96,7 @@ filetypes[GEANY_FILETYPES_JAVA] = g_new0(filetype, 1); filetypes[GEANY_FILETYPES_JAVA]->id = GEANY_FILETYPES_JAVA; filetypes[GEANY_FILETYPES_JAVA]->name = g_strdup("Java"); + filetypes[GEANY_FILETYPES_JAVA]->lang = 2; filetypes[GEANY_FILETYPES_JAVA]->has_tags = TRUE; filetypes[GEANY_FILETYPES_JAVA]->title = g_strdup(_("Java source file")); filetypes[GEANY_FILETYPES_JAVA]->extension = g_strdup("java"); @@ -109,6 +113,7 @@ #define PERL filetypes[GEANY_FILETYPES_PERL] = g_new0(filetype, 1); filetypes[GEANY_FILETYPES_PERL]->id = GEANY_FILETYPES_PERL; + filetypes[GEANY_FILETYPES_PERL]->lang = 5; filetypes[GEANY_FILETYPES_PERL]->name = g_strdup("Perl"); filetypes[GEANY_FILETYPES_PERL]->has_tags = TRUE; filetypes[GEANY_FILETYPES_PERL]->title = g_strdup(_("Perl source file")); @@ -127,6 +132,7 @@ #define PHP filetypes[GEANY_FILETYPES_PHP] = g_new0(filetype, 1); filetypes[GEANY_FILETYPES_PHP]->id = GEANY_FILETYPES_PHP; + filetypes[GEANY_FILETYPES_PHP]->lang = 6; filetypes[GEANY_FILETYPES_PHP]->name = g_strdup("PHP"); filetypes[GEANY_FILETYPES_PHP]->has_tags = TRUE; filetypes[GEANY_FILETYPES_PHP]->title = g_strdup(_("PHP / HTML source file")); @@ -149,6 +155,7 @@ #define XML filetypes[GEANY_FILETYPES_XML] = g_new0(filetype, 1); filetypes[GEANY_FILETYPES_XML]->id = GEANY_FILETYPES_XML; + filetypes[GEANY_FILETYPES_XML]->lang = -2; filetypes[GEANY_FILETYPES_XML]->name = g_strdup("XML"); filetypes[GEANY_FILETYPES_XML]->has_tags = FALSE; filetypes[GEANY_FILETYPES_XML]->title = g_strdup(_("XML source file")); @@ -166,6 +173,7 @@ #define DOCBOOK filetypes[GEANY_FILETYPES_DOCBOOK] = g_new0(filetype, 1); filetypes[GEANY_FILETYPES_DOCBOOK]->id = GEANY_FILETYPES_DOCBOOK; + filetypes[GEANY_FILETYPES_DOCBOOK]->lang = 12; filetypes[GEANY_FILETYPES_DOCBOOK]->name = g_strdup("Docbook"); filetypes[GEANY_FILETYPES_DOCBOOK]->has_tags = TRUE; filetypes[GEANY_FILETYPES_DOCBOOK]->title = g_strdup(_("Docbook source file")); @@ -182,6 +190,7 @@ #define PYTHON filetypes[GEANY_FILETYPES_PYTHON] = g_new0(filetype, 1); filetypes[GEANY_FILETYPES_PYTHON]->id = GEANY_FILETYPES_PYTHON; + filetypes[GEANY_FILETYPES_PYTHON]->lang = 7; filetypes[GEANY_FILETYPES_PYTHON]->name = g_strdup("Python"); filetypes[GEANY_FILETYPES_PYTHON]->has_tags = TRUE; filetypes[GEANY_FILETYPES_PYTHON]->title = g_strdup(_("Python source file")); @@ -199,6 +208,7 @@ #define LATEX filetypes[GEANY_FILETYPES_LATEX] = g_new0(filetype, 1); filetypes[GEANY_FILETYPES_LATEX]->id = GEANY_FILETYPES_LATEX; + filetypes[GEANY_FILETYPES_LATEX]->lang = 8; filetypes[GEANY_FILETYPES_LATEX]->name = g_strdup("LaTeX"); filetypes[GEANY_FILETYPES_LATEX]->has_tags = TRUE; filetypes[GEANY_FILETYPES_LATEX]->title = g_strdup(_("LaTeX source file")); @@ -217,6 +227,7 @@ #define PASCAL filetypes[GEANY_FILETYPES_PASCAL] = g_new0(filetype, 1); filetypes[GEANY_FILETYPES_PASCAL]->id = GEANY_FILETYPES_PASCAL; + filetypes[GEANY_FILETYPES_PASCAL]->lang = 4; filetypes[GEANY_FILETYPES_PASCAL]->name = g_strdup("Pascal"); filetypes[GEANY_FILETYPES_PASCAL]->has_tags = TRUE; filetypes[GEANY_FILETYPES_PASCAL]->title = g_strdup(_("Pascal source file")); @@ -238,6 +249,7 @@ #define SH filetypes[GEANY_FILETYPES_SH] = g_new0(filetype, 1); filetypes[GEANY_FILETYPES_SH]->id = GEANY_FILETYPES_SH; + filetypes[GEANY_FILETYPES_SH]->lang = 16; filetypes[GEANY_FILETYPES_SH]->name = g_strdup("Sh"); filetypes[GEANY_FILETYPES_SH]->has_tags = TRUE; filetypes[GEANY_FILETYPES_SH]->title = g_strdup(_("Shell script file")); @@ -260,6 +272,7 @@ #define MAKE filetypes[GEANY_FILETYPES_MAKE] = g_new0(filetype, 1); filetypes[GEANY_FILETYPES_MAKE]->id = GEANY_FILETYPES_MAKE; + filetypes[GEANY_FILETYPES_MAKE]->lang = 3; filetypes[GEANY_FILETYPES_MAKE]->name = g_strdup("Make"); filetypes[GEANY_FILETYPES_MAKE]->has_tags = TRUE; filetypes[GEANY_FILETYPES_MAKE]->title = g_strdup(_("Makefile")); @@ -277,6 +290,7 @@ #define CSS filetypes[GEANY_FILETYPES_CSS] = g_new0(filetype, 1); filetypes[GEANY_FILETYPES_CSS]->id = GEANY_FILETYPES_CSS; + filetypes[GEANY_FILETYPES_CSS]->lang = 13; filetypes[GEANY_FILETYPES_CSS]->name = g_strdup("CSS"); filetypes[GEANY_FILETYPES_CSS]->has_tags = TRUE; filetypes[GEANY_FILETYPES_CSS]->title = g_strdup(_("Cascading StyleSheet")); @@ -293,6 +307,7 @@ #define CONF filetypes[GEANY_FILETYPES_CONF] = g_new0(filetype, 1); filetypes[GEANY_FILETYPES_CONF]->id = GEANY_FILETYPES_CONF; + filetypes[GEANY_FILETYPES_CONF]->lang = 10; filetypes[GEANY_FILETYPES_CONF]->name = g_strdup("Conf"); filetypes[GEANY_FILETYPES_CONF]->has_tags = TRUE; filetypes[GEANY_FILETYPES_CONF]->title = g_strdup(_("Config file")); @@ -312,8 +327,9 @@ #define ASM filetypes[GEANY_FILETYPES_ASM] = g_new0(filetype, 1); filetypes[GEANY_FILETYPES_ASM]->id = GEANY_FILETYPES_ASM; + filetypes[GEANY_FILETYPES_ASM]->lang = 9; filetypes[GEANY_FILETYPES_ASM]->name = g_strdup("ASM"); - filetypes[GEANY_FILETYPES_ASM]->has_tags = FALSE; + filetypes[GEANY_FILETYPES_ASM]->has_tags = TRUE; filetypes[GEANY_FILETYPES_ASM]->title = g_strdup(_("Assembler source file")); filetypes[GEANY_FILETYPES_ASM]->extension = g_strdup("asm"); filetypes[GEANY_FILETYPES_ASM]->pattern = g_new0(gchar*, 2); @@ -328,6 +344,7 @@ #define SQL filetypes[GEANY_FILETYPES_SQL] = g_new0(filetype, 1); filetypes[GEANY_FILETYPES_SQL]->id = GEANY_FILETYPES_SQL; + filetypes[GEANY_FILETYPES_SQL]->lang = 11; filetypes[GEANY_FILETYPES_SQL]->name = g_strdup("SQL"); filetypes[GEANY_FILETYPES_SQL]->has_tags = TRUE; filetypes[GEANY_FILETYPES_SQL]->title = g_strdup(_("SQL Dump file")); @@ -344,6 +361,7 @@ #define CAML filetypes[GEANY_FILETYPES_CAML] = g_new0(filetype, 1); filetypes[GEANY_FILETYPES_CAML]->id = GEANY_FILETYPES_CAML; + filetypes[GEANY_FILETYPES_CAML]->lang = -2; filetypes[GEANY_FILETYPES_CAML]->name = g_strdup("CAML"); filetypes[GEANY_FILETYPES_CAML]->has_tags = FALSE; filetypes[GEANY_FILETYPES_CAML]->title = g_strdup(_("(O)Caml source file")); @@ -361,6 +379,7 @@ #define OMS filetypes[GEANY_FILETYPES_OMS] = g_new0(filetype, 1); filetypes[GEANY_FILETYPES_OMS]->id = GEANY_FILETYPES_OMS; + filetypes[GEANY_FILETYPES_OMS]->lang = -2; filetypes[GEANY_FILETYPES_OMS]->name = g_strdup("O-Matrix"); filetypes[GEANY_FILETYPES_OMS]->has_tags = FALSE; filetypes[GEANY_FILETYPES_OMS]->title = g_strdup(_("O-Matrix source file")); @@ -377,6 +396,7 @@ #define RUBY filetypes[GEANY_FILETYPES_RUBY] = g_new0(filetype, 1); filetypes[GEANY_FILETYPES_RUBY]->id = GEANY_FILETYPES_RUBY; + filetypes[GEANY_FILETYPES_RUBY]->lang = 14; filetypes[GEANY_FILETYPES_RUBY]->name = g_strdup("Ruby"); filetypes[GEANY_FILETYPES_RUBY]->has_tags = TRUE; filetypes[GEANY_FILETYPES_RUBY]->title = g_strdup(_("Ruby source file")); @@ -395,6 +415,7 @@ #define TCL filetypes[GEANY_FILETYPES_TCL] = g_new0(filetype, 1); filetypes[GEANY_FILETYPES_TCL]->id = GEANY_FILETYPES_TCL; + filetypes[GEANY_FILETYPES_TCL]->lang = 15; filetypes[GEANY_FILETYPES_TCL]->name = g_strdup("Tcl"); filetypes[GEANY_FILETYPES_TCL]->has_tags = TRUE; filetypes[GEANY_FILETYPES_TCL]->title = g_strdup(_("Tcl source file")); @@ -414,6 +435,7 @@ filetypes[GEANY_FILETYPES_ALL] = g_new0(filetype, 1); filetypes[GEANY_FILETYPES_ALL]->id = GEANY_FILETYPES_ALL; filetypes[GEANY_FILETYPES_ALL]->name = g_strdup("None"); + filetypes[GEANY_FILETYPES_ALL]->lang = -2; filetypes[GEANY_FILETYPES_ALL]->has_tags = FALSE; filetypes[GEANY_FILETYPES_ALL]->title = g_strdup(_("All files")); filetypes[GEANY_FILETYPES_ALL]->extension = g_strdup("*"); Modified: trunk/src/filetypes.h =================================================================== --- trunk/src/filetypes.h 2006-06-23 14:00:22 UTC (rev 473) +++ trunk/src/filetypes.h 2006-06-24 14:36:35 UTC (rev 474) @@ -73,6 +73,8 @@ typedef struct filetype { guint id; + langType lang; // represents the langType of tagmanager(see the table + // in tagmanager/parsers.h), -1 represents all, -2 none gchar *name; // will be used as name for tagmanager gboolean has_tags; // indicates whether there is a tag parser for it or not gchar *title; // will be shown in the file open dialog Modified: trunk/src/geany.h =================================================================== --- trunk/src/geany.h 2006-06-23 14:00:22 UTC (rev 473) +++ trunk/src/geany.h 2006-06-24 14:36:35 UTC (rev 474) @@ -65,7 +65,7 @@ #define GEANY_SESSION_FILES 25 #define GEANY_MAX_TAGS_COUNT 1000 #define GEANY_CHECK_FILE_DELAY 30 -#define GEANY_WORDCHARS "_#&abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789" +#define GEANY_WORDCHARS "_#&abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789\\" #define GEANY_MAX_WORD_LENGTH 192 #define GEANY_MAX_AUTOCOMPLETE_WORDS 30 #define GEANY_STRING_UNTITLED _("untitled") @@ -263,9 +263,6 @@ GIGABYTE = (MEGABYTE*1024) }; -// prototype from tagmanager/parse.h, used in document.c, ugly but it works -extern langType getNamedLanguage(const char *const name); - // implementation in main.c void geany_debug(gchar const *format, ...); Modified: trunk/src/sci_cb.c =================================================================== --- trunk/src/sci_cb.c 2006-06-23 14:00:22 UTC (rev 473) +++ trunk/src/sci_cb.c 2006-06-24 14:36:35 UTC (rev 474) @@ -182,6 +182,7 @@ case '{': { // Tex auto-closing sci_cb_auto_close_bracket(sci, pos, nt->ch); // Tex auto-closing + sci_cb_show_calltip(sci, pos); break; } case '}': @@ -365,24 +366,26 @@ gint lexer = SSM(sci, SCI_GETLEXER, 0, 0); gint style; gchar word[GEANY_MAX_WORD_LENGTH]; + gint idx = document_find_by_sci(sci); const GPtrArray *tags; word[0] = '\0'; if (pos == -1) { // position of '(' is unknown, so go backwards to find it pos = SSM(sci, SCI_GETCURRENTPOS, 0, 0); - while (pos >= 0 && SSM(sci, SCI_GETCHARAT, pos, 0) != '(') pos--; + // I'm not sure if utils_isbrace() is a good idea, but it is the simplest way, but we need + // something more intelligent than only check for '(' because e.g. LaTeX uses {, [ or ( + while (pos >= 0 && ! utils_isbrace(SSM(sci, SCI_GETCHARAT, pos, 0))) pos--; } style = SSM(sci, SCI_GETSTYLEAT, pos, 0); - if (lexer != SCLEX_CPP) return FALSE; if (lexer == SCLEX_CPP && (style == SCE_C_COMMENT || style == SCE_C_COMMENTLINE || style == SCE_C_COMMENTDOC)) return FALSE; utils_find_current_word(sci, pos - 1, word, sizeof word); if (word[0] == '\0') return FALSE; - tags = tm_workspace_find(word, tm_tag_max_t, NULL, FALSE); + tags = tm_workspace_find(word, tm_tag_max_t, NULL, FALSE, doc_list[idx].file_type->lang); if (tags->len == 1 && TM_TAG(tags->pdata[0])->atts.entry.arglist) { SSM(sci, SCI_CALLTIPSHOW, pos, (sptr_t) TM_TAG(tags->pdata[0])->atts.entry.arglist); @@ -439,25 +442,27 @@ g_strfreev(ents); } else - { // C and C++ tag autocompletion + { // PHP, LaTeX, C and C++ tag autocompletion gint i = 0; + gint idx = document_find_by_sci(sci); + TMTagAttrType attrs[] = { tm_tag_attr_name_t, 0 }; while ((line_pos - i >= 0) && ! g_ascii_isspace(linebuf[line_pos - i])) i++; if (i < 4) return FALSE; // go home if typed less than 4 chars - tags = tm_workspace_find(root, tm_tag_max_t, NULL, TRUE); + tags = tm_workspace_find(root, tm_tag_max_t, attrs, TRUE, doc_list[idx].file_type->lang); if (NULL != tags && tags->len > 0) { GString *words = g_string_sized_new(150); - TMTag *tag; guint j; + for (j = 0; ((j < tags->len) && (j < GEANY_MAX_AUTOCOMPLETE_WORDS)); ++j) { - tag = (TMTag *) tags->pdata[j]; if (j > 0) g_string_append_c(words, ' '); - g_string_append(words, tag->name); + g_string_append(words, ((TMTag *) tags->pdata[j])->name); } SSM(sci, SCI_AUTOCSHOW, rootlen, (sptr_t) words->str); + //geany_debug("string size: %d", words->len); g_string_free(words, TRUE); } } Modified: trunk/src/utils.c =================================================================== --- trunk/src/utils.c 2006-06-23 14:00:22 UTC (rev 473) +++ trunk/src/utils.c 2006-06-24 14:36:35 UTC (rev 474) @@ -308,19 +308,18 @@ case '>': return TRUE; } } - else + + switch (c) { - switch (c) - { - case '(': - case ')': - case '{': - case '}': - case '[': - case ']': return TRUE; - default: return FALSE; - } + case '(': + case ')': + case '{': + case '}': + case '[': + case ']': return TRUE; + default: return FALSE; } + return FALSE; } @@ -1827,16 +1826,24 @@ "iterator", "functional", "string", "complex", "valarray", NULL }; - blank = gtk_menu_item_new_with_label(_("(blank)")); + blank = gtk_menu_item_new_with_label("#include \"...\""); gtk_container_add(GTK_CONTAINER(menu_edit), blank); gtk_widget_show(blank); g_signal_connect((gpointer) blank, "activate", G_CALLBACK(on_insert_include_activate), (gpointer) "blank"); - blank = gtk_menu_item_new_with_label(_("(blank)")); + blank = gtk_separator_menu_item_new (); + gtk_container_add(GTK_CONTAINER(menu_edit), blank); + gtk_widget_show(blank); + + blank = gtk_menu_item_new_with_label("#include \"...\""); gtk_container_add(GTK_CONTAINER(menu_popup), blank); gtk_widget_show(blank); g_signal_connect((gpointer) blank, "activate", G_CALLBACK(on_insert_include_activate), (gpointer) "blank"); + blank = gtk_separator_menu_item_new (); + gtk_container_add(GTK_CONTAINER(menu_popup), blank); + gtk_widget_show(blank); + insert_items(menu_edit, menu_popup, (gchar**) c_includes_stdlib, _("C Standard Library")); insert_items(menu_edit, menu_popup, (gchar**) c_includes_c99, _("ISO C99")); insert_items(menu_edit, menu_popup, (gchar**) c_includes_cpp, _("C++ (C Standard Library)")); Modified: trunk/tagmanager/options.c =================================================================== --- trunk/tagmanager/options.c 2006-06-23 14:00:22 UTC (rev 473) +++ trunk/tagmanager/options.c 2006-06-24 14:36:35 UTC (rev 474) @@ -24,20 +24,11 @@ #include "options.h" #include "parse.h" -/* -* MACROS -*/ -#define INVOCATION "Usage: %s [options] [file(s)]\n" #define CTAGS_ENVIRONMENT "CTAGS" -#define ETAGS_ENVIRONMENT "ETAGS" #define CTAGS_FILE "tags" -#define ETAGS_FILE "TAGS" -#ifndef ETAGS -# define ETAGS "etags" /* name which causes default use of to -e */ -#endif /* The following separators are permitted for list options. */ @@ -56,44 +47,12 @@ #define isCompoundOption(c) (boolean) (strchr ("fohiILpDb", (c)) != NULL) -/* -* Data declarations -*/ -enum eOptionLimits { - MaxHeaderExtensions = 100, /* maximum number of extensions in -h option */ - MaxSupportedTagFormat = 2 -}; -typedef struct sOptionDescription { - int usedByEtags; - const char *const description; -} optionDescription; - -typedef void (*parametricOptionHandler) (const char *const option, const char *const parameter); - -typedef const struct { - const char* name; /* name of option as specified by user */ - parametricOptionHandler handler; /* routine to handle option */ - boolean initOnly; /* option must be specified before any files */ -} parametricOption; - -typedef const struct { - const char* name; /* name of option as specified by user */ - boolean* pValue; /* pointer to option value */ - boolean initOnly; /* option must be specified before any files */ -} booleanOption; - /* * DATA DEFINITIONS */ -static boolean ParsedLeadingOptions = FALSE; - -static const char *const HeaderExtensions [] = { - "h", "H", "hh", "hpp", "hxx", "h++", "inc", "def", NULL -}; - optionValues Option = { { FALSE, /* --extra=f */ @@ -130,7 +89,6 @@ NULL, /* -L */ NULL, /* -o */ NULL, /* -h */ - NULL, /* --etags-include */ DEFAULT_FILE_FORMAT,/* --format */ FALSE, /* --if0 */ FALSE, /* --kind-long */ @@ -143,117 +101,13 @@ FALSE, /* --totals */ FALSE, /* --line-directives */ FALSE, -#ifdef TM_DEBUG - 0, 0 /* -D, -b */ -#endif }; -/* -- Locally used only -*/ -static optionDescription LongOptionDescription [] = { - {1," --version"}, - {1," Print version identifier to standard output."}, - {1, NULL} -}; - -static const char* const License = -"This program is free software; you can redistribute it and/or\n\ -modify it under the terms of the GNU General Public License\n\ -as published by the Free Software Foundation; either version 2\n\ -of the License, or (at your option) any later version.\n\ -\n\ -This program is distributed in the hope that it will be useful,\n\ -but WITHOUT ANY WARRANTY; without even the implied warranty of\n\ -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n\ -GNU General Public License for more details.\n\ -\n\ -You should have received a copy of the GNU General Public License\n\ -along with this program; if not, write to the Free Software\n\ -Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n"; - -/* Contains a set of strings describing the set of "features" compiled into - * the code. - */ -static const char *const Features [] = { -#ifdef WIN32 - "win32", -#endif -#ifdef DJGPP - "msdos_32", -#else -# ifdef MSDOS - "msdos_16", -# endif -#endif -#ifdef OS2 - "os2", -#endif -#ifdef AMIGA - "amiga", -#endif -#ifdef VMS - "vms", -#endif -#ifdef HAVE_FNMATCH - "wildcards", -#endif -#ifdef HAVE_REGEX - "regex", -#endif -#ifndef EXTERNAL_SORT - "internal-sort", -#endif -#ifdef CUSTOM_CONFIGURATION_FILE - "custom-conf", -#endif -#if (defined (MSDOS) || defined (WIN32) || defined (OS2)) && defined (UNIX_PATH_SEPARATOR) - "unix-path-separator", -#endif -#ifdef TM_DEBUG - "debug", -#endif - NULL -}; - -/* -* FUNCTION PROTOTYPES -*/ -static boolean parseFileOptions (const char *const fileName); - -/* -* FUNCTION DEFINITIONS -*/ - extern void verbose (const char *const format, ...) { - if (Option.verbose) - { - va_list ap; - va_start (ap, format); - vprintf (format, ap); - va_end (ap); - } } -static char *stringCopy (const char *const string) -{ - char* result = NULL; - if (string != NULL) - result = eStrdup (string); - return result; -} - -static void freeString (char **const pString) -{ - if (*pString != NULL) - { - eFree (*pString); - *pString = NULL; - } -} - extern void freeList (stringList** const pList) { if (*pList != NULL) @@ -265,306 +119,17 @@ extern void setDefaultTagFileName (void) { - if (Option.tagFileName != NULL) - ; /* accept given name */ - else if (Option.etags) - Option.tagFileName = stringCopy (ETAGS_FILE); - else - Option.tagFileName = stringCopy (CTAGS_FILE); + Option.tagFileName = eStrdup (CTAGS_FILE); } -extern void checkOptions (void) -{ - const char* notice; - if (Option.xref) - { - notice = "xref output"; - if (Option.include.fileNames) - { - error (WARNING, "%s disables file name tags", notice); - Option.include.fileNames = FALSE; - } - } - if (Option.append) - { - notice = "append mode is not compatible with"; - if (isDestinationStdout ()) - error (FATAL, "%s tags to stdout", notice); - } - if (Option.filter) - { - notice = "filter mode"; - if (Option.printTotals) - { - error (WARNING, "%s disables totals", notice); - Option.printTotals = FALSE; - } - if (Option.tagFileName != NULL) - error (WARNING, "%s ignores output tag file name", notice); - } -#ifdef UPDATE_ENABLED - if (Option.update) - { - notice = "update option is not compatible with"; - if (Option.etags) - error (FATAL, "%s emacs-style tags", notice); - if (Option.filter) - error (FATAL, "%s filter option", notice); - if (isDestinationStdout ()) - error (FATAL, "%s tags to stdout", notice); - Option.append = TRUE; - } -#endif -} - -static void setEtagsMode (void) -{ - Option.etags = TRUE; - Option.sorted = FALSE; - Option.lineDirectives = FALSE; - Option.tagRelative = TRUE; -} - -extern void testEtagsInvocation (void) -{ - char* const execName = eStrdup (getExecutableName ()); - char* const etags = eStrdup (ETAGS); -#ifdef CASE_INSENSITIVE_FILENAMES - toLowerString (execName); - toLowerString (etags); -#endif - if (strstr (execName, etags) != NULL) - { - verbose ("Running in etags mode\n"); - setEtagsMode (); - } -} - /* - * Cooked argument parsing - */ - -static void parseShortOption (cookedArgs *const args) -{ - args->simple [0] = *args->shortOptions++; - args->simple [1] = '\0'; - args->item = args->simple; - if (! isCompoundOption (*args->simple)) - args->parameter = ""; - else if (*args->shortOptions == '\0') - { - argForth (args->args); - if (argOff (args->args)) - args->parameter = NULL; - else - args->parameter = argItem (args->args); - args->shortOptions = NULL; - } - else - { - args->parameter = args->shortOptions; - args->shortOptions = NULL; - } -} - -static void parseLongOption (cookedArgs *const args, const char *item) -{ - const char* const equal = strchr (item, '='); - if (equal == NULL) - { - args->item = eStrdup (item); - args->parameter = ""; - } - else - { - const size_t length = equal - item; - args->item = xMalloc (length + 1, char); - strncpy (args->item, item, length); - args->item [length] = '\0'; - args->parameter = equal + 1; - } -} - -static void cArgRead (cookedArgs *const current) -{ - char* item; - - Assert (current != NULL); - if (! argOff (current->args)) - { - item = argItem (current->args); - current->shortOptions = NULL; - Assert (item != NULL); - if (strncmp (item, "--", (size_t) 2) == 0) - { - current->isOption = TRUE; - current->longOption = TRUE; - parseLongOption (current, item + 2); - } - else if (*item == '-') - { - current->isOption = TRUE; - current->longOption = FALSE; - current->shortOptions = item + 1; - parseShortOption (current); - } - else - { - current->isOption = FALSE; - current->longOption = FALSE; - current->item = item; - current->parameter = ""; - } - } -} - -extern cookedArgs* cArgNewFromString (const char* string) -{ - cookedArgs* const result = xMalloc (1, cookedArgs); - memset (result, 0, sizeof (cookedArgs)); - result->args = argNewFromString (string); - cArgRead (result); - return result; -} - -extern cookedArgs* cArgNewFromArgv (char* const* const argv) -{ - cookedArgs* const result = xMalloc (1, cookedArgs); - memset (result, 0, sizeof (cookedArgs)); - result->args = argNewFromArgv (argv); - cArgRead (result); - return result; -} - -extern cookedArgs* cArgNewFromFile (FILE* const fp) -{ - cookedArgs* const result = xMalloc (1, cookedArgs); - memset (result, 0, sizeof (cookedArgs)); - result->args = argNewFromFile (fp); - cArgRead (result); - return result; -} - -extern cookedArgs* cArgNewFromLineFile (FILE* const fp) -{ - cookedArgs* const result = xMalloc (1, cookedArgs); - memset (result, 0, sizeof (cookedArgs)); - result->args = argNewFromLineFile (fp); - cArgRead (result); - return result; -} - -extern void cArgDelete (cookedArgs* const current) -{ - Assert (current != NULL); - argDelete (current->args); - memset (current, 0, sizeof (cookedArgs)); - eFree (current); -} - -static boolean cArgOptionPending (cookedArgs* const current) -{ - boolean result = FALSE; - if (current->shortOptions != NULL) - if (*current->shortOptions != '\0') - result = TRUE; - return result; -} - -extern boolean cArgOff (cookedArgs* const current) -{ - Assert (current != NULL); - return (boolean) (argOff (current->args) && ! cArgOptionPending (current)); -} - -extern boolean cArgIsOption (cookedArgs* const current) -{ - Assert (current != NULL); - return current->isOption; -} - -extern const char* cArgItem (cookedArgs* const current) -{ - Assert (current != NULL); - return current->item; -} - -extern void cArgForth (cookedArgs* const current) -{ - Assert (current != NULL); - Assert (! cArgOff (current)); - if (cArgOptionPending (current)) - parseShortOption (current); - else - { - Assert (! argOff (current->args)); - argForth (current->args); - if (! argOff (current->args)) - cArgRead (current); - else - { - current->isOption = FALSE; - current->longOption = FALSE; - current->shortOptions = NULL; - current->item = NULL; - current->parameter = NULL; - } - } -} - -/* * File extension and language mapping */ - -static void addExtensionList (stringList *const slist, - const char *const elist, const boolean clear) -{ - char *const extensionList = eStrdup (elist); - const char *extension = NULL; - boolean first = TRUE; - - if (clear) - { - verbose (" clearing\n"); - stringListClear (slist); - } - verbose (" adding: "); - if (elist != NULL && *elist != '\0') - { - extension = extensionList; - if (elist [0] == EXTENSION_SEPARATOR) - ++extension; - } - while (extension != NULL) - { - char *separator = strchr (extension, EXTENSION_SEPARATOR); - if (separator != NULL) - *separator = '\0'; - verbose ("%s%s", first ? "" : ", ", - *extension == '\0' ? "(NONE)" : extension); - stringListAdd (slist, vStringNewInit (extension)); - first = FALSE; - if (separator == NULL) - extension = NULL; - else - extension = separator + 1; - } - if (Option.verbose) - { - printf ("\n now: "); - stringListPrint (slist); - putchar ('\n'); - } - eFree (extensionList); -} - extern const char *fileExtension (const char *const fileName) { const char *extension; const char *pDelimiter = NULL; -#ifdef QDOS - pDelimiter = strrchr (fileName, '_'); -#endif + if (pDelimiter == NULL) pDelimiter = strrchr (fileName, '.'); @@ -582,330 +147,19 @@ */ extern boolean isIncludeFile (const char *const fileName) { - boolean result = FALSE; - const char *const extension = fileExtension (fileName); - if (Option.headerExt != NULL) - result = stringListExtensionMatched (Option.headerExt, extension); - return result; + return FALSE; } -static void processLanguageForceOption (const char *const option, - const char *const parameter) -{ - langType language; - if (stricmp (parameter, "auto") == 0) - language = LANG_AUTO; - else - language = getNamedLanguage (parameter); - if (strcmp (option, "lang") == 0 || strcmp (option, "language") == 0) - error (WARNING, - "\"--%s\" option is obsolete; use \"--language-force\" instead", - option); - if (language == LANG_IGNORE) - error (FATAL, "Uknown language specified in \"%s\" option", option); - else - Option.language = language; -} - -static char* skipPastMap (char* p) -{ - while (*p != EXTENSION_SEPARATOR && - *p != PATTERN_START && *p != ',' && *p != '\0') - ++p; - return p; -} - -/* Parses the mapping beginning at `map', adds it to the language map, and - * returns first character past the map. - */ -static char* addLanguageMap (const langType language, char* map) -{ - char* p = NULL; - const char first = *map; - if (first == EXTENSION_SEPARATOR) /* extension map */ - { - ++map; - p = skipPastMap (map); - if (*p == '\0') - { - verbose (" .%s", map); - addLanguageExtensionMap (language, map); - p = map + strlen (map); - } - else - { - const char separator = *p; - *p = '\0'; - verbose (" .%s", map); - addLanguageExtensionMap (language, map); - *p = separator; - } - } - else if (first == PATTERN_START) /* pattern map */ - { - ++map; - for (p = map ; *p != PATTERN_STOP && *p != '\0' ; ++p) - { - if (*p == '\\' && *(p + 1) == PATTERN_STOP) - ++p; - } - if (*p == '\0') - error (FATAL, "Unterminated file name pattern for %s language", - getLanguageName (language)); - else - { - *p++ = '\0'; - verbose (" (%s)", map); - addLanguagePatternMap (language, map); - } - } - else - error (FATAL, "Badly formed language map for %s language", - getLanguageName (language)); - return p; -} - -static char* processLanguageMap (char* map) -{ - char* const separator = strchr (map, ':'); - char* result = NULL; - if (separator != NULL) - { - langType language; - char *list = separator + 1; - boolean clear = FALSE; - *separator = '\0'; - language = getNamedLanguage (map); - if (language != LANG_IGNORE) - { - char* p; - if (*list == '+') - ++list; - else - clear = TRUE; - for (p = list ; *p != ',' && *p != '\0' ; ++p) /*no-op*/ ; - if (strnicmp (list, "default", p - list) == 0) - { - verbose (" Restoring default %s language map: ", getLanguageName (language)); - installLanguageMapDefault (language); - list = p; - } - else - { - if (clear) - { - verbose (" Setting %s language map:", getLanguageName (language)); - clearLanguageMap (language); - } - else - verbose (" Adding to %s language map:", getLanguageName (language)); - while (list != NULL && *list != '\0' && *list != ',') - list = addLanguageMap (language, list); - verbose ("\n"); - } - if (list != NULL && *list == ',') - ++list; - result = list; - } - } - return result; -} - -static void processLanguageMapOption (const char *const option, - const char *const parameter) -{ - char *const maps = eStrdup (parameter); - char *map = maps; - - if (strcmp (parameter, "default") == 0) - { - verbose (" Restoring default language maps:\n"); - installLanguageMapDefaults (); - } - else while (map != NULL && *map != '\0') - { - char* const next = processLanguageMap (map); - if (next == NULL) - error (WARNING, "Unknown language specified in \"%s\" option", option); - map = next; - } - eFree (maps); -} - -static void processLanguageListOption (const char *const option, - const char *const parameter) -{ - char *const langs = eStrdup (parameter); - enum { Add, Remove, Replace } mode = Replace; - boolean first = TRUE; - char *lang = langs; - const char* prefix = ""; - verbose (" Enabled languages: "); - while (lang != NULL) - { - char *const end = strchr (lang, ','); - if (lang [0] == '+') - { - ++lang; - mode = Add; - prefix = "+ "; - } - else if (lang [0] == '-') - { - ++lang; - mode = Remove; - prefix = "- "; - } - if (mode == Replace) - enableLanguages (FALSE); - if (end != NULL) - *end = '\0'; - if (lang [0] != '\0') - { - if (strcmp (lang, "all") == 0) - enableLanguages ((boolean) (mode != Remove)); - else - { - const langType language = getNamedLanguage (lang); - if (language == LANG_IGNORE) - error (WARNING, "Unknown language specified in \"%s\" option", option); - else - enableLanguage (language, (boolean) (mode != Remove)); - } - verbose ("%s%s%s", (first ? "" : ", "), prefix, lang); - prefix = ""; - first = FALSE; - if (mode == Replace) - mode = Add; - } - lang = (end != NULL ? end + 1 : NULL); - } - verbose ("\n"); - eFree (langs); -} - -static void processOptionFile (const char *const option, - const char *const parameter) -{ - if (parameter == NULL || parameter [0] == '\0') - error (WARNING, "no option file supplied for \"%s\"", option); - else if (! parseFileOptions (parameter)) - error (FATAL | PERROR, "cannot open option file \"%s\"", parameter); -} - -static void installHeaderListDefaults (void) -{ - Option.headerExt = stringListNewFromArgv (HeaderExtensions); - if (Option.verbose) - { - printf (" Setting default header extensions: "); - stringListPrint (Option.headerExt); - putchar ('\n'); - } -} - -static void processHeaderListOption (const int option, const char *parameter) -{ - /* Check to make sure that the user did not enter "ctags -h *.c" - * by testing to see if the list is a filename that exists. - */ - if (doesFileExist (parameter)) - error (FATAL, "-%c: Invalid list", option); - if (strcmp (parameter, "default") == 0) - installHeaderListDefaults (); - else - { - boolean clear = TRUE; - - if (parameter [0] == '+') - { - ++parameter; - clear = FALSE; - } - if (Option.headerExt == NULL) - Option.headerExt = stringListNew (); - verbose (" Header Extensions:\n"); - addExtensionList (Option.headerExt, parameter, clear); - } -} - -/* - * Token ignore processing - */ - /* Determines whether or not "name" should be ignored, per the ignore list. */ extern boolean isIgnoreToken (const char *const name, boolean *const pIgnoreParens, const char **const replacement) { - boolean result = FALSE; - - if (Option.ignore != NULL) - { - const size_t nameLen = strlen (name); - unsigned int i; - - if (pIgnoreParens != NULL) - *pIgnoreParens = FALSE; - - for (i = 0 ; i < stringListCount (Option.ignore) ; ++i) - { - vString *token = stringListItem (Option.ignore, i); - - if (strncmp (vStringValue (token), name, nameLen) == 0) - { - const size_t tokenLen = vStringLength (token); - - if (nameLen == tokenLen) - { - result = TRUE; - break; - } - else if (tokenLen == nameLen + 1 && - vStringChar (token, tokenLen - 1) == '+') - { - result = TRUE; - if (pIgnoreParens != NULL) - *pIgnoreParens = TRUE; - break; - } - else if (vStringChar (token, nameLen) == '=') - { - if (replacement != NULL) - *replacement = vStringValue (token) + nameLen + 1; - break; - } - } - } - } - return result; + return FALSE; } -static void saveIgnoreToken (vString *const ignoreToken) -{ - if (Option.ignore == NULL) - Option.ignore = stringListNew (); - stringListAdd (Option.ignore, ignoreToken); - verbose (" ignore token: %s\n", vStringValue (ignoreToken)); -} - -static void readIgnoreList (const char *const list) -{ - char* newList = stringCopy (list); - const char *token = strtok (newList, IGNORE_SEPARATORS); - - while (token != NULL) - { - vString *const entry = vStringNewInit (token); - - saveIgnoreToken (entry); - token = strtok (NULL, IGNORE_SEPARATORS); - } - eFree (newList); -} - void addIgnoreListFromFile (const char *const fileName) { stringList* tokens = stringListNewFromFile (fileName); @@ -915,569 +169,13 @@ stringListCombine (Option.ignore, tokens); } -static void processIgnoreOption (const char *const list) -{ - if (strchr ("@./\\", list [0]) != NULL) - { - const char* fileName = (*list == '@') ? list + 1 : list; - addIgnoreListFromFile (fileName); - } -#if defined (MSDOS) || defined (WIN32) || defined (OS2) - else if (isalpha (list [0]) && list [1] == ':') - addIgnoreListFromFile (list); -#endif - else if (strcmp (list, "-") == 0) - { - freeList (&Option.ignore); - verbose (" clearing list\n"); - } - else - readIgnoreList (list); -} -/* - * Specific option processing - */ -static void printfFeatureList (void) -{ - int i; - - for (i = 0 ; Features [i] != NULL ; ++i) - { - if (i == 0) - printf (" Optional compiled features: "); - printf ("%s+%s", (i>0 ? ", " : ""), Features [i]); -#ifdef CUSTOM_CONFIGURATION_FILE - if (strcmp (Features [i], "custom-conf") == 0) - printf ("=%s", CUSTOM_CONFIGURATION_FILE); -#endif - } - if (i > 0) - putchar ('\n'); -} - -static void printProgramIdentification (void) -{ - printf ("%s %s, Copyright (C) 1996-2001 %s\n", - PROGRAM_NAME, PROGRAM_VERSION, AUTHOR_NAME); - printf (" Addresses: <%s>, %s\n", AUTHOR_EMAIL, PROGRAM_URL); - printfFeatureList (); -} - -static void printInvocationDescription (void) -{ - printf (INVOCATION, getExecutableName ()); -} - -static void printOptionDescriptions (const optionDescription *const optDesc) -{ - int i; - for (i = 0 ; optDesc [i].description != NULL ; ++i) - { - if (! Option.etags || optDesc [i].usedByEtags) - puts (optDesc [i].description); - } -} - -static void printHelp (const optionDescription *const optDesc) -{ - - printProgramIdentification (); - putchar ('\n'); - printInvocationDescription (); - putchar ('\n'); - printOptionDescriptions (optDesc); -} - -static void processExcmdOption (const char *const option, - const char *const parameter) -{ - switch (*parameter) - { - case 'm': Option.locate = EX_MIX; break; - case 'n': Option.locate = EX_LINENUM; break; - case 'p': Option.locate = EX_PATTERN; break; - default: - error (FATAL, "Invalid value for \"%s\" option", option); - break; - } -} - -static void processFormatOption (const char *const option, - const char *const parameter) -{ - unsigned int format; - - if (sscanf (parameter, "%u", &format) < 1) - error (FATAL, "Invalid value for \"%s\" option",option); - else if (format <= (unsigned int) MaxSupportedTagFormat) - Option.tagFileFormat = format; - else - error (FATAL, "Unsupported value for \"%s\" option", option); -} - -static void processEtagsInclude (const char *const __unused__ option, - const char *const parameter) -{ - vString *const file = vStringNewInit (parameter); - if (Option.etagsInclude == NULL) - Option.etagsInclude = stringListNew (); - stringListAdd (Option.etagsInclude, file); -} - -static void processFilterTerminatorOption (const char *const __unused__ option, - const char *const parameter) -{ - freeString (&Option.filterTerminator); - Option.filterTerminator = stringCopy (parameter); -} - -static void processExtensionFieldsOption (const char *const option, - const char *const parameter) -{ - struct sExtFields *const field = &Option.extensionFields; - const char *p = parameter; - boolean mode = TRUE; - int c; - - if (*p != '+' && *p != '-') - { - field->access = FALSE; - field->fileScope = FALSE; - field->implementation = FALSE; - field->inheritance = FALSE; - field->kind = FALSE; - field->kindKey = FALSE; - field->kindLong = FALSE; - field->language = FALSE; - field->scope = FALSE; - field->argList = FALSE; - } - while ((c = *p++) != '\0') switch (c) - { - case '+': mode = TRUE; break; - case '-': mode = FALSE; break; - - case 'a': field->access = mode; break; - case 'f': field->fileScope = mode; break; - case 'm': field->implementation = mode; break; - case 'i': field->inheritance = mode; break; - case 'k': field->kind = mode; break; - case 'K': field->kindLong = mode; break; - case 'l': field->language = mode; break; - case 'n': field->lineNumber = mode; break; - case 's': field->scope = mode; break; - case 'z': field->kindKey = mode; break; - case 'P': field->filePosition = mode; break; - case 'A': field->argList = mode; break; - - default: error(WARNING, "Unsupported parameter '%c' for \"%s\" option", - c, option); - break; - } -} - -static void processExtraTagsOption (const char *const option, - const char *const parameter) -{ - struct sInclude *const inc = &Option.include; - const char *p = parameter; - boolean mode = TRUE; - int c; - - if (*p != '+' && *p != '-') - { - inc->fileNames = FALSE; - inc->qualifiedTags = FALSE; -#if 0 - inc->fileScope = FALSE; -#endif - } - while ((c = *p++) != '\0') switch (c) - { - case '+': mode = TRUE; break; - case '-': mode = FALSE; break; - - case 'f': inc->fileNames = mode; break; - case 'q': inc->qualifiedTags = mode; break; -#if 0 - case 'F': inc->fileScope = mode; break; -#endif - - default: error(WARNING, "Unsupported parameter '%c' for \"%s\" option", - c, option); - break; - } -} - /* - * Option tables - */ - -static parametricOption ParametricOptions [] = { - { "etags-include", processEtagsInclude, FALSE }, - { "exclude", processExcludeOption, FALSE }, - { "excmd", processExcmdOption, FALSE }, - { "extra", processExtraTagsOption, FALSE }, - { "fields", processExtensionFieldsOption, FALSE }, - { "filter-terminator", processFilterTerminatorOption, TRUE }, - { "format", processFormatOption, TRUE }, - { "lang", processLanguageForceOption, FALSE }, - { "language", processLanguageForceOption, FALSE }, - { "language-force", processLanguageForceOption, FALSE }, - { "languages", processLanguageListOption, FALSE }, - { "langdef", processLanguageDefineOption, FALSE }, - { "langmap", processLanguageMapOption, FALSE }, - { "options", processOptionFile, FALSE }, -}; - -static booleanOption BooleanOptions [] = { - { "append", &Option.append, TRUE }, - { "file-scope", &Option.include.fileScope, FALSE }, - { "file-tags", &Option.include.fileNames, FALSE }, - { "filter", &Option.filter, TRUE }, - { "if0", &Option.if0, FALSE }, - { "kind-long", &Option.kindLong, TRUE }, - { "line-directives",&Option.lineDirectives, FALSE }, - { "nest",&Option.nestFunction, FALSE }, - { "links", &Option.followLinks, FALSE }, -#ifdef RECURSE_SUPPORTED - { "recurse", &Option.recurse, FALSE }, -#endif - { "sort", &Option.sorted, TRUE }, - { "tag-relative", &Option.tagRelative, TRUE }, - { "totals", &Option.printTotals, TRUE }, - { "verbose", &Option.verbose, FALSE }, -}; - -/* * Generic option parsing */ +#define readOptionConfiguration +#define initOptions +#define freeOptionResources -static void checkOptionOrder (const char* const option) -{ - if (ParsedLeadingOptions) - error (FATAL, "-%s option may not follow a file name", option); -} - -static boolean processParametricOption (const char *const option, - const char *const parameter) -{ - const int count = sizeof (ParametricOptions) / sizeof (parametricOption); - boolean found = FALSE; - int i; - - for (i = 0 ; i < count && ! found ; ++i) - { - parametricOption* const entry = &ParametricOptions [i]; - if (strcmp (option, entry->name) == 0) - { - found = TRUE; - if (entry->initOnly) - checkOptionOrder (option); - (entry->handler) (option, parameter); - } - } - return found; -} - -static boolean getBooleanOption (const char *const option, - const char *const parameter) -{ - boolean selection = TRUE; - - if (parameter [0] == '\0') - selection = TRUE; - else if (strcmp (parameter, "0" ) == 0 || - strcmp (parameter, "no" ) == 0 || - strcmp (parameter, "off") == 0) - selection = FALSE; - else if (strcmp (parameter, "1" ) == 0 || - strcmp (parameter, "yes") == 0 || - strcmp (parameter, "on" ) == 0) - selection = TRUE; - else - error (FATAL, "Invalid value for \"%s\" option", option); - - return selection; -} - -static boolean processBooleanOption (const char *const option, - const char *const parameter) -{ - const int count = sizeof (BooleanOptions) / sizeof (booleanOption); - boolean found = FALSE; - int i; - - for (i = 0 ; i < count && ! found ; ++i) - { - booleanOption* const entry = &BooleanOptions [i]; - if (strcmp (option, entry->name) == 0) - { - found = TRUE; - if (entry->initOnly) - checkOptionOrder (option); - *entry->pValue = getBooleanOption (option, parameter); - } - } - return found; -} - -static void processLongOption (const char *const option, - const char *const parameter) -{ - if (parameter == NULL || *parameter == '\0') - verbose (" Option: --%s\n", option); - else - verbose (" Option: --%s=%s\n", option, parameter); - - if (processBooleanOption (option, parameter)) - ; - else if (processParametricOption (option, parameter)) - ; - else if (processKindOption (option, parameter)) - ; -#ifdef HAVE_REGEX - else if (processRegexOption (option, parameter)) - ; -#endif -#define isOption(item) (boolean) (strcmp (item,option) == 0) - else if (isOption ("help")) - { - printHelp (LongOptionDescription); - printKindOptions (); - exit (0); - } - else if (isOption ("license")) - { - printProgramIdentification (); - puts (""); - puts (License); - exit (0); - } - else if (isOption ("version")) - { - printProgramIdentification (); - exit (0); - } -#ifndef RECURSE_SUPPORTED - else if (isOption ("recurse")) - error (WARNING, "%s option not supported on this host", option); -#endif - else - error (FATAL, "Unknown option: --%s", option); -#undef isOption -} - -static void processShortOption (const char *const option, - const char *const parameter) -{ - if (parameter == NULL || *parameter == '\0') - verbose (" Option: -%s\n", option); - else - verbose (" Option: -%s %s\n", option, parameter); - - if (isCompoundOption (*option) && *parameter == '\0') - error (FATAL, "Missing parameter for \"%s\" option", option); - else switch (*option) - { - case '?': - printHelp (LongOptionDescription); - exit (0); - break; - case 'a': - checkOptionOrder (option); - Option.append = TRUE; - break; - case 'B': - Option.backward = TRUE; - break; - case 'e': - checkOptionOrder (option); - setEtagsMode (); - break; - case 'f': - case 'o': - checkOptionOrder (option); - if (Option.tagFileName != NULL) - { - error (WARNING, - "-%s option specified more than once, last value used", - option); - freeString (&Option.tagFileName); - } - else if (parameter [0] == '-' && parameter [1] != '\0') - error (FATAL, "output file name may not begin with a '-'"); - Option.tagFileName = stringCopy (parameter); - break; - case 'F': - Option.backward = FALSE; - break; - case 'h': - processHeaderListOption (*option, parameter); - break; - case 'i': - processLegacyKindOption (parameter); - break; - case 'I': - processIgnoreOption (parameter); - break; - case 'L': - if (Option.fileList != NULL) - { - error (WARNING, - "-%s option specified more than once, last value used", - option); - freeString (&Option.fileList); - } - Option.fileList = stringCopy (parameter); - break; - case 'n': - Option.locate = EX_LINENUM; - break; - case 'N': - Option.locate = EX_PATTERN; - break; - case 'R': -#ifdef RECURSE_SUPPORTED - Option.recurse = TRUE; -#else - error (WARNING, "-%s option not supported on this host", option); -#endif - break; - case 'u': - checkOptionOrder (option); - Option.sorted = FALSE; - break; - case 'V': - Option.verbose = TRUE; - break; - case 'w': - /* silently ignored */ - break; - case 'x': - checkOptionOrder (option); - Option.xref = TRUE; - break; - default: - error (FATAL, "Unknown option: -%s", option); - break; - } -} - -extern void parseOption (cookedArgs* const args) -{ - Assert (! cArgOff (args)); - if (args->isOption) - { - if (args->longOption) - processLongOption (args->item, args->parameter); - else - { - const char *parameter = args->parameter; - while (*parameter == ' ') - ++parameter; - processShortOption (args->item, parameter); - } - cArgForth (args); - } -} - -extern void parseOptions (cookedArgs* const args) -{ - while (! cArgOff (args) && cArgIsOption (args)) - parseOption (args); - if (! cArgOff (args) && ! cArgIsOption (args)) - ParsedLeadingOptions = TRUE; -} - -static boolean parseFileOptions (const char* const fileName) -{ - boolean fileFound = FALSE; - FILE* const fp = fopen (fileName, "r"); - if (fp != NULL) - { - cookedArgs* const args = cArgNewFromLineFile (fp); - verbose ("Reading options from %s\n", fileName); - parseOptions (args); - cArgDelete (args); - fclose (fp); - fileFound = TRUE; - } - return fileFound; -} - -extern void previewFirstOption (cookedArgs* const args) -{ - if (cArgIsOption (args) && - (strcmp (args->item, "V") == 0 || strcmp (args->item, "verbose") == 0)) - { - parseOption (args); - } -} - -static void parseConfigurationFileOptions (void) -{ - const char* const home = getenv ("HOME"); - parseFileOptions ("/etc/ctags.conf"); - parseFileOptions ("/usr/local/etc/ctags.conf"); -#ifdef CUSTOM_CONFIGURATION_FILE - parseFileOptions (CUSTOM_CONFIGURATION_FILE); -#endif - if (home != NULL) - { - vString* const dotFile = combinePathAndFile (home, ".ctags"); - parseFileOptions (vStringValue (dotFile)); - vStringDelete (dotFile); - } - parseFileOptions (".ctags"); -} - -static void parseEnvironmentOptions (void) -{ - const char *envOptions = NULL; - - if (Option.etags) - envOptions = getenv (ETAGS_ENVIRONMENT); - if (envOptions == NULL) - envOptions = getenv (CTAGS_ENVIRONMENT); - if (envOptions != NULL && envOptions [0] != '\0') - { - cookedArgs* const args = cArgNewFromString (envOptions); - verbose ("Reading options from $CTAGS\n"); - parseOptions (args); - cArgDelete (args); - } -} - -extern void readOptionConfiguration (void) -{ - parseConfigurationFileOptions (); - parseEnvironmentOptions (); -} - -/* -* Option initialization -*/ - -extern void initOptions (void) -{ - verbose ("Setting option defaults\n"); - installHeaderListDefaults (); - verbose (" Installing default language mappings:\n"); - installLanguageMapDefaults (); -} - -extern void freeOptionResources (void) -{ - freeString (&Option.tagFileName); - freeString (&Option.fileList); - freeString (&Option.filterTerminator); - - freeList (&Option.ignore); - freeList (&Option.headerExt); - freeList (&Option.etagsInclude); -} - /* vi:set tabstop=8 shiftwidth=4: */ Modified: trunk/tagmanager/options.h =================================================================== --- trunk/tagmanager/options.h 2006-06-23 14:00:22 UTC (rev 473) +++ trunk/tagmanager/options.h 2006-06-24 14:36:35 UTC (rev 474) @@ -32,20 +32,7 @@ * DATA DECLARATIONS */ -typedef enum { OPTION_NONE, OPTION_SHORT, OPTION_LONG } optionType; -typedef struct sCookedArgs { -/* private */ - Arguments* args; - char *shortOptions; - char simple[2]; - boolean isOption; - boolean longOption; - const char* parameter; -/* public */ - char* item; -} cookedArgs; - /* This stores the command line options. */ typedef struct sOptionValues { @@ -71,7 +58,6 @@ stringList* ignore; /* -I name of file containing tokens to ignore */ boolean append; /* -a append to "tags" file */ boolean backward; /* -B regexp patterns search backwards */ - boolean etags; /* -e output Emacs style tags file */ enum eLocate { EX_MIX, /* line numbers for defines, patterns otherwise */ EX_LINENUM, /* -n only line numbers in tag file */ @@ -97,10 +83,6 @@ boolean printTotals; /* --totals print cumulative statistics */ boolean lineDirectives; /* --linedirectives process #line directives */ boolean nestFunction; /* --nest Nest inside function blocks for tags */ -#ifdef TM_DEBUG - long debugLevel; /* -D debugging output */ - unsigned long breakLine;/* -b source line at which to call lineBreak() */ -#endif } optionValues; /* @@ -114,25 +96,10 @@ extern void verbose (const char *const format, ...) __printf__ (1, 2); extern void freeList (stringList** const pString); extern void setDefaultTagFileName (void); -extern void checkOptions (void); -extern void testEtagsInvocation (void); -extern cookedArgs* cArgNewFromString (const char* string); -extern cookedArgs* cArgNewFromArgv (char* const* const argv); -extern cookedArgs* cArgNewFromFile (FILE* const fp); -extern cookedArgs* cArgNewFromLineFile (FILE* const fp); -extern void cArgDelete (cookedArgs* const current); -extern boolean cArgOff (cookedArgs* const current); -extern boolean cArgIsOption (cookedArgs* const current); -extern const char* cArgItem (cookedArgs* const current); -extern void cArgForth (cookedArgs* const current); - extern const char *fileExtension (const char *const fileName); extern boolean isIncludeFile (const char *const fileName); extern boolean isIgnoreToken (const char *const name, boolean *const pIgnoreParens, const char **const replacement); -extern void parseOption (cookedArgs* const cargs); -extern void parseOptions (cookedArgs* const cargs); -extern void previewFirstOption (cookedArgs* const cargs); extern void readOptionConfiguration (void); extern void initOptions (void); extern void freeOptionResources (void); Modified: trunk/tagmanager/parse.c =================================================================== --- trunk/tagmanager/parse.c 2006-06-23 14:00:22 UTC (rev 473) +++ trunk/tagmanager/parse.c 2006-06-24 14:36:35 UTC (rev 474) @@ -239,9 +239,6 @@ LanguageTable [language]->currentExtensions = stringListNewFromArgv (LanguageTable [language]->extensions); } - if (Option.verbose) - printLanguageMap (language); - verbose ("\n"); } extern void installLanguageMapDefaults (void) @@ -249,7 +246,6 @@ unsigned int i; for (i = 0 ; i < LanguageCount ; ++i) { - //verbose (" %s: ", getLanguageName (i)); installLanguageMapDefault (i); } } @@ -307,7 +303,6 @@ builtInCount = sizeof (BuiltInParsers) / sizeof (BuiltInParsers [0]); LanguageTable = xMalloc (builtInCount, parserDefinition*); - verbose ("Installing parsers: "); for (i = 0 ; i < builtInCount ; ++i) { parserDefinition* const def = (*BuiltInParsers [i]) (); @@ -331,13 +326,11 @@ accepted = TRUE; if (accepted) { - verbose ("%s%s", i > 0 ? ", " : "", def->name); def->id = LanguageCount++; LanguageTable [def->id] = def; } } } - verbose ("\n"); enableLanguages (TRUE); initializeParsers (); } @@ -603,8 +596,6 @@ if (fileOpen (fileName, language)) { - if (Option.etags) - beginEtagsFile (); makeFileTag (fileName); @@ -613,8 +604,6 @@ else if (LanguageTable [language]->parser2 != NULL) retried = LanguageTable [language]->parser2 (passCount); - if (Option.etags) - endEtagsFile (getSourceFileTagPath ()); fileClose (); } @@ -649,23 +638,13 @@ if (Option.language == LANG_AUTO) language = getFileLanguage (fileName); Assert (language != LANG_AUTO); - if (language == LANG_IGNORE) - verbose ("ignoring %s (unknown language)\n", fileName); - else if (! LanguageTable [language]->enabled) - verbose ("ignoring %s (language disabled)\n", fileName); - else - { if (Option.filter) openTagFile (); tagFileResized = createTagsWithFallback (fileName, language); - if (Option.filter) - closeTagFile (tagFileResized); addTotals (1, 0L, 0L); - return tagFileResized; - } return tagFileResized; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany: [473] trunk
by ntrel＠users.sourceforge.net 23 Jun '06

23 Jun '06

Revision: 473 Author: ntrel Date: 2006-06-23 07:00:22 -0700 (Fri, 23 Jun 2006) ViewCVS: http://svn.sourceforge.net/geany/?rev=473&view=rev Log Message: ----------- Add a timestamp to messages in the Status window (closes request #1509908) Modified Paths: -------------- trunk/ChangeLog trunk/src/msgwindow.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2006-06-22 14:29:55 UTC (rev 472) +++ trunk/ChangeLog 2006-06-23 14:00:22 UTC (rev 473) @@ -1,3 +1,9 @@ +2006-06-23 Nick Treleaven <nick.treleaven(a)btinternet.com> + + * src/msgwindow.c: Add a timestamp to messages in the Status window + (closes request #1509908). + + 2006-06-22 Enrico Troeger <enrico.troeger(a)uvena.de> * src/utils.c: Reorganised C include file items, added C++ headers. Modified: trunk/src/msgwindow.c =================================================================== --- trunk/src/msgwindow.c 2006-06-22 14:29:55 UTC (rev 472) +++ trunk/src/msgwindow.c 2006-06-23 14:00:22 UTC (rev 473) @@ -21,6 +21,8 @@ */ +#include <time.h> + #include "geany.h" #include "support.h" @@ -181,8 +183,26 @@ gtk_list_store_append(msgwindow.store_status, &iter); //gtk_list_store_insert(msgwindow.store_status, &iter, 0); //gtk_list_store_set(msgwindow.store_status, &iter, 0, (state > 0) ? &white : &dark, 1, string, -1); - gtk_list_store_set(msgwindow.store_status, &iter, 0, ((state++ % 2) == 0) ? &white : &dark, 1, string, -1); + { + GTimeVal cur_time; + gchar *date_str, *statusmsg; + gchar **strv; + g_get_current_time(&cur_time); + date_str = ctime(&cur_time.tv_sec); //uses internal string buffer + strv = g_strsplit(date_str, " ", 5); + if (strv[3] != NULL) + statusmsg = g_strconcat(strv[3], ": ", string, NULL); + else + statusmsg = g_strdup(string); + + gtk_list_store_set(msgwindow.store_status, &iter, 0, + ((state++ % 2) == 0) ? &white : &dark, 1, statusmsg, -1); + + g_free(statusmsg); + g_strfreev(strv); + } + if (app->main_window_realized) { GtkTreePath *path = gtk_tree_model_get_path(gtk_tree_view_get_model(GTK_TREE_VIEW(msgwindow.tree_status)), &iter); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany: [472] trunk
by eht16＠users.sourceforge.net 22 Jun '06

22 Jun '06

Revision: 472 Author: eht16 Date: 2006-06-22 07:29:55 -0700 (Thu, 22 Jun 2006) ViewCVS: http://svn.sourceforge.net/geany/?rev=472&view=rev Log Message: ----------- Reorganised C include file items, added C++ headers. Insert include statements and comment templates at mouse pointer position instead of cursor position. Modified Paths: -------------- trunk/ChangeLog trunk/src/callbacks.c trunk/src/utils.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2006-06-21 23:15:54 UTC (rev 471) +++ trunk/ChangeLog 2006-06-22 14:29:55 UTC (rev 472) @@ -1,3 +1,10 @@ +2006-06-22 Enrico Troeger <enrico.troeger(a)uvena.de> + + * src/utils.c: Reorganised C include file items, added C++ headers. + * src/callbacks.c: Insert include statements and comment templates at + mouse pointer position instead of cursor position. + + 2006-06-21 Enrico Troeger <enrico.troeger(a)uvena.de> * src/keybindings.c: Added missing shortcut for "Close". Modified: trunk/src/callbacks.c =================================================================== --- trunk/src/callbacks.c 2006-06-21 23:15:54 UTC (rev 471) +++ trunk/src/callbacks.c 2006-06-22 14:29:55 UTC (rev 472) @@ -78,6 +78,9 @@ static gint search_flags_re; static gboolean search_backwards_re; +// holds the current position where the mouse pointer is when the popup menu for the scintilla +// scintilla widget is shown +static gint clickpos; void signal_cb(gint sig) @@ -968,7 +971,7 @@ gpointer user_data) { gint idx = GPOINTER_TO_INT(user_data); - gint clickpos = sci_get_position_from_xy(doc_list[idx].sci, event->x, event->y, FALSE); + clickpos = sci_get_position_from_xy(doc_list[idx].sci, event->x, event->y, FALSE); #ifndef GEANY_WIN32 if (event->button == 1) @@ -2092,7 +2095,7 @@ } } - sci_insert_text(doc_list[idx].sci, -1, text); + sci_insert_text(doc_list[idx].sci, clickpos, text); g_free(text); } @@ -2132,7 +2135,7 @@ } } - sci_insert_text(doc_list[idx].sci, -1, text); + sci_insert_text(doc_list[idx].sci, clickpos, text); g_free(text); } @@ -2154,8 +2157,6 @@ } - - void on_comments_fileheader_activate (GtkMenuItem *menuitem, gpointer user_data) @@ -2206,10 +2207,9 @@ gpointer user_data) { gint idx = document_get_cur_idx(); - gint pos = sci_get_current_position(doc_list[idx].sci); gchar *text; - if (utils_strcmp(user_data, "(blank)")) + if (utils_strcmp(user_data, "blank")) { text = g_strdup("#include \"\"\n"); } @@ -2218,7 +2218,7 @@ text = g_strconcat("#include <", user_data, ">\n", NULL); } - sci_insert_text(doc_list[idx].sci, pos, text); + sci_insert_text(doc_list[idx].sci, clickpos, text); g_free(text); } @@ -2305,9 +2305,6 @@ } - - - void on_file_properties_activate (GtkMenuItem *menuitem, gpointer user_data) @@ -2317,8 +2314,6 @@ } - - void on_menu_fold_all1_activate (GtkMenuItem *menuitem, gpointer user_data) Modified: trunk/src/utils.c =================================================================== --- trunk/src/utils.c 2006-06-21 23:15:54 UTC (rev 471) +++ trunk/src/utils.c 2006-06-22 14:29:55 UTC (rev 472) @@ -1485,6 +1485,7 @@ } +/// TODO move me to document.c void utils_replace_tabs(gint idx) { gint i, len, j = 0, tabs_amount = 0; @@ -1767,79 +1768,80 @@ } +static void insert_items(GtkMenu *me, GtkMenu *mp, gchar **includes, gchar *label) +{ + guint i = 0; + GtkWidget *tmp_menu; + GtkWidget *tmp_popup; + GtkWidget *edit_menu, *edit_menu_item; + GtkWidget *popup_menu, *popup_menu_item; + + edit_menu = gtk_menu_new(); + popup_menu = gtk_menu_new(); + edit_menu_item = gtk_menu_item_new_with_label(label); + popup_menu_item = gtk_menu_item_new_with_label(label); + gtk_menu_item_set_submenu(GTK_MENU_ITEM(edit_menu_item), edit_menu); + gtk_menu_item_set_submenu(GTK_MENU_ITEM(popup_menu_item), popup_menu); + + while (includes[i] != NULL) + { + tmp_menu = gtk_menu_item_new_with_label(includes[i]); + tmp_popup = gtk_menu_item_new_with_label(includes[i]); + gtk_container_add(GTK_CONTAINER(edit_menu), tmp_menu); + gtk_container_add(GTK_CONTAINER(popup_menu), tmp_popup); + g_signal_connect((gpointer) tmp_menu, "activate", G_CALLBACK(on_insert_include_activate), + (gpointer) includes[i]); + g_signal_connect((gpointer) tmp_popup, "activate", G_CALLBACK(on_insert_include_activate), + (gpointer) includes[i]); + i++; + } + gtk_widget_show_all(edit_menu_item); + gtk_widget_show_all(popup_menu_item); + gtk_container_add(GTK_CONTAINER(me), edit_menu_item); + gtk_container_add(GTK_CONTAINER(mp), popup_menu_item); +} + + void utils_create_insert_menu_items(void) { GtkMenu *menu_edit = GTK_MENU(lookup_widget(app->window, "insert_include2_menu")); GtkMenu *menu_popup = GTK_MENU(lookup_widget(app->popup_menu, "insert_include1_menu")); - gint i, include_files_len = 29; - const gchar *c_include_files[] = { - NULL, - "<span weight=\"ultrabold\">Std.Lib</span>", - "(blank)", - "assert.h", - "ctype.h", - "errno.h", - "float.h", - "limits.h", - "locale.h", - "math.h", - "setjmp.h", - "signal.h", - "stdarg.h", - "stddef.h", - "stdio.h", - "stdlib.h", - "string.h", - "time.h", - NULL, - "<span weight=\"ultrabold\">C99</span>", - "complex.h", - "fenv.h", - "inttypes.h", - "iso646.h", - "stdbool.h", - "stdint.h", - "tgmath.h", - "wchar.h", - "wctype.h" + GtkWidget *blank; + const gchar *c_includes_stdlib[] = { + "assert.h", "ctype.h", "errno.h", "float.h", "limits.h", "locale.h", "math.h", "setjmp.h", + "signal.h", "stdarg.h", "stddef.h", "stdio.h", "stdlib.h", "string.h", "time.h", NULL }; - - for (i = 0; i < include_files_len; i++) - { - if (c_include_files[i] == NULL) - { - GtkWidget *tmp_menu = gtk_menu_item_new_with_label(""); - GtkWidget *tmp_popup = gtk_menu_item_new_with_label(""); - i++; - gtk_widget_set_sensitive(tmp_menu, FALSE); - gtk_widget_set_sensitive(tmp_popup, FALSE); - gtk_label_set_markup (GTK_LABEL(gtk_bin_get_child(GTK_BIN(tmp_menu))), c_include_files[i]); - gtk_label_set_markup (GTK_LABEL(gtk_bin_get_child(GTK_BIN(tmp_popup))), c_include_files[i]); - gtk_widget_show(tmp_menu); - gtk_widget_show(tmp_popup); - gtk_container_add(GTK_CONTAINER(menu_edit), tmp_menu); - gtk_container_add(GTK_CONTAINER(menu_popup), tmp_popup); - tmp_menu = gtk_separator_menu_item_new(); - tmp_popup = gtk_separator_menu_item_new(); - gtk_widget_show(tmp_menu); - gtk_widget_show(tmp_popup); - gtk_container_add(GTK_CONTAINER(menu_edit), tmp_menu); - gtk_container_add(GTK_CONTAINER(menu_popup), tmp_popup); - } - else - { - GtkWidget *tmp_menu = gtk_menu_item_new_with_label(c_include_files[i]); - GtkWidget *tmp_popup = gtk_menu_item_new_with_label(c_include_files[i]); - gtk_widget_show(tmp_menu); - gtk_widget_show(tmp_popup); - gtk_container_add(GTK_CONTAINER(menu_edit), tmp_menu); - gtk_container_add(GTK_CONTAINER(menu_popup), tmp_popup); - g_signal_connect((gpointer) tmp_menu, "activate", G_CALLBACK(on_insert_include_activate), (gpointer) c_include_files[i]); - g_signal_connect((gpointer) tmp_popup, "activate", G_CALLBACK(on_insert_include_activate), (gpointer) c_include_files[i]); - } - - } - + const gchar *c_includes_c99[] = { + "complex.h", "fenv.h", "inttypes.h", "iso646.h", "stdbool.h", "stdint.h", + "tgmath.h", "wchar.h", "wctype.h", NULL + }; + const gchar *c_includes_cpp[] = { + "cstdio", "cstring", "cctype", "cmath", "ctime", "cstdlib", "cstdarg", NULL + }; + const gchar *c_includes_cppstdlib[] = { + "iostream", "fstream", "iomanip", "sstream", "exception", "stdexcept", + "memory", "locale", NULL + }; + const gchar *c_includes_stl[] = { + "bitset", "dequev", "list", "map", "set", "queue", "stack", "vector", "algorithm", + "iterator", "functional", "string", "complex", "valarray", NULL + }; + + blank = gtk_menu_item_new_with_label(_("(blank)")); + gtk_container_add(GTK_CONTAINER(menu_edit), blank); + gtk_widget_show(blank); + g_signal_connect((gpointer) blank, "activate", G_CALLBACK(on_insert_include_activate), + (gpointer) "blank"); + blank = gtk_menu_item_new_with_label(_("(blank)")); + gtk_container_add(GTK_CONTAINER(menu_popup), blank); + gtk_widget_show(blank); + g_signal_connect((gpointer) blank, "activate", G_CALLBACK(on_insert_include_activate), + (gpointer) "blank"); + insert_items(menu_edit, menu_popup, (gchar**) c_includes_stdlib, _("C Standard Library")); + insert_items(menu_edit, menu_popup, (gchar**) c_includes_c99, _("ISO C99")); + insert_items(menu_edit, menu_popup, (gchar**) c_includes_cpp, _("C++ (C Standard Library)")); + insert_items(menu_edit, menu_popup, (gchar**) c_includes_cppstdlib, _("C++ Standard Library")); + insert_items(menu_edit, menu_popup, (gchar**) c_includes_stl, _("C++ STL")); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany: [471] trunk
by eht16＠users.sourceforge.net 22 Jun '06

22 Jun '06

Revision: 471 Author: eht16 Date: 2006-06-21 16:15:54 -0700 (Wed, 21 Jun 2006) ViewCVS: http://svn.sourceforge.net/geany/?rev=471&view=rev Log Message: ----------- Updated Scintilla to version 1.70. Modified Paths: -------------- trunk/ChangeLog trunk/scintilla/Converter.h trunk/scintilla/Editor.cxx trunk/scintilla/Editor.h trunk/scintilla/LexBash.cxx trunk/scintilla/LexHTML.cxx trunk/scintilla/LexSQL.cxx trunk/scintilla/LexTCL.cxx trunk/scintilla/LineMarker.h trunk/scintilla/PlatGTK.cxx trunk/scintilla/ScintillaBase.cxx trunk/scintilla/ScintillaGTK.cxx trunk/scintilla/ViewStyle.cxx trunk/scintilla/ViewStyle.h trunk/scintilla/include/HFacer.py trunk/scintilla/include/SciLexer.h trunk/scintilla/include/Scintilla.h trunk/scintilla/include/ScintillaWidget.h Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2006-06-21 18:54:07 UTC (rev 470) +++ trunk/ChangeLog 2006-06-21 23:15:54 UTC (rev 471) @@ -6,6 +6,7 @@ Added option in the preferences dialog to replace tabs by spaces when saving a file. Added option for default encoding for new files. + * scintilla/*: Updated Scintilla to version 1.70. 2006-06-20 Nick Treleaven <nick.treleaven(a)btinternet.com> Modified: trunk/scintilla/Converter.h =================================================================== --- trunk/scintilla/Converter.h 2006-06-21 18:54:07 UTC (rev 470) +++ trunk/scintilla/Converter.h 2006-06-21 23:15:54 UTC (rev 471) @@ -27,9 +27,9 @@ Converter() { iconvh = iconvhBad; } - Converter(const char *charSetDestination, const char *charSetSource) { + Converter(const char *charSetDestination, const char *charSetSource, bool transliterations) { iconvh = iconvhBad; - Open(charSetDestination, charSetSource); + Open(charSetDestination, charSetSource, transliterations); } ~Converter() { Close(); @@ -37,13 +37,18 @@ operator bool() const { return iconvh != iconvhBad; } - void Open(const char *charSetDestination, const char *charSetSource) { + void Open(const char *charSetDestination, const char *charSetSource, bool transliterations=true) { Close(); if (*charSetSource) { + char fullDest[200]; + strcpy(fullDest, charSetDestination); + if (transliterations) { + strcat(fullDest, "//TRANSLIT"); + } #if GTK_MAJOR_VERSION >= 2 - iconvh = g_iconv_open(charSetDestination, charSetSource); + iconvh = g_iconv_open(fullDest, charSetSource); #else - iconvh = iconv_open(charSetDestination, charSetSource); + iconvh = iconv_open(fullDest, charSetSource); #endif } } Modified: trunk/scintilla/Editor.cxx =================================================================== --- trunk/scintilla/Editor.cxx 2006-06-21 18:54:07 UTC (rev 470) +++ trunk/scintilla/Editor.cxx 2006-06-21 23:15:54 UTC (rev 471) @@ -285,7 +285,7 @@ } else if (level == llcPage) { if (lineNumber == lineCaret) { pos = 0; - } else { + } else if (length > 1) { pos = 1 + (lineNumber % (length - 1)); } } else if (level == llcDocument) { @@ -328,7 +328,7 @@ delete ll; } else { useCount--; - } + } } } @@ -429,9 +429,8 @@ wrapState = eWrapNone; wrapWidth = LineLayout::wrapWidthInfinite; - docLineLastWrapped = -1; - docLastLineToWrap = -1; - backgroundWrapEnabled = true; + wrapStart = wrapLineLarge; + wrapEnd = wrapLineLarge; wrapVisualFlags = 0; wrapVisualFlagsLocation = 0; wrapVisualStartIndent = 0; @@ -1487,29 +1486,18 @@ void Editor::UpdateSystemCaret() { } -void Editor::NeedWrapping(int docLineStartWrapping, int docLineEndWrapping) { - docLineStartWrapping = Platform::Minimum(docLineStartWrapping, pdoc->LinesTotal()-1); - docLineEndWrapping = Platform::Minimum(docLineEndWrapping, pdoc->LinesTotal()-1); - bool noWrap = (docLastLineToWrap == docLineLastWrapped); - if (docLineLastWrapped > (docLineStartWrapping - 1)) { - docLineLastWrapped = docLineStartWrapping - 1; - if (docLineLastWrapped < -1) - docLineLastWrapped = -1; +void Editor::NeedWrapping(int docLineStart, int docLineEnd) { + docLineStart = Platform::Clamp(docLineStart, 0, pdoc->LinesTotal()); + if (wrapStart > docLineStart) { + wrapStart = docLineStart; llc.Invalidate(LineLayout::llPositions); } - if (noWrap) { - docLastLineToWrap = docLineEndWrapping; - } else if (docLastLineToWrap < docLineEndWrapping) { - docLastLineToWrap = docLineEndWrapping + 1; + if (wrapEnd < docLineEnd) { + wrapEnd = docLineEnd; } - if (docLastLineToWrap < -1) - docLastLineToWrap = -1; - if (docLastLineToWrap >= pdoc->LinesTotal()) - docLastLineToWrap = pdoc->LinesTotal()-1; + wrapEnd = Platform::Clamp(wrapEnd, 0, pdoc->LinesTotal()); // Wrap lines during idle. - if ((wrapState != eWrapNone) && - backgroundWrapEnabled && - (docLastLineToWrap != docLineLastWrapped)) { + if ((wrapState != eWrapNone) && (wrapEnd != wrapStart)) { SetIdle(true); } } @@ -1518,33 +1506,33 @@ // fullwrap: if true, all lines which need wrapping will be done, // in this single call. // priorityWrapLineStart: If greater than zero, all lines starting from -// here to 100 lines past will be wrapped (even if there are +// here to 1 page + 100 lines past will be wrapped (even if there are // more lines under wrapping process in idle). -// If it is neither fullwrap, nor priorityWrap, then 100 lines will be +// If it is neither fullwrap, nor priorityWrap, then 1 page + 100 lines will be // wrapped, if there are any wrapping going on in idle. (Generally this // condition is called only from idler). // Return true if wrapping occurred. bool Editor::WrapLines(bool fullWrap, int priorityWrapLineStart) { // If there are any pending wraps, do them during idle if possible. + int linesInOneCall = LinesOnScreen() + 100; if (wrapState != eWrapNone) { - if (docLineLastWrapped < docLastLineToWrap) { - if (!(backgroundWrapEnabled && SetIdle(true))) { - // Background wrapping is disabled, or idle processing - // not supported. A full wrap is required. + if (wrapStart < wrapEnd) { + if (!SetIdle(true)) { + // Idle processing not supported so full wrap required. fullWrap = true; } } if (!fullWrap && priorityWrapLineStart >= 0 && // .. and if the paint window is outside pending wraps - (((priorityWrapLineStart + 100) < docLineLastWrapped) || - (priorityWrapLineStart > docLastLineToWrap))) { + (((priorityWrapLineStart + linesInOneCall) < wrapStart) || + (priorityWrapLineStart > wrapEnd))) { // No priority wrap pending return false; } } int goodTopLine = topLine; bool wrapOccurred = false; - if (docLineLastWrapped < pdoc->LinesTotal()) { + if (wrapStart <= pdoc->LinesTotal()) { if (wrapState == eWrapNone) { if (wrapWidth != LineLayout::wrapWidthInfinite) { wrapWidth = LineLayout::wrapWidthInfinite; @@ -1553,8 +1541,11 @@ } wrapOccurred = true; } - docLineLastWrapped = 0x7ffffff; + wrapStart = wrapLineLarge; + wrapEnd = wrapLineLarge; } else { + if (wrapEnd >= pdoc->LinesTotal()) + wrapEnd = pdoc->LinesTotal(); //ElapsedTime et; int lineDocTop = cs.DocFromDisplay(topLine); int subLineTop = topLine - cs.DisplayFromDoc(lineDocTop); @@ -1568,44 +1559,42 @@ AutoSurface surface(this); if (surface) { bool priorityWrap = false; - int lastLineToWrap = docLastLineToWrap; - int firstLineToWrap = docLineLastWrapped; + int lastLineToWrap = wrapEnd; + int lineToWrap = wrapStart; if (!fullWrap) { if (priorityWrapLineStart >= 0) { // This is a priority wrap. - firstLineToWrap = priorityWrapLineStart; - lastLineToWrap = firstLineToWrap + 100; + lineToWrap = priorityWrapLineStart; + lastLineToWrap = priorityWrapLineStart + linesInOneCall; priorityWrap = true; } else { // This is idle wrap. - lastLineToWrap = docLineLastWrapped + 100; + lastLineToWrap = wrapStart + linesInOneCall; } - if (lastLineToWrap >= docLastLineToWrap) - lastLineToWrap = docLastLineToWrap; + if (lastLineToWrap >= wrapEnd) + lastLineToWrap = wrapEnd; } // else do a fullWrap. - // printf("Wraplines: full = %d, priorityStart = %d (wrapping: %d to %d)\n", fullWrap, priorityWrapLineStart, firstLineToWrap, lastLineToWrap); - // printf("Pending wraps: %d to %d\n", docLineLastWrapped, docLastLineToWrap); - while (firstLineToWrap < lastLineToWrap) { - firstLineToWrap++; - if (!priorityWrap) - docLineLastWrapped++; - if (firstLineToWrap < pdoc->LinesTotal()) { - AutoLineLayout ll(llc, RetrieveLineLayout(firstLineToWrap)); + // Platform::DebugPrintf("Wraplines: full = %d, priorityStart = %d (wrapping: %d to %d)\n", fullWrap, priorityWrapLineStart, lineToWrap, lastLineToWrap); + // Platform::DebugPrintf("Pending wraps: %d to %d\n", wrapStart, wrapEnd); + while (lineToWrap < lastLineToWrap) { + AutoLineLayout ll(llc, RetrieveLineLayout(lineToWrap)); int linesWrapped = 1; if (ll) { - LayoutLine(firstLineToWrap, surface, vs, ll, wrapWidth); + LayoutLine(lineToWrap, surface, vs, ll, wrapWidth); linesWrapped = ll->lines; } - if (cs.SetHeight(firstLineToWrap, linesWrapped)) { + if (cs.SetHeight(lineToWrap, linesWrapped)) { wrapOccurred = true; - } } + lineToWrap++; } + if (!priorityWrap) + wrapStart = lineToWrap; // If wrapping is done, bring it to resting position - if (docLineLastWrapped > docLastLineToWrap) { - docLineLastWrapped = -1; - docLastLineToWrap = -1; + if (wrapStart >= wrapEnd) { + wrapStart = wrapLineLarge; + wrapEnd = wrapLineLarge; } } goodTopLine = cs.DisplayFromDoc(lineDocTop); @@ -1721,7 +1710,7 @@ rcSelMargin.left = rcSelMargin.right; rcSelMargin.right = rcSelMargin.left + vs.ms[margin].width; - if (vs.ms[margin].symbol) { + if (vs.ms[margin].style != SC_MARGIN_NUMBER) { /* alternate scheme: if (vs.ms[margin].mask & SC_MASK_FOLDERS) surface->FillRectangle(rcSelMargin, vs.styles[STYLE_DEFAULT].back.allocated); @@ -1732,8 +1721,21 @@ if (vs.ms[margin].mask & SC_MASK_FOLDERS) // Required because of special way brush is created for selection margin surface->FillRectangle(rcSelMargin, *pixmapSelPattern); - else - surface->FillRectangle(rcSelMargin, vs.styles[STYLE_LINENUMBER].back.allocated); + else { + ColourAllocated colour; + switch (vs.ms[margin].style) { + case SC_MARGIN_BACK: + colour = vs.styles[STYLE_DEFAULT].back.allocated; + break; + case SC_MARGIN_FORE: + colour = vs.styles[STYLE_DEFAULT].fore.allocated; + break; + default: + colour = vs.styles[STYLE_LINENUMBER].back.allocated; + break; + } + surface->FillRectangle(rcSelMargin, colour); + } } else { surface->FillRectangle(rcSelMargin, vs.styles[STYLE_LINENUMBER].back.allocated); } @@ -1840,7 +1842,7 @@ PRectangle rcMarker = rcSelMargin; rcMarker.top = yposScreen; rcMarker.bottom = yposScreen + vs.lineHeight; - if (!vs.ms[margin].symbol) { + if (vs.ms[margin].style == SC_MARGIN_NUMBER) { char number[100]; number[0] = '\0'; if (firstSubLine) @@ -2131,7 +2133,7 @@ continue; } if (p > 0) { - if (wrapState == eWrapChar){ + if (wrapState == eWrapChar) { lastGoodBreak = pdoc->MovePositionOutsideChar(p + posLineStart, -1) - posLineStart; p = pdoc->MovePositionOutsideChar(p + 1 + posLineStart, 1) - posLineStart; @@ -2150,14 +2152,15 @@ } } +ColourAllocated Editor::SelectionBackground(ViewStyle &vsDraw) { + return primarySelection ? vsDraw.selbackground.allocated : vsDraw.selbackground2.allocated; +} + ColourAllocated Editor::TextBackground(ViewStyle &vsDraw, bool overrideBackground, ColourAllocated background, bool inSelection, bool inHotspot, int styleMain, int i, LineLayout *ll) { if (inSelection) { - if (vsDraw.selbackset) { - if (primarySelection) - return vsDraw.selbackground.allocated; - else - return vsDraw.selbackground2.allocated; + if (vsDraw.selbackset && (vsDraw.selAlpha == SC_ALPHA_NOALPHA)) { + return SelectionBackground(vsDraw); } } else { if ((vsDraw.edgeState == EDGE_BACKGROUND) && @@ -2209,7 +2212,7 @@ surface->LineTo(xBase + xDir * xRelative, yBase + yDir * yRelative); } }; - Relative rel = {surface, x0, xStraight?1:-1, y0, yStraight?1:-1}; + Relative rel = {surface, x0, xStraight ? 1 : -1, y0, yStraight ? 1 : -1}; // arrow head rel.MoveTo(xa, y); @@ -2225,6 +2228,12 @@ y - 2 * dy); } +static void SimpleAlphaRectangle(Surface *surface, PRectangle rc, ColourAllocated fill, int alpha) { + if (alpha != SC_ALPHA_NOALPHA) { + surface->AlphaRectangle(rc, 0, fill, alpha, fill, alpha, 0); + } +} + void Editor::DrawEOL(Surface *surface, ViewStyle &vsDraw, PRectangle rcLine, LineLayout *ll, int line, int lineEnd, int xStart, int subLine, int subLineStart, bool overrideBackground, ColourAllocated background, @@ -2241,15 +2250,17 @@ bool eolInSelection = (subLine == (ll->lines - 1)) && (posLineEnd > ll->selStart) && (posLineEnd <= ll->selEnd) && (ll->selStart != ll->selEnd); - if (eolInSelection && vsDraw.selbackset && (line < pdoc->LinesTotal() - 1)) { - if (primarySelection) - surface->FillRectangle(rcSegment, vsDraw.selbackground.allocated); - else - surface->FillRectangle(rcSegment, vsDraw.selbackground2.allocated); - } else if (overrideBackground) { - surface->FillRectangle(rcSegment, background); + if (eolInSelection && vsDraw.selbackset && (line < pdoc->LinesTotal() - 1) && (vsDraw.selAlpha == SC_ALPHA_NOALPHA)) { + surface->FillRectangle(rcSegment, SelectionBackground(vsDraw)); } else { - surface->FillRectangle(rcSegment, vsDraw.styles[ll->styles[ll->numCharsInLine] & styleMask].back.allocated); + if (overrideBackground) { + surface->FillRectangle(rcSegment, background); + } else { + surface->FillRectangle(rcSegment, vsDraw.styles[ll->styles[ll->numCharsInLine] & styleMask].back.allocated); + } + if (eolInSelection && vsDraw.selbackset && (line < pdoc->LinesTotal() - 1) && (vsDraw.selAlpha != SC_ALPHA_NOALPHA)) { + SimpleAlphaRectangle(surface, rcSegment, SelectionBackground(vsDraw), vsDraw.selAlpha); + } } rcSegment.left = xEol + vsDraw.aveCharWidth + xStart; @@ -2302,7 +2313,8 @@ if (!overrideBackground) { int marks = pdoc->GetMark(line); for (int markBit = 0; (markBit < 32) && marks; markBit++) { - if ((marks & 1) && vsDraw.markers[markBit].markType == SC_MARK_BACKGROUND) { + if ((marks & 1) && (vsDraw.markers[markBit].markType == SC_MARK_BACKGROUND) && + (vsDraw.markers[markBit].alpha == SC_ALPHA_NOALPHA)) { background = vsDraw.markers[markBit].back.allocated; overrideBackground = true; } @@ -2311,14 +2323,15 @@ } if (!overrideBackground) { if (vsDraw.maskInLine) { - int marks = pdoc->GetMark(line) & vsDraw.maskInLine; - if (marks) { - for (int markBit = 0; (markBit < 32) && marks; markBit++) { - if ((marks & 1) && (vsDraw.markers[markBit].markType != SC_MARK_EMPTY)) { + int marksMasked = pdoc->GetMark(line) & vsDraw.maskInLine; + if (marksMasked) { + for (int markBit = 0; (markBit < 32) && marksMasked; markBit++) { + if ((marksMasked & 1) && (vsDraw.markers[markBit].markType != SC_MARK_EMPTY) && + (vsDraw.markers[markBit].alpha == SC_ALPHA_NOALPHA)) { overrideBackground = true; background = vsDraw.markers[markBit].back.allocated; } - marks >>= 1; + marksMasked >>= 1; } } } @@ -2646,6 +2659,15 @@ xStart, subLine, subLineStart, overrideBackground, background, drawWrapMarkEnd, vsDraw.whitespaceForeground.allocated); } + if ((vsDraw.selAlpha != SC_ALPHA_NOALPHA) && (ll->selStart >= 0) && (ll->selEnd >= 0)) { + int startPosSel = (ll->selStart < posLineStart) ? posLineStart : ll->selStart; + int endPosSel = (ll->selEnd < (lineEnd + posLineStart)) ? ll->selEnd : (lineEnd + posLineStart); + if (startPosSel < endPosSel) { + rcSegment.left = xStart + ll->positions[startPosSel - posLineStart] - subLineStart; + rcSegment.right = xStart + ll->positions[endPosSel - posLineStart] - subLineStart; + SimpleAlphaRectangle(surface, rcSegment, SelectionBackground(vsDraw), vsDraw.selAlpha); + } + } if (vsDraw.edgeState == EDGE_LINE) { int edgeX = theEdge * vsDraw.spaceWidth; @@ -2654,12 +2676,30 @@ surface->FillRectangle(rcSegment, vsDraw.edgecolour.allocated); } - if (caret.active && vsDraw.showCaretLineBackground && (vsDraw.caretLineAlpha != SC_ALPHA_NOALPHA) && ll->containsCaret) { - rcSegment.left = xStart; - rcSegment.right = rcLine.right - 1; - surface->AlphaRectangle(rcSegment, 0, vsDraw.caretLineBackground.allocated, vsDraw.caretLineAlpha, - vsDraw.caretLineBackground.allocated, vsDraw.caretLineAlpha, 0); + // Draw any translucent whole line states + rcSegment.left = xStart; + rcSegment.right = rcLine.right - 1; + if (caret.active && vsDraw.showCaretLineBackground && ll->containsCaret) { + SimpleAlphaRectangle(surface, rcSegment, vsDraw.caretLineBackground.allocated, vsDraw.caretLineAlpha); } + int marks = pdoc->GetMark(line); + for (int markBit = 0; (markBit < 32) && marks; markBit++) { + if ((marks & 1) && (vsDraw.markers[markBit].markType == SC_MARK_BACKGROUND)) { + SimpleAlphaRectangle(surface, rcSegment, vsDraw.markers[markBit].back.allocated, vsDraw.markers[markBit].alpha); + } + marks >>= 1; + } + if (vsDraw.maskInLine) { + int marksMasked = pdoc->GetMark(line) & vsDraw.maskInLine; + if (marksMasked) { + for (int markBit = 0; (markBit < 32) && marksMasked; markBit++) { + if ((marksMasked & 1) && (vsDraw.markers[markBit].markType != SC_MARK_EMPTY)) { + SimpleAlphaRectangle(surface, rcSegment, vsDraw.markers[markBit].back.allocated, vsDraw.markers[markBit].alpha); + } + marksMasked >>= 1; + } + } + } } void Editor::RefreshPixMaps(Surface *surfaceWindow) { @@ -3076,7 +3116,7 @@ // Printing supports only the line number margin. int lineNumberIndex = -1; for (int margin = 0; margin < ViewStyle::margins; margin++) { - if ((!vsPrint.ms[margin].symbol) && (vsPrint.ms[margin].width > 0)) { + if ((vsPrint.ms[margin].style == SC_MARGIN_NUMBER) && (vsPrint.ms[margin].width > 0)) { lineNumberIndex = margin; } else { vsPrint.ms[margin].width = 0; @@ -3089,6 +3129,7 @@ // Don't show the selection when printing vsPrint.selbackset = false; vsPrint.selforeset = false; + vsPrint.selAlpha = SC_ALPHA_NOALPHA; vsPrint.whitespaceBackgroundSet = false; vsPrint.whitespaceForegroundSet = false; vsPrint.showCaretLineBackground = false; @@ -3675,19 +3716,8 @@ llc.Invalidate(LineLayout::llCheckTextAndStyle); if (wrapState != eWrapNone) { int lineDoc = pdoc->LineFromPosition(mh.position); - if (mh.linesAdded <= 0) { - AutoSurface surface(this); - AutoLineLayout ll(llc, RetrieveLineLayout(lineDoc)); - if (surface && ll) { - LayoutLine(lineDoc, surface, vs, ll, wrapWidth); - if (cs.GetHeight(lineDoc) != ll->lines) { - NeedWrapping(lineDoc - 1, lineDoc + 1); - Redraw(); - } - } - } else { - NeedWrapping(lineDoc, lineDoc + 1 + mh.linesAdded); - } + int lines = Platform::Maximum(0, mh.linesAdded); + NeedWrapping(lineDoc, lineDoc + lines + 1); } } } @@ -3730,6 +3760,7 @@ InvalidateRange(mh.position, mh.position + mh.length); } } + llc.Invalidate(LineLayout::llCheckTextAndStyle); } else { // Move selection and brace highlights if (mh.modificationType & SC_MOD_INSERTTEXT) { @@ -4846,7 +4877,7 @@ text[size] = '\0'; } } - ss->Set(text, size + 1, pdoc->dbcsCodePage, + ss->Set(text, size + 1, pdoc->dbcsCodePage, vs.styles[STYLE_DEFAULT].characterSet, selType == selRectangle); } } @@ -5390,13 +5421,13 @@ bool idleDone; - bool wrappingDone = (wrapState == eWrapNone) || (!backgroundWrapEnabled); + bool wrappingDone = wrapState == eWrapNone; if (!wrappingDone) { // Wrap lines during idle. WrapLines(false, -1); // No more wrapping - if (docLineLastWrapped == docLastLineToWrap) + if (wrapStart == wrapEnd) wrappingDone = true; } @@ -6318,16 +6349,16 @@ return pdoc->ExtendWordSelect(wParam, 1, lParam != 0); case SCI_SETWRAPMODE: - switch(wParam){ - case SC_WRAP_WORD: - wrapState = eWrapWord; - break; - case SC_WRAP_CHAR: - wrapState = eWrapChar; - break; - default: - wrapState = eWrapNone; - break; + switch (wParam) { + case SC_WRAP_WORD: + wrapState = eWrapWord; + break; + case SC_WRAP_CHAR: + wrapState = eWrapChar; + break; + default: + wrapState = eWrapNone; + break; } xOffset = 0; InvalidateStyleRedraw(); @@ -6478,8 +6509,10 @@ return pdoc->LineEnd(wParam); case SCI_SETCODEPAGE: - pdoc->dbcsCodePage = wParam; - InvalidateStyleRedraw(); + if (ValidCodePage(wParam)) { + pdoc->dbcsCodePage = wParam; + InvalidateStyleRedraw(); + } break; case SCI_GETCODEPAGE: @@ -6512,6 +6545,11 @@ InvalidateStyleData(); RedrawSelMargin(); break; + case SCI_MARKERSETALPHA: + if (wParam <= MARKER_MAX) + vs.markers[wParam].alpha = lParam; + InvalidateStyleRedraw(); + break; case SCI_MARKERADD: { int markerID = pdoc->AddMark(wParam, lParam); return markerID; @@ -6559,14 +6597,14 @@ case SCI_SETMARGINTYPEN: if (ValidMargin(wParam)) { - vs.ms[wParam].symbol = (lParam == SC_MARGIN_SYMBOL); + vs.ms[wParam].style = lParam; InvalidateStyleRedraw(); } break; case SCI_GETMARGINTYPEN: if (ValidMargin(wParam)) - return vs.ms[wParam].symbol ? SC_MARGIN_SYMBOL : SC_MARGIN_NUMBER; + return vs.ms[wParam].style; else return 0; @@ -6850,6 +6888,14 @@ InvalidateStyleRedraw(); break; + case SCI_SETSELALPHA: + vs.selAlpha = wParam; + InvalidateStyleRedraw(); + break; + + case SCI_GETSELALPHA: + return vs.selAlpha; + case SCI_SETWHITESPACEFORE: vs.whitespaceForegroundSet = wParam != 0; vs.whitespaceForeground.desired = ColourDesired(lParam); Modified: trunk/scintilla/Editor.h =================================================================== --- trunk/scintilla/Editor.h 2006-06-21 18:54:07 UTC (rev 470) +++ trunk/scintilla/Editor.h 2006-06-21 23:15:54 UTC (rev 471) @@ -305,10 +305,10 @@ // Wrapping support enum { eWrapNone, eWrapWord, eWrapChar } wrapState; - bool backgroundWrapEnabled; + enum { wrapLineLarge = 0x7ffffff }; int wrapWidth; - int docLineLastWrapped; - int docLastLineToWrap; + int wrapStart; + int wrapEnd; int wrapVisualFlags; int wrapVisualFlagsLocation; int wrapVisualStartIndent; @@ -377,7 +377,7 @@ void InvalidateCaret(); virtual void UpdateSystemCaret(); - void NeedWrapping(int docLineStartWrapping = 0, int docLineEndWrapping = 0x7ffffff); + void NeedWrapping(int docLineStart = 0, int docLineEnd = wrapLineLarge); bool WrapLines(bool fullWrap, int priorityWrapLineStart); void LinesJoin(); void LinesSplit(int pixelWidth); @@ -387,6 +387,7 @@ LineLayout *RetrieveLineLayout(int lineNumber); void LayoutLine(int line, Surface *surface, ViewStyle &vstyle, LineLayout *ll, int width=LineLayout::wrapWidthInfinite); + ColourAllocated SelectionBackground(ViewStyle &vsDraw); ColourAllocated TextBackground(ViewStyle &vsDraw, bool overrideBackground, ColourAllocated background, bool inSelection, bool inHotspot, int styleMain, int i, LineLayout *ll); void DrawIndentGuide(Surface *surface, int lineVisible, int lineHeight, int start, PRectangle rcSegment, bool highlight); void DrawWrapMarker(Surface *surface, PRectangle rcPlace, bool isEndMarker, ColourAllocated wrapColour); @@ -524,6 +525,7 @@ void GetHotSpotRange(int& hsStart, int& hsEnd); int CodePage() const; + virtual bool ValidCodePage(int /* codePage */) const { return true; } int WrapCount(int line); virtual sptr_t DefWndProc(unsigned int iMessage, uptr_t wParam, sptr_t lParam) = 0; Modified: trunk/scintilla/LexBash.cxx =================================================================== --- trunk/scintilla/LexBash.cxx 2006-06-21 18:54:07 UTC (rev 470) +++ trunk/scintilla/LexBash.cxx 2006-06-21 23:15:54 UTC (rev 471) @@ -259,7 +259,7 @@ if (state == SCE_SH_DEFAULT) { if (ch == '\\') { // escaped character if (i < lengthDoc - 1) - i++; + i++; ch = chNext; chNext = chNext2; styler.ColourTo(i, SCE_SH_IDENTIFIER); Modified: trunk/scintilla/LexHTML.cxx =================================================================== --- trunk/scintilla/LexHTML.cxx 2006-06-21 18:54:07 UTC (rev 470) +++ trunk/scintilla/LexHTML.cxx 2006-06-21 23:15:54 UTC (rev 471) @@ -687,7 +687,7 @@ (ch == '<') && (chNext == '?') && !IsScriptCommentState(state) ) { - scriptLanguage = segIsScriptingIndicator(styler, styler.GetStartSegment() + 2, i + 10, eScriptPHP); + scriptLanguage = segIsScriptingIndicator(styler, i + 2, i + 10, eScriptPHP); if (scriptLanguage != eScriptPHP && isStringState(state)) continue; styler.ColourTo(i - 1, StateToPrint); beforePreProc = state; Modified: trunk/scintilla/LexSQL.cxx =================================================================== --- trunk/scintilla/LexSQL.cxx 2006-06-21 18:54:07 UTC (rev 470) +++ trunk/scintilla/LexSQL.cxx 2006-06-21 23:15:54 UTC (rev 471) @@ -60,27 +60,7 @@ bool sqlBackslashEscapes = styler.GetPropertyInt("sql.backslash.escapes", 0) != 0; bool sqlBackticksIdentifier = styler.GetPropertyInt("lexer.sql.backticks.identifier", 0) != 0; int styleBeforeDCKeyword = SCE_SQL_DEFAULT; - bool fold = styler.GetPropertyInt("fold") != 0; - int lineCurrent = styler.GetLine(startPos); - for (; sc.More(); sc.Forward()) { - // Fold based on indentation - if (sc.atLineStart) { - int spaceFlags = 0; - int indentCurrent = styler.IndentAmount(lineCurrent, &spaceFlags); - int level = indentCurrent; - if (!(indentCurrent & SC_FOLDLEVELWHITEFLAG)) { - // Only non whitespace lines can be headers - int indentNext = styler.IndentAmount(lineCurrent + 1, &spaceFlags); - if (indentCurrent < (indentNext & ~SC_FOLDLEVELWHITEFLAG)) { - level |= SC_FOLDLEVELHEADERFLAG; - } - } - if (fold) { - styler.SetLevel(lineCurrent, level); - } - } - // Determine if the current state should terminate. switch (sc.state) { case SCE_SQL_OPERATOR: @@ -242,6 +222,8 @@ WordList *[], Accessor &styler) { bool foldComment = styler.GetPropertyInt("fold.comment") != 0; bool foldCompact = styler.GetPropertyInt("fold.compact", 1) != 0; + bool foldOnlyBegin = styler.GetPropertyInt("fold.sql.only.begin", 0) != 0; + unsigned int endPos = startPos + length; int visibleChars = 0; int lineCurrent = styler.GetLine(startPos); @@ -305,7 +287,7 @@ } else { s[j] = '\0'; } - if (strcmp(s, "if") == 0 || strcmp(s, "loop") == 0) { + if ((!foldOnlyBegin) && (strcmp(s, "if") == 0 || strcmp(s, "loop") == 0)) { if (endFound) { // ignore endFound = false; Modified: trunk/scintilla/LexTCL.cxx =================================================================== --- trunk/scintilla/LexTCL.cxx 2006-06-21 18:54:07 UTC (rev 470) +++ trunk/scintilla/LexTCL.cxx 2006-06-21 23:15:54 UTC (rev 471) @@ -23,34 +23,36 @@ // Extended to accept accented characters static inline bool IsAWordChar(int ch) { return ch >= 0x80 || - (isalnum(ch) || ch == '_' || ch ==':'); // : name space separator + (isalnum(ch) || ch == '_' || ch ==':' || ch=='.'); // : name space separator } static inline bool IsAWordStart(int ch) { - return ch >= 0x80 || - (isalpha(ch) || ch == '_'); + return ch >= 0x80 || (ch ==':' || isalpha(ch) || ch == '_'); } static inline bool IsANumberChar(int ch) { // Not exactly following number definition (several dots are seen as OK, etc.) // but probably enough in most cases. return (ch < 0x80) && - (isdigit(ch) || toupper(ch) == 'E' || + (IsADigit(ch, 0x10) || toupper(ch) == 'E' || ch == '.' || ch == '-' || ch == '+'); } -static void ColouriseTCLDoc(unsigned int startPos, int length, int initStyle, WordList *keywordlists[], Accessor &styler) { +static void ColouriseTCLDoc(unsigned int startPos, int length, int , WordList *keywordlists[], Accessor &styler) { +#define isComment(s) (s==SCE_TCL_COMMENT || s==SCE_TCL_COMMENTLINE || s==SCE_TCL_COMMENT_BOX || s==SCE_TCL_BLOCK_COMMENT) bool foldComment = styler.GetPropertyInt("fold.comment") != 0; bool commentLevel = false; bool subBrace = false; // substitution begin with a brace ${.....} - enum tLineState {LS_DEFAULT, LS_OPEN_COMMENT, LS_OPEN_DOUBLE_QUOTE, LS_MASK_STATE = 0xf, + enum tLineState {LS_DEFAULT, LS_OPEN_COMMENT, LS_OPEN_DOUBLE_QUOTE, LS_COMMENT_BOX, LS_MASK_STATE = 0xf, LS_COMMAND_EXPECTED = 16, LS_BRACE_ONLY = 32 } lineState = LS_DEFAULT; bool prevSlash = false; int currentLevel = 0; bool expected = 0; - int subParen = 0; + bool subParen = 0; int currentLine = styler.GetLine(startPos); + if (currentLine > 0) + currentLine--; length += startPos - styler.LineStart(currentLine); // make sure lines overlap startPos = styler.LineStart(currentLine); @@ -77,77 +79,107 @@ bool visibleChars = false; int previousLevel = currentLevel; - StyleContext sc(startPos, length, initStyle, styler); + StyleContext sc(startPos, length, SCE_TCL_DEFAULT, styler); for (; ; sc.Forward()) { - bool atEnd = !sc.More(); // make sure we process last word at end of file next: - if (subBrace) { + if (sc.ch=='\r' && sc.chNext == '\n') // only ignore \r on PC process on the mac + continue; + bool atEnd = !sc.More(); // make sure we coloured the last word + if (lineState != LS_DEFAULT) { + sc.SetState(SCE_TCL_DEFAULT); + if (lineState == LS_OPEN_COMMENT) + sc.SetState(SCE_TCL_COMMENTLINE); + else if (lineState == LS_OPEN_DOUBLE_QUOTE) + sc.SetState(SCE_TCL_IN_QUOTE); + else if (lineState == LS_COMMENT_BOX && (sc.ch == '#' || (sc.ch == ' ' && sc.chNext=='#'))) + sc.SetState(SCE_TCL_COMMENT_BOX); + lineState = LS_DEFAULT; + } + if (subBrace) { // ${ overrides every thing even \ except } if (sc.ch == '}') { subBrace = false; - sc.SetState(SCE_TCL_OPERATOR); // } + sc.SetState(SCE_TCL_OPERATOR); sc.ForwardSetState(SCE_TCL_DEFAULT); + goto next; } else sc.SetState(SCE_TCL_SUB_BRACE); if (!sc.atLineEnd) continue; } else if (sc.state == SCE_TCL_DEFAULT || sc.state ==SCE_TCL_OPERATOR) { - expected &= isspacechar(static_cast<unsigned char>(sc.ch)) || IsAWordStart(sc.ch); + expected &= isspacechar(static_cast<unsigned char>(sc.ch)) || IsAWordStart(sc.ch) || sc.ch =='#'; } else if (sc.state == SCE_TCL_SUBSTITUTION) { - if (sc.ch == '(') - subParen++; - else if (sc.ch == ')') { + switch(sc.ch) { + case '(': + subParen=true; + sc.SetState(SCE_TCL_OPERATOR); + sc.ForwardSetState(SCE_TCL_SUBSTITUTION); + continue; + case ')': + sc.SetState(SCE_TCL_OPERATOR); + subParen=false; + continue; + case '$': + continue; + case ',': + sc.SetState(SCE_TCL_OPERATOR); if (subParen) - subParen--; - else - sc.SetState(SCE_TCL_DEFAULT); // lets the code below fix it - } else if (!IsAWordChar(sc.ch)) { - sc.SetState(SCE_TCL_DEFAULT); - subParen = 0; + sc.ForwardSetState(SCE_TCL_SUBSTITUTION); + continue; + default : + // maybe spaces should be allowed ??? + if (!IsAWordChar(sc.ch)) { // probably the code is wrong + sc.SetState(SCE_TCL_DEFAULT); + subParen = 0; + } + break; } - } - else - { - if (!IsAWordChar(sc.ch)) { - if (sc.state == SCE_TCL_IDENTIFIER || sc.state == SCE_TCL_MODIFIER || expected) { - char s[100]; - sc.GetCurrent(s, sizeof(s)); - bool quote = sc.state == SCE_TCL_IN_QUOTE; - if (commentLevel || expected) { - if (keywords.InList(s)) { - sc.ChangeState(quote ? SCE_TCL_WORD_IN_QUOTE : SCE_TCL_WORD); - } else if (keywords2.InList(s)) { - sc.ChangeState(quote ? SCE_TCL_WORD_IN_QUOTE : SCE_TCL_WORD2); - } else if (keywords3.InList(s)) { - sc.ChangeState(quote ? SCE_TCL_WORD_IN_QUOTE : SCE_TCL_WORD3); - } else if (keywords4.InList(s)) { - sc.ChangeState(quote ? SCE_TCL_WORD_IN_QUOTE : SCE_TCL_WORD4); - } else if (sc.GetRelative(-static_cast<int>(strlen(s))-1) == '{' && - keywords5.InList(s) && sc.ch == '}') { // {keyword} exactly no spaces - sc.ChangeState(SCE_TCL_EXPAND); - } - if (keywords6.InList(s)) { - sc.ChangeState(SCE_TCL_WORD5); - } else if (keywords7.InList(s)) { - sc.ChangeState(SCE_TCL_WORD6); - } else if (keywords8.InList(s)) { - sc.ChangeState(SCE_TCL_WORD7); - } else if (keywords9.InList(s)) { - sc.ChangeState(SCE_TCL_WORD8); - } + } else if (isComment(sc.state)) { + } else if (!IsAWordChar(sc.ch)) { + if ((sc.state == SCE_TCL_IDENTIFIER && expected) || sc.state == SCE_TCL_MODIFIER) { + char w[100]; + char *s=w; + sc.GetCurrent(w, sizeof(w)); + if (w[strlen(w)-1]=='\r') + w[strlen(w)-1]=0; + while(*s == ':') // ignore leading : like in ::set a 10 + ++s; + bool quote = sc.state == SCE_TCL_IN_QUOTE; + if (commentLevel || expected) { + if (keywords.InList(s)) { + sc.ChangeState(quote ? SCE_TCL_WORD_IN_QUOTE : SCE_TCL_WORD); + } else if (keywords2.InList(s)) { + sc.ChangeState(quote ? SCE_TCL_WORD_IN_QUOTE : SCE_TCL_WORD2); + } else if (keywords3.InList(s)) { + sc.ChangeState(quote ? SCE_TCL_WORD_IN_QUOTE : SCE_TCL_WORD3); + } else if (keywords4.InList(s)) { + sc.ChangeState(quote ? SCE_TCL_WORD_IN_QUOTE : SCE_TCL_WORD4); + } else if (sc.GetRelative(-static_cast<int>(strlen(s))-1) == '{' && + keywords5.InList(s) && sc.ch == '}') { // {keyword} exactly no spaces + sc.ChangeState(SCE_TCL_EXPAND); } - expected = false; - sc.SetState(quote ? SCE_TCL_IN_QUOTE : SCE_TCL_DEFAULT); - } else if (sc.state == SCE_TCL_MODIFIER || sc.state == SCE_TCL_SUBSTITUTION) { - sc.SetState(SCE_TCL_DEFAULT); + if (keywords6.InList(s)) { + sc.ChangeState(SCE_TCL_WORD5); + } else if (keywords7.InList(s)) { + sc.ChangeState(SCE_TCL_WORD6); + } else if (keywords8.InList(s)) { + sc.ChangeState(SCE_TCL_WORD7); + } else if (keywords9.InList(s)) { + sc.ChangeState(SCE_TCL_WORD8); + } } + expected = false; + sc.SetState(quote ? SCE_TCL_IN_QUOTE : SCE_TCL_DEFAULT); + } else if (sc.state == SCE_TCL_MODIFIER || sc.state == SCE_TCL_IDENTIFIER) { + sc.SetState(SCE_TCL_DEFAULT); } } if (atEnd) break; - if (sc.atLineEnd) { + if (sc.atLineEnd) { + lineState = LS_DEFAULT; currentLine = styler.GetLine(sc.currentPos); - if (foldComment && sc.state == SCE_TCL_COMMENTLINE) { + if (foldComment && sc.state!=SCE_TCL_COMMENT && isComment(sc.state)) { if (currentLevel == 0) { ++currentLevel; commentLevel = true; @@ -169,35 +201,39 @@ // Update the line state, so it can be seen by next line if (sc.state == SCE_TCL_IN_QUOTE) lineState = LS_OPEN_DOUBLE_QUOTE; - else if (prevSlash) { - if (sc.state == SCE_TCL_COMMENT || sc.state == SCE_TCL_COMMENTLINE) - lineState = LS_OPEN_COMMENT; + else { + if (prevSlash) { + if (isComment(sc.state)) + lineState = LS_OPEN_COMMENT; + } else if (sc.state == SCE_TCL_COMMENT_BOX) + lineState = LS_COMMENT_BOX; } styler.SetLineState(currentLine, (subBrace ? LS_BRACE_ONLY : 0) | (expected ? LS_COMMAND_EXPECTED : 0) | lineState); - sc.SetState(SCE_TCL_DEFAULT); + if (lineState == LS_COMMENT_BOX) + sc.ForwardSetState(SCE_TCL_COMMENT_BOX); + else if (lineState == LS_OPEN_DOUBLE_QUOTE) + sc.ForwardSetState(SCE_TCL_IN_QUOTE); + else + sc.ForwardSetState(SCE_TCL_DEFAULT); prevSlash = false; previousLevel = currentLevel; - lineState = LS_DEFAULT; - continue; + goto next; } if (prevSlash) { - prevSlash = (sc.state == SCE_TCL_COMMENT || sc.state == SCE_TCL_COMMENTLINE) && isspacechar(static_cast<unsigned char>(sc.ch)); - continue; + prevSlash = false; + if (sc.ch == '#' && IsANumberChar(sc.chNext)) + sc.ForwardSetState(SCE_TCL_NUMBER); + continue; } - + prevSlash = sc.ch == '\\'; + if (isComment(sc.state)) + continue; if (sc.atLineStart) { visibleChars = false; - if (lineState == LS_OPEN_COMMENT) { - sc.SetState(SCE_TCL_COMMENT); - lineState = LS_DEFAULT; - continue; - } - if (lineState == LS_OPEN_DOUBLE_QUOTE) - sc.SetState(SCE_TCL_IN_QUOTE); - else + if (sc.state!=SCE_TCL_IN_QUOTE && !isComment(sc.state)) { sc.SetState(SCE_TCL_DEFAULT); expected = IsAWordStart(sc.ch)|| isspacechar(static_cast<unsigned char>(sc.ch)); @@ -212,30 +248,32 @@ case SCE_TCL_IN_QUOTE: if (sc.ch == '"') { sc.ForwardSetState(SCE_TCL_DEFAULT); - visibleChars = true; // necessary for a " as the first and only character on a line + visibleChars = true; // necessary if a " is the first and only character on a line goto next; } else if (sc.ch == '[' || sc.ch == ']' || sc.ch == '$') { sc.SetState(SCE_TCL_OPERATOR); expected = sc.ch == '['; sc.ForwardSetState(SCE_TCL_IN_QUOTE); goto next; - } - prevSlash = sc.ch == '\\'; - continue; - case SCE_TCL_OPERATOR: + } + continue; + case SCE_TCL_OPERATOR: sc.SetState(SCE_TCL_DEFAULT); break; } if (sc.ch == '#') { if (visibleChars) { - if (sc.state != SCE_TCL_IN_QUOTE && expected) { + if (sc.state != SCE_TCL_IN_QUOTE && expected) sc.SetState(SCE_TCL_COMMENT); - expected = false; - } - } else - sc.SetState(SCE_TCL_COMMENTLINE); - } + } else { + sc.SetState(SCE_TCL_COMMENTLINE); + if (sc.chNext == '~') + sc.SetState(SCE_TCL_BLOCK_COMMENT); + if (sc.atLineStart && (sc.chNext == '#' || sc.chNext == '-')) + sc.SetState(SCE_TCL_COMMENT_BOX); + } + } if (!isspacechar(static_cast<unsigned char>(sc.ch))) { visibleChars = true; @@ -243,15 +281,15 @@ if (sc.ch == '\\') { prevSlash = true; - continue; + continue; } // Determine if a new state should be entered. if (sc.state == SCE_TCL_DEFAULT) { - if (IsADigit(sc.ch) || (sc.ch == '.' && IsADigit(sc.chNext))) { + if (IsAWordStart(sc.ch)) { + sc.SetState(SCE_TCL_IDENTIFIER); + } else if (IsADigit(sc.ch) && !IsAWordChar(sc.chPrev)) { sc.SetState(SCE_TCL_NUMBER); - } else if (IsAWordStart(sc.ch) & expected) { - sc.SetState(SCE_TCL_IDENTIFIER); } else { switch (sc.ch) { case '\"': @@ -267,10 +305,8 @@ --currentLevel; break; case '[': + expected = true; case ']': - sc.SetState(SCE_TCL_OPERATOR); - expected = true; - break; case '(': case ')': sc.SetState(SCE_TCL_OPERATOR); @@ -284,15 +320,24 @@ sc.SetState(SCE_TCL_SUBSTITUTION); } else { - sc.ForwardSetState(SCE_TCL_OPERATOR); // { - sc.ForwardSetState(SCE_TCL_SUB_BRACE); + sc.SetState(SCE_TCL_OPERATOR); // $ + sc.Forward(); // { + sc.ForwardSetState(SCE_TCL_SUB_BRACE); subBrace = true; } break; + case '#': + if ((isspacechar(static_cast<unsigned char>(sc.chPrev))|| + isoperator(static_cast<char>(sc.chPrev))) && IsADigit(sc.chNext,0x10)) + sc.SetState(SCE_TCL_NUMBER); + break; case '-': - if (!IsADigit(sc.chNext)) - sc.SetState(SCE_TCL_MODIFIER); + sc.SetState(IsADigit(sc.chNext)? SCE_TCL_NUMBER: SCE_TCL_MODIFIER); break; + default: + if (isoperator(static_cast<char>(sc.ch))) { + sc.SetState(SCE_TCL_OPERATOR); + } } } } Modified: trunk/scintilla/LineMarker.h =================================================================== --- trunk/scintilla/LineMarker.h 2006-06-21 18:54:07 UTC (rev 470) +++ trunk/scintilla/LineMarker.h 2006-06-21 23:15:54 UTC (rev 471) @@ -15,11 +15,13 @@ int markType; ColourPair fore; ColourPair back; + int alpha; XPM *pxpm; LineMarker() { markType = SC_MARK_CIRCLE; fore = ColourDesired(0,0,0); back = ColourDesired(0xff,0xff,0xff); + alpha = SC_ALPHA_NOALPHA; pxpm = NULL; } LineMarker(const LineMarker &) { @@ -27,6 +29,7 @@ markType = SC_MARK_CIRCLE; fore = ColourDesired(0,0,0); back = ColourDesired(0xff,0xff,0xff); + alpha = SC_ALPHA_NOALPHA; pxpm = NULL; } ~LineMarker() { @@ -37,6 +40,7 @@ markType = SC_MARK_CIRCLE; fore = ColourDesired(0,0,0); back = ColourDesired(0xff,0xff,0xff); + alpha = SC_ALPHA_NOALPHA; delete pxpm; pxpm = NULL; return *this; Modified: trunk/scintilla/PlatGTK.cxx =================================================================== --- trunk/scintilla/PlatGTK.cxx 2006-06-21 18:54:07 UTC (rev 470) +++ trunk/scintilla/PlatGTK.cxx 2006-06-21 23:15:54 UTC (rev 471) @@ -794,7 +794,7 @@ void SurfaceImpl::SetConverter(int characterSet_) { if (characterSet != characterSet_) { characterSet = characterSet_; - conv.Open("UTF-8", CharacterSetID(characterSet)); + conv.Open("UTF-8", CharacterSetID(characterSet), false); } } #endif @@ -1016,6 +1016,8 @@ } } +#if GTK_MAJOR_VERSION >= 2 + // Plot a point into a guint32 buffer symetrically to all 4 qudrants static void AllFour(guint32 *pixels, int stride, int width, int height, int x, int y, guint32 val) { pixels[y*stride+x] = val; @@ -1036,6 +1038,8 @@ return co & 0xff; } +#endif + #if GTK_MAJOR_VERSION < 2 void SurfaceImpl::AlphaRectangle(PRectangle rc, int , ColourAllocated , int , ColourAllocated outline, int , int ) { if (gc && drawable) { @@ -1290,7 +1294,7 @@ int wclen; if (et == UTF8) { wclen = UCS2FromUTF8(s, len, - reinterpret_cast<wchar_t *>(wctext), maxLengthTextRun - 1); + static_cast<wchar_t *>(static_cast<void *>(wctext)), maxLengthTextRun - 1); } else { // dbcs, so convert using current locale char sMeasure[maxLengthTextRun]; memcpy(sMeasure, s, len); @@ -1396,7 +1400,7 @@ // Convert to UTF-8 so can ask Pango for widths, then // Loop through UTF-8 and DBCS forms, taking account of different // character byte lengths. - Converter convMeasure("UCS-2", CharacterSetID(characterSet)); + Converter convMeasure("UCS-2", CharacterSetID(characterSet), false); pango_layout_set_text(layout, utfForm, strlen(utfForm)); int i = 0; int utfIndex = 0; @@ -1465,7 +1469,7 @@ int wclen; if (et == UTF8) { wclen = UCS2FromUTF8(s, len, - reinterpret_cast<wchar_t *>(wctext), maxLengthTextRun - 1); + static_cast<wchar_t *>(static_cast<void *>(wctext)), maxLengthTextRun - 1); } else { // dbcsMode, so convert using current locale char sDraw[maxLengthTextRun]; memcpy(sDraw, s, len); @@ -1550,7 +1554,8 @@ #endif if (et == UTF8) { GdkWChar wctext[maxLengthTextRun]; - size_t wclen = UCS2FromUTF8(s, len, (wchar_t *)wctext, sizeof(wctext) / sizeof(GdkWChar) - 1); + size_t wclen = UCS2FromUTF8(s, len, static_cast<wchar_t *>(static_cast<void *>(wctext)), + sizeof(wctext) / sizeof(GdkWChar) - 1); wctext[wclen] = L'\0'; return gdk_text_width_wc(PFont(font_)->pfont, wctext, wclen); } else { @@ -1972,12 +1977,12 @@ scheme that it would use if it had the focus. */ static void StyleSet(GtkWidget *w, GtkStyle*, void*) { GtkStyle* style; - + g_return_if_fail(w != NULL); - + /* Copy the selected color to active. Note that the modify calls will cause recursive calls to this function after the value is updated and w->style to - be set to a new object */ + be set to a new object */ style = gtk_widget_get_style(w); if (style == NULL) return; @@ -2010,17 +2015,18 @@ #if GTK_MAJOR_VERSION < 2 list = gtk_clist_new(1); - gtk_widget_show(PWidget(list)); - gtk_container_add(GTK_CONTAINER(PWidget(scroller)), PWidget(list)); - gtk_clist_set_column_auto_resize(GTK_CLIST(PWidget(list)), 0, TRUE); - gtk_clist_set_selection_mode(GTK_CLIST(PWidget(list)), GTK_SELECTION_BROWSE); - gtk_signal_connect(GTK_OBJECT(PWidget(list)), "unselect_row", + GtkWidget *wid = PWidget(list); // No code inside the GTK_OBJECT macro + gtk_widget_show(wid); + gtk_container_add(GTK_CONTAINER(PWidget(scroller)), wid); + gtk_clist_set_column_auto_resize(GTK_CLIST(wid), 0, TRUE); + gtk_clist_set_selection_mode(GTK_CLIST(wid), GTK_SELECTION_BROWSE); + gtk_signal_connect(GTK_OBJECT(wid), "unselect_row", GTK_SIGNAL_FUNC(UnselectionAC), &current); - gtk_signal_connect(GTK_OBJECT(PWidget(list)), "select_row", + gtk_signal_connect(GTK_OBJECT(wid), "select_row", GTK_SIGNAL_FUNC(SelectionAC), &current); - gtk_signal_connect(GTK_OBJECT(PWidget(list)), "button_press_event", + gtk_signal_connect(GTK_OBJECT(wid), "button_press_event", GTK_SIGNAL_FUNC(ButtonPress), this); - gtk_clist_set_shadow_type(GTK_CLIST(PWidget(list)), GTK_SHADOW_NONE); + gtk_clist_set_shadow_type(GTK_CLIST(wid), GTK_SHADOW_NONE); #else /* Tree and its model */ GtkListStore *store = @@ -2054,11 +2060,12 @@ gtk_tree_view_append_column(GTK_TREE_VIEW(list), column); if (g_object_class_find_property(G_OBJECT_GET_CLASS(list), "fixed-height-mode")) g_object_set(G_OBJECT(list), "fixed-height-mode", TRUE, NULL); - gtk_container_add(GTK_CONTAINER(PWidget(scroller)), PWidget(list)); - gtk_widget_show(PWidget(list)); - gtk_signal_connect(GTK_OBJECT(PWidget(list)), "button_press_event", - GTK_SIGNAL_FUNC(ButtonPress), this); + GtkWidget *wid = PWidget(list); // No code inside the G_OBJECT macro + gtk_container_add(GTK_CONTAINER(PWidget(scroller)), wid); + gtk_widget_show(wid); + g_signal_connect(G_OBJECT(wid), "button_press_event", + G_CALLBACK(ButtonPress), this); #endif gtk_widget_realize(PWidget(id)); } @@ -2478,7 +2485,11 @@ void Menu::Destroy() { if (id) +#if GTK_MAJOR_VERSION < 2 gtk_object_unref(GTK_OBJECT(id)); +#else + g_object_unref(G_OBJECT(id)); +#endif id = 0; } @@ -2573,16 +2584,18 @@ #ifdef G_OS_WIN32 return "Lucida Console"; #else - - return "!Sans"; //fix for GTK2.8 until updating to sci 1.69 +#ifdef USE_PANGO + return "!Sans"; +#else + return "lucidatypewriter"; #endif +#endif } int Platform::DefaultFontSize() { #ifdef G_OS_WIN32 return 10; #else - return 12; #endif } @@ -2619,7 +2632,6 @@ return false; } -#if GTK_MAJOR_VERSION < 2 int Platform::DBCSCharLength(int, const char *s) { int bytes = mblen(s, MB_CUR_MAX); if (bytes >= 1) @@ -2627,24 +2639,6 @@ else return 1; } -#else -int Platform::DBCSCharLength(int codePage, const char *s) { - if (codePage == 999932) { - // Experimental and disabled code - change 999932 to 932 above to - // enable locale avoiding but expensive character length determination. - // Avoid locale with explicit use of iconv - Converter convMeasure("UCS-2", CharacterSetID(SC_CHARSET_SHIFTJIS)); - size_t lenChar = MultiByteLenFromIconv(convMeasure, s, strlen(s)); - return lenChar; - } else { - int bytes = mblen(s, MB_CUR_MAX); - if (bytes >= 1) - return bytes; - else - return 1; - } -} -#endif int Platform::DBCSCharMaxLength() { return MB_CUR_MAX; Modified: trunk/scintilla/ScintillaBase.cxx =================================================================== --- trunk/scintilla/ScintillaBase.cxx 2006-06-21 18:54:07 UTC (rev 470) +++ trunk/scintilla/ScintillaBase.cxx 2006-06-21 23:15:54 UTC (rev 471) @@ -469,7 +469,7 @@ int styleStart = 0; if (start > 0) - styleStart = styler.StyleAt(start - 1); + styleStart = styler.StyleAt(start - 1) & pdoc->stylingBitsMask; styler.SetCodePage(pdoc->dbcsCodePage); if (lexCurrent && (len > 0)) { // Should always succeed as null lexer should always be available Modified: trunk/scintilla/ScintillaGTK.cxx =================================================================== --- trunk/scintilla/ScintillaGTK.cxx 2006-06-21 18:54:07 UTC (rev 470) +++ trunk/scintilla/ScintillaGTK.cxx 2006-06-21 23:15:54 UTC (rev 471) @@ -46,7 +46,7 @@ #include "gtk/gtksignal.h" #include "gtk/gtkmarshal.h" -#if GTK_MAJOR_VERSION >= 2 +#if GLIB_MAJOR_VERSION >= 2 #include "scintilla-marshal.h" #endif @@ -73,10 +73,16 @@ #pragma warning(disable: 4505) #endif -#if GTK_MAJOR_VERSION == 2 && GTK_MINOR_VERSION >= 2 +#if GTK_CHECK_VERSION(2,2,0) #define USE_GTK_CLIPBOARD #endif +#if GLIB_MAJOR_VERSION < 2 +#define OBJECT_CLASS GtkObjectClass +#else +#define OBJECT_CLASS GObjectClass +#endif + extern char *UTF8FromLatin1(const char *s, int &len); class ScintillaGTK : public ScintillaBase { @@ -107,6 +113,7 @@ static GdkAtom atomUTF8; static GdkAtom atomString; static GdkAtom atomUriList; + static GdkAtom atomDROPFILES_DND; GdkAtom atomSought; #if PLAT_GTK_WIN32 @@ -140,8 +147,7 @@ public: ScintillaGTK(_ScintillaObject *sci_); virtual ~ScintillaGTK(); - static void ClassInit(GtkObjectClass* object_class, GtkWidgetClass *widget_class, GtkContainerClass *container_class); - + static void ClassInit(OBJECT_CLASS* object_class, GtkWidgetClass *widget_class, GtkContainerClass *container_class); private: virtual void Initialise(); virtual void Finalise(); @@ -149,6 +155,7 @@ virtual void StartDrag(); int TargetAsUTF8(char *text); int EncodedFromUTF8(char *utf8, char *encoded); + virtual bool ValidCodePage(int codePage) const; public: // Public for scintilla_send_message virtual sptr_t WndProc(unsigned int iMessage, uptr_t wParam, sptr_t lParam); private: @@ -171,7 +178,6 @@ virtual void NotifyParent(SCNotification scn); void NotifyKey(int key, int modifiers); void NotifyURIDropped(const char *list); - bool UseInputMethod() const; const char *CharacterSetID() const; virtual int KeyDefault(int key, int modifiers); virtual void CopyToClipboard(const SelectionText &selectedText); @@ -222,12 +228,12 @@ static gint ScrollEvent(GtkWidget *widget, GdkEventScroll *event); #endif static gint Motion(GtkWidget *widget, GdkEventMotion *event); - gint KeyThis(GdkEventKey *event); - static gint KeyPress(GtkWidget *widget, GdkEventKey *event); - static gint KeyRelease(GtkWidget *widget, GdkEventKey *event); + gboolean KeyThis(GdkEventKey *event); + static gboolean KeyPress(GtkWidget *widget, GdkEventKey *event); + static gboolean KeyRelease(GtkWidget *widget, GdkEventKey *event); #if GTK_MAJOR_VERSION >= 2 - static gint ExposePreedit(GtkWidget *widget, GdkEventExpose *ose, ScintillaGTK *sciThis); - gint ExposePreeditThis(GtkWidget *widget, GdkEventExpose *ose); + static gboolean ExposePreedit(GtkWidget *widget, GdkEventExpose *ose, ScintillaGTK *sciThis); + gboolean ExposePreeditThis(GtkWidget *widget, GdkEventExpose *ose); static void Commit(GtkIMContext *context, char *str, ScintillaGTK *sciThis); void CommitThis(char *str); static void PreeditChanged(GtkIMContext *context, ScintillaGTK *sciThis); @@ -235,7 +241,11 @@ #endif static gint StyleSetText(GtkWidget *widget, GtkStyle *previous, void*); static gint RealizeText(GtkWidget *widget, void*); +#if GLIB_MAJOR_VERSION < 2 static void Destroy(GtkObject *object); +#else + static void Destroy(GObject *object); +#endif static void SelectionReceived(GtkWidget *widget, GtkSelectionData *selection_data, guint time); static void SelectionGet(GtkWidget *widget, GtkSelectionData *selection_data, @@ -277,7 +287,9 @@ }; static gint scintilla_signals[LAST_SIGNAL] = { 0 }; -static GtkWidgetClass* parent_class = NULL; +#if GLIB_MAJOR_VERSION < 2 +static GtkWidgetClass *parent_class = NULL; +#endif enum { TARGET_STRING, @@ -291,6 +303,7 @@ GdkAtom ScintillaGTK::atomUTF8 = 0; GdkAtom ScintillaGTK::atomString = 0; GdkAtom ScintillaGTK::atomUriList = 0; +GdkAtom ScintillaGTK::atomDROPFILES_DND = 0; static const GtkTargetEntry clipboardTargets[] = { { "text/uri-list", 0, TARGET_URI }, @@ -434,26 +447,35 @@ #else wPreedit = gtk_window_new(GTK_WINDOW_POPUP); wPreeditDraw = gtk_drawing_area_new(); - gtk_signal_connect(GTK_OBJECT(PWidget(wPreeditDraw)), "expose_event", - GtkSignalFunc(ExposePreedit), this); - gtk_container_add(GTK_CONTAINER(PWidget(wPreedit)), PWidget(wPreeditDraw)); + GtkWidget *predrw = PWidget(wPreeditDraw); // No code inside the G_OBJECT macro + g_signal_connect(G_OBJECT(predrw), "expose_event", + G_CALLBACK(ExposePreedit), this); + gtk_container_add(GTK_CONTAINER(PWidget(wPreedit)), predrw); gtk_widget_realize(PWidget(wPreedit)); - gtk_widget_realize(PWidget(wPreeditDraw)); - gtk_widget_show(PWidget(wPreeditDraw)); + gtk_widget_realize(predrw); + gtk_widget_show(predrw); im_context = gtk_im_multicontext_new(); - g_signal_connect(im_context, "commit", + g_signal_connect(G_OBJECT(im_context), "commit", G_CALLBACK(Commit), this); - g_signal_connect(im_context, "preedit_changed", + g_signal_connect(G_OBJECT(im_context), "preedit_changed", G_CALLBACK(PreeditChanged), this); gtk_im_context_set_client_window(im_context, widget->window); #endif #endif - gtk_signal_connect_after(GTK_OBJECT(PWidget(wText)), "style_set", + GtkWidget *widtxt = PWidget(wText); // // No code inside the G_OBJECT macro +#if GLIB_MAJOR_VERSION < 2 + gtk_signal_connect_after(GTK_OBJECT(widtxt), "style_set", GtkSignalFunc(ScintillaGTK::StyleSetText), NULL); - gtk_signal_connect_after(GTK_OBJECT(PWidget(wText)), "realize", + gtk_signal_connect_after(GTK_OBJECT(widtxt), "realize", GtkSignalFunc(ScintillaGTK::RealizeText), NULL); - gtk_widget_realize(PWidget(wText)); +#else + g_signal_connect_after(G_OBJECT(widtxt), "style_set", + G_CALLBACK(ScintillaGTK::StyleSetText), NULL); + g_signal_connect_after(G_OBJECT(widtxt), "realize", + G_CALLBACK(ScintillaGTK::RealizeText), NULL); +#endif + gtk_widget_realize(widtxt); gtk_widget_realize(PWidget(scrollbarv)); gtk_widget_realize(PWidget(scrollbarh)); } @@ -691,30 +713,45 @@ wText = gtk_drawing_area_new(); gtk_widget_set_parent(PWidget(wText), PWidget(wMain)); - gtk_widget_show(PWidget(wText)); - gtk_signal_connect(GTK_OBJECT(PWidget(wText)), "expose_event", + GtkWidget *widtxt = PWidget(wText); // No code inside the G_OBJECT macro + gtk_widget_show(widtxt); +#if GLIB_MAJOR_VERSION < 2 + gtk_signal_connect(GTK_OBJECT(widtxt), "expose_event", GtkSignalFunc(ScintillaGTK::ExposeText), this); - gtk_widget_set_events(PWidget(wText), GDK_EXPOSURE_MASK); +#else + g_signal_connect(G_OBJECT(widtxt), "expose_event", + G_CALLBACK(ScintillaGTK::ExposeText), this); +#endif + gtk_widget_set_events(widtxt, GDK_EXPOSURE_MASK); #if GTK_MAJOR_VERSION >= 2 // Avoid background drawing flash - gtk_widget_set_double_buffered(PWidget(wText), FALSE); + gtk_widget_set_double_buffered(widtxt, FALSE); #endif - gtk_drawing_area_size(GTK_DRAWING_AREA(PWidget(wText)), + gtk_drawing_area_size(GTK_DRAWING_AREA(widtxt), 100,100); - adjustmentv = gtk_adjustment_new(0.0, 0.0, 201.0, 1.0, 20.0, 20.0); scrollbarv = gtk_vscrollbar_new(GTK_ADJUSTMENT(adjustmentv)); GTK_WIDGET_UNSET_FLAGS(PWidget(scrollbarv), GTK_CAN_FOCUS); - gtk_signal_connect(GTK_OBJECT(adjustmentv), "value_changed", - GTK_SIGNAL_FUNC(ScrollSignal), this); +#if GLIB_MAJOR_VERSION < 2 + gtk_signal_connect(adjustmentv, "value_changed", + GtkSignalFunc(ScrollSignal), this); +#else + g_signal_connect(G_OBJECT(adjustmentv), "value_changed", + G_CALLBACK(ScrollSignal), this); +#endif gtk_widget_set_parent(PWidget(scrollbarv), PWidget(wMain)); gtk_widget_show(PWidget(scrollbarv)); adjustmenth = gtk_adjustment_new(0.0, 0.0, 101.0, 1.0, 20.0, 20.0); scrollbarh = gtk_hscrollbar_new(GTK_ADJUSTMENT(adjustmenth)); GTK_WIDGET_UNSET_FLAGS(PWidget(scrollbarh), GTK_CAN_FOCUS); - gtk_signal_connect(GTK_OBJECT(adjustmenth), "value_changed", - GTK_SIGNAL_FUNC(ScrollHSignal), this); +#if GLIB_MAJOR_VERSION < 2 + gtk_signal_connect(adjustmenth, "value_changed", + GtkSignalFunc(ScrollHSignal), this); +#else + g_signal_connect(G_OBJECT(adjustmenth), "value_changed", + G_CALLBACK(ScrollHSignal), this); +#endif gtk_widget_set_parent(PWidget(scrollbarh), PWidget(wMain)); gtk_widget_show(PWidget(scrollbarh)); @@ -752,8 +789,6 @@ static const GtkTargetEntry targets[] = { { "UTF8_STRING", 0, TARGET_UTF8_STRING }, { "STRING", 0, TARGET_STRING }, - // { "TEXT", 0, TARGET_TEXT }, - // { "COMPOUND_TEXT", 0, TARGET_COMPOUND_TEXT }, }; static const gint n_targets = sizeof(targets) / sizeof(targets[0]); GtkTargetList *tl = gtk_target_list_new(targets, n_targets); @@ -765,10 +800,11 @@ } #ifdef USE_CONVERTER -static char *ConvertText(int *lenResult, char *s, size_t len, const char *charSetDest, const char *charSetSource) { +static char *ConvertText(int *lenResult, char *s, size_t len, const char *charSetDest, + const char *charSetSource, bool transliterations) { *lenResult = 0; char *destForm = 0; - Converter conv(charSetDest, charSetSource); + Converter conv(charSetDest, charSetSource, transliterations); if (conv) { destForm = new char[len*3+1]; char *pin = s; @@ -816,7 +852,7 @@ pdoc->GetCharRange(s, targetStart, targetLength); //~ fprintf(stderr, " \"%s\"\n", s); if (text) { - char *tmputf = ConvertText(&targetLength, s, targetLength, "UTF-8", charSetBuffer); + char *tmputf = ConvertText(&targetLength, s, targetLength, "UTF-8", charSetBuffer, false); memcpy(text, tmputf, targetLength); delete []tmputf; //~ fprintf(stderr, " \"%s\"\n", text); @@ -853,7 +889,7 @@ if (*charSetBuffer) { //~ fprintf(stderr, "Encode %s %d\n", charSetBuffer, inputLength); int outLength = 0; - char *tmpEncoded = ConvertText(&outLength, utf8, inputLength, charSetBuffer, "UTF-8"); + char *tmpEncoded = ConvertText(&outLength, utf8, inputLength, charSetBuffer, "UTF-8", true); if (tmpEncoded) { //~ fprintf(stderr, " \"%s\"\n", tmpEncoded); if (encoded) { @@ -874,6 +910,10 @@ return 0; } +bool ScintillaGTK::ValidCodePage(int codePage) const { + return codePage == 0 || codePage == SC_CP_UTF8 || codePage == SC_CP_DBCS; +} + sptr_t ScintillaGTK::WndProc(unsigned int iMessage, uptr_t wParam, sptr_t lParam) { switch (iMessage) { @@ -1126,20 +1166,37 @@ } void ScintillaGTK::NotifyChange() { +#if GLIB_MAJOR_VERSION < 2 gtk_signal_emit(GTK_OBJECT(sci), scintilla_signals[COMMAND_SIGNAL], Platform::LongFromTwoShorts(GetCtrlID(), SCEN_CHANGE), PWidget(wMain)); +#else + g_signal_emit(G_OBJECT(sci), scintilla_signals[COMMAND_SIGNAL], 0, + Platform::LongFromTwoShorts(GetCtrlID(), SCEN_CHANGE), PWidget(wMain)); +#endif } void ScintillaGTK::NotifyFocus(bool focus) { +#if GLIB_MAJOR_VERSION < 2 gtk_signal_emit(GTK_OBJECT(sci), scintilla_signals[COMMAND_SIGNAL], - Platform::LongFromTwoShorts(GetCtrlID(), focus ? SCEN_SETFOCUS : SCEN_KILLFOCUS), PWidget(wMain)); + Platform::LongFromTwoShorts + (GetCtrlID(), focus ? SCEN_SETFOCUS : SCEN_KILLFOCUS), PWidget(wMain)); +#else + g_signal_emit(G_OBJECT(sci), scintilla_signals[COMMAND_SIGNAL], 0, + Platform::LongFromTwoShorts + (GetCtrlID(), focus ? SCEN_SETFOCUS : SCEN_KILLFOCUS), PWidget(wMain)); +#endif } void ScintillaGTK::NotifyParent(SCNotification scn) { scn.nmhdr.hwndFrom = PWidget(wMain); scn.nmhdr.idFrom = GetCtrlID(); +#if GLIB_MAJOR_VERSION < 2 gtk_signal_emit(GTK_OBJECT(sci), scintilla_signals[NOTIFY_SIGNAL], GetCtrlID(), &scn); +#else + g_signal_emit(G_OBJECT(sci), scintilla_signals[NOTIFY_SIGNAL], 0, + GetCtrlID(), &scn); +#endif } void ScintillaGTK::NotifyKey(int key, int modifiers) { @@ -1159,117 +1216,19 @@ NotifyParent(scn); } -bool ScintillaGTK::UseInputMethod() const { - switch (vs.styles[STYLE_DEFAULT].characterSet) { - case SC_CHARSET_CHINESEBIG5: - case SC_CHARSET_GB2312: - case SC_CHARSET_HANGUL: - case SC_CHARSET_SHIFTJIS: - case SC_CHARSET_JOHAB: - case SC_CHARSET_HEBREW: - case SC_CHARSET_ARABIC: - case SC_CHARSET_VIETNAMESE: - case SC_CHARSET_THAI: - return true; - default: - return false; - } -} - const char *CharacterSetID(int characterSet); const char *ScintillaGTK::CharacterSetID() const { return ::CharacterSetID(vs.styles[STYLE_DEFAULT].characterSet); } -#if GTK_MAJOR_VERSION >= 2 -#define IS_ACC(x) \ - ((x) >= 65103 && (x) <= 65111) -#define IS_CHAR(x) \ - ((x) >= 0 && (x) <= 128) - -#define IS_ACC_OR_CHAR(x) \ - (IS_CHAR(x) || IS_ACC(x)) - -static int MakeAccent(int key, int acc) { - const char *conv[] = { - "aeiounc AEIOUNC", - "\xE3ei\xF5u\xF1c~\xC3EI\xD5U\xD1C", - "\xE1\xE9\xED\xF3\xFAn\xE7'\xC1\xC9\xCD\xD3\xDAN\xC7", - "\xE0\xE8\xEC\xF2\xF9nc`\xC0\xC8\xCC\xD2\xD9NC", - "\xE2\xEA\xEE\xF4\xFBnc^\xC2\xCA\xCE\xD4\xDBNC", - "\xE4\xEB\xEF\xF6\xFCnc\xA8\xC4\xCB\xCF\xD6\xDCNC" - }; - int idx; - for (idx = 0; idx < 15; ++idx) { - if (char(key) == conv[0][idx]) { - break; - } - } - if (idx == 15) { - return key; - } - if (acc == GDK_dead_tilde) { // ~ - return int((unsigned char)(conv[1][idx])); - } else if (acc == GDK_dead_acute) { // ' - return int((unsigned char)(conv[2][idx])); - } else if (acc == GDK_dead_grave) { // ` - return int((unsigned char)(conv[3][idx])); - } else if (acc == GDK_dead_circumflex) { // ^ - return int((unsigned char)(conv[4][idx])); - } else if (acc == GDK_dead_diaeresis) { // " - return int((unsigned char)(conv[5][idx])); - } - return key; -} -#endif - int ScintillaGTK::KeyDefault(int key, int modifiers) { if (!(modifiers & SCI_CTRL) && !(modifiers & SCI_ALT)) { -#if GTK_MAJOR_VERSION >= 2 - if (!UseInputMethod()) { - char utfVal[4]="\0\0\0"; - wchar_t wcs[2]; - if (IS_CHAR(key) && IS_ACC(lastKey)) { - lastKey = key = MakeAccent(key, lastKey); - } - if (IS_ACC_OR_CHAR(key)) { - lastKey = key; - } - wcs[0] = gdk_keyval_to_unicode(key); - wcs[1] = 0; - UTF8FromUCS2(wcs, 1, utfVal, 3); - if (key <= 0xFE00) { - if (IsUnicodeMode()) { - AddCharUTF(utfVal,strlen(utfVal)); - return 1; - } else { - const char *source = CharacterSetID(); - if (*source) { - Converter conv(source, "UTF-8"); - if (conv) { - char localeVal[4]="\0\0\0"; - char *pin = utfVal; - size_t inLeft = strlen(utfVal); - char *pout = localeVal; - size_t outLeft = sizeof(localeVal); - size_t conversions = conv.Convert(&pin, &inLeft, &pout, &outLeft); - if (conversions != ((size_t)(-1))) { - *pout = '\0'; - for (int i=0; localeVal[i]; i++) { - AddChar(localeVal[i]); - } - return 1; - } - } - } - } - } - } -#endif if (key < 256) { - AddChar(key); - return 1; + NotifyKey(key, modifiers); + return 0; + //~ AddChar(key); + //~ return 1; } else { // Pass up to container in case it is an accelerator NotifyKey(key, modifiers); @@ -1344,12 +1303,20 @@ if (!ct.wCallTip.Created()) { ct.wCallTip = gtk_window_new(GTK_WINDOW_POPUP); ct.wDraw = gtk_drawing_area_new(); - gtk_container_add(GTK_CONTAINER(PWidget(ct.wCallTip)), PWidget(ct.wDraw)); - gtk_signal_connect(GTK_OBJECT(PWidget(ct.wDraw)), "expose_event", + GtkWidget *widcdrw = PWidget(ct.wDraw); // // No code inside the G_OBJECT macro + gtk_container_add(GTK_CONTAINER(PWidget(ct.wCallTip)), widcdrw); +#if GLIB_MAJOR_VERSION < 2 + gtk_signal_connect(GTK_OBJECT(widcdrw), "expose_event", GtkSignalFunc(ScintillaGTK::ExposeCT), &ct); - gtk_signal_connect(GTK_OBJECT(PWidget(ct.wDraw)), "button_press_event", + gtk_signal_connect(GTK_OBJECT(widcdrw), "button_press_event", GtkSignalFunc(ScintillaGTK::PressCT), static_cast<void *>(this)); - gtk_widget_set_events(PWidget(ct.wDraw), +#else + g_signal_connect(G_OBJECT(widcdrw), "expose_event", + G_CALLBACK(ScintillaGTK::ExposeCT), &ct); + g_signal_connect(G_OBJECT(widcdrw), "button_press_event", + G_CALLBACK(ScintillaGTK::PressCT), static_cast<void *>(this)); +#endif + gtk_widget_set_events(widcdrw, GDK_EXPOSURE_MASK | GDK_BUTTON_PRESS_MASK); } gtk_drawing_area_size(GTK_DRAWING_AREA(PWidget(ct.wDraw)), @@ -1452,7 +1419,7 @@ if (!IsUnicodeMode() && *charSetBuffer) { //fprintf(stderr, "Convert to locale %s\n", CharacterSetID()); // Convert to locale - dest = ConvertText(&len, selText.s, selText.len, charSetBuffer, "UTF-8"); + dest = ConvertText(&len, selText.s, selText.len, charSetBuffer, "UTF-8", true); selText.Set(dest, len, pdoc->dbcsCodePage, vs.styles[STYLE_DEFAULT].characterSet, selText.rectangular); } @@ -1485,7 +1452,7 @@ SetEmptySelection(currentPos + selText.len); } pdoc->EndUndoAction(); - EnsureCaretVisible(); + EnsureCaretVisible(); } } // else fprintf(stderr, "Target non string %d %d\n", (int)(selection_data->type), @@ -1495,7 +1462,7 @@ void ScintillaGTK::ReceivedDrop(GtkSelectionData *selection_data) { dragWasDropped = true; - if (selection_data->type == atomUriList) { + if (selection_data->type == atomUriList || selection_data->type == atomDROPFILES_DND) { char *ptr = new char[selection_data->length + 1]; ptr[selection_data->length] = '\0'; memcpy(ptr, selection_data->data, selection_data->length); @@ -1508,7 +1475,7 @@ DropAt(posDrop, selText.s, false, selText.rectangular); } } else if (selection_data->length > 0) { - fprintf(stderr, "ReceivedDrop other %p\n", static_cast<void *>(selection_data->type)); + //~ fprintf(stderr, "ReceivedDrop other %p\n", static_cast<void *>(selection_data->type)); } Redraw(); } @@ -1516,6 +1483,20 @@ void ScintillaGTK::GetSelection(GtkSelectionData *selection_data, guint info, SelectionText *text) { +#if PLAT_GTK_WIN32 + // Many native win32 programs require \n line endings, so make a copy of + // the clip text now with newlines converted. Use { } to hide symbols + // from code below + SelectionText *newline_normalized = NULL; + { + int tmpstr_len; + char *tmpstr = Document::TransformLineEnds(&tmpstr_len, text->s, text->len, SC_EOL_LF); + newline_normalized = new SelectionText(); + newline_normalized->Set(tmpstr, tmpstr_len, SC_CP_UTF8, 0, text->rectangular); + text = newline_normalized; + } +#endif + #if GTK_MAJOR_VERSION >= 2 // Convert text to utf8 if it isn't already SelectionText *converted = 0; @@ -1523,7 +1504,7 @@ const char *charSet = ::CharacterSetID(text->characterSet); if (*charSet) { int new_len; - char* tmputf = ConvertText(&new_len, text->s, text->len, "UTF-8", charSet); + char* tmputf = ConvertText(&new_len, text->s, text->len, "UTF-8", charSet, false); converted = new SelectionText(); converted->Set(tmputf, new_len, SC_CP_UTF8, 0, text->rectangular); text = converted; @@ -1555,15 +1536,6 @@ #else /* Gtk 1 */ char *selBuffer = text->s; -#if PLAT_GTK_WIN32 - - // Many native win32 programs require \n line endings, - // so make a copy of the clip text now with newlines converted - - int new_len; - char *tmpstr = Document::TransformLineEnds(&new_len, selBuffer, text->len, SC_EOL_LF); - selBuffer = tmpstr; -#endif char *tmputf = 0; if ((info == TARGET_UTF8_STRING) || (info == TARGET_STRING)) { int len = strlen(selBuffer); @@ -1575,14 +1547,14 @@ if (text->codePage != SC_CP_UTF8) { // Convert to UTF-8 //fprintf(stderr, "Convert to UTF-8 from %s\n", charSetBuffer); - tmputf = ConvertText(&len, selBuffer, len, "UTF-8", charSetBuffer); + tmputf = ConvertText(&len, selBuffer, len, "UTF-8", charSetBuffer, false); selBuffer = tmputf; } } else if (info == TARGET_STRING) { if (text->codePage == SC_CP_UTF8) { //fprintf(stderr, "Convert to locale %s\n", charSetBuffer); // Convert to locale - tmputf = ConvertText(&len, selBuffer, len, charSetBuffer, "UTF-8"); + tmputf = ConvertText(&len, selBuffer, len, charSetBuffer, "UTF-8", true); selBuffer = tmputf; } } @@ -1617,10 +1589,11 @@ } delete []tmputf; +#endif /* Gtk >= 2 */ + #if PLAT_GTK_WIN32 - delete []tmpstr; + delete newline_normalized; #endif -#endif /* Gtk >= 2 */ } #ifdef USE_GTK_CLIPBOARD @@ -1971,14 +1944,12 @@ } } -gint ScintillaGTK::KeyThis(GdkEventKey *event) { - //Platform::DebugPrintf("SC-key: %d %x [%s]\n", +gboolean ScintillaGTK::KeyThis(GdkEventKey *event) { + //fprintf(stderr, "SC-key: %d %x [%s]\n", // event->keyval, event->state, (event->length > 0) ? event->string : "empty"); #if GTK_MAJOR_VERSION >= 2 - if (UseInputMethod()) { - if (gtk_im_context_filter_keypress(im_context, event)) { - return 1; - } + if (gtk_im_context_filter_keypress(im_context, event)) { + return 1; } #endif if (!event->keyval) { @@ -1988,7 +1959,7 @@ bool shift = (event->state & GDK_SHIFT_MASK) != 0; bool ctrl = (event->state & GDK_CONTROL_MASK) != 0; bool alt = (event->state & GDK_MOD1_MASK) != 0; - int key = event->keyval; + guint key = event->keyval; if (ctrl && (key < 128)) key = toupper(key); else if (!ctrl && (key >= GDK_KP_Multiply && key <= GDK_KP_9)) @@ -2008,7 +1979,7 @@ bool added = KeyDown(key, shift, ctrl, alt, &consumed) != 0; if (!consumed) consumed = added; - //Platform::DebugPrintf("SK-key: %d %x %x\n",event->keyval, event->state, consumed); + //fprintf(stderr, "SK-key: %d %x %x\n",event->keyval, event->state, consumed); if (event->keyval == 0xffffff && event->length > 0) { ClearSelection(); if (pdoc->InsertString(CurrentPosition(), event->string)) { @@ -2018,22 +1989,22 @@ return consumed; } -gint ScintillaGTK::KeyPress(GtkWidget *widget, GdkEventKey *event) { +gboolean ScintillaGTK::KeyPress(GtkWidget *widget, GdkEventKey *event) { ScintillaGTK *sciThis = ScintillaFromWidget(widget); return sciThis->KeyThis(event); } -gint ScintillaGTK::KeyRelease(GtkWidget *, GdkEventKey * /*event*/) { +gboolean ScintillaGTK::KeyRelease(GtkWidget *, GdkEventKey * /*event*/) { //Platform::DebugPrintf("SC-keyrel: %d %x %3s\n",event->keyval, event->state, event->string); return FALSE; } #if GTK_MAJOR_VERSION >= 2 -gint ScintillaGTK::ExposePreedit(GtkWidget *widget, GdkEventExpose *ose, ScintillaGTK *sciThis) { +gboolean ScintillaGTK::ExposePreedit(GtkWidget *widget, GdkEventExpose *ose, ScintillaGTK *sciThis) { return sciThis->ExposePreeditThis(widget, ose); } -gint ScintillaGTK::ExposePreeditThis(GtkWidget *widget, GdkEventExpose *ose) { +gboolean ScintillaGTK::ExposePreeditThis(GtkWidget *widget, GdkEventExpose *ose) { gchar *str; gint cursor_pos; PangoAttrList *attrs; @@ -2067,8 +2038,32 @@ sciThis->CommitThis(str); } -void ScintillaGTK::CommitThis(char *str) { - AddCharUTF(str, strlen(str)); +void ScintillaGTK::CommitThis(char *utfVal) { + //~ fprintf(stderr, "Commit '%s'\n", utfVal); + if (IsUnicodeMode()) { + AddCharUTF(utfVal,strlen(utfVal)); + } else { + const char *source = CharacterSetID(); + if (*source) { + Converter conv(source, "UTF-8", true); + if (conv) { + char localeVal[4]="\0\0\0"; + char *pin = utfVal; + size_t inLeft = strlen(utfVal); + char *pout = localeVal; + size_t outLeft = sizeof(localeVal); + size_t conversions = conv.Convert(&pin, &inLeft, &pout, &outLeft); + if (conversions != ((size_t)(-1))) { + *pout = '\0'; + for (int i=0; localeVal[i]; i++) { + AddChar(localeVal[i]); + } + } else { + fprintf(stderr, "Conversion failed '%s'\n", utfVal); + } + } + } + } } void ScintillaGTK::PreeditChanged(GtkIMContext *, ScintillaGTK *sciThis) { @@ -2121,7 +2116,12 @@ return FALSE; } -void ScintillaGTK::Destroy(GtkObject* object) { +#if GLIB_MAJOR_VERSION < 2 +void ScintillaGTK::Destroy(GtkObject *object) +#else +void ScintillaGTK::Destroy(GObject *object) +#endif +{ ScintillaObject *scio = reinterpret_cast<ScintillaObject *>(object); // This avoids a double destruction if (!scio->pscin) @@ -2130,8 +2130,12 @@ //Platform::DebugPrintf("Destroying %x %x\n", sciThis, object); sciThis->Finalise(); +#if GLIB_MAJOR_VERSION < 2 if (GTK_OBJECT_CLASS(parent_class)->destroy) (* GTK_OBJECT_CLASS(parent_class)->destroy)(object); +#else + // IS ANYTHING NEEDED ? +#endif delete sciThis; scio->pscin = 0; @@ -2193,7 +2197,7 @@ paintState = notPainting; if (rgnUpdate) { - g_free(rgnUpdate); + gdk_region_destroy(rgnUpdate); } rgnUpdate = 0; @@ -2446,6 +2450,7 @@ extern void Platform_Initialise(); extern void Platform_Finalise(); +#if GLIB_MAJOR_VERSION < 2 GtkType scintilla_get_type() { static GtkType scintilla_type = 0; @@ -2467,26 +2472,60 @@ return scintilla_type; } +#else +GType scintilla_get_type() { + static GType scintilla_type = 0; -void ScintillaGTK::ClassInit(GtkObjectClass* object_class, GtkWidgetClass *widget_class, GtkContainerClass *container_class) { + if (!scintilla_type) { + scintilla_type = g_type_from_name("Scintilla"); + if (!scintilla_type) { + static GTypeInfo scintilla_info = { + (guint16) sizeof (ScintillaClass), + NULL, //(GBaseInitFunc) + NULL, //(GBaseFinalizeFunc) + (GClassInitFunc) scintilla_class_init, + NULL, //(GClassFinalizeFunc) + NULL, //gconstpointer data + (guint16) sizeof (ScintillaObject), + 0, //n_preallocs + (GInstanceInitFunc) scintilla_init, + NULL //(GTypeValueTable*) + }; + + scintilla_type = g_type_register_static( + GTK_TYPE_CONTAINER, "Scintilla", &scintilla_info, (GTypeFlags) 0); + } + } + + return scintilla_type; +} +#endif + +void ScintillaGTK::ClassInit(OBJECT_CLASS* object_class, GtkWidgetClass *widget_class, GtkContainerClass *container_class) { +#if GLIB_MAJOR_VERSION >= 2 + Platform_Initialise(); +#endif atomClipboard = gdk_atom_intern("CLIPBOARD", FALSE); atomUTF8 = gdk_atom_intern("UTF8_STRING", FALSE); atomString = GDK_SELECTION_TYPE_STRING; atomUriList = gdk_atom_intern("text/uri-list", FALSE); + atomDROPFILES_DND = gdk_atom_intern("DROPFILES_DND", FALSE); // Define default signal handlers for the class: Could move more // of the signal handlers here (those that currently attached to wDraw // in Initialise() may require coordinate translation?) +#if GLIB_MAJOR_VERSION < 2 object_class->destroy = Destroy; - +#else + object_class->finalize = Destroy; +#endif widget_class->size_request = SizeRequest; widget_class->size_allocate = SizeAllocate; widget_class->expose_event = ExposeMain; #if GTK_MAJOR_VERSION < 2 widget_class->draw = Draw; #endif - widget_class->motion_notify_event = Motion; widget_class->button_press_event = Press; widget_class->button_release_event = MouseRelease; @@ -2519,19 +2558,21 @@ container_class->forall = MainForAll; } -#if GTK_MAJOR_VERSION < 2 +#if GLIB_MAJOR_VERSION < 2 #define GTK_CLASS_TYPE(c) (c->type) #define SIG_MARSHAL gtk_marshal_NONE__INT_POINTER +#define MARSHAL_ARGUMENTS GTK_TYPE_INT, GTK_TYPE_POINTER #else #define SIG_MARSHAL scintilla_marshal_NONE__INT_POINTER +#define MARSHAL_ARGUMENTS G_TYPE_INT, G_TYPE_POINTER #endif -#define MARSHAL_ARGUMENTS GTK_TYPE_INT, GTK_TYPE_POINTER static void scintilla_class_init(ScintillaClass *klass) { - GtkObjectClass *object_class = (GtkObjectClass*) klass; + OBJECT_CLASS *object_class = (OBJECT_CLASS*) klass; GtkWidgetClass *widget_class = (GtkWidgetClass*) klass; GtkContainerClass *container_class = (GtkContainerClass*) klass; +#if GLIB_MAJOR_VERSION < 2 parent_class = (GtkWidgetClass*) gtk_type_class(gtk_container_get_type()); scintilla_signals[COMMAND_SIGNAL] = gtk_signal_new( @@ -2551,9 +2592,31 @@ SIG_MARSHAL, GTK_TYPE_NONE, 2, MARSHAL_ARGUMENTS); -#if GTK_MAJOR_VERSION < 2 gtk_object_class_add_signals(object_class, reinterpret_cast<unsigned int *>(scintilla_signals), LAST_SIGNAL); +#else + GSignalFlags sigflags = GSignalFlags(G_SIGNAL_ACTION | G_SIGNAL_RUN_LAST); + scintilla_signals[COMMAND_SIGNAL] = g_signal_new( + "command", + G_TYPE_FROM_CLASS(object_class), + sigflags, + G_STRUCT_OFFSET(ScintillaClass, command), + NULL, //(GSignalAccumulator) + NULL, //(gpointer) + SIG_MARSHAL, + G_TYPE_NONE, + 2, MARSHAL_ARGUMENTS); + + scintilla_signals[NOTIFY_SIGNAL] = g_signal_new( + SCINTILLA_NOTIFY, + G_TYPE_FROM_CLASS(object_class), + sigflags, + G_STRUCT_OFFSET(ScintillaClass, notify), + NULL, + NULL, + SIG_MARSHAL, + G_TYPE_NONE, + 2, MARSHAL_ARGUMENTS); #endif klass->command = NULL; klass->notify = NULL; @@ -2567,7 +2630,11 @@ } GtkWidget* scintilla_new() { +#if GLIB_MAJOR_VERSION < 2 return GTK_WIDGET(gtk_type_new(scintilla_get_type())); +#else + return GTK_WIDGET(g_object_new(scintilla_get_type(), NULL)); +#endif } void scintilla_set_id(ScintillaObject *sci, uptr_t id) { Modified: trunk/scintilla/ViewStyle.cxx =================================================================== --- trunk/scintilla/ViewStyle.cxx 2006-06-21 18:54:07 UTC (rev 470) +++ trunk/scintilla/ViewStyle.cxx 2006-06-21 23:15:54 UTC (rev 471) @@ -17,7 +17,7 @@ #include "ViewStyle.h" MarginStyle::MarginStyle() : - symbol(false), width(16), mask(0xffffffff), sensitive(false) { + style(SC_MARGIN_SYMBOL), width(0), mask(0), sensitive(false) { } // A list of the fontnames - avoids wasting space in each style @@ -73,6 +73,7 @@ selbackset = source.selbackset; selbackground.desired = source.selbackground.desired; selbackground2.desired = source.selbackground2.desired; + selAlpha = source.selAlpha; foldmarginColourSet = source.foldmarginColourSet; foldmarginColour.desired = source.foldmarginColour.desired; @@ -141,6 +142,7 @@ selbackset = true; selbackground.desired = ColourDesired(0xc0, 0xc0, 0xc0); selbackground2.desired = ColourDesired(0xb0, 0xb0, 0xb0); + selAlpha = SC_ALPHA_NOALPHA; foldmarginColourSet = false; foldmarginColour.desired = ColourDesired(0xff, 0, 0); @@ -173,13 +175,13 @@ leftMarginWidth = 1; rightMarginWidth = 1; - ms[0].symbol = false; + ms[0].style = SC_MARGIN_NUMBER; ms[0].width = 0; ms[0].mask = 0; - ms[1].symbol = true; + ms[1].style = SC_MARGIN_SYMBOL; ms[1].width = 16; ms[1].mask = ~SC_MASK_FOLDERS; - ms[2].symbol = true; + ms[2].style = SC_MARGIN_SYMBOL; ms[2].width = 0; ms[2].mask = 0; fixedColumnWidth = leftMarginWidth; @@ -187,7 +189,7 @@ maskInLine = 0xffffffff; for (int margin=0; margin < margins; margin++) { fixedColumnWidth += ms[margin].width; - symbolMargin = symbolMargin || ms[margin].symbol; + symbolMargin = symbolMargin || (ms[margin].style != SC_MARGIN_NUMBER); if (ms[margin].width > 0) maskInLine &= ~ms[margin].mask; } @@ -258,7 +260,7 @@ maskInLine = 0xffffffff; for (int margin=0; margin < margins; margin++) { fixedColumnWidth += ms[margin].width; - symbolMargin = symbolMargin || ms[margin].symbol; + symbolMargin = symbolMargin || (ms[margin].style != SC_MARGIN_NUMBER); if (ms[margin].width > 0) maskInLine &= ~ms[margin].mask; } Modified: trunk/scintilla/ViewStyle.h =================================================================== --- trunk/scintilla/ViewStyle.h 2006-06-21 18:54:07 UTC (rev 470) +++ trunk/scintilla/ViewStyle.h 2006-06-21 23:15:54 UTC (rev 471) @@ -12,7 +12,7 @@ */ class MarginStyle { public: - bool symbol; + int style; int width; int mask; bool sensitive; @@ -53,6 +53,7 @@ bool selbackset; ColourPair selbackground; ColourPair selbackground2; + int selAlpha; bool whitespaceForegroundSet; ColourPair whitespaceForeground; bool whitespaceBackgroundSet; @@ -70,7 +71,7 @@ bool hotspotUnderline; bool hotspotSingleLine; /// Margins are ordered: Line Numbers, Selection Margin, Spacing Margin - enum { margins=3 }; + enum { margins=5 }; int leftMarginWidth; ///< Spacing margin on left of text int rightMarginWidth; ///< Spacing margin on left of text bool symbolMargin; Modified: trunk/scintilla/include/HFacer.py =================================================================== --- trunk/scintilla/include/HFacer.py 2006-06-21 18:54:07 UTC (rev 470) +++ trunk/scintilla/include/HFacer.py 2006-06-21 23:15:54 UTC (rev 471) @@ -67,6 +67,10 @@ os.rename(tempname, filename) f = Face.Face() -f.ReadFromFile("Scintilla.iface") -Regenerate("Scintilla.h", printHFile, f) -Regenerate("SciLexer.h", printLexHFile, f) +try: + f.ReadFromFile("Scintilla.iface") + Regenerate("Scintilla.h", printHFile, f) + Regenerate("SciLexer.h", printLexHFile, f) + print "Maximum ID is", max(x for x in f.values if int(x) < 3000) +except: + raise Modified: trunk/scintilla/include/SciLexer.h =================================================================== --- trunk/scintilla/include/SciLexer.h 2006-06-21 18:54:07 UTC (rev 470) +++ trunk/scintilla/include/SciLexer.h 2006-06-21 23:15:54 UTC (rev 471) @@ -90,7 +90,8 @@ #define SCLEX_FREEBASIC 75 #define SCLEX_INNOSETUP 76 #define SCLEX_OPAL 77 -#define SCLEX_OMS 78 +#define SCLEX_SPICE 78 +#define SCLEX_OMS 79 #define SCLEX_AUTOMATIC 1000 #define SCE_P_DEFAULT 0 #define SCE_P_COMMENTLINE 1 @@ -148,6 +149,8 @@ #define SCE_TCL_WORD6 17 #define SCE_TCL_WORD7 18 #define SCE_TCL_WORD8 19 +#define SCE_TCL_COMMENT_BOX 20 +#define SCE_TCL_BLOCK_COMMENT 21 #define SCE_H_DEFAULT 0 #define SCE_H_TAG 1 #define SCE_H_TAGUNKNOWN 2 @@ -819,6 +822,7 @@ #define SCE_AU3_SPECIAL 12 #define SCE_AU3_EXPAND 13 #define SCE_AU3_COMOBJ 14 +#define SCE_AU3_UDF 15 #define SCE_APDL_DEFAULT 0 #define SCE_APDL_COMMENT 1 #define SCE_APDL_COMMENTBLOCK 2 @@ -1055,6 +1059,15 @@ #define SCE_OPAL_PAR 7 #define SCE_OPAL_BOOL_CONST 8 #define SCE_OPAL_DEFAULT 32 +#define SCE_SPICE_DEFAULT 0 +#define SCE_SPICE_IDENTIFIER 1 +#define SCE_SPICE_KEYWORD 2 +#define SCE_SPICE_KEYWORD2 3 +#define SCE_SPICE_KEYWORD3 4 +#define SCE_SPICE_NUMBER 5 +#define SCE_SPICE_DELIMITER 6 +#define SCE_SPICE_VALUE 7 +#define SCE_SPICE_COMMENTLINE 8 #define SCLEX_ASP 29 #define SCLEX_PHP 30 //--Autogenerated -- end of section automatically generated from Scintilla.iface Modified: trunk/scintilla/include/Scintilla.h =================================================================== --- trunk/scintilla/include/Scintilla.h 2006-06-21 18:54:07 UTC (rev 470) +++ trunk/scintilla/include/Scintilla.h 2006-06-21 23:15:54 UTC (rev 471) @@ -138,8 +138,11 @@ #define SCI_MARKERPREVIOUS 2048 #define SCI_MARKERDEFINEPIXMAP 2049 #define SCI_MARKERADDSET 2466 +#define SCI_MARKERSETALPHA 2476 #define SC_MARGIN_SYMBOL 0 #define SC_MARGIN_NUMBER 1 +#define SC_MARGIN_BACK 2 +#define SC_MARGIN_FORE 3 #define SCI_SETMARGINTYPEN 2240 #define SCI_GETMARGINTYPEN 2241 #define SCI_SETMARGINWIDTHN 2242 @@ -196,6 +199,8 @@ #define SCI_STYLESETHOTSPOT 2409 #define SCI_SETSELFORE 2067 #define SCI_SETSELBACK 2068 +#define SCI_GETSELALPHA 2477 +#define SCI_SETSELALPHA 2478 #define SCI_SETCARETFORE 2069 #define SCI_ASSIGNCMDKEY 2070 #define SCI_CLEARCMDKEY 2071 Modified: trunk/scintilla/include/ScintillaWidget.h =================================================================== --- trunk/scintilla/include/ScintillaWidget.h 2006-06-21 18:54:07 UTC (rev 470) +++ trunk/scintilla/include/ScintillaWidget.h 2006-06-21 23:15:54 UTC (rev 471) @@ -34,7 +34,11 @@ void (* notify) (ScintillaObject *ttt); }; +#if GLIB_MAJOR_VERSION < 2 GtkType scintilla_get_type (void); +#else +GType scintilla_get_type (void); +#endif GtkWidget* scintilla_new (void); void scintilla_set_id (ScintillaObject *sci, uptr_t id); sptr_t scintilla_send_message (ScintillaObject *sci,unsigned int iMessage, uptr_t wParam, sptr_t lParam); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits