* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
-#undef GDK_DISABLE_DEPRECATED
-#undef GTK_DISABLE_DEPRECATED
+#include "config.h"
-#include <config.h>
#include <ctype.h>
#include <string.h>
+
+#undef GDK_DISABLE_DEPRECATED
+
#include "gdk/gdkkeysyms.h"
#include "gdk/gdki18n.h"
+
+#undef GTK_DISABLE_DEPRECATED
+
#include "gtkmain.h"
#include "gtkmarshalers.h"
#include "gtkselection.h"
#include "gtksignal.h"
#include "gtkstyle.h"
-#include "gtkobject.h"
#define GTK_ENABLE_BROKEN
#include "gtktext.h"
#include "line-wrap.xbm"
#include "line-arrow.xbm"
#include "gtkprivate.h"
#include "gtkintl.h"
+
#include "gtkalias.h"
#define TEXT_SHOW_ADJ(text,adj,msg)
#endif
-/* Memory Management. */
-static GMemChunk *params_mem_chunk = NULL;
-static GMemChunk *text_property_chunk = NULL;
-
static GtkWidgetClass *parent_class = NULL;
-
-static const GtkTextFunction control_keys[26] =
-{
- (GtkTextFunction)gtk_text_move_beginning_of_line, /* a */
- (GtkTextFunction)gtk_text_move_backward_character, /* b */
- (GtkTextFunction)gtk_editable_copy_clipboard, /* c */
- (GtkTextFunction)gtk_text_delete_forward_character, /* d */
- (GtkTextFunction)gtk_text_move_end_of_line, /* e */
- (GtkTextFunction)gtk_text_move_forward_character, /* f */
- NULL, /* g */
- (GtkTextFunction)gtk_text_delete_backward_character, /* h */
- NULL, /* i */
- NULL, /* j */
- (GtkTextFunction)gtk_text_delete_to_line_end, /* k */
- NULL, /* l */
- NULL, /* m */
- (GtkTextFunction)gtk_text_move_next_line, /* n */
- NULL, /* o */
- (GtkTextFunction)gtk_text_move_previous_line, /* p */
- NULL, /* q */
- NULL, /* r */
- NULL, /* s */
- NULL, /* t */
- (GtkTextFunction)gtk_text_delete_line, /* u */
- (GtkTextFunction)gtk_editable_paste_clipboard, /* v */
- (GtkTextFunction)gtk_text_delete_backward_word, /* w */
- (GtkTextFunction)gtk_editable_cut_clipboard, /* x */
- NULL, /* y */
- NULL, /* z */
-};
-
-static const GtkTextFunction alt_keys[26] =
-{
- NULL, /* a */
- (GtkTextFunction)gtk_text_move_backward_word, /* b */
- NULL, /* c */
- (GtkTextFunction)gtk_text_delete_forward_word, /* d */
- NULL, /* e */
- (GtkTextFunction)gtk_text_move_forward_word, /* f */
- NULL, /* g */
- NULL, /* h */
- NULL, /* i */
- NULL, /* j */
- NULL, /* k */
- NULL, /* l */
- NULL, /* m */
- NULL, /* n */
- NULL, /* o */
- NULL, /* p */
- NULL, /* q */
- NULL, /* r */
- NULL, /* s */
- NULL, /* t */
- NULL, /* u */
- NULL, /* v */
- NULL, /* w */
- NULL, /* x */
- NULL, /* y */
- NULL, /* z */
-};
-
-
/**********************************************************************/
/* Widget Crap */
/**********************************************************************/
(GtkClassInitFunc) NULL,
};
- static const GInterfaceInfo editable_info =
+ const GInterfaceInfo editable_info =
{
(GInterfaceInitFunc) gtk_text_editable_init, /* interface_init */
NULL, /* interface_finalize */
GTK_PARAM_READWRITE));
widget_class->set_scroll_adjustments_signal =
- gtk_signal_new (I_("set_scroll_adjustments"),
+ gtk_signal_new (I_("set-scroll-adjustments"),
GTK_RUN_LAST,
GTK_CLASS_TYPE (object_class),
GTK_SIGNAL_OFFSET (GtkTextClass, set_scroll_adjustments),
text->freeze_count = 0;
- if (!params_mem_chunk)
- params_mem_chunk = g_mem_chunk_new ("LineParams",
- sizeof (LineParams),
- 256 * sizeof (LineParams),
- G_ALLOC_AND_FREE);
-
text->default_tab_width = 4;
text->tab_stops = NULL;
if (vadj)
g_return_val_if_fail (GTK_IS_ADJUSTMENT (vadj), NULL);
- text = gtk_widget_new (GTK_TYPE_TEXT,
+ text = g_object_new (GTK_TYPE_TEXT,
"hadjustment", hadj,
"vadjustment", vadj,
NULL);
gtk_widget_queue_draw (GTK_WIDGET (text));
}
- g_object_notify (G_OBJECT (text), "word_wrap");
+ g_object_notify (G_OBJECT (text), "word-wrap");
}
void
gtk_widget_queue_draw (GTK_WIDGET (text));
}
- g_object_notify (G_OBJECT (text), "line_wrap");
+ g_object_notify (G_OBJECT (text), "line-wrap");
}
void
if (text->hadj && (text->hadj != hadj))
{
gtk_signal_disconnect_by_data (GTK_OBJECT (text->hadj), text);
- gtk_object_unref (GTK_OBJECT (text->hadj));
+ g_object_unref (text->hadj);
}
if (text->vadj && (text->vadj != vadj))
{
gtk_signal_disconnect_by_data (GTK_OBJECT (text->vadj), text);
- gtk_object_unref (GTK_OBJECT (text->vadj));
+ g_object_unref (text->vadj);
}
g_object_freeze_notify (G_OBJECT (text));
if (text->hadj != hadj)
{
text->hadj = hadj;
- gtk_object_ref (GTK_OBJECT (text->hadj));
- gtk_object_sink (GTK_OBJECT (text->hadj));
+ g_object_ref_sink (text->hadj);
gtk_signal_connect (GTK_OBJECT (text->hadj), "changed",
- (GtkSignalFunc) gtk_text_adjustment,
+ G_CALLBACK (gtk_text_adjustment),
text);
- gtk_signal_connect (GTK_OBJECT (text->hadj), "value_changed",
- (GtkSignalFunc) gtk_text_adjustment,
+ gtk_signal_connect (GTK_OBJECT (text->hadj), "value-changed",
+ G_CALLBACK (gtk_text_adjustment),
text);
gtk_signal_connect (GTK_OBJECT (text->hadj), "destroy",
- (GtkSignalFunc) gtk_text_adjustment_destroyed,
+ G_CALLBACK (gtk_text_adjustment_destroyed),
text);
gtk_text_adjustment (hadj, text);
if (text->vadj != vadj)
{
text->vadj = vadj;
- gtk_object_ref (GTK_OBJECT (text->vadj));
- gtk_object_sink (GTK_OBJECT (text->vadj));
+ g_object_ref_sink (text->vadj);
gtk_signal_connect (GTK_OBJECT (text->vadj), "changed",
- (GtkSignalFunc) gtk_text_adjustment,
+ G_CALLBACK (gtk_text_adjustment),
text);
- gtk_signal_connect (GTK_OBJECT (text->vadj), "value_changed",
- (GtkSignalFunc) gtk_text_adjustment,
+ gtk_signal_connect (GTK_OBJECT (text->vadj), "value-changed",
+ G_CALLBACK (gtk_text_adjustment),
text);
gtk_signal_connect (GTK_OBJECT (text->vadj), "destroy",
- (GtkSignalFunc) gtk_text_adjustment_destroyed,
+ G_CALLBACK (gtk_text_adjustment_destroyed),
text);
gtk_text_adjustment (vadj, text);
g_free (text->text.ch);
text->text.wc = g_new (GdkWChar, INITIAL_BUFFER_SIZE);
text->text_len = INITIAL_BUFFER_SIZE;
- if (text->scratch_buffer.ch)
- g_free (text->scratch_buffer.ch);
+ g_free (text->scratch_buffer.ch);
text->scratch_buffer.wc = NULL;
text->scratch_buffer_len = 0;
}
gtk_text_forward_delete (GtkText *text,
guint nchars)
{
- guint old_lines, old_height;
+ guint old_lines = 0, old_height = 0;
GtkOldEditable *old_editable = GTK_OLD_EDITABLE (text);
gboolean frozen = FALSE;
guchar ch;
ch = text->text.ch[end_pos];
text->text.ch[end_pos] = 0;
- retval = g_strdup (text->text.ch + start_pos);
+ retval = g_strdup ((gchar *)(text->text.ch + start_pos));
text->text.ch[end_pos] = ch;
}
static void
gtk_text_destroy (GtkObject *object)
{
- GtkText *text;
-
- g_return_if_fail (GTK_IS_TEXT (object));
-
- text = GTK_TEXT (object);
+ GtkText *text = GTK_TEXT (object);
if (text->hadj)
{
gtk_signal_disconnect_by_data (GTK_OBJECT (text->hadj), text);
- gtk_object_unref (GTK_OBJECT (text->hadj));
+ g_object_unref (text->hadj);
text->hadj = NULL;
}
if (text->vadj)
{
gtk_signal_disconnect_by_data (GTK_OBJECT (text->vadj), text);
- gtk_object_unref (GTK_OBJECT (text->vadj));
+ g_object_unref (text->vadj);
text->vadj = NULL;
}
static void
gtk_text_finalize (GObject *object)
{
- GtkText *text;
+ GtkText *text = GTK_TEXT (object);
GList *tmp_list;
-
- g_return_if_fail (GTK_IS_TEXT (object));
-
- text = GTK_TEXT (object);
/* Clean up the internal structures */
if (text->use_wchar)
if (text->use_wchar)
{
- if (text->scratch_buffer.wc)
- g_free (text->scratch_buffer.wc);
+ g_free (text->scratch_buffer.wc);
}
else
{
- if (text->scratch_buffer.ch)
- g_free (text->scratch_buffer.ch);
+ g_free (text->scratch_buffer.ch);
}
g_list_free (text->tab_stops);
static void
gtk_text_realize (GtkWidget *widget)
{
- GtkText *text;
- GtkOldEditable *old_editable;
+ GtkText *text = GTK_TEXT (widget);
+ GtkOldEditable *old_editable = GTK_OLD_EDITABLE (widget);
GdkWindowAttr attributes;
gint attributes_mask;
-
- g_return_if_fail (GTK_IS_TEXT (widget));
-
- text = GTK_TEXT (widget);
- old_editable = GTK_OLD_EDITABLE (widget);
+
GTK_WIDGET_SET_FLAGS (text, GTK_REALIZED);
attributes.window_type = GDK_WINDOW_CHILD;
text->text_area = gdk_window_new (widget->window, &attributes, attributes_mask);
gdk_window_set_user_data (text->text_area, text);
- gdk_cursor_destroy (attributes.cursor); /* The X server will keep it around as long as necessary */
+ gdk_cursor_unref (attributes.cursor); /* The X server will keep it around as long as necessary */
widget->style = gtk_style_attach (widget->style, widget->window);
if (text->bg_gc)
{
- gdk_gc_destroy (text->bg_gc);
+ g_object_unref (text->bg_gc);
text->bg_gc = NULL;
}
static void
gtk_text_unrealize (GtkWidget *widget)
{
- GtkText *text;
-
- g_return_if_fail (GTK_IS_TEXT (widget));
-
- text = GTK_TEXT (widget);
+ GtkText *text = GTK_TEXT (widget);
gdk_window_set_user_data (text->text_area, NULL);
gdk_window_destroy (text->text_area);
text->text_area = NULL;
- gdk_gc_destroy (text->gc);
+ g_object_unref (text->gc);
text->gc = NULL;
if (text->bg_gc)
{
- gdk_gc_destroy (text->bg_gc);
+ g_object_unref (text->bg_gc);
text->bg_gc = NULL;
}
- gdk_pixmap_unref (text->line_wrap_bitmap);
- gdk_pixmap_unref (text->line_arrow_bitmap);
+ g_object_unref (text->line_wrap_bitmap);
+ g_object_unref (text->line_arrow_bitmap);
unrealize_properties (text);
free_cache (text);
- if (GTK_WIDGET_CLASS (parent_class)->unrealize)
- (* GTK_WIDGET_CLASS (parent_class)->unrealize) (widget);
+ GTK_WIDGET_CLASS (parent_class)->unrealize (widget);
}
static void
if (widget->style->bg_pixmap[GTK_STATE_NORMAL])
{
- gdk_window_get_size (widget->style->bg_pixmap[GTK_STATE_NORMAL], &width, &height);
+ gdk_drawable_get_size (widget->style->bg_pixmap[GTK_STATE_NORMAL], &width, &height);
gdk_gc_set_ts_origin (text->bg_gc,
(- text->first_onscreen_hor_pixel + xthick) % width,
gint ythickness;
gint char_height;
gint char_width;
-
- g_return_if_fail (GTK_IS_TEXT (widget));
- g_return_if_fail (requisition != NULL);
-
+
xthickness = widget->style->xthickness + TEXT_BORDER_ROOM;
ythickness = widget->style->ythickness + TEXT_BORDER_ROOM;
gtk_text_size_allocate (GtkWidget *widget,
GtkAllocation *allocation)
{
- GtkText *text;
- GtkOldEditable *old_editable;
-
- g_return_if_fail (GTK_IS_TEXT (widget));
- g_return_if_fail (allocation != NULL);
-
- text = GTK_TEXT (widget);
- old_editable = GTK_OLD_EDITABLE (widget);
-
+ GtkText *text = GTK_TEXT (widget);
+
widget->allocation = *allocation;
if (GTK_WIDGET_REALIZED (widget))
{
gtk_text_expose (GtkWidget *widget,
GdkEventExpose *event)
{
- g_return_val_if_fail (GTK_IS_TEXT (widget), FALSE);
- g_return_val_if_fail (event != NULL, FALSE);
-
if (event->window == GTK_TEXT (widget)->text_area)
{
TDEBUG (("in gtk_text_expose (expose)\n"));
gint x, y;
GdkModifierType mask;
- GDK_THREADS_ENTER ();
-
text = GTK_TEXT (data);
text->timer = 0;
gdk_event_free (event);
}
- GDK_THREADS_LEAVE ();
-
return FALSE;
}
gtk_text_button_press (GtkWidget *widget,
GdkEventButton *event)
{
- GtkText *text;
- GtkOldEditable *old_editable;
-
- g_return_val_if_fail (GTK_IS_TEXT (widget), FALSE);
- g_return_val_if_fail (event != NULL, FALSE);
-
- text = GTK_TEXT (widget);
- old_editable = GTK_OLD_EDITABLE (widget);
+ GtkText *text = GTK_TEXT (widget);
+ GtkOldEditable *old_editable = GTK_OLD_EDITABLE (widget);
if (text->button && (event->button != text->button))
return FALSE;
}
gtk_selection_convert (widget, GDK_SELECTION_PRIMARY,
- gdk_atom_intern ("UTF8_STRING", FALSE),
+ gdk_atom_intern_static_string ("UTF8_STRING"),
event->time);
}
else
gtk_text_button_release (GtkWidget *widget,
GdkEventButton *event)
{
- GtkText *text;
+ GtkText *text = GTK_TEXT (widget);
GtkOldEditable *old_editable;
GdkDisplay *display;
- g_return_val_if_fail (GTK_IS_TEXT (widget), FALSE);
- g_return_val_if_fail (event != NULL, FALSE);
-
- text = GTK_TEXT (widget);
-
gtk_grab_remove (widget);
if (text->button != event->button)
gtk_text_motion_notify (GtkWidget *widget,
GdkEventMotion *event)
{
- GtkText *text;
+ GtkText *text = GTK_TEXT (widget);
gint x, y;
gint height;
GdkModifierType mask;
-
- g_return_val_if_fail (GTK_IS_TEXT (widget), FALSE);
- g_return_val_if_fail (event != NULL, FALSE);
-
- text = GTK_TEXT (widget);
-
+
x = event->x;
y = event->y;
mask = event->state;
!(mask & (GDK_BUTTON1_MASK | GDK_BUTTON3_MASK)))
return FALSE;
- gdk_window_get_size (text->text_area, NULL, &height);
+ gdk_drawable_get_size (text->text_area, NULL, &height);
if ((y < 0) || (y > height))
{
if (text->timer == 0)
{
- text->timer = g_timeout_add (SCROLL_TIME,
+ text->timer = gdk_threads_add_timeout (SCROLL_TIME,
gtk_text_scroll_timeout,
text);
gint start_pos,
gint end_pos)
{
- GtkText *text;
+ GtkText *text = GTK_TEXT (editable);
g_return_if_fail (start_pos >= 0);
-
- text = GTK_TEXT (editable);
-
+
gtk_text_set_point (text, start_pos);
if (end_pos < 0)
end_pos = TEXT_LENGTH (text);
gtk_text_key_press (GtkWidget *widget,
GdkEventKey *event)
{
- GtkText *text;
- GtkOldEditable *old_editable;
+ GtkText *text = GTK_TEXT (widget);
+ GtkOldEditable *old_editable = GTK_OLD_EDITABLE (widget);
gchar key;
gint return_val;
gint position;
-
- g_return_val_if_fail (GTK_IS_TEXT (widget), FALSE);
- g_return_val_if_fail (event != NULL, FALSE);
-
- text = GTK_TEXT (widget);
- old_editable = GTK_OLD_EDITABLE (widget);
-
+
key = event->keyval;
return_val = TRUE;
case GDK_KP_Down:
case GDK_Down: scroll_int (text, +KEY_SCROLL_PIXELS); break;
case GDK_Return:
+ case GDK_ISO_Enter:
case GDK_KP_Enter:
if (event->state & GDK_CONTROL_MASK)
gtk_signal_emit_by_name (GTK_OBJECT (text), "activate");
gtk_editable_insert_text (GTK_EDITABLE (old_editable), "\t", 1, &position);
break;
case GDK_KP_Enter:
+ case GDK_ISO_Enter:
case GDK_Return:
if (event->state & GDK_CONTROL_MASK)
gtk_signal_emit_by_name (GTK_OBJECT (text), "activate");
if (event->state & GDK_CONTROL_MASK)
{
+ return_val = TRUE;
if ((key >= 'A') && (key <= 'Z'))
key -= 'A' - 'a';
-
- if ((key >= 'a') && (key <= 'z') && control_keys[(int) (key - 'a')])
+
+ switch (key)
{
- (* control_keys[(int) (key - 'a')]) (old_editable, event->time);
- return_val = TRUE;
+ case 'a':
+ gtk_text_move_beginning_of_line (text);
+ break;
+ case 'b':
+ gtk_text_move_backward_character (text);
+ break;
+ case 'c':
+ gtk_editable_copy_clipboard (GTK_EDITABLE (text));
+ break;
+ case 'd':
+ gtk_text_delete_forward_character (text);
+ break;
+ case 'e':
+ gtk_text_move_end_of_line (text);
+ break;
+ case 'f':
+ gtk_text_move_forward_character (text);
+ break;
+ case 'h':
+ gtk_text_delete_backward_character (text);
+ break;
+ case 'k':
+ gtk_text_delete_to_line_end (text);
+ break;
+ case 'n':
+ gtk_text_move_next_line (text);
+ break;
+ case 'p':
+ gtk_text_move_previous_line (text);
+ break;
+ case 'u':
+ gtk_text_delete_line (text);
+ break;
+ case 'v':
+ gtk_editable_paste_clipboard (GTK_EDITABLE (text));
+ break;
+ case 'w':
+ gtk_text_delete_backward_word (text);
+ break;
+ case 'x':
+ gtk_editable_cut_clipboard (GTK_EDITABLE (text));
+ break;
+ default:
+ return_val = FALSE;
}
-
+
break;
}
else if (event->state & GDK_MOD1_MASK)
{
+ return_val = TRUE;
if ((key >= 'A') && (key <= 'Z'))
key -= 'A' - 'a';
- if ((key >= 'a') && (key <= 'z') && alt_keys[(int) (key - 'a')])
+ switch (key)
{
- (* alt_keys[(int) (key - 'a')]) (old_editable, event->time);
- return_val = TRUE;
+ case 'b':
+ gtk_text_move_backward_word (text);
+ break;
+ case 'd':
+ gtk_text_delete_forward_word (text);
+ break;
+ case 'f':
+ gtk_text_move_forward_word (text);
+ break;
+ default:
+ return_val = FALSE;
}
break;
{
tab_cont->pixel_offset = 0;
tab_cont->tab_start.tab_stops = text->tab_stops;
- tab_cont->tab_start.to_next_tab = (gulong) text->tab_stops->data;
+ tab_cont->tab_start.to_next_tab = (gintptr) text->tab_stops->data;
if (!tab_cont->tab_start.to_next_tab)
tab_cont->tab_start.to_next_tab = text->default_tab_width;
for (;;)
{
if (alloc)
- lp = g_chunk_new (LineParams, params_mem_chunk);
+ lp = g_slice_new (LineParams);
else
lp = &lpbuf;
static void
fetch_lines_backward (GtkText* text)
{
- GList* new_lines = NULL, *new_line_start;
+ GList *new_line_start;
GtkPropertyMark mark;
if (CACHE_DATA(text->line_start_cache).start.index == 0)
CACHE_DATA(text->line_start_cache).start.index - 1,
&CACHE_DATA(text->line_start_cache).start);
- new_line_start = new_lines = fetch_lines (text, &mark, NULL, FetchLinesCount, 1);
+ new_line_start = fetch_lines (text, &mark, NULL, FetchLinesCount, 1);
while (new_line_start->next)
new_line_start = new_line_start->next;
new_pixels = total_line_height (text, new_line, 1);
- gdk_window_get_size (text->text_area, &width, &height);
+ gdk_drawable_get_size (text->text_area, &width, &height);
if (old_pixels != new_pixels)
{
if (!widget->style->bg_pixmap[GTK_STATE_NORMAL])
{
- gdk_draw_pixmap (text->text_area,
- text->gc,
- text->text_area,
- 0,
- pixel_height + old_pixels,
- 0,
- pixel_height + new_pixels,
- width,
- height);
+ gdk_draw_drawable (text->text_area,
+ text->gc,
+ text->text_area,
+ 0,
+ pixel_height + old_pixels,
+ 0,
+ pixel_height + new_pixels,
+ width,
+ height);
}
text->vadj->upper += new_pixels;
text->vadj->upper -= old_pixels;
new_pixels = total_line_height (text, new_lines, new_line_count);
- gdk_window_get_size (text->text_area, &width, &height);
+ gdk_drawable_get_size (text->text_area, &width, &height);
if (old_pixels != new_pixels)
{
if (!widget->style->bg_pixmap[GTK_STATE_NORMAL])
{
- gdk_draw_pixmap (text->text_area,
- text->gc,
- text->text_area,
- 0,
- pixel_height + old_pixels,
- 0,
- pixel_height + new_pixels,
- width,
- height + (old_pixels - new_pixels) - pixel_height);
+ gdk_draw_drawable (text->text_area,
+ text->gc,
+ text->text_area,
+ 0,
+ pixel_height + old_pixels,
+ 0,
+ pixel_height + new_pixels,
+ width,
+ height + (old_pixels - new_pixels) - pixel_height);
}
text->vadj->upper += new_pixels;
{
TextProperty *prop;
- if (text_property_chunk == NULL)
- {
- text_property_chunk = g_mem_chunk_new ("text property mem chunk",
- sizeof(TextProperty),
- 1024*sizeof(TextProperty),
- G_ALLOC_AND_FREE);
- }
-
- prop = g_chunk_new(TextProperty, text_property_chunk);
+ prop = g_slice_new (TextProperty);
prop->flags = 0;
if (font)
if (prop->font)
text_font_unref (prop->font);
- g_mem_chunk_free (text_property_chunk, prop);
+ g_slice_free (TextProperty, prop);
}
/* Flop the memory between the point and the gap around like a
scroll_int (text, - LINE_HEIGHT(CACHE_DATA(text->line_start_cache->next)));
}
- gdk_window_get_size (text->text_area, NULL, &height);
+ gdk_drawable_get_size (text->text_area, NULL, &height);
for (cache = text->line_start_cache; cache; cache = cache->next)
{
if (tab_mark->tab_stops->next)
{
tab_mark->tab_stops = tab_mark->tab_stops->next;
- tab_mark->to_next_tab = (gulong) tab_mark->tab_stops->data;
+ tab_mark->to_next_tab = (gintptr) tab_mark->tab_stops->data;
}
else
{
}
for (; cache; cache = cache->next)
- g_mem_chunk_free (params_mem_chunk, cache->data);
+ g_slice_free (LineParams, cache->data);
g_list_free (text->line_start_cache);
list = member->next;
- g_mem_chunk_free (params_mem_chunk, member->data);
+ g_slice_free (LineParams, member->data);
g_list_free_1 (member);
return list;
{
gint height;
- gdk_window_get_size (text->text_area, NULL, &height);
+ gdk_drawable_get_size (text->text_area, NULL, &height);
adj->step_increment = MIN (adj->upper, SCROLL_PIXELS);
adj->page_increment = MIN (adj->upper, height - KEY_SCROLL_PIXELS);
text->vadj->upper = data.pixel_height;
orig_value = (gint) text->vadj->value;
- gdk_window_get_size (text->text_area, NULL, &height);
+ gdk_drawable_get_size (text->text_area, NULL, &height);
text->vadj->step_increment = MIN (text->vadj->upper, SCROLL_PIXELS);
text->vadj->page_increment = MIN (text->vadj->upper, height - KEY_SCROLL_PIXELS);
text->vadj->value = MIN (text->vadj->value, upper);
text->vadj->value = MAX (text->vadj->value, 0.0);
- gtk_signal_emit_by_name (GTK_OBJECT (text->vadj), "value_changed");
+ gtk_signal_emit_by_name (GTK_OBJECT (text->vadj), "value-changed");
}
static void
GList *cache = text->line_start_cache;
gint height;
- gdk_window_get_size (text->text_area, NULL, &height);
+ gdk_drawable_get_size (text->text_area, NULL, &height);
for (; cache->next; cache = cache->next)
if (pixel_height_of(text, cache->next) > height)
real_diff += 1;
}
- gdk_window_get_size (text->text_area, &width, &height);
+ gdk_drawable_get_size (text->text_area, &width, &height);
if (height > real_diff)
- gdk_draw_pixmap (text->text_area,
- text->gc,
- text->text_area,
- 0,
- real_diff,
- 0,
- 0,
- width,
- height - real_diff);
+ gdk_draw_drawable (text->text_area,
+ text->gc,
+ text->text_area,
+ 0,
+ real_diff,
+ 0,
+ 0,
+ width,
+ height - real_diff);
rect.x = 0;
rect.y = MAX (0, height - real_diff);
real_diff += 1;
}
- gdk_window_get_size (text->text_area, &width, &height);
+ gdk_drawable_get_size (text->text_area, &width, &height);
if (height > real_diff)
- gdk_draw_pixmap (text->text_area,
- text->gc,
- text->text_area,
- 0,
- 0,
- 0,
- real_diff,
- width,
- height - real_diff);
+ gdk_draw_drawable (text->text_area,
+ text->gc,
+ text->text_area,
+ 0,
+ 0,
+ 0,
+ real_diff,
+ width,
+ height - real_diff);
rect.x = 0;
rect.y = 0;
text->cursor_pos_y += real_diff;
cursor_max = drawn_cursor_max(text);
- gdk_window_get_size (text->text_area, NULL, &height);
+ gdk_drawable_get_size (text->text_area, NULL, &height);
if (cursor_max >= height)
find_mouse_cursor (text, text->cursor_pos_x,
gint ch_width;
GdkFont *font;
- gdk_window_get_size (text->text_area, (gint*) &max_display_pixels, NULL);
+ gdk_drawable_get_size (text->text_area, (gint*) &max_display_pixels, NULL);
max_display_pixels -= LINE_WRAP_ROOM;
lp.wraps = 0;
buffer.wc, len);
else
pixel_width = gdk_text_width (gc_values.font,
- buffer.ch, len);
+ (gchar *)buffer.ch, len);
}
else
{
if (text->use_wchar)
pixel_width = gdk_text_width_wc (font, buffer.wc, len);
else
- pixel_width = gdk_text_width (font, buffer.ch, len);
+ pixel_width = gdk_text_width (font, (gchar *)buffer.ch, len);
}
draw_bg_rect (text, &mark, running_offset, pixel_start_height,
fg_gc,
running_offset,
pixel_height,
- buffer.ch,
+ (gchar *)buffer.ch,
len);
running_offset += pixel_width;
len = 1;
- gdk_window_get_size (text->text_area, &pixels_remaining, NULL);
+ gdk_drawable_get_size (text->text_area, &pixels_remaining, NULL);
pixels_remaining -= (LINE_WRAP_ROOM + running_offset);
space_width = MARK_CURRENT_TEXT_FONT(text, &mark)->char_widths[' '];
bitmap_height = line_arrow_height;
}
- gdk_window_get_size (text->text_area, &width, NULL);
+ gdk_drawable_get_size (text->text_area, &width, NULL);
width -= LINE_WRAP_ROOM;
gdk_gc_set_stipple (text->gc,
static gint
drawn_cursor_max (GtkText* text)
{
- GdkFont* font;
-
g_assert(text->cursor_mark.property);
- font = MARK_CURRENT_FONT(text, &text->cursor_mark);
-
return text->cursor_pos_y - text->cursor_char_offset;
}
{
gint width, height;
- gdk_window_get_size (widget->style->bg_pixmap[GTK_STATE_NORMAL], &width, &height);
+ gdk_drawable_get_size (widget->style->bg_pixmap[GTK_STATE_NORMAL], &width, &height);
gdk_gc_set_ts_origin (text->bg_gc,
(- text->first_onscreen_hor_pixel) % width,
gint max_y = MAX (0, area->y + area->height);
gint height;
- gdk_window_get_size (text->text_area, NULL, &height);
+ gdk_drawable_get_size (text->text_area, NULL, &height);
max_y = MIN (max_y, height);
TDEBUG (("in expose x=%d y=%d w=%d h=%d\n", area->x, area->y, area->width, area->height));
if (end_pos < start_pos)
return;
- gdk_window_get_size (text->text_area, &width, &height);
+ gdk_drawable_get_size (text->text_area, &width, &height);
area.x = 0;
area.y = -1;
area.width = width;
GTK_TEXT_INDEX (text, mark.index - 1) != LINE_DELIM)
decrement_mark (&mark);
- gdk_window_get_size (text->text_area, &width, &height);
+ gdk_drawable_get_size (text->text_area, &width, &height);
/* Fetch an entire line, to make sure that we get all the text
* we backed over above, in addition to enough text to fill up
projects / ~andy / gtk / blobdiff