projects
/
chise
/
xemacs-chise.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
XEmacs 21.4.5 "Civil Service".
[chise/xemacs-chise.git]
/
src
/
glyphs-x.c
diff --git
a/src/glyphs-x.c
b/src/glyphs-x.c
index
0451996
..
ae7d3be
100644
(file)
--- a/
src/glyphs-x.c
+++ b/
src/glyphs-x.c
@@
-703,7
+703,7
@@
write_lisp_string_to_temp_file (Lisp_Object string, char *filename_out)
/* Get the data while doing the conversion */
while (1)
{
/* Get the data while doing the conversion */
while (1)
{
- ssize_t size_in_bytes = Lstream_read (istr, tempbuf, sizeof (tempbuf));
+ Lstream_data_count size_in_bytes = Lstream_read (istr, tempbuf, sizeof (tempbuf));
if (!size_in_bytes)
break;
/* It does seem the flushes are necessary... */
if (!size_in_bytes)
break;
/* It does seem the flushes are necessary... */
@@
-798,7
+798,7
@@
generate_cursor_fg_bg (Lisp_Object device, Lisp_Object *foreground,
else
{
xbg->pixel = 0;
else
{
xbg->pixel = 0;
- xbg->red = xbg->green = xbg->blue = ~0;
+ xbg->red = xbg->green = xbg->blue = USHRT_MAX;
}
}
}
}
@@
-2228,8
+2228,14
@@
x_redisplay_widget (Lisp_Image_Instance *p)
/* Possibly update the colors and font */
if (IMAGE_INSTANCE_WIDGET_FACE_CHANGED (p)
||
/* Possibly update the colors and font */
if (IMAGE_INSTANCE_WIDGET_FACE_CHANGED (p)
||
+ /* #### This is not sufficient because it will not cope with widgets
+ that are not currently visible. Once redisplay has done the
+ visible ones it will clear this flag so that when new ones
+ become visible they will not be updated. */
XFRAME (IMAGE_INSTANCE_FRAME (p))->faces_changed
||
XFRAME (IMAGE_INSTANCE_FRAME (p))->faces_changed
||
+ XFRAME (IMAGE_INSTANCE_FRAME (p))->frame_changed
+ ||
IMAGE_INSTANCE_WIDGET_ITEMS_CHANGED (p))
{
update_widget_face (wv, p, IMAGE_INSTANCE_FRAME (p));
IMAGE_INSTANCE_WIDGET_ITEMS_CHANGED (p))
{
update_widget_face (wv, p, IMAGE_INSTANCE_FRAME (p));
@@
-2772,7
+2778,7
@@
x_tab_control_redisplay (Lisp_Object image_instance)
but I couldn't find it. */
Lisp_Object old_selected =gui_item_list_find_selected
(XCDR (IMAGE_INSTANCE_WIDGET_ITEMS (ii)));
but I couldn't find it. */
Lisp_Object old_selected =gui_item_list_find_selected
(XCDR (IMAGE_INSTANCE_WIDGET_ITEMS (ii)));
- Arg al [1];
+ Arg al [2];
char* name;
unsigned int num_children, i;
Widget* children;
char* name;
unsigned int num_children, i;
Widget* children;
@@
-2788,7
+2794,9
@@
x_tab_control_redisplay (Lisp_Object image_instance)
if (!strcmp (XtName (children [i]), name))
{
XtSetArg (al [0], XtNtopWidget, children [i]);
if (!strcmp (XtName (children [i]), name))
{
XtSetArg (al [0], XtNtopWidget, children [i]);
- XtSetValues (IMAGE_INSTANCE_X_WIDGET_ID (ii), al, 1);
+ XtSetArg (al [1], XtNhighlightWidget,
+ children [i]);
+ XtSetValues (IMAGE_INSTANCE_X_WIDGET_ID (ii), al, 2);
break;
}
}
break;
}
}