ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/command.C
(Generate patch)

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.193 by root, Sun Feb 13 08:56:27 2005 UTC vs.
Revision 1.227 by root, Mon Jan 2 15:35:43 2006 UTC

… …
25 * - extensive modifications 25 * - extensive modifications
26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org> 26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org>
27 * Copyright (c) 2001 Marius Gedminas 27 * Copyright (c) 2001 Marius Gedminas
28 * - Ctrl/Mod4+Tab works like Meta+Tab (options) 28 * - Ctrl/Mod4+Tab works like Meta+Tab (options)
29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org> 29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org>
30 * Copyright (c) 2003-2004 Marc Lehmann <pcg@goof.com> 30 * Copyright (c) 2003-2005 Marc Lehmann <pcg@goof.com>
31 * 31 *
32 * This program is free software; you can redistribute it and/or modify 32 * This program is free software; you can redistribute it and/or modify
33 * it under the terms of the GNU General Public License as published by 33 * it under the terms of the GNU General Public License as published by
34 * the Free Software Foundation; either version 2 of the License, or 34 * the Free Software Foundation; either version 2 of the License, or
35 * (at your option) any later version. 35 * (at your option) any later version.
… …
43 * along with this program; if not, write to the Free Software 43 * along with this program; if not, write to the Free Software
44 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 44 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
45 *----------------------------------------------------------------------*/ 45 *----------------------------------------------------------------------*/
46 46
47/*{{{ includes: */ 47/*{{{ includes: */
48#include "../config.h" /* NECESSARY */ 48#include "../config.h"
49#include "rxvt.h" /* NECESSARY */ 49#include "rxvt.h"
50#include "rxvtperl.h"
50#include "version.h" 51#include "version.h"
51#include "command.h" 52#include "command.h"
53
54#if HAVE_SCHED_YIELD
55# include <sched.h>
56#endif
52 57
53#ifdef KEYSYM_RESOURCE 58#ifdef KEYSYM_RESOURCE
54# include "keyboard.h" 59# include "keyboard.h"
55#endif 60#endif
56 61
… …
117 XK_Escape, 0x238b, 122 XK_Escape, 0x238b,
118 XK_Undo, 0x238c, 123 XK_Undo, 0x238c,
119 XK_Print, 0x2399, 124 XK_Print, 0x2399,
120 125
121 XK_space, 0x2423, 126 XK_space, 0x2423,
127
128#ifdef XK_KP_Begin
129 XK_KP_Prior, 0x21de,
130 XK_KP_Next, 0x21df,
131 XK_KP_Begin, 0x2320,
132 XK_KP_Insert, 0x2380,
133 XK_KP_Delete, 0x2326,
122 XK_KP_Space, 0x2422, 134 XK_KP_Space, 0x2422,
135#endif
123 0, 136 0,
124}; 137};
125 138
126void 139void
127rxvt_term::iso14755_54 (int x, int y) 140rxvt_term::iso14755_54 (int x, int y)
128{ 141{
129 x = Pixel2Col (x); 142 x = Pixel2Col (x);
130 y = Pixel2Row (y); 143 y = Pixel2Row (y);
131 144
132 if (x < 0 || x >= TermWin.ncol 145 if (!IN_RANGE_EXC (x, 0, ncol)
133 || y < 0 || y >= TermWin.nrow) 146 || !IN_RANGE_EXC (y, 0, nrow))
134 return; 147 return;
135 148
136 for (;;) 149 for (;;)
137 { 150 {
138 text_t t = screen.text[y + TermWin.saveLines - TermWin.view_start][x]; 151 const line_t &l = ROW(y - view_start);
152
153 text_t t = l.t[x];
139 154
140 if (t != NOCHAR || !x) 155 if (t != NOCHAR || !x)
141 { 156 {
142 iso14755_51 (screen.text[y + TermWin.saveLines - TermWin.view_start][x], 157 iso14755_51 (l.t[x], l.r[x], x, y);
143 screen.rend[y + TermWin.saveLines - TermWin.view_start][x]);
144 iso14755buf = ISO_14755_54; 158 iso14755buf = ISO_14755_54;
145 break; 159 break;
146 } 160 }
147 161
148 x--; 162 x--;
149 } 163 }
150
151} 164}
152#endif
153 165
154#if ENABLE_OVERLAY
155void 166void
156rxvt_term::iso14755_51 (unicode_t ch, rend_t r) 167rxvt_term::iso14755_51 (unicode_t ch, rend_t r, int x, int y)
157{ 168{
158 rxvt_fontset *fs = FONTSET (r); 169 rxvt_fontset *fs = FONTSET (r);
159 rxvt_font *f = (*fs)[fs->find_font (ch)]; 170 rxvt_font *f = (*fs)[fs->find_font (ch)];
160 wchar_t *chr, *alloc, ch2; 171 wchar_t *chr, *alloc, ch2, *fname;
161 int len; 172 int len;
162 173
174 fname = rxvt_utf8towcs (f->name);
175
163#if ENABLE_COMBINING 176# if ENABLE_COMBINING
164 if (IS_COMPOSE (ch)) 177 if (IS_COMPOSE (ch))
165 { 178 {
166 len = rxvt_composite.expand (ch, 0); 179 len = rxvt_composite.expand (ch, 0);
167 alloc = chr = new wchar_t[len]; 180 alloc = chr = new wchar_t[len];
168 rxvt_composite.expand (ch, chr); 181 rxvt_composite.expand (ch, chr);
169 } 182 }
170 else 183 else
171#endif 184# endif
172 { 185 {
173 ch2 = ch; 186 ch2 = ch;
174 187
175 alloc = 0; 188 alloc = 0;
176 chr = &ch2; 189 chr = &ch2;
177 len = 1; 190 len = 1;
178 } 191 }
179 192
180 int width = strlen (f->name); 193 char attr[80]; // plenty
181 194
182 scr_overlay_new (0, -1, width < 8+5 ? 8+5 : width, len + 1); 195 sprintf (attr, "%08x = fg %d bg %d%s%s%s%s%s%s",
196 (int)r,
197 fgcolor_of (r), bgcolor_of (r),
198 r & RS_Bold ? " bold" : "",
199 r & RS_Italic ? " italic" : "",
200 r & RS_Blink ? " blink" : "",
201 r & RS_RVid ? " rvid" : "",
202 r & RS_Uline ? " uline" : "",
203 r & RS_Careful ? " careful" : "");
204
205 int width = wcswidth (fname, wcslen (fname));
206
207 max_it (width, 8+5); // for char + hey
208 max_it (width, strlen (attr));
209
210 if (y >= 0)
211 {
212 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1;
213 x = 0;
214 }
215
216 scr_overlay_new (x, y, width, len + 2);
183 217
184 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r)); 218 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));
185 219
186 for (int y = 0; y < len; y++) 220 for (int y = 0; y < len; y++)
187 { 221 {
… …
190 ch = *chr++; 224 ch = *chr++;
191 225
192 sprintf (buf, "%8x", ch); 226 sprintf (buf, "%8x", ch);
193 scr_overlay_set (0, y, buf); 227 scr_overlay_set (0, y, buf);
194 scr_overlay_set (9, y, '='); 228 scr_overlay_set (9, y, '=');
195#if !UNICODE3 229# if !UNICODE3
196 if (ch >= 0x10000) 230 if (ch >= 0x10000)
197 ch = 0xfffd; 231 ch = 0xfffd;
198#endif 232# endif
199 scr_overlay_set (11, y, ch, r); 233 scr_overlay_set (11, y, ch, r);
200 scr_overlay_set (12, y, NOCHAR, r); 234 scr_overlay_set (12, y, NOCHAR, r);
201 } 235 }
202 236
237 scr_overlay_set (0, len , attr);
203 scr_overlay_set (0, len, f->name); 238 scr_overlay_set (0, len + 1, fname);
204 239
240 free (fname);
241
205#if ENABLE_COMBINING 242# if ENABLE_COMBINING
206 if (alloc) 243 if (alloc)
207 delete [] alloc; 244 delete [] alloc;
208#endif 245# endif
209} 246}
210#endif 247#endif
211 248
212void 249void
213rxvt_term::commit_iso14755 () 250rxvt_term::commit_iso14755 ()
… …
276 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an 313 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an
277 * escape sequence to toggle the Keypad. 314 * escape sequence to toggle the Keypad.
278 * 315 *
279 * Always permit `shift' to override the current setting 316 * Always permit `shift' to override the current setting
280 */ 317 */
281 shft = (ev.state & ShiftMask); 318 shft = ev.state & ShiftMask;
282 ctrl = (ev.state & ControlMask); 319 ctrl = ev.state & ControlMask;
283 meta = (ev.state & ModMetaMask); 320 meta = ev.state & ModMetaMask;
284 321
285 if (numlock_state || (ev.state & ModNumLockMask)) 322 if (numlock_state || (ev.state & ModNumLockMask))
286 { 323 {
287 numlock_state = (ev.state & ModNumLockMask); 324 numlock_state = (ev.state & ModNumLockMask);
288 PrivMode ((!numlock_state), PrivMode_aplKP); 325 PrivMode ((!numlock_state), PrivMode_aplKP);
… …
308 345
309 // the XOpenIM manpage lies about hardcoding the locale 346 // the XOpenIM manpage lies about hardcoding the locale
310 // at the point of XOpenIM, so temporarily switch locales 347 // at the point of XOpenIM, so temporarily switch locales
311 if (rs[Rs_imLocale]) 348 if (rs[Rs_imLocale])
312 SET_LOCALE (rs[Rs_imLocale]); 349 SET_LOCALE (rs[Rs_imLocale]);
350
313 // assume wchar_t == unicode or better 351 // assume wchar_t == unicode or better
314 len = XwcLookupString (Input_Context, &ev, wkbuf, 352 len = XwcLookupString (Input_Context, &ev, wkbuf,
315 KBUFSZ, &keysym, &status_return); 353 KBUFSZ, &keysym, &status_return);
354
316 if (rs[Rs_imLocale]) 355 if (rs[Rs_imLocale])
317 SET_LOCALE (locale); 356 SET_LOCALE (locale);
318 357
319 if (status_return == XLookupChars 358 if (status_return == XLookupChars
320 || status_return == XLookupBoth) 359 || status_return == XLookupBoth)
… …
352#ifdef KEYSYM_RESOURCE 391#ifdef KEYSYM_RESOURCE
353 if (keyboard->dispatch (this, keysym, ev.state)) 392 if (keyboard->dispatch (this, keysym, ev.state))
354 return; 393 return;
355#endif 394#endif
356 395
357 if (TermWin.saveLines) 396 if (saveLines)
358 { 397 {
359#ifdef UNSHIFTED_SCROLLKEYS 398#ifdef UNSHIFTED_SCROLLKEYS
360 if (!ctrl && !meta) 399 if (!ctrl && !meta)
361#else 400#else
362 if (IS_SCROLL_MOD) 401 if (IS_SCROLL_MOD)
363#endif 402#endif
364 { 403 {
365 int lnsppg; 404 int lnsppg;
366 405
367#ifdef PAGING_CONTEXT_LINES 406#ifdef PAGING_CONTEXT_LINES
368 lnsppg = TermWin.nrow - PAGING_CONTEXT_LINES; 407 lnsppg = nrow - PAGING_CONTEXT_LINES;
369#else 408#else
370 lnsppg = TermWin.nrow * 4 / 5; 409 lnsppg = nrow * 4 / 5;
371#endif 410#endif
372 if (keysym == XK_Prior) 411 if (keysym == XK_Prior)
373 { 412 {
374 scr_page (UP, lnsppg); 413 scr_page (UP, lnsppg);
375 return; 414 return;
… …
512 else 551 else
513 strcpy (kbuf, key_backspace); 552 strcpy (kbuf, key_backspace);
514 break; 553 break;
515#endif 554#endif
516#ifndef NO_DELETE_KEY 555#ifndef NO_DELETE_KEY
556# ifdef XK_KP_Prior
557 case XK_KP_Delete:
558 /* allow shift to override */
559 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
560 {
561 strcpy (kbuf, "\033On");
562 break;
563 }
564 /* FALLTHROUGH */
565# endif
517 case XK_Delete: 566 case XK_Delete:
518 strcpy (kbuf, key_delete); 567 strcpy (kbuf, key_delete);
519 break; 568 break;
520#endif 569#endif
521 case XK_Tab: 570 case XK_Tab:
… …
624#ifdef XK_KP_Begin 673#ifdef XK_KP_Begin
625 case XK_KP_Begin: 674 case XK_KP_Begin:
626 strcpy (kbuf, "\033Ou"); 675 strcpy (kbuf, "\033Ou");
627 break; 676 break;
628 677
629 case XK_KP_Insert:
630 strcpy (kbuf, "\033Op");
631 break;
632
633 case XK_KP_Delete:
634 strcpy (kbuf, "\033On");
635 break;
636#endif 678#endif
637 case XK_KP_F1: /* "\033OP" */ 679 case XK_KP_F1: /* "\033OP" */
638 case XK_KP_F2: /* "\033OQ" */ 680 case XK_KP_F2: /* "\033OQ" */
639 case XK_KP_F3: /* "\033OR" */ 681 case XK_KP_F3: /* "\033OR" */
640 case XK_KP_F4: /* "\033OS" */ 682 case XK_KP_F4: /* "\033OS" */
… …
672 break; 714 break;
673 715
674 case XK_Find: 716 case XK_Find:
675 strcpy (kbuf, "\033[1~"); 717 strcpy (kbuf, "\033[1~");
676 break; 718 break;
719
720#ifdef XK_KP_End
721 case XK_KP_Insert:
722 /* allow shift to override */
723 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
724 {
725 strcpy (kbuf, "\033Op");
726 break;
727 }
728 /* FALLTHROUGH */
729#endif
677 case XK_Insert: 730 case XK_Insert:
678 strcpy (kbuf, "\033[2~"); 731 strcpy (kbuf, "\033[2~");
679 break; 732 break;
680#ifdef DXK_Remove /* support for DEC remove like key */ 733#ifdef DXK_Remove /* support for DEC remove like key */
681 case DXK_Remove: 734 case DXK_Remove:
… …
816 } 869 }
817 870
818 if (len <= 0) 871 if (len <= 0)
819 return; /* not mapped */ 872 return; /* not mapped */
820 873
821 if (options & Opt_scrollTtyKeypress) 874 if (OPTION (Opt_scrollTtyKeypress))
822 if (TermWin.view_start) 875 if (view_start)
823 { 876 {
824 TermWin.view_start = 0; 877 view_start = 0;
825 want_refresh = 1; 878 want_refresh = 1;
826 } 879 }
827 880
828 /* 881 /*
829 * these modifications only affect the static keybuffer 882 * these modifications only affect the static keybuffer
… …
932 SET_LOCALE (locale); 985 SET_LOCALE (locale);
933 986
934 display->flush (); 987 display->flush ();
935 988
936 if (want_refresh && !flush_ev.active) 989 if (want_refresh && !flush_ev.active)
937 flush_ev.start (NOW + 0.01); 990 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
938} 991}
939 992
940void 993void
941rxvt_term::flush_cb (time_watcher &w) 994rxvt_term::flush_cb (time_watcher &w)
942{ 995{
… …
1006{ 1059{
1007 if (mouse_slip_wheel_speed == 0 1060 if (mouse_slip_wheel_speed == 0
1008 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed) 1061 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1009 : scr_page (UP, mouse_slip_wheel_speed)) 1062 : scr_page (UP, mouse_slip_wheel_speed))
1010 { 1063 {
1011 if (TermWin.view_start == TermWin.nscrolled || 1064 if (view_start == nsaved ||
1012 TermWin.view_start == 0) 1065 view_start == 0)
1013 mouse_slip_wheel_speed = 0; 1066 mouse_slip_wheel_speed = 0;
1014 1067
1015 refresh_type |= SMOOTH_REFRESH; 1068 refresh_type |= SMOOTH_REFRESH;
1016 want_refresh = 1; 1069 want_refresh = 1;
1017 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1070 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1018 } 1071 }
1019} 1072}
1020#endif 1073#endif
1021 1074
1075#if HAVE_SCHED_YIELD
1076static struct event_handler
1077{
1078 check_watcher cw_yield;
1079
1080 void yield (check_watcher &w)
1081 {
1082 sched_yield ();
1083 w.stop ();
1084 }
1085
1086 event_handler ()
1087 : cw_yield (this, &event_handler::yield)
1088 {
1089 }
1090} event_handler;
1091#endif
1092
1022bool 1093bool
1023rxvt_term::pty_fill () 1094rxvt_term::pty_fill ()
1024{ 1095{
1025 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1096 ssize_t n = cmdbuf_endp - cmdbuf_ptr;
1026 1097
… …
1032 1103
1033 memmove (cmdbuf_base, cmdbuf_ptr, n); 1104 memmove (cmdbuf_base, cmdbuf_ptr, n);
1034 cmdbuf_ptr = cmdbuf_base; 1105 cmdbuf_ptr = cmdbuf_base;
1035 cmdbuf_endp = cmdbuf_ptr + n; 1106 cmdbuf_endp = cmdbuf_ptr + n;
1036 1107
1037 n = read (pty.pty, cmdbuf_endp, CBUFSIZ - n); 1108 ssize_t r = read (pty.pty, cmdbuf_endp, CBUFSIZ - n);
1038 1109
1039 if (n > 0) 1110 if (r > 0)
1040 { 1111 {
1041 cmdbuf_endp += n; 1112 cmdbuf_endp += r;
1042 return true; 1113 return true;
1043 } 1114 }
1044 else if (n < 0 && errno != EAGAIN) 1115 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1116 {
1117#if HAVE_SCHED_YIELD
1118 event_handler.cw_yield.start ();
1119#endif
1120 }
1121 else
1122 {
1123 pty_ev.stop ();
1124
1125 if (!OPTION (Opt_hold))
1045 destroy (); 1126 destroy ();
1127 }
1046 1128
1047 return false; 1129 return false;
1048} 1130}
1049 1131
1050void 1132void
… …
1064} 1146}
1065 1147
1066void 1148void
1067rxvt_term::pointer_unblank () 1149rxvt_term::pointer_unblank ()
1068{ 1150{
1069 XDefineCursor (display->display, TermWin.vt, TermWin_cursor); 1151 XDefineCursor (display->display, vt, TermWin_cursor);
1070 recolour_cursor (); 1152 recolour_cursor ();
1071 1153
1072#ifdef POINTER_BLANK 1154#ifdef POINTER_BLANK
1073 hidden_pointer = 0; 1155 hidden_pointer = 0;
1074 1156
1075 if (options & Opt_pointerBlank) 1157 if (OPTION (Opt_pointerBlank))
1076 pointer_ev.start (NOW + pointerBlankDelay); 1158 pointer_ev.start (NOW + pointerBlankDelay);
1077#endif 1159#endif
1078} 1160}
1079 1161
1080#ifdef POINTER_BLANK 1162#ifdef POINTER_BLANK
1081void 1163void
1082rxvt_term::pointer_blank () 1164rxvt_term::pointer_blank ()
1083{ 1165{
1084 if (! (options & Opt_pointerBlank)) 1166 if (! OPTION (Opt_pointerBlank))
1085 return; 1167 return;
1086 1168
1087 XDefineCursor (display->display, TermWin.vt, display->blank_cursor); 1169 XDefineCursor (display->display, vt, display->blank_cursor);
1088 XFlush (display->display); 1170 XFlush (display->display);
1089 1171
1090 hidden_pointer = 1; 1172 hidden_pointer = 1;
1091} 1173}
1092 1174
… …
1187 1269
1188 SET_R (this); 1270 SET_R (this);
1189 SET_LOCALE (locale); 1271 SET_LOCALE (locale);
1190 1272
1191#if defined(CURSOR_BLINK) 1273#if defined(CURSOR_BLINK)
1192 if ((options & Opt_cursorBlink) && ev.type == KeyPress) 1274 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress)
1193 { 1275 {
1194 if (hidden_cursor) 1276 if (hidden_cursor)
1195 { 1277 {
1196 hidden_cursor = 0; 1278 hidden_cursor = 0;
1197 want_refresh = 1; 1279 want_refresh = 1;
… …
1200 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1282 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1201 } 1283 }
1202#endif 1284#endif
1203 1285
1204#if defined(POINTER_BLANK) 1286#if defined(POINTER_BLANK)
1205 if ((options & Opt_pointerBlank) && pointerBlankDelay > 0) 1287 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
1206 { 1288 {
1207 if (ev.type == MotionNotify 1289 if (ev.type == MotionNotify
1208 || ev.type == ButtonPress 1290 || ev.type == ButtonPress
1209 || ev.type == ButtonRelease) 1291 || ev.type == ButtonRelease)
1210 if (hidden_pointer) 1292 if (hidden_pointer)
… …
1308 button_release (ev.xbutton); 1390 button_release (ev.xbutton);
1309 break; 1391 break;
1310 1392
1311 case ClientMessage: 1393 case ClientMessage:
1312 if (ev.xclient.format == 32 1394 if (ev.xclient.format == 32
1395 && ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
1396 {
1313 && (Atom)ev.xclient.data.l[0] == xa[XA_WMDELETEWINDOW]) 1397 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1314 destroy (); 1398 destroy ();
1399#if ENABLE_EWMH
1400 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1401 XSendEvent (disp, ev.xclient.window = display->root,
1402 False, SubstructureRedirectMask | SubstructureNotifyMask,
1403 &ev);
1404#endif
1405 }
1406#if ENABLE_XEMBED
1407 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1408 {
1409 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1410 focus_in ();
1411 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1412 focus_out ();
1413 }
1414#endif
1315#ifdef OFFIX_DND 1415#ifdef OFFIX_DND
1316 /* OffiX Dnd (drag 'n' drop) protocol */ 1416 /* OffiX Dnd (drag 'n' drop) protocol */
1317 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL] 1417 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1318 && (ev.xclient.data.l[0] == DndFile 1418 && (ev.xclient.data.l[0] == DndFile
1319 || ev.xclient.data.l[0] == DndDir 1419 || ev.xclient.data.l[0] == DndDir
1320 || ev.xclient.data.l[0] == DndLink)) 1420 || ev.xclient.data.l[0] == DndLink))
1321 { 1421 {
1322 /* Get Dnd data */ 1422 /* Get Dnd data */
1323 Atom ActualType; 1423 Atom ActualType;
1324 int ActualFormat; 1424 int ActualFormat;
1325 unsigned char *data; 1425 unsigned char *data;
… …
1368 break; 1468 break;
1369 } 1469 }
1370 break; 1470 break;
1371 1471
1372 case FocusIn: 1472 case FocusIn:
1373 if (!TermWin.focus) 1473 focus_in ();
1474 break;
1475
1476 case FocusOut:
1477 focus_out ();
1478 break;
1479
1480 case ConfigureNotify:
1481 if (ev.xconfigure.window == parent[0])
1374 { 1482 {
1375 TermWin.focus = 1;
1376 want_refresh = 1;
1377#ifdef USE_XIM
1378 if (Input_Context != NULL)
1379 {
1380 IMSetStatusPosition ();
1381 XSetICFocus (Input_Context);
1382 }
1383#endif
1384#ifdef CURSOR_BLINK
1385 if (options & Opt_cursorBlink)
1386 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1387#endif
1388#ifdef OFF_FOCUS_FADING
1389 if (rs[Rs_fade])
1390 {
1391 pix_colors = pix_colors_focused;
1392 scr_recolour ();
1393 }
1394#endif
1395
1396 }
1397 break;
1398
1399 case FocusOut:
1400 if (TermWin.focus)
1401 {
1402 TermWin.focus = 0;
1403 want_refresh = 1;
1404
1405#if ENABLE_FRILLS || ISO_14755
1406 iso14755buf = 0;
1407#endif
1408#if ENABLE_OVERLAY
1409 scr_overlay_off ();
1410#endif
1411#ifdef USE_XIM
1412 if (Input_Context != NULL)
1413 XUnsetICFocus (Input_Context);
1414#endif
1415#ifdef CURSOR_BLINK
1416 if (options & Opt_cursorBlink)
1417 cursor_blink_ev.stop ();
1418 hidden_cursor = 0;
1419#endif
1420#ifdef OFF_FOCUS_FADING
1421 if (rs[Rs_fade])
1422 {
1423 pix_colors = pix_colors_unfocused;
1424 scr_recolour ();
1425 }
1426#endif
1427 }
1428 break;
1429
1430 case ConfigureNotify:
1431 if (ev.xconfigure.window == TermWin.parent[0])
1432 {
1433 int height, width;
1434
1435 do
1436 { /* Wrap lots of configures into one */
1437 width = ev.xconfigure.width;
1438 height = ev.xconfigure.height;
1439 D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height));
1440 }
1441 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev)); 1483 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev))
1484 ;
1442 1485
1443 if (szHint.width != width || szHint.height != height) 1486 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1444 { 1487 {
1445 seen_resize = 1; 1488 seen_resize = 1;
1446 resize_all_windows (width, height, 1); 1489 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1447 } 1490 }
1448 1491
1449#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1492#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1450 if (options & Opt_transparent) 1493 if (OPTION (Opt_transparent))
1451 check_our_parents (); 1494 check_our_parents ();
1452#endif 1495#endif
1453 } 1496 }
1454 break; 1497 break;
1455 1498
… …
1472 case SelectionRequest: 1515 case SelectionRequest:
1473 selection_send (ev.xselectionrequest); 1516 selection_send (ev.xselectionrequest);
1474 break; 1517 break;
1475 1518
1476 case UnmapNotify: 1519 case UnmapNotify:
1477 TermWin.mapped = 0; 1520 mapped = 0;
1478#ifdef TEXT_BLINK 1521#ifdef TEXT_BLINK
1479 text_blink_ev.stop (); 1522 text_blink_ev.stop ();
1480#endif 1523#endif
1481 break; 1524 break;
1482 1525
1483 case MapNotify: 1526 case MapNotify:
1484 TermWin.mapped = 1; 1527 mapped = 1;
1485#ifdef TEXT_BLINK 1528#ifdef TEXT_BLINK
1486 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 1529 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1487#endif 1530#endif
1488 break; 1531 break;
1489 1532
… …
1493 break; 1536 break;
1494#endif /* TRANSPARENT */ 1537#endif /* TRANSPARENT */
1495 1538
1496 case GraphicsExpose: 1539 case GraphicsExpose:
1497 case Expose: 1540 case Expose:
1498 if (ev.xany.window == TermWin.vt) 1541 if (ev.xany.window == vt)
1499 { 1542 {
1500 do 1543 do
1501 scr_expose (ev.xexpose.x, ev.xexpose.y, 1544 scr_expose (ev.xexpose.x, ev.xexpose.y,
1502 ev.xexpose.width, ev.xexpose.height, False); 1545 ev.xexpose.width, ev.xexpose.height, False);
1503 while (XCheckTypedWindowEvent (disp, TermWin.vt, ev.xany.type, &ev)); 1546 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev));
1504 1547
1505 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1548 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1506 1549
1507 while (XCheckTypedWindowEvent (disp, TermWin.vt, ev.xany.type, &ev)) 1550 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev))
1508 scr_expose (ev.xexpose.x, ev.xexpose.y, 1551 scr_expose (ev.xexpose.x, ev.xexpose.y,
1509 ev.xexpose.width, ev.xexpose.height, False); 1552 ev.xexpose.width, ev.xexpose.height, False);
1510 1553
1511 scr_refresh (refresh_type); 1554 scr_refresh (refresh_type);
1512 } 1555 }
… …
1528 if (menubar_visible () && isMenuBarWindow (ev.xany.window)) 1571 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1529 menubar_expose (); 1572 menubar_expose ();
1530#endif 1573#endif
1531 1574
1532#ifdef TRANSPARENT 1575#ifdef TRANSPARENT
1533 if (am_transparent && ev.xany.window == TermWin.parent[0]) 1576 if (am_transparent && ev.xany.window == parent[0])
1534 XClearWindow (disp, ev.xany.window); 1577 XClearWindow (disp, ev.xany.window);
1535#endif 1578#endif
1536 } 1579 }
1537 break; 1580 break;
1538 1581
… …
1549 } 1592 }
1550#endif 1593#endif
1551 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1594 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1552 break; 1595 break;
1553 1596
1554 if (ev.xany.window == TermWin.vt) 1597 if (ev.xany.window == vt)
1555 { 1598 {
1556 if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1599 if (ev.xbutton.state & (Button1Mask | Button3Mask))
1557 { 1600 {
1558 while (XCheckTypedWindowEvent (disp, TermWin.vt, MotionNotify, &ev)) 1601 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev))
1559 ; 1602 ;
1560 1603
1561 XQueryPointer (disp, TermWin.vt, 1604 XQueryPointer (disp, vt,
1562 &unused_root, &unused_child, 1605 &unused_root, &unused_child,
1563 &unused_root_x, &unused_root_y, 1606 &unused_root_x, &unused_root_y,
1564 &ev.xbutton.x, &ev.xbutton.y, 1607 &ev.xbutton.x, &ev.xbutton.y,
1565 &ev.xbutton.state); 1608 &ev.xbutton.state);
1566#ifdef MOUSE_THRESHOLD 1609#ifdef MOUSE_THRESHOLD
… …
1578#endif 1621#endif
1579 selection_extend (ev.xbutton.x, ev.xbutton.y, 1622 selection_extend (ev.xbutton.x, ev.xbutton.y,
1580 ev.xbutton.state & Button3Mask ? 2 : 0); 1623 ev.xbutton.state & Button3Mask ? 2 : 0);
1581 1624
1582#ifdef SELECTION_SCROLLING 1625#ifdef SELECTION_SCROLLING
1583 if (ev.xbutton.y < TermWin.int_bwidth 1626 if (ev.xbutton.y < int_bwidth
1584 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1)) 1627 || Pixel2Row (ev.xbutton.y) > (nrow-1))
1585 { 1628 {
1586 int dist; 1629 int dist;
1587 1630
1588 /* don't clobber the current delay if we are 1631 /* don't clobber the current delay if we are
1589 * already in the middle of scrolling. 1632 * already in the middle of scrolling.
… …
1597 selection_save_x = ev.xbutton.x; 1640 selection_save_x = ev.xbutton.x;
1598 selection_save_y = ev.xbutton.y; 1641 selection_save_y = ev.xbutton.y;
1599 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0; 1642 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;
1600 1643
1601 /* calc number of lines to scroll */ 1644 /* calc number of lines to scroll */
1602 if (ev.xbutton.y < TermWin.int_bwidth) 1645 if (ev.xbutton.y < int_bwidth)
1603 { 1646 {
1604 scroll_selection_dir = UP; 1647 scroll_selection_dir = UP;
1605 dist = TermWin.int_bwidth - ev.xbutton.y; 1648 dist = int_bwidth - ev.xbutton.y;
1606 } 1649 }
1607 else 1650 else
1608 { 1651 {
1609 scroll_selection_dir = DN; 1652 scroll_selection_dir = DN;
1610 dist = ev.xbutton.y - (TermWin.int_bwidth + TermWin.height); 1653 dist = ev.xbutton.y - (int_bwidth + height);
1611 } 1654 }
1612 1655
1613 scroll_selection_lines = Pixel2Height (dist) 1656 scroll_selection_lines = Pixel2Height (dist)
1614 / SELECTION_SCROLL_LINE_SPEEDUP 1657 / SELECTION_SCROLL_LINE_SPEEDUP
1615 + 1; 1658 + 1;
1616 MIN_IT (scroll_selection_lines, 1659 min_it (scroll_selection_lines,
1617 SELECTION_SCROLL_MAX_LINES); 1660 SELECTION_SCROLL_MAX_LINES);
1618 } 1661 }
1619 else 1662 else
1620 { 1663 {
1621 /* we are within the text window, so we 1664 /* we are within the text window, so we
… …
1649 } 1692 }
1650 break; 1693 break;
1651 } 1694 }
1652} 1695}
1653 1696
1697void
1698rxvt_term::focus_in ()
1699{
1700 if (!focus)
1701 {
1702 focus = 1;
1703 want_refresh = 1;
1704
1705 PERL_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1706
1707#if USE_XIM
1708 if (Input_Context != NULL)
1709 {
1710 IMSetStatusPosition ();
1711 XSetICFocus (Input_Context);
1712 }
1713#endif
1714#if CURSOR_BLINK
1715 if (OPTION (Opt_cursorBlink))
1716 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1717#endif
1718#if OFF_FOCUS_FADING
1719 if (rs[Rs_fade])
1720 {
1721 pix_colors = pix_colors_focused;
1722 scr_recolour ();
1723 }
1724#endif
1725 }
1726}
1727
1728void
1729rxvt_term::focus_out ()
1730{
1731 if (focus)
1732 {
1733 focus = 0;
1734 want_refresh = 1;
1735
1736 PERL_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1737
1738#if ENABLE_FRILLS || ISO_14755
1739 if (iso14755buf)
1740 {
1741 iso14755buf = 0;
1742# if ENABLE_OVERLAY
1743 scr_overlay_off ();
1744# endif
1745 }
1746#endif
1747#if USE_XIM
1748 if (Input_Context != NULL)
1749 XUnsetICFocus (Input_Context);
1750#endif
1751#if CURSOR_BLINK
1752 if (OPTION (Opt_cursorBlink))
1753 cursor_blink_ev.stop ();
1754 hidden_cursor = 0;
1755#endif
1756#if OFF_FOCUS_FADING
1757 if (rs[Rs_fade])
1758 {
1759 pix_colors = pix_colors_unfocused;
1760 scr_recolour ();
1761 }
1762#endif
1763 }
1764}
1765
1654#if TRANSPARENT 1766#if TRANSPARENT
1655void 1767void
1656rxvt_term::rootwin_cb (XEvent &ev) 1768rxvt_term::rootwin_cb (XEvent &ev)
1657{ 1769{
1658 SET_R (this); 1770 SET_R (this);
… …
1669 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1781 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID])
1670 return; 1782 return;
1671 1783
1672 /* FALLTHROUGH */ 1784 /* FALLTHROUGH */
1673 case ReparentNotify: 1785 case ReparentNotify:
1674 if ((options & Opt_transparent) && check_our_parents () && am_transparent) 1786 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)
1675 want_refresh = want_full_refresh = 1; 1787 want_refresh = want_full_refresh = 1;
1676 break; 1788 break;
1677 } 1789 }
1678} 1790}
1679#endif 1791#endif
… …
1688 reportmode = !! (priv_modes & PrivMode_mouse_report); 1800 reportmode = !! (priv_modes & PrivMode_mouse_report);
1689 1801
1690 /* 1802 /*
1691 * VT window processing of button press 1803 * VT window processing of button press
1692 */ 1804 */
1693 if (ev.window == TermWin.vt) 1805 if (ev.window == vt)
1694 { 1806 {
1695#if ISO_14755 1807#if ISO_14755
1696 // 5.4 1808 // 5.4
1697 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1809 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1698 { 1810 {
… …
1903 case Button3: 2015 case Button3:
1904 if (scrollBar.style != R_SB_XTERM) 2016 if (scrollBar.style != R_SB_XTERM)
1905 { 2017 {
1906 if (scrollbar_above_slider (ev.y)) 2018 if (scrollbar_above_slider (ev.y))
1907# ifdef RXVT_SCROLL_FULL 2019# ifdef RXVT_SCROLL_FULL
1908 scr_page (UP, TermWin.nrow - 1); 2020 scr_page (UP, nrow - 1);
1909# else 2021# else
1910 scr_page (UP, TermWin.nrow / 4); 2022 scr_page (UP, nrow / 4);
1911# endif 2023# endif
1912 else if (scrollbar_below_slider (ev.y)) 2024 else if (scrollbar_below_slider (ev.y))
1913# ifdef RXVT_SCROLL_FULL 2025# ifdef RXVT_SCROLL_FULL
1914 scr_page (DN, TermWin.nrow - 1); 2026 scr_page (DN, nrow - 1);
1915# else 2027# else
1916 scr_page (DN, TermWin.nrow / 4); 2028 scr_page (DN, nrow / 4);
1917# endif 2029# endif
1918 else 2030 else
1919 scrollBar.setMotion (); 2031 scrollBar.setMotion ();
1920 } 2032 }
1921 else 2033 else
1922 { 2034 {
1923 scr_page ((ev.button == Button1 ? DN : UP), 2035 scr_page ((ev.button == Button1 ? DN : UP),
1924 (TermWin.nrow 2036 (nrow
1925 * scrollbar_position (ev.y) 2037 * scrollbar_position (ev.y)
1926 / scrollbar_size ())); 2038 / scrollbar_size ()));
1927 } 2039 }
1928 2040
1929 break; 2041 break;
… …
1961#ifdef SELECTION_SCROLLING 2073#ifdef SELECTION_SCROLLING
1962 if (sel_scroll_ev.active) 2074 if (sel_scroll_ev.active)
1963 sel_scroll_ev.stop(); 2075 sel_scroll_ev.stop();
1964#endif 2076#endif
1965 2077
1966 if (ev.window == TermWin.vt) 2078 if (ev.window == vt)
1967 { 2079 {
1968#if ISO_14755 2080#if ISO_14755
1969 // 5.4 2081 // 5.4
1970 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 2082 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1971 return; 2083 return;
… …
2021 2133
2022 v = ev.button == Button4 ? UP : DN; 2134 v = ev.button == Button4 ? UP : DN;
2023 2135
2024 if (ev.state & ShiftMask) 2136 if (ev.state & ShiftMask)
2025 i = 1; 2137 i = 1;
2026 else if (options & Opt_mouseWheelScrollPage) 2138 else if (OPTION (Opt_mouseWheelScrollPage))
2027 i = TermWin.nrow - 1; 2139 i = nrow - 1;
2028 else 2140 else
2029 i = 5; 2141 i = 5;
2030 2142
2031# ifdef MOUSE_SLIP_WHEELING 2143# ifdef MOUSE_SLIP_WHEELING
2032 if (ev.state & ControlMask) 2144 if (ev.state & ControlMask)
2033 { 2145 {
2034 mouse_slip_wheel_speed += v ? -1 : 1; 2146 mouse_slip_wheel_speed += v ? -1 : 1;
2035 if (mouse_slip_wheel_speed < -TermWin.nrow) mouse_slip_wheel_speed = -TermWin.nrow; 2147 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2036 if (mouse_slip_wheel_speed > +TermWin.nrow) mouse_slip_wheel_speed = +TermWin.nrow; 2148 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2037 2149
2038 if (slip_wheel_ev.at < NOW) 2150 if (slip_wheel_ev.at < NOW)
2039 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; 2151 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;
2040 2152
2041 slip_wheel_ev.start (); 2153 slip_wheel_ev.start ();
… …
2317 XWindowAttributes wattr, wrootattr; 2429 XWindowAttributes wattr, wrootattr;
2318 dDisp; 2430 dDisp;
2319 2431
2320 pchanged = 0; 2432 pchanged = 0;
2321 2433
2322 if (!(options & Opt_transparent)) 2434 if (!OPTION (Opt_transparent))
2323 return pchanged; /* Don't try any more */ 2435 return pchanged; /* Don't try any more */
2324 2436
2325 XGetWindowAttributes (disp, display->root, &wrootattr); 2437 XGetWindowAttributes (disp, display->root, &wrootattr);
2326 rootdepth = wrootattr.depth; 2438 rootdepth = wrootattr.depth;
2327 2439
2328 XGetWindowAttributes (disp, TermWin.parent[0], &wattr); 2440 XGetWindowAttributes (disp, parent[0], &wattr);
2329 2441
2330 if (rootdepth != wattr.depth) 2442 if (rootdepth != wattr.depth)
2331 { 2443 {
2332 if (am_transparent) 2444 if (am_transparent)
2333 { 2445 {
2334 pchanged = 1; 2446 pchanged = 1;
2335 XSetWindowBackground (disp, TermWin.vt, pix_colors_focused[Color_bg]); 2447 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2336 am_transparent = am_pixmap_trans = 0; 2448 am_transparent = am_pixmap_trans = 0;
2337 } 2449 }
2338 2450
2339 return pchanged; /* Don't try any more */ 2451 return pchanged; /* Don't try any more */
2340 } 2452 }
… …
2381 Window cr; 2493 Window cr;
2382 XImage *image; 2494 XImage *image;
2383 GC gc; 2495 GC gc;
2384 XGCValues gcvalue; 2496 XGCValues gcvalue;
2385 2497
2386 XTranslateCoordinates (disp, TermWin.parent[0], display->root, 2498 XTranslateCoordinates (disp, parent[0], display->root,
2387 0, 0, &sx, &sy, &cr); 2499 0, 0, &sx, &sy, &cr);
2388 nw = (unsigned int)szHint.width; 2500 nw = (unsigned int)szHint.width;
2389 nh = (unsigned int)szHint.height; 2501 nh = (unsigned int)szHint.height;
2390 nx = ny = 0; 2502 nx = ny = 0;
2391 2503
… …
2401 nh += sy; 2513 nh += sy;
2402 ny = -sy; 2514 ny = -sy;
2403 sy = 0; 2515 sy = 0;
2404 } 2516 }
2405 2517
2406 MIN_IT (nw, (unsigned int) (wrootattr.width - sx)); 2518 min_it (nw, (unsigned int) (wrootattr.width - sx));
2407 MIN_IT (nh, (unsigned int) (wrootattr.height - sy)); 2519 min_it (nh, (unsigned int) (wrootattr.height - sy));
2408 2520
2409 XSync (disp, False); 2521 XSync (disp, False);
2410 allowedxerror = -1; 2522 allowedxerror = -1;
2411 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap); 2523 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2412 2524
… …
2417 if (image == NULL) 2529 if (image == NULL)
2418 { 2530 {
2419 if (am_transparent && am_pixmap_trans) 2531 if (am_transparent && am_pixmap_trans)
2420 { 2532 {
2421 pchanged = 1; 2533 pchanged = 1;
2422 if (TermWin.pixmap != None) 2534 if (pixmap != None)
2423 { 2535 {
2424 XFreePixmap (disp, TermWin.pixmap); 2536 XFreePixmap (disp, pixmap);
2425 TermWin.pixmap = None; 2537 pixmap = None;
2426 } 2538 }
2427 } 2539 }
2428 2540
2429 am_pixmap_trans = 0; 2541 am_pixmap_trans = 0;
2430 } 2542 }
2431 else 2543 else
2432 { 2544 {
2433 if (TermWin.pixmap != None) 2545 if (pixmap != None)
2434 XFreePixmap (disp, TermWin.pixmap); 2546 XFreePixmap (disp, pixmap);
2435 2547
2436#if TINTING 2548#if TINTING
2437 if (ISSET_PIXCOLOR (Color_tint)) 2549 if (ISSET_PIXCOLOR (Color_tint))
2438 { 2550 {
2439 unsigned short rm, gm, bm; 2551 unsigned short rm, gm, bm;
… …
2443 2555
2444 ShadeXImage (display, image, shade, rm, gm, bm); 2556 ShadeXImage (display, image, shade, rm, gm, bm);
2445 } 2557 }
2446#endif 2558#endif
2447 2559
2448 TermWin.pixmap = XCreatePixmap (disp, TermWin.vt, 2560 pixmap = XCreatePixmap (disp, vt,
2449 szHint.width, szHint.height, image->depth); 2561 szHint.width, szHint.height, image->depth);
2450 gc = XCreateGC (disp, TermWin.vt, 0UL, &gcvalue); 2562 gc = XCreateGC (disp, vt, 0UL, &gcvalue);
2451 XPutImage (disp, TermWin.pixmap, gc, image, 0, 0, 2563 XPutImage (disp, pixmap, gc, image, 0, 0,
2452 nx, ny, image->width, image->height); 2564 nx, ny, image->width, image->height);
2453 XFreeGC (disp, gc); 2565 XFreeGC (disp, gc);
2454 XDestroyImage (image); 2566 XDestroyImage (image);
2455 XSetWindowBackgroundPixmap (disp, TermWin.parent[0], TermWin.pixmap); 2567 XSetWindowBackgroundPixmap (disp, parent[0], pixmap);
2456 XClearWindow (disp, TermWin.parent[0]); 2568 XClearWindow (disp, parent[0]);
2457 2569
2458 if (!am_transparent || !am_pixmap_trans) 2570 if (!am_transparent || !am_pixmap_trans)
2459 pchanged = 1; 2571 pchanged = 1;
2460 2572
2461 am_transparent = am_pixmap_trans = 1; 2573 am_transparent = am_pixmap_trans = 1;
2462 } 2574 }
2463 } 2575 }
2464 2576
2465 if (am_pixmap_trans) 2577 if (am_pixmap_trans)
2466 XSetWindowBackgroundPixmap (disp, TermWin.vt, ParentRelative); 2578 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2467 else 2579 else
2468 { 2580 {
2469 unsigned int n; 2581 unsigned int n;
2470 /* 2582 /*
2471 * InheritPixmap transparency 2583 * InheritPixmap transparency
2472 */ 2584 */
2473 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2585 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2474 { 2586 {
2475 oldp = TermWin.parent[i]; 2587 oldp = parent[i];
2476 XQueryTree (disp, TermWin.parent[i - 1], &root, 2588 XQueryTree (disp, parent[i - 1], &root,
2477 &TermWin.parent[i], &list, &n); 2589 &parent[i], &list, &n);
2478 XFree (list); 2590 XFree (list);
2479 2591
2480 if (TermWin.parent[i] == display->root) 2592 if (parent[i] == display->root)
2481 { 2593 {
2482 if (oldp != None) 2594 if (oldp != None)
2483 pchanged = 1; 2595 pchanged = 1;
2484 2596
2485 break; 2597 break;
2486 } 2598 }
2487 2599
2488 if (oldp != TermWin.parent[i]) 2600 if (oldp != parent[i])
2489 pchanged = 1; 2601 pchanged = 1;
2490 } 2602 }
2491 2603
2492 n = 0; 2604 n = 0;
2493 2605
2494 if (pchanged) 2606 if (pchanged)
2495 { 2607 {
2496 for (; n < (unsigned int)i; n++) 2608 for (; n < (unsigned int)i; n++)
2497 { 2609 {
2498 XGetWindowAttributes (disp, TermWin.parent[n], &wattr); 2610 XGetWindowAttributes (disp, parent[n], &wattr);
2499 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) 2611 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2500 { 2612 {
2501 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1; 2613 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2502 break; 2614 break;
2503 } 2615 }
2504 } 2616 }
2505 } 2617 }
2506 2618
2507 if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0]))) 2619 if (n > (int) (sizeof (parent) / sizeof (parent[0])))
2508 { 2620 {
2509 XSetWindowBackground (disp, TermWin.parent[0], pix_colors_focused[Color_fg]); 2621 XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]);
2510 XSetWindowBackground (disp, TermWin.vt, pix_colors_focused[Color_bg]); 2622 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2511 am_transparent = 0; 2623 am_transparent = 0;
2512 /* XXX: also turn off Opt_transparent? */ 2624 /* XXX: also turn off Opt_transparent? */
2513 } 2625 }
2514 else 2626 else
2515 { 2627 {
… …
2518 * needed for fvwm2.2.2 (and before?) */ 2630 * needed for fvwm2.2.2 (and before?) */
2519 sleep (1); 2631 sleep (1);
2520#endif 2632#endif
2521 for (n = 0; n < (unsigned int)i; n++) 2633 for (n = 0; n < (unsigned int)i; n++)
2522 { 2634 {
2523 XSetWindowBackgroundPixmap (disp, TermWin.parent[n], ParentRelative); 2635 XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative);
2524 XClearWindow (disp, TermWin.parent[n]); 2636 XClearWindow (disp, parent[n]);
2525 } 2637 }
2526 2638
2527 XSetWindowBackgroundPixmap (disp, TermWin.vt, ParentRelative); 2639 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2528 am_transparent = 1; 2640 am_transparent = 1;
2529 } 2641 }
2530 2642
2531 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2643 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2532 TermWin.parent[i] = None; 2644 parent[i] = None;
2533 } 2645 }
2534 2646
2535 if (scrollBar.win) 2647 if (scrollBar.win)
2536 { 2648 {
2537 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative); 2649 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);
… …
2580 // some window managers resize the window early, and these programs 2692 // some window managers resize the window early, and these programs
2581 // then sometimes get the size wrong. 2693 // then sometimes get the size wrong.
2582 // unfortunately other programs are even more buggy and dislike 2694 // unfortunately other programs are even more buggy and dislike
2583 // being sent SIGWINCH, so only do it when we were in fact being 2695 // being sent SIGWINCH, so only do it when we were in fact being
2584 // resized. 2696 // resized.
2585 if (seen_resize) 2697 if (seen_resize && cmd_pid)
2586 kill (-cmd_pid, SIGWINCH); 2698 kill (-cmd_pid, SIGWINCH);
2587 } 2699 }
2588 2700
2589 /* Read a text string from the input buffer */ 2701 /* Read a text string from the input buffer */
2590 unicode_t buf[UBUFSIZ]; 2702 unicode_t buf[UBUFSIZ];
2591 bool refreshnow = false; 2703 bool refreshnow = false;
2592 int nlines = 0; 2704 int nlines = 0;
2593 unicode_t *str = buf; 2705 unicode_t *str = buf;
2706 unicode_t *eol = str + min (ncol, UBUFSIZ);
2594 2707
2595 for (;;) 2708 for (;;)
2596 { 2709 {
2597 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2710 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2598 break; 2711 break;
2599 2712
2600 *str++ = ch; 2713 *str++ = ch;
2601 2714
2602 if (ch == C0_LF) 2715 if (ch == C0_LF || str >= eol)
2603 { 2716 {
2717 if (ch == C0_LF)
2604 nlines++; 2718 nlines++;
2719
2605 refresh_count++; 2720 refresh_count++;
2606 2721
2607 if (!(options & Opt_jumpScroll) 2722 if (!OPTION (Opt_jumpScroll)
2608 || (refresh_count >= refresh_limit * (TermWin.nrow - 1))) 2723 || (refresh_count >= refresh_limit * (nrow - 1)))
2609 { 2724 {
2610 refreshnow = true; 2725 refreshnow = true;
2726 refresh_count = 0;
2611 ch = NOCHAR; 2727 ch = NOCHAR;
2612 break; 2728 break;
2613 } 2729 }
2614 2730
2615 // scr_add_lines only works for nlines <= TermWin.nrow - 1. 2731 // scr_add_lines only works for nlines <= nrow - 1.
2616 if (nlines >= TermWin.nrow - 1) 2732 if (nlines >= nrow - 1)
2617 { 2733 {
2618 scr_add_lines (buf, nlines, str - buf); 2734 scr_add_lines (buf, nlines, str - buf);
2619 nlines = 0; 2735 nlines = 0;
2620 str = buf; 2736 str = buf;
2737 eol = str + min (ncol, UBUFSIZ);
2621 } 2738 }
2622 }
2623 2739
2624 if (str >= buf + UBUFSIZ) 2740 if (str >= eol)
2625 { 2741 {
2742 if (eol >= buf + UBUFSIZ)
2743 {
2626 ch = NOCHAR; 2744 ch = NOCHAR;
2627 break; 2745 break;
2746 }
2747 else
2748 eol = min (eol + ncol, buf + UBUFSIZ);
2749 }
2750
2628 } 2751 }
2629 2752
2630 seq_begin = cmdbuf_ptr; 2753 seq_begin = cmdbuf_ptr;
2631 ch = next_char (); 2754 ch = next_char ();
2632 } 2755 }
… …
2639 * the number of pages between refreshes is refresh_limit, which 2762 * the number of pages between refreshes is refresh_limit, which
2640 * is incremented here because we must be doing flat-out scrolling. 2763 * is incremented here because we must be doing flat-out scrolling.
2641 */ 2764 */
2642 if (refreshnow) 2765 if (refreshnow)
2643 { 2766 {
2644 if ((options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 2767 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2645 refresh_limit++; 2768 refresh_limit++;
2646 else 2769 else
2647 { 2770 {
2648 flag = true; 2771 flag = true;
2649 scr_refresh (refresh_type); 2772 scr_refresh (refresh_type);
2773 flush_ev.stop ();
2650 } 2774 }
2651 } 2775 }
2652 2776
2653 } 2777 }
2654 else 2778 else
… …
3176 { 3300 {
3177 switch (priv) 3301 switch (priv)
3178 { 3302 {
3179 case '>': 3303 case '>':
3180 if (ch == CSI_DA) /* secondary device attributes */ 3304 if (ch == CSI_DA) /* secondary device attributes */
3181 tt_printf ("\033[>%d;%-.8s;0c", 'R', VSTRING); 3305 tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]);
3182 break; 3306 break;
3183 case '?': 3307 case '?':
3184 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 3308 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3185 process_terminal_mode (ch, priv, nargs, arg); 3309 process_terminal_mode (ch, priv, nargs, arg);
3186 break; 3310 break;
… …
3291 3415
3292 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */ 3416 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */
3293 arg[0] = -arg[0]; 3417 arg[0] = -arg[0];
3294 /* FALLTHROUGH */ 3418 /* FALLTHROUGH */
3295 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 3419 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
3296 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0); 3420 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
3297 break; 3421 break;
3298 3422
3299 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 3423 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
3300 tt_write ((const unsigned char *)VT100_ANS, 3424 tt_write ((const unsigned char *)VT100_ANS,
3301 (unsigned int) (sizeof (VT100_ANS) - 1)); 3425 (unsigned int) (sizeof (VT100_ANS) - 1));
… …
3313 break; 3437 break;
3314 case 6: /* CPR requested */ 3438 case 6: /* CPR requested */
3315 scr_report_position (); 3439 scr_report_position ();
3316 break; 3440 break;
3317 case 7: /* unofficial extension */ 3441 case 7: /* unofficial extension */
3318 if (options & Opt_insecure) 3442 if (OPTION (Opt_insecure))
3319 tt_printf ("%-.250s\012", rs[Rs_display_name]); 3443 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3320 break; 3444 break;
3321 case 8: /* unofficial extension */ 3445 case 8: /* unofficial extension */
3322 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3446 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3323 break; 3447 break;
… …
3426 { 3550 {
3427 /* 3551 /*
3428 * commands 3552 * commands
3429 */ 3553 */
3430 case 1: /* deiconify window */ 3554 case 1: /* deiconify window */
3431 XMapWindow (disp, TermWin.parent[0]); 3555 XMapWindow (disp, parent[0]);
3432 break; 3556 break;
3433 case 2: /* iconify window */ 3557 case 2: /* iconify window */
3434 XIconifyWindow (disp, TermWin.parent[0], display->screen); 3558 XIconifyWindow (disp, parent[0], display->screen);
3435 break; 3559 break;
3436 case 3: /* set position (pixels) */ 3560 case 3: /* set position (pixels) */
3437 XMoveWindow (disp, TermWin.parent[0], args[1], args[2]); 3561 XMoveWindow (disp, parent[0], args[1], args[2]);
3438 break; 3562 break;
3439 case 4: /* set size (pixels) */ 3563 case 4: /* set size (pixels) */
3440 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3564 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3441 break; 3565 break;
3442 case 5: /* raise window */ 3566 case 5: /* raise window */
3443 XRaiseWindow (disp, TermWin.parent[0]); 3567 XRaiseWindow (disp, parent[0]);
3444 break; 3568 break;
3445 case 6: /* lower window */ 3569 case 6: /* lower window */
3446 XLowerWindow (disp, TermWin.parent[0]); 3570 XLowerWindow (disp, parent[0]);
3447 break; 3571 break;
3448 case 7: /* refresh window */ 3572 case 7: /* refresh window */
3449 scr_touch (true); 3573 scr_touch (true);
3450 break; 3574 break;
3451 case 8: /* set size (chars) */ 3575 case 8: /* set size (chars) */
3452 set_widthheight ((unsigned int) (args[2] * TermWin.fwidth), 3576 set_widthheight ((unsigned int) (args[2] * fwidth),
3453 (unsigned int) (args[1] * TermWin.fheight)); 3577 (unsigned int) (args[1] * fheight));
3454 break; 3578 break;
3455 3579
3456 //case 9: NYI, TODO, restore maximized window or maximize window 3580 //case 9: NYI, TODO, restore maximized window or maximize window
3457 default: 3581 default:
3458 if (args[0] >= 24) /* set height (chars) */ 3582 if (args[0] >= 24) /* set height (chars) */
3459 set_widthheight ((unsigned int)TermWin.width, 3583 set_widthheight ((unsigned int)width,
3460 (unsigned int) (args[1] * TermWin.fheight)); 3584 (unsigned int) (args[1] * fheight));
3461 break; 3585 break;
3462 3586
3463 3587
3464 /* 3588 /*
3465 * reports - some output format copied from XTerm 3589 * reports - some output format copied from XTerm
3466 */ 3590 */
3467 case 11: /* report window state */ 3591 case 11: /* report window state */
3468 XGetWindowAttributes (disp, TermWin.parent[0], &wattr); 3592 XGetWindowAttributes (disp, parent[0], &wattr);
3469 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3593 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3470 break; 3594 break;
3471 case 13: /* report window position */ 3595 case 13: /* report window position */
3472 XGetWindowAttributes (disp, TermWin.parent[0], &wattr); 3596 XGetWindowAttributes (disp, parent[0], &wattr);
3473 XTranslateCoordinates (disp, TermWin.parent[0], wattr.root, 3597 XTranslateCoordinates (disp, parent[0], wattr.root,
3474 -wattr.border_width, -wattr.border_width, 3598 -wattr.border_width, -wattr.border_width,
3475 &x, &y, &wdummy); 3599 &x, &y, &wdummy);
3476 tt_printf ("\033[3;%d;%dt", x, y); 3600 tt_printf ("\033[3;%d;%dt", x, y);
3477 break; 3601 break;
3478 case 14: /* report window size (pixels) */ 3602 case 14: /* report window size (pixels) */
3479 XGetWindowAttributes (disp, TermWin.parent[0], &wattr); 3603 XGetWindowAttributes (disp, parent[0], &wattr);
3480 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3604 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3481 break; 3605 break;
3482 case 18: /* report text area size (chars) */ 3606 case 18: /* report text area size (chars) */
3483 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); 3607 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3484 break; 3608 break;
3485 case 19: /* report window size (chars) */ 3609 case 19: /* report window size (chars) */
3486 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol); 3610 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3487 break; 3611 break;
3488 case 20: /* report icon label */ 3612 case 20: /* report icon label */
3489 { 3613 {
3490 char *s; 3614 char *s;
3491 XGetIconName (disp, TermWin.parent[0], &s); 3615 XGetIconName (disp, parent[0], &s);
3492 tt_printf ("\033]L%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3616 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3493 XFree (s); 3617 XFree (s);
3494 } 3618 }
3495 break; 3619 break;
3496 case 21: /* report window title */ 3620 case 21: /* report window title */
3497 { 3621 {
3498 char *s; 3622 char *s;
3499 XFetchName (disp, TermWin.parent[0], &s); 3623 XFetchName (disp, parent[0], &s);
3500 tt_printf ("\033]l%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3624 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3501 XFree (s); 3625 XFree (s);
3502 } 3626 }
3503 break; 3627 break;
3504 } 3628 }
3505} 3629}
… …
3537 else if (ch < 0x20) 3661 else if (ch < 0x20)
3538 return NULL; /* other control character - exit */ 3662 return NULL; /* other control character - exit */
3539 3663
3540 seen_esc = false; 3664 seen_esc = false;
3541 3665
3542 if (n >= sizeof (string) - 1) 3666 if (n >= STRING_MAX - 1)
3543 // stop at some sane length 3667 // stop at some sane length
3544 return NULL; 3668 return NULL;
3545 3669
3546 if (ch == C0_SYN) 3670 if (ch == C0_SYN)
3547 string[n++] = cmd_get8 (); 3671 string[n++] = cmd_get8 ();
… …
3615 set_window_color (color, str); 3739 set_window_color (color, str);
3616} 3740}
3617 3741
3618/* 3742/*
3619 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3743 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3620 * 0 = change iconName/title
3621 * 1 = change iconName
3622 * 2 = change title
3623 * 4 = change color
3624 * 10 = change fg color
3625 * 11 = change bg color
3626 * 12 = change text color
3627 * 13 = change mouse foreground color
3628 * 17 = change highlight character colour
3629 * 18 = change bold character color
3630 * 19 = change underlined character color
3631 * 46 = change logfile (not implemented)
3632 * 50 = change font
3633 *
3634 * rxvt extensions:
3635 * 20 = bg pixmap
3636 * 39 = change default fg color
3637 * 49 = change default bg color
3638 * 55 = dump scrollback buffer and all of screen
3639 * 701 = change locale
3640 * 702 = find font
3641 * 703 = menu
3642 */ 3744 */
3643void 3745void
3644rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp) 3746rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp)
3645{ 3747{
3646 int changed = 0; 3748 int changed = 0;
… …
3672 unsigned long bytes_after; 3774 unsigned long bytes_after;
3673 unsigned char *value = 0; 3775 unsigned char *value = 0;
3674 const char *str = ""; 3776 const char *str = "";
3675 3777
3676 if (prop 3778 if (prop
3677 && XGetWindowProperty (disp, TermWin.parent[0], 3779 && XGetWindowProperty (disp, parent[0],
3678 prop, 0, 1<<16, 0, AnyPropertyType, 3780 prop, 0, 1<<16, 0, AnyPropertyType,
3679 &actual_type, &actual_format, 3781 &actual_type, &actual_format,
3680 &nitems, &bytes_after, &value) == Success 3782 &nitems, &bytes_after, &value) == Success
3681 && actual_type != None 3783 && actual_type != None
3682 && actual_format == 8) 3784 && actual_format == 8)
… …
3694 { 3796 {
3695 *eq = 0; 3797 *eq = 0;
3696 set_utf8_property (display->atom (str), eq + 1); 3798 set_utf8_property (display->atom (str), eq + 1);
3697 } 3799 }
3698 else 3800 else
3699 XDeleteProperty (disp, TermWin.parent[0], 3801 XDeleteProperty (disp, parent[0],
3700 display->atom (str)); 3802 display->atom (str));
3701 } 3803 }
3702 break; 3804 break;
3703 3805
3704 case XTerm_Color: 3806 case XTerm_Color:
… …
3745 break; 3847 break;
3746#ifndef NO_BOLD_UNDERLINE_REVERSE 3848#ifndef NO_BOLD_UNDERLINE_REVERSE
3747 case XTerm_Color_BD: 3849 case XTerm_Color_BD:
3748 process_color_seq (XTerm_Color_BD, Color_BD, str, resp); 3850 process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3749 break; 3851 break;
3750 case XTerm_Color_IT:
3751 process_color_seq (XTerm_Color_IT, Color_IT, str, resp);
3752 break;
3753 case XTerm_Color_UL: 3852 case XTerm_Color_UL:
3754 process_color_seq (XTerm_Color_UL, Color_UL, str, resp); 3853 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3755 break; 3854 break;
3756 case XTerm_Color_RV: 3855 case XTerm_Color_RV:
3757 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3856 process_color_seq (XTerm_Color_RV, Color_RV, str, resp);
3758 break; 3857 break;
3858 case URxvt_Color_IT:
3859 process_color_seq (URxvt_Color_IT, Color_IT, str, resp);
3860 break;
3759#endif 3861#endif
3760#if TRANSPARENT && TINTING 3862#if TRANSPARENT && TINTING
3761 case XTerm_Color_tint: 3863 case URxvt_Color_tint:
3762 process_color_seq (XTerm_Color_tint, Color_tint, str, resp); 3864 process_color_seq (URxvt_Color_tint, Color_tint, str, resp);
3763 check_our_parents (); 3865 check_our_parents ();
3764 if (am_transparent) 3866 if (am_transparent)
3765 want_full_refresh = want_refresh = 1; 3867 want_full_refresh = want_refresh = 1;
3766 break; 3868 break;
3767#endif 3869#endif
… …
3801 3903
3802 case XTerm_logfile: 3904 case XTerm_logfile:
3803 // TODO, when secure mode? 3905 // TODO, when secure mode?
3804 break; 3906 break;
3805 3907
3908#ifdef MENUBAR
3909 case URxvt_Menu:
3910 if (OPTION (Opt_insecure))
3911 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3912 break;
3913#endif
3914#if 0
3915 case XTerm_dumpscreen: /* no error notices */
3916 {
3917 int fd;
3918 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3919 {
3920 scr_dump (fd);
3921 close (fd);
3922 }
3923 }
3924 break;
3925#endif
3806 case XTerm_font: 3926 case XTerm_font:
3807 op = URxvt_font; 3927 op = URxvt_font;
3808 case URxvt_font: 3928 case URxvt_font:
3809#if ENABLE_STYLES 3929#if ENABLE_STYLES
3810 case URxvt_boldFont: 3930 case URxvt_boldFont:
3811 case URxvt_italicFont: 3931 case URxvt_italicFont:
3812 case URxvt_boldItalicFont: 3932 case URxvt_boldItalicFont:
3813#endif 3933#endif
3814 if (query) 3934 if (query)
3815 tt_printf ("\33]%d;%-.250s%c", saveop, 3935 tt_printf ("\33]%d;%-.250s%c", saveop,
3816 (options & Opt_insecure) && TermWin.fontset[op - URxvt_font]->fontdesc 3936 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3817 ? TermWin.fontset[op - URxvt_font]->fontdesc : "", 3937 ? fontset[op - URxvt_font]->fontdesc : "",
3818 resp); 3938 resp);
3819 else 3939 else
3820 { 3940 {
3821 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3941 const char *&res = rs[Rs_font + (op - URxvt_font)];
3822 3942
… …
3825 set_fonts (); 3945 set_fonts ();
3826 } 3946 }
3827 break; 3947 break;
3828 3948
3829#if ENABLE_FRILLS 3949#if ENABLE_FRILLS
3830 case XTerm_locale: 3950 case URxvt_locale:
3831 if (query) 3951 if (query)
3832 tt_printf ("\33]%d;%-.250s%c", XTerm_locale, (options & Opt_insecure) ? locale : "", resp); 3952 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp);
3833 else 3953 else
3834 { 3954 {
3835 set_locale (str); 3955 set_locale (str);
3836 pty.set_utf8_mode (enc_utf8); 3956 pty.set_utf8_mode (enc_utf8);
3837# ifdef USE_XIM
3838 im_cb (); 3957 init_xlocale ();
3839# endif
3840 } 3958 }
3841 break; 3959 break;
3842#endif
3843 3960
3844#ifdef MENUBAR 3961 case URxvt_view_up:
3845 case XTerm_Menu: 3962 case URxvt_view_down:
3846 if (options & Opt_insecure) 3963 int lines = atoi (str);
3847 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked 3964
3848 break; 3965 if (lines)
3849#endif 3966 scr_page (op == URxvt_view_up ? UP : DN, lines);
3850#if 0
3851 case XTerm_dumpscreen: /* no error notices */
3852 { 3967 else
3853 int fd;
3854 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3855 { 3968 {
3856 scr_dump (fd); 3969 scr_erase_savelines ();
3857 close (fd);
3858 } 3970 }
3859 } 3971
3860 break; 3972 break;
3861#endif 3973#endif
3862 } 3974 }
3863} 3975}
3864/*----------------------------------------------------------------------*/ 3976/*----------------------------------------------------------------------*/
… …
3973 } 4085 }
3974 4086
3975 /* extra handling for values with state unkept */ 4087 /* extra handling for values with state unkept */
3976 switch (arg[i]) 4088 switch (arg[i])
3977 { 4089 {
4090#if ENABLE_STYLES
4091 case 1021:
4092 if (mode)
4093 SET_OPTION (Opt_intensityStyles);
4094 else
4095 CLR_OPTION (Opt_intensityStyles);
4096
4097 scr_touch (true);
4098 break;
4099#endif
3978 case 1048: /* alternative cursor save */ 4100 case 1048: /* alternative cursor save */
3979 case 1049: 4101 case 1049:
3980 if (options & Opt_secondaryScreen) 4102 if (OPTION (Opt_secondaryScreen))
3981 if (mode == 0) 4103 if (mode == 0)
3982 scr_cursor (RESTORE); 4104 scr_cursor (RESTORE);
3983 else if (mode == 1) 4105 else if (mode == 1)
3984 scr_cursor (SAVE); 4106 scr_cursor (SAVE);
3985 break; 4107 break;
… …
3997 */ 4119 */
3998 PrivMode (1, PrivMode_vt52); 4120 PrivMode (1, PrivMode_vt52);
3999 break; 4121 break;
4000 case 3: /* 80/132 */ 4122 case 3: /* 80/132 */
4001 if (priv_modes & PrivMode_132OK) 4123 if (priv_modes & PrivMode_132OK)
4002 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height); 4124 set_widthheight (((state ? 132 : 80) * fwidth), height);
4003 break; 4125 break;
4004 case 4: /* smooth scrolling */ 4126 case 4: /* smooth scrolling */
4005 if (state) 4127 if (!state)
4006 options &= ~Opt_jumpScroll; 4128 SET_OPTION (Opt_jumpScroll);
4007 else 4129 else
4008 options |= Opt_jumpScroll; 4130 CLR_OPTION (Opt_jumpScroll);
4009 break; 4131 break;
4010 case 5: /* reverse video */ 4132 case 5: /* reverse video */
4011 scr_rvideo_mode (state); 4133 scr_rvideo_mode (state);
4012 break; 4134 break;
4013 case 6: /* relative/absolute origins */ 4135 case 6: /* relative/absolute origins */
… …
4054#if 0 4176#if 0
4055 case 1001: 4177 case 1001:
4056 break; /* X11 mouse highlighting */ 4178 break; /* X11 mouse highlighting */
4057#endif 4179#endif
4058 case 1010: /* scroll to bottom on TTY output inhibit */ 4180 case 1010: /* scroll to bottom on TTY output inhibit */
4059 if (state) 4181 if (!state)
4060 options &= ~Opt_scrollTtyOutput; 4182 SET_OPTION (Opt_scrollTtyOutput);
4061 else 4183 else
4062 options |= Opt_scrollTtyOutput; 4184 CLR_OPTION (Opt_scrollTtyOutput);
4063 break; 4185 break;
4064 case 1011: /* scroll to bottom on key press */ 4186 case 1011: /* scroll to bottom on key press */
4065 if (state) 4187 if (state)
4066 options |= Opt_scrollTtyKeypress; 4188 SET_OPTION (Opt_scrollTtyKeypress);
4067 else 4189 else
4068 options &= ~Opt_scrollTtyKeypress; 4190 CLR_OPTION (Opt_scrollTtyKeypress);
4069 break; 4191 break;
4070 case 1047: /* secondary screen w/ clearing last */ 4192 case 1047: /* secondary screen w/ clearing last */
4071 if (options & Opt_secondaryScreen) 4193 if (OPTION (Opt_secondaryScreen))
4072 if (current_screen != PRIMARY) 4194 if (current_screen != PRIMARY)
4073 scr_erase_screen (2); 4195 scr_erase_screen (2);
4074 scr_change_screen (state); 4196 scr_change_screen (state);
4075 break; 4197 break;
4076 case 1049: /* secondary screen w/ clearing first */ 4198 case 1049: /* secondary screen w/ clearing first */
4077 scr_change_screen (state); 4199 scr_change_screen (state);
4078 if (options & Opt_secondaryScreen) 4200 if (OPTION (Opt_secondaryScreen))
4079 if (current_screen != PRIMARY) 4201 if (current_screen != PRIMARY)
4080 scr_erase_screen (2); 4202 scr_erase_screen (2);
4081 break; 4203 break;
4082 default: 4204 default:
4083 break; 4205 break;
… …
4233 case 106: 4355 case 106:
4234 case 107: 4356 case 107:
4235 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg); 4357 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);
4236 break; 4358 break;
4237#endif 4359#endif
4238
4239 } 4360 }
4240 } 4361 }
4241} 4362}
4242/*}}} */ 4363/*}}} */
4243 4364
… …
4324 } 4445 }
4325 4446
4326 memmove (v_buffer, v_buffer + written, v_buflen); 4447 memmove (v_buffer, v_buffer + written, v_buflen);
4327 } 4448 }
4328 else if (written != -1 || (errno != EAGAIN && errno != EINTR)) 4449 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4329 // original code just ignores this... 4450 pty_ev.set (EVENT_READ);
4330 destroy ();
4331} 4451}
4332 4452
4333/*----------------------- end-of-file (C source) -----------------------*/ 4453/*----------------------- end-of-file (C source) -----------------------*/
4334 4454

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines