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.194 by root, Mon Feb 14 10:44:50 2005 UTC vs.
Revision 1.220 by root, Sat Dec 31 18:19:06 2005 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.
… …
117 XK_Escape, 0x238b, 117 XK_Escape, 0x238b,
118 XK_Undo, 0x238c, 118 XK_Undo, 0x238c,
119 XK_Print, 0x2399, 119 XK_Print, 0x2399,
120 120
121 XK_space, 0x2423, 121 XK_space, 0x2423,
122
123#ifdef XK_KP_Begin
124 XK_KP_Prior, 0x21de,
125 XK_KP_Next, 0x21df,
126 XK_KP_Begin, 0x2320,
127 XK_KP_Insert, 0x2380,
128 XK_KP_Delete, 0x2326,
122 XK_KP_Space, 0x2422, 129 XK_KP_Space, 0x2422,
130#endif
123 0, 131 0,
124}; 132};
125 133
126void 134void
127rxvt_term::iso14755_54 (int x, int y) 135rxvt_term::iso14755_54 (int x, int y)
128{ 136{
129 x = Pixel2Col (x); 137 x = Pixel2Col (x);
130 y = Pixel2Row (y); 138 y = Pixel2Row (y);
131 139
132 if (x < 0 || x >= TermWin.ncol 140 if (!IN_RANGE_EXC (x, 0, ncol)
133 || y < 0 || y >= TermWin.nrow) 141 || !IN_RANGE_EXC (y, 0, nrow))
134 return; 142 return;
135 143
136 for (;;) 144 for (;;)
137 { 145 {
138 text_t t = screen.text[y + TermWin.saveLines - TermWin.view_start][x]; 146 const line_t &l = ROW(y - view_start);
147
148 text_t t = l.t[x];
139 149
140 if (t != NOCHAR || !x) 150 if (t != NOCHAR || !x)
141 { 151 {
142 iso14755_51 (screen.text[y + TermWin.saveLines - TermWin.view_start][x], 152 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; 153 iso14755buf = ISO_14755_54;
145 break; 154 break;
146 } 155 }
147 156
148 x--; 157 x--;
149 } 158 }
150
151} 159}
152#endif
153 160
154#if ENABLE_OVERLAY
155void 161void
156rxvt_term::iso14755_51 (unicode_t ch, rend_t r) 162rxvt_term::iso14755_51 (unicode_t ch, rend_t r, int x, int y)
157{ 163{
158 rxvt_fontset *fs = FONTSET (r); 164 rxvt_fontset *fs = FONTSET (r);
159 rxvt_font *f = (*fs)[fs->find_font (ch)]; 165 rxvt_font *f = (*fs)[fs->find_font (ch)];
160 wchar_t *chr, *alloc, ch2; 166 wchar_t *chr, *alloc, ch2, *fname;
161 int len; 167 int len;
162 168
169 fname = rxvt_utf8towcs (f->name);
170
163#if ENABLE_COMBINING 171# if ENABLE_COMBINING
164 if (IS_COMPOSE (ch)) 172 if (IS_COMPOSE (ch))
165 { 173 {
166 len = rxvt_composite.expand (ch, 0); 174 len = rxvt_composite.expand (ch, 0);
167 alloc = chr = new wchar_t[len]; 175 alloc = chr = new wchar_t[len];
168 rxvt_composite.expand (ch, chr); 176 rxvt_composite.expand (ch, chr);
169 } 177 }
170 else 178 else
171#endif 179# endif
172 { 180 {
173 ch2 = ch; 181 ch2 = ch;
174 182
175 alloc = 0; 183 alloc = 0;
176 chr = &ch2; 184 chr = &ch2;
177 len = 1; 185 len = 1;
178 } 186 }
179 187
180 int width = strlen (f->name); 188 char attr[80]; // plenty
181 189
182 scr_overlay_new (0, -1, width < 8+5 ? 8+5 : width, len + 1); 190 sprintf (attr, "%08x = fg %d bg %d%s%s%s%s%s%s",
191 (int)r,
192 fgcolor_of (r), bgcolor_of (r),
193 r & RS_Bold ? " bold" : "",
194 r & RS_Italic ? " italic" : "",
195 r & RS_Blink ? " blink" : "",
196 r & RS_RVid ? " rvid" : "",
197 r & RS_Uline ? " uline" : "",
198 r & RS_Careful ? " careful" : "");
199
200 int width = wcswidth (fname, wcslen (fname));
201
202 max_it (width, 8+5); // for char + hey
203 max_it (width, strlen (attr));
204
205 if (y >= 0)
206 {
207 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1;
208 x = 0;
209 }
210
211 scr_overlay_new (x, y, width, len + 2);
183 212
184 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r)); 213 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));
185 214
186 for (int y = 0; y < len; y++) 215 for (int y = 0; y < len; y++)
187 { 216 {
… …
190 ch = *chr++; 219 ch = *chr++;
191 220
192 sprintf (buf, "%8x", ch); 221 sprintf (buf, "%8x", ch);
193 scr_overlay_set (0, y, buf); 222 scr_overlay_set (0, y, buf);
194 scr_overlay_set (9, y, '='); 223 scr_overlay_set (9, y, '=');
195#if !UNICODE3 224# if !UNICODE3
196 if (ch >= 0x10000) 225 if (ch >= 0x10000)
197 ch = 0xfffd; 226 ch = 0xfffd;
198#endif 227# endif
199 scr_overlay_set (11, y, ch, r); 228 scr_overlay_set (11, y, ch, r);
200 scr_overlay_set (12, y, NOCHAR, r); 229 scr_overlay_set (12, y, NOCHAR, r);
201 } 230 }
202 231
232 scr_overlay_set (0, len , attr);
203 scr_overlay_set (0, len, f->name); 233 scr_overlay_set (0, len + 1, fname);
204 234
235 free (fname);
236
205#if ENABLE_COMBINING 237# if ENABLE_COMBINING
206 if (alloc) 238 if (alloc)
207 delete [] alloc; 239 delete [] alloc;
208#endif 240# endif
209} 241}
210#endif 242#endif
211 243
212void 244void
213rxvt_term::commit_iso14755 () 245rxvt_term::commit_iso14755 ()
… …
276 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an 308 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an
277 * escape sequence to toggle the Keypad. 309 * escape sequence to toggle the Keypad.
278 * 310 *
279 * Always permit `shift' to override the current setting 311 * Always permit `shift' to override the current setting
280 */ 312 */
281 shft = (ev.state & ShiftMask); 313 shft = ev.state & ShiftMask;
282 ctrl = (ev.state & ControlMask); 314 ctrl = ev.state & ControlMask;
283 meta = (ev.state & ModMetaMask); 315 meta = ev.state & ModMetaMask;
284 316
285 if (numlock_state || (ev.state & ModNumLockMask)) 317 if (numlock_state || (ev.state & ModNumLockMask))
286 { 318 {
287 numlock_state = (ev.state & ModNumLockMask); 319 numlock_state = (ev.state & ModNumLockMask);
288 PrivMode ((!numlock_state), PrivMode_aplKP); 320 PrivMode ((!numlock_state), PrivMode_aplKP);
… …
308 340
309 // the XOpenIM manpage lies about hardcoding the locale 341 // the XOpenIM manpage lies about hardcoding the locale
310 // at the point of XOpenIM, so temporarily switch locales 342 // at the point of XOpenIM, so temporarily switch locales
311 if (rs[Rs_imLocale]) 343 if (rs[Rs_imLocale])
312 SET_LOCALE (rs[Rs_imLocale]); 344 SET_LOCALE (rs[Rs_imLocale]);
345
313 // assume wchar_t == unicode or better 346 // assume wchar_t == unicode or better
314 len = XwcLookupString (Input_Context, &ev, wkbuf, 347 len = XwcLookupString (Input_Context, &ev, wkbuf,
315 KBUFSZ, &keysym, &status_return); 348 KBUFSZ, &keysym, &status_return);
349
316 if (rs[Rs_imLocale]) 350 if (rs[Rs_imLocale])
317 SET_LOCALE (locale); 351 SET_LOCALE (locale);
318 352
319 if (status_return == XLookupChars 353 if (status_return == XLookupChars
320 || status_return == XLookupBoth) 354 || status_return == XLookupBoth)
… …
352#ifdef KEYSYM_RESOURCE 386#ifdef KEYSYM_RESOURCE
353 if (keyboard->dispatch (this, keysym, ev.state)) 387 if (keyboard->dispatch (this, keysym, ev.state))
354 return; 388 return;
355#endif 389#endif
356 390
357 if (TermWin.saveLines) 391 if (saveLines)
358 { 392 {
359#ifdef UNSHIFTED_SCROLLKEYS 393#ifdef UNSHIFTED_SCROLLKEYS
360 if (!ctrl && !meta) 394 if (!ctrl && !meta)
361#else 395#else
362 if (IS_SCROLL_MOD) 396 if (IS_SCROLL_MOD)
363#endif 397#endif
364 { 398 {
365 int lnsppg; 399 int lnsppg;
366 400
367#ifdef PAGING_CONTEXT_LINES 401#ifdef PAGING_CONTEXT_LINES
368 lnsppg = TermWin.nrow - PAGING_CONTEXT_LINES; 402 lnsppg = nrow - PAGING_CONTEXT_LINES;
369#else 403#else
370 lnsppg = TermWin.nrow * 4 / 5; 404 lnsppg = nrow * 4 / 5;
371#endif 405#endif
372 if (keysym == XK_Prior) 406 if (keysym == XK_Prior)
373 { 407 {
374 scr_page (UP, lnsppg); 408 scr_page (UP, lnsppg);
375 return; 409 return;
… …
512 else 546 else
513 strcpy (kbuf, key_backspace); 547 strcpy (kbuf, key_backspace);
514 break; 548 break;
515#endif 549#endif
516#ifndef NO_DELETE_KEY 550#ifndef NO_DELETE_KEY
551# ifdef XK_KP_Prior
552 case XK_KP_Delete:
553 /* allow shift to override */
554 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
555 {
556 strcpy (kbuf, "\033On");
557 break;
558 }
559 /* FALLTHROUGH */
560# endif
517 case XK_Delete: 561 case XK_Delete:
518 strcpy (kbuf, key_delete); 562 strcpy (kbuf, key_delete);
519 break; 563 break;
520#endif 564#endif
521 case XK_Tab: 565 case XK_Tab:
… …
624#ifdef XK_KP_Begin 668#ifdef XK_KP_Begin
625 case XK_KP_Begin: 669 case XK_KP_Begin:
626 strcpy (kbuf, "\033Ou"); 670 strcpy (kbuf, "\033Ou");
627 break; 671 break;
628 672
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 673#endif
637 case XK_KP_F1: /* "\033OP" */ 674 case XK_KP_F1: /* "\033OP" */
638 case XK_KP_F2: /* "\033OQ" */ 675 case XK_KP_F2: /* "\033OQ" */
639 case XK_KP_F3: /* "\033OR" */ 676 case XK_KP_F3: /* "\033OR" */
640 case XK_KP_F4: /* "\033OS" */ 677 case XK_KP_F4: /* "\033OS" */
… …
672 break; 709 break;
673 710
674 case XK_Find: 711 case XK_Find:
675 strcpy (kbuf, "\033[1~"); 712 strcpy (kbuf, "\033[1~");
676 break; 713 break;
714
715#ifdef XK_KP_End
716 case XK_KP_Insert:
717 /* allow shift to override */
718 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
719 {
720 strcpy (kbuf, "\033Op");
721 break;
722 }
723 /* FALLTHROUGH */
724#endif
677 case XK_Insert: 725 case XK_Insert:
678 strcpy (kbuf, "\033[2~"); 726 strcpy (kbuf, "\033[2~");
679 break; 727 break;
680#ifdef DXK_Remove /* support for DEC remove like key */ 728#ifdef DXK_Remove /* support for DEC remove like key */
681 case DXK_Remove: 729 case DXK_Remove:
… …
816 } 864 }
817 865
818 if (len <= 0) 866 if (len <= 0)
819 return; /* not mapped */ 867 return; /* not mapped */
820 868
821 if (options & Opt_scrollTtyKeypress) 869 if (OPTION (Opt_scrollTtyKeypress))
822 if (TermWin.view_start) 870 if (view_start)
823 { 871 {
824 TermWin.view_start = 0; 872 view_start = 0;
825 want_refresh = 1; 873 want_refresh = 1;
826 } 874 }
827 875
828 /* 876 /*
829 * these modifications only affect the static keybuffer 877 * these modifications only affect the static keybuffer
… …
1006{ 1054{
1007 if (mouse_slip_wheel_speed == 0 1055 if (mouse_slip_wheel_speed == 0
1008 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed) 1056 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1009 : scr_page (UP, mouse_slip_wheel_speed)) 1057 : scr_page (UP, mouse_slip_wheel_speed))
1010 { 1058 {
1011 if (TermWin.view_start == TermWin.nscrolled || 1059 if (view_start == nsaved ||
1012 TermWin.view_start == 0) 1060 view_start == 0)
1013 mouse_slip_wheel_speed = 0; 1061 mouse_slip_wheel_speed = 0;
1014 1062
1015 refresh_type |= SMOOTH_REFRESH; 1063 refresh_type |= SMOOTH_REFRESH;
1016 want_refresh = 1; 1064 want_refresh = 1;
1017 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1065 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
… …
1039 if (n > 0) 1087 if (n > 0)
1040 { 1088 {
1041 cmdbuf_endp += n; 1089 cmdbuf_endp += n;
1042 return true; 1090 return true;
1043 } 1091 }
1044 else if (n < 0 && errno != EAGAIN) 1092 else if ((n < 0 && errno != EAGAIN && errno != EINTR) || n == 0)
1093 {
1094 pty_ev.stop ();
1095
1096 if (!OPTION (Opt_hold))
1045 destroy (); 1097 destroy ();
1098 }
1046 1099
1047 return false; 1100 return false;
1048} 1101}
1049 1102
1050void 1103void
… …
1064} 1117}
1065 1118
1066void 1119void
1067rxvt_term::pointer_unblank () 1120rxvt_term::pointer_unblank ()
1068{ 1121{
1069 XDefineCursor (display->display, TermWin.vt, TermWin_cursor); 1122 XDefineCursor (display->display, vt, TermWin_cursor);
1070 recolour_cursor (); 1123 recolour_cursor ();
1071 1124
1072#ifdef POINTER_BLANK 1125#ifdef POINTER_BLANK
1073 hidden_pointer = 0; 1126 hidden_pointer = 0;
1074 1127
1075 if (options & Opt_pointerBlank) 1128 if (OPTION (Opt_pointerBlank))
1076 pointer_ev.start (NOW + pointerBlankDelay); 1129 pointer_ev.start (NOW + pointerBlankDelay);
1077#endif 1130#endif
1078} 1131}
1079 1132
1080#ifdef POINTER_BLANK 1133#ifdef POINTER_BLANK
1081void 1134void
1082rxvt_term::pointer_blank () 1135rxvt_term::pointer_blank ()
1083{ 1136{
1084 if (! (options & Opt_pointerBlank)) 1137 if (! OPTION (Opt_pointerBlank))
1085 return; 1138 return;
1086 1139
1087 XDefineCursor (display->display, TermWin.vt, display->blank_cursor); 1140 XDefineCursor (display->display, vt, display->blank_cursor);
1088 XFlush (display->display); 1141 XFlush (display->display);
1089 1142
1090 hidden_pointer = 1; 1143 hidden_pointer = 1;
1091} 1144}
1092 1145
… …
1187 1240
1188 SET_R (this); 1241 SET_R (this);
1189 SET_LOCALE (locale); 1242 SET_LOCALE (locale);
1190 1243
1191#if defined(CURSOR_BLINK) 1244#if defined(CURSOR_BLINK)
1192 if ((options & Opt_cursorBlink) && ev.type == KeyPress) 1245 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress)
1193 { 1246 {
1194 if (hidden_cursor) 1247 if (hidden_cursor)
1195 { 1248 {
1196 hidden_cursor = 0; 1249 hidden_cursor = 0;
1197 want_refresh = 1; 1250 want_refresh = 1;
… …
1200 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1253 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1201 } 1254 }
1202#endif 1255#endif
1203 1256
1204#if defined(POINTER_BLANK) 1257#if defined(POINTER_BLANK)
1205 if ((options & Opt_pointerBlank) && pointerBlankDelay > 0) 1258 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
1206 { 1259 {
1207 if (ev.type == MotionNotify 1260 if (ev.type == MotionNotify
1208 || ev.type == ButtonPress 1261 || ev.type == ButtonPress
1209 || ev.type == ButtonRelease) 1262 || ev.type == ButtonRelease)
1210 if (hidden_pointer) 1263 if (hidden_pointer)
… …
1308 button_release (ev.xbutton); 1361 button_release (ev.xbutton);
1309 break; 1362 break;
1310 1363
1311 case ClientMessage: 1364 case ClientMessage:
1312 if (ev.xclient.format == 32 1365 if (ev.xclient.format == 32
1366 && ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
1367 {
1313 && (Atom)ev.xclient.data.l[0] == xa[XA_WMDELETEWINDOW]) 1368 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1314 destroy (); 1369 destroy ();
1370#if ENABLE_EWMH
1371 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1372 XSendEvent (disp, ev.xclient.window = display->root,
1373 False, SubstructureRedirectMask | SubstructureNotifyMask,
1374 &ev);
1375#endif
1376 }
1377#if ENABLE_XEMBED
1378 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1379 {
1380 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1381 focus_in ();
1382 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1383 focus_out ();
1384 }
1385#endif
1315#ifdef OFFIX_DND 1386#ifdef OFFIX_DND
1316 /* OffiX Dnd (drag 'n' drop) protocol */ 1387 /* OffiX Dnd (drag 'n' drop) protocol */
1317 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL] 1388 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1318 && (ev.xclient.data.l[0] == DndFile 1389 && (ev.xclient.data.l[0] == DndFile
1319 || ev.xclient.data.l[0] == DndDir 1390 || ev.xclient.data.l[0] == DndDir
1320 || ev.xclient.data.l[0] == DndLink)) 1391 || ev.xclient.data.l[0] == DndLink))
1321 { 1392 {
1322 /* Get Dnd data */ 1393 /* Get Dnd data */
1323 Atom ActualType; 1394 Atom ActualType;
1324 int ActualFormat; 1395 int ActualFormat;
1325 unsigned char *data; 1396 unsigned char *data;
… …
1368 break; 1439 break;
1369 } 1440 }
1370 break; 1441 break;
1371 1442
1372 case FocusIn: 1443 case FocusIn:
1373 if (!TermWin.focus) 1444 focus_in ();
1445 break;
1446
1447 case FocusOut:
1448 focus_out ();
1449 break;
1450
1451 case ConfigureNotify:
1452 if (ev.xconfigure.window == parent[0])
1374 { 1453 {
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)); 1454 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev))
1455 ;
1442 1456
1443 if (szHint.width != width || szHint.height != height) 1457 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1444 { 1458 {
1445 seen_resize = 1; 1459 seen_resize = 1;
1446 resize_all_windows (width, height, 1); 1460 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1447 } 1461 }
1448 1462
1449#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1463#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1450 if (options & Opt_transparent) 1464 if (OPTION (Opt_transparent))
1451 check_our_parents (); 1465 check_our_parents ();
1452#endif 1466#endif
1453 } 1467 }
1454 break; 1468 break;
1455 1469
… …
1472 case SelectionRequest: 1486 case SelectionRequest:
1473 selection_send (ev.xselectionrequest); 1487 selection_send (ev.xselectionrequest);
1474 break; 1488 break;
1475 1489
1476 case UnmapNotify: 1490 case UnmapNotify:
1477 TermWin.mapped = 0; 1491 mapped = 0;
1478#ifdef TEXT_BLINK 1492#ifdef TEXT_BLINK
1479 text_blink_ev.stop (); 1493 text_blink_ev.stop ();
1480#endif 1494#endif
1481 break; 1495 break;
1482 1496
1483 case MapNotify: 1497 case MapNotify:
1484 TermWin.mapped = 1; 1498 mapped = 1;
1485#ifdef TEXT_BLINK 1499#ifdef TEXT_BLINK
1486 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 1500 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1487#endif 1501#endif
1488 break; 1502 break;
1489 1503
… …
1493 break; 1507 break;
1494#endif /* TRANSPARENT */ 1508#endif /* TRANSPARENT */
1495 1509
1496 case GraphicsExpose: 1510 case GraphicsExpose:
1497 case Expose: 1511 case Expose:
1498 if (ev.xany.window == TermWin.vt) 1512 if (ev.xany.window == vt)
1499 { 1513 {
1500 do 1514 do
1501 scr_expose (ev.xexpose.x, ev.xexpose.y, 1515 scr_expose (ev.xexpose.x, ev.xexpose.y,
1502 ev.xexpose.width, ev.xexpose.height, False); 1516 ev.xexpose.width, ev.xexpose.height, False);
1503 while (XCheckTypedWindowEvent (disp, TermWin.vt, ev.xany.type, &ev)); 1517 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev));
1504 1518
1505 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1519 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1506 1520
1507 while (XCheckTypedWindowEvent (disp, TermWin.vt, ev.xany.type, &ev)) 1521 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev))
1508 scr_expose (ev.xexpose.x, ev.xexpose.y, 1522 scr_expose (ev.xexpose.x, ev.xexpose.y,
1509 ev.xexpose.width, ev.xexpose.height, False); 1523 ev.xexpose.width, ev.xexpose.height, False);
1510 1524
1511 scr_refresh (refresh_type); 1525 scr_refresh (refresh_type);
1512 } 1526 }
… …
1528 if (menubar_visible () && isMenuBarWindow (ev.xany.window)) 1542 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1529 menubar_expose (); 1543 menubar_expose ();
1530#endif 1544#endif
1531 1545
1532#ifdef TRANSPARENT 1546#ifdef TRANSPARENT
1533 if (am_transparent && ev.xany.window == TermWin.parent[0]) 1547 if (am_transparent && ev.xany.window == parent[0])
1534 XClearWindow (disp, ev.xany.window); 1548 XClearWindow (disp, ev.xany.window);
1535#endif 1549#endif
1536 } 1550 }
1537 break; 1551 break;
1538 1552
… …
1549 } 1563 }
1550#endif 1564#endif
1551 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1565 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1552 break; 1566 break;
1553 1567
1554 if (ev.xany.window == TermWin.vt) 1568 if (ev.xany.window == vt)
1555 { 1569 {
1556 if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1570 if (ev.xbutton.state & (Button1Mask | Button3Mask))
1557 { 1571 {
1558 while (XCheckTypedWindowEvent (disp, TermWin.vt, MotionNotify, &ev)) 1572 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev))
1559 ; 1573 ;
1560 1574
1561 XQueryPointer (disp, TermWin.vt, 1575 XQueryPointer (disp, vt,
1562 &unused_root, &unused_child, 1576 &unused_root, &unused_child,
1563 &unused_root_x, &unused_root_y, 1577 &unused_root_x, &unused_root_y,
1564 &ev.xbutton.x, &ev.xbutton.y, 1578 &ev.xbutton.x, &ev.xbutton.y,
1565 &ev.xbutton.state); 1579 &ev.xbutton.state);
1566#ifdef MOUSE_THRESHOLD 1580#ifdef MOUSE_THRESHOLD
… …
1578#endif 1592#endif
1579 selection_extend (ev.xbutton.x, ev.xbutton.y, 1593 selection_extend (ev.xbutton.x, ev.xbutton.y,
1580 ev.xbutton.state & Button3Mask ? 2 : 0); 1594 ev.xbutton.state & Button3Mask ? 2 : 0);
1581 1595
1582#ifdef SELECTION_SCROLLING 1596#ifdef SELECTION_SCROLLING
1583 if (ev.xbutton.y < TermWin.int_bwidth 1597 if (ev.xbutton.y < int_bwidth
1584 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1)) 1598 || Pixel2Row (ev.xbutton.y) > (nrow-1))
1585 { 1599 {
1586 int dist; 1600 int dist;
1587 1601
1588 /* don't clobber the current delay if we are 1602 /* don't clobber the current delay if we are
1589 * already in the middle of scrolling. 1603 * already in the middle of scrolling.
… …
1597 selection_save_x = ev.xbutton.x; 1611 selection_save_x = ev.xbutton.x;
1598 selection_save_y = ev.xbutton.y; 1612 selection_save_y = ev.xbutton.y;
1599 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0; 1613 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;
1600 1614
1601 /* calc number of lines to scroll */ 1615 /* calc number of lines to scroll */
1602 if (ev.xbutton.y < TermWin.int_bwidth) 1616 if (ev.xbutton.y < int_bwidth)
1603 { 1617 {
1604 scroll_selection_dir = UP; 1618 scroll_selection_dir = UP;
1605 dist = TermWin.int_bwidth - ev.xbutton.y; 1619 dist = int_bwidth - ev.xbutton.y;
1606 } 1620 }
1607 else 1621 else
1608 { 1622 {
1609 scroll_selection_dir = DN; 1623 scroll_selection_dir = DN;
1610 dist = ev.xbutton.y - (TermWin.int_bwidth + TermWin.height); 1624 dist = ev.xbutton.y - (int_bwidth + height);
1611 } 1625 }
1612 1626
1613 scroll_selection_lines = Pixel2Height (dist) 1627 scroll_selection_lines = Pixel2Height (dist)
1614 / SELECTION_SCROLL_LINE_SPEEDUP 1628 / SELECTION_SCROLL_LINE_SPEEDUP
1615 + 1; 1629 + 1;
1616 MIN_IT (scroll_selection_lines, 1630 min_it (scroll_selection_lines,
1617 SELECTION_SCROLL_MAX_LINES); 1631 SELECTION_SCROLL_MAX_LINES);
1618 } 1632 }
1619 else 1633 else
1620 { 1634 {
1621 /* we are within the text window, so we 1635 /* we are within the text window, so we
… …
1649 } 1663 }
1650 break; 1664 break;
1651 } 1665 }
1652} 1666}
1653 1667
1668void
1669rxvt_term::focus_in ()
1670{
1671 if (!focus)
1672 {
1673 focus = 1;
1674 want_refresh = 1;
1675#if USE_XIM
1676 if (Input_Context != NULL)
1677 {
1678 IMSetStatusPosition ();
1679 XSetICFocus (Input_Context);
1680 }
1681#endif
1682#if CURSOR_BLINK
1683 if (OPTION (Opt_cursorBlink))
1684 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1685#endif
1686#if OFF_FOCUS_FADING
1687 if (rs[Rs_fade])
1688 {
1689 pix_colors = pix_colors_focused;
1690 scr_recolour ();
1691 }
1692#endif
1693 }
1694}
1695
1696void
1697rxvt_term::focus_out ()
1698{
1699 if (focus)
1700 {
1701 focus = 0;
1702 want_refresh = 1;
1703
1704#if ENABLE_FRILLS || ISO_14755
1705 iso14755buf = 0;
1706#endif
1707#if ENABLE_OVERLAY
1708 scr_overlay_off ();
1709#endif
1710#if USE_XIM
1711 if (Input_Context != NULL)
1712 XUnsetICFocus (Input_Context);
1713#endif
1714#if CURSOR_BLINK
1715 if (OPTION (Opt_cursorBlink))
1716 cursor_blink_ev.stop ();
1717 hidden_cursor = 0;
1718#endif
1719#if OFF_FOCUS_FADING
1720 if (rs[Rs_fade])
1721 {
1722 pix_colors = pix_colors_unfocused;
1723 scr_recolour ();
1724 }
1725#endif
1726 }
1727}
1728
1654#if TRANSPARENT 1729#if TRANSPARENT
1655void 1730void
1656rxvt_term::rootwin_cb (XEvent &ev) 1731rxvt_term::rootwin_cb (XEvent &ev)
1657{ 1732{
1658 SET_R (this); 1733 SET_R (this);
… …
1669 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1744 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID])
1670 return; 1745 return;
1671 1746
1672 /* FALLTHROUGH */ 1747 /* FALLTHROUGH */
1673 case ReparentNotify: 1748 case ReparentNotify:
1674 if ((options & Opt_transparent) && check_our_parents () && am_transparent) 1749 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)
1675 want_refresh = want_full_refresh = 1; 1750 want_refresh = want_full_refresh = 1;
1676 break; 1751 break;
1677 } 1752 }
1678} 1753}
1679#endif 1754#endif
… …
1688 reportmode = !! (priv_modes & PrivMode_mouse_report); 1763 reportmode = !! (priv_modes & PrivMode_mouse_report);
1689 1764
1690 /* 1765 /*
1691 * VT window processing of button press 1766 * VT window processing of button press
1692 */ 1767 */
1693 if (ev.window == TermWin.vt) 1768 if (ev.window == vt)
1694 { 1769 {
1695#if ISO_14755 1770#if ISO_14755
1696 // 5.4 1771 // 5.4
1697 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1772 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1698 { 1773 {
… …
1903 case Button3: 1978 case Button3:
1904 if (scrollBar.style != R_SB_XTERM) 1979 if (scrollBar.style != R_SB_XTERM)
1905 { 1980 {
1906 if (scrollbar_above_slider (ev.y)) 1981 if (scrollbar_above_slider (ev.y))
1907# ifdef RXVT_SCROLL_FULL 1982# ifdef RXVT_SCROLL_FULL
1908 scr_page (UP, TermWin.nrow - 1); 1983 scr_page (UP, nrow - 1);
1909# else 1984# else
1910 scr_page (UP, TermWin.nrow / 4); 1985 scr_page (UP, nrow / 4);
1911# endif 1986# endif
1912 else if (scrollbar_below_slider (ev.y)) 1987 else if (scrollbar_below_slider (ev.y))
1913# ifdef RXVT_SCROLL_FULL 1988# ifdef RXVT_SCROLL_FULL
1914 scr_page (DN, TermWin.nrow - 1); 1989 scr_page (DN, nrow - 1);
1915# else 1990# else
1916 scr_page (DN, TermWin.nrow / 4); 1991 scr_page (DN, nrow / 4);
1917# endif 1992# endif
1918 else 1993 else
1919 scrollBar.setMotion (); 1994 scrollBar.setMotion ();
1920 } 1995 }
1921 else 1996 else
1922 { 1997 {
1923 scr_page ((ev.button == Button1 ? DN : UP), 1998 scr_page ((ev.button == Button1 ? DN : UP),
1924 (TermWin.nrow 1999 (nrow
1925 * scrollbar_position (ev.y) 2000 * scrollbar_position (ev.y)
1926 / scrollbar_size ())); 2001 / scrollbar_size ()));
1927 } 2002 }
1928 2003
1929 break; 2004 break;
… …
1961#ifdef SELECTION_SCROLLING 2036#ifdef SELECTION_SCROLLING
1962 if (sel_scroll_ev.active) 2037 if (sel_scroll_ev.active)
1963 sel_scroll_ev.stop(); 2038 sel_scroll_ev.stop();
1964#endif 2039#endif
1965 2040
1966 if (ev.window == TermWin.vt) 2041 if (ev.window == vt)
1967 { 2042 {
1968#if ISO_14755 2043#if ISO_14755
1969 // 5.4 2044 // 5.4
1970 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 2045 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1971 return; 2046 return;
… …
2021 2096
2022 v = ev.button == Button4 ? UP : DN; 2097 v = ev.button == Button4 ? UP : DN;
2023 2098
2024 if (ev.state & ShiftMask) 2099 if (ev.state & ShiftMask)
2025 i = 1; 2100 i = 1;
2026 else if (options & Opt_mouseWheelScrollPage) 2101 else if (OPTION (Opt_mouseWheelScrollPage))
2027 i = TermWin.nrow - 1; 2102 i = nrow - 1;
2028 else 2103 else
2029 i = 5; 2104 i = 5;
2030 2105
2031# ifdef MOUSE_SLIP_WHEELING 2106# ifdef MOUSE_SLIP_WHEELING
2032 if (ev.state & ControlMask) 2107 if (ev.state & ControlMask)
2033 { 2108 {
2034 mouse_slip_wheel_speed += v ? -1 : 1; 2109 mouse_slip_wheel_speed += v ? -1 : 1;
2035 if (mouse_slip_wheel_speed < -TermWin.nrow) mouse_slip_wheel_speed = -TermWin.nrow; 2110 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; 2111 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2037 2112
2038 if (slip_wheel_ev.at < NOW) 2113 if (slip_wheel_ev.at < NOW)
2039 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; 2114 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;
2040 2115
2041 slip_wheel_ev.start (); 2116 slip_wheel_ev.start ();
… …
2317 XWindowAttributes wattr, wrootattr; 2392 XWindowAttributes wattr, wrootattr;
2318 dDisp; 2393 dDisp;
2319 2394
2320 pchanged = 0; 2395 pchanged = 0;
2321 2396
2322 if (!(options & Opt_transparent)) 2397 if (!OPTION (Opt_transparent))
2323 return pchanged; /* Don't try any more */ 2398 return pchanged; /* Don't try any more */
2324 2399
2325 XGetWindowAttributes (disp, display->root, &wrootattr); 2400 XGetWindowAttributes (disp, display->root, &wrootattr);
2326 rootdepth = wrootattr.depth; 2401 rootdepth = wrootattr.depth;
2327 2402
2328 XGetWindowAttributes (disp, TermWin.parent[0], &wattr); 2403 XGetWindowAttributes (disp, parent[0], &wattr);
2329 2404
2330 if (rootdepth != wattr.depth) 2405 if (rootdepth != wattr.depth)
2331 { 2406 {
2332 if (am_transparent) 2407 if (am_transparent)
2333 { 2408 {
2334 pchanged = 1; 2409 pchanged = 1;
2335 XSetWindowBackground (disp, TermWin.vt, pix_colors_focused[Color_bg]); 2410 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2336 am_transparent = am_pixmap_trans = 0; 2411 am_transparent = am_pixmap_trans = 0;
2337 } 2412 }
2338 2413
2339 return pchanged; /* Don't try any more */ 2414 return pchanged; /* Don't try any more */
2340 } 2415 }
… …
2381 Window cr; 2456 Window cr;
2382 XImage *image; 2457 XImage *image;
2383 GC gc; 2458 GC gc;
2384 XGCValues gcvalue; 2459 XGCValues gcvalue;
2385 2460
2386 XTranslateCoordinates (disp, TermWin.parent[0], display->root, 2461 XTranslateCoordinates (disp, parent[0], display->root,
2387 0, 0, &sx, &sy, &cr); 2462 0, 0, &sx, &sy, &cr);
2388 nw = (unsigned int)szHint.width; 2463 nw = (unsigned int)szHint.width;
2389 nh = (unsigned int)szHint.height; 2464 nh = (unsigned int)szHint.height;
2390 nx = ny = 0; 2465 nx = ny = 0;
2391 2466
… …
2401 nh += sy; 2476 nh += sy;
2402 ny = -sy; 2477 ny = -sy;
2403 sy = 0; 2478 sy = 0;
2404 } 2479 }
2405 2480
2406 MIN_IT (nw, (unsigned int) (wrootattr.width - sx)); 2481 min_it (nw, (unsigned int) (wrootattr.width - sx));
2407 MIN_IT (nh, (unsigned int) (wrootattr.height - sy)); 2482 min_it (nh, (unsigned int) (wrootattr.height - sy));
2408 2483
2409 XSync (disp, False); 2484 XSync (disp, False);
2410 allowedxerror = -1; 2485 allowedxerror = -1;
2411 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap); 2486 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2412 2487
… …
2417 if (image == NULL) 2492 if (image == NULL)
2418 { 2493 {
2419 if (am_transparent && am_pixmap_trans) 2494 if (am_transparent && am_pixmap_trans)
2420 { 2495 {
2421 pchanged = 1; 2496 pchanged = 1;
2422 if (TermWin.pixmap != None) 2497 if (pixmap != None)
2423 { 2498 {
2424 XFreePixmap (disp, TermWin.pixmap); 2499 XFreePixmap (disp, pixmap);
2425 TermWin.pixmap = None; 2500 pixmap = None;
2426 } 2501 }
2427 } 2502 }
2428 2503
2429 am_pixmap_trans = 0; 2504 am_pixmap_trans = 0;
2430 } 2505 }
2431 else 2506 else
2432 { 2507 {
2433 if (TermWin.pixmap != None) 2508 if (pixmap != None)
2434 XFreePixmap (disp, TermWin.pixmap); 2509 XFreePixmap (disp, pixmap);
2435 2510
2436#if TINTING 2511#if TINTING
2437 if (ISSET_PIXCOLOR (Color_tint)) 2512 if (ISSET_PIXCOLOR (Color_tint))
2438 { 2513 {
2439 unsigned short rm, gm, bm; 2514 unsigned short rm, gm, bm;
… …
2443 2518
2444 ShadeXImage (display, image, shade, rm, gm, bm); 2519 ShadeXImage (display, image, shade, rm, gm, bm);
2445 } 2520 }
2446#endif 2521#endif
2447 2522
2448 TermWin.pixmap = XCreatePixmap (disp, TermWin.vt, 2523 pixmap = XCreatePixmap (disp, vt,
2449 szHint.width, szHint.height, image->depth); 2524 szHint.width, szHint.height, image->depth);
2450 gc = XCreateGC (disp, TermWin.vt, 0UL, &gcvalue); 2525 gc = XCreateGC (disp, vt, 0UL, &gcvalue);
2451 XPutImage (disp, TermWin.pixmap, gc, image, 0, 0, 2526 XPutImage (disp, pixmap, gc, image, 0, 0,
2452 nx, ny, image->width, image->height); 2527 nx, ny, image->width, image->height);
2453 XFreeGC (disp, gc); 2528 XFreeGC (disp, gc);
2454 XDestroyImage (image); 2529 XDestroyImage (image);
2455 XSetWindowBackgroundPixmap (disp, TermWin.parent[0], TermWin.pixmap); 2530 XSetWindowBackgroundPixmap (disp, parent[0], pixmap);
2456 XClearWindow (disp, TermWin.parent[0]); 2531 XClearWindow (disp, parent[0]);
2457 2532
2458 if (!am_transparent || !am_pixmap_trans) 2533 if (!am_transparent || !am_pixmap_trans)
2459 pchanged = 1; 2534 pchanged = 1;
2460 2535
2461 am_transparent = am_pixmap_trans = 1; 2536 am_transparent = am_pixmap_trans = 1;
2462 } 2537 }
2463 } 2538 }
2464 2539
2465 if (am_pixmap_trans) 2540 if (am_pixmap_trans)
2466 XSetWindowBackgroundPixmap (disp, TermWin.vt, ParentRelative); 2541 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2467 else 2542 else
2468 { 2543 {
2469 unsigned int n; 2544 unsigned int n;
2470 /* 2545 /*
2471 * InheritPixmap transparency 2546 * InheritPixmap transparency
2472 */ 2547 */
2473 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2548 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2474 { 2549 {
2475 oldp = TermWin.parent[i]; 2550 oldp = parent[i];
2476 XQueryTree (disp, TermWin.parent[i - 1], &root, 2551 XQueryTree (disp, parent[i - 1], &root,
2477 &TermWin.parent[i], &list, &n); 2552 &parent[i], &list, &n);
2478 XFree (list); 2553 XFree (list);
2479 2554
2480 if (TermWin.parent[i] == display->root) 2555 if (parent[i] == display->root)
2481 { 2556 {
2482 if (oldp != None) 2557 if (oldp != None)
2483 pchanged = 1; 2558 pchanged = 1;
2484 2559
2485 break; 2560 break;
2486 } 2561 }
2487 2562
2488 if (oldp != TermWin.parent[i]) 2563 if (oldp != parent[i])
2489 pchanged = 1; 2564 pchanged = 1;
2490 } 2565 }
2491 2566
2492 n = 0; 2567 n = 0;
2493 2568
2494 if (pchanged) 2569 if (pchanged)
2495 { 2570 {
2496 for (; n < (unsigned int)i; n++) 2571 for (; n < (unsigned int)i; n++)
2497 { 2572 {
2498 XGetWindowAttributes (disp, TermWin.parent[n], &wattr); 2573 XGetWindowAttributes (disp, parent[n], &wattr);
2499 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) 2574 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2500 { 2575 {
2501 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1; 2576 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2502 break; 2577 break;
2503 } 2578 }
2504 } 2579 }
2505 } 2580 }
2506 2581
2507 if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0]))) 2582 if (n > (int) (sizeof (parent) / sizeof (parent[0])))
2508 { 2583 {
2509 XSetWindowBackground (disp, TermWin.parent[0], pix_colors_focused[Color_fg]); 2584 XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]);
2510 XSetWindowBackground (disp, TermWin.vt, pix_colors_focused[Color_bg]); 2585 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2511 am_transparent = 0; 2586 am_transparent = 0;
2512 /* XXX: also turn off Opt_transparent? */ 2587 /* XXX: also turn off Opt_transparent? */
2513 } 2588 }
2514 else 2589 else
2515 { 2590 {
… …
2518 * needed for fvwm2.2.2 (and before?) */ 2593 * needed for fvwm2.2.2 (and before?) */
2519 sleep (1); 2594 sleep (1);
2520#endif 2595#endif
2521 for (n = 0; n < (unsigned int)i; n++) 2596 for (n = 0; n < (unsigned int)i; n++)
2522 { 2597 {
2523 XSetWindowBackgroundPixmap (disp, TermWin.parent[n], ParentRelative); 2598 XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative);
2524 XClearWindow (disp, TermWin.parent[n]); 2599 XClearWindow (disp, parent[n]);
2525 } 2600 }
2526 2601
2527 XSetWindowBackgroundPixmap (disp, TermWin.vt, ParentRelative); 2602 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2528 am_transparent = 1; 2603 am_transparent = 1;
2529 } 2604 }
2530 2605
2531 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2606 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2532 TermWin.parent[i] = None; 2607 parent[i] = None;
2533 } 2608 }
2534 2609
2535 if (scrollBar.win) 2610 if (scrollBar.win)
2536 { 2611 {
2537 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative); 2612 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);
… …
2580 // some window managers resize the window early, and these programs 2655 // some window managers resize the window early, and these programs
2581 // then sometimes get the size wrong. 2656 // then sometimes get the size wrong.
2582 // unfortunately other programs are even more buggy and dislike 2657 // unfortunately other programs are even more buggy and dislike
2583 // being sent SIGWINCH, so only do it when we were in fact being 2658 // being sent SIGWINCH, so only do it when we were in fact being
2584 // resized. 2659 // resized.
2585 if (seen_resize) 2660 if (seen_resize && cmd_pid)
2586 kill (-cmd_pid, SIGWINCH); 2661 kill (-cmd_pid, SIGWINCH);
2587 } 2662 }
2588 2663
2589 /* Read a text string from the input buffer */ 2664 /* Read a text string from the input buffer */
2590 unicode_t buf[UBUFSIZ]; 2665 unicode_t buf[UBUFSIZ];
2591 bool refreshnow = false; 2666 bool refreshnow = false;
2592 int nlines = 0; 2667 int nlines = 0;
2593 unicode_t *str = buf; 2668 unicode_t *str = buf;
2669 unicode_t *eol = str + min (ncol, UBUFSIZ);
2594 2670
2595 for (;;) 2671 for (;;)
2596 { 2672 {
2597 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2673 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2598 break; 2674 break;
2599 2675
2600 *str++ = ch; 2676 *str++ = ch;
2601 2677
2602 if (ch == C0_LF) 2678 if (ch == C0_LF || str >= eol)
2603 { 2679 {
2680 if (ch == C0_LF)
2604 nlines++; 2681 nlines++;
2682
2605 refresh_count++; 2683 refresh_count++;
2606 2684
2607 if (!(options & Opt_jumpScroll) 2685 if (!OPTION (Opt_jumpScroll)
2608 || (refresh_count >= refresh_limit * (TermWin.nrow - 1))) 2686 || (refresh_count >= refresh_limit * (nrow - 1)))
2609 { 2687 {
2610 refreshnow = true; 2688 refreshnow = true;
2611 ch = NOCHAR; 2689 ch = NOCHAR;
2612 break; 2690 break;
2613 } 2691 }
2614 2692
2615 // scr_add_lines only works for nlines <= TermWin.nrow - 1. 2693 // scr_add_lines only works for nlines <= nrow - 1.
2616 if (nlines >= TermWin.nrow - 1) 2694 if (nlines >= nrow - 1)
2617 { 2695 {
2618 scr_add_lines (buf, nlines, str - buf); 2696 scr_add_lines (buf, nlines, str - buf);
2619 nlines = 0; 2697 nlines = 0;
2620 str = buf; 2698 str = buf;
2699 eol = str + min (ncol, UBUFSIZ);
2621 } 2700 }
2622 }
2623 2701
2624 if (str >= buf + UBUFSIZ) 2702 if (str >= eol)
2625 { 2703 {
2704 if (eol >= buf + UBUFSIZ)
2705 {
2626 ch = NOCHAR; 2706 ch = NOCHAR;
2627 break; 2707 break;
2708 }
2709 else
2710 eol = min (eol + ncol, buf + UBUFSIZ);
2711 }
2712
2628 } 2713 }
2629 2714
2630 seq_begin = cmdbuf_ptr; 2715 seq_begin = cmdbuf_ptr;
2631 ch = next_char (); 2716 ch = next_char ();
2632 } 2717 }
… …
2639 * the number of pages between refreshes is refresh_limit, which 2724 * the number of pages between refreshes is refresh_limit, which
2640 * is incremented here because we must be doing flat-out scrolling. 2725 * is incremented here because we must be doing flat-out scrolling.
2641 */ 2726 */
2642 if (refreshnow) 2727 if (refreshnow)
2643 { 2728 {
2644 if ((options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 2729 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2645 refresh_limit++; 2730 refresh_limit++;
2646 else 2731 else
2647 { 2732 {
2648 flag = true; 2733 flag = true;
2649 scr_refresh (refresh_type); 2734 scr_refresh (refresh_type);
… …
3291 3376
3292 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */ 3377 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */
3293 arg[0] = -arg[0]; 3378 arg[0] = -arg[0];
3294 /* FALLTHROUGH */ 3379 /* FALLTHROUGH */
3295 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 3380 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
3296 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0); 3381 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
3297 break; 3382 break;
3298 3383
3299 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 3384 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
3300 tt_write ((const unsigned char *)VT100_ANS, 3385 tt_write ((const unsigned char *)VT100_ANS,
3301 (unsigned int) (sizeof (VT100_ANS) - 1)); 3386 (unsigned int) (sizeof (VT100_ANS) - 1));
… …
3313 break; 3398 break;
3314 case 6: /* CPR requested */ 3399 case 6: /* CPR requested */
3315 scr_report_position (); 3400 scr_report_position ();
3316 break; 3401 break;
3317 case 7: /* unofficial extension */ 3402 case 7: /* unofficial extension */
3318 if (options & Opt_insecure) 3403 if (OPTION (Opt_insecure))
3319 tt_printf ("%-.250s\012", rs[Rs_display_name]); 3404 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3320 break; 3405 break;
3321 case 8: /* unofficial extension */ 3406 case 8: /* unofficial extension */
3322 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3407 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3323 break; 3408 break;
… …
3426 { 3511 {
3427 /* 3512 /*
3428 * commands 3513 * commands
3429 */ 3514 */
3430 case 1: /* deiconify window */ 3515 case 1: /* deiconify window */
3431 XMapWindow (disp, TermWin.parent[0]); 3516 XMapWindow (disp, parent[0]);
3432 break; 3517 break;
3433 case 2: /* iconify window */ 3518 case 2: /* iconify window */
3434 XIconifyWindow (disp, TermWin.parent[0], display->screen); 3519 XIconifyWindow (disp, parent[0], display->screen);
3435 break; 3520 break;
3436 case 3: /* set position (pixels) */ 3521 case 3: /* set position (pixels) */
3437 XMoveWindow (disp, TermWin.parent[0], args[1], args[2]); 3522 XMoveWindow (disp, parent[0], args[1], args[2]);
3438 break; 3523 break;
3439 case 4: /* set size (pixels) */ 3524 case 4: /* set size (pixels) */
3440 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3525 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3441 break; 3526 break;
3442 case 5: /* raise window */ 3527 case 5: /* raise window */
3443 XRaiseWindow (disp, TermWin.parent[0]); 3528 XRaiseWindow (disp, parent[0]);
3444 break; 3529 break;
3445 case 6: /* lower window */ 3530 case 6: /* lower window */
3446 XLowerWindow (disp, TermWin.parent[0]); 3531 XLowerWindow (disp, parent[0]);
3447 break; 3532 break;
3448 case 7: /* refresh window */ 3533 case 7: /* refresh window */
3449 scr_touch (true); 3534 scr_touch (true);
3450 break; 3535 break;
3451 case 8: /* set size (chars) */ 3536 case 8: /* set size (chars) */
3452 set_widthheight ((unsigned int) (args[2] * TermWin.fwidth), 3537 set_widthheight ((unsigned int) (args[2] * fwidth),
3453 (unsigned int) (args[1] * TermWin.fheight)); 3538 (unsigned int) (args[1] * fheight));
3454 break; 3539 break;
3455 3540
3456 //case 9: NYI, TODO, restore maximized window or maximize window 3541 //case 9: NYI, TODO, restore maximized window or maximize window
3457 default: 3542 default:
3458 if (args[0] >= 24) /* set height (chars) */ 3543 if (args[0] >= 24) /* set height (chars) */
3459 set_widthheight ((unsigned int)TermWin.width, 3544 set_widthheight ((unsigned int)width,
3460 (unsigned int) (args[1] * TermWin.fheight)); 3545 (unsigned int) (args[1] * fheight));
3461 break; 3546 break;
3462 3547
3463 3548
3464 /* 3549 /*
3465 * reports - some output format copied from XTerm 3550 * reports - some output format copied from XTerm
3466 */ 3551 */
3467 case 11: /* report window state */ 3552 case 11: /* report window state */
3468 XGetWindowAttributes (disp, TermWin.parent[0], &wattr); 3553 XGetWindowAttributes (disp, parent[0], &wattr);
3469 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3554 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3470 break; 3555 break;
3471 case 13: /* report window position */ 3556 case 13: /* report window position */
3472 XGetWindowAttributes (disp, TermWin.parent[0], &wattr); 3557 XGetWindowAttributes (disp, parent[0], &wattr);
3473 XTranslateCoordinates (disp, TermWin.parent[0], wattr.root, 3558 XTranslateCoordinates (disp, parent[0], wattr.root,
3474 -wattr.border_width, -wattr.border_width, 3559 -wattr.border_width, -wattr.border_width,
3475 &x, &y, &wdummy); 3560 &x, &y, &wdummy);
3476 tt_printf ("\033[3;%d;%dt", x, y); 3561 tt_printf ("\033[3;%d;%dt", x, y);
3477 break; 3562 break;
3478 case 14: /* report window size (pixels) */ 3563 case 14: /* report window size (pixels) */
3479 XGetWindowAttributes (disp, TermWin.parent[0], &wattr); 3564 XGetWindowAttributes (disp, parent[0], &wattr);
3480 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3565 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3481 break; 3566 break;
3482 case 18: /* report text area size (chars) */ 3567 case 18: /* report text area size (chars) */
3483 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); 3568 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3484 break; 3569 break;
3485 case 19: /* report window size (chars) */ 3570 case 19: /* report window size (chars) */
3486 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol); 3571 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3487 break; 3572 break;
3488 case 20: /* report icon label */ 3573 case 20: /* report icon label */
3489 { 3574 {
3490 char *s; 3575 char *s;
3491 XGetIconName (disp, TermWin.parent[0], &s); 3576 XGetIconName (disp, parent[0], &s);
3492 tt_printf ("\033]L%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3577 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3493 XFree (s); 3578 XFree (s);
3494 } 3579 }
3495 break; 3580 break;
3496 case 21: /* report window title */ 3581 case 21: /* report window title */
3497 { 3582 {
3498 char *s; 3583 char *s;
3499 XFetchName (disp, TermWin.parent[0], &s); 3584 XFetchName (disp, parent[0], &s);
3500 tt_printf ("\033]l%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3585 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3501 XFree (s); 3586 XFree (s);
3502 } 3587 }
3503 break; 3588 break;
3504 } 3589 }
3505} 3590}
… …
3537 else if (ch < 0x20) 3622 else if (ch < 0x20)
3538 return NULL; /* other control character - exit */ 3623 return NULL; /* other control character - exit */
3539 3624
3540 seen_esc = false; 3625 seen_esc = false;
3541 3626
3542 if (n >= sizeof (string) - 1) 3627 if (n >= STRING_MAX - 1)
3543 // stop at some sane length 3628 // stop at some sane length
3544 return NULL; 3629 return NULL;
3545 3630
3546 if (ch == C0_SYN) 3631 if (ch == C0_SYN)
3547 string[n++] = cmd_get8 (); 3632 string[n++] = cmd_get8 ();
… …
3615 set_window_color (color, str); 3700 set_window_color (color, str);
3616} 3701}
3617 3702
3618/* 3703/*
3619 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3704 * 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 */ 3705 */
3643void 3706void
3644rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp) 3707rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp)
3645{ 3708{
3646 int changed = 0; 3709 int changed = 0;
… …
3672 unsigned long bytes_after; 3735 unsigned long bytes_after;
3673 unsigned char *value = 0; 3736 unsigned char *value = 0;
3674 const char *str = ""; 3737 const char *str = "";
3675 3738
3676 if (prop 3739 if (prop
3677 && XGetWindowProperty (disp, TermWin.parent[0], 3740 && XGetWindowProperty (disp, parent[0],
3678 prop, 0, 1<<16, 0, AnyPropertyType, 3741 prop, 0, 1<<16, 0, AnyPropertyType,
3679 &actual_type, &actual_format, 3742 &actual_type, &actual_format,
3680 &nitems, &bytes_after, &value) == Success 3743 &nitems, &bytes_after, &value) == Success
3681 && actual_type != None 3744 && actual_type != None
3682 && actual_format == 8) 3745 && actual_format == 8)
… …
3694 { 3757 {
3695 *eq = 0; 3758 *eq = 0;
3696 set_utf8_property (display->atom (str), eq + 1); 3759 set_utf8_property (display->atom (str), eq + 1);
3697 } 3760 }
3698 else 3761 else
3699 XDeleteProperty (disp, TermWin.parent[0], 3762 XDeleteProperty (disp, parent[0],
3700 display->atom (str)); 3763 display->atom (str));
3701 } 3764 }
3702 break; 3765 break;
3703 3766
3704 case XTerm_Color: 3767 case XTerm_Color:
… …
3745 break; 3808 break;
3746#ifndef NO_BOLD_UNDERLINE_REVERSE 3809#ifndef NO_BOLD_UNDERLINE_REVERSE
3747 case XTerm_Color_BD: 3810 case XTerm_Color_BD:
3748 process_color_seq (XTerm_Color_BD, Color_BD, str, resp); 3811 process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3749 break; 3812 break;
3750 case XTerm_Color_IT:
3751 process_color_seq (XTerm_Color_IT, Color_IT, str, resp);
3752 break;
3753 case XTerm_Color_UL: 3813 case XTerm_Color_UL:
3754 process_color_seq (XTerm_Color_UL, Color_UL, str, resp); 3814 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3755 break; 3815 break;
3756 case XTerm_Color_RV: 3816 case XTerm_Color_RV:
3757 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3817 process_color_seq (XTerm_Color_RV, Color_RV, str, resp);
3758 break; 3818 break;
3819 case URxvt_Color_IT:
3820 process_color_seq (URxvt_Color_IT, Color_IT, str, resp);
3821 break;
3759#endif 3822#endif
3760#if TRANSPARENT && TINTING 3823#if TRANSPARENT && TINTING
3761 case XTerm_Color_tint: 3824 case URxvt_Color_tint:
3762 process_color_seq (XTerm_Color_tint, Color_tint, str, resp); 3825 process_color_seq (URxvt_Color_tint, Color_tint, str, resp);
3763 check_our_parents (); 3826 check_our_parents ();
3764 if (am_transparent) 3827 if (am_transparent)
3765 want_full_refresh = want_refresh = 1; 3828 want_full_refresh = want_refresh = 1;
3766 break; 3829 break;
3767#endif 3830#endif
… …
3801 3864
3802 case XTerm_logfile: 3865 case XTerm_logfile:
3803 // TODO, when secure mode? 3866 // TODO, when secure mode?
3804 break; 3867 break;
3805 3868
3869#ifdef MENUBAR
3870 case URxvt_Menu:
3871 if (OPTION (Opt_insecure))
3872 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3873 break;
3874#endif
3875#if 0
3876 case XTerm_dumpscreen: /* no error notices */
3877 {
3878 int fd;
3879 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3880 {
3881 scr_dump (fd);
3882 close (fd);
3883 }
3884 }
3885 break;
3886#endif
3806 case XTerm_font: 3887 case XTerm_font:
3807 op = URxvt_font; 3888 op = URxvt_font;
3808 case URxvt_font: 3889 case URxvt_font:
3809#if ENABLE_STYLES 3890#if ENABLE_STYLES
3810 case URxvt_boldFont: 3891 case URxvt_boldFont:
3811 case URxvt_italicFont: 3892 case URxvt_italicFont:
3812 case URxvt_boldItalicFont: 3893 case URxvt_boldItalicFont:
3813#endif 3894#endif
3814 if (query) 3895 if (query)
3815 tt_printf ("\33]%d;%-.250s%c", saveop, 3896 tt_printf ("\33]%d;%-.250s%c", saveop,
3816 (options & Opt_insecure) && TermWin.fontset[op - URxvt_font]->fontdesc 3897 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3817 ? TermWin.fontset[op - URxvt_font]->fontdesc : "", 3898 ? fontset[op - URxvt_font]->fontdesc : "",
3818 resp); 3899 resp);
3819 else 3900 else
3820 { 3901 {
3821 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3902 const char *&res = rs[Rs_font + (op - URxvt_font)];
3822 3903
… …
3825 set_fonts (); 3906 set_fonts ();
3826 } 3907 }
3827 break; 3908 break;
3828 3909
3829#if ENABLE_FRILLS 3910#if ENABLE_FRILLS
3830 case XTerm_locale: 3911 case URxvt_locale:
3831 if (query) 3912 if (query)
3832 tt_printf ("\33]%d;%-.250s%c", XTerm_locale, (options & Opt_insecure) ? locale : "", resp); 3913 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp);
3833 else 3914 else
3834 { 3915 {
3835 set_locale (str); 3916 set_locale (str);
3836 pty.set_utf8_mode (enc_utf8); 3917 pty.set_utf8_mode (enc_utf8);
3837# ifdef USE_XIM
3838 im_cb (); 3918 init_xlocale ();
3839# endif
3840 } 3919 }
3841 break; 3920 break;
3842#endif
3843 3921
3844#ifdef MENUBAR 3922 case URxvt_view_up:
3845 case XTerm_Menu: 3923 case URxvt_view_down:
3846 if (options & Opt_insecure) 3924 int lines = atoi (str);
3847 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked 3925
3848 break; 3926 if (lines)
3849#endif 3927 scr_page (op == URxvt_view_up ? UP : DN, lines);
3850#if 0
3851 case XTerm_dumpscreen: /* no error notices */
3852 { 3928 else
3853 int fd;
3854 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3855 { 3929 {
3856 scr_dump (fd); 3930 scr_erase_savelines ();
3857 close (fd);
3858 } 3931 }
3859 } 3932
3860 break; 3933 break;
3861#endif 3934#endif
3862 } 3935 }
3863} 3936}
3864/*----------------------------------------------------------------------*/ 3937/*----------------------------------------------------------------------*/
… …
3973 } 4046 }
3974 4047
3975 /* extra handling for values with state unkept */ 4048 /* extra handling for values with state unkept */
3976 switch (arg[i]) 4049 switch (arg[i])
3977 { 4050 {
4051#if ENABLE_STYLES
4052 case 1021:
4053 if (mode)
4054 SET_OPTION (Opt_intensityStyles);
4055 else
4056 CLR_OPTION (Opt_intensityStyles);
4057#endif
3978 case 1048: /* alternative cursor save */ 4058 case 1048: /* alternative cursor save */
3979 case 1049: 4059 case 1049:
3980 if (options & Opt_secondaryScreen) 4060 if (OPTION (Opt_secondaryScreen))
3981 if (mode == 0) 4061 if (mode == 0)
3982 scr_cursor (RESTORE); 4062 scr_cursor (RESTORE);
3983 else if (mode == 1) 4063 else if (mode == 1)
3984 scr_cursor (SAVE); 4064 scr_cursor (SAVE);
3985 break; 4065 break;
… …
3997 */ 4077 */
3998 PrivMode (1, PrivMode_vt52); 4078 PrivMode (1, PrivMode_vt52);
3999 break; 4079 break;
4000 case 3: /* 80/132 */ 4080 case 3: /* 80/132 */
4001 if (priv_modes & PrivMode_132OK) 4081 if (priv_modes & PrivMode_132OK)
4002 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height); 4082 set_widthheight (((state ? 132 : 80) * fwidth), height);
4003 break; 4083 break;
4004 case 4: /* smooth scrolling */ 4084 case 4: /* smooth scrolling */
4005 if (state) 4085 if (!state)
4006 options &= ~Opt_jumpScroll; 4086 SET_OPTION (Opt_jumpScroll);
4007 else 4087 else
4008 options |= Opt_jumpScroll; 4088 CLR_OPTION (Opt_jumpScroll);
4009 break; 4089 break;
4010 case 5: /* reverse video */ 4090 case 5: /* reverse video */
4011 scr_rvideo_mode (state); 4091 scr_rvideo_mode (state);
4012 break; 4092 break;
4013 case 6: /* relative/absolute origins */ 4093 case 6: /* relative/absolute origins */
… …
4054#if 0 4134#if 0
4055 case 1001: 4135 case 1001:
4056 break; /* X11 mouse highlighting */ 4136 break; /* X11 mouse highlighting */
4057#endif 4137#endif
4058 case 1010: /* scroll to bottom on TTY output inhibit */ 4138 case 1010: /* scroll to bottom on TTY output inhibit */
4059 if (state) 4139 if (!state)
4060 options &= ~Opt_scrollTtyOutput; 4140 SET_OPTION (Opt_scrollTtyOutput);
4061 else 4141 else
4062 options |= Opt_scrollTtyOutput; 4142 CLR_OPTION (Opt_scrollTtyOutput);
4063 break; 4143 break;
4064 case 1011: /* scroll to bottom on key press */ 4144 case 1011: /* scroll to bottom on key press */
4065 if (state) 4145 if (state)
4066 options |= Opt_scrollTtyKeypress; 4146 SET_OPTION (Opt_scrollTtyKeypress);
4067 else 4147 else
4068 options &= ~Opt_scrollTtyKeypress; 4148 CLR_OPTION (Opt_scrollTtyKeypress);
4069 break; 4149 break;
4070 case 1047: /* secondary screen w/ clearing last */ 4150 case 1047: /* secondary screen w/ clearing last */
4071 if (options & Opt_secondaryScreen) 4151 if (OPTION (Opt_secondaryScreen))
4072 if (current_screen != PRIMARY) 4152 if (current_screen != PRIMARY)
4073 scr_erase_screen (2); 4153 scr_erase_screen (2);
4074 scr_change_screen (state); 4154 scr_change_screen (state);
4075 break; 4155 break;
4076 case 1049: /* secondary screen w/ clearing first */ 4156 case 1049: /* secondary screen w/ clearing first */
4077 scr_change_screen (state); 4157 scr_change_screen (state);
4078 if (options & Opt_secondaryScreen) 4158 if (OPTION (Opt_secondaryScreen))
4079 if (current_screen != PRIMARY) 4159 if (current_screen != PRIMARY)
4080 scr_erase_screen (2); 4160 scr_erase_screen (2);
4081 break; 4161 break;
4082 default: 4162 default:
4083 break; 4163 break;
… …
4324 } 4404 }
4325 4405
4326 memmove (v_buffer, v_buffer + written, v_buflen); 4406 memmove (v_buffer, v_buffer + written, v_buflen);
4327 } 4407 }
4328 else if (written != -1 || (errno != EAGAIN && errno != EINTR)) 4408 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4329 // original code just ignores this... 4409 pty_ev.set (EVENT_READ);
4330 destroy ();
4331} 4410}
4332 4411
4333/*----------------------- end-of-file (C source) -----------------------*/ 4412/*----------------------- end-of-file (C source) -----------------------*/
4334 4413

Diff Legend

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