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

Diff Legend

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