2829 |
|
|
2830 |
XFlush (FRAME_X_DISPLAY (f)); |
XFlush (FRAME_X_DISPLAY (f)); |
2831 |
|
|
|
#ifdef USE_GTK |
|
|
xg_frame_cleared (f); |
|
|
#endif |
|
|
|
|
2832 |
UNBLOCK_INPUT; |
UNBLOCK_INPUT; |
2833 |
} |
} |
2834 |
|
|
4863 |
top, |
top, |
4864 |
left + VERTICAL_SCROLL_BAR_WIDTH_TRIM, |
left + VERTICAL_SCROLL_BAR_WIDTH_TRIM, |
4865 |
width - VERTICAL_SCROLL_BAR_WIDTH_TRIM * 2, |
width - VERTICAL_SCROLL_BAR_WIDTH_TRIM * 2, |
4866 |
max (height, 1), |
max (height, 1)); |
|
left, |
|
|
width); |
|
4867 |
xg_show_scroll_bar (SCROLL_BAR_X_WINDOW (bar)); |
xg_show_scroll_bar (SCROLL_BAR_X_WINDOW (bar)); |
4868 |
#else /* not USE_GTK */ |
#else /* not USE_GTK */ |
4869 |
Widget scroll_bar = SCROLL_BAR_X_WIDGET (FRAME_X_DISPLAY (f), bar); |
Widget scroll_bar = SCROLL_BAR_X_WIDGET (FRAME_X_DISPLAY (f), bar); |
5107 |
|
|
5108 |
#ifdef USE_TOOLKIT_SCROLL_BARS |
#ifdef USE_TOOLKIT_SCROLL_BARS |
5109 |
|
|
|
#ifdef USE_GTK |
|
|
if (mask) |
|
|
xg_update_scrollbar_pos (f, |
|
|
SCROLL_BAR_X_WINDOW (bar), |
|
|
top, |
|
|
sb_left + VERTICAL_SCROLL_BAR_WIDTH_TRIM, |
|
|
sb_width - VERTICAL_SCROLL_BAR_WIDTH_TRIM * 2, |
|
|
max (height, 1), |
|
|
left, |
|
|
width); |
|
|
#else /* not USE_GTK */ |
|
|
|
|
5110 |
/* Move/size the scroll bar widget. */ |
/* Move/size the scroll bar widget. */ |
5111 |
if (mask) |
if (mask) |
5112 |
{ |
{ |
5115 |
if (width > 0 && height > 0) |
if (width > 0 && height > 0) |
5116 |
x_clear_area (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f), |
x_clear_area (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f), |
5117 |
left, top, width, height, False); |
left, top, width, height, False); |
5118 |
|
#ifdef USE_GTK |
5119 |
|
xg_update_scrollbar_pos (f, |
5120 |
|
SCROLL_BAR_X_WINDOW (bar), |
5121 |
|
top, |
5122 |
|
sb_left + VERTICAL_SCROLL_BAR_WIDTH_TRIM, |
5123 |
|
sb_width - VERTICAL_SCROLL_BAR_WIDTH_TRIM *2, |
5124 |
|
max (height, 1)); |
5125 |
|
#else /* not USE_GTK */ |
5126 |
XtConfigureWidget (SCROLL_BAR_X_WIDGET (FRAME_X_DISPLAY (f), bar), |
XtConfigureWidget (SCROLL_BAR_X_WIDGET (FRAME_X_DISPLAY (f), bar), |
5127 |
sb_left + VERTICAL_SCROLL_BAR_WIDTH_TRIM, |
sb_left + VERTICAL_SCROLL_BAR_WIDTH_TRIM, |
5128 |
top, |
top, |
5129 |
sb_width - VERTICAL_SCROLL_BAR_WIDTH_TRIM * 2, |
sb_width - VERTICAL_SCROLL_BAR_WIDTH_TRIM * 2, |
5130 |
max (height, 1), 0); |
max (height, 1), 0); |
|
} |
|
5131 |
#endif /* not USE_GTK */ |
#endif /* not USE_GTK */ |
5132 |
|
} |
5133 |
#else /* not USE_TOOLKIT_SCROLL_BARS */ |
#else /* not USE_TOOLKIT_SCROLL_BARS */ |
5134 |
|
|
5135 |
/* Clear areas not covered by the scroll bar because of |
/* Clear areas not covered by the scroll bar because of |
8036 |
if (FRAME_X_DISPLAY_INFO (f) == dpyinfo) |
if (FRAME_X_DISPLAY_INFO (f) == dpyinfo) |
8037 |
{ |
{ |
8038 |
FRAME_XIC (f) = NULL; |
FRAME_XIC (f) = NULL; |
8039 |
if (FRAME_XIC_FONTSET (f)) |
xic_free_xfontset (f); |
|
{ |
|
|
XFreeFontSet (FRAME_X_DISPLAY (f), FRAME_XIC_FONTSET (f)); |
|
|
FRAME_XIC_FONTSET (f) = NULL; |
|
|
} |
|
8040 |
} |
} |
8041 |
} |
} |
8042 |
|
|