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

Diff Legend

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