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.420 by root, Wed Oct 15 14:48:22 2008 UTC vs.
Revision 1.603 by root, Mon Jun 5 13:39:34 2023 UTC

… …
4 * 4 *
5 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk> 6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk>
7 * - original version 7 * - original version
8 * Copyright (c) 1994 Robert Nation <nation@rocket.sanders.lockheed.com> 8 * Copyright (c) 1994 Robert Nation <nation@rocket.sanders.lockheed.com>
9 * - extensive modifications 9 * - extensive modifications
10 * Copyright (c) 1995 Garrett D'Amore <garrett@netcom.com> 10 * Copyright (c) 1995 Garrett D'Amore <garrett@netcom.com>
11 * - vt100 printing 11 * - vt100 printing
12 * Copyright (c) 1995 Steven Hirsch <hirsch@emba.uvm.edu> 12 * Copyright (c) 1995 Steven Hirsch <hirsch@emba.uvm.edu>
13 * - X11 mouse report mode and support for 13 * - X11 mouse report mode and support for
14 * DEC "private mode" save/restore functions. 14 * DEC "private mode" save/restore functions.
… …
20 * Copyright (c) 1997 Raul Garcia Garcia <rgg@tid.es> 20 * Copyright (c) 1997 Raul Garcia Garcia <rgg@tid.es>
21 * - modification and cleanups for Solaris 2.x 21 * - modification and cleanups for Solaris 2.x
22 * and Linux 1.2.x 22 * and Linux 1.2.x
23 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de> 23 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de>
24 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com> 24 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>
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-2007 Marc Lehmann <pcg@goof.com> 30 * Copyright (c) 2003-2021 Marc Lehmann <schmorp@schmorp.de>
31 * Copyright (c) 2007 Emanuele Giaquinta <e.giaquinta@glauco.it> 31 * Copyright (c) 2007,2015 Emanuele Giaquinta <e.giaquinta@glauco.it>
32 * 32 *
33 * This program is free software; you can redistribute it and/or modify 33 * This program is free software; you can redistribute it and/or modify
34 * it under the terms of the GNU General Public License as published by 34 * it under the terms of the GNU General Public License as published by
35 * the Free Software Foundation; either version 2 of the License, or 35 * the Free Software Foundation; either version 3 of the License, or
36 * (at your option) any later version. 36 * (at your option) any later version.
37 * 37 *
38 * This program is distributed in the hope that it will be useful, 38 * This program is distributed in the hope that it will be useful,
39 * but WITHOUT ANY WARRANTY; without even the implied warranty of 39 * but WITHOUT ANY WARRANTY; without even the implied warranty of
40 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 40 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
… …
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)
… …
84 XK_Right, 0x2192, 84 XK_Right, 0x2192,
85 XK_KP_Right, 0x2192, 85 XK_KP_Right, 0x2192,
86 XK_Down, 0x2193, 86 XK_Down, 0x2193,
87 XK_KP_Down, 0x2193, 87 XK_KP_Down, 0x2193,
88 XK_Linefeed, 0x21b4, 88 XK_Linefeed, 0x21b4,
89 XK_Return, 0x21b5,
90 XK_KP_Enter, 0x21b5,
91 89
92 XK_Prior, 0x21de, 90 XK_Prior, 0x21de,
93 XK_Next, 0x21df, 91 XK_Next, 0x21df,
94 XK_Tab, 0x21e5, 92 XK_Tab, 0x21e5,
95 XK_ISO_Left_Tab, 0x21e6, 93 XK_ISO_Left_Tab, 0x21e6,
… …
110 XK_Begin, 0x2320, 108 XK_Begin, 0x2320,
111 XK_Delete, 0x2326, 109 XK_Delete, 0x2326,
112 XK_Clear, 0x2327, 110 XK_Clear, 0x2327,
113 XK_BackSpace, 0x232b, 111 XK_BackSpace, 0x232b,
114 XK_Insert, 0x2380, 112 XK_Insert, 0x2380,
113 XK_KP_Enter, 0x2386,
114 XK_Alt_L, 0x2387,
115 XK_Alt_R, 0x2387,
115 XK_Control_L, 0x2388, 116 XK_Control_L, 0x2388,
116 XK_Control_R, 0x2388, 117 XK_Control_R, 0x2388,
117 XK_Pause, 0x2389, 118 XK_Pause, 0x2389,
118 XK_Break, 0x238a, 119 XK_Break, 0x238a,
119 XK_Escape, 0x238b, 120 XK_Escape, 0x238b,
120 XK_Undo, 0x238c, 121 XK_Undo, 0x238c,
121 XK_Print, 0x2399, 122 XK_Print, 0x2399,
123 XK_Return, 0x23ce,
122 124
123 XK_space, 0x2423, 125 XK_space, 0x2423,
124 126
125#ifdef XK_KP_Begin 127#ifdef XK_KP_Begin
126 XK_KP_Prior, 0x21de, 128 XK_KP_Prior, 0x21de,
… …
131 XK_KP_Space, 0x2422, 133 XK_KP_Space, 0x2422,
132#endif 134#endif
133 0, 135 0,
134}; 136};
135 137
136void 138void ecb_cold
137rxvt_term::iso14755_54 (int x, int y) 139rxvt_term::iso14755_54 (int x, int y)
138{ 140{
139 x = Pixel2Col (x); 141 x = Pixel2Col (x);
140 y = Pixel2Row (y); 142 y = Pixel2Row (y);
141 143
… …
149 151
150 text_t t = l.t[x]; 152 text_t t = l.t[x];
151 153
152 if (t != NOCHAR || !x) 154 if (t != NOCHAR || !x)
153 { 155 {
154 iso14755_51 (l.t[x], l.r[x], x, y); 156 iso14755_51 (l.t[x], l.r[x], x, y, view_start);
155 iso14755buf = ISO_14755_54; 157 iso14755buf = ISO_14755_54;
156 break; 158 break;
157 } 159 }
158 160
159 x--; 161 x--;
160 } 162 }
161} 163}
162 164
163void 165void ecb_cold
164rxvt_term::iso14755_51 (unicode_t ch, rend_t r, int x, int y) 166rxvt_term::iso14755_51 (unicode_t ch, rend_t r, int x, int y, int y2)
165{ 167{
166 rxvt_fontset *fs = FONTSET (r); 168 rxvt_fontset *fs = FONTSET (r);
167 rxvt_font *f = (*fs)[fs->find_font (ch)];
168 wchar_t *chr, *alloc, ch2, *fname; 169 wchar_t *chr, *alloc, ch2, **fname;
169 int len; 170 int len;
170
171 fname = rxvt_utf8towcs (f->name);
172 171
173# if ENABLE_COMBINING 172# if ENABLE_COMBINING
174 if (IS_COMPOSE (ch)) 173 if (IS_COMPOSE (ch))
175 { 174 {
176 len = rxvt_composite.expand (ch, 0); 175 len = rxvt_composite.expand (ch);
177 alloc = chr = new wchar_t[len]; 176 alloc = chr = new wchar_t[len];
178 rxvt_composite.expand (ch, chr); 177 rxvt_composite.expand (ch, chr);
179 } 178 }
180 else 179 else
181# endif 180# endif
… …
184 183
185 alloc = 0; 184 alloc = 0;
186 chr = &ch2; 185 chr = &ch2;
187 len = 1; 186 len = 1;
188 } 187 }
188
189 char rowcol[40];
190 snprintf (rowcol, sizeof rowcol, "col %d row %d @%d", x, y, y2);
189 191
190 char attr[80]; // plenty 192 char attr[80]; // plenty
191 193
192 sprintf (attr, "%08x = fg %d bg %d%s%s%s%s%s%s", 194 sprintf (attr, "%08x = fg %d bg %d%s%s%s%s%s%s",
193 (int)r, 195 (int)r,
… …
197 r & RS_Blink ? " blink" : "", 199 r & RS_Blink ? " blink" : "",
198 r & RS_RVid ? " rvid" : "", 200 r & RS_RVid ? " rvid" : "",
199 r & RS_Uline ? " uline" : "", 201 r & RS_Uline ? " uline" : "",
200 r & RS_Careful ? " careful" : ""); 202 r & RS_Careful ? " careful" : "");
201 203
204 int width = 0;
205 fname = rxvt_temp_buf<wchar_t *> (len);
206 for (int i = 0; i < len; i++)
207 {
208 rxvt_font *f = (*fs)[fs->find_font_idx (chr[i])];
209 fname[i] = rxvt_utf8towcs (f->name);
202 int width = wcswidth (fname, wcslen (fname)); 210 max_it (width, wcswidth (fname[i], wcslen (fname[i])));
211 }
203 212
204 max_it (width, 8+5); // for char + hex
205 max_it (width, strlen (attr)); 213 max_it (width, strlen (attr));
206 214
207 if (y >= 0) 215 if (y >= 0)
208 { 216 {
209 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1; 217 y = (y >= nrow - len - 5 && x < width + 2) ? 0 : -1;
210 x = 0; 218 x = 0;
211 } 219 }
212 220
213 scr_overlay_new (x, y, width, len + 2); 221 scr_overlay_new (x, y, width, len * 2 + 2);
222
223 scr_overlay_set (0, 0, rowcol);
214 224
215 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r)); 225 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));
216 226
217 for (int y = 0; y < len; y++) 227 for (int y = 0; y < len; y++)
218 { 228 {
219 char buf[9]; 229 char buf[9];
220 230
221 ch = *chr++; 231 ch = *chr++;
222 232
223 sprintf (buf, "%8x", ch); 233 sprintf (buf, "%8x", ch);
224 scr_overlay_set (0, y, buf); 234 scr_overlay_set (0, y + 1, buf);
225 scr_overlay_set (9, y, '='); 235 scr_overlay_set (9, y + 1, '=');
226# if !UNICODE_3 236# if !UNICODE_3
227 if (ch >= 0x10000) 237 if (ch >= 0x10000)
228 ch = 0xfffd; 238 ch = 0xfffd;
229# endif 239# endif
230 scr_overlay_set (11, y, ch, r); 240 scr_overlay_set (11, y + 1, ch, r);
231 241
232 if (WCWIDTH (ch) >= 2) 242 if (WCWIDTH (ch) >= 2)
233 scr_overlay_set (12, y, NOCHAR, r); 243 scr_overlay_set (12, y + 1, NOCHAR, r);
234 } 244 }
235 245
236// { 246// {
237// char buf[4+4+3+1]; 247// char buf[4+4+3+1];
238// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y); 248// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y);
239// scr_overlay_set (0, 0, buf); 249// scr_overlay_set (0, 0, buf);
240// } 250// }
241 scr_overlay_set (0, len , attr); 251 scr_overlay_set (0, len + 1, attr);
252 for (int i = 0; i < len; i++)
253 {
242 scr_overlay_set (0, len + 1, fname); 254 scr_overlay_set (0, len + 2 + i, fname[i]);
243
244 free (fname); 255 free (fname[i]);
256 }
245 257
246# if ENABLE_COMBINING 258# if ENABLE_COMBINING
247 if (alloc) 259 if (alloc)
248 delete [] alloc; 260 delete [] alloc;
249# endif 261# endif
250} 262}
251#endif 263#endif
252 264
253void 265void ecb_cold
254rxvt_term::commit_iso14755 () 266rxvt_term::commit_iso14755 ()
255{ 267{
256 wchar_t ch[2];
257
258 ch[0] = iso14755buf & ISO_14755_MASK; 268 wchar_t ch = iso14755buf & ISO_14755_MASK;
259 ch[1] = 0;
260 269
261 if (iso14755buf & ISO_14755_51) 270 if (iso14755buf & ISO_14755_51)
262 { 271 {
263 char mb[16]; 272 char mb[MB_LEN_MAX];
264 int len; 273 int len;
265 274
266 // allow verbatim 0-bytes and control-bytes to be entered 275 // allow verbatim 0-bytes and control-bytes to be entered
267 if (ch[0] >= 0x20) 276 if (ch >= 0x20)
268 len = wcstombs (mb, ch, 16); 277 len = wctomb (mb, ch);
269 else 278 else
270 { 279 {
271 mb[0] = ch[0]; 280 mb[0] = ch;
272 len = 1; 281 len = 1;
273 } 282 }
274 283
275 if (len > 0) 284 if (len > 0)
276 tt_write (mb, len); 285 tt_write (mb, len);
… …
279 } 288 }
280 289
281 iso14755buf = 0; 290 iso14755buf = 0;
282} 291}
283 292
284static int 293static int ecb_cold
285hex_keyval (XKeyEvent &ev) 294hex_keyval (XKeyEvent &ev)
286{ 295{
287 // check wether this event corresponds to a hex digit 296 // check whether this event corresponds to a hex digit
288 // if the modifiers had not been pressed. 297 // if the modifiers had not been pressed.
289 for (int index = 0; index < 8; index++) 298 for (int index = 0; index < 8; index++)
290 { 299 {
291 KeySym k = XLookupKeysym (&ev, index); 300 KeySym k = XLookupKeysym (&ev, index);
292 301
… …
298 307
299 return -1; 308 return -1;
300} 309}
301#endif 310#endif
302 311
303static inline KeySym 312static inline KeySym ecb_cold
304translate_keypad (KeySym keysym, bool kp) 313translate_keypad (KeySym keysym, bool kp)
305{ 314{
306#ifdef XK_KP_Home 315#ifdef XK_KP_Home
307 static const KeySym keypadtrans[] = { 316 static const KeySym keypadtrans[] = {
308 XK_KP_7, // XK_KP_Home 317 XK_KP_7, // XK_KP_Home
309 XK_KP_4, // XK_KP_Left 318 XK_KP_4, // XK_KP_Left
310 XK_KP_8, // XK_KP_Up 319 XK_KP_8, // XK_KP_Up
311 XK_KP_6, // XK_KP_Right 320 XK_KP_6, // XK_KP_Right
312 XK_KP_2, // XK_KP_Down 321 XK_KP_2, // XK_KP_Down
313# ifndef UNSHIFTED_SCROLLKEYS
314 XK_KP_9, // XK_KP_Prior 322 XK_KP_9, // XK_KP_Prior
315 XK_KP_3, // XK_KP_Next 323 XK_KP_3, // XK_KP_Next
316# else
317 XK_Prior,
318 XK_Next,
319# endif
320 XK_KP_1, // XK_KP_End 324 XK_KP_1, // XK_KP_End
321 XK_KP_5, // XK_KP_Begin 325 XK_KP_5, // XK_KP_Begin
322 }; 326 };
323 327
324 if (IN_RANGE_INC (keysym, XK_KP_Home, XK_KP_Begin)) 328 if (IN_RANGE_INC (keysym, XK_KP_Home, XK_KP_Begin))
… …
334# endif 338# endif
335#endif 339#endif
336 return keysym; 340 return keysym;
337} 341}
338 342
339static inline int 343static inline int ecb_cold
340map_function_key (KeySym keysym) 344map_function_key (KeySym keysym)
341{ 345{
342 int param = 0; 346 int param = 0;
343 347
344 if (IN_RANGE_INC (keysym, XK_F1, XK_F35)) 348 if (IN_RANGE_INC (keysym, XK_F1, XK_F35))
… …
369 param = 3; 373 param = 3;
370 break; 374 break;
371 case XK_Select: 375 case XK_Select:
372 param = 4; 376 param = 4;
373 break; 377 break;
374#ifndef UNSHIFTED_SCROLLKEYS
375 case XK_Prior: 378 case XK_Prior:
376 param = 5; 379 param = 5;
377 break; 380 break;
378 case XK_Next: 381 case XK_Next:
379 param = 6; 382 param = 6;
… …
382 param = 7; 385 param = 7;
383 break; 386 break;
384 case XK_End: 387 case XK_End:
385 param = 8; 388 param = 8;
386 break; 389 break;
387#endif
388 case XK_Help: 390 case XK_Help:
389 param = 28; 391 param = 28;
390 break; 392 break;
391 case XK_Menu: 393 case XK_Menu:
392 param = 29; 394 param = 29;
393 break; 395 break;
394 } 396 }
395 return param; 397 return param;
396} 398}
397 399
398void 400static inline wchar_t *
401rxvt_wcsdup (const wchar_t *str, int len)
402{
403 wchar_t *r = (wchar_t *)rxvt_malloc ((len + 1) * sizeof (wchar_t));
404 memcpy (r, str, len * sizeof (wchar_t));
405 r[len] = 0;
406 return r;
407}
408
409void ecb_cold
399rxvt_term::key_press (XKeyEvent &ev) 410rxvt_term::key_press (XKeyEvent &ev)
400{ 411{
401 int ctrl, meta, shft, len; 412 int ctrl, meta, shft, len;
402 KeySym keysym; 413 KeySym keysym = NoSymbol;
403 int valid_keysym;
404 char kbuf[KBUFSZ]; 414 char rkbuf[KBUFSZ + 1];
415 char *kbuf = rkbuf + 1;
405 416
406#if ISO_14755 417#if ISO_14755
407 if (iso14755buf & ISO_14755_52) 418 if (iso14755buf & ISO_14755_52)
408 return; 419 return;
409#endif 420#endif
… …
416 */ 427 */
417 shft = ev.state & ShiftMask; 428 shft = ev.state & ShiftMask;
418 ctrl = ev.state & ControlMask; 429 ctrl = ev.state & ControlMask;
419 meta = ev.state & ModMetaMask; 430 meta = ev.state & ModMetaMask;
420 431
421 if (numlock_state || (ev.state & ModNumLockMask))
422 {
423 numlock_state = (ev.state & ModNumLockMask);
424 set_privmode (PrivMode_aplKP, !numlock_state);
425 }
426
427 kbuf[0] = 0; 432 kbuf[0] = 0;
428 433
429#ifdef USE_XIM 434#if USE_XIM
430 if (Input_Context) 435 if (Input_Context)
431 { 436 {
432 Status status_return; 437 Status status_return;
433 438
434#if 0 439#if 0
… …
472 } 477 }
473 } 478 }
474 else 479 else
475 len = 0; 480 len = 0;
476 } 481 }
477
478 valid_keysym = status_return == XLookupKeySym
479 || status_return == XLookupBoth;
480 } 482 }
481 else 483 else
482#endif 484#endif
483 { 485 {
484 len = XLookupString (&ev, kbuf, KBUFSZ, &keysym, &compose); 486 len = XLookupString (&ev, kbuf, KBUFSZ, &keysym, &compose);
485 valid_keysym = keysym != NoSymbol; 487 }
488
489 if (keysym != NoSymbol)
486 } 490 {
491 KeySym orig_keysym = keysym;
487 492
488 if (valid_keysym) 493 /* Shift + F1 - F10 generates F11 - F20 */
494 if (shft && keysym >= XK_F1 && keysym <= XK_F10)
495 {
496 keysym += (XK_F11 - XK_F1);
497 shft = 0; /* turn off Shift */
498 }
499
500 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
501 {
502 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
503 unsigned int newlen = 1;
504
505 if (ev.state & ModNumLockMask)
506 kp = false;
507
508 keysym = translate_keypad (keysym, kp);
509
510 switch (keysym)
511 {
512#ifndef NO_BACKSPACE_KEY
513 case XK_BackSpace:
514 if (priv_modes & PrivMode_HaveBackSpace)
515 {
516 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
517 ^ !!ctrl) ? '\b' : '\177';
518 kbuf[1] = '\0';
519 }
520 else
521 strcpy (kbuf, rs[Rs_backspace_key]);
522 break;
523#endif
524#ifndef NO_DELETE_KEY
525 case XK_Delete:
526 strcpy (kbuf, rs[Rs_delete_key]);
527 break;
528#endif
529 case XK_Tab:
530 if (shft)
531 strcpy (kbuf, "\033[Z");
532 else
533 {
534#ifdef CTRL_TAB_MAKES_META
535 if (ctrl)
536 meta = 1;
537#endif
538#ifdef MOD4_TAB_MAKES_META
539 if (ev.state & Mod4Mask)
540 meta = 1;
541#endif
542 newlen = 0;
543 }
544 break;
545
546 case XK_Up: /* "\033[A" */
547 case XK_Down: /* "\033[B" */
548 case XK_Right: /* "\033[C" */
549 case XK_Left: /* "\033[D" */
550 strcpy (kbuf, "\033[Z");
551 kbuf[2] = "DACB"[keysym - XK_Left];
552 /* do Shift first */
553 if (shft)
554 kbuf[2] = "dacb"[keysym - XK_Left];
555 else if (ctrl)
556 {
557 kbuf[1] = 'O';
558 kbuf[2] = "dacb"[keysym - XK_Left];
559 }
560 else if (priv_modes & PrivMode_aplCUR)
561 kbuf[1] = 'O';
562 break;
563
564 case XK_KP_Enter:
565 /* allow shift to override */
566 if (kp)
567 {
568 strcpy (kbuf, "\033OM");
569 break;
570 }
571
572 /* FALLTHROUGH */
573
574 case XK_Return:
575 if (priv_modes & PrivMode_LFNL)
576 {
577 kbuf[0] = '\015';
578 kbuf[1] = '\012';
579 kbuf[2] = '\0';
580 }
581 else
582 {
583 kbuf[0] = '\015';
584 kbuf[1] = '\0';
585 }
586 break;
587
588 case XK_KP_F1: /* "\033OP" */
589 case XK_KP_F2: /* "\033OQ" */
590 case XK_KP_F3: /* "\033OR" */
591 case XK_KP_F4: /* "\033OS" */
592 strcpy (kbuf, "\033OP");
593 kbuf[2] += (keysym - XK_KP_F1);
594 break;
595
596 case XK_KP_Multiply: /* "\033Oj" : "*" */
597 case XK_KP_Add: /* "\033Ok" : "+" */
598 case XK_KP_Separator: /* "\033Ol" : "," */
599 case XK_KP_Subtract: /* "\033Om" : "-" */
600 case XK_KP_Decimal: /* "\033On" : "." */
601 case XK_KP_Divide: /* "\033Oo" : "/" */
602 case XK_KP_0: /* "\033Op" : "0" */
603 case XK_KP_1: /* "\033Oq" : "1" */
604 case XK_KP_2: /* "\033Or" : "2" */
605 case XK_KP_3: /* "\033Os" : "3" */
606 case XK_KP_4: /* "\033Ot" : "4" */
607 case XK_KP_5: /* "\033Ou" : "5" */
608 case XK_KP_6: /* "\033Ov" : "6" */
609 case XK_KP_7: /* "\033Ow" : "7" */
610 case XK_KP_8: /* "\033Ox" : "8" */
611 case XK_KP_9: /* "\033Oy" : "9" */
612 /* allow shift to override */
613 if (kp)
614 {
615 strcpy (kbuf, "\033Oj");
616 kbuf[2] += (keysym - XK_KP_Multiply);
617 }
618 else
619 {
620 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
621 kbuf[1] = '\0';
622 }
623 break;
624
625 default:
626 {
627 int param = map_function_key (keysym);
628 if (param > 0)
629 sprintf (kbuf,"\033[%d~", param);
630 else
631 newlen = 0;
632 }
633 break;
634 }
635
636 if (newlen)
637 len = strlen (kbuf);
638
639 if (len > 0)
640 {
641 /*
642 * pass Shift/Control indicators for function keys ending with `~'
643 *
644 * eg,
645 * Prior = "ESC[5~"
646 * Shift+Prior = "ESC[5$"
647 * Ctrl+Prior = "ESC[5^"
648 * Ctrl+Shift+Prior = "ESC[5@"
649 */
650 if (kbuf[0] == C0_ESC && kbuf[1] == '[' && kbuf[len - 1] == '~')
651 kbuf[len - 1] = (shft ? (ctrl ? '@' : '$') : (ctrl ? '^' : '~'));
652
653 /*
654 * Pass meta for all function keys, if 'meta' option set
655 */
656#ifdef META8_OPTION
657 if (meta && (meta_char == 0x80))
658 kbuf[len - 1] |= 0x80;
659#endif
660 }
661
662 }
663 else if (ctrl && keysym == XK_minus)
664 {
665 len = 1;
666 kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */
667 }
668 else if (keysym == XK_ISO_Left_Tab)
669 {
670 strcpy (kbuf, "\033[Z");
671 len = 3;
672 }
673 else
674 {
675#ifdef META8_OPTION
676 /* set 8-bit on */
677 if (meta && (meta_char == 0x80))
678 {
679 char *ch;
680
681 for (ch = kbuf; ch < kbuf + len; ch++)
682 *ch |= 0x80;
683 }
684#endif
685 /* nil */ ;
686 }
687
688 keysym = orig_keysym;
689 }
690
691 /* escape prefix */
692 if (len && meta
693#ifdef META8_OPTION
694 && meta_char == C0_ESC
695#endif
696 )
697 {
698 *--kbuf = C0_ESC;
699 len++;
700 }
701
702 if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_INT, keysym, DT_STR_LEN, kbuf, len, DT_END)))
703 return;
704
705 if (keysym != NoSymbol)
489 { 706 {
490#ifdef KEYSYM_RESOURCE 707#ifdef KEYSYM_RESOURCE
491 if (keyboard->dispatch (this, keysym, ev.state)) 708 if (keyboard->dispatch (this, keysym, ev.state, kbuf, len))
492 return; 709 return;
493#endif 710#endif
494 711
495 if (saveLines) 712 if (saveLines)
496 { 713 {
… …
505#ifdef PAGING_CONTEXT_LINES 722#ifdef PAGING_CONTEXT_LINES
506 lnsppg = nrow - PAGING_CONTEXT_LINES; 723 lnsppg = nrow - PAGING_CONTEXT_LINES;
507#else 724#else
508 lnsppg = nrow * 4 / 5; 725 lnsppg = nrow * 4 / 5;
509#endif 726#endif
727 max_it (lnsppg, 1);
728
510 if (keysym == XK_Prior) 729 if (keysym == XK_Prior)
511 { 730 {
512 scr_page (UP, lnsppg); 731 scr_page (lnsppg);
513 return; 732 return;
514 } 733 }
515 else if (keysym == XK_Next) 734 else if (keysym == XK_Next)
516 { 735 {
517 scr_page (DN, lnsppg); 736 scr_page (-lnsppg);
518 return; 737 return;
519 } 738 }
520 } 739 }
521#ifdef SCROLL_ON_UPDOWN_KEYS 740#ifdef SCROLL_ON_UPDOWN_KEYS
522 if (IS_SCROLL_MOD) 741 if (IS_SCROLL_MOD)
523 { 742 {
524 if (keysym == XK_Up) 743 if (keysym == XK_Up)
525 { 744 {
526 scr_page (UP, 1); 745 scr_page (1);
527 return; 746 return;
528 } 747 }
529 else if (keysym == XK_Down) 748 else if (keysym == XK_Down)
530 { 749 {
531 scr_page (DN, 1); 750 scr_page (-1);
532 return; 751 return;
533 } 752 }
534 } 753 }
535#endif 754#endif
536#ifdef SCROLL_ON_HOMEEND_KEYS 755#ifdef SCROLL_ON_HOMEEND_KEYS
537 if (IS_SCROLL_MOD) 756 if (IS_SCROLL_MOD)
538 { 757 {
539 if (keysym == XK_Home) 758 if (keysym == XK_Home)
540 { 759 {
541 scr_move_to (0, 1); 760 scr_changeview (top_row);
542 return; 761 return;
543 } 762 }
544 else if (keysym == XK_End) 763 else if (keysym == XK_End)
545 { 764 {
546 scr_move_to (1, 1); 765 scr_changeview (0);
547 return; 766 return;
548 } 767 }
549 } 768 }
550#endif 769#endif
551 } 770 }
552 771
553 if (shft) 772 if (shft)
554 { 773 {
555 /* Shift + F1 - F10 generates F11 - F20 */
556 if (keysym >= XK_F1 && keysym <= XK_F10)
557 {
558 keysym += (XK_F11 - XK_F1);
559 shft = 0; /* turn off Shift */
560 }
561 else if (!ctrl && !meta && (priv_modes & PrivMode_ShiftKeys)) 774 if (!ctrl && !meta && (priv_modes & PrivMode_ShiftKeys))
562 { 775 {
563 switch (keysym) 776 switch (keysym)
564 { 777 {
565 /* normal XTerm key bindings */ 778 /* normal XTerm key bindings */
566 case XK_Insert: /* Shift+Insert = paste mouse selection */ 779 case XK_Insert: /* Shift+Insert = paste mouse selection */
567 selection_request (ev.time); 780 selection_request (ev.time);
568 return; 781 return;
569#if TODO 782#if TODO
570 /* rxvt extras */ 783 /* rxvt extras */
571 case XK_KP_Add: /* Shift+KP_Add = bigger font */ 784 case XK_KP_Add: /* Shift+KP_Add = bigger font */
572 change_font (FONT_UP);
573 return; 785 return;
574 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */ 786 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */
575 change_font (FONT_DN);
576 return; 787 return;
577#endif 788#endif
578 } 789 }
579 } 790 }
580 } 791 }
581 792
793 if (ctrl && meta && (keysym == XK_c || keysym == XK_v))
794 {
795 if (keysym == XK_v)
796 selection_request (ev.time, Sel_Clipboard);
797 else if (selection.len > 0)
798 {
799 free (selection.clip_text);
800 selection.clip_text = rxvt_wcsdup (selection.text, selection.len);
801 selection.clip_len = selection.len;
802 selection_grab (CurrentTime, true);
803 }
804
805 return;
806 }
807
582#if ENABLE_FRILLS || ISO_14755 808#if ENABLE_FRILLS || ISO_14755
583 // ISO 14755 support 809 // ISO 14755 support
584 if (shft && ctrl) 810 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_51))
585 { 811 {
586 int hv; 812 int hv;
587 813
588 if (iso14755buf & ISO_14755_51 814 if (iso14755buf & ISO_14755_51
589 && (keysym == XK_space || keysym == XK_KP_Space 815 && (keysym == XK_space || keysym == XK_KP_Space
… …
619 scr_overlay_off (); 845 scr_overlay_off ();
620# endif 846# endif
621 iso14755buf = 0; 847 iso14755buf = 0;
622 } 848 }
623 } 849 }
850 else if (option (Opt_iso14755) &&
624 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R)) 851 ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R))
625 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))) 852 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))))
626 if (!(iso14755buf & ISO_14755_STARTED)) 853 if (!(iso14755buf & ISO_14755_STARTED))
627 { 854 {
628 iso14755buf |= ISO_14755_STARTED; 855 iso14755buf |= ISO_14755_STARTED;
629# if ISO_14755 856# if ISO_14755
630 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1); 857 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);
… …
638 { 865 {
639 scr_printscreen (ctrl | shft); 866 scr_printscreen (ctrl | shft);
640 return; 867 return;
641 } 868 }
642#endif 869#endif
643
644 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
645 {
646 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
647 unsigned int newlen = 1;
648
649 switch (translate_keypad (keysym, kp))
650 {
651#ifndef NO_BACKSPACE_KEY
652 case XK_BackSpace:
653 if (priv_modes & PrivMode_HaveBackSpace)
654 {
655 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
656 ^ !!ctrl) ? '\b' : '\177';
657 kbuf[1] = '\0';
658 }
659 else
660 strcpy (kbuf, rs[Rs_backspace_key]);
661 break;
662#endif
663#ifndef NO_DELETE_KEY
664 case XK_Delete:
665 strcpy (kbuf, rs[Rs_delete_key]);
666 break;
667#endif
668 case XK_Tab:
669 if (shft)
670 strcpy (kbuf, "\033[Z");
671 else
672 {
673#ifdef CTRL_TAB_MAKES_META
674 if (ctrl)
675 meta = 1;
676#endif
677#ifdef MOD4_TAB_MAKES_META
678 if (ev.state & Mod4Mask)
679 meta = 1;
680#endif
681 newlen = 0;
682 }
683 break;
684
685 case XK_Up: /* "\033[A" */
686 case XK_Down: /* "\033[B" */
687 case XK_Right: /* "\033[C" */
688 case XK_Left: /* "\033[D" */
689 strcpy (kbuf, "\033[Z");
690 kbuf[2] = "DACB"[keysym - XK_Left];
691 /* do Shift first */
692 if (shft)
693 kbuf[2] = "dacb"[keysym - XK_Left];
694 else if (ctrl)
695 {
696 kbuf[1] = 'O';
697 kbuf[2] = "dacb"[keysym - XK_Left];
698 }
699 else if (priv_modes & PrivMode_aplCUR)
700 kbuf[1] = 'O';
701 break;
702
703 case XK_KP_Enter:
704 /* allow shift to override */
705 if (kp)
706 {
707 strcpy (kbuf, "\033OM");
708 break;
709 }
710
711 /* FALLTHROUGH */
712
713 case XK_Return:
714 if (priv_modes & PrivMode_LFNL)
715 {
716 kbuf[0] = '\015';
717 kbuf[1] = '\012';
718 kbuf[2] = '\0';
719 }
720 else
721 {
722 kbuf[0] = '\015';
723 kbuf[1] = '\0';
724 }
725 break;
726
727 case XK_KP_F1: /* "\033OP" */
728 case XK_KP_F2: /* "\033OQ" */
729 case XK_KP_F3: /* "\033OR" */
730 case XK_KP_F4: /* "\033OS" */
731 strcpy (kbuf, "\033OP");
732 kbuf[2] += (keysym - XK_KP_F1);
733 break;
734
735 case XK_KP_Multiply: /* "\033Oj" : "*" */
736 case XK_KP_Add: /* "\033Ok" : "+" */
737 case XK_KP_Separator: /* "\033Ol" : "," */
738 case XK_KP_Subtract: /* "\033Om" : "-" */
739 case XK_KP_Decimal: /* "\033On" : "." */
740 case XK_KP_Divide: /* "\033Oo" : "/" */
741 case XK_KP_0: /* "\033Op" : "0" */
742 case XK_KP_1: /* "\033Oq" : "1" */
743 case XK_KP_2: /* "\033Or" : "2" */
744 case XK_KP_3: /* "\033Os" : "3" */
745 case XK_KP_4: /* "\033Ot" : "4" */
746 case XK_KP_5: /* "\033Ou" : "5" */
747 case XK_KP_6: /* "\033Ov" : "6" */
748 case XK_KP_7: /* "\033Ow" : "7" */
749 case XK_KP_8: /* "\033Ox" : "8" */
750 case XK_KP_9: /* "\033Oy" : "9" */
751 /* allow shift to override */
752 if (kp)
753 {
754 strcpy (kbuf, "\033Oj");
755 kbuf[2] += (keysym - XK_KP_Multiply);
756 }
757 else
758 {
759 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
760 kbuf[1] = '\0';
761 }
762 break;
763
764 default:
765 {
766 int param = map_function_key (keysym);
767 if (param > 0)
768 sprintf (kbuf,"\033[%d~", param);
769 else
770 newlen = 0;
771 }
772 break;
773 }
774
775 if (newlen)
776 len = strlen (kbuf);
777
778 /*
779 * Pass meta for all function keys, if 'meta' option set
780 */
781#ifdef META8_OPTION
782 if (meta && (meta_char == 0x80) && len > 0)
783 kbuf[len - 1] |= 0x80;
784#endif
785
786 }
787 else if (ctrl && keysym == XK_minus)
788 {
789 len = 1;
790 kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */
791 }
792 else if (keysym == XK_ISO_Left_Tab)
793 {
794 strcpy (kbuf, "\033[Z");
795 len = 3;
796 }
797 else
798 {
799#ifdef META8_OPTION
800 /* set 8-bit on */
801 if (meta && (meta_char == 0x80))
802 {
803 char *ch;
804
805 for (ch = kbuf; ch < kbuf + len; ch++)
806 *ch |= 0x80;
807
808 meta = 0;
809 }
810#endif
811 /* nil */ ;
812 }
813 } 870 }
814
815 if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_INT, keysym, DT_STR_LEN, kbuf, len, DT_END)))
816 return;
817 871
818 if (len <= 0) 872 if (len <= 0)
819 return; /* not mapped */ 873 return; /* not mapped */
820 874
821 if (option (Opt_scrollTtyKeypress))
822 if (view_start)
823 {
824 view_start = 0;
825 want_refresh = 1;
826 }
827
828 /*
829 * these modifications only affect the static keybuffer
830 * pass Shift/Control indicators for function keys ending with `~'
831 *
832 * eg,
833 * Prior = "ESC[5~"
834 * Shift+Prior = "ESC[5$"
835 * Ctrl+Prior = "ESC[5^"
836 * Ctrl+Shift+Prior = "ESC[5@"
837 * Meta adds an Escape prefix (with META8_OPTION, if meta == <escape>).
838 */
839 if (kbuf[0] == C0_ESC && kbuf[1] == '[' && kbuf[len - 1] == '~')
840 kbuf[len - 1] = (shft ? (ctrl ? '@' : '$') : (ctrl ? '^' : '~'));
841
842 /* escape prefix */
843 if (meta
844#ifdef META8_OPTION
845 && meta_char == C0_ESC
846#endif
847 )
848 {
849 const char ch = C0_ESC;
850 tt_write (&ch, 1);
851 }
852
853 tt_write (kbuf, (unsigned int)len); 875 tt_write_user_input (kbuf, (unsigned int)len);
854} 876}
855 877
856void 878void ecb_cold
857rxvt_term::key_release (XKeyEvent &ev) 879rxvt_term::key_release (XKeyEvent &ev)
858{ 880{
859#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL 881#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
860 KeySym keysym; 882 KeySym keysym;
861 883
… …
881 commit_iso14755 (); 903 commit_iso14755 ();
882 904
883 return; 905 return;
884 } 906 }
885 907
886 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2) 908 for (unsigned short *i = iso14755_symtab; i[0]; i += 2)
887 if (i[0] == keysym) 909 if (i[0] == keysym)
888 { 910 {
889 iso14755buf = ISO_14755_51 | i[1]; 911 iso14755buf = ISO_14755_51 | i[1];
890 commit_iso14755 (); 912 commit_iso14755 ();
891 913
… …
928 else if (keysym == XK_Control_L || keysym == XK_Control_R) 950 else if (keysym == XK_Control_L || keysym == XK_Control_R)
929 mouse_slip_wheel_speed = 0; 951 mouse_slip_wheel_speed = 0;
930#endif 952#endif
931} 953}
932 954
933#if defined (KEYSYM_RESOURCE)
934unsigned int
935rxvt_term::cmd_write (const char *str, unsigned int count)
936{
937 unsigned int n, s;
938
939 n = cmdbuf_ptr - cmdbuf_base;
940 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp;
941
942 if (n > 0 && s < count)
943 {
944 memmove (cmdbuf_base, cmdbuf_ptr,
945 (unsigned int) (cmdbuf_endp - cmdbuf_ptr));
946 cmdbuf_ptr = cmdbuf_base;
947 cmdbuf_endp -= n;
948 s += n;
949 }
950
951 if (count > s)
952 {
953 rxvt_warn ("data loss: cmd_write too large, continuing.\n");
954 count = s;
955 }
956
957 for (; count--;)
958 *cmdbuf_endp++ = *str++;
959
960 cmd_parse ();
961
962 return 0;
963}
964#endif
965
966void 955void
967rxvt_term::flush () 956rxvt_term::flush ()
968{ 957{
969 flush_ev.stop (); 958 flush_ev.stop ();
970 959
971#ifdef HAVE_BG_PIXMAP 960#ifdef HAVE_IMG
972 if (bgPixmap.check_clearChanged ()) 961 if (bg_flags & BG_NEEDS_REFRESH)
973 { 962 {
974// scr_clear (true); This needs to be researched further! 963 bg_flags &= ~BG_NEEDS_REFRESH;
975 scr_touch (false); 964 scr_touch (false);
976 } 965 }
977#endif 966#endif
978 967
979 if (want_refresh) 968 if (want_refresh)
… …
1016 while (row < end_row); 1005 while (row < end_row);
1017 } 1006 }
1018 1007
1019 scr_refresh (); 1008 scr_refresh ();
1020 scrollBar.show (1); 1009 scrollBar.show (1);
1021#ifdef USE_XIM 1010#if USE_XIM
1022 IMSendSpot (); 1011 im_send_spot ();
1023#endif 1012#endif
1024 } 1013 }
1025 1014
1026 display->flush (); 1015 display->flush ();
1027} 1016}
1028 1017
1029/* checks wether a refresh is requested and starts the refresh timer */ 1018/* checks whether a refresh is requested and starts the refresh timer */
1030void 1019void
1031rxvt_term::refresh_check () 1020rxvt_term::refresh_check ()
1032{ 1021{
1033 if (want_refresh && !flush_ev.is_active ()) 1022 if (want_refresh && !flush_ev.is_active ())
1034 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally 1023 flush_ev.start ();
1035 1024
1036 display->flush (); 1025 display->flush ();
1037} 1026}
1038 1027
1039void 1028void
… …
1044 refresh_count = 0; 1033 refresh_count = 0;
1045 flush (); 1034 flush ();
1046} 1035}
1047 1036
1048#ifdef CURSOR_BLINK 1037#ifdef CURSOR_BLINK
1038void
1039rxvt_term::cursor_blink_reset ()
1040{
1041 if (!focus)
1042 return;
1043
1044 if (hidden_cursor)
1045 {
1046 hidden_cursor = 0;
1047 want_refresh = 1;
1048 }
1049
1050 if (option (Opt_cursorBlink) || (priv_modes & PrivMode_BlinkingCursor))
1051 cursor_blink_ev.again ();
1052 else
1053 cursor_blink_ev.stop ();
1054}
1055
1049void 1056void
1050rxvt_term::cursor_blink_cb (ev::timer &w, int revents) 1057rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
1051{ 1058{
1052 hidden_cursor = !hidden_cursor; 1059 hidden_cursor = !hidden_cursor;
1053 want_refresh = 1; 1060 want_refresh = 1;
… …
1072 1079
1073#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1080#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1074void 1081void
1075rxvt_term::cont_scroll_cb (ev::timer &w, int revents) 1082rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1076{ 1083{
1077 if ((scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN) 1084 if ((scrollBar.state == SB_STATE_UP || scrollBar.state == SB_STATE_DOWN)
1078 && scr_page (scrollBar.state == STATE_UP ? UP : DN, 1)) 1085 && scr_page (scrollBar.state == SB_STATE_UP ? UP : DN, 1))
1079 { 1086 {
1080 want_refresh = 1; 1087 want_refresh = 1;
1081 refresh_check (); 1088 refresh_check ();
1082 } 1089 }
1083 else 1090 else
… …
1087 1094
1088#ifdef SELECTION_SCROLLING 1095#ifdef SELECTION_SCROLLING
1089void 1096void
1090rxvt_term::sel_scroll_cb (ev::timer &w, int revents) 1097rxvt_term::sel_scroll_cb (ev::timer &w, int revents)
1091{ 1098{
1092 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1099 if (scr_page (scroll_selection_lines))
1093 { 1100 {
1094 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1101 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1095 want_refresh = 1; 1102 want_refresh = 1;
1096 refresh_check (); 1103 refresh_check ();
1097 } 1104 }
… …
1102 1109
1103#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1110#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1104void 1111void
1105rxvt_term::slip_wheel_cb (ev::timer &w, int revents) 1112rxvt_term::slip_wheel_cb (ev::timer &w, int revents)
1106{ 1113{
1107 if (scr_changeview (view_start - mouse_slip_wheel_speed)) 1114 if (scr_page (mouse_slip_wheel_speed))
1108 { 1115 {
1109 want_refresh = 1; 1116 want_refresh = 1;
1110 refresh_check (); 1117 refresh_check ();
1111 } 1118 }
1112 1119
… …
1127 { 1134 {
1128 // this should really be sched_yield(), but the linux guys thought 1135 // this should really be sched_yield(), but the linux guys thought
1129 // that giving a process calling sched_yield () less cpu time than 1136 // that giving a process calling sched_yield () less cpu time than
1130 // ones with high nice levels is a useful thing to do. It surely is is 1137 // ones with high nice levels is a useful thing to do. It surely is is
1131 // allowed by the sus... as is returning ENOSYS. 1138 // allowed by the sus... as is returning ENOSYS.
1139 // since the linux guys additionally thought that breaking the only
1140 // known workaround against their unusable sched_yield hack is cool,
1141 // we just nanosleep a bit and hope for the best.
1132 1142
1133 struct timespec ts = { 0, 0 }; 1143 struct timespec ts = { 0, 1000 };
1134 nanosleep (&ts, 0); 1144 nanosleep (&ts, 0);
1135 1145
1136 w.stop (); 1146 w.stop ();
1137 } 1147 }
1138 1148
… …
1141 { 1151 {
1142 } 1152 }
1143} event_handler; 1153} event_handler;
1144#endif 1154#endif
1145 1155
1156/* make sure all the cmd data is at beginning of cmdbuf */
1157void
1158rxvt_term::cmdbuf_reify ()
1159{
1160 if (cmdbuf_ptr == cmdbuf_base)
1161 return;
1162
1163 ssize_t used = cmdbuf_endp - cmdbuf_ptr;
1164
1165 memmove (cmdbuf_base, cmdbuf_ptr, used);
1166 cmdbuf_ptr = cmdbuf_base;
1167 cmdbuf_endp = cmdbuf_ptr + used;
1168
1169}
1170
1171#if defined (KEYSYM_RESOURCE)
1172void
1173rxvt_term::cmdbuf_append (const char *str, size_t count)
1174{
1175 cmdbuf_reify ();
1176
1177 size_t avail = cmdbuf_base + CBUFSIZ - cmdbuf_endp;
1178
1179 if (count > avail)
1180 return;
1181
1182 memcpy (cmdbuf_endp, str, count);
1183 cmdbuf_endp += count;
1184
1185 cmd_parse ();
1186}
1187#endif
1188
1146bool 1189bool
1147rxvt_term::pty_fill () 1190rxvt_term::pty_fill ()
1148{ 1191{
1149 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1192 cmdbuf_reify ();
1150 1193
1151 if (CBUFSIZ == n) 1194 size_t avail = cmdbuf_base + CBUFSIZ - cmdbuf_endp;
1152 { 1195
1153 rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n"); 1196 if (!avail)
1154 n = 0;
1155 } 1197 {
1156 1198 // normally this indicates a "too long" command sequence - just drop the data we have
1157 memmove (cmdbuf_base, cmdbuf_ptr, n);
1158 cmdbuf_ptr = cmdbuf_base; 1199 cmdbuf_ptr = cmdbuf_base;
1159 cmdbuf_endp = cmdbuf_ptr + n; 1200 cmdbuf_endp = cmdbuf_ptr;
1201 avail = CBUFSIZ;
1202 }
1160 1203
1161 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n); 1204 ssize_t r = read (pty->pty, cmdbuf_endp, avail);
1162 1205
1163 if (r > 0) 1206 if (r > 0)
1164 { 1207 {
1165 cmdbuf_endp += r; 1208 cmdbuf_endp += r;
1166 return true; 1209 return true;
… …
1188{ 1231{
1189 make_current (); 1232 make_current ();
1190 1233
1191 if (revents & ev::READ) 1234 if (revents & ev::READ)
1192 // loop, but don't allow a single term to monopolize us 1235 // loop, but don't allow a single term to monopolize us
1193 while (pty_fill ()) 1236 for (int i = CBUFCNT; i-- && pty_fill (); )
1194 if (cmd_parse ()) 1237 cmd_parse ();
1195 break;
1196 1238
1197 if (revents & ev::WRITE) 1239 if (revents & ev::WRITE)
1198 pty_write (); 1240 pty_write ();
1199 1241
1200 refresh_check (); 1242 refresh_check ();
1201} 1243}
1202 1244
1203void 1245void ecb_cold
1204rxvt_term::pointer_unblank () 1246rxvt_term::pointer_unblank ()
1205{ 1247{
1206 XDefineCursor (dpy, vt, TermWin_cursor); 1248 XDefineCursor (dpy, vt, TermWin_cursor);
1207 recolour_cursor (); 1249 recolor_cursor ();
1208 1250
1209#ifdef POINTER_BLANK 1251#ifdef POINTER_BLANK
1210 hidden_pointer = 0; 1252 hidden_pointer = 0;
1211 1253
1212 if (option (Opt_pointerBlank)) 1254 if (option (Opt_pointerBlank))
1213 pointer_ev.start (pointerBlankDelay); 1255 pointer_ev.start (pointerBlankDelay);
1214#endif 1256#endif
1215} 1257}
1216 1258
1217#ifdef POINTER_BLANK 1259#ifdef POINTER_BLANK
1218void 1260void ecb_cold
1219rxvt_term::pointer_blank () 1261rxvt_term::pointer_blank ()
1220{ 1262{
1221 if (!option (Opt_pointerBlank)) 1263 if (!option (Opt_pointerBlank))
1222 return; 1264 return;
1223 1265
… …
1225 XFlush (dpy); 1267 XFlush (dpy);
1226 1268
1227 hidden_pointer = 1; 1269 hidden_pointer = 1;
1228} 1270}
1229 1271
1230void 1272void ecb_cold
1231rxvt_term::pointer_cb (ev::timer &w, int revents) 1273rxvt_term::pointer_cb (ev::timer &w, int revents)
1232{ 1274{
1233 make_current (); 1275 make_current ();
1234 1276
1235 pointer_blank (); 1277 pointer_blank ();
… …
1237#endif 1279#endif
1238 1280
1239void 1281void
1240rxvt_term::mouse_report (XButtonEvent &ev) 1282rxvt_term::mouse_report (XButtonEvent &ev)
1241{ 1283{
1242 int button_number, key_state = 0; 1284 int button_number, state = 0;
1243 int x, y; 1285 int x, y;
1244 int code = 32; 1286 bool release = ev.type == ButtonRelease;
1245 1287
1246 x = Pixel2Col (ev.x); 1288 x = 1 + clamp (Pixel2Col (ev.x), 0, ncol - 1);
1247 y = Pixel2Row (ev.y); 1289 y = 1 + clamp (Pixel2Row (ev.y), 0, nrow - 1);
1290
1248 if (ev.type == MotionNotify) 1291 if (ev.type == MotionNotify)
1249 { 1292 {
1250 if (x == mouse_row && y == mouse_col) 1293 if (x == mouse_row && y == mouse_col)
1251 return; 1294 return;
1295
1252 mouse_row = x; 1296 mouse_row = x;
1253 mouse_col = y; 1297 mouse_col = y;
1254 code += 32; 1298 state += 32;
1255 }
1256
1257 if (MEvent.button == AnyButton)
1258 button_number = 3;
1259 else
1260 { 1299 }
1300
1261 button_number = MEvent.button - Button1; 1301 button_number = MEvent.button - Button1;
1262 /* add 0x3D for wheel events, like xterm does */ 1302 if (button_number > 10)
1303 return;
1304 else if (button_number >= 7)
1305 button_number += 128 - 7;
1263 if (button_number >= 3) 1306 else if (button_number >= 3)
1264 button_number += (64 - 3); 1307 button_number += 64 - 3;
1265 }
1266 1308
1267 if (priv_modes & PrivMode_MouseX10) 1309 if (priv_modes & PrivMode_MouseX10)
1268 { 1310 {
1269 /* 1311 /*
1270 * do not report ButtonRelease 1312 * do not report ButtonRelease
1271 * no state info allowed 1313 * no state info allowed
1272 */ 1314 */
1273 key_state = 0; 1315 if (release)
1274 if (button_number == 3)
1275 return; 1316 return;
1276 } 1317 }
1277 else 1318 else
1278 { 1319 {
1279 /* XTerm mouse reporting needs these values: 1320 /* XTerm mouse reporting needs these values:
… …
1281 * 8 = Meta 1322 * 8 = Meta
1282 * 16 = Control 1323 * 16 = Control
1283 * plus will add in our own Double-Click reporting 1324 * plus will add in our own Double-Click reporting
1284 * 32 = Double Click 1325 * 32 = Double Click
1285 */ 1326 */
1286 key_state = ((MEvent.state & ShiftMask) ? 4 : 0) 1327 state += ((MEvent.state & ShiftMask) ? 4 : 0)
1287 + ((MEvent.state & ModMetaMask) ? 8 : 0) 1328 + ((MEvent.state & ModMetaMask) ? 8 : 0)
1288 + ((MEvent.state & ControlMask) ? 16 : 0); 1329 + ((MEvent.state & ControlMask) ? 16 : 0);
1289#ifdef MOUSE_REPORT_DOUBLECLICK 1330#ifdef MOUSE_REPORT_DOUBLECLICK
1290 key_state += ((MEvent.clicks > 1) ? 32 : 0); 1331 state += ((MEvent.clicks > 1) ? 32 : 0);
1291#endif 1332#endif
1292 } 1333 }
1334
1335 int code = 32 + (release ? 3 : button_number) + state;
1293 1336
1294#if DEBUG_MOUSEREPORT 1337#if DEBUG_MOUSEREPORT
1295 fprintf (stderr, "Mouse ["); 1338 fprintf (stderr, "Mouse [");
1296 if (key_state & 16) 1339 if (state & 16)
1297 fputc ('C', stderr); 1340 fputc ('C', stderr);
1298 if (key_state & 4) 1341 if (state & 4)
1299 fputc ('S', stderr); 1342 fputc ('S', stderr);
1300 if (key_state & 8) 1343 if (state & 8)
1301 fputc ('A', stderr); 1344 fputc ('A', stderr);
1302 if (key_state & 32) 1345 if (state & 32)
1303 fputc ('2', stderr); 1346 fputc ('2', stderr);
1304 fprintf (stderr, "]: <%d>, %d/%d\n", 1347 fprintf (stderr, "]: <%d>, %d/%d\n",
1305 button_number, 1348 button_number,
1306 x + 1, 1349 x,
1307 y + 1); 1350 y);
1308#endif 1351#endif
1309 1352
1353#if ENABLE_FRILLS
1354 if (priv_modes & PrivMode_ExtMouseSGR)
1355 tt_printf ("\033[<%d;%d;%d%c",
1356 button_number + state,
1357 x,
1358 y,
1359 release ? 'm' : 'M');
1360 else if (priv_modes & PrivMode_ExtMouseUrxvt)
1361 tt_printf ("\033[%d;%d;%dM",
1362 code,
1363 x,
1364 y);
1365 else if (priv_modes & PrivMode_ExtMouseUTF8)
1366 if (code < 128)
1367 tt_printf ("\033[M%c%lc%lc",
1368 code,
1369 wint_t (32 + x),
1370 wint_t (32 + y));
1371 else
1372 tt_printf ("\033[M%c%c%lc%lc",
1373 0xc0 + (code >> 6),
1374 0x80 + (code & 0x3f),
1375 wint_t (32 + x),
1376 wint_t (32 + y));
1377 else
1378#endif
1310 tt_printf ("\033[M%c%c%c", 1379 tt_printf ("\033[M%c%c%c",
1311 (code + button_number + key_state), 1380 code,
1312 (32 + x + 1), 1381 32 + x,
1313 (32 + y + 1)); 1382 32 + y);
1314} 1383}
1315 1384
1316/*{{{ process an X event */ 1385/*{{{ process an X event */
1317void 1386void ecb_hot
1318rxvt_term::x_cb (XEvent &ev) 1387rxvt_term::x_cb (XEvent &ev)
1319{ 1388{
1320 make_current (); 1389 make_current ();
1321 1390
1322 dLocal (Display *, dpy); 1391 dLocal (Display *, dpy);
… …
1420 && ev.xfocus.mode != NotifyGrab) 1489 && ev.xfocus.mode != NotifyGrab)
1421 focus_out (); 1490 focus_out ();
1422 break; 1491 break;
1423 1492
1424 case ConfigureNotify: 1493 case ConfigureNotify:
1425 /*fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",
1426 ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,
1427 szHint.width, szHint.height);*/
1428 if (ev.xconfigure.window == parent[0]) 1494 if (ev.xconfigure.window == parent)
1429 { 1495 {
1430 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1496 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1431 ; 1497 ;
1498
1499 bool want_position_change = SHOULD_INVOKE (HOOK_POSITION_CHANGE);
1500
1501 if (want_position_change)
1502 {
1503 int x, y;
1504
1505 if (ev.xconfigure.send_event)
1506 {
1507 x = ev.xconfigure.x;
1508 y = ev.xconfigure.y;
1509 }
1510 else
1511 get_window_origin (x, y);
1512
1513 if (x != parent_x || y != parent_y)
1514 {
1515 parent_x = x;
1516 parent_y = y;
1517 HOOK_INVOKE ((this, HOOK_POSITION_CHANGE, DT_INT, x, DT_INT, y, DT_END));
1518 }
1519 }
1432 1520
1433 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1521 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1434 { 1522 {
1435 seen_resize = 1; 1523 seen_resize = 1;
1436 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1524 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1437 } 1525 }
1438 else
1439 {
1440#ifdef HAVE_BG_PIXMAP
1441 if (bgPixmap.window_position_sensitive ())
1442 {
1443 if (mapped)
1444 update_background ();
1445 else
1446 bgPixmap.invalidate ();
1447 }
1448#endif
1449 }
1450 1526
1451 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1527 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1452 } 1528 }
1453 break; 1529 break;
1454 1530
1455 case PropertyNotify: 1531 case PropertyNotify:
1456 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END))) 1532 HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END));
1457 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1458 && ev.xproperty.state == PropertyNewValue)
1459 selection_property (ev.xproperty.window, ev.xproperty.atom);
1460
1461 break; 1533 break;
1462 1534
1463 case SelectionClear: 1535 case SelectionClear:
1464 selection_clear (); 1536 selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]);
1465 break;
1466
1467 case SelectionNotify:
1468 if (selection_wait == Sel_normal)
1469 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1470 break; 1537 break;
1471 1538
1472 case SelectionRequest: 1539 case SelectionRequest:
1473 selection_send (ev.xselectionrequest); 1540 selection_send (ev.xselectionrequest);
1474 break; 1541 break;
1475 1542
1476 case MapNotify: 1543 case MapNotify:
1477#ifdef HAVE_BG_PIXMAP
1478 /* This is needed spcifically to fix the case of no window manager or a
1479 * non-reparenting window manager. In those cases we never get first
1480 * ConfigureNotify. Also that speeds startup under normal WM, by taking
1481 * care of multiplicity of ConfigureNotify events arriwing while WM does
1482 * reparenting.
1483 * We should not render background immidiately, as there could be several
1484 * ConfigureNotify's to follow. Lets take care of all of them in one scoop
1485 * by scheduling background redraw as soon as we can, but giving a short
1486 * bit of time for ConfigureNotifies to arrive.
1487 * We should render background PRIOR to drawing any text, but AFTER all
1488 * of ConfigureNotifys for the best results.
1489 */
1490 if (bgPixmap.flags & bgPixmap_t::isInvalid)
1491 update_background_ev.start (0.025);
1492#endif
1493 mapped = 1; 1544 mapped = 1;
1494#ifdef TEXT_BLINK 1545#ifdef TEXT_BLINK
1495 text_blink_ev.start (); 1546 text_blink_ev.start ();
1496#endif 1547#endif
1497 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1548 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
… …
1510 if (ev.xany.window == vt) 1561 if (ev.xany.window == vt)
1511 { 1562 {
1512 do 1563 do
1513 { 1564 {
1514 scr_expose (ev.xexpose.x, ev.xexpose.y, 1565 scr_expose (ev.xexpose.x, ev.xexpose.y,
1515 ev.xexpose.width, ev.xexpose.height, False); 1566 ev.xexpose.width, ev.xexpose.height, false);
1516 } 1567 }
1517 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)); 1568 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1518 1569
1519 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1570 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1520 1571
1521 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)) 1572 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1522 { 1573 {
1523 scr_expose (ev.xexpose.x, ev.xexpose.y, 1574 scr_expose (ev.xexpose.x, ev.xexpose.y,
1524 ev.xexpose.width, ev.xexpose.height, False); 1575 ev.xexpose.width, ev.xexpose.height, false);
1525 } 1576 }
1526 1577
1527 want_refresh = 1; 1578 want_refresh = 1;
1528 } 1579 }
1529 else 1580 else
… …
1535 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event)) 1586 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1536 ; 1587 ;
1537 1588
1538 if (scrollBar.state && ev.xany.window == scrollBar.win) 1589 if (scrollBar.state && ev.xany.window == scrollBar.win)
1539 { 1590 {
1540 scrollBar.state = STATE_IDLE; 1591 scrollBar.state = SB_STATE_IDLE;
1541 scrollBar.show (0); 1592 scrollBar.show (0);
1542 } 1593 }
1543 } 1594 }
1544 break; 1595 break;
1545 1596
1546 case MotionNotify: 1597 case MotionNotify:
1547#ifdef POINTER_BLANK 1598#ifdef POINTER_BLANK
1548 if (hidden_pointer) 1599 if (hidden_pointer)
1549 pointer_unblank (); 1600 pointer_unblank ();
1550#endif 1601#endif
1602 if (!bypass_keystate
1551 if ((priv_modes & PrivMode_MouseBtnEvent && ev.xbutton.state & (Button1Mask|Button2Mask|Button3Mask)) 1603 && ((priv_modes & PrivMode_MouseBtnEvent && ev.xbutton.state & (Button1Mask|Button2Mask|Button3Mask))
1552 || priv_modes & PrivMode_MouseAnyEvent) 1604 || priv_modes & PrivMode_MouseAnyEvent))
1553 mouse_report (ev.xbutton); 1605 mouse_report (ev.xbutton);
1554 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1606 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1555 break; 1607 break;
1556 1608
1557 if (ev.xany.window == vt) 1609 if (ev.xany.window == vt)
… …
1569 &unused_root_x, &unused_root_y, 1621 &unused_root_x, &unused_root_y,
1570 &ev.xbutton.x, &ev.xbutton.y, 1622 &ev.xbutton.x, &ev.xbutton.y,
1571 &ev.xbutton.state); 1623 &ev.xbutton.state);
1572#ifdef MOUSE_THRESHOLD 1624#ifdef MOUSE_THRESHOLD
1573 /* deal with a `jumpy' mouse */ 1625 /* deal with a `jumpy' mouse */
1574 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD) 1626 if (ev.xmotion.time - MEvent.time > MOUSE_THRESHOLD)
1627#endif
1575 { 1628 {
1576#endif
1577#if ISO_14755 1629#if ISO_14755
1578 // 5.4 1630 // 5.4
1579 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1631 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1580 { 1632 {
1581 iso14755_54 (ev.xbutton.x, ev.xbutton.y); 1633 iso14755_54 (ev.xbutton.x, ev.xbutton.y);
… …
1587 1639
1588#ifdef SELECTION_SCROLLING 1640#ifdef SELECTION_SCROLLING
1589 if (ev.xbutton.y < int_bwidth 1641 if (ev.xbutton.y < int_bwidth
1590 || Pixel2Row (ev.xbutton.y) > (nrow-1)) 1642 || Pixel2Row (ev.xbutton.y) > (nrow-1))
1591 { 1643 {
1644 page_dirn scroll_selection_dir;
1592 int dist; 1645 int dist;
1593 1646
1594 /* don't clobber the current delay if we are 1647 /* don't clobber the current delay if we are
1595 * already in the middle of scrolling. 1648 * already in the middle of scrolling.
1596 */ 1649 */
… …
1611 dist = int_bwidth - ev.xbutton.y; 1664 dist = int_bwidth - ev.xbutton.y;
1612 } 1665 }
1613 else 1666 else
1614 { 1667 {
1615 scroll_selection_dir = DN; 1668 scroll_selection_dir = DN;
1616 dist = ev.xbutton.y - (int_bwidth + height); 1669 dist = ev.xbutton.y - (int_bwidth + vt_height);
1617 } 1670 }
1618 1671
1619 scroll_selection_lines = Pixel2Height (dist) 1672 scroll_selection_lines = Pixel2Height (dist)
1620 / SELECTION_SCROLL_LINE_SPEEDUP 1673 / SELECTION_SCROLL_LINE_SPEEDUP
1621 + 1; 1674 + 1;
1622 min_it (scroll_selection_lines, 1675 min_it (scroll_selection_lines,
1623 SELECTION_SCROLL_MAX_LINES); 1676 SELECTION_SCROLL_MAX_LINES);
1677 scroll_selection_lines *= scroll_selection_dir;
1624 } 1678 }
1625 else 1679 else
1626 { 1680 {
1627 /* we are within the text window, so we 1681 /* we are within the text window, so we
1628 * shouldn't be scrolling 1682 * shouldn't be scrolling
1629 */ 1683 */
1630 sel_scroll_ev.stop(); 1684 sel_scroll_ev.stop();
1631 } 1685 }
1632#endif 1686#endif
1633#ifdef MOUSE_THRESHOLD
1634 } 1687 }
1635#endif
1636 } 1688 }
1637 } 1689 }
1638 else if (scrollBar.state == STATE_MOTION && ev.xany.window == scrollBar.win) 1690 else if (scrollBar.state == SB_STATE_MOTION && ev.xany.window == scrollBar.win)
1639 { 1691 {
1640 while (XCheckTypedWindowEvent (dpy, scrollBar.win, 1692 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1641 MotionNotify, &ev)) 1693 MotionNotify, &ev))
1642 ; 1694 ;
1643 1695
1644 XQueryPointer (dpy, scrollBar.win, 1696 XQueryPointer (dpy, scrollBar.win,
1645 &unused_root, &unused_child, 1697 &unused_root, &unused_child,
1646 &unused_root_x, &unused_root_y, 1698 &unused_root_x, &unused_root_y,
1647 &ev.xbutton.x, &ev.xbutton.y, 1699 &ev.xbutton.x, &ev.xbutton.y,
1648 &unused_mask); 1700 &unused_mask);
1649 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1701 scr_move_to (scrollBar.position (ev.xbutton.y) - csrO,
1650 scrollBar.size ()); 1702 scrollBar.size ());
1651 want_refresh = 1; 1703 want_refresh = 1;
1652 scrollBar.show (1); 1704 scrollBar.show (1);
1653 } 1705 }
1654 break; 1706 break;
1655 } 1707 }
1656 1708
1657#if defined(CURSOR_BLINK) 1709#if defined(CURSOR_BLINK)
1658 if (option (Opt_cursorBlink) && ev.type == KeyPress) 1710 if (ev.type == KeyPress)
1659 {
1660 if (hidden_cursor)
1661 {
1662 hidden_cursor = 0;
1663 want_refresh = 1;
1664 }
1665
1666 cursor_blink_ev.again (); 1711 cursor_blink_reset ();
1667 }
1668#endif 1712#endif
1669 1713
1670#if defined(POINTER_BLANK) 1714#if defined(POINTER_BLANK)
1671 if (option (Opt_pointerBlank) && pointerBlankDelay > 0) 1715 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1672 { 1716 {
… …
1682#endif 1726#endif
1683 1727
1684 refresh_check (); 1728 refresh_check ();
1685} 1729}
1686 1730
1687void 1731#if ENABLE_FRILLS
1732void ecb_cold
1688rxvt_term::set_urgency (bool enable) 1733rxvt_term::set_urgency (bool enable)
1689{ 1734{
1690 if (enable == urgency_hint) 1735 if (enable == urgency_hint)
1691 return; 1736 return;
1692 1737
1693 if (XWMHints *h = XGetWMHints (dpy, parent[0])) 1738 if (XWMHints *h = XGetWMHints (dpy, parent))
1694 { 1739 {
1695 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0); 1740 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0);
1696 XSetWMHints (dpy, parent[0], h); 1741 XSetWMHints (dpy, parent, h);
1697 urgency_hint = enable; 1742 urgency_hint = enable;
1743 XFree (h);
1698 } 1744 }
1699} 1745}
1746#endif
1700 1747
1701void 1748void ecb_cold
1702rxvt_term::focus_in () 1749rxvt_term::focus_in ()
1703{ 1750{
1704 if (!focus) 1751 if (!focus)
1705 { 1752 {
1706 focus = 1; 1753 focus = 1;
1707 want_refresh = 1; 1754 want_refresh = 1;
1708 1755
1709#if USE_XIM 1756#if USE_XIM
1710 if (Input_Context != NULL) 1757 if (Input_Context != NULL)
1711 { 1758 {
1712 IMSetPosition (); 1759 im_set_position ();
1713 XSetICFocus (Input_Context); 1760 XSetICFocus (Input_Context);
1714 } 1761 }
1715#endif 1762#endif
1716#if CURSOR_BLINK 1763#if CURSOR_BLINK
1717 if (option (Opt_cursorBlink)) 1764 if (option (Opt_cursorBlink))
… …
1719#endif 1766#endif
1720#if OFF_FOCUS_FADING 1767#if OFF_FOCUS_FADING
1721 if (rs[Rs_fade]) 1768 if (rs[Rs_fade])
1722 { 1769 {
1723 pix_colors = pix_colors_focused; 1770 pix_colors = pix_colors_focused;
1724 scr_recolour (); 1771 scr_recolor ();
1725 } 1772 }
1726#endif 1773#endif
1727#if ENABLE_FRILLS 1774#if ENABLE_FRILLS
1728 if (option (Opt_urgentOnBell)) 1775 if (option (Opt_urgentOnBell))
1729 set_urgency (0); 1776 set_urgency (0);
1777
1778 if (priv_modes & PrivMode_FocusEvent)
1779 tt_printf ("\x1b[I");
1730#endif 1780#endif
1731 1781
1732 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END)); 1782 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1733 } 1783 }
1734} 1784}
1735 1785
1736void 1786void ecb_cold
1737rxvt_term::focus_out () 1787rxvt_term::focus_out ()
1738{ 1788{
1739 if (focus) 1789 if (focus)
1740 { 1790 {
1741 focus = 0; 1791 focus = 0;
1742 want_refresh = 1; 1792 want_refresh = 1;
1743 1793
1744#if ENABLE_FRILLS 1794#if ENABLE_FRILLS
1745 if (option (Opt_urgentOnBell)) 1795 if (option (Opt_urgentOnBell))
1746 set_urgency (0); 1796 set_urgency (0);
1797
1798 if (priv_modes & PrivMode_FocusEvent)
1799 tt_printf ("\x1b[O");
1747#endif 1800#endif
1748#if ENABLE_FRILLS || ISO_14755 1801#if ENABLE_FRILLS || ISO_14755
1749 if (iso14755buf) 1802 if (iso14755buf)
1750 { 1803 {
1751 iso14755buf = 0; 1804 iso14755buf = 0;
… …
1766#endif 1819#endif
1767#if OFF_FOCUS_FADING 1820#if OFF_FOCUS_FADING
1768 if (rs[Rs_fade]) 1821 if (rs[Rs_fade])
1769 { 1822 {
1770 pix_colors = pix_colors_unfocused; 1823 pix_colors = pix_colors_unfocused;
1771 scr_recolour (); 1824 scr_recolor ();
1772 } 1825 }
1773#endif 1826#endif
1774 1827
1775 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1828 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1776 } 1829 }
1777} 1830}
1778 1831
1779void 1832void ecb_cold
1780rxvt_term::update_fade_color (unsigned int idx) 1833rxvt_term::update_fade_color (unsigned int idx, bool first_time)
1781{ 1834{
1782#if OFF_FOCUS_FADING 1835#if OFF_FOCUS_FADING
1783 if (rs[Rs_fade]) 1836 if (rs[Rs_fade])
1784 { 1837 {
1838 if (!first_time)
1839 pix_colors_focused [idx].free (this);
1840
1785 rgba c; 1841 rgba c;
1786 pix_colors [Color_fade].get (c); 1842 pix_colors [Color_fade].get (c);
1787 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c); 1843 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1788 } 1844 }
1789#endif 1845#endif
1790} 1846}
1791 1847
1792#if ENABLE_TRANSPARENCY || ENABLE_PERL 1848#if ENABLE_PERL
1793void 1849void ecb_hot
1794rxvt_term::rootwin_cb (XEvent &ev) 1850rxvt_term::rootwin_cb (XEvent &ev)
1795{ 1851{
1796 make_current (); 1852 make_current ();
1797 1853
1798 if (SHOULD_INVOKE (HOOK_ROOT_EVENT) 1854 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1799 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END))) 1855 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1800 return; 1856 return;
1801 1857
1802# if ENABLE_TRANSPARENCY
1803 switch (ev.type) 1858 switch (ev.type)
1804 { 1859 {
1805 case PropertyNotify: 1860 case PropertyNotify:
1806 /* 1861 /*
1807 * if user used some Esetroot compatible prog to set the root bg, 1862 * if user used some Esetroot compatible prog to set the root bg,
1808 * use the property to determine the pixmap. We use it later on. 1863 * use the property to determine the pixmap. We use it later on.
1809 */ 1864 */
1810 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID] 1865 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1811 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID]) 1866 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1812 { 1867 {
1813 bgPixmap.set_root_pixmap (); 1868 HOOK_INVOKE ((this, HOOK_ROOTPMAP_CHANGE, DT_END));
1814 update_background ();
1815 } 1869 }
1816 1870
1817 break; 1871 break;
1818 } 1872 }
1819# endif
1820 1873
1821 refresh_check (); 1874 refresh_check ();
1822} 1875}
1823#endif 1876#endif
1824 1877
… …
1847 iso14755_54 (ev.x, ev.y); 1900 iso14755_54 (ev.x, ev.y);
1848 return; 1901 return;
1849 } 1902 }
1850#endif 1903#endif
1851 1904
1852 clickintime = ev.time - MEvent.time < MULTICLICK_TIME; 1905 clickintime = ev.time - MEvent.time < multiClickTime;
1853 1906
1854 if (reportmode) 1907 if (reportmode)
1855 { 1908 {
1856 /* mouse report from vt window */ 1909 /* mouse report from vt window */
1857 /* save the xbutton state (for ButtonRelease) */ 1910 /* save the xbutton state (for ButtonRelease) */
1858 MEvent.state = ev.state; 1911 MEvent.state = ev.state;
1859#ifdef MOUSE_REPORT_DOUBLECLICK 1912#ifdef MOUSE_REPORT_DOUBLECLICK
1860 if (ev.button == MEvent.button && clickintime) 1913 if (ev.button == MEvent.button && clickintime)
1861 { 1914 {
1862 /* same button, within alloted time */ 1915 /* same button, within allowed time */
1863 MEvent.clicks++; 1916 MEvent.clicks++;
1864 1917
1865 if (MEvent.clicks > 1) 1918 if (MEvent.clicks > 1)
1866 { 1919 {
1867 /* only report double clicks */ 1920 /* only report double clicks */
… …
1948 if (scrollBar.upButton (ev.y)) 2001 if (scrollBar.upButton (ev.y))
1949 direction = UP; /* up */ 2002 direction = UP; /* up */
1950 else if (scrollBar.dnButton (ev.y)) 2003 else if (scrollBar.dnButton (ev.y))
1951 direction = DN; /* down */ 2004 direction = DN; /* down */
1952 2005
1953 scrollBar.state = STATE_IDLE; 2006 scrollBar.state = SB_STATE_IDLE;
1954 /* 2007 /*
1955 * Rxvt-style scrollbar: 2008 * Rxvt-style scrollbar:
1956 * move up if mouse is above slider 2009 * move up if mouse is above slider
1957 * move dn if mouse is below slider 2010 * move dn if mouse is below slider
1958 * 2011 *
… …
1997 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY); 2050 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1998#endif 2051#endif
1999 if (scr_page (direction, 1)) 2052 if (scr_page (direction, 1))
2000 { 2053 {
2001 if (direction == UP) 2054 if (direction == UP)
2002 scrollBar.state = STATE_UP; 2055 scrollBar.state = SB_STATE_UP;
2003 else 2056 else
2004 scrollBar.state = STATE_DOWN; 2057 scrollBar.state = SB_STATE_DOWN;
2005 } 2058 }
2006 } 2059 }
2007 else 2060 else
2008 switch (ev.button) 2061 switch (ev.button)
2009 { 2062 {
2010 case Button2: 2063 case Button2:
2011 switch (scrollBar.align) 2064 switch (scrollBar.align)
2012 { 2065 {
2013 case R_SB_ALIGN_TOP: 2066 case SB_ALIGN_TOP:
2014 csrO = 0; 2067 csrO = 0;
2015 break; 2068 break;
2016 case R_SB_ALIGN_CENTRE: 2069 case SB_ALIGN_CENTRE:
2017 csrO = (scrollBar.bot - scrollBar.top) / 2; 2070 csrO = (scrollBar.bot - scrollBar.top) / 2;
2018 break; 2071 break;
2019 case R_SB_ALIGN_BOTTOM: 2072 case SB_ALIGN_BOTTOM:
2020 csrO = scrollBar.bot - scrollBar.top; 2073 csrO = scrollBar.bot - scrollBar.top;
2021 break; 2074 break;
2022 } 2075 }
2023 2076
2024 if (scrollBar.style == R_SB_XTERM 2077 if (scrollBar.style == SB_STYLE_XTERM
2025 || scrollbar_above_slider (ev.y) 2078 || scrollBar.above_slider (ev.y)
2026 || scrollbar_below_slider (ev.y)) 2079 || scrollBar.below_slider (ev.y))
2027 scr_move_to (scrollbar_position (ev.y) - csrO, scrollBar.size ()); 2080 scr_move_to (scrollBar.position (ev.y) - csrO, scrollBar.size ());
2028 2081
2029 scrollBar.state = STATE_MOTION; 2082 scrollBar.state = SB_STATE_MOTION;
2030 break; 2083 break;
2031 2084
2032 case Button1: 2085 case Button1:
2033 if (scrollBar.align == R_SB_ALIGN_CENTRE) 2086 if (scrollBar.align == SB_ALIGN_CENTRE)
2034 csrO = ev.y - scrollBar.top; 2087 csrO = ev.y - scrollBar.top;
2035 /* FALLTHROUGH */ 2088 /* FALLTHROUGH */
2036 2089
2037 case Button3: 2090 case Button3:
2038 if (scrollBar.style != R_SB_XTERM) 2091 if (scrollBar.style != SB_STYLE_XTERM)
2039 { 2092 {
2040 if (scrollbar_above_slider (ev.y)) 2093 if (scrollBar.above_slider (ev.y))
2041# ifdef RXVT_SCROLL_FULL 2094# ifdef RXVT_SCROLL_FULL
2042 scr_page (UP, nrow - 1); 2095 scr_page (UP, nrow - 1);
2043# else 2096# else
2044 scr_page (UP, nrow / 4); 2097 scr_page (UP, nrow / 4);
2045# endif 2098# endif
2046 else if (scrollbar_below_slider (ev.y)) 2099 else if (scrollBar.below_slider (ev.y))
2047# ifdef RXVT_SCROLL_FULL 2100# ifdef RXVT_SCROLL_FULL
2048 scr_page (DN, nrow - 1); 2101 scr_page (DN, nrow - 1);
2049# else 2102# else
2050 scr_page (DN, nrow / 4); 2103 scr_page (DN, nrow / 4);
2051# endif 2104# endif
2052 else 2105 else
2053 scrollBar.state = STATE_MOTION; 2106 scrollBar.state = SB_STATE_MOTION;
2054 } 2107 }
2055 else 2108 else
2056 { 2109 {
2057 scr_page ((ev.button == Button1 ? DN : UP), 2110 scr_page ((ev.button == Button1 ? DN : UP),
2058 (nrow 2111 (nrow
2059 * scrollbar_position (ev.y) 2112 * scrollBar.position (ev.y)
2060 / scrollBar.size ())); 2113 / scrollBar.size ()));
2061 } 2114 }
2062 2115
2063 break; 2116 break;
2064 } 2117 }
… …
2075 2128
2076 csrO = 0; /* reset csr Offset */ 2129 csrO = 0; /* reset csr Offset */
2077 if (!bypass_keystate) 2130 if (!bypass_keystate)
2078 reportmode = !! (priv_modes & PrivMode_mouse_report); 2131 reportmode = !! (priv_modes & PrivMode_mouse_report);
2079 2132
2080 if (scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN) 2133 if (scrollBar.state == SB_STATE_UP || scrollBar.state == SB_STATE_DOWN)
2081 { 2134 {
2082 scrollBar.state = STATE_IDLE; 2135 scrollBar.state = SB_STATE_IDLE;
2083 scrollBar.show (0); 2136 scrollBar.show (0);
2084 } 2137 }
2085 2138
2086#ifdef SELECTION_SCROLLING 2139#ifdef SELECTION_SCROLLING
2087 sel_scroll_ev.stop(); 2140 sel_scroll_ev.stop();
… …
2100 2153
2101 if (reportmode) 2154 if (reportmode)
2102 { 2155 {
2103 /* mouse report from vt window */ 2156 /* mouse report from vt window */
2104 /* don't report release of wheel "buttons" */ 2157 /* don't report release of wheel "buttons" */
2105 if (ev.button >= 4) 2158 if (ev.button >= 4 && ev.button <= 7)
2106 return; 2159 return;
2107#ifdef MOUSE_REPORT_DOUBLECLICK 2160#ifdef MOUSE_REPORT_DOUBLECLICK
2108 /* only report the release of 'slow' single clicks */ 2161 /* only report the release of 'slow' single clicks */
2109 if (MEvent.button != AnyButton 2162 if (MEvent.button != AnyButton
2110 && (ev.button != MEvent.button 2163 && (ev.button != MEvent.button
2111 || (ev.time - MEvent.time 2164 || (ev.time - MEvent.time
2112 > MULTICLICK_TIME / 2))) 2165 > multiClickTime / 2)))
2113 { 2166 {
2114 MEvent.clicks = 0; 2167 MEvent.clicks = 0;
2115 MEvent.button = AnyButton; 2168 MEvent.button = ev.button;
2116 mouse_report (ev); 2169 mouse_report (ev);
2117 } 2170 }
2118#else /* MOUSE_REPORT_DOUBLECLICK */ 2171#else /* MOUSE_REPORT_DOUBLECLICK */
2119 MEvent.button = AnyButton; 2172 MEvent.button = ev.button;
2120 mouse_report (ev); 2173 mouse_report (ev);
2121#endif /* MOUSE_REPORT_DOUBLECLICK */ 2174#endif /* MOUSE_REPORT_DOUBLECLICK */
2122 return; 2175 return;
2123 } 2176 }
2124 2177
… …
2137 case Button3: 2190 case Button3:
2138 selection_make (ev.time); 2191 selection_make (ev.time);
2139 break; 2192 break;
2140 2193
2141 case Button2: 2194 case Button2:
2142 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window? 2195 if (IN_RANGE_EXC (ev.x, 0, vt_width) && IN_RANGE_EXC (ev.y, 0, vt_height)) // inside window?
2143 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary); 2196 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2144 break; 2197 break;
2145 2198
2146#ifdef MOUSE_WHEEL 2199#ifdef MOUSE_WHEEL
2147 case Button4: 2200 case Button4:
2148 case Button5: 2201 case Button5:
2149 { 2202 {
2150 int i; 2203 int lines;
2151 page_dirn v; 2204 page_dirn dirn;
2152 2205
2153 v = ev.button == Button4 ? UP : DN; 2206 dirn = ev.button == Button4 ? UP : DN;
2154 2207
2155 if (ev.state & ShiftMask) 2208 if (ev.state & ShiftMask)
2156 i = 1; 2209 lines = 1;
2157 else if (option (Opt_mouseWheelScrollPage)) 2210 else if (option (Opt_mouseWheelScrollPage))
2158 i = nrow - 1; 2211 lines = nrow - 1;
2159 else 2212 else
2160 i = 5; 2213 lines = 5;
2161 2214
2162# ifdef MOUSE_SLIP_WHEELING 2215# ifdef MOUSE_SLIP_WHEELING
2163 if (ev.state & ControlMask) 2216 if (ev.state & ControlMask)
2164 { 2217 {
2165 mouse_slip_wheel_speed += v ? -1 : 1; 2218 mouse_slip_wheel_speed += dirn;
2166 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow; 2219 clamp_it (mouse_slip_wheel_speed, -nrow, nrow);
2167 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2168 2220
2169 if (!slip_wheel_ev.is_active ()) 2221 if (!slip_wheel_ev.is_active ())
2170 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY); 2222 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2171 } 2223 }
2172 else 2224 else
2173# endif 2225# endif
2174 { 2226 {
2175 scr_page (v, i); 2227 scr_page (dirn, lines);
2176 scrollBar.show (1); 2228 scrollBar.show (1);
2177 } 2229 }
2178 } 2230 }
2179 break; 2231 break;
2180#endif 2232#endif
… …
2182 } 2234 }
2183} 2235}
2184 2236
2185/*}}} */ 2237/*}}} */
2186 2238
2187bool 2239void ecb_hot
2188rxvt_term::cmd_parse () 2240rxvt_term::cmd_parse ()
2189{ 2241{
2190 bool flag = false;
2191 wchar_t ch = NOCHAR; 2242 wchar_t ch = NOCHAR;
2192 char *seq_begin; // remember start of esc-sequence here 2243 char *seq_begin; // remember start of esc-sequence here
2193 2244
2194 for (;;) 2245 for (;;)
2195 { 2246 {
2196 if (expect_false (ch == NOCHAR)) 2247 if (ecb_unlikely (ch == NOCHAR))
2197 { 2248 {
2198 seq_begin = cmdbuf_ptr; 2249 seq_begin = cmdbuf_ptr;
2199 ch = next_char (); 2250 ch = next_char ();
2200 2251
2201 if (ch == NOCHAR) 2252 if (ch == NOCHAR)
2202 break; 2253 break;
2203 } 2254 }
2204 2255
2205 if (expect_true (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)) 2256 if (ecb_likely (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT))
2206 { 2257 {
2207 if (expect_false (!seen_input)) 2258 if (ecb_unlikely (!seen_input))
2208 { 2259 {
2209 seen_input = 1; 2260 seen_input = 1;
2210 // many badly-written programs (e.g. jed) contain a race condition: 2261 // many badly-written programs (e.g. jed) contain a race condition:
2211 // they first read the screensize and then install a SIGWINCH handler. 2262 // they first read the screensize and then install a SIGWINCH handler.
2212 // some window managers resize the window early, and these programs 2263 // some window managers resize the window early, and these programs
… …
2225 wchar_t *str = buf; 2276 wchar_t *str = buf;
2226 wchar_t *eol = str + min (ncol, UBUFSIZ); 2277 wchar_t *eol = str + min (ncol, UBUFSIZ);
2227 2278
2228 for (;;) 2279 for (;;)
2229 { 2280 {
2230 if (expect_false (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))) 2281 if (ecb_unlikely (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)))
2231 break; 2282 break;
2232 2283
2233 *str++ = ch; 2284 *str++ = ch;
2234 2285
2235 if (expect_false (ch == C0_LF || str >= eol)) 2286 if (ecb_unlikely (ch == C0_LF || str >= eol))
2236 { 2287 {
2237 if (ch == C0_LF) 2288 if (ch == C0_LF)
2238 nlines++; 2289 nlines++;
2239 2290
2240 refresh_count++; 2291 refresh_count++;
… …
2289 * What the heck we'll cheat and only refresh less than every page-full. 2340 * What the heck we'll cheat and only refresh less than every page-full.
2290 * if skipScroll is enabled. 2341 * if skipScroll is enabled.
2291 */ 2342 */
2292 if (refreshnow) 2343 if (refreshnow)
2293 { 2344 {
2294 flag = true;
2295 scr_refresh (); 2345 scr_refresh ();
2296 want_refresh = 1; 2346 want_refresh = 1;
2297 } 2347 }
2298
2299 } 2348 }
2300 else 2349 else
2301 { 2350 {
2302 try 2351 try
2303 { 2352 {
… …
2311 } 2360 }
2312 2361
2313 ch = NOCHAR; 2362 ch = NOCHAR;
2314 } 2363 }
2315 } 2364 }
2316
2317 return flag;
2318} 2365}
2319 2366
2320// read the next character 2367// read the next character
2321wchar_t 2368wchar_t ecb_hot
2322rxvt_term::next_char () NOTHROW 2369rxvt_term::next_char () noexcept
2323{ 2370{
2324 while (cmdbuf_ptr < cmdbuf_endp) 2371 while (cmdbuf_ptr < cmdbuf_endp)
2325 { 2372 {
2326 // assume 7-bit to be ascii ALWAYS 2373 // assume 7-bit to be ascii ALWAYS (always true in POSIX)
2327 if (expect_true ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)) 2374 if (ecb_likely ((unsigned char)*cmdbuf_ptr <= 0x7f))
2328 return *cmdbuf_ptr++; 2375 return *cmdbuf_ptr++;
2329 2376
2330 wchar_t wc; 2377 wchar_t wc;
2331 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2378 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2332 2379
… …
2337 break; 2384 break;
2338 } 2385 }
2339 2386
2340 if (len == (size_t)-1) 2387 if (len == (size_t)-1)
2341 { 2388 {
2342 mbrtowc (0, 0, 0, mbstate); // reset now undefined conversion state 2389 mbstate.reset (); // reset now undefined conversion state
2390 // a -1 might indicate that a previous incomplete char is invalid (previous return -2)
2391 // in which case we "erroneously" return the next byte which might be valid.
2343 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2392 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2344 } 2393 }
2345 2394
2346 // assume wchar == unicode 2395 // assume wchar == unicode
2347 cmdbuf_ptr += len; 2396 cmdbuf_ptr += len;
… …
2350 2399
2351 return NOCHAR; 2400 return NOCHAR;
2352} 2401}
2353 2402
2354// read the next octet 2403// read the next octet
2355uint32_t 2404uint32_t ecb_hot
2356rxvt_term::next_octet () NOTHROW 2405rxvt_term::next_octet () noexcept
2357{ 2406{
2358 return cmdbuf_ptr < cmdbuf_endp 2407 return cmdbuf_ptr < cmdbuf_endp
2359 ? (unsigned char)*cmdbuf_ptr++ 2408 ? (unsigned char)*cmdbuf_ptr++
2360 : NOCHAR; 2409 : NOCHAR;
2361} 2410}
2362 2411
2363static class out_of_input out_of_input; 2412static class out_of_input out_of_input;
2364 2413
2365/* rxvt_cmd_getc () - Return next input character */ 2414wchar_t ecb_hot
2366/* 2415rxvt_term::cmd_getc ()
2367 * Return the next input character after first passing any keyboard input
2368 * to the command.
2369 */
2370wchar_t
2371rxvt_term::cmd_getc () THROW ((class out_of_input))
2372{ 2416{
2373 wchar_t c = next_char (); 2417 wchar_t c = next_char ();
2374 2418
2375 if (c == NOCHAR) 2419 if (c == NOCHAR)
2376 throw out_of_input; 2420 throw out_of_input;
2377 2421
2378 return c; 2422 return c;
2379} 2423}
2380 2424
2381uint32_t 2425uint32_t ecb_hot
2382rxvt_term::cmd_get8 () THROW ((class out_of_input)) 2426rxvt_term::cmd_get8 ()
2383{ 2427{
2384 uint32_t c = next_octet (); 2428 uint32_t c = next_octet ();
2385 2429
2386 if (c == NOCHAR) 2430 if (c == NOCHAR)
2387 throw out_of_input; 2431 throw out_of_input;
… …
2390} 2434}
2391 2435
2392/*{{{ print pipe */ 2436/*{{{ print pipe */
2393/*----------------------------------------------------------------------*/ 2437/*----------------------------------------------------------------------*/
2394#ifdef PRINTPIPE 2438#ifdef PRINTPIPE
2395FILE * 2439FILE * ecb_cold
2396rxvt_term::popen_printer () 2440rxvt_term::popen_printer ()
2397{ 2441{
2398 FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w"); 2442 FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");
2399 2443
2400 if (stream == NULL) 2444 if (stream == NULL)
2401 rxvt_warn ("can't open printer pipe, not printing.\n"); 2445 rxvt_warn ("can't open printer pipe, not printing.\n");
2402 2446
2403 return stream; 2447 return stream;
2404} 2448}
2405 2449
2406int 2450int ecb_cold
2407rxvt_term::pclose_printer (FILE *stream) 2451rxvt_term::pclose_printer (FILE *stream)
2408{ 2452{
2409 fflush (stream); 2453 fflush (stream);
2410 return pclose (stream); 2454 return pclose (stream);
2411} 2455}
2412 2456
2413/* 2457/*
2414 * simulate attached vt100 printer 2458 * simulate attached vt100 printer
2415 */ 2459 */
2416void 2460void ecb_cold
2417rxvt_term::process_print_pipe () 2461rxvt_term::process_print_pipe ()
2418{ 2462{
2419 FILE *fd = popen_printer (); 2463 FILE *fd = popen_printer ();
2420 2464
2421 if (!fd) 2465 if (!fd)
… …
2467 pclose_printer (fd); 2511 pclose_printer (fd);
2468} 2512}
2469#endif /* PRINTPIPE */ 2513#endif /* PRINTPIPE */
2470/*}}} */ 2514/*}}} */
2471 2515
2472/* *INDENT-OFF* */
2473enum { 2516enum {
2474 C1_40 = 0x40, 2517 C1_40 = 0x40,
2475 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA, 2518 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA,
2476 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3, 2519 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3,
2477 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA, 2520 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA,
2478 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC, 2521 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC,
2479}; 2522};
2480/* *INDENT-ON* */
2481 2523
2482/*{{{ process non-printing single characters */ 2524/*{{{ process non-printing single characters */
2483void 2525void ecb_hot
2484rxvt_term::process_nonprinting (unicode_t ch) 2526rxvt_term::process_nonprinting (unicode_t ch)
2485{ 2527{
2486 switch (ch) 2528 switch (ch)
2487 { 2529 {
2488 case C0_ESC: 2530 case C0_ESC:
… …
2518 scr_charset_choose (0); 2560 scr_charset_choose (0);
2519 break; 2561 break;
2520 2562
2521#ifdef EIGHT_BIT_CONTROLS 2563#ifdef EIGHT_BIT_CONTROLS
2522 // 8-bit controls 2564 // 8-bit controls
2523 case 0x90: /* DCS */ 2565 case 0x90: /* DCS */
2524 process_dcs_seq (); 2566 process_dcs_seq ();
2525 break; 2567 break;
2526 case 0x9b: /* CSI */ 2568 case 0x9b: /* CSI */
2527 process_csi_seq (); 2569 process_csi_seq ();
2528 break; 2570 break;
2529 case 0x9d: /* OSC */ 2571 case 0x9d: /* OSC */
2530 process_osc_seq (); 2572 process_osc_seq ();
2531 break; 2573 break;
2532#endif 2574#endif
2533 } 2575 }
2534} 2576}
2535/*}}} */ 2577/*}}} */
2536 2578
2537 2579
2538/*{{{ process VT52 escape sequences */ 2580/*{{{ process VT52 escape sequences */
2539void 2581void ecb_cold
2540rxvt_term::process_escape_vt52 (unicode_t ch) 2582rxvt_term::process_escape_vt52 (unicode_t ch)
2541{ 2583{
2542 int row, col; 2584 int row, col;
2543 2585
2544 switch (ch) 2586 switch (ch)
… …
2578 break; 2620 break;
2579 case 'Z': /* identify the terminal type */ 2621 case 'Z': /* identify the terminal type */
2580 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */ 2622 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
2581 break; 2623 break;
2582 case '<': /* turn off VT52 mode */ 2624 case '<': /* turn off VT52 mode */
2583 set_privmode (PrivMode_vt52, 0); 2625 priv_modes &= ~PrivMode_vt52;
2584 break; 2626 break;
2585 case 'F': /* use special graphics character set */ 2627 case 'F': /* use special graphics character set */
2586 case 'G': /* use regular character set */ 2628 case 'G': /* use regular character set */
2587 /* unimplemented */ 2629 /* unimplemented */
2588 break; 2630 break;
… …
2594} 2636}
2595/*}}} */ 2637/*}}} */
2596 2638
2597 2639
2598/*{{{ process escape sequences */ 2640/*{{{ process escape sequences */
2599void 2641void ecb_hot
2600rxvt_term::process_escape_seq () 2642rxvt_term::process_escape_seq ()
2601{ 2643{
2602 unicode_t ch = cmd_getc (); 2644 unicode_t ch = cmd_getc ();
2603 2645
2604 if (priv_modes & PrivMode_vt52) 2646 if (priv_modes & PrivMode_vt52)
… …
2607 return; 2649 return;
2608 } 2650 }
2609 2651
2610 switch (ch) 2652 switch (ch)
2611 { 2653 {
2612 /* case 1: do_tek_mode (); break; */
2613 case '#': 2654 case '#':
2614 if (cmd_getc () == '8') 2655 if (cmd_getc () == '8')
2615 scr_E (); 2656 scr_E ();
2616 break; 2657 break;
2617 case '(': 2658 case '(':
… …
2640#if !ENABLE_MINIMAL 2681#if !ENABLE_MINIMAL
2641 case '9': 2682 case '9':
2642 scr_forwardindex (); 2683 scr_forwardindex ();
2643 break; 2684 break;
2644#endif 2685#endif
2686 // DECPAM/DECPNM
2645 case '=': 2687 case '=':
2688 priv_modes |= PrivMode_aplKP;
2689 break;
2646 case '>': 2690 case '>':
2647 set_privmode (PrivMode_aplKP, ch == '='); 2691 priv_modes &= ~PrivMode_aplKP;
2648 break; 2692 break;
2649 2693
2650 case C1_40: 2694 case C1_40:
2651 cmd_getc (); 2695 cmd_getc ();
2652 break; 2696 break;
… …
2656 2700
2657 /* 8.3.87: NEXT LINE */ 2701 /* 8.3.87: NEXT LINE */
2658 case C1_NEL: /* ESC E */ 2702 case C1_NEL: /* ESC E */
2659 { 2703 {
2660 wchar_t nlcr[] = { C0_LF, C0_CR }; 2704 wchar_t nlcr[] = { C0_LF, C0_CR };
2661 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1); 2705 scr_add_lines (nlcr, ecb_array_length (nlcr), 1);
2662 } 2706 }
2663 break; 2707 break;
2664 2708
2709#if 0 // disabled because embedded newlines can make exploits easier
2665 /* kidnapped escape sequence: Should be 8.3.48 */ 2710 /* kidnapped escape sequence: Should be 8.3.48 */
2666 case C1_ESA: /* ESC G */ 2711 case C1_ESA: /* ESC G */
2667 process_graphics (); 2712 // used by original rxvt for rob nations own graphics mode
2713 if (cmd_getc () == 'Q' && option (Opt_insecure))
2714 tt_printf ("\033G0\012"); /* query graphics - no graphics */
2668 break; 2715 break;
2716#endif
2669 2717
2670 /* 8.3.63: CHARACTER TABULATION SET */ 2718 /* 8.3.63: CHARACTER TABULATION SET */
2671 case C1_HTS: /* ESC H */ 2719 case C1_HTS: /* ESC H */
2672 scr_set_tab (1); 2720 scr_set_tab (1);
2673 break; 2721 break;
… …
2676 case C1_RI: /* ESC M */ 2724 case C1_RI: /* ESC M */
2677 scr_index (DN); 2725 scr_index (DN);
2678 break; 2726 break;
2679 2727
2680 /* 8.3.142: SINGLE-SHIFT TWO */ 2728 /* 8.3.142: SINGLE-SHIFT TWO */
2681 /*case C1_SS2: scr_single_shift (2); break; */ 2729 /* case C1_SS2: break; */
2682 2730
2683 /* 8.3.143: SINGLE-SHIFT THREE */ 2731 /* 8.3.143: SINGLE-SHIFT THREE */
2684 /*case C1_SS3: scr_single_shift (3); break; */ 2732 /* case C1_SS3: break; */
2685 2733
2686 /* 8.3.27: DEVICE CONTROL STRING */ 2734 /* 8.3.27: DEVICE CONTROL STRING */
2687 case C1_DCS: /* ESC P */ 2735 case C1_DCS: /* ESC P */
2688 process_dcs_seq (); 2736 process_dcs_seq ();
2689 break; 2737 break;
… …
2691 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2739 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
2692 case C1_SCI: /* ESC Z */ 2740 case C1_SCI: /* ESC Z */
2693 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1); 2741 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
2694 break; /* steal obsolete ESC [ c */ 2742 break; /* steal obsolete ESC [ c */
2695 2743
2696 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2744 /* 8.3.16: CONTROL SEQUENCE INTRODUCER (CSI) */
2697 case C1_CSI: /* ESC [ */ 2745 case C1_CSI: /* ESC [ */
2698 process_csi_seq (); 2746 process_csi_seq ();
2699 break; 2747 break;
2700 2748
2701 /* 8.3.90: OPERATING SYSTEM COMMAND */ 2749 /* 8.3.90: OPERATING SYSTEM COMMAND (OSC) */
2702 case C1_OSC: /* ESC ] */ 2750 case C1_OSC: /* ESC ] */
2703 process_osc_seq (); 2751 process_osc_seq ();
2704 break; 2752 break;
2705 2753
2706 /* 8.3.106: RESET TO INITIAL STATE */ 2754 /* 8.3.106: RESET TO INITIAL STATE (RIS) */
2707 case 'c': 2755 case 'c':
2708 mbstate.reset (); 2756 mbstate.reset ();
2709 scr_poweron (); 2757 scr_poweron ();
2710 scrollBar.show (1); 2758 scrollBar.show (1);
2711 break; 2759 break;
… …
2722 } 2770 }
2723} 2771}
2724/*}}} */ 2772/*}}} */
2725 2773
2726/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */ 2774/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */
2727/* *INDENT-OFF* */
2728enum { 2775enum {
2729 CSI_ICH = 0x40, 2776 CSI_ICH = 0x40,
2730 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,
2731 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 ,
2732 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,
… …
2735 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ, 2782 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ,
2736 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 , 2783 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 ,
2737 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F 2784 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F
2738}; 2785};
2739 2786
2740#define make_byte(b7,b6,b5,b4,b3,b2,b1,b0) \ 2787#define make_byte(b0,b1,b2,b3,b4,b5,b6,b7) \
2741 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \ 2788 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \
2742 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0)) 2789 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0))
2743#define get_byte_array_bit(array, bit) \ 2790#define get_byte_array_bit(array, bit) \
2744 (!! ((array)[ (bit) / 8] & (128 >> ((bit) & 7)))) 2791 (!! ((array)[(bit) >> 3] & (1 << ((bit) & 7))))
2745 2792
2746const unsigned char csi_defaults[] = 2793static const unsigned char csi_defaults[] =
2747 { 2794 {
2748 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */ 2795 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */
2749 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */ 2796 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */
2750 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */ 2797 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */
2751 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */ 2798 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */
2752 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, */
2753 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, */
2754 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, */
2755 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, {, |, }, ~, */
2756 }; 2803 };
2757/* *INDENT-ON* */
2758 2804
2759void 2805void ecb_hot
2760rxvt_term::process_csi_seq () 2806rxvt_term::process_csi_seq ()
2761{ 2807{
2762 unicode_t ch, priv, i; 2808 unicode_t ch, priv, prev_ch, i;
2763 unsigned int nargs, p; 2809 unsigned int nargs, p;
2764 int n, ndef; 2810 int n, ndef;
2765 int arg[ESC_ARGS] = { }; 2811 int arg[ESC_ARGS] = { };
2766 2812
2767 nargs = 0; 2813 nargs = 0;
2768 2814
2769 priv = 0; 2815 priv = 0;
2770 ch = cmd_getc (); 2816 ch = cmd_getc ();
2771 if (ch >= '<' && ch <= '?') 2817 if ((ch >= '<' && ch <= '?') || ch == '!')
2772 { 2818 {
2773 /* '<' '=' '>' '?' */ 2819 /* '<' '=' '>' '?' '!' */
2774 priv = ch; 2820 priv = ch;
2775 ch = cmd_getc (); 2821 ch = cmd_getc ();
2776 } 2822 }
2777 2823
2824 prev_ch = 0;
2778 /* read any numerical arguments */ 2825 /* read any numerical arguments */
2779 for (n = -1; ch < CSI_ICH; ) 2826 for (n = -1; ch < CSI_ICH; )
2780 { 2827 {
2781 if (isdigit (ch)) 2828 if (isdigit (ch))
2782 { 2829 {
… …
2792 n = -1; 2839 n = -1;
2793 } 2840 }
2794 else if (IS_CONTROL (ch)) 2841 else if (IS_CONTROL (ch))
2795 process_nonprinting (ch); 2842 process_nonprinting (ch);
2796 2843
2844 prev_ch = ch;
2797 ch = cmd_getc (); 2845 ch = cmd_getc ();
2798 } 2846 }
2799 2847
2800 if (ch > CSI_7F) 2848 if (ch > CSI_7F)
2801 return; 2849 return;
… …
2831 break; 2879 break;
2832 2880
2833 case '?': 2881 case '?':
2834 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2882 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2835 process_terminal_mode (ch, priv, nargs, arg); 2883 process_terminal_mode (ch, priv, nargs, arg);
2884 if (prev_ch == '$' && ch == 'p')
2885 process_terminal_mode (ch, priv, nargs, arg);
2836 break; 2886 break;
2887
2888 case '!':
2889 if (ch == CSI_70)
2890 {
2891 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */
2892 scr_soft_reset ();
2893
2894 static const int pm_h[] = { 7, 25 };
2895 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1005, 1006, 1015, 1049 };
2896
2897 process_terminal_mode ('h', 0, ecb_array_length (pm_h), pm_h);
2898 process_terminal_mode ('l', 0, ecb_array_length (pm_l), pm_l);
2837 } 2899 }
2900 break;
2901 }
2902
2838 return; 2903 return;
2839 } 2904 }
2840 2905
2841 switch (ch) 2906 switch (ch)
2842 { 2907 {
… …
2856 } 2921 }
2857 break; 2922 break;
2858#endif 2923#endif
2859 2924
2860 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */ 2925 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */
2861 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */ 2926 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */
2862 arg[0] = -arg[0]; 2927 arg[0] = -arg[0];
2863 /* FALLTHROUGH */ 2928 /* FALLTHROUGH */
2864 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */ 2929 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */
2865 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */ 2930 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */
2866 scr_gotorc (arg[0], 0, RELATIVE); 2931 scr_gotorc (arg[0], 0, RELATIVE);
2867 break; 2932 break;
2868 2933
2869 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */ 2934 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */
2870 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */ 2935 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */
2871#ifdef ISO6429 2936#ifdef ISO6429
2872 arg[0] = -arg[0]; 2937 arg[0] = -arg[0];
2873#else /* emulate common DEC VTs */ 2938#else /* emulate common DEC VTs */
2874 arg[0] = arg[0] ? -arg[0] : -1; 2939 arg[0] = arg[0] ? -arg[0] : -1;
2875#endif 2940#endif
… …
2966 case 7: /* unofficial extension */ 3031 case 7: /* unofficial extension */
2967 if (option (Opt_insecure)) 3032 if (option (Opt_insecure))
2968 tt_printf ("%-.250s\012", rs[Rs_display_name]); 3033 tt_printf ("%-.250s\012", rs[Rs_display_name]);
2969 break; 3034 break;
2970 case 8: /* unofficial extension */ 3035 case 8: /* unofficial extension */
3036 {
3037 string_term st;
3038 st.v[0] = CHAR_ST;
3039 st.v[1] = '\0';
2971 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3040 process_xterm_seq (XTerm_title, (char *)RESNAME "-" VERSION, st); // char * cast verified
2972 break; 3041 break;
3042 }
2973 } 3043 }
2974 break; 3044 break;
2975 3045
2976 case CSI_TBC: /* 8.3.155: (0) TABULATION CLEAR */ 3046 case CSI_TBC: /* 8.3.155: (0) TABULATION CLEAR */
2977 switch (arg[0]) 3047 switch (arg[0])
… …
3020 scr_insert_mode (1); 3090 scr_insert_mode (1);
3021 else if (arg[0] == 20) 3091 else if (arg[0] == 20)
3022 priv_modes |= PrivMode_LFNL; 3092 priv_modes |= PrivMode_LFNL;
3023 break; 3093 break;
3024 3094
3095 case CSI_71: // DECSCUSR: set cursor style
3096 if (prev_ch == ' ')
3097 set_cursor_style (arg[0]);
3098 break;
3099
3025 /* 3100 /*
3026 * PRIVATE USE beyond this point. All CSI_7? sequences here 3101 * PRIVATE USE beyond this point. All CSI_7? sequences here
3027 */ 3102 */
3028 case CSI_72: /* DECSTBM: set top and bottom margins */ 3103 case CSI_72: /* DECSTBM: set top and bottom margins */
3029 if (nargs == 1) 3104 if (nargs == 1)
… …
3057 } 3132 }
3058} 3133}
3059/*}}} */ 3134/*}}} */
3060 3135
3061#if !ENABLE_MINIMAL 3136#if !ENABLE_MINIMAL
3062/* ARGSUSED */
3063void 3137void
3064rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3138rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3065{ 3139{
3066 int x, y; 3140 int x, y;
3067 XWindowAttributes wattr; 3141 XWindowAttributes wattr;
… …
3076 { 3150 {
3077 /* 3151 /*
3078 * commands 3152 * commands
3079 */ 3153 */
3080 case 1: /* deiconify window */ 3154 case 1: /* deiconify window */
3081 XMapWindow (dpy, parent[0]); 3155 XMapWindow (dpy, parent);
3082 break; 3156 break;
3083 case 2: /* iconify window */ 3157 case 2: /* iconify window */
3084 XIconifyWindow (dpy, parent[0], display->screen); 3158 XIconifyWindow (dpy, parent, display->screen);
3085 break; 3159 break;
3086 case 3: /* set position (pixels) */ 3160 case 3: /* set position (pixels) */
3087 XMoveWindow (dpy, parent[0], args[1], args[2]); 3161 XMoveWindow (dpy, parent, args[1], args[2]);
3088 break; 3162 break;
3089 case 4: /* set size (pixels) */ 3163 case 4: /* set size (pixels) */
3090 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3164 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3091 break; 3165 break;
3092 case 5: /* raise window */ 3166 case 5: /* raise window */
3093 XRaiseWindow (dpy, parent[0]); 3167 XRaiseWindow (dpy, parent);
3094 break; 3168 break;
3095 case 6: /* lower window */ 3169 case 6: /* lower window */
3096 XLowerWindow (dpy, parent[0]); 3170 XLowerWindow (dpy, parent);
3097 break; 3171 break;
3098 case 7: /* refresh window */ 3172 case 7: /* refresh window */
3099 scr_touch (true); 3173 scr_touch (true);
3100 break; 3174 break;
3101 case 8: /* set size (chars) */ 3175 case 8: /* set size (chars) */
… …
3104 break; 3178 break;
3105 3179
3106 //case 9: NYI, TODO, restore maximized window or maximize window 3180 //case 9: NYI, TODO, restore maximized window or maximize window
3107 default: 3181 default:
3108 if (args[0] >= 24) /* set height (chars) */ 3182 if (args[0] >= 24) /* set height (chars) */
3109 set_widthheight ((unsigned int)width, 3183 set_widthheight ((unsigned int)vt_width,
3110 (unsigned int) (args[1] * fheight)); 3184 (unsigned int) (args[1] * fheight));
3111 break; 3185 break;
3112 3186
3113 /* 3187 /*
3114 * reports - some output format copied from XTerm 3188 * reports - some output format copied from XTerm
3115 */ 3189 */
3116 case 11: /* report window state */ 3190 case 11: /* report window state */
3117 XGetWindowAttributes (dpy, parent[0], &wattr); 3191 XGetWindowAttributes (dpy, parent, &wattr);
3118 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3192 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3119 break; 3193 break;
3120 case 13: /* report window position */ 3194 case 13: /* report window position */
3121 XGetWindowAttributes (dpy, parent[0], &wattr); 3195 XGetWindowAttributes (dpy, parent, &wattr);
3122 XTranslateCoordinates (dpy, parent[0], wattr.root, 3196 XTranslateCoordinates (dpy, parent, wattr.root,
3123 -wattr.border_width, -wattr.border_width, 3197 -wattr.border_width, -wattr.border_width,
3124 &x, &y, &wdummy); 3198 &x, &y, &wdummy);
3125 tt_printf ("\033[3;%d;%dt", x, y); 3199 tt_printf ("\033[3;%d;%dt", x, y);
3126 break; 3200 break;
3127 case 14: /* report window size (pixels) */ 3201 case 14: /* report window size (pixels) */
3128 XGetWindowAttributes (dpy, parent[0], &wattr); 3202 XGetWindowAttributes (dpy, parent, &wattr);
3129 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3203 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3130 break; 3204 break;
3131 case 18: /* report text area size (chars) */ 3205 case 18: /* report text area size (chars) */
3132 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3206 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3133 break; 3207 break;
… …
3135 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3209 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3136 break; 3210 break;
3137 case 20: /* report icon label */ 3211 case 20: /* report icon label */
3138 { 3212 {
3139 char *s; 3213 char *s;
3140 XGetIconName (dpy, parent[0], &s); 3214 XGetIconName (dpy, parent, &s);
3141 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3215 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3142 XFree (s); 3216 XFree (s);
3143 } 3217 }
3144 break; 3218 break;
3145 case 21: /* report window title */ 3219 case 21: /* report window title */
3146 { 3220 {
3147 char *s; 3221 char *s;
3148 XFetchName (dpy, parent[0], &s); 3222 XFetchName (dpy, parent, &s);
3149 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3223 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3150 XFree (s); 3224 XFree (s);
3151 } 3225 }
3152 break; 3226 break;
3153 } 3227 }
… …
3158/* 3232/*
3159 * get input up until STRING TERMINATOR (or BEL) 3233 * get input up until STRING TERMINATOR (or BEL)
3160 * ends_how is terminator used. returned input must be free()'d 3234 * ends_how is terminator used. returned input must be free()'d
3161 */ 3235 */
3162char * 3236char *
3163rxvt_term::get_to_st (unicode_t &ends_how) 3237rxvt_term::get_to_st (string_term &st)
3164{ 3238{
3165 unicode_t ch; 3239 unicode_t ch;
3166 bool seen_esc = false; 3240 bool seen_esc = false;
3167 unsigned int n = 0; 3241 unsigned int n = 0;
3168 wchar_t string[STRING_MAX]; 3242 wchar_t string[CBUFSIZ];
3169 3243
3170 while ((ch = cmd_getc ()) != NOCHAR) 3244 while ((ch = cmd_getc ()) != NOCHAR)
3171 { 3245 {
3172 if (seen_esc) 3246 if (seen_esc)
3173 { 3247 {
… …
3188 else if (ch < 0x20) 3262 else if (ch < 0x20)
3189 return NULL; /* other control character - exit */ 3263 return NULL; /* other control character - exit */
3190 3264
3191 seen_esc = false; 3265 seen_esc = false;
3192 3266
3193 if (n >= STRING_MAX - 1) 3267 if (n >= sizeof (string) - 1)
3194 // stop at some sane length 3268 // stop at some sane length
3195 return NULL; 3269 return NULL;
3196 3270
3197 string[n++] = ch; 3271 string[n++] = ch;
3198 } 3272 }
3199 3273
3200 string[n++] = '\0'; 3274 string[n++] = '\0';
3201 3275
3202 ends_how = (ch == 0x5c ? C0_ESC : ch); 3276 n = 0;
3277 if (ch == 0x5c)
3278 st.v[n++] = C0_ESC;
3279 st.v[n++] = ch;
3280 st.v[n] = '\0';
3203 3281
3204 return rxvt_wcstombs (string); 3282 return rxvt_wcstombs (string);
3205} 3283}
3206 3284
3207/*----------------------------------------------------------------------*/ 3285/*----------------------------------------------------------------------*/
… …
3209 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3287 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3210 */ 3288 */
3211void 3289void
3212rxvt_term::process_dcs_seq () 3290rxvt_term::process_dcs_seq ()
3213{ 3291{
3214 char *s;
3215 unicode_t eh;
3216
3217 /* 3292 /*
3218 * Not handled yet 3293 * Not handled yet
3219 */ 3294 */
3295
3296 string_term st;
3220 s = get_to_st (eh); 3297 char *s = get_to_st (st);
3221 if (s) 3298 if (s)
3222 free (s); 3299 free (s);
3223 3300
3224 return; 3301 return;
3225} 3302}
… …
3229 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)' 3306 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)'
3230 */ 3307 */
3231void 3308void
3232rxvt_term::process_osc_seq () 3309rxvt_term::process_osc_seq ()
3233{ 3310{
3234 unicode_t ch, eh;
3235 int arg; 3311 int arg;
3236 3312
3237 ch = cmd_getc (); 3313 unicode_t ch = cmd_getc ();
3238 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3314 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3239 arg = arg * 10 + (ch - '0'); 3315 arg = arg * 10 + (ch - '0');
3240 3316
3241 if (ch == ';') 3317 if (ch == ';')
3242 { 3318 {
3319 string_term st;
3243 char *s = get_to_st (eh); 3320 char *s = get_to_st (st);
3244 3321
3245 if (s) 3322 if (s)
3246 { 3323 {
3247 process_xterm_seq (arg, s, eh); 3324 process_xterm_seq (arg, s, st);
3248 free (s); 3325 free (s);
3249 } 3326 }
3250 } 3327 }
3251} 3328}
3252 3329
3330static unsigned int
3331colorcube_index (unsigned int idx_r,
3332 unsigned int idx_g,
3333 unsigned int idx_b)
3334{
3335 assert (idx_r < Red_levels);
3336 assert (idx_g < Green_levels);
3337 assert (idx_b < Blue_levels);
3338
3339 return idx_r * Blue_levels * Green_levels +
3340 idx_g * Blue_levels +
3341 idx_b;
3342}
3343
3344/*
3345 * Find the nearest color slot in the hidden color cube,
3346 * adapt its value to the 32bit RGBA color.
3347 */
3348unsigned int
3349rxvt_term::map_rgb24_color (unsigned int r, unsigned int g, unsigned int b, unsigned int a)
3350{
3351 r &= 0xff;
3352 g &= 0xff;
3353 b &= 0xff;
3354 a &= 0xff;
3355
3356 uint32_t color = (a << 24) | (r << 16) | (g << 8) | b;
3357
3358 /* we allow one of the 6 closest neighbouring colours */
3359 /* to replace the current color, if they not used recently */
3360 #if 0
3361 static const unsigned char dxyz[][3] = {
3362 0, 0, 0,
3363 0, 0, 4,
3364 0, 4, 4,
3365 4, 4, 0,
3366 4, 0, 4,
3367 0, 4, 0,
3368 4, 0, 0,
3369 };
3370 #else
3371 // silly compressed verlapping triplets version of above
3372 static const unsigned char dxyz[] = {
3373 0, 0, 0, 4, 4, 0, 4, 0, 0,
3374 };
3375 #endif
3376
3377 static const unsigned char color_level[8][32] = {
3378 // neighbour index
3379 {0, 0, 1, 0, 0, 1, 1, 2, 2, 1, 1, 1, 2, 2, 2, 2, 3, 3, 3, 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, 3, 3, 3},
3380 {0, 1, 0, 1, 1, 2, 1, 1, 2, 2, 3, 3, 2, 2, 2, 3, 3, 3, 4, 4, 4, 3, 3, 3, 3, 4, 4, 4, 4, 4, 4, 4},
3381 {0, 0, 1, 2, 1, 1, 2, 3, 3, 2, 2, 3, 3, 4, 4, 3, 3, 3, 4, 4, 5, 5, 5, 4, 4, 4, 5, 5, 5, 5, 5, 5},
3382 {0, 0, 2, 1, 2, 3, 2, 2, 3, 4, 4, 3, 3, 4, 4, 5, 5, 4, 4, 5, 5, 5, 6, 6, 5, 5, 5, 6, 6, 6, 6, 6},
3383 // Red_levels/Green_levels/Blue_levels index
3384 {0, 0, 0, 1, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3},
3385 {0, 0, 1, 1, 1, 1, 2, 2, 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, 3, 3, 3, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4},
3386 {0, 1, 1, 1, 2, 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, 4, 4, 4, 4, 4, 4, 4, 4, 5, 5, 5, 5, 5, 5, 5, 5, 5},
3387 {0, 1, 1, 2, 2, 2, 3, 3, 3, 3, 3, 4, 4, 4, 4, 4, 4, 5, 5, 5, 5, 5, 5, 5, 6, 6, 6, 6, 6, 6, 6, 6},
3388 };
3389
3390 unsigned int idx;
3391
3392 for (int n = 0; n < ecb_array_length (dxyz) - 2; ++n)
3393 {
3394 unsigned int idx_r = color_level[ Red_levels - dxyz[n + 0]][r / 8];
3395 unsigned int idx_g = color_level[Green_levels - dxyz[n + 1]][g / 8];
3396 unsigned int idx_b = color_level[ Blue_levels - dxyz[n + 2]][b / 8];
3397 unsigned int index = colorcube_index (idx_r, idx_g, idx_b);
3398
3399 if (n == 0)
3400 idx = index;
3401
3402 if (rgb24_color[index] == color)
3403 {
3404 rgb24_seqno[index] = ++rgb24_sequence;
3405 return index + minTermCOLOR24;
3406 }
3407
3408 // minor issue: could update index 0 few more times
3409 if ((rgb24_seqno[index] | rgb24_color[index]) == 0)
3410 {
3411 idx = index;
3412 goto update;
3413 }
3414
3415 // like (rgb24_seqno[idx] > rgb24_seqno[index])
3416 // but also handles wrap around values well enough
3417 if ((uint16_t)(rgb24_seqno[idx] - rgb24_seqno[index]) < 0x8000)
3418 idx = index;
3419 }
3420
3421update:
3422 rgb24_color[idx] = color;
3423 rgb24_seqno[idx] = ++rgb24_sequence;
3424
3425 idx += minTermCOLOR24;
3426 pix_colors_focused [idx].free (this);
3427 pix_colors_focused [idx].set (this, rgba (r * 0x0101, g * 0x0101, b * 0x0101, a * 0x0101));
3428 update_fade_color (idx, false);
3429
3430 return idx;
3431}
3432
3253void 3433void
3254rxvt_term::process_color_seq (int report, int color, const char *str, char resp) 3434rxvt_term::process_color_seq (int report, int color, const char *str, string_term &st)
3255{ 3435{
3256 if (str[0] == '?' && !str[1]) 3436 if (str[0] == '?' && !str[1])
3257 { 3437 {
3258 rgba c; 3438 rgba c;
3259 pix_colors_focused[color].get (c); 3439 pix_colors_focused[color].get (c);
3440 char rgba_str[32];
3260 3441
3261#if XFT 3442#if XFT
3262 if (c.a != rgba::MAX_CC) 3443 if (c.a != rgba::MAX_CC)
3263 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp); 3444 snprintf (rgba_str, sizeof (rgba_str), "rgba:%04x/%04x/%04x/%04x", c.r, c.g, c.b, c.a);
3264 else 3445 else
3265#endif 3446#endif
3266 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp); 3447 snprintf (rgba_str, sizeof (rgba_str), "rgb:%04x/%04x/%04x", c.r, c.g, c.b);
3448
3449 if (IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
3450 tt_printf ("\033]%d;%d;%s%s", report, color - minCOLOR, rgba_str, st.v);
3451 else
3452 tt_printf ("\033]%d;%s%s", report, rgba_str, st.v);
3267 } 3453 }
3268 else 3454 else
3269 set_window_color (color, str); 3455 set_window_color (color, str);
3270} 3456}
3271 3457
3272/* 3458/*
3273 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3459 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3274 */ 3460 */
3275void 3461void
3276rxvt_term::process_xterm_seq (int op, const char *str, char resp) 3462rxvt_term::process_xterm_seq (int op, char *str, string_term &st)
3277{ 3463{
3278 int color; 3464 int color;
3279 char *buf, *name; 3465 char *buf, *name;
3280 bool query = str[0] == '?' && !str[1]; 3466 bool query = str[0] == '?' && !str[1];
3281 int saveop = op; 3467 int saveop = op;
… …
3308 unsigned long bytes_after; 3494 unsigned long bytes_after;
3309 unsigned char *value = 0; 3495 unsigned char *value = 0;
3310 const char *str = ""; 3496 const char *str = "";
3311 3497
3312 if (prop 3498 if (prop
3313 && XGetWindowProperty (dpy, parent[0], 3499 && XGetWindowProperty (dpy, parent,
3314 prop, 0, 1<<16, 0, AnyPropertyType, 3500 prop, 0, 1<<16, 0, AnyPropertyType,
3315 &actual_type, &actual_format, 3501 &actual_type, &actual_format,
3316 &nitems, &bytes_after, &value) == Success 3502 &nitems, &bytes_after, &value) == Success
3317 && actual_type != None 3503 && actual_type != None
3318 && actual_format == 8) 3504 && actual_format == 8)
3319 str = (const char *)(value); 3505 str = (const char *)(value);
3320 3506
3321 tt_printf ("\033]%d;%s%c", op, str, resp); 3507 tt_printf ("\033]%d;%s%s", op, option (Opt_insecure) ? str : "", st.v);
3322 3508
3323 XFree (value); 3509 XFree (value);
3324 } 3510 }
3325 else 3511 else
3326 { 3512 {
3327 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3513 char *eq = strchr (str, '=');
3328 3514
3329 if (eq) 3515 if (eq)
3330 { 3516 {
3331 *eq = 0; 3517 *eq = 0;
3332 set_utf8_property (display->atom (str), eq + 1); 3518 set_utf8_property (display->atom (str), eq + 1);
3333 } 3519 }
3334 else 3520 else
3335 XDeleteProperty (dpy, parent[0], 3521 XDeleteProperty (dpy, parent,
3336 display->atom (str)); 3522 display->atom (str));
3337 } 3523 }
3338 break; 3524 break;
3339 3525
3340 case XTerm_Color: 3526 case XTerm_Color:
… …
3350 break; 3536 break;
3351 3537
3352 if ((buf = strchr (name, ';')) != NULL) 3538 if ((buf = strchr (name, ';')) != NULL)
3353 *buf++ = '\0'; 3539 *buf++ = '\0';
3354 3540
3355 process_color_seq (op, color, name, resp); 3541 process_color_seq (op, color, name, st);
3356 } 3542 }
3357 break; 3543 break;
3358 case Rxvt_restoreFG: 3544 case Rxvt_restoreFG:
3359 case XTerm_Color00: 3545 case XTerm_Color00:
3360 process_color_seq (op, Color_fg, str, resp); 3546 process_color_seq (op, Color_fg, str, st);
3361 break; 3547 break;
3362 case Rxvt_restoreBG: 3548 case Rxvt_restoreBG:
3363 case XTerm_Color01: 3549 case XTerm_Color01:
3364 process_color_seq (op, Color_bg, str, resp); 3550 process_color_seq (op, Color_bg, str, st);
3365 break; 3551 break;
3366#ifndef NO_CURSORCOLOR 3552#ifndef NO_CURSORCOLOR
3367 case XTerm_Color_cursor: 3553 case XTerm_Color_cursor:
3368 process_color_seq (op, Color_cursor, str, resp); 3554 process_color_seq (op, Color_cursor, str, st);
3369 break; 3555 break;
3370#endif 3556#endif
3371 case XTerm_Color_pointer_fg: 3557 case XTerm_Color_pointer_fg:
3372 process_color_seq (op, Color_pointer_fg, str, resp); 3558 process_color_seq (op, Color_pointer_fg, str, st);
3373 break; 3559 break;
3374 case XTerm_Color_pointer_bg: 3560 case XTerm_Color_pointer_bg:
3375 process_color_seq (op, Color_pointer_bg, str, resp); 3561 process_color_seq (op, Color_pointer_bg, str, st);
3376 break; 3562 break;
3563#ifdef OPTION_HC
3564 case XTerm_Color_HC:
3565 process_color_seq (op, Color_HC, str, st);
3566 break;
3567 case XTerm_Color_HTC:
3568 process_color_seq (op, Color_HTC, str, st);
3569 break;
3570#endif
3377#ifndef NO_BOLD_UNDERLINE_REVERSE 3571#ifndef NO_BOLD_UNDERLINE_REVERSE
3378 case XTerm_Color_RV:
3379 process_color_seq (op, Color_RV, str, resp);
3380 break;
3381 case Rxvt_Color_BD:
3382 case URxvt_Color_BD: 3572 case URxvt_Color_BD:
3383 process_color_seq (op, Color_BD, str, resp); 3573 process_color_seq (op, Color_BD, str, st);
3384 break; 3574 break;
3385 case Rxvt_Color_UL:
3386 case URxvt_Color_UL: 3575 case URxvt_Color_UL:
3387 process_color_seq (op, Color_UL, str, resp); 3576 process_color_seq (op, Color_UL, str, st);
3388 break; 3577 break;
3389 case URxvt_Color_IT: 3578 case URxvt_Color_IT:
3390 process_color_seq (op, Color_IT, str, resp); 3579 process_color_seq (op, Color_IT, str, st);
3391 break; 3580 break;
3392#endif 3581#endif
3393#if ENABLE_TRANSPARENCY
3394 case URxvt_Color_tint: 3582 case URxvt_Color_border:
3395 process_color_seq (op, Color_tint, str, resp); 3583 process_color_seq (op, Color_border, str, st);
3396 {
3397 bool changed = false;
3398
3399 if (ISSET_PIXCOLOR (Color_tint))
3400 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]);
3401 else
3402 changed = bgPixmap.unset_tint ();
3403
3404 if (changed)
3405 update_background ();
3406 }
3407
3408 break; 3584 break;
3409#endif
3410
3411#if BG_IMAGE_FROM_FILE
3412 case Rxvt_Pixmap:
3413 if (!strcmp (str, "?"))
3414 {
3415 char str[256];
3416
3417 sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */
3418 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767),
3419 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767));
3420 process_xterm_seq (XTerm_title, str, CHAR_ST);
3421 }
3422 else
3423 {
3424 int changed = 0;
3425
3426 if (*str != ';')
3427 {
3428 /* reset to default scaling :*/
3429 bgPixmap.unset_geometry ();
3430 if (bgPixmap.set_file (str)) /* change pixmap */
3431 changed++;
3432 str = strchr (str, ';');
3433 if (str == NULL)
3434 bgPixmap.set_defaultGeometry ();
3435 }
3436
3437 while (str)
3438 {
3439 str++;
3440 if (bgPixmap.set_geometry (str))
3441 changed++;
3442 str = strchr (str, ';');
3443 }
3444
3445 if (changed)
3446 update_background ();
3447 }
3448 break;
3449#endif
3450 3585
3451 case XTerm_logfile: 3586 case XTerm_logfile:
3452 // TODO, when secure mode? 3587 // TODO, when secure mode?
3453 break; 3588 break;
3454 3589
… …
3471 case URxvt_boldFont: 3606 case URxvt_boldFont:
3472 case URxvt_italicFont: 3607 case URxvt_italicFont:
3473 case URxvt_boldItalicFont: 3608 case URxvt_boldItalicFont:
3474#endif 3609#endif
3475 if (query) 3610 if (query)
3476 tt_printf ("\33]%d;%-.250s%c", saveop, 3611 tt_printf ("\33]%d;%-.250s%s", saveop,
3477 option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc 3612 option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3478 ? fontset[op - URxvt_font]->fontdesc : "", 3613 ? fontset[op - URxvt_font]->fontdesc : "",
3479 resp); 3614 st.v);
3480 else 3615 else
3481 { 3616 {
3482 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3617 const char *&res = rs[Rs_font + (op - URxvt_font)];
3483 3618
3484 res = strdup (str); 3619 res = strdup (str);
… …
3487 } 3622 }
3488 break; 3623 break;
3489 3624
3490 case URxvt_version: 3625 case URxvt_version:
3491 if (query) 3626 if (query)
3492 tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%c", 3627 tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%s",
3493 op, 3628 op,
3494 rs[Rs_name], VERSION[0], VERSION[2], 3629 rs[Rs_name], VERSION[0], VERSION[2],
3495 resp); 3630 st.v);
3496 break; 3631 break;
3497 3632
3498#if !ENABLE_MINIMAL 3633#if !ENABLE_MINIMAL
3634 case URxvt_cellinfo:
3635 if (query)
3636 tt_printf ("\33]%d;%d;%d;%d%s", saveop,
3637 fwidth, fheight, fbase,
3638 st.v);
3639 break;
3640
3499 case URxvt_locale: 3641 case URxvt_locale:
3500 if (query) 3642 if (query)
3501 tt_printf ("\33]%d;%-.250s%c", op, option (Opt_insecure) ? locale : "", resp); 3643 tt_printf ("\33]%d;%-.250s%s", op, option (Opt_insecure) ? locale : "", st.v);
3502 else 3644 else
3503 { 3645 {
3504 set_locale (str); 3646 set_locale (str);
3505 pty->set_utf8_mode (enc_utf8); 3647 pty->set_utf8_mode (enc_utf8);
3506 init_xlocale (); 3648 init_xlocale ();
… …
3521 break; 3663 break;
3522#endif 3664#endif
3523 3665
3524#if ENABLE_PERL 3666#if ENABLE_PERL
3525 case URxvt_perl: 3667 case URxvt_perl:
3526 HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_STR_LEN, &resp, 1, DT_END)); 3668 HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_STR, st.v, DT_END));
3527 break; 3669 break;
3528#endif 3670#endif
3529 } 3671 }
3530} 3672}
3531/*----------------------------------------------------------------------*/ 3673/*----------------------------------------------------------------------*/
… …
3538 * 's' = save 3680 * 's' = save
3539 * 'r' = restore 3681 * 'r' = restore
3540 * 't' = toggle 3682 * 't' = toggle
3541 * so no need for fancy checking 3683 * so no need for fancy checking
3542 */ 3684 */
3543int 3685int ecb_cold
3544rxvt_term::privcases (int mode, unsigned long bit) 3686rxvt_term::privcases (int mode, unsigned long bit)
3545{ 3687{
3546 int state; 3688 int state;
3547 3689
3548 if (mode == 's') 3690 if (mode == 's')
3549 { 3691 {
3550 SavedModes |= (priv_modes & bit); 3692 if (priv_modes & bit)
3693 SavedModes |= bit;
3694 else
3695 SavedModes &= ~bit;
3551 return -1; 3696 return -1;
3552 } 3697 }
3553 else 3698 else
3554 { 3699 {
3555 if (mode == 'r') 3700 if (mode == 'r')
3556 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3701 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3557 else 3702 else
3558 state = (mode == 't') ? ! (priv_modes & bit) : mode; 3703 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3559 set_privmode (bit, state); 3704
3705 if (state)
3706 priv_modes |= bit;
3707 else
3708 priv_modes &= ~bit;
3560 } 3709 }
3561 3710
3562 return state; 3711 return state;
3563} 3712}
3564 3713
3565/* we're not using priv _yet_ */ 3714/* we're not using priv _yet_ */
3566void 3715void
3567rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg) 3716rxvt_term::process_terminal_mode (int mode, int priv ecb_unused, unsigned int nargs, const int *arg)
3568{ 3717{
3569 unsigned int i, j; 3718 unsigned int i, j;
3570 int state; 3719 int state;
3571 3720
3572 static const struct 3721 static const struct
3573 { 3722 {
3574 const int argval; 3723 const int argval;
3575 const unsigned long bit; 3724 const unsigned long bit;
3576 } argtopriv[] = { 3725 } argtopriv[] = {
3577 { 1, PrivMode_aplCUR }, 3726 { 1, PrivMode_aplCUR }, // DECCKM
3578 { 2, PrivMode_vt52 }, 3727 { 2, PrivMode_vt52 }, // DECANM
3579 { 3, PrivMode_132 }, 3728 { 3, PrivMode_132 }, // DECCOLM
3580 { 4, PrivMode_smoothScroll }, 3729 { 4, PrivMode_smoothScroll }, // DECSCLM
3581 { 5, PrivMode_rVideo }, 3730 { 5, PrivMode_rVideo }, // DECSCNM
3582 { 6, PrivMode_relOrigin }, 3731 { 6, PrivMode_relOrigin }, // DECOM
3583 { 7, PrivMode_Autowrap }, 3732 { 7, PrivMode_Autowrap }, // DECAWM
3584 // 8, bi-directional support mode 3733 // 8, auto-repeat keys // DECARM
3585 { 9, PrivMode_MouseX10 }, 3734 { 9, PrivMode_MouseX10 },
3586 // 18, 19 printing-related
3587 { 25, PrivMode_VisibleCursor }, 3735 { 12, PrivMode_BlinkingCursor },
3736 // 18 end FF to printer after print screen
3737 // 19 Print screen prints full screen/scroll region
3738 { 25, PrivMode_VisibleCursor }, // DECTCEM cnorm/cvvis/civis
3588#ifdef scrollBar_esc 3739#ifdef scrollBar_esc
3589 { scrollBar_esc, PrivMode_scrollBar }, 3740 { scrollBar_esc, PrivMode_scrollBar },
3590#endif 3741#endif
3591 { 35, PrivMode_ShiftKeys }, // rxvt extension 3742 { 35, PrivMode_ShiftKeys }, // rxvt extension
3743 // 38, tektronix mode // DECTEK
3592 { 40, PrivMode_132OK }, 3744 { 40, PrivMode_132OK },
3593 // 41 xterm more fixes NYI 3745 // 41 xterm more fixes NYI
3594 // 45 margin bell NYI 3746 // 45 margin bell NYI
3595 // 46 start logging 3747 // 46 start logging
3596 { 47, PrivMode_Screen }, 3748 { 47, PrivMode_Screen },
3597 { 66, PrivMode_aplKP }, 3749 { 66, PrivMode_aplKP }, // DECNKM
3598#ifndef NO_BACKSPACE_KEY 3750#ifndef NO_BACKSPACE_KEY
3599 { 67, PrivMode_BackSpace }, 3751 { 67, PrivMode_BackSpace }, // DECBKM
3600#endif 3752#endif
3601 { 1000, PrivMode_MouseX11 }, 3753 { 1000, PrivMode_MouseX11 },
3602 { 1002, PrivMode_MouseBtnEvent }, 3754 { 1002, PrivMode_MouseBtnEvent },
3603 { 1003, PrivMode_MouseAnyEvent }, 3755 { 1003, PrivMode_MouseAnyEvent },
3756#if ENABLE_FRILLS
3757 { 1004, PrivMode_FocusEvent },
3758 { 1005, PrivMode_ExtMouseUTF8 },
3759 { 1006, PrivMode_ExtMouseSGR },
3760#endif
3604 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3761 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3605 { 1011, PrivMode_Keypress }, // rxvt extension 3762 { 1011, PrivMode_Keypress }, // rxvt extension
3763#if ENABLE_FRILLS
3764 { 1015, PrivMode_ExtMouseUrxvt }, // urxvt extension of 1005
3765#endif
3606 // 1035 enable modifiers for alt, numlock NYI 3766 // 1035 enable modifiers for alt, numlock NYI
3607 // 1036 send ESC for meta keys NYI 3767 // 1036 send ESC for meta keys NYI
3608 // 1037 send DEL for keypad delete NYI 3768 // 1037 send DEL for keypad delete NYI
3609 { 1047, PrivMode_Screen }, 3769 { 1047, PrivMode_Screen },
3610 // 1048 save and restore cursor 3770 // 1048 save and restore cursor, implemented in code
3611 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */ 3771 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
3612 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3772 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3773#if ENABLE_FRILLS
3613 { 2004, PrivMode_BracketPaste }, 3774 { 2004, PrivMode_BracketPaste },
3775#endif
3614 }; 3776 };
3615 3777
3616 if (nargs == 0) 3778 if (nargs == 0)
3617 return; 3779 return;
3780
3781 // DECRQM
3782 if (mode == 'p')
3783 {
3784 int status = 0;
3785 if (nargs != 1)
3786 return;
3787
3788 for (j = 0; j < ecb_array_length (argtopriv); j++)
3789 if (argtopriv[j].argval == arg[0])
3790 {
3791 status = (priv_modes & argtopriv[j].bit) ? 1 : 2;
3792 break;
3793 }
3794
3795 tt_printf ("\33[?%d;%d$y", arg[0], status);
3796 return;
3797 }
3618 3798
3619 /* make lo/hi boolean */ 3799 /* make lo/hi boolean */
3620 if (mode == 'l') 3800 if (mode == 'l')
3621 mode = 0; /* reset */ 3801 mode = 0; /* reset */
3622 else if (mode == 'h') 3802 else if (mode == 'h')
… …
3625 for (i = 0; i < nargs; i++) 3805 for (i = 0; i < nargs; i++)
3626 { 3806 {
3627 state = -1; 3807 state = -1;
3628 3808
3629 /* basic handling */ 3809 /* basic handling */
3630 for (j = 0; j < (sizeof (argtopriv)/sizeof (argtopriv[0])); j++) 3810 for (j = 0; j < ecb_array_length (argtopriv); j++)
3631 if (argtopriv[j].argval == arg[i]) 3811 if (argtopriv[j].argval == arg[i])
3632 { 3812 {
3633 state = privcases (mode, argtopriv[j].bit); 3813 state = privcases (mode, argtopriv[j].bit);
3634 break; 3814 break;
3635 } 3815 }
… …
3643 3823
3644 scr_touch (true); 3824 scr_touch (true);
3645 break; 3825 break;
3646#endif 3826#endif
3647 case 1048: /* alternative cursor save */ 3827 case 1048: /* alternative cursor save */
3648 case 1049:
3649 if (option (Opt_secondaryScreen)) 3828 if (option (Opt_secondaryScreen))
3650 if (mode == 0) 3829 if (mode == 0)
3651 scr_cursor (RESTORE); 3830 scr_cursor (RESTORE);
3652 else if (mode == 1) 3831 else if (mode == 1)
3653 scr_cursor (SAVE); 3832 scr_cursor (SAVE);
… …
3662 case 2: /* VT52 mode */ 3841 case 2: /* VT52 mode */
3663 /* oddball mode. should be set regardless of set/reset 3842 /* oddball mode. should be set regardless of set/reset
3664 * parameter. Return from VT52 mode with an ESC < from 3843 * parameter. Return from VT52 mode with an ESC < from
3665 * within VT52 mode 3844 * within VT52 mode
3666 */ 3845 */
3667 set_privmode (PrivMode_vt52, 1); 3846 priv_modes |= PrivMode_vt52;
3668 break; 3847 break;
3669 case 3: /* 80/132 */ 3848 case 3: /* 80/132 */
3670 if (priv_modes & PrivMode_132OK) 3849 if (priv_modes & PrivMode_132OK)
3671 {
3672 scr_poweron ();
3673 set_widthheight (((state ? 132 : 80) * fwidth), 24 * fheight); 3850 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
3674 }
3675 break; 3851 break;
3676 case 4: /* smooth scrolling */ 3852 case 4: /* smooth scrolling */
3677 set_option (Opt_jumpScroll, !state); 3853 set_option (Opt_jumpScroll, !state);
3678 break; 3854 break;
3679 case 5: /* reverse video */ 3855 case 5: /* reverse video */
… …
3690 if (state) /* orthogonal */ 3866 if (state) /* orthogonal */
3691 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent); 3867 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3692 break; 3868 break;
3693#ifdef scrollBar_esc 3869#ifdef scrollBar_esc
3694 case scrollBar_esc: 3870 case scrollBar_esc:
3695 if (scrollBar.map (state)) 3871 scrollBar.map (state);
3696 {
3697 resize_all_windows (0, 0, 0); 3872 resize_all_windows (0, 0, 0);
3698 scr_touch (true); 3873 scr_touch (true);
3699 } 3874 break;
3875#endif
3876#ifdef CURSOR_BLINK
3877 case 12:
3878 cursor_blink_reset ();
3700 break; 3879 break;
3701#endif 3880#endif
3702 case 25: /* visible/invisible cursor */ 3881 case 25: /* visible/invisible cursor */
3703 scr_cursor_visible (state); 3882 scr_cursor_visible (state);
3704 break; 3883 break;
… …
3717 case 1003: 3896 case 1003:
3718 if (state) 3897 if (state)
3719 { 3898 {
3720 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11); 3899 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3721 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent; 3900 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3901 mouse_row = mouse_col = 0;
3722 vt_emask_mouse = PointerMotionMask; 3902 vt_emask_mouse = PointerMotionMask;
3723 } 3903 }
3724 else 3904 else
3725 vt_emask_mouse = NoEventMask; 3905 vt_emask_mouse = NoEventMask;
3906
3726 vt_select_input (); 3907 vt_select_input ();
3727 break; 3908 break;
3728 case 1010: /* scroll to bottom on TTY output inhibit */ 3909 case 1010: /* scroll to bottom on TTY output inhibit */
3729 set_option (Opt_scrollTtyOutput, !state); 3910 set_option (Opt_scrollTtyOutput, !state);
3730 break; 3911 break;
3731 case 1011: /* scroll to bottom on key press */ 3912 case 1011: /* scroll to bottom on key press */
3732 set_option (Opt_scrollTtyKeypress, state); 3913 set_option (Opt_scrollTtyKeypress, state);
3733 break; 3914 break;
3734 case 1047: /* secondary screen w/ clearing last */ 3915 case 1047: /* secondary screen w/ clearing last */
3735 if (option (Opt_secondaryScreen)) 3916 if (option (Opt_secondaryScreen))
3736 if (current_screen != PRIMARY) 3917 if (!state)
3737 scr_erase_screen (2); 3918 scr_erase_screen (2);
3919
3738 scr_change_screen (state); 3920 scr_change_screen (state);
3739 break; 3921 break;
3740 case 1049: /* secondary screen w/ clearing first */ 3922 case 1049: /* secondary screen w/ clearing first */
3923 if (option (Opt_secondaryScreen))
3924 if (state)
3925 scr_cursor (SAVE);
3926
3741 scr_change_screen (state); 3927 scr_change_screen (state);
3928
3742 if (option (Opt_secondaryScreen)) 3929 if (option (Opt_secondaryScreen))
3743 if (current_screen != PRIMARY) 3930 if (state)
3744 scr_erase_screen (2); 3931 scr_erase_screen (2);
3932 else
3933 scr_cursor (RESTORE);
3745 break; 3934 break;
3746 default: 3935 default:
3747 break; 3936 break;
3748 } 3937 }
3749 } 3938 }
3750} 3939}
3751/*}}} */ 3940/*}}} */
3752 3941
3753/*{{{ process sgr sequences */ 3942/*{{{ process sgr sequences */
3754void 3943void ecb_hot
3755rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg) 3944rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg)
3756{ 3945{
3757 unsigned int i; 3946 unsigned int i;
3758 short rendset; 3947 short rendset;
3759 int rendstyle; 3948 int rendstyle;
… …
3801 //case 19: // ninth alt font 3990 //case 19: // ninth alt font
3802 //case 20: // gothic 3991 //case 20: // gothic
3803 case 21: // disable bold, faint, sometimes doubly underlined (iso 8613) 3992 case 21: // disable bold, faint, sometimes doubly underlined (iso 8613)
3804 rendset = 0, rendstyle = RS_Bold; 3993 rendset = 0, rendstyle = RS_Bold;
3805 break; 3994 break;
3806 case 22: // normal intensity 3995 case 22: // bold off (vt220)
3807 rendset = 0, rendstyle = RS_Bold; 3996 rendset = 0, rendstyle = RS_Bold;
3808 break; 3997 break;
3809 case 23: // disable italic 3998 case 23: // disable italic
3810 rendset = 0, rendstyle = RS_Italic; 3999 rendset = 0, rendstyle = RS_Italic;
3811 break; 4000 break;
3812 case 24: 4001 case 24: // underline off (vt220)
3813 rendset = 0, rendstyle = RS_Uline; 4002 rendset = 0, rendstyle = RS_Uline;
3814 break; 4003 break;
3815 case 25: 4004 case 25: // blink off (vt220)
3816 rendset = 0, rendstyle = RS_Blink; 4005 rendset = 0, rendstyle = RS_Blink;
3817 break; 4006 break;
3818 case 26: // variable spacing (iso 8613) 4007 case 26: // variable spacing (iso 8613)
3819 rendset = 0, rendstyle = RS_Blink; 4008 rendset = 0, rendstyle = RS_Blink;
3820 break; 4009 break;
3821 case 27: 4010 case 27: // reverse off (vt220)
3822 rendset = 0, rendstyle = RS_RVid; 4011 rendset = 0, rendstyle = RS_RVid;
3823 break; 4012 break;
3824 //case 28: // visible. NYI 4013 //case 28: // visible. NYI
3825 //case 29: // not crossed-out 4014 //case 29: // not crossed-out
3826 } 4015 }
… …
3841 case 35: 4030 case 35:
3842 case 36: 4031 case 36:
3843 case 37: 4032 case 37:
3844 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg); 4033 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg);
3845 break; 4034 break;
3846 case 38: // set fg color, ISO 8613-6
3847 if (nargs > i + 2 && arg[i + 1] == 5)
3848 {
3849 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg);
3850 i += 2;
3851 }
3852 break;
3853 case 39: /* default fg */ 4035 case 39: /* default fg */
3854 scr_color (Color_fg, Color_fg); 4036 scr_color (Color_fg, Color_fg);
3855 break; 4037 break;
3856 4038
3857 case 40: 4039 case 40:
… …
3862 case 45: 4044 case 45:
3863 case 46: 4045 case 46:
3864 case 47: 4046 case 47:
3865 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg); 4047 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg);
3866 break; 4048 break;
3867 case 48: // set bg color, ISO 8613-6
3868 if (nargs > i + 2 && arg[i + 1] == 5)
3869 {
3870 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg);
3871 i += 2;
3872 }
3873 break;
3874 case 49: /* default bg */ 4049 case 49: /* default bg */
3875 scr_color (Color_bg, Color_bg); 4050 scr_color (Color_bg, Color_bg);
4051 break;
4052
4053 case 38: // set fg color, ISO 8613-6
4054 case 48: // set bg color, ISO 8613-6
4055 {
4056 unsigned int fgbg = arg[i] == 38 ? Color_fg : Color_bg;
4057 unsigned int idx;
4058
4059 if (nargs > i + 2 && arg[i + 1] == 5)
4060 {
4061 idx = minCOLOR + arg[i + 2];
4062 i += 2;
4063
4064 scr_color (idx, fgbg);
4065 }
4066 else if (nargs > i + 4 && arg[i + 1] == 2)
4067 {
4068 unsigned int r = arg[i + 2];
4069 unsigned int g = arg[i + 3];
4070 unsigned int b = arg[i + 4];
4071 unsigned int a = 0xff;
4072
4073 idx = map_rgb24_color (r, g, b, a);
4074
4075 i += 4;
4076
4077 scr_color (idx, fgbg);
4078 }
4079 }
3876 break; 4080 break;
3877 4081
3878 //case 50: // not variable spacing 4082 //case 50: // not variable spacing
3879 4083
3880#if !ENABLE_MINIMAL 4084#if !ENABLE_MINIMAL
… …
3900 break; 4104 break;
3901#endif 4105#endif
3902 } 4106 }
3903 } 4107 }
3904} 4108}
4109
4110void
4111rxvt_term::set_cursor_style (int style)
4112{
4113 if (!IN_RANGE_INC (style, 0, 6))
4114 return;
4115
4116 if (style == 0)
4117 style = 1;
4118
4119 cursor_type = (style - 1) / 2;
4120 set_option (Opt_cursorUnderline, cursor_type == 1);
4121
4122#ifdef CURSOR_BLINK
4123 set_option (Opt_cursorBlink, style & 1);
4124 cursor_blink_reset ();
4125#endif
4126
4127 want_refresh = 1;
4128}
3905/*}}} */ 4129/*}}} */
3906 4130
3907/*{{{ (do not) process Rob Nation's own graphics mode sequences */
3908void
3909rxvt_term::process_graphics ()
3910{
3911 unicode_t ch, cmd = cmd_getc ();
3912
3913 if (cmd == 'Q')
3914 {
3915 /* query graphics */
3916 tt_printf ("\033G0\012"); /* no graphics */
3917 return;
3918 }
3919 /* swallow other graphics sequences until terminating ':' */
3920 do
3921 ch = cmd_getc ();
3922 while (ch != ':');
3923}
3924/*}}} */
3925
3926/* ------------------------------------------------------------------------- */ 4131/* ---------------------------------------------------------------------- */
4132/* Write data to the pty as typed by the user, pasted with the mouse,
4133 * or generated by us in response to a query ESC sequence.
4134 */
3927 4135
3928/* 4136/*
3929 * Send printf () formatted output to the command. 4137 * Send printf () formatted output to the command.
3930 * Only use for small amounts of data. 4138 * Only use for small amounts of data.
3931 */ 4139 */
… …
3939 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4147 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
3940 va_end (arg_ptr); 4148 va_end (arg_ptr);
3941 tt_write (buf, strlen (buf)); 4149 tt_write (buf, strlen (buf));
3942} 4150}
3943 4151
3944/* ---------------------------------------------------------------------- */
3945/* Write data to the pty as typed by the user, pasted with the mouse, 4152/* Write data to the pty as typed by the user. */
3946 * or generated by us in response to a query ESC sequence. 4153void
3947 */ 4154rxvt_term::tt_write_user_input (const char *data, unsigned int len)
3948const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 4155{
4156 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4157 return;
4158
4159 if (option (Opt_scrollTtyKeypress))
4160 if (view_start)
4161 {
4162 view_start = 0;
4163 want_refresh = 1;
4164 }
4165
4166 tt_write_ (data, len);
4167}
3949 4168
3950void 4169void
3951rxvt_term::tt_write (const char *data, unsigned int len) 4170rxvt_term::tt_write (const char *data, unsigned int len)
3952{ 4171{
3953 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END))) 4172 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
3954 return; 4173 return;
3955 4174
4175 tt_write_ (data, len);
4176}
4177
4178static const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4179
4180void
4181rxvt_term::tt_write_ (const char *data, unsigned int len)
4182{
3956 if (pty->pty < 0) 4183 if (pty->pty < 0)
3957 return; 4184 return;
3958 4185
3959 if (v_buflen == 0) 4186 if (v_buflen == 0)
3960 { 4187 {
3961 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE)); 4188 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
3962 4189
4190 max_it (written, 0);
4191
3963 if ((unsigned int)written == len) 4192 if (written == len)
3964 return; 4193 return;
3965 4194
3966 data += written; 4195 data += written;
3967 len -= written; 4196 len -= written;
3968 } 4197 }
3969 4198
3970 v_buffer = (char *)realloc (v_buffer, v_buflen + len); 4199 v_buffer = (char *)rxvt_realloc (v_buffer, v_buflen + len);
3971 4200
3972 memcpy (v_buffer + v_buflen, data, len); 4201 memcpy (v_buffer + v_buflen, data, len);
3973 v_buflen += len; 4202 v_buflen += len;
3974 4203
3975 pty_ev.set (ev::READ | ev::WRITE); 4204 pty_ev.set (ev::READ | ev::WRITE);

Diff Legend

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