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.480 by sf-exg, Mon Mar 7 11:48:55 2011 UTC vs.
Revision 1.525 by sf-exg, Wed Aug 15 19:41:49 2012 UTC

… …
54 54
55#ifdef KEYSYM_RESOURCE 55#ifdef KEYSYM_RESOURCE
56# include "keyboard.h" 56# include "keyboard.h"
57#endif 57#endif
58 58
59#include <csignal> 59#include <signal.h>
60 60
61#if LINUX_YIELD_HACK 61#if LINUX_YIELD_HACK
62# include <ctime> 62# include <time.h>
63#endif 63#endif
64 64
65/*----------------------------------------------------------------------*/ 65/*----------------------------------------------------------------------*/
66 66
67#define IS_CONTROL(ch) !((ch) & 0xffffff60UL) 67#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
… …
131 XK_KP_Space, 0x2422, 131 XK_KP_Space, 0x2422,
132#endif 132#endif
133 0, 133 0,
134}; 134};
135 135
136void 136void ecb_cold
137rxvt_term::iso14755_54 (int x, int y) 137rxvt_term::iso14755_54 (int x, int y)
138{ 138{
139 x = Pixel2Col (x); 139 x = Pixel2Col (x);
140 y = Pixel2Row (y); 140 y = Pixel2Row (y);
141 141
… …
149 149
150 text_t t = l.t[x]; 150 text_t t = l.t[x];
151 151
152 if (t != NOCHAR || !x) 152 if (t != NOCHAR || !x)
153 { 153 {
154 iso14755_51 (l.t[x], l.r[x], x, y); 154 iso14755_51 (l.t[x], l.r[x], x, y, view_start);
155 iso14755buf = ISO_14755_54; 155 iso14755buf = ISO_14755_54;
156 break; 156 break;
157 } 157 }
158 158
159 x--; 159 x--;
160 } 160 }
161} 161}
162 162
163void 163void ecb_cold
164rxvt_term::iso14755_51 (unicode_t ch, rend_t r, int x, int y) 164rxvt_term::iso14755_51 (unicode_t ch, rend_t r, int x, int y, int y2)
165{ 165{
166 rxvt_fontset *fs = FONTSET (r); 166 rxvt_fontset *fs = FONTSET (r);
167 wchar_t *chr, *alloc, ch2, **fname; 167 wchar_t *chr, *alloc, ch2, **fname;
168 int len; 168 int len;
169 169
… …
181 181
182 alloc = 0; 182 alloc = 0;
183 chr = &ch2; 183 chr = &ch2;
184 len = 1; 184 len = 1;
185 } 185 }
186
187 char rowcol[40];
188 snprintf (rowcol, sizeof rowcol, "col %d row %d @%d", x, y, y2);
186 189
187 char attr[80]; // plenty 190 char attr[80]; // plenty
188 191
189 sprintf (attr, "%08x = fg %d bg %d%s%s%s%s%s%s", 192 sprintf (attr, "%08x = fg %d bg %d%s%s%s%s%s%s",
190 (int)r, 193 (int)r,
… …
203 rxvt_font *f = (*fs)[fs->find_font_idx (chr[i])]; 206 rxvt_font *f = (*fs)[fs->find_font_idx (chr[i])];
204 fname[i] = rxvt_utf8towcs (f->name); 207 fname[i] = rxvt_utf8towcs (f->name);
205 max_it (width, wcswidth (fname[i], wcslen (fname[i]))); 208 max_it (width, wcswidth (fname[i], wcslen (fname[i])));
206 } 209 }
207 210
208 max_it (width, 8+5); // for char + hex
209 max_it (width, strlen (attr)); 211 max_it (width, strlen (attr));
210 212
211 if (y >= 0) 213 if (y >= 0)
212 { 214 {
213 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1; 215 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1;
214 x = 0; 216 x = 0;
215 } 217 }
216 218
217 scr_overlay_new (x, y, width, len * 2 + 1); 219 scr_overlay_new (x, y, width, len * 2 + 2);
220
221 scr_overlay_set (0, 0, rowcol);
218 222
219 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r)); 223 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));
220 224
221 for (int y = 0; y < len; y++) 225 for (int y = 0; y < len; y++)
222 { 226 {
223 char buf[9]; 227 char buf[9];
224 228
225 ch = *chr++; 229 ch = *chr++;
226 230
227 sprintf (buf, "%8x", ch); 231 sprintf (buf, "%8x", ch);
228 scr_overlay_set (0, y, buf); 232 scr_overlay_set (0, y + 1, buf);
229 scr_overlay_set (9, y, '='); 233 scr_overlay_set (9, y + 1, '=');
230# if !UNICODE_3 234# if !UNICODE_3
231 if (ch >= 0x10000) 235 if (ch >= 0x10000)
232 ch = 0xfffd; 236 ch = 0xfffd;
233# endif 237# endif
234 scr_overlay_set (11, y, ch, r); 238 scr_overlay_set (11, y + 1, ch, r);
235 239
236 if (WCWIDTH (ch) >= 2) 240 if (WCWIDTH (ch) >= 2)
237 scr_overlay_set (12, y, NOCHAR, r); 241 scr_overlay_set (12, y + 1, NOCHAR, r);
238 } 242 }
239 243
240// { 244// {
241// char buf[4+4+3+1]; 245// char buf[4+4+3+1];
242// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y); 246// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y);
243// scr_overlay_set (0, 0, buf); 247// scr_overlay_set (0, 0, buf);
244// } 248// }
245 scr_overlay_set (0, len , attr); 249 scr_overlay_set (0, len + 1, attr);
246 for (int i = 0; i < len; i++) 250 for (int i = 0; i < len; i++)
247 { 251 {
248 scr_overlay_set (0, len + 1 + i, fname[i]); 252 scr_overlay_set (0, len + 2 + i, fname[i]);
249 free (fname[i]); 253 free (fname[i]);
250 } 254 }
251 255
252# if ENABLE_COMBINING 256# if ENABLE_COMBINING
253 if (alloc) 257 if (alloc)
254 delete [] alloc; 258 delete [] alloc;
255# endif 259# endif
256} 260}
257#endif 261#endif
258 262
259void 263void ecb_cold
260rxvt_term::commit_iso14755 () 264rxvt_term::commit_iso14755 ()
261{ 265{
262 wchar_t ch[2];
263
264 ch[0] = iso14755buf & ISO_14755_MASK; 266 wchar_t ch = iso14755buf & ISO_14755_MASK;
265 ch[1] = 0;
266 267
267 if (iso14755buf & ISO_14755_51) 268 if (iso14755buf & ISO_14755_51)
268 { 269 {
269 char mb[16]; 270 char mb[MB_LEN_MAX];
270 int len; 271 int len;
271 272
272 // allow verbatim 0-bytes and control-bytes to be entered 273 // allow verbatim 0-bytes and control-bytes to be entered
273 if (ch[0] >= 0x20) 274 if (ch >= 0x20)
274 len = wcstombs (mb, ch, 16); 275 len = wctomb (mb, ch);
275 else 276 else
276 { 277 {
277 mb[0] = ch[0]; 278 mb[0] = ch;
278 len = 1; 279 len = 1;
279 } 280 }
280 281
281 if (len > 0) 282 if (len > 0)
282 tt_write (mb, len); 283 tt_write (mb, len);
… …
285 } 286 }
286 287
287 iso14755buf = 0; 288 iso14755buf = 0;
288} 289}
289 290
290static int 291static int ecb_cold
291hex_keyval (XKeyEvent &ev) 292hex_keyval (XKeyEvent &ev)
292{ 293{
293 // check whether this event corresponds to a hex digit 294 // check whether this event corresponds to a hex digit
294 // if the modifiers had not been pressed. 295 // if the modifiers had not been pressed.
295 for (int index = 0; index < 8; index++) 296 for (int index = 0; index < 8; index++)
… …
304 305
305 return -1; 306 return -1;
306} 307}
307#endif 308#endif
308 309
309static inline KeySym 310static inline KeySym ecb_cold
310translate_keypad (KeySym keysym, bool kp) 311translate_keypad (KeySym keysym, bool kp)
311{ 312{
312#ifdef XK_KP_Home 313#ifdef XK_KP_Home
313 static const KeySym keypadtrans[] = { 314 static const KeySym keypadtrans[] = {
314 XK_KP_7, // XK_KP_Home 315 XK_KP_7, // XK_KP_Home
… …
340# endif 341# endif
341#endif 342#endif
342 return keysym; 343 return keysym;
343} 344}
344 345
345static inline int 346static inline int ecb_cold
346map_function_key (KeySym keysym) 347map_function_key (KeySym keysym)
347{ 348{
348 int param = 0; 349 int param = 0;
349 350
350 if (IN_RANGE_INC (keysym, XK_F1, XK_F35)) 351 if (IN_RANGE_INC (keysym, XK_F1, XK_F35))
… …
399 break; 400 break;
400 } 401 }
401 return param; 402 return param;
402} 403}
403 404
404void 405void ecb_cold
405rxvt_term::key_press (XKeyEvent &ev) 406rxvt_term::key_press (XKeyEvent &ev)
406{ 407{
407 int ctrl, meta, shft, len; 408 int ctrl, meta, shft, len;
408 KeySym keysym; 409 KeySym keysym;
409 int valid_keysym; 410 int valid_keysym;
… …
424 ctrl = ev.state & ControlMask; 425 ctrl = ev.state & ControlMask;
425 meta = ev.state & ModMetaMask; 426 meta = ev.state & ModMetaMask;
426 427
427 kbuf[0] = 0; 428 kbuf[0] = 0;
428 429
429#ifdef USE_XIM 430#if USE_XIM
430 if (Input_Context) 431 if (Input_Context)
431 { 432 {
432 Status status_return; 433 Status status_return;
433 434
434#if 0 435#if 0
… …
569 selection_request (ev.time); 570 selection_request (ev.time);
570 return; 571 return;
571#if TODO 572#if TODO
572 /* rxvt extras */ 573 /* rxvt extras */
573 case XK_KP_Add: /* Shift+KP_Add = bigger font */ 574 case XK_KP_Add: /* Shift+KP_Add = bigger font */
574 change_font (FONT_UP);
575 return; 575 return;
576 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */ 576 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */
577 change_font (FONT_DN);
578 return; 577 return;
579#endif 578#endif
580 } 579 }
581 } 580 }
582 } 581 }
… …
781 } 780 }
782 781
783 if (newlen) 782 if (newlen)
784 len = strlen (kbuf); 783 len = strlen (kbuf);
785 784
785 if (len > 0)
786 {
786 /* 787 /*
788 * pass Shift/Control indicators for function keys ending with `~'
789 *
790 * eg,
791 * Prior = "ESC[5~"
792 * Shift+Prior = "ESC[5$"
793 * Ctrl+Prior = "ESC[5^"
794 * Ctrl+Shift+Prior = "ESC[5@"
795 */
796 if (kbuf[0] == C0_ESC && kbuf[1] == '[' && kbuf[len - 1] == '~')
797 kbuf[len - 1] = (shft ? (ctrl ? '@' : '$') : (ctrl ? '^' : '~'));
798
799 /*
787 * Pass meta for all function keys, if 'meta' option set 800 * Pass meta for all function keys, if 'meta' option set
788 */ 801 */
789#ifdef META8_OPTION 802#ifdef META8_OPTION
790 if (meta && (meta_char == 0x80) && len > 0) 803 if (meta && (meta_char == 0x80))
791 kbuf[len - 1] |= 0x80; 804 kbuf[len - 1] |= 0x80;
792#endif 805#endif
806 }
793 807
794 } 808 }
795 else if (ctrl && keysym == XK_minus) 809 else if (ctrl && keysym == XK_minus)
796 { 810 {
797 len = 1; 811 len = 1;
… …
831 { 845 {
832 view_start = 0; 846 view_start = 0;
833 want_refresh = 1; 847 want_refresh = 1;
834 } 848 }
835 849
836 /*
837 * these modifications only affect the static keybuffer
838 * pass Shift/Control indicators for function keys ending with `~'
839 *
840 * eg,
841 * Prior = "ESC[5~"
842 * Shift+Prior = "ESC[5$"
843 * Ctrl+Prior = "ESC[5^"
844 * Ctrl+Shift+Prior = "ESC[5@"
845 * Meta adds an Escape prefix (with META8_OPTION, if meta == <escape>).
846 */
847 if (kbuf[0] == C0_ESC && kbuf[1] == '[' && kbuf[len - 1] == '~')
848 kbuf[len - 1] = (shft ? (ctrl ? '@' : '$') : (ctrl ? '^' : '~'));
849
850 /* escape prefix */ 850 /* escape prefix */
851 if (meta 851 if (meta
852#ifdef META8_OPTION 852#ifdef META8_OPTION
853 && meta_char == C0_ESC 853 && meta_char == C0_ESC
854#endif 854#endif
… …
859 } 859 }
860 860
861 tt_write (kbuf, (unsigned int)len); 861 tt_write (kbuf, (unsigned int)len);
862} 862}
863 863
864void 864void ecb_cold
865rxvt_term::key_release (XKeyEvent &ev) 865rxvt_term::key_release (XKeyEvent &ev)
866{ 866{
867#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL 867#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
868 KeySym keysym; 868 KeySym keysym;
869 869
… …
936 else if (keysym == XK_Control_L || keysym == XK_Control_R) 936 else if (keysym == XK_Control_L || keysym == XK_Control_R)
937 mouse_slip_wheel_speed = 0; 937 mouse_slip_wheel_speed = 0;
938#endif 938#endif
939} 939}
940 940
941#if defined (KEYSYM_RESOURCE)
942unsigned int
943rxvt_term::cmd_write (const char *str, unsigned int count)
944{
945 unsigned int n, s;
946
947 n = cmdbuf_ptr - cmdbuf_base;
948 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp;
949
950 if (n > 0 && s < count)
951 {
952 memmove (cmdbuf_base, cmdbuf_ptr,
953 (unsigned int) (cmdbuf_endp - cmdbuf_ptr));
954 cmdbuf_ptr = cmdbuf_base;
955 cmdbuf_endp -= n;
956 s += n;
957 }
958
959 if (count > s)
960 {
961 rxvt_warn ("data loss: cmd_write too large, continuing.\n");
962 count = s;
963 }
964
965 for (; count--;)
966 *cmdbuf_endp++ = *str++;
967
968 cmd_parse ();
969
970 return 0;
971}
972#endif
973
974void 941void
975rxvt_term::flush () 942rxvt_term::flush ()
976{ 943{
977 flush_ev.stop (); 944 flush_ev.stop ();
978 945
… …
1024 while (row < end_row); 991 while (row < end_row);
1025 } 992 }
1026 993
1027 scr_refresh (); 994 scr_refresh ();
1028 scrollBar.show (1); 995 scrollBar.show (1);
1029#ifdef USE_XIM 996#if USE_XIM
1030 IMSendSpot (); 997 im_send_spot ();
1031#endif 998#endif
1032 } 999 }
1033 1000
1034 display->flush (); 1001 display->flush ();
1035} 1002}
… …
1053 flush (); 1020 flush ();
1054} 1021}
1055 1022
1056#ifdef CURSOR_BLINK 1023#ifdef CURSOR_BLINK
1057void 1024void
1025rxvt_term::cursor_blink_reset ()
1026{
1027 if (hidden_cursor)
1028 {
1029 hidden_cursor = 0;
1030 want_refresh = 1;
1031 }
1032
1033 if (option (Opt_cursorBlink))
1034 cursor_blink_ev.again ();
1035 else
1036 cursor_blink_ev.stop ();
1037}
1038
1039void
1058rxvt_term::cursor_blink_cb (ev::timer &w, int revents) 1040rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
1059{ 1041{
1060 hidden_cursor = !hidden_cursor; 1042 hidden_cursor = !hidden_cursor;
1061 want_refresh = 1; 1043 want_refresh = 1;
1062 refresh_check (); 1044 refresh_check ();
… …
1080 1062
1081#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1063#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1082void 1064void
1083rxvt_term::cont_scroll_cb (ev::timer &w, int revents) 1065rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1084{ 1066{
1085 if ((scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN) 1067 if ((scrollBar.state == SB_STATE_UP || scrollBar.state == SB_STATE_DOWN)
1086 && scr_page (scrollBar.state == STATE_UP ? UP : DN, 1)) 1068 && scr_page (scrollBar.state == SB_STATE_UP ? UP : DN, 1))
1087 { 1069 {
1088 want_refresh = 1; 1070 want_refresh = 1;
1089 refresh_check (); 1071 refresh_check ();
1090 } 1072 }
1091 else 1073 else
… …
1152 { 1134 {
1153 } 1135 }
1154} event_handler; 1136} event_handler;
1155#endif 1137#endif
1156 1138
1139/* make sure all the cmd data is at beginning of cmdbuf */
1140void
1141rxvt_term::cmdbuf_reify ()
1142{
1143 if (cmdbuf_ptr == cmdbuf_base)
1144 return;
1145
1146 ssize_t used = cmdbuf_endp - cmdbuf_ptr;
1147
1148 memmove (cmdbuf_base, cmdbuf_ptr, used);
1149 cmdbuf_ptr = cmdbuf_base;
1150 cmdbuf_endp = cmdbuf_ptr + used;
1151
1152}
1153
1154#if defined (KEYSYM_RESOURCE)
1155void
1156rxvt_term::cmdbuf_append (const char *str, size_t count)
1157{
1158 cmdbuf_reify ();
1159
1160 size_t avail = cmdbuf_base + CBUFSIZ - cmdbuf_endp;
1161
1162 if (count > avail)
1163 return;
1164
1165 memcpy (cmdbuf_endp, str, count);
1166 cmdbuf_endp += count;
1167
1168 cmd_parse ();
1169}
1170#endif
1171
1157bool 1172bool
1158rxvt_term::pty_fill () 1173rxvt_term::pty_fill ()
1159{ 1174{
1160 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1175 cmdbuf_reify ();
1161 1176
1162 if (CBUFSIZ == n) 1177 size_t avail = cmdbuf_base + CBUFSIZ - cmdbuf_endp;
1178
1179 if (!avail)
1180 {
1163 n = 0; // normally this indicates a "too long" command sequence - just drop the data we have 1181 // normally this indicates a "too long" command sequence - just drop the data we have
1164
1165 memmove (cmdbuf_base, cmdbuf_ptr, n);
1166 cmdbuf_ptr = cmdbuf_base; 1182 cmdbuf_ptr = cmdbuf_base;
1167 cmdbuf_endp = cmdbuf_ptr + n; 1183 cmdbuf_endp = cmdbuf_ptr;
1184 avail = CBUFSIZ;
1185 }
1168 1186
1169 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n); 1187 ssize_t r = read (pty->pty, cmdbuf_endp, avail);
1170 1188
1171 if (r > 0) 1189 if (r > 0)
1172 { 1190 {
1173 cmdbuf_endp += r; 1191 cmdbuf_endp += r;
1174 return true; 1192 return true;
… …
1205 pty_write (); 1223 pty_write ();
1206 1224
1207 refresh_check (); 1225 refresh_check ();
1208} 1226}
1209 1227
1210void 1228void ecb_cold
1211rxvt_term::pointer_unblank () 1229rxvt_term::pointer_unblank ()
1212{ 1230{
1213 XDefineCursor (dpy, vt, TermWin_cursor); 1231 XDefineCursor (dpy, vt, TermWin_cursor);
1214 recolour_cursor (); 1232 recolour_cursor ();
1215 1233
… …
1220 pointer_ev.start (pointerBlankDelay); 1238 pointer_ev.start (pointerBlankDelay);
1221#endif 1239#endif
1222} 1240}
1223 1241
1224#ifdef POINTER_BLANK 1242#ifdef POINTER_BLANK
1225void 1243void ecb_cold
1226rxvt_term::pointer_blank () 1244rxvt_term::pointer_blank ()
1227{ 1245{
1228 if (!option (Opt_pointerBlank)) 1246 if (!option (Opt_pointerBlank))
1229 return; 1247 return;
1230 1248
… …
1232 XFlush (dpy); 1250 XFlush (dpy);
1233 1251
1234 hidden_pointer = 1; 1252 hidden_pointer = 1;
1235} 1253}
1236 1254
1237void 1255void ecb_cold
1238rxvt_term::pointer_cb (ev::timer &w, int revents) 1256rxvt_term::pointer_cb (ev::timer &w, int revents)
1239{ 1257{
1240 make_current (); 1258 make_current ();
1241 1259
1242 pointer_blank (); 1260 pointer_blank ();
… …
1334 32 + x, 1352 32 + x,
1335 32 + y); 1353 32 + y);
1336} 1354}
1337 1355
1338/*{{{ process an X event */ 1356/*{{{ process an X event */
1339void 1357void ecb_hot
1340rxvt_term::x_cb (XEvent &ev) 1358rxvt_term::x_cb (XEvent &ev)
1341{ 1359{
1342 make_current (); 1360 make_current ();
1343 1361
1344 dLocal (Display *, dpy); 1362 dLocal (Display *, dpy);
… …
1442 && ev.xfocus.mode != NotifyGrab) 1460 && ev.xfocus.mode != NotifyGrab)
1443 focus_out (); 1461 focus_out ();
1444 break; 1462 break;
1445 1463
1446 case ConfigureNotify: 1464 case ConfigureNotify:
1447 if (ev.xconfigure.window == parent[0]) 1465 if (ev.xconfigure.window == parent)
1448 { 1466 {
1449 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1467 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1450 ; 1468 ;
1451 1469
1470 bool want_position_change = SHOULD_INVOKE (HOOK_POSITION_CHANGE);
1471
1472 bool moved = false;
1452#ifdef HAVE_BG_PIXMAP 1473#ifdef HAVE_BG_PIXMAP
1453 bool moved = false;
1454 if (bg_window_position_sensitive ()) 1474 if (bg_window_position_sensitive ())
1455 { 1475 {
1476 want_position_change = true;
1477 if (!(bg_flags & BG_IS_VALID))
1478 moved = true;
1479 }
1480#endif
1481
1482 if (want_position_change)
1483 {
1456 int x, y; 1484 int x, y;
1485
1457 if (ev.xconfigure.send_event) 1486 if (ev.xconfigure.send_event)
1458 { 1487 {
1459 x = ev.xconfigure.x; 1488 x = ev.xconfigure.x;
1460 y = ev.xconfigure.y; 1489 y = ev.xconfigure.y;
1461 } 1490 }
1462 else 1491 else
1463 get_window_origin (x, y); 1492 get_window_origin (x, y);
1464 1493
1465 if (bg_set_position (x, y) 1494 if (x != parent_x || y != parent_y)
1466 || !(bg_flags & BG_IS_VALID)) 1495 {
1496 parent_x = x;
1497 parent_y = y;
1498 HOOK_INVOKE ((this, HOOK_POSITION_CHANGE, DT_INT, x, DT_INT, y, DT_END));
1467 moved = true; 1499 moved = true;
1500 }
1468 } 1501 }
1469#endif
1470 1502
1471 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1503 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1472 { 1504 {
1473 seen_resize = 1; 1505 seen_resize = 1;
1474 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1506 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1475 } 1507 }
1476 else 1508 else
1477 { 1509 {
1478#ifdef HAVE_BG_PIXMAP 1510#ifdef HAVE_BG_PIXMAP
1479 if (moved) 1511 if (moved)
1480 {
1481 if (mapped)
1482 update_background (); 1512 update_background ();
1483 else
1484 bg_invalidate ();
1485 }
1486#endif 1513#endif
1487 } 1514 }
1488 1515
1489 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1516 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1490 } 1517 }
… …
1564 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event)) 1591 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1565 ; 1592 ;
1566 1593
1567 if (scrollBar.state && ev.xany.window == scrollBar.win) 1594 if (scrollBar.state && ev.xany.window == scrollBar.win)
1568 { 1595 {
1569 scrollBar.state = STATE_IDLE; 1596 scrollBar.state = SB_STATE_IDLE;
1570 scrollBar.show (0); 1597 scrollBar.show (0);
1571 } 1598 }
1572 } 1599 }
1573 break; 1600 break;
1574 1601
… …
1640 dist = int_bwidth - ev.xbutton.y; 1667 dist = int_bwidth - ev.xbutton.y;
1641 } 1668 }
1642 else 1669 else
1643 { 1670 {
1644 scroll_selection_dir = DN; 1671 scroll_selection_dir = DN;
1645 dist = ev.xbutton.y - (int_bwidth + height); 1672 dist = ev.xbutton.y - (int_bwidth + vt_height);
1646 } 1673 }
1647 1674
1648 scroll_selection_lines = Pixel2Height (dist) 1675 scroll_selection_lines = Pixel2Height (dist)
1649 / SELECTION_SCROLL_LINE_SPEEDUP 1676 / SELECTION_SCROLL_LINE_SPEEDUP
1650 + 1; 1677 + 1;
… …
1662#ifdef MOUSE_THRESHOLD 1689#ifdef MOUSE_THRESHOLD
1663 } 1690 }
1664#endif 1691#endif
1665 } 1692 }
1666 } 1693 }
1667 else if (scrollBar.state == STATE_MOTION && ev.xany.window == scrollBar.win) 1694 else if (scrollBar.state == SB_STATE_MOTION && ev.xany.window == scrollBar.win)
1668 { 1695 {
1669 while (XCheckTypedWindowEvent (dpy, scrollBar.win, 1696 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1670 MotionNotify, &ev)) 1697 MotionNotify, &ev))
1671 ; 1698 ;
1672 1699
1673 XQueryPointer (dpy, scrollBar.win, 1700 XQueryPointer (dpy, scrollBar.win,
1674 &unused_root, &unused_child, 1701 &unused_root, &unused_child,
1675 &unused_root_x, &unused_root_y, 1702 &unused_root_x, &unused_root_y,
1676 &ev.xbutton.x, &ev.xbutton.y, 1703 &ev.xbutton.x, &ev.xbutton.y,
1677 &unused_mask); 1704 &unused_mask);
1678 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1705 scr_move_to (scrollBar.position (ev.xbutton.y) - csrO,
1679 scrollBar.size ()); 1706 scrollBar.size ());
1680 want_refresh = 1; 1707 want_refresh = 1;
1681 scrollBar.show (1); 1708 scrollBar.show (1);
1682 } 1709 }
1683 break; 1710 break;
1684 } 1711 }
1685 1712
1686#if defined(CURSOR_BLINK) 1713#if defined(CURSOR_BLINK)
1687 if (option (Opt_cursorBlink) && ev.type == KeyPress) 1714 if (ev.type == KeyPress)
1688 {
1689 if (hidden_cursor)
1690 {
1691 hidden_cursor = 0;
1692 want_refresh = 1;
1693 }
1694
1695 cursor_blink_ev.again (); 1715 cursor_blink_reset ();
1696 }
1697#endif 1716#endif
1698 1717
1699#if defined(POINTER_BLANK) 1718#if defined(POINTER_BLANK)
1700 if (option (Opt_pointerBlank) && pointerBlankDelay > 0) 1719 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1701 { 1720 {
… …
1712 1731
1713 refresh_check (); 1732 refresh_check ();
1714} 1733}
1715 1734
1716#if ENABLE_FRILLS 1735#if ENABLE_FRILLS
1717void 1736void ecb_cold
1718rxvt_term::set_urgency (bool enable) 1737rxvt_term::set_urgency (bool enable)
1719{ 1738{
1720 if (enable == urgency_hint) 1739 if (enable == urgency_hint)
1721 return; 1740 return;
1722 1741
1723 if (XWMHints *h = XGetWMHints (dpy, parent[0])) 1742 if (XWMHints *h = XGetWMHints (dpy, parent))
1724 { 1743 {
1725 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0); 1744 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0);
1726 XSetWMHints (dpy, parent[0], h); 1745 XSetWMHints (dpy, parent, h);
1727 urgency_hint = enable; 1746 urgency_hint = enable;
1747 XFree (h);
1728 } 1748 }
1729} 1749}
1730#endif 1750#endif
1731 1751
1732void 1752void ecb_cold
1733rxvt_term::focus_in () 1753rxvt_term::focus_in ()
1734{ 1754{
1735 if (!focus) 1755 if (!focus)
1736 { 1756 {
1737 focus = 1; 1757 focus = 1;
1738 want_refresh = 1; 1758 want_refresh = 1;
1739 1759
1740#if USE_XIM 1760#if USE_XIM
1741 if (Input_Context != NULL) 1761 if (Input_Context != NULL)
1742 { 1762 {
1743 IMSetPosition (); 1763 im_set_position ();
1744 XSetICFocus (Input_Context); 1764 XSetICFocus (Input_Context);
1745 } 1765 }
1746#endif 1766#endif
1747#if CURSOR_BLINK 1767#if CURSOR_BLINK
1748 if (option (Opt_cursorBlink)) 1768 if (option (Opt_cursorBlink))
… …
1762 1782
1763 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END)); 1783 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1764 } 1784 }
1765} 1785}
1766 1786
1767void 1787void ecb_cold
1768rxvt_term::focus_out () 1788rxvt_term::focus_out ()
1769{ 1789{
1770 if (focus) 1790 if (focus)
1771 { 1791 {
1772 focus = 0; 1792 focus = 0;
… …
1805 1825
1806 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1826 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1807 } 1827 }
1808} 1828}
1809 1829
1810void 1830void ecb_cold
1811rxvt_term::update_fade_color (unsigned int idx) 1831rxvt_term::update_fade_color (unsigned int idx)
1812{ 1832{
1813#if OFF_FOCUS_FADING 1833#if OFF_FOCUS_FADING
1814 if (rs[Rs_fade]) 1834 if (rs[Rs_fade])
1815 { 1835 {
… …
1819 } 1839 }
1820#endif 1840#endif
1821} 1841}
1822 1842
1823#if ENABLE_TRANSPARENCY || ENABLE_PERL 1843#if ENABLE_TRANSPARENCY || ENABLE_PERL
1824void 1844void ecb_hot
1825rxvt_term::rootwin_cb (XEvent &ev) 1845rxvt_term::rootwin_cb (XEvent &ev)
1826{ 1846{
1827 make_current (); 1847 make_current ();
1828 1848
1829 if (SHOULD_INVOKE (HOOK_ROOT_EVENT) 1849 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1830 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END))) 1850 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1831 return; 1851 return;
1832 1852
1833# if ENABLE_TRANSPARENCY
1834 switch (ev.type) 1853 switch (ev.type)
1835 { 1854 {
1836 case PropertyNotify: 1855 case PropertyNotify:
1837 /* 1856 /*
1838 * if user used some Esetroot compatible prog to set the root bg, 1857 * if user used some Esetroot compatible prog to set the root bg,
1839 * use the property to determine the pixmap. We use it later on. 1858 * use the property to determine the pixmap. We use it later on.
1840 */ 1859 */
1841 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID] 1860 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1842 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID]) 1861 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1843 { 1862 {
1863# if ENABLE_TRANSPARENCY
1844 bg_set_root_pixmap (); 1864 bg_set_root_pixmap ();
1845 update_background (); 1865 update_background ();
1866#endif
1867#if ENABLE_PERL
1868 HOOK_INVOKE ((this, HOOK_ROOTPMAP_CHANGE, DT_END));
1869#endif
1846 } 1870 }
1847 1871
1848 break; 1872 break;
1849 } 1873 }
1850# endif
1851 1874
1852 refresh_check (); 1875 refresh_check ();
1853} 1876}
1854#endif 1877#endif
1855 1878
… …
1979 if (scrollBar.upButton (ev.y)) 2002 if (scrollBar.upButton (ev.y))
1980 direction = UP; /* up */ 2003 direction = UP; /* up */
1981 else if (scrollBar.dnButton (ev.y)) 2004 else if (scrollBar.dnButton (ev.y))
1982 direction = DN; /* down */ 2005 direction = DN; /* down */
1983 2006
1984 scrollBar.state = STATE_IDLE; 2007 scrollBar.state = SB_STATE_IDLE;
1985 /* 2008 /*
1986 * Rxvt-style scrollbar: 2009 * Rxvt-style scrollbar:
1987 * move up if mouse is above slider 2010 * move up if mouse is above slider
1988 * move dn if mouse is below slider 2011 * move dn if mouse is below slider
1989 * 2012 *
… …
2028 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY); 2051 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2029#endif 2052#endif
2030 if (scr_page (direction, 1)) 2053 if (scr_page (direction, 1))
2031 { 2054 {
2032 if (direction == UP) 2055 if (direction == UP)
2033 scrollBar.state = STATE_UP; 2056 scrollBar.state = SB_STATE_UP;
2034 else 2057 else
2035 scrollBar.state = STATE_DOWN; 2058 scrollBar.state = SB_STATE_DOWN;
2036 } 2059 }
2037 } 2060 }
2038 else 2061 else
2039 switch (ev.button) 2062 switch (ev.button)
2040 { 2063 {
2041 case Button2: 2064 case Button2:
2042 switch (scrollBar.align) 2065 switch (scrollBar.align)
2043 { 2066 {
2044 case R_SB_ALIGN_TOP: 2067 case SB_ALIGN_TOP:
2045 csrO = 0; 2068 csrO = 0;
2046 break; 2069 break;
2047 case R_SB_ALIGN_CENTRE: 2070 case SB_ALIGN_CENTRE:
2048 csrO = (scrollBar.bot - scrollBar.top) / 2; 2071 csrO = (scrollBar.bot - scrollBar.top) / 2;
2049 break; 2072 break;
2050 case R_SB_ALIGN_BOTTOM: 2073 case SB_ALIGN_BOTTOM:
2051 csrO = scrollBar.bot - scrollBar.top; 2074 csrO = scrollBar.bot - scrollBar.top;
2052 break; 2075 break;
2053 } 2076 }
2054 2077
2055 if (scrollBar.style == R_SB_XTERM 2078 if (scrollBar.style == SB_STYLE_XTERM
2056 || scrollbar_above_slider (ev.y) 2079 || scrollBar.above_slider (ev.y)
2057 || scrollbar_below_slider (ev.y)) 2080 || scrollBar.below_slider (ev.y))
2058 scr_move_to (scrollbar_position (ev.y) - csrO, scrollBar.size ()); 2081 scr_move_to (scrollBar.position (ev.y) - csrO, scrollBar.size ());
2059 2082
2060 scrollBar.state = STATE_MOTION; 2083 scrollBar.state = SB_STATE_MOTION;
2061 break; 2084 break;
2062 2085
2063 case Button1: 2086 case Button1:
2064 if (scrollBar.align == R_SB_ALIGN_CENTRE) 2087 if (scrollBar.align == SB_ALIGN_CENTRE)
2065 csrO = ev.y - scrollBar.top; 2088 csrO = ev.y - scrollBar.top;
2066 /* FALLTHROUGH */ 2089 /* FALLTHROUGH */
2067 2090
2068 case Button3: 2091 case Button3:
2069 if (scrollBar.style != R_SB_XTERM) 2092 if (scrollBar.style != SB_STYLE_XTERM)
2070 { 2093 {
2071 if (scrollbar_above_slider (ev.y)) 2094 if (scrollBar.above_slider (ev.y))
2072# ifdef RXVT_SCROLL_FULL 2095# ifdef RXVT_SCROLL_FULL
2073 scr_page (UP, nrow - 1); 2096 scr_page (UP, nrow - 1);
2074# else 2097# else
2075 scr_page (UP, nrow / 4); 2098 scr_page (UP, nrow / 4);
2076# endif 2099# endif
2077 else if (scrollbar_below_slider (ev.y)) 2100 else if (scrollBar.below_slider (ev.y))
2078# ifdef RXVT_SCROLL_FULL 2101# ifdef RXVT_SCROLL_FULL
2079 scr_page (DN, nrow - 1); 2102 scr_page (DN, nrow - 1);
2080# else 2103# else
2081 scr_page (DN, nrow / 4); 2104 scr_page (DN, nrow / 4);
2082# endif 2105# endif
2083 else 2106 else
2084 scrollBar.state = STATE_MOTION; 2107 scrollBar.state = SB_STATE_MOTION;
2085 } 2108 }
2086 else 2109 else
2087 { 2110 {
2088 scr_page ((ev.button == Button1 ? DN : UP), 2111 scr_page ((ev.button == Button1 ? DN : UP),
2089 (nrow 2112 (nrow
2090 * scrollbar_position (ev.y) 2113 * scrollBar.position (ev.y)
2091 / scrollBar.size ())); 2114 / scrollBar.size ()));
2092 } 2115 }
2093 2116
2094 break; 2117 break;
2095 } 2118 }
… …
2106 2129
2107 csrO = 0; /* reset csr Offset */ 2130 csrO = 0; /* reset csr Offset */
2108 if (!bypass_keystate) 2131 if (!bypass_keystate)
2109 reportmode = !! (priv_modes & PrivMode_mouse_report); 2132 reportmode = !! (priv_modes & PrivMode_mouse_report);
2110 2133
2111 if (scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN) 2134 if (scrollBar.state == SB_STATE_UP || scrollBar.state == SB_STATE_DOWN)
2112 { 2135 {
2113 scrollBar.state = STATE_IDLE; 2136 scrollBar.state = SB_STATE_IDLE;
2114 scrollBar.show (0); 2137 scrollBar.show (0);
2115 } 2138 }
2116 2139
2117#ifdef SELECTION_SCROLLING 2140#ifdef SELECTION_SCROLLING
2118 sel_scroll_ev.stop(); 2141 sel_scroll_ev.stop();
… …
2168 case Button3: 2191 case Button3:
2169 selection_make (ev.time); 2192 selection_make (ev.time);
2170 break; 2193 break;
2171 2194
2172 case Button2: 2195 case Button2:
2173 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window? 2196 if (IN_RANGE_EXC (ev.x, 0, vt_width) && IN_RANGE_EXC (ev.y, 0, vt_height)) // inside window?
2174 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary); 2197 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2175 break; 2198 break;
2176 2199
2177#ifdef MOUSE_WHEEL 2200#ifdef MOUSE_WHEEL
2178 case Button4: 2201 case Button4:
… …
2213 } 2236 }
2214} 2237}
2215 2238
2216/*}}} */ 2239/*}}} */
2217 2240
2218void 2241void ecb_hot
2219rxvt_term::cmd_parse () 2242rxvt_term::cmd_parse ()
2220{ 2243{
2221 wchar_t ch = NOCHAR; 2244 wchar_t ch = NOCHAR;
2222 char *seq_begin; // remember start of esc-sequence here 2245 char *seq_begin; // remember start of esc-sequence here
2223 2246
2224 for (;;) 2247 for (;;)
2225 { 2248 {
2226 if (expect_false (ch == NOCHAR)) 2249 if (ecb_unlikely (ch == NOCHAR))
2227 { 2250 {
2228 seq_begin = cmdbuf_ptr; 2251 seq_begin = cmdbuf_ptr;
2229 ch = next_char (); 2252 ch = next_char ();
2230 2253
2231 if (ch == NOCHAR) 2254 if (ch == NOCHAR)
2232 break; 2255 break;
2233 } 2256 }
2234 2257
2235 if (expect_true (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)) 2258 if (ecb_likely (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT))
2236 { 2259 {
2237 if (expect_false (!seen_input)) 2260 if (ecb_unlikely (!seen_input))
2238 { 2261 {
2239 seen_input = 1; 2262 seen_input = 1;
2240 // many badly-written programs (e.g. jed) contain a race condition: 2263 // many badly-written programs (e.g. jed) contain a race condition:
2241 // they first read the screensize and then install a SIGWINCH handler. 2264 // they first read the screensize and then install a SIGWINCH handler.
2242 // some window managers resize the window early, and these programs 2265 // some window managers resize the window early, and these programs
… …
2255 wchar_t *str = buf; 2278 wchar_t *str = buf;
2256 wchar_t *eol = str + min (ncol, UBUFSIZ); 2279 wchar_t *eol = str + min (ncol, UBUFSIZ);
2257 2280
2258 for (;;) 2281 for (;;)
2259 { 2282 {
2260 if (expect_false (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))) 2283 if (ecb_unlikely (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)))
2261 break; 2284 break;
2262 2285
2263 *str++ = ch; 2286 *str++ = ch;
2264 2287
2265 if (expect_false (ch == C0_LF || str >= eol)) 2288 if (ecb_unlikely (ch == C0_LF || str >= eol))
2266 { 2289 {
2267 if (ch == C0_LF) 2290 if (ch == C0_LF)
2268 nlines++; 2291 nlines++;
2269 2292
2270 refresh_count++; 2293 refresh_count++;
… …
2342 } 2365 }
2343 } 2366 }
2344} 2367}
2345 2368
2346// read the next character 2369// read the next character
2347wchar_t 2370wchar_t ecb_hot
2348rxvt_term::next_char () NOTHROW 2371rxvt_term::next_char () NOTHROW
2349{ 2372{
2350 while (cmdbuf_ptr < cmdbuf_endp) 2373 while (cmdbuf_ptr < cmdbuf_endp)
2351 { 2374 {
2352 // assume 7-bit to be ascii ALWAYS 2375 // assume 7-bit to be ascii ALWAYS
2353 if (expect_true ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)) 2376 if (ecb_likely ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b))
2354 return *cmdbuf_ptr++; 2377 return *cmdbuf_ptr++;
2355 2378
2356 wchar_t wc; 2379 wchar_t wc;
2357 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2380 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2358 2381
… …
2364 } 2387 }
2365 2388
2366 if (len == (size_t)-1) 2389 if (len == (size_t)-1)
2367 { 2390 {
2368 mbstate.reset (); // reset now undefined conversion state 2391 mbstate.reset (); // reset now undefined conversion state
2392 // a -1 might indicate that a previous incomplete char is invalid (previous return -2)
2393 // in which case we "erroneously" return the next byte which might be valid.
2369 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2394 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2370 } 2395 }
2371 2396
2372 // assume wchar == unicode 2397 // assume wchar == unicode
2373 cmdbuf_ptr += len; 2398 cmdbuf_ptr += len;
… …
2376 2401
2377 return NOCHAR; 2402 return NOCHAR;
2378} 2403}
2379 2404
2380// read the next octet 2405// read the next octet
2381uint32_t 2406uint32_t ecb_hot
2382rxvt_term::next_octet () NOTHROW 2407rxvt_term::next_octet () NOTHROW
2383{ 2408{
2384 return cmdbuf_ptr < cmdbuf_endp 2409 return cmdbuf_ptr < cmdbuf_endp
2385 ? (unsigned char)*cmdbuf_ptr++ 2410 ? (unsigned char)*cmdbuf_ptr++
2386 : NOCHAR; 2411 : NOCHAR;
2387} 2412}
2388 2413
2389static class out_of_input out_of_input; 2414static class out_of_input out_of_input;
2390 2415
2391/* rxvt_cmd_getc () - Return next input character */ 2416wchar_t ecb_hot
2392/*
2393 * Return the next input character after first passing any keyboard input
2394 * to the command.
2395 */
2396wchar_t
2397rxvt_term::cmd_getc () THROW ((class out_of_input)) 2417rxvt_term::cmd_getc () THROW ((class out_of_input))
2398{ 2418{
2399 wchar_t c = next_char (); 2419 wchar_t c = next_char ();
2400 2420
2401 if (c == NOCHAR) 2421 if (c == NOCHAR)
2402 throw out_of_input; 2422 throw out_of_input;
2403 2423
2404 return c; 2424 return c;
2405} 2425}
2406 2426
2407uint32_t 2427uint32_t ecb_hot
2408rxvt_term::cmd_get8 () THROW ((class out_of_input)) 2428rxvt_term::cmd_get8 () THROW ((class out_of_input))
2409{ 2429{
2410 uint32_t c = next_octet (); 2430 uint32_t c = next_octet ();
2411 2431
2412 if (c == NOCHAR) 2432 if (c == NOCHAR)
… …
2416} 2436}
2417 2437
2418/*{{{ print pipe */ 2438/*{{{ print pipe */
2419/*----------------------------------------------------------------------*/ 2439/*----------------------------------------------------------------------*/
2420#ifdef PRINTPIPE 2440#ifdef PRINTPIPE
2421FILE * 2441FILE * ecb_cold
2422rxvt_term::popen_printer () 2442rxvt_term::popen_printer ()
2423{ 2443{
2424 FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w"); 2444 FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");
2425 2445
2426 if (stream == NULL) 2446 if (stream == NULL)
2427 rxvt_warn ("can't open printer pipe, not printing.\n"); 2447 rxvt_warn ("can't open printer pipe, not printing.\n");
2428 2448
2429 return stream; 2449 return stream;
2430} 2450}
2431 2451
2432int 2452int ecb_cold
2433rxvt_term::pclose_printer (FILE *stream) 2453rxvt_term::pclose_printer (FILE *stream)
2434{ 2454{
2435 fflush (stream); 2455 fflush (stream);
2436 return pclose (stream); 2456 return pclose (stream);
2437} 2457}
2438 2458
2439/* 2459/*
2440 * simulate attached vt100 printer 2460 * simulate attached vt100 printer
2441 */ 2461 */
2442void 2462void ecb_cold
2443rxvt_term::process_print_pipe () 2463rxvt_term::process_print_pipe ()
2444{ 2464{
2445 FILE *fd = popen_printer (); 2465 FILE *fd = popen_printer ();
2446 2466
2447 if (!fd) 2467 if (!fd)
… …
2493 pclose_printer (fd); 2513 pclose_printer (fd);
2494} 2514}
2495#endif /* PRINTPIPE */ 2515#endif /* PRINTPIPE */
2496/*}}} */ 2516/*}}} */
2497 2517
2498/* *INDENT-OFF* */
2499enum { 2518enum {
2500 C1_40 = 0x40, 2519 C1_40 = 0x40,
2501 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA, 2520 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA,
2502 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3, 2521 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3,
2503 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA, 2522 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA,
2504 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC, 2523 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC,
2505}; 2524};
2506/* *INDENT-ON* */
2507 2525
2508/*{{{ process non-printing single characters */ 2526/*{{{ process non-printing single characters */
2509void 2527void ecb_hot
2510rxvt_term::process_nonprinting (unicode_t ch) 2528rxvt_term::process_nonprinting (unicode_t ch)
2511{ 2529{
2512 switch (ch) 2530 switch (ch)
2513 { 2531 {
2514 case C0_ESC: 2532 case C0_ESC:
… …
2560} 2578}
2561/*}}} */ 2579/*}}} */
2562 2580
2563 2581
2564/*{{{ process VT52 escape sequences */ 2582/*{{{ process VT52 escape sequences */
2565void 2583void ecb_cold
2566rxvt_term::process_escape_vt52 (unicode_t ch) 2584rxvt_term::process_escape_vt52 (unicode_t ch)
2567{ 2585{
2568 int row, col; 2586 int row, col;
2569 2587
2570 switch (ch) 2588 switch (ch)
… …
2604 break; 2622 break;
2605 case 'Z': /* identify the terminal type */ 2623 case 'Z': /* identify the terminal type */
2606 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */ 2624 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
2607 break; 2625 break;
2608 case '<': /* turn off VT52 mode */ 2626 case '<': /* turn off VT52 mode */
2609 set_privmode (PrivMode_vt52, 0); 2627 priv_modes &= ~PrivMode_vt52;
2610 break; 2628 break;
2611 case 'F': /* use special graphics character set */ 2629 case 'F': /* use special graphics character set */
2612 case 'G': /* use regular character set */ 2630 case 'G': /* use regular character set */
2613 /* unimplemented */ 2631 /* unimplemented */
2614 break; 2632 break;
… …
2620} 2638}
2621/*}}} */ 2639/*}}} */
2622 2640
2623 2641
2624/*{{{ process escape sequences */ 2642/*{{{ process escape sequences */
2625void 2643void ecb_hot
2626rxvt_term::process_escape_seq () 2644rxvt_term::process_escape_seq ()
2627{ 2645{
2628 unicode_t ch = cmd_getc (); 2646 unicode_t ch = cmd_getc ();
2629 2647
2630 if (priv_modes & PrivMode_vt52) 2648 if (priv_modes & PrivMode_vt52)
… …
2633 return; 2651 return;
2634 } 2652 }
2635 2653
2636 switch (ch) 2654 switch (ch)
2637 { 2655 {
2638 /* case 1: do_tek_mode (); break; */
2639 case '#': 2656 case '#':
2640 if (cmd_getc () == '8') 2657 if (cmd_getc () == '8')
2641 scr_E (); 2658 scr_E ();
2642 break; 2659 break;
2643 case '(': 2660 case '(':
… …
2666#if !ENABLE_MINIMAL 2683#if !ENABLE_MINIMAL
2667 case '9': 2684 case '9':
2668 scr_forwardindex (); 2685 scr_forwardindex ();
2669 break; 2686 break;
2670#endif 2687#endif
2688 // DECPAM/DECPNM
2671 case '=': 2689 case '=':
2690 priv_modes |= PrivMode_aplKP;
2691 break;
2672 case '>': 2692 case '>':
2673 set_privmode (PrivMode_aplKP, ch == '='); 2693 priv_modes &= ~PrivMode_aplKP;
2674 break; 2694 break;
2675 2695
2676 case C1_40: 2696 case C1_40:
2677 cmd_getc (); 2697 cmd_getc ();
2678 break; 2698 break;
… …
2682 2702
2683 /* 8.3.87: NEXT LINE */ 2703 /* 8.3.87: NEXT LINE */
2684 case C1_NEL: /* ESC E */ 2704 case C1_NEL: /* ESC E */
2685 { 2705 {
2686 wchar_t nlcr[] = { C0_LF, C0_CR }; 2706 wchar_t nlcr[] = { C0_LF, C0_CR };
2687 scr_add_lines (nlcr, ARRAY_LENGTH(nlcr), 1); 2707 scr_add_lines (nlcr, ecb_array_length (nlcr), 1);
2688 } 2708 }
2689 break; 2709 break;
2690 2710
2691 /* kidnapped escape sequence: Should be 8.3.48 */ 2711 /* kidnapped escape sequence: Should be 8.3.48 */
2692 case C1_ESA: /* ESC G */ 2712 case C1_ESA: /* ESC G */
… …
2704 case C1_RI: /* ESC M */ 2724 case C1_RI: /* ESC M */
2705 scr_index (DN); 2725 scr_index (DN);
2706 break; 2726 break;
2707 2727
2708 /* 8.3.142: SINGLE-SHIFT TWO */ 2728 /* 8.3.142: SINGLE-SHIFT TWO */
2709 /*case C1_SS2: scr_single_shift (2); break; */ 2729 /* case C1_SS2: break; */
2710 2730
2711 /* 8.3.143: SINGLE-SHIFT THREE */ 2731 /* 8.3.143: SINGLE-SHIFT THREE */
2712 /*case C1_SS3: scr_single_shift (3); break; */ 2732 /* case C1_SS3: break; */
2713 2733
2714 /* 8.3.27: DEVICE CONTROL STRING */ 2734 /* 8.3.27: DEVICE CONTROL STRING */
2715 case C1_DCS: /* ESC P */ 2735 case C1_DCS: /* ESC P */
2716 process_dcs_seq (); 2736 process_dcs_seq ();
2717 break; 2737 break;
… …
2750 } 2770 }
2751} 2771}
2752/*}}} */ 2772/*}}} */
2753 2773
2754/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */ 2774/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */
2755/* *INDENT-OFF* */
2756enum { 2775enum {
2757 CSI_ICH = 0x40, 2776 CSI_ICH = 0x40,
2758 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA, 2777 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA,
2759 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA , 2778 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA ,
2760 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC, 2779 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC,
… …
2780 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */ 2799 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */
2781 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */ 2800 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */
2782 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */ 2801 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */
2783 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */ 2802 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */
2784 }; 2803 };
2785/* *INDENT-ON* */
2786 2804
2787void 2805void ecb_hot
2788rxvt_term::process_csi_seq () 2806rxvt_term::process_csi_seq ()
2789{ 2807{
2790 unicode_t ch, priv, i; 2808 unicode_t ch, priv, i;
2791 unsigned int nargs, p; 2809 unsigned int nargs, p;
2792 int n, ndef; 2810 int n, ndef;
… …
2870 scr_soft_reset (); 2888 scr_soft_reset ();
2871 2889
2872 static const int pm_h[] = { 7, 25 }; 2890 static const int pm_h[] = { 7, 25 };
2873 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1005, 1015, 1049 }; 2891 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1005, 1015, 1049 };
2874 2892
2875 process_terminal_mode ('h', 0, ARRAY_LENGTH(pm_h), pm_h); 2893 process_terminal_mode ('h', 0, ecb_array_length (pm_h), pm_h);
2876 process_terminal_mode ('l', 0, ARRAY_LENGTH(pm_l), pm_l); 2894 process_terminal_mode ('l', 0, ecb_array_length (pm_l), pm_l);
2877 } 2895 }
2878 break; 2896 break;
2879 } 2897 }
2880 2898
2881 return; 2899 return;
… …
2899 } 2917 }
2900 break; 2918 break;
2901#endif 2919#endif
2902 2920
2903 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */ 2921 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */
2904 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */ 2922 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */
2905 arg[0] = -arg[0]; 2923 arg[0] = -arg[0];
2906 /* FALLTHROUGH */ 2924 /* FALLTHROUGH */
2907 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */ 2925 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */
2908 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */ 2926 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */
2909 scr_gotorc (arg[0], 0, RELATIVE); 2927 scr_gotorc (arg[0], 0, RELATIVE);
2910 break; 2928 break;
2911 2929
2912 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */ 2930 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */
2913 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */ 2931 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */
… …
3100 } 3118 }
3101} 3119}
3102/*}}} */ 3120/*}}} */
3103 3121
3104#if !ENABLE_MINIMAL 3122#if !ENABLE_MINIMAL
3105/* ARGSUSED */
3106void 3123void
3107rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3124rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3108{ 3125{
3109 int x, y; 3126 int x, y;
3110 XWindowAttributes wattr; 3127 XWindowAttributes wattr;
… …
3119 { 3136 {
3120 /* 3137 /*
3121 * commands 3138 * commands
3122 */ 3139 */
3123 case 1: /* deiconify window */ 3140 case 1: /* deiconify window */
3124 XMapWindow (dpy, parent[0]); 3141 XMapWindow (dpy, parent);
3125 break; 3142 break;
3126 case 2: /* iconify window */ 3143 case 2: /* iconify window */
3127 XIconifyWindow (dpy, parent[0], display->screen); 3144 XIconifyWindow (dpy, parent, display->screen);
3128 break; 3145 break;
3129 case 3: /* set position (pixels) */ 3146 case 3: /* set position (pixels) */
3130 XMoveWindow (dpy, parent[0], args[1], args[2]); 3147 XMoveWindow (dpy, parent, args[1], args[2]);
3131 break; 3148 break;
3132 case 4: /* set size (pixels) */ 3149 case 4: /* set size (pixels) */
3133 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3150 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3134 break; 3151 break;
3135 case 5: /* raise window */ 3152 case 5: /* raise window */
3136 XRaiseWindow (dpy, parent[0]); 3153 XRaiseWindow (dpy, parent);
3137 break; 3154 break;
3138 case 6: /* lower window */ 3155 case 6: /* lower window */
3139 XLowerWindow (dpy, parent[0]); 3156 XLowerWindow (dpy, parent);
3140 break; 3157 break;
3141 case 7: /* refresh window */ 3158 case 7: /* refresh window */
3142 scr_touch (true); 3159 scr_touch (true);
3143 break; 3160 break;
3144 case 8: /* set size (chars) */ 3161 case 8: /* set size (chars) */
… …
3147 break; 3164 break;
3148 3165
3149 //case 9: NYI, TODO, restore maximized window or maximize window 3166 //case 9: NYI, TODO, restore maximized window or maximize window
3150 default: 3167 default:
3151 if (args[0] >= 24) /* set height (chars) */ 3168 if (args[0] >= 24) /* set height (chars) */
3152 set_widthheight ((unsigned int)width, 3169 set_widthheight ((unsigned int)vt_width,
3153 (unsigned int) (args[1] * fheight)); 3170 (unsigned int) (args[1] * fheight));
3154 break; 3171 break;
3155 3172
3156 /* 3173 /*
3157 * reports - some output format copied from XTerm 3174 * reports - some output format copied from XTerm
3158 */ 3175 */
3159 case 11: /* report window state */ 3176 case 11: /* report window state */
3160 XGetWindowAttributes (dpy, parent[0], &wattr); 3177 XGetWindowAttributes (dpy, parent, &wattr);
3161 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3178 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3162 break; 3179 break;
3163 case 13: /* report window position */ 3180 case 13: /* report window position */
3164 XGetWindowAttributes (dpy, parent[0], &wattr); 3181 XGetWindowAttributes (dpy, parent, &wattr);
3165 XTranslateCoordinates (dpy, parent[0], wattr.root, 3182 XTranslateCoordinates (dpy, parent, wattr.root,
3166 -wattr.border_width, -wattr.border_width, 3183 -wattr.border_width, -wattr.border_width,
3167 &x, &y, &wdummy); 3184 &x, &y, &wdummy);
3168 tt_printf ("\033[3;%d;%dt", x, y); 3185 tt_printf ("\033[3;%d;%dt", x, y);
3169 break; 3186 break;
3170 case 14: /* report window size (pixels) */ 3187 case 14: /* report window size (pixels) */
3171 XGetWindowAttributes (dpy, parent[0], &wattr); 3188 XGetWindowAttributes (dpy, parent, &wattr);
3172 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3189 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3173 break; 3190 break;
3174 case 18: /* report text area size (chars) */ 3191 case 18: /* report text area size (chars) */
3175 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3192 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3176 break; 3193 break;
… …
3178 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3195 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3179 break; 3196 break;
3180 case 20: /* report icon label */ 3197 case 20: /* report icon label */
3181 { 3198 {
3182 char *s; 3199 char *s;
3183 XGetIconName (dpy, parent[0], &s); 3200 XGetIconName (dpy, parent, &s);
3184 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3201 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3185 XFree (s); 3202 XFree (s);
3186 } 3203 }
3187 break; 3204 break;
3188 case 21: /* report window title */ 3205 case 21: /* report window title */
3189 { 3206 {
3190 char *s; 3207 char *s;
3191 XFetchName (dpy, parent[0], &s); 3208 XFetchName (dpy, parent, &s);
3192 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3209 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3193 XFree (s); 3210 XFree (s);
3194 } 3211 }
3195 break; 3212 break;
3196 } 3213 }
… …
3350 unsigned long bytes_after; 3367 unsigned long bytes_after;
3351 unsigned char *value = 0; 3368 unsigned char *value = 0;
3352 const char *str = ""; 3369 const char *str = "";
3353 3370
3354 if (prop 3371 if (prop
3355 && XGetWindowProperty (dpy, parent[0], 3372 && XGetWindowProperty (dpy, parent,
3356 prop, 0, 1<<16, 0, AnyPropertyType, 3373 prop, 0, 1<<16, 0, AnyPropertyType,
3357 &actual_type, &actual_format, 3374 &actual_type, &actual_format,
3358 &nitems, &bytes_after, &value) == Success 3375 &nitems, &bytes_after, &value) == Success
3359 && actual_type != None 3376 && actual_type != None
3360 && actual_format == 8) 3377 && actual_format == 8)
… …
3372 { 3389 {
3373 *eq = 0; 3390 *eq = 0;
3374 set_utf8_property (display->atom (str), eq + 1); 3391 set_utf8_property (display->atom (str), eq + 1);
3375 } 3392 }
3376 else 3393 else
3377 XDeleteProperty (dpy, parent[0], 3394 XDeleteProperty (dpy, parent,
3378 display->atom (str)); 3395 display->atom (str));
3379 } 3396 }
3380 break; 3397 break;
3381 3398
3382 case XTerm_Color: 3399 case XTerm_Color:
… …
3443 process_color_seq (op, Color_tint, str, resp); 3460 process_color_seq (op, Color_tint, str, resp);
3444 { 3461 {
3445 bool changed = false; 3462 bool changed = false;
3446 3463
3447 if (ISSET_PIXCOLOR (Color_tint)) 3464 if (ISSET_PIXCOLOR (Color_tint))
3448 changed = bg_set_tint (pix_colors_focused [Color_tint]); 3465 changed = root_effects.set_tint (pix_colors_focused [Color_tint]);
3449 3466
3450 if (changed) 3467 if (changed)
3451 update_background (); 3468 update_background ();
3452 } 3469 }
3453 3470
… …
3457#if BG_IMAGE_FROM_FILE 3474#if BG_IMAGE_FROM_FILE
3458 case Rxvt_Pixmap: 3475 case Rxvt_Pixmap:
3459 if (!strcmp (str, "?")) 3476 if (!strcmp (str, "?"))
3460 { 3477 {
3461 char str[256]; 3478 char str[256];
3479 int h_scale = fimage.h_scale;
3480 int v_scale = fimage.v_scale;
3481 int h_align = fimage.h_align;
3482 int v_align = fimage.v_align;
3462 3483
3463 sprintf (str, "[%dx%d+%d+%d]", 3484 sprintf (str, "[%dx%d+%d+%d]",
3464 min (h_scale, 32767), min (v_scale, 32767), 3485 h_scale, v_scale,
3465 min (h_align, 32767), min (v_align, 32767)); 3486 h_align, v_align);
3466 process_xterm_seq (XTerm_title, str, CHAR_ST); 3487 process_xterm_seq (XTerm_title, str, CHAR_ST);
3467 } 3488 }
3468 else 3489 else
3469 { 3490 {
3470 int changed = 0; 3491 bool changed = false;
3471 3492
3472 if (*str != ';') 3493 if (*str != ';')
3473 { 3494 {
3474 if (bg_set_file (str)) /* change pixmap */ 3495 try
3475 { 3496 {
3497 fimage.set_file_geometry (this, str);
3476 changed++; 3498 changed = true;
3477 str = strchr (str, ';');
3478 if (str == NULL)
3479 bg_set_default_geometry ();
3480 else 3499 }
3481 bg_set_geometry (str+1); 3500 catch (const class rxvt_failure_exception &e)
3501 {
3482 } 3502 }
3483 } 3503 }
3484 else 3504 else
3485 { 3505 {
3486 str++; 3506 str++;
3487 if (bg_set_geometry (str, true)) 3507 if (fimage.set_geometry (str, true))
3488 changed++; 3508 changed = true;
3489 } 3509 }
3490 3510
3491 if (changed) 3511 if (changed)
3492 { 3512 {
3493 if (bg_window_position_sensitive ()) 3513 if (bg_window_position_sensitive ())
3494 { 3514 {
3495 int x, y; 3515 int x, y;
3496 get_window_origin (x, y); 3516 get_window_origin (x, y);
3497 bg_set_position (x, y); 3517 parent_x = x;
3518 parent_y = y;
3498 } 3519 }
3499 update_background (); 3520 update_background ();
3500 } 3521 }
3501 } 3522 }
3502 break; 3523 break;
… …
3592 * 's' = save 3613 * 's' = save
3593 * 'r' = restore 3614 * 'r' = restore
3594 * 't' = toggle 3615 * 't' = toggle
3595 * so no need for fancy checking 3616 * so no need for fancy checking
3596 */ 3617 */
3597int 3618int ecb_cold
3598rxvt_term::privcases (int mode, unsigned long bit) 3619rxvt_term::privcases (int mode, unsigned long bit)
3599{ 3620{
3600 int state; 3621 int state;
3601 3622
3602 if (mode == 's') 3623 if (mode == 's')
3603 { 3624 {
3604 SavedModes |= (priv_modes & bit); 3625 if (priv_modes & bit)
3626 SavedModes |= bit;
3627 else
3628 SavedModes &= ~bit;
3605 return -1; 3629 return -1;
3606 } 3630 }
3607 else 3631 else
3608 { 3632 {
3609 if (mode == 'r') 3633 if (mode == 'r')
3610 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3634 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3611 else 3635 else
3612 state = (mode == 't') ? ! (priv_modes & bit) : mode; 3636 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3613 3637
3614 set_privmode (bit, state); 3638 if (state)
3639 priv_modes |= bit;
3640 else
3641 priv_modes &= ~bit;
3615 } 3642 }
3616 3643
3617 return state; 3644 return state;
3618} 3645}
3619 3646
3620/* we're not using priv _yet_ */ 3647/* we're not using priv _yet_ */
3621void 3648void
3622rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg) 3649rxvt_term::process_terminal_mode (int mode, int priv ecb_unused, unsigned int nargs, const int *arg)
3623{ 3650{
3624 unsigned int i, j; 3651 unsigned int i, j;
3625 int state; 3652 int state;
3626 3653
3627 static const struct 3654 static const struct
3628 { 3655 {
3629 const int argval; 3656 const int argval;
3630 const unsigned long bit; 3657 const unsigned long bit;
3631 } argtopriv[] = { 3658 } argtopriv[] = {
3632 { 1, PrivMode_aplCUR }, // DECCKM 3659 { 1, PrivMode_aplCUR }, // DECCKM
3633 { 2, PrivMode_vt52 }, 3660 { 2, PrivMode_vt52 }, // DECANM
3634 { 3, PrivMode_132 }, // DECCOLM 3661 { 3, PrivMode_132 }, // DECCOLM
3635 { 4, PrivMode_smoothScroll }, // DECSCLM 3662 { 4, PrivMode_smoothScroll }, // DECSCLM
3636 { 5, PrivMode_rVideo }, // DECSCNM 3663 { 5, PrivMode_rVideo }, // DECSCNM
3637 { 6, PrivMode_relOrigin }, // DECOM 3664 { 6, PrivMode_relOrigin }, // DECOM
3638 { 7, PrivMode_Autowrap }, // DECAWM 3665 { 7, PrivMode_Autowrap }, // DECAWM
3639 // 8, auto-repeat keys // DECARM 3666 // 8, auto-repeat keys // DECARM
3640 { 9, PrivMode_MouseX10 }, 3667 { 9, PrivMode_MouseX10 },
3641 // 18 end FF to printer after print screen 3668 // 18 end FF to printer after print screen
3642 // 19 Print screen prints full screen/scroll region 3669 // 19 Print screen prints full screen/scroll region
3643 { 25, PrivMode_VisibleCursor }, // cnorm/cvvis/civis 3670 { 25, PrivMode_VisibleCursor }, // DECTCEM cnorm/cvvis/civis
3644#ifdef scrollBar_esc 3671#ifdef scrollBar_esc
3645 { scrollBar_esc, PrivMode_scrollBar }, 3672 { scrollBar_esc, PrivMode_scrollBar },
3646#endif 3673#endif
3647 { 35, PrivMode_ShiftKeys }, // rxvt extension 3674 { 35, PrivMode_ShiftKeys }, // rxvt extension
3648 // 38, tektronix mode // DECTEK 3675 // 38, tektronix mode // DECTEK
3649 { 40, PrivMode_132OK }, 3676 { 40, PrivMode_132OK },
3650 // 41 xterm more fixes NYI 3677 // 41 xterm more fixes NYI
3651 // 45 margin bell NYI 3678 // 45 margin bell NYI
3652 // 46 start logging 3679 // 46 start logging
3653 { 47, PrivMode_Screen }, 3680 { 47, PrivMode_Screen },
3654 { 66, PrivMode_aplKP }, // DECPAM/DECPNM 3681 { 66, PrivMode_aplKP }, // DECNKM
3655#ifndef NO_BACKSPACE_KEY 3682#ifndef NO_BACKSPACE_KEY
3656 { 67, PrivMode_BackSpace }, // DECBKM 3683 { 67, PrivMode_BackSpace }, // DECBKM
3657#endif 3684#endif
3658 { 1000, PrivMode_MouseX11 }, 3685 { 1000, PrivMode_MouseX11 },
3659 { 1002, PrivMode_MouseBtnEvent }, 3686 { 1002, PrivMode_MouseBtnEvent },
… …
3688 for (i = 0; i < nargs; i++) 3715 for (i = 0; i < nargs; i++)
3689 { 3716 {
3690 state = -1; 3717 state = -1;
3691 3718
3692 /* basic handling */ 3719 /* basic handling */
3693 for (j = 0; j < ARRAY_LENGTH(argtopriv); j++) 3720 for (j = 0; j < ecb_array_length (argtopriv); j++)
3694 if (argtopriv[j].argval == arg[i]) 3721 if (argtopriv[j].argval == arg[i])
3695 { 3722 {
3696 state = privcases (mode, argtopriv[j].bit); 3723 state = privcases (mode, argtopriv[j].bit);
3697 break; 3724 break;
3698 } 3725 }
… …
3724 case 2: /* VT52 mode */ 3751 case 2: /* VT52 mode */
3725 /* oddball mode. should be set regardless of set/reset 3752 /* oddball mode. should be set regardless of set/reset
3726 * parameter. Return from VT52 mode with an ESC < from 3753 * parameter. Return from VT52 mode with an ESC < from
3727 * within VT52 mode 3754 * within VT52 mode
3728 */ 3755 */
3729 set_privmode (PrivMode_vt52, 1); 3756 priv_modes |= PrivMode_vt52;
3730 break; 3757 break;
3731 case 3: /* 80/132 */ 3758 case 3: /* 80/132 */
3732 if (priv_modes & PrivMode_132OK) 3759 if (priv_modes & PrivMode_132OK)
3733 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight); 3760 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
3734 break; 3761 break;
… …
3749 if (state) /* orthogonal */ 3776 if (state) /* orthogonal */
3750 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent); 3777 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3751 break; 3778 break;
3752#ifdef scrollBar_esc 3779#ifdef scrollBar_esc
3753 case scrollBar_esc: 3780 case scrollBar_esc:
3754 if (scrollBar.map (state)) 3781 scrollBar.map (state);
3755 {
3756 resize_all_windows (0, 0, 0); 3782 resize_all_windows (0, 0, 0);
3757 scr_touch (true); 3783 scr_touch (true);
3758 }
3759 break; 3784 break;
3760#endif 3785#endif
3761 case 25: /* visible/invisible cursor */ 3786 case 25: /* visible/invisible cursor */
3762 scr_cursor_visible (state); 3787 scr_cursor_visible (state);
3763 break; 3788 break;
… …
3818 } 3843 }
3819} 3844}
3820/*}}} */ 3845/*}}} */
3821 3846
3822/*{{{ process sgr sequences */ 3847/*{{{ process sgr sequences */
3823void 3848void ecb_hot
3824rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg) 3849rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg)
3825{ 3850{
3826 unsigned int i; 3851 unsigned int i;
3827 short rendset; 3852 short rendset;
3828 int rendstyle; 3853 int rendstyle;

Diff Legend

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