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.474 by sf-exg, Fri Jan 28 00:08:58 2011 UTC vs.
Revision 1.564 by sf-exg, Fri Mar 27 15:06:09 2015 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-2014 Marc Lehmann <schmorp@schmorp.de>
31 * Copyright (c) 2007 Emanuele Giaquinta <e.giaquinta@glauco.it> 31 * Copyright (c) 2007 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 wchar_t *chr, *alloc, ch2, **fname; 167 wchar_t *chr, *alloc, ch2, **fname;
168 int len; 168 int len;
169 169
… …
181 181
182 alloc = 0; 182 alloc = 0;
183 chr = &ch2; 183 chr = &ch2;
184 len = 1; 184 len = 1;
185 } 185 }
186
187 char rowcol[40];
188 snprintf (rowcol, sizeof rowcol, "col %d row %d @%d", x, y, y2);
186 189
187 char attr[80]; // plenty 190 char attr[80]; // plenty
188 191
189 sprintf (attr, "%08x = fg %d bg %d%s%s%s%s%s%s", 192 sprintf (attr, "%08x = fg %d bg %d%s%s%s%s%s%s",
190 (int)r, 193 (int)r,
… …
203 rxvt_font *f = (*fs)[fs->find_font_idx (chr[i])]; 206 rxvt_font *f = (*fs)[fs->find_font_idx (chr[i])];
204 fname[i] = rxvt_utf8towcs (f->name); 207 fname[i] = rxvt_utf8towcs (f->name);
205 max_it (width, wcswidth (fname[i], wcslen (fname[i]))); 208 max_it (width, wcswidth (fname[i], wcslen (fname[i])));
206 } 209 }
207 210
208 max_it (width, 8+5); // for char + hex
209 max_it (width, strlen (attr)); 211 max_it (width, strlen (attr));
210 212
211 if (y >= 0) 213 if (y >= 0)
212 { 214 {
213 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1; 215 y = (y >= nrow - len - 5 && x < width + 2) ? 0 : -1;
214 x = 0; 216 x = 0;
215 } 217 }
216 218
217 scr_overlay_new (x, y, width, len * 2 + 1); 219 scr_overlay_new (x, y, width, len * 2 + 2);
220
221 scr_overlay_set (0, 0, rowcol);
218 222
219 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r)); 223 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));
220 224
221 for (int y = 0; y < len; y++) 225 for (int y = 0; y < len; y++)
222 { 226 {
223 char buf[9]; 227 char buf[9];
224 228
225 ch = *chr++; 229 ch = *chr++;
226 230
227 sprintf (buf, "%8x", ch); 231 sprintf (buf, "%8x", ch);
228 scr_overlay_set (0, y, buf); 232 scr_overlay_set (0, y + 1, buf);
229 scr_overlay_set (9, y, '='); 233 scr_overlay_set (9, y + 1, '=');
230# if !UNICODE_3 234# if !UNICODE_3
231 if (ch >= 0x10000) 235 if (ch >= 0x10000)
232 ch = 0xfffd; 236 ch = 0xfffd;
233# endif 237# endif
234 scr_overlay_set (11, y, ch, r); 238 scr_overlay_set (11, y + 1, ch, r);
235 239
236 if (WCWIDTH (ch) >= 2) 240 if (WCWIDTH (ch) >= 2)
237 scr_overlay_set (12, y, NOCHAR, r); 241 scr_overlay_set (12, y + 1, NOCHAR, r);
238 } 242 }
239 243
240// { 244// {
241// char buf[4+4+3+1]; 245// char buf[4+4+3+1];
242// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y); 246// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y);
243// scr_overlay_set (0, 0, buf); 247// scr_overlay_set (0, 0, buf);
244// } 248// }
245 scr_overlay_set (0, len , attr); 249 scr_overlay_set (0, len + 1, attr);
246 for (int i = 0; i < len; i++) 250 for (int i = 0; i < len; i++)
247 { 251 {
248 scr_overlay_set (0, len + 1 + i, fname[i]); 252 scr_overlay_set (0, len + 2 + i, fname[i]);
249 free (fname[i]); 253 free (fname[i]);
250 } 254 }
251 255
252# if ENABLE_COMBINING 256# if ENABLE_COMBINING
253 if (alloc) 257 if (alloc)
254 delete [] alloc; 258 delete [] alloc;
255# endif 259# endif
256} 260}
257#endif 261#endif
258 262
259void 263void ecb_cold
260rxvt_term::commit_iso14755 () 264rxvt_term::commit_iso14755 ()
261{ 265{
262 wchar_t ch[2];
263
264 ch[0] = iso14755buf & ISO_14755_MASK; 266 wchar_t ch = iso14755buf & ISO_14755_MASK;
265 ch[1] = 0;
266 267
267 if (iso14755buf & ISO_14755_51) 268 if (iso14755buf & ISO_14755_51)
268 { 269 {
269 char mb[16]; 270 char mb[MB_LEN_MAX];
270 int len; 271 int len;
271 272
272 // allow verbatim 0-bytes and control-bytes to be entered 273 // allow verbatim 0-bytes and control-bytes to be entered
273 if (ch[0] >= 0x20) 274 if (ch >= 0x20)
274 len = wcstombs (mb, ch, 16); 275 len = wctomb (mb, ch);
275 else 276 else
276 { 277 {
277 mb[0] = ch[0]; 278 mb[0] = ch;
278 len = 1; 279 len = 1;
279 } 280 }
280 281
281 if (len > 0) 282 if (len > 0)
282 tt_write (mb, len); 283 tt_write (mb, len);
… …
285 } 286 }
286 287
287 iso14755buf = 0; 288 iso14755buf = 0;
288} 289}
289 290
290static int 291static int ecb_cold
291hex_keyval (XKeyEvent &ev) 292hex_keyval (XKeyEvent &ev)
292{ 293{
293 // check whether this event corresponds to a hex digit 294 // check whether this event corresponds to a hex digit
294 // if the modifiers had not been pressed. 295 // if the modifiers had not been pressed.
295 for (int index = 0; index < 8; index++) 296 for (int index = 0; index < 8; index++)
… …
304 305
305 return -1; 306 return -1;
306} 307}
307#endif 308#endif
308 309
309static inline KeySym 310static inline KeySym ecb_cold
310translate_keypad (KeySym keysym, bool kp) 311translate_keypad (KeySym keysym, bool kp)
311{ 312{
312#ifdef XK_KP_Home 313#ifdef XK_KP_Home
313 static const KeySym keypadtrans[] = { 314 static const KeySym keypadtrans[] = {
314 XK_KP_7, // XK_KP_Home 315 XK_KP_7, // XK_KP_Home
315 XK_KP_4, // XK_KP_Left 316 XK_KP_4, // XK_KP_Left
316 XK_KP_8, // XK_KP_Up 317 XK_KP_8, // XK_KP_Up
317 XK_KP_6, // XK_KP_Right 318 XK_KP_6, // XK_KP_Right
318 XK_KP_2, // XK_KP_Down 319 XK_KP_2, // XK_KP_Down
319# ifndef UNSHIFTED_SCROLLKEYS
320 XK_KP_9, // XK_KP_Prior 320 XK_KP_9, // XK_KP_Prior
321 XK_KP_3, // XK_KP_Next 321 XK_KP_3, // XK_KP_Next
322# else
323 XK_Prior,
324 XK_Next,
325# endif
326 XK_KP_1, // XK_KP_End 322 XK_KP_1, // XK_KP_End
327 XK_KP_5, // XK_KP_Begin 323 XK_KP_5, // XK_KP_Begin
328 }; 324 };
329 325
330 if (IN_RANGE_INC (keysym, XK_KP_Home, XK_KP_Begin)) 326 if (IN_RANGE_INC (keysym, XK_KP_Home, XK_KP_Begin))
… …
340# endif 336# endif
341#endif 337#endif
342 return keysym; 338 return keysym;
343} 339}
344 340
345static inline int 341static inline int ecb_cold
346map_function_key (KeySym keysym) 342map_function_key (KeySym keysym)
347{ 343{
348 int param = 0; 344 int param = 0;
349 345
350 if (IN_RANGE_INC (keysym, XK_F1, XK_F35)) 346 if (IN_RANGE_INC (keysym, XK_F1, XK_F35))
… …
375 param = 3; 371 param = 3;
376 break; 372 break;
377 case XK_Select: 373 case XK_Select:
378 param = 4; 374 param = 4;
379 break; 375 break;
380#ifndef UNSHIFTED_SCROLLKEYS
381 case XK_Prior: 376 case XK_Prior:
382 param = 5; 377 param = 5;
383 break; 378 break;
384 case XK_Next: 379 case XK_Next:
385 param = 6; 380 param = 6;
… …
388 param = 7; 383 param = 7;
389 break; 384 break;
390 case XK_End: 385 case XK_End:
391 param = 8; 386 param = 8;
392 break; 387 break;
393#endif
394 case XK_Help: 388 case XK_Help:
395 param = 28; 389 param = 28;
396 break; 390 break;
397 case XK_Menu: 391 case XK_Menu:
398 param = 29; 392 param = 29;
399 break; 393 break;
400 } 394 }
401 return param; 395 return param;
402} 396}
403 397
404void 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
405rxvt_term::key_press (XKeyEvent &ev) 408rxvt_term::key_press (XKeyEvent &ev)
406{ 409{
407 int ctrl, meta, shft, len; 410 int ctrl, meta, shft, len;
408 KeySym keysym; 411 KeySym keysym = NoSymbol;
409 int valid_keysym;
410 char kbuf[KBUFSZ]; 412 char rkbuf[KBUFSZ + 1];
413 char *kbuf = rkbuf + 1;
411 414
412#if ISO_14755 415#if ISO_14755
413 if (iso14755buf & ISO_14755_52) 416 if (iso14755buf & ISO_14755_52)
414 return; 417 return;
415#endif 418#endif
… …
424 ctrl = ev.state & ControlMask; 427 ctrl = ev.state & ControlMask;
425 meta = ev.state & ModMetaMask; 428 meta = ev.state & ModMetaMask;
426 429
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 {
… …
509#endif 724#endif
510 max_it (lnsppg, 1); 725 max_it (lnsppg, 1);
511 726
512 if (keysym == XK_Prior) 727 if (keysym == XK_Prior)
513 { 728 {
514 scr_page (UP, lnsppg); 729 scr_page (lnsppg);
515 return; 730 return;
516 } 731 }
517 else if (keysym == XK_Next) 732 else if (keysym == XK_Next)
518 { 733 {
519 scr_page (DN, lnsppg); 734 scr_page (-lnsppg);
520 return; 735 return;
521 } 736 }
522 } 737 }
523#ifdef SCROLL_ON_UPDOWN_KEYS 738#ifdef SCROLL_ON_UPDOWN_KEYS
524 if (IS_SCROLL_MOD) 739 if (IS_SCROLL_MOD)
525 { 740 {
526 if (keysym == XK_Up) 741 if (keysym == XK_Up)
527 { 742 {
528 scr_page (UP, 1); 743 scr_page (1);
529 return; 744 return;
530 } 745 }
531 else if (keysym == XK_Down) 746 else if (keysym == XK_Down)
532 { 747 {
533 scr_page (DN, 1); 748 scr_page (-1);
534 return; 749 return;
535 } 750 }
536 } 751 }
537#endif 752#endif
538#ifdef SCROLL_ON_HOMEEND_KEYS 753#ifdef SCROLL_ON_HOMEEND_KEYS
539 if (IS_SCROLL_MOD) 754 if (IS_SCROLL_MOD)
540 { 755 {
541 if (keysym == XK_Home) 756 if (keysym == XK_Home)
542 { 757 {
543 scr_move_to (0, 1); 758 scr_changeview (top_row);
544 return; 759 return;
545 } 760 }
546 else if (keysym == XK_End) 761 else if (keysym == XK_End)
547 { 762 {
548 scr_move_to (1, 1); 763 scr_changeview (0);
549 return; 764 return;
550 } 765 }
551 } 766 }
552#endif 767#endif
553 } 768 }
554 769
555 if (shft) 770 if (shft)
556 { 771 {
557 /* Shift + F1 - F10 generates F11 - F20 */
558 if (keysym >= XK_F1 && keysym <= XK_F10)
559 {
560 keysym += (XK_F11 - XK_F1);
561 shft = 0; /* turn off Shift */
562 }
563 else if (!ctrl && !meta && (priv_modes & PrivMode_ShiftKeys)) 772 if (!ctrl && !meta && (priv_modes & PrivMode_ShiftKeys))
564 { 773 {
565 switch (keysym) 774 switch (keysym)
566 { 775 {
567 /* normal XTerm key bindings */ 776 /* normal XTerm key bindings */
568 case XK_Insert: /* Shift+Insert = paste mouse selection */ 777 case XK_Insert: /* Shift+Insert = paste mouse selection */
569 selection_request (ev.time); 778 selection_request (ev.time);
570 return; 779 return;
571#if TODO 780#if TODO
572 /* rxvt extras */ 781 /* rxvt extras */
573 case XK_KP_Add: /* Shift+KP_Add = bigger font */ 782 case XK_KP_Add: /* Shift+KP_Add = bigger font */
574 change_font (FONT_UP);
575 return; 783 return;
576 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */ 784 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */
577 change_font (FONT_DN);
578 return; 785 return;
579#endif 786#endif
580 } 787 }
581 } 788 }
789 }
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;
582 } 804 }
583 805
584#if ENABLE_FRILLS || ISO_14755 806#if ENABLE_FRILLS || ISO_14755
585 // ISO 14755 support 807 // ISO 14755 support
586 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_51)) 808 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_51))
… …
641 { 863 {
642 scr_printscreen (ctrl | shft); 864 scr_printscreen (ctrl | shft);
643 return; 865 return;
644 } 866 }
645#endif 867#endif
646
647 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
648 {
649 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
650 unsigned int newlen = 1;
651
652 if (ev.state & ModNumLockMask)
653 kp = false;
654
655 keysym = translate_keypad (keysym, kp);
656
657 switch (keysym)
658 {
659#ifndef NO_BACKSPACE_KEY
660 case XK_BackSpace:
661 if (priv_modes & PrivMode_HaveBackSpace)
662 {
663 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
664 ^ !!ctrl) ? '\b' : '\177';
665 kbuf[1] = '\0';
666 }
667 else
668 strcpy (kbuf, rs[Rs_backspace_key]);
669 break;
670#endif
671#ifndef NO_DELETE_KEY
672 case XK_Delete:
673 strcpy (kbuf, rs[Rs_delete_key]);
674 break;
675#endif
676 case XK_Tab:
677 if (shft)
678 strcpy (kbuf, "\033[Z");
679 else
680 {
681#ifdef CTRL_TAB_MAKES_META
682 if (ctrl)
683 meta = 1;
684#endif
685#ifdef MOD4_TAB_MAKES_META
686 if (ev.state & Mod4Mask)
687 meta = 1;
688#endif
689 newlen = 0;
690 }
691 break;
692
693 case XK_Up: /* "\033[A" */
694 case XK_Down: /* "\033[B" */
695 case XK_Right: /* "\033[C" */
696 case XK_Left: /* "\033[D" */
697 strcpy (kbuf, "\033[Z");
698 kbuf[2] = "DACB"[keysym - XK_Left];
699 /* do Shift first */
700 if (shft)
701 kbuf[2] = "dacb"[keysym - XK_Left];
702 else if (ctrl)
703 {
704 kbuf[1] = 'O';
705 kbuf[2] = "dacb"[keysym - XK_Left];
706 }
707 else if (priv_modes & PrivMode_aplCUR)
708 kbuf[1] = 'O';
709 break;
710
711 case XK_KP_Enter:
712 /* allow shift to override */
713 if (kp)
714 {
715 strcpy (kbuf, "\033OM");
716 break;
717 }
718
719 /* FALLTHROUGH */
720
721 case XK_Return:
722 if (priv_modes & PrivMode_LFNL)
723 {
724 kbuf[0] = '\015';
725 kbuf[1] = '\012';
726 kbuf[2] = '\0';
727 }
728 else
729 {
730 kbuf[0] = '\015';
731 kbuf[1] = '\0';
732 }
733 break;
734
735 case XK_KP_F1: /* "\033OP" */
736 case XK_KP_F2: /* "\033OQ" */
737 case XK_KP_F3: /* "\033OR" */
738 case XK_KP_F4: /* "\033OS" */
739 strcpy (kbuf, "\033OP");
740 kbuf[2] += (keysym - XK_KP_F1);
741 break;
742
743 case XK_KP_Multiply: /* "\033Oj" : "*" */
744 case XK_KP_Add: /* "\033Ok" : "+" */
745 case XK_KP_Separator: /* "\033Ol" : "," */
746 case XK_KP_Subtract: /* "\033Om" : "-" */
747 case XK_KP_Decimal: /* "\033On" : "." */
748 case XK_KP_Divide: /* "\033Oo" : "/" */
749 case XK_KP_0: /* "\033Op" : "0" */
750 case XK_KP_1: /* "\033Oq" : "1" */
751 case XK_KP_2: /* "\033Or" : "2" */
752 case XK_KP_3: /* "\033Os" : "3" */
753 case XK_KP_4: /* "\033Ot" : "4" */
754 case XK_KP_5: /* "\033Ou" : "5" */
755 case XK_KP_6: /* "\033Ov" : "6" */
756 case XK_KP_7: /* "\033Ow" : "7" */
757 case XK_KP_8: /* "\033Ox" : "8" */
758 case XK_KP_9: /* "\033Oy" : "9" */
759 /* allow shift to override */
760 if (kp)
761 {
762 strcpy (kbuf, "\033Oj");
763 kbuf[2] += (keysym - XK_KP_Multiply);
764 }
765 else
766 {
767 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
768 kbuf[1] = '\0';
769 }
770 break;
771
772 default:
773 {
774 int param = map_function_key (keysym);
775 if (param > 0)
776 sprintf (kbuf,"\033[%d~", param);
777 else
778 newlen = 0;
779 }
780 break;
781 }
782
783 if (newlen)
784 len = strlen (kbuf);
785
786 /*
787 * Pass meta for all function keys, if 'meta' option set
788 */
789#ifdef META8_OPTION
790 if (meta && (meta_char == 0x80) && len > 0)
791 kbuf[len - 1] |= 0x80;
792#endif
793
794 }
795 else if (ctrl && keysym == XK_minus)
796 {
797 len = 1;
798 kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */
799 }
800 else if (keysym == XK_ISO_Left_Tab)
801 {
802 strcpy (kbuf, "\033[Z");
803 len = 3;
804 }
805 else
806 {
807#ifdef META8_OPTION
808 /* set 8-bit on */
809 if (meta && (meta_char == 0x80))
810 {
811 char *ch;
812
813 for (ch = kbuf; ch < kbuf + len; ch++)
814 *ch |= 0x80;
815
816 meta = 0;
817 }
818#endif
819 /* nil */ ;
820 }
821 } 868 }
822
823 if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_INT, keysym, DT_STR_LEN, kbuf, len, DT_END)))
824 return;
825 869
826 if (len <= 0) 870 if (len <= 0)
827 return; /* not mapped */ 871 return; /* not mapped */
828 872
829 if (option (Opt_scrollTtyKeypress))
830 if (view_start)
831 {
832 view_start = 0;
833 want_refresh = 1;
834 }
835
836 /*
837 * these modifications only affect the static keybuffer
838 * pass Shift/Control indicators for function keys ending with `~'
839 *
840 * eg,
841 * Prior = "ESC[5~"
842 * Shift+Prior = "ESC[5$"
843 * Ctrl+Prior = "ESC[5^"
844 * Ctrl+Shift+Prior = "ESC[5@"
845 * Meta adds an Escape prefix (with META8_OPTION, if meta == <escape>).
846 */
847 if (kbuf[0] == C0_ESC && kbuf[1] == '[' && kbuf[len - 1] == '~')
848 kbuf[len - 1] = (shft ? (ctrl ? '@' : '$') : (ctrl ? '^' : '~'));
849
850 /* escape prefix */
851 if (meta
852#ifdef META8_OPTION
853 && meta_char == C0_ESC
854#endif
855 )
856 {
857 const char ch = C0_ESC;
858 tt_write (&ch, 1);
859 }
860
861 tt_write (kbuf, (unsigned int)len); 873 tt_write_user_input (kbuf, (unsigned int)len);
862} 874}
863 875
864void 876void ecb_cold
865rxvt_term::key_release (XKeyEvent &ev) 877rxvt_term::key_release (XKeyEvent &ev)
866{ 878{
867#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL 879#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
868 KeySym keysym; 880 KeySym keysym;
869 881
… …
936 else if (keysym == XK_Control_L || keysym == XK_Control_R) 948 else if (keysym == XK_Control_L || keysym == XK_Control_R)
937 mouse_slip_wheel_speed = 0; 949 mouse_slip_wheel_speed = 0;
938#endif 950#endif
939} 951}
940 952
941#if defined (KEYSYM_RESOURCE)
942unsigned int
943rxvt_term::cmd_write (const char *str, unsigned int count)
944{
945 unsigned int n, s;
946
947 n = cmdbuf_ptr - cmdbuf_base;
948 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp;
949
950 if (n > 0 && s < count)
951 {
952 memmove (cmdbuf_base, cmdbuf_ptr,
953 (unsigned int) (cmdbuf_endp - cmdbuf_ptr));
954 cmdbuf_ptr = cmdbuf_base;
955 cmdbuf_endp -= n;
956 s += n;
957 }
958
959 if (count > s)
960 {
961 rxvt_warn ("data loss: cmd_write too large, continuing.\n");
962 count = s;
963 }
964
965 for (; count--;)
966 *cmdbuf_endp++ = *str++;
967
968 cmd_parse ();
969
970 return 0;
971}
972#endif
973
974void 953void
975rxvt_term::flush () 954rxvt_term::flush ()
976{ 955{
977 flush_ev.stop (); 956 flush_ev.stop ();
978 957
979#ifdef HAVE_BG_PIXMAP 958#ifdef HAVE_IMG
980 if (bg_flags & BG_NEEDS_REFRESH) 959 if (bg_flags & BG_NEEDS_REFRESH)
981 { 960 {
982 bg_flags &= ~BG_NEEDS_REFRESH; 961 bg_flags &= ~BG_NEEDS_REFRESH;
983 scr_touch (false); 962 scr_touch (false);
984 } 963 }
… …
1024 while (row < end_row); 1003 while (row < end_row);
1025 } 1004 }
1026 1005
1027 scr_refresh (); 1006 scr_refresh ();
1028 scrollBar.show (1); 1007 scrollBar.show (1);
1029#ifdef USE_XIM 1008#if USE_XIM
1030 IMSendSpot (); 1009 im_send_spot ();
1031#endif 1010#endif
1032 } 1011 }
1033 1012
1034 display->flush (); 1013 display->flush ();
1035} 1014}
… …
1053 flush (); 1032 flush ();
1054} 1033}
1055 1034
1056#ifdef CURSOR_BLINK 1035#ifdef CURSOR_BLINK
1057void 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
1054void
1058rxvt_term::cursor_blink_cb (ev::timer &w, int revents) 1055rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
1059{ 1056{
1060 hidden_cursor = !hidden_cursor; 1057 hidden_cursor = !hidden_cursor;
1061 want_refresh = 1; 1058 want_refresh = 1;
1062 refresh_check (); 1059 refresh_check ();
… …
1080 1077
1081#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1078#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1082void 1079void
1083rxvt_term::cont_scroll_cb (ev::timer &w, int revents) 1080rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1084{ 1081{
1085 if ((scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN) 1082 if ((scrollBar.state == SB_STATE_UP || scrollBar.state == SB_STATE_DOWN)
1086 && scr_page (scrollBar.state == STATE_UP ? UP : DN, 1)) 1083 && scr_page (scrollBar.state == SB_STATE_UP ? UP : DN, 1))
1087 { 1084 {
1088 want_refresh = 1; 1085 want_refresh = 1;
1089 refresh_check (); 1086 refresh_check ();
1090 } 1087 }
1091 else 1088 else
… …
1095 1092
1096#ifdef SELECTION_SCROLLING 1093#ifdef SELECTION_SCROLLING
1097void 1094void
1098rxvt_term::sel_scroll_cb (ev::timer &w, int revents) 1095rxvt_term::sel_scroll_cb (ev::timer &w, int revents)
1099{ 1096{
1100 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1097 if (scr_page (scroll_selection_lines))
1101 { 1098 {
1102 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1099 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1103 want_refresh = 1; 1100 want_refresh = 1;
1104 refresh_check (); 1101 refresh_check ();
1105 } 1102 }
… …
1110 1107
1111#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1108#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1112void 1109void
1113rxvt_term::slip_wheel_cb (ev::timer &w, int revents) 1110rxvt_term::slip_wheel_cb (ev::timer &w, int revents)
1114{ 1111{
1115 if (scr_changeview (view_start - mouse_slip_wheel_speed)) 1112 if (scr_page (mouse_slip_wheel_speed))
1116 { 1113 {
1117 want_refresh = 1; 1114 want_refresh = 1;
1118 refresh_check (); 1115 refresh_check ();
1119 } 1116 }
1120 1117
… …
1152 { 1149 {
1153 } 1150 }
1154} event_handler; 1151} event_handler;
1155#endif 1152#endif
1156 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
1157bool 1187bool
1158rxvt_term::pty_fill () 1188rxvt_term::pty_fill ()
1159{ 1189{
1160 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1190 cmdbuf_reify ();
1161 1191
1162 if (CBUFSIZ == n) 1192 size_t avail = cmdbuf_base + CBUFSIZ - cmdbuf_endp;
1163 { 1193
1164 rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n"); 1194 if (!avail)
1165 n = 0;
1166 } 1195 {
1167 1196 // normally this indicates a "too long" command sequence - just drop the data we have
1168 memmove (cmdbuf_base, cmdbuf_ptr, n);
1169 cmdbuf_ptr = cmdbuf_base; 1197 cmdbuf_ptr = cmdbuf_base;
1170 cmdbuf_endp = cmdbuf_ptr + n; 1198 cmdbuf_endp = cmdbuf_ptr;
1199 avail = CBUFSIZ;
1200 }
1171 1201
1172 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n); 1202 ssize_t r = read (pty->pty, cmdbuf_endp, avail);
1173 1203
1174 if (r > 0) 1204 if (r > 0)
1175 { 1205 {
1176 cmdbuf_endp += r; 1206 cmdbuf_endp += r;
1177 return true; 1207 return true;
… …
1208 pty_write (); 1238 pty_write ();
1209 1239
1210 refresh_check (); 1240 refresh_check ();
1211} 1241}
1212 1242
1213void 1243void ecb_cold
1214rxvt_term::pointer_unblank () 1244rxvt_term::pointer_unblank ()
1215{ 1245{
1216 XDefineCursor (dpy, vt, TermWin_cursor); 1246 XDefineCursor (dpy, vt, TermWin_cursor);
1217 recolour_cursor (); 1247 recolor_cursor ();
1218 1248
1219#ifdef POINTER_BLANK 1249#ifdef POINTER_BLANK
1220 hidden_pointer = 0; 1250 hidden_pointer = 0;
1221 1251
1222 if (option (Opt_pointerBlank)) 1252 if (option (Opt_pointerBlank))
1223 pointer_ev.start (pointerBlankDelay); 1253 pointer_ev.start (pointerBlankDelay);
1224#endif 1254#endif
1225} 1255}
1226 1256
1227#ifdef POINTER_BLANK 1257#ifdef POINTER_BLANK
1228void 1258void ecb_cold
1229rxvt_term::pointer_blank () 1259rxvt_term::pointer_blank ()
1230{ 1260{
1231 if (!option (Opt_pointerBlank)) 1261 if (!option (Opt_pointerBlank))
1232 return; 1262 return;
1233 1263
… …
1235 XFlush (dpy); 1265 XFlush (dpy);
1236 1266
1237 hidden_pointer = 1; 1267 hidden_pointer = 1;
1238} 1268}
1239 1269
1240void 1270void ecb_cold
1241rxvt_term::pointer_cb (ev::timer &w, int revents) 1271rxvt_term::pointer_cb (ev::timer &w, int revents)
1242{ 1272{
1243 make_current (); 1273 make_current ();
1244 1274
1245 pointer_blank (); 1275 pointer_blank ();
… …
1337 32 + x, 1367 32 + x,
1338 32 + y); 1368 32 + y);
1339} 1369}
1340 1370
1341/*{{{ process an X event */ 1371/*{{{ process an X event */
1342void 1372void ecb_hot
1343rxvt_term::x_cb (XEvent &ev) 1373rxvt_term::x_cb (XEvent &ev)
1344{ 1374{
1345 make_current (); 1375 make_current ();
1346 1376
1347 dLocal (Display *, dpy); 1377 dLocal (Display *, dpy);
… …
1445 && ev.xfocus.mode != NotifyGrab) 1475 && ev.xfocus.mode != NotifyGrab)
1446 focus_out (); 1476 focus_out ();
1447 break; 1477 break;
1448 1478
1449 case ConfigureNotify: 1479 case ConfigureNotify:
1450 if (ev.xconfigure.window == parent[0]) 1480 if (ev.xconfigure.window == parent)
1451 { 1481 {
1452 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1482 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1453 ; 1483 ;
1454 1484
1485 bool want_position_change = SHOULD_INVOKE (HOOK_POSITION_CHANGE);
1486
1487 bool moved = false;
1455#ifdef HAVE_BG_PIXMAP 1488#ifdef HAVE_BG_PIXMAP
1456 bool moved = false;
1457 if (bg_window_position_sensitive ()) 1489 if (bg_window_position_sensitive ())
1458 { 1490 {
1491 want_position_change = true;
1492 if (bg_img == 0)
1493 moved = true;
1494 }
1495#endif
1496
1497 if (want_position_change)
1498 {
1459 int x, y; 1499 int x, y;
1500
1460 if (ev.xconfigure.send_event) 1501 if (ev.xconfigure.send_event)
1461 { 1502 {
1462 x = ev.xconfigure.x; 1503 x = ev.xconfigure.x;
1463 y = ev.xconfigure.y; 1504 y = ev.xconfigure.y;
1464 } 1505 }
1465 else 1506 else
1466 get_window_origin (x, y); 1507 get_window_origin (x, y);
1467 1508
1468 if (bg_set_position (x, y) 1509 if (x != parent_x || y != parent_y)
1469 || !(bg_flags & BG_IS_VALID)) 1510 {
1511 parent_x = x;
1512 parent_y = y;
1513 HOOK_INVOKE ((this, HOOK_POSITION_CHANGE, DT_INT, x, DT_INT, y, DT_END));
1470 moved = true; 1514 moved = true;
1515 }
1471 } 1516 }
1472#endif
1473 1517
1474 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1518 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1475 { 1519 {
1476 seen_resize = 1; 1520 seen_resize = 1;
1477 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1521 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1478 } 1522 }
1479 else 1523 else
1480 { 1524 {
1481#ifdef HAVE_BG_PIXMAP 1525#ifdef HAVE_BG_PIXMAP
1482 if (moved) 1526 if (moved)
1483 {
1484 if (mapped)
1485 update_background (); 1527 update_background ();
1486 else
1487 bg_invalidate ();
1488 }
1489#endif 1528#endif
1490 } 1529 }
1491 1530
1492 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1531 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1493 } 1532 }
1494 break; 1533 break;
1495 1534
1496 case PropertyNotify: 1535 case PropertyNotify:
1497 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END))) 1536 HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END));
1498 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1499 && ev.xproperty.state == PropertyNewValue)
1500 selection_property (ev.xproperty.window, ev.xproperty.atom);
1501
1502 break; 1537 break;
1503 1538
1504 case SelectionClear: 1539 case SelectionClear:
1505 selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]); 1540 selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]);
1506 break; 1541 break;
1507 1542
1508 case SelectionNotify:
1509 if (selection_wait == Sel_normal)
1510 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1511 break;
1512
1513 case SelectionRequest: 1543 case SelectionRequest:
1514 selection_send (ev.xselectionrequest); 1544 selection_send (ev.xselectionrequest);
1515 break; 1545 break;
1516 1546
1517 case MapNotify: 1547 case MapNotify:
1518#ifdef HAVE_BG_PIXMAP 1548#ifdef HAVE_BG_PIXMAP
1519 /* This is needed specifically to fix the case of no window manager or a 1549 // This is needed at startup for the case of no window manager
1520 * non-reparenting window manager. In those cases we never get first 1550 // or a non-reparenting window manager and also because we
1521 * ConfigureNotify. Also that speeds startup under normal WM, by taking 1551 // defer bg image updates if the window is not mapped. The
1522 * care of multiplicity of ConfigureNotify events arriving while WM does 1552 // short delay is to optimize for multiple ConfigureNotify
1523 * reparenting. 1553 // events at startup when the window manager reparents the
1524 * We should not render background immediately, as there could be several 1554 // window, so as to perform the computation after we have
1525 * ConfigureNotify's to follow. Lets take care of all of them in one scoop 1555 // received all of them.
1526 * by scheduling background redraw as soon as we can, but giving a short 1556 if (bg_img == 0)
1527 * bit of time for ConfigureNotifies to arrive.
1528 * We should render background PRIOR to drawing any text, but AFTER all
1529 * of ConfigureNotifys for the best results.
1530 */
1531 if (!(bg_flags & BG_IS_VALID))
1532 update_background_ev.start (0.025); 1557 update_background_ev.start (0.025);
1533#endif 1558#endif
1534 mapped = 1; 1559 mapped = 1;
1535#ifdef TEXT_BLINK 1560#ifdef TEXT_BLINK
1536 text_blink_ev.start (); 1561 text_blink_ev.start ();
… …
1551 if (ev.xany.window == vt) 1576 if (ev.xany.window == vt)
1552 { 1577 {
1553 do 1578 do
1554 { 1579 {
1555 scr_expose (ev.xexpose.x, ev.xexpose.y, 1580 scr_expose (ev.xexpose.x, ev.xexpose.y,
1556 ev.xexpose.width, ev.xexpose.height, False); 1581 ev.xexpose.width, ev.xexpose.height, false);
1557 } 1582 }
1558 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)); 1583 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1559 1584
1560 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1585 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1561 1586
1562 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)) 1587 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1563 { 1588 {
1564 scr_expose (ev.xexpose.x, ev.xexpose.y, 1589 scr_expose (ev.xexpose.x, ev.xexpose.y,
1565 ev.xexpose.width, ev.xexpose.height, False); 1590 ev.xexpose.width, ev.xexpose.height, false);
1566 } 1591 }
1567 1592
1568 want_refresh = 1; 1593 want_refresh = 1;
1569 } 1594 }
1570 else 1595 else
… …
1576 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event)) 1601 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1577 ; 1602 ;
1578 1603
1579 if (scrollBar.state && ev.xany.window == scrollBar.win) 1604 if (scrollBar.state && ev.xany.window == scrollBar.win)
1580 { 1605 {
1581 scrollBar.state = STATE_IDLE; 1606 scrollBar.state = SB_STATE_IDLE;
1582 scrollBar.show (0); 1607 scrollBar.show (0);
1583 } 1608 }
1584 } 1609 }
1585 break; 1610 break;
1586 1611
… …
1628 1653
1629#ifdef SELECTION_SCROLLING 1654#ifdef SELECTION_SCROLLING
1630 if (ev.xbutton.y < int_bwidth 1655 if (ev.xbutton.y < int_bwidth
1631 || Pixel2Row (ev.xbutton.y) > (nrow-1)) 1656 || Pixel2Row (ev.xbutton.y) > (nrow-1))
1632 { 1657 {
1658 page_dirn scroll_selection_dir;
1633 int dist; 1659 int dist;
1634 1660
1635 /* don't clobber the current delay if we are 1661 /* don't clobber the current delay if we are
1636 * already in the middle of scrolling. 1662 * already in the middle of scrolling.
1637 */ 1663 */
… …
1652 dist = int_bwidth - ev.xbutton.y; 1678 dist = int_bwidth - ev.xbutton.y;
1653 } 1679 }
1654 else 1680 else
1655 { 1681 {
1656 scroll_selection_dir = DN; 1682 scroll_selection_dir = DN;
1657 dist = ev.xbutton.y - (int_bwidth + height); 1683 dist = ev.xbutton.y - (int_bwidth + vt_height);
1658 } 1684 }
1659 1685
1660 scroll_selection_lines = Pixel2Height (dist) 1686 scroll_selection_lines = Pixel2Height (dist)
1661 / SELECTION_SCROLL_LINE_SPEEDUP 1687 / SELECTION_SCROLL_LINE_SPEEDUP
1662 + 1; 1688 + 1;
1663 min_it (scroll_selection_lines, 1689 min_it (scroll_selection_lines,
1664 SELECTION_SCROLL_MAX_LINES); 1690 SELECTION_SCROLL_MAX_LINES);
1691 scroll_selection_lines *= scroll_selection_dir;
1665 } 1692 }
1666 else 1693 else
1667 { 1694 {
1668 /* we are within the text window, so we 1695 /* we are within the text window, so we
1669 * shouldn't be scrolling 1696 * shouldn't be scrolling
… …
1674#ifdef MOUSE_THRESHOLD 1701#ifdef MOUSE_THRESHOLD
1675 } 1702 }
1676#endif 1703#endif
1677 } 1704 }
1678 } 1705 }
1679 else if (scrollBar.state == STATE_MOTION && ev.xany.window == scrollBar.win) 1706 else if (scrollBar.state == SB_STATE_MOTION && ev.xany.window == scrollBar.win)
1680 { 1707 {
1681 while (XCheckTypedWindowEvent (dpy, scrollBar.win, 1708 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1682 MotionNotify, &ev)) 1709 MotionNotify, &ev))
1683 ; 1710 ;
1684 1711
1685 XQueryPointer (dpy, scrollBar.win, 1712 XQueryPointer (dpy, scrollBar.win,
1686 &unused_root, &unused_child, 1713 &unused_root, &unused_child,
1687 &unused_root_x, &unused_root_y, 1714 &unused_root_x, &unused_root_y,
1688 &ev.xbutton.x, &ev.xbutton.y, 1715 &ev.xbutton.x, &ev.xbutton.y,
1689 &unused_mask); 1716 &unused_mask);
1690 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1717 scr_move_to (scrollBar.position (ev.xbutton.y) - csrO,
1691 scrollBar.size ()); 1718 scrollBar.size ());
1692 want_refresh = 1; 1719 want_refresh = 1;
1693 scrollBar.show (1); 1720 scrollBar.show (1);
1694 } 1721 }
1695 break; 1722 break;
1696 } 1723 }
1697 1724
1698#if defined(CURSOR_BLINK) 1725#if defined(CURSOR_BLINK)
1699 if (option (Opt_cursorBlink) && ev.type == KeyPress) 1726 if (ev.type == KeyPress)
1700 {
1701 if (hidden_cursor)
1702 {
1703 hidden_cursor = 0;
1704 want_refresh = 1;
1705 }
1706
1707 cursor_blink_ev.again (); 1727 cursor_blink_reset ();
1708 }
1709#endif 1728#endif
1710 1729
1711#if defined(POINTER_BLANK) 1730#if defined(POINTER_BLANK)
1712 if (option (Opt_pointerBlank) && pointerBlankDelay > 0) 1731 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1713 { 1732 {
… …
1724 1743
1725 refresh_check (); 1744 refresh_check ();
1726} 1745}
1727 1746
1728#if ENABLE_FRILLS 1747#if ENABLE_FRILLS
1729void 1748void ecb_cold
1730rxvt_term::set_urgency (bool enable) 1749rxvt_term::set_urgency (bool enable)
1731{ 1750{
1732 if (enable == urgency_hint) 1751 if (enable == urgency_hint)
1733 return; 1752 return;
1734 1753
1735 if (XWMHints *h = XGetWMHints (dpy, parent[0])) 1754 if (XWMHints *h = XGetWMHints (dpy, parent))
1736 { 1755 {
1737 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0); 1756 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0);
1738 XSetWMHints (dpy, parent[0], h); 1757 XSetWMHints (dpy, parent, h);
1739 urgency_hint = enable; 1758 urgency_hint = enable;
1759 XFree (h);
1740 } 1760 }
1741} 1761}
1742#endif 1762#endif
1743 1763
1744void 1764void ecb_cold
1745rxvt_term::focus_in () 1765rxvt_term::focus_in ()
1746{ 1766{
1747 if (!focus) 1767 if (!focus)
1748 { 1768 {
1749 focus = 1; 1769 focus = 1;
1750 want_refresh = 1; 1770 want_refresh = 1;
1751 1771
1752#if USE_XIM 1772#if USE_XIM
1753 if (Input_Context != NULL) 1773 if (Input_Context != NULL)
1754 { 1774 {
1755 IMSetPosition (); 1775 im_set_position ();
1756 XSetICFocus (Input_Context); 1776 XSetICFocus (Input_Context);
1757 } 1777 }
1758#endif 1778#endif
1759#if CURSOR_BLINK 1779#if CURSOR_BLINK
1760 if (option (Opt_cursorBlink)) 1780 if (option (Opt_cursorBlink))
… …
1762#endif 1782#endif
1763#if OFF_FOCUS_FADING 1783#if OFF_FOCUS_FADING
1764 if (rs[Rs_fade]) 1784 if (rs[Rs_fade])
1765 { 1785 {
1766 pix_colors = pix_colors_focused; 1786 pix_colors = pix_colors_focused;
1767 scr_recolour (); 1787 scr_recolor ();
1768 } 1788 }
1769#endif 1789#endif
1770#if ENABLE_FRILLS 1790#if ENABLE_FRILLS
1771 if (option (Opt_urgentOnBell)) 1791 if (option (Opt_urgentOnBell))
1772 set_urgency (0); 1792 set_urgency (0);
… …
1774 1794
1775 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END)); 1795 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1776 } 1796 }
1777} 1797}
1778 1798
1779void 1799void ecb_cold
1780rxvt_term::focus_out () 1800rxvt_term::focus_out ()
1781{ 1801{
1782 if (focus) 1802 if (focus)
1783 { 1803 {
1784 focus = 0; 1804 focus = 0;
… …
1809#endif 1829#endif
1810#if OFF_FOCUS_FADING 1830#if OFF_FOCUS_FADING
1811 if (rs[Rs_fade]) 1831 if (rs[Rs_fade])
1812 { 1832 {
1813 pix_colors = pix_colors_unfocused; 1833 pix_colors = pix_colors_unfocused;
1814 scr_recolour (); 1834 scr_recolor ();
1815 } 1835 }
1816#endif 1836#endif
1817 1837
1818 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1838 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1819 } 1839 }
1820} 1840}
1821 1841
1822void 1842void ecb_cold
1823rxvt_term::update_fade_color (unsigned int idx) 1843rxvt_term::update_fade_color (unsigned int idx, bool first_time)
1824{ 1844{
1825#if OFF_FOCUS_FADING 1845#if OFF_FOCUS_FADING
1826 if (rs[Rs_fade]) 1846 if (rs[Rs_fade])
1827 { 1847 {
1848 if (!first_time)
1849 pix_colors_focused [idx].free (this);
1850
1828 rgba c; 1851 rgba c;
1829 pix_colors [Color_fade].get (c); 1852 pix_colors [Color_fade].get (c);
1830 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c); 1853 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1831 } 1854 }
1832#endif 1855#endif
1833} 1856}
1834 1857
1835#if ENABLE_TRANSPARENCY || ENABLE_PERL 1858#if BG_IMAGE_FROM_ROOT || ENABLE_PERL
1836void 1859void ecb_hot
1837rxvt_term::rootwin_cb (XEvent &ev) 1860rxvt_term::rootwin_cb (XEvent &ev)
1838{ 1861{
1839 make_current (); 1862 make_current ();
1840 1863
1841 if (SHOULD_INVOKE (HOOK_ROOT_EVENT) 1864 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1842 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END))) 1865 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1843 return; 1866 return;
1844 1867
1845# if ENABLE_TRANSPARENCY
1846 switch (ev.type) 1868 switch (ev.type)
1847 { 1869 {
1848 case PropertyNotify: 1870 case PropertyNotify:
1849 /* 1871 /*
1850 * if user used some Esetroot compatible prog to set the root bg, 1872 * if user used some Esetroot compatible prog to set the root bg,
1851 * use the property to determine the pixmap. We use it later on. 1873 * use the property to determine the pixmap. We use it later on.
1852 */ 1874 */
1853 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID] 1875 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1854 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID]) 1876 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1855 { 1877 {
1856 bg_set_root_pixmap (); 1878#if BG_IMAGE_FROM_ROOT
1879 if (option (Opt_transparent))
1880 {
1881 rxvt_img::new_from_root (this)->replace (root_img);
1857 update_background (); 1882 update_background ();
1883 }
1884#endif
1885 HOOK_INVOKE ((this, HOOK_ROOTPMAP_CHANGE, DT_END));
1858 } 1886 }
1859 1887
1860 break; 1888 break;
1861 } 1889 }
1862# endif
1863 1890
1864 refresh_check (); 1891 refresh_check ();
1865} 1892}
1866#endif 1893#endif
1867 1894
… …
1890 iso14755_54 (ev.x, ev.y); 1917 iso14755_54 (ev.x, ev.y);
1891 return; 1918 return;
1892 } 1919 }
1893#endif 1920#endif
1894 1921
1895 clickintime = ev.time - MEvent.time < MULTICLICK_TIME; 1922 clickintime = ev.time - MEvent.time < multiClickTime;
1896 1923
1897 if (reportmode) 1924 if (reportmode)
1898 { 1925 {
1899 /* mouse report from vt window */ 1926 /* mouse report from vt window */
1900 /* save the xbutton state (for ButtonRelease) */ 1927 /* save the xbutton state (for ButtonRelease) */
… …
1991 if (scrollBar.upButton (ev.y)) 2018 if (scrollBar.upButton (ev.y))
1992 direction = UP; /* up */ 2019 direction = UP; /* up */
1993 else if (scrollBar.dnButton (ev.y)) 2020 else if (scrollBar.dnButton (ev.y))
1994 direction = DN; /* down */ 2021 direction = DN; /* down */
1995 2022
1996 scrollBar.state = STATE_IDLE; 2023 scrollBar.state = SB_STATE_IDLE;
1997 /* 2024 /*
1998 * Rxvt-style scrollbar: 2025 * Rxvt-style scrollbar:
1999 * move up if mouse is above slider 2026 * move up if mouse is above slider
2000 * move dn if mouse is below slider 2027 * move dn if mouse is below slider
2001 * 2028 *
… …
2040 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY); 2067 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2041#endif 2068#endif
2042 if (scr_page (direction, 1)) 2069 if (scr_page (direction, 1))
2043 { 2070 {
2044 if (direction == UP) 2071 if (direction == UP)
2045 scrollBar.state = STATE_UP; 2072 scrollBar.state = SB_STATE_UP;
2046 else 2073 else
2047 scrollBar.state = STATE_DOWN; 2074 scrollBar.state = SB_STATE_DOWN;
2048 } 2075 }
2049 } 2076 }
2050 else 2077 else
2051 switch (ev.button) 2078 switch (ev.button)
2052 { 2079 {
2053 case Button2: 2080 case Button2:
2054 switch (scrollBar.align) 2081 switch (scrollBar.align)
2055 { 2082 {
2056 case R_SB_ALIGN_TOP: 2083 case SB_ALIGN_TOP:
2057 csrO = 0; 2084 csrO = 0;
2058 break; 2085 break;
2059 case R_SB_ALIGN_CENTRE: 2086 case SB_ALIGN_CENTRE:
2060 csrO = (scrollBar.bot - scrollBar.top) / 2; 2087 csrO = (scrollBar.bot - scrollBar.top) / 2;
2061 break; 2088 break;
2062 case R_SB_ALIGN_BOTTOM: 2089 case SB_ALIGN_BOTTOM:
2063 csrO = scrollBar.bot - scrollBar.top; 2090 csrO = scrollBar.bot - scrollBar.top;
2064 break; 2091 break;
2065 } 2092 }
2066 2093
2067 if (scrollBar.style == R_SB_XTERM 2094 if (scrollBar.style == SB_STYLE_XTERM
2068 || scrollbar_above_slider (ev.y) 2095 || scrollBar.above_slider (ev.y)
2069 || scrollbar_below_slider (ev.y)) 2096 || scrollBar.below_slider (ev.y))
2070 scr_move_to (scrollbar_position (ev.y) - csrO, scrollBar.size ()); 2097 scr_move_to (scrollBar.position (ev.y) - csrO, scrollBar.size ());
2071 2098
2072 scrollBar.state = STATE_MOTION; 2099 scrollBar.state = SB_STATE_MOTION;
2073 break; 2100 break;
2074 2101
2075 case Button1: 2102 case Button1:
2076 if (scrollBar.align == R_SB_ALIGN_CENTRE) 2103 if (scrollBar.align == SB_ALIGN_CENTRE)
2077 csrO = ev.y - scrollBar.top; 2104 csrO = ev.y - scrollBar.top;
2078 /* FALLTHROUGH */ 2105 /* FALLTHROUGH */
2079 2106
2080 case Button3: 2107 case Button3:
2081 if (scrollBar.style != R_SB_XTERM) 2108 if (scrollBar.style != SB_STYLE_XTERM)
2082 { 2109 {
2083 if (scrollbar_above_slider (ev.y)) 2110 if (scrollBar.above_slider (ev.y))
2084# ifdef RXVT_SCROLL_FULL 2111# ifdef RXVT_SCROLL_FULL
2085 scr_page (UP, nrow - 1); 2112 scr_page (UP, nrow - 1);
2086# else 2113# else
2087 scr_page (UP, nrow / 4); 2114 scr_page (UP, nrow / 4);
2088# endif 2115# endif
2089 else if (scrollbar_below_slider (ev.y)) 2116 else if (scrollBar.below_slider (ev.y))
2090# ifdef RXVT_SCROLL_FULL 2117# ifdef RXVT_SCROLL_FULL
2091 scr_page (DN, nrow - 1); 2118 scr_page (DN, nrow - 1);
2092# else 2119# else
2093 scr_page (DN, nrow / 4); 2120 scr_page (DN, nrow / 4);
2094# endif 2121# endif
2095 else 2122 else
2096 scrollBar.state = STATE_MOTION; 2123 scrollBar.state = SB_STATE_MOTION;
2097 } 2124 }
2098 else 2125 else
2099 { 2126 {
2100 scr_page ((ev.button == Button1 ? DN : UP), 2127 scr_page ((ev.button == Button1 ? DN : UP),
2101 (nrow 2128 (nrow
2102 * scrollbar_position (ev.y) 2129 * scrollBar.position (ev.y)
2103 / scrollBar.size ())); 2130 / scrollBar.size ()));
2104 } 2131 }
2105 2132
2106 break; 2133 break;
2107 } 2134 }
… …
2118 2145
2119 csrO = 0; /* reset csr Offset */ 2146 csrO = 0; /* reset csr Offset */
2120 if (!bypass_keystate) 2147 if (!bypass_keystate)
2121 reportmode = !! (priv_modes & PrivMode_mouse_report); 2148 reportmode = !! (priv_modes & PrivMode_mouse_report);
2122 2149
2123 if (scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN) 2150 if (scrollBar.state == SB_STATE_UP || scrollBar.state == SB_STATE_DOWN)
2124 { 2151 {
2125 scrollBar.state = STATE_IDLE; 2152 scrollBar.state = SB_STATE_IDLE;
2126 scrollBar.show (0); 2153 scrollBar.show (0);
2127 } 2154 }
2128 2155
2129#ifdef SELECTION_SCROLLING 2156#ifdef SELECTION_SCROLLING
2130 sel_scroll_ev.stop(); 2157 sel_scroll_ev.stop();
… …
2150#ifdef MOUSE_REPORT_DOUBLECLICK 2177#ifdef MOUSE_REPORT_DOUBLECLICK
2151 /* only report the release of 'slow' single clicks */ 2178 /* only report the release of 'slow' single clicks */
2152 if (MEvent.button != AnyButton 2179 if (MEvent.button != AnyButton
2153 && (ev.button != MEvent.button 2180 && (ev.button != MEvent.button
2154 || (ev.time - MEvent.time 2181 || (ev.time - MEvent.time
2155 > MULTICLICK_TIME / 2))) 2182 > multiClickTime / 2)))
2156 { 2183 {
2157 MEvent.clicks = 0; 2184 MEvent.clicks = 0;
2158 MEvent.button = AnyButton; 2185 MEvent.button = AnyButton;
2159 mouse_report (ev); 2186 mouse_report (ev);
2160 } 2187 }
… …
2180 case Button3: 2207 case Button3:
2181 selection_make (ev.time); 2208 selection_make (ev.time);
2182 break; 2209 break;
2183 2210
2184 case Button2: 2211 case Button2:
2185 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window? 2212 if (IN_RANGE_EXC (ev.x, 0, vt_width) && IN_RANGE_EXC (ev.y, 0, vt_height)) // inside window?
2186 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary); 2213 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2187 break; 2214 break;
2188 2215
2189#ifdef MOUSE_WHEEL 2216#ifdef MOUSE_WHEEL
2190 case Button4: 2217 case Button4:
2191 case Button5: 2218 case Button5:
2192 { 2219 {
2193 int i; 2220 int lines;
2194 page_dirn v; 2221 page_dirn dirn;
2195 2222
2196 v = ev.button == Button4 ? UP : DN; 2223 dirn = ev.button == Button4 ? UP : DN;
2197 2224
2198 if (ev.state & ShiftMask) 2225 if (ev.state & ShiftMask)
2199 i = 1; 2226 lines = 1;
2200 else if (option (Opt_mouseWheelScrollPage)) 2227 else if (option (Opt_mouseWheelScrollPage))
2201 i = nrow - 1; 2228 lines = nrow - 1;
2202 else 2229 else
2203 i = 5; 2230 lines = 5;
2204 2231
2205# ifdef MOUSE_SLIP_WHEELING 2232# ifdef MOUSE_SLIP_WHEELING
2206 if (ev.state & ControlMask) 2233 if (ev.state & ControlMask)
2207 { 2234 {
2208 mouse_slip_wheel_speed += v ? -1 : 1; 2235 mouse_slip_wheel_speed += dirn;
2209 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow; 2236 clamp_it (mouse_slip_wheel_speed, -nrow, nrow);
2210 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2211 2237
2212 if (!slip_wheel_ev.is_active ()) 2238 if (!slip_wheel_ev.is_active ())
2213 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY); 2239 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2214 } 2240 }
2215 else 2241 else
2216# endif 2242# endif
2217 { 2243 {
2218 scr_page (v, i); 2244 scr_page (dirn, lines);
2219 scrollBar.show (1); 2245 scrollBar.show (1);
2220 } 2246 }
2221 } 2247 }
2222 break; 2248 break;
2223#endif 2249#endif
… …
2225 } 2251 }
2226} 2252}
2227 2253
2228/*}}} */ 2254/*}}} */
2229 2255
2230void 2256void ecb_hot
2231rxvt_term::cmd_parse () 2257rxvt_term::cmd_parse ()
2232{ 2258{
2233 wchar_t ch = NOCHAR; 2259 wchar_t ch = NOCHAR;
2234 char *seq_begin; // remember start of esc-sequence here 2260 char *seq_begin; // remember start of esc-sequence here
2235 2261
2236 for (;;) 2262 for (;;)
2237 { 2263 {
2238 if (expect_false (ch == NOCHAR)) 2264 if (ecb_unlikely (ch == NOCHAR))
2239 { 2265 {
2240 seq_begin = cmdbuf_ptr; 2266 seq_begin = cmdbuf_ptr;
2241 ch = next_char (); 2267 ch = next_char ();
2242 2268
2243 if (ch == NOCHAR) 2269 if (ch == NOCHAR)
2244 break; 2270 break;
2245 } 2271 }
2246 2272
2247 if (expect_true (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)) 2273 if (ecb_likely (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT))
2248 { 2274 {
2249 if (expect_false (!seen_input)) 2275 if (ecb_unlikely (!seen_input))
2250 { 2276 {
2251 seen_input = 1; 2277 seen_input = 1;
2252 // many badly-written programs (e.g. jed) contain a race condition: 2278 // many badly-written programs (e.g. jed) contain a race condition:
2253 // they first read the screensize and then install a SIGWINCH handler. 2279 // they first read the screensize and then install a SIGWINCH handler.
2254 // some window managers resize the window early, and these programs 2280 // some window managers resize the window early, and these programs
… …
2267 wchar_t *str = buf; 2293 wchar_t *str = buf;
2268 wchar_t *eol = str + min (ncol, UBUFSIZ); 2294 wchar_t *eol = str + min (ncol, UBUFSIZ);
2269 2295
2270 for (;;) 2296 for (;;)
2271 { 2297 {
2272 if (expect_false (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))) 2298 if (ecb_unlikely (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)))
2273 break; 2299 break;
2274 2300
2275 *str++ = ch; 2301 *str++ = ch;
2276 2302
2277 if (expect_false (ch == C0_LF || str >= eol)) 2303 if (ecb_unlikely (ch == C0_LF || str >= eol))
2278 { 2304 {
2279 if (ch == C0_LF) 2305 if (ch == C0_LF)
2280 nlines++; 2306 nlines++;
2281 2307
2282 refresh_count++; 2308 refresh_count++;
… …
2354 } 2380 }
2355 } 2381 }
2356} 2382}
2357 2383
2358// read the next character 2384// read the next character
2359wchar_t 2385wchar_t ecb_hot
2360rxvt_term::next_char () NOTHROW 2386rxvt_term::next_char () NOTHROW
2361{ 2387{
2362 while (cmdbuf_ptr < cmdbuf_endp) 2388 while (cmdbuf_ptr < cmdbuf_endp)
2363 { 2389 {
2364 // assume 7-bit to be ascii ALWAYS 2390 // assume 7-bit to be ascii ALWAYS
2365 if (expect_true ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)) 2391 if (ecb_likely ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b))
2366 return *cmdbuf_ptr++; 2392 return *cmdbuf_ptr++;
2367 2393
2368 wchar_t wc; 2394 wchar_t wc;
2369 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2395 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2370 2396
… …
2376 } 2402 }
2377 2403
2378 if (len == (size_t)-1) 2404 if (len == (size_t)-1)
2379 { 2405 {
2380 mbstate.reset (); // reset now undefined conversion state 2406 mbstate.reset (); // reset now undefined conversion state
2407 // a -1 might indicate that a previous incomplete char is invalid (previous return -2)
2408 // in which case we "erroneously" return the next byte which might be valid.
2381 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2409 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2382 } 2410 }
2383 2411
2384 // assume wchar == unicode 2412 // assume wchar == unicode
2385 cmdbuf_ptr += len; 2413 cmdbuf_ptr += len;
… …
2388 2416
2389 return NOCHAR; 2417 return NOCHAR;
2390} 2418}
2391 2419
2392// read the next octet 2420// read the next octet
2393uint32_t 2421uint32_t ecb_hot
2394rxvt_term::next_octet () NOTHROW 2422rxvt_term::next_octet () NOTHROW
2395{ 2423{
2396 return cmdbuf_ptr < cmdbuf_endp 2424 return cmdbuf_ptr < cmdbuf_endp
2397 ? (unsigned char)*cmdbuf_ptr++ 2425 ? (unsigned char)*cmdbuf_ptr++
2398 : NOCHAR; 2426 : NOCHAR;
2399} 2427}
2400 2428
2401static class out_of_input out_of_input; 2429static class out_of_input out_of_input;
2402 2430
2403/* rxvt_cmd_getc () - Return next input character */ 2431wchar_t ecb_hot
2404/*
2405 * Return the next input character after first passing any keyboard input
2406 * to the command.
2407 */
2408wchar_t
2409rxvt_term::cmd_getc () THROW ((class out_of_input)) 2432rxvt_term::cmd_getc () THROW ((class out_of_input))
2410{ 2433{
2411 wchar_t c = next_char (); 2434 wchar_t c = next_char ();
2412 2435
2413 if (c == NOCHAR) 2436 if (c == NOCHAR)
2414 throw out_of_input; 2437 throw out_of_input;
2415 2438
2416 return c; 2439 return c;
2417} 2440}
2418 2441
2419uint32_t 2442uint32_t ecb_hot
2420rxvt_term::cmd_get8 () THROW ((class out_of_input)) 2443rxvt_term::cmd_get8 () THROW ((class out_of_input))
2421{ 2444{
2422 uint32_t c = next_octet (); 2445 uint32_t c = next_octet ();
2423 2446
2424 if (c == NOCHAR) 2447 if (c == NOCHAR)
… …
2428} 2451}
2429 2452
2430/*{{{ print pipe */ 2453/*{{{ print pipe */
2431/*----------------------------------------------------------------------*/ 2454/*----------------------------------------------------------------------*/
2432#ifdef PRINTPIPE 2455#ifdef PRINTPIPE
2433FILE * 2456FILE * ecb_cold
2434rxvt_term::popen_printer () 2457rxvt_term::popen_printer ()
2435{ 2458{
2436 FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w"); 2459 FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");
2437 2460
2438 if (stream == NULL) 2461 if (stream == NULL)
2439 rxvt_warn ("can't open printer pipe, not printing.\n"); 2462 rxvt_warn ("can't open printer pipe, not printing.\n");
2440 2463
2441 return stream; 2464 return stream;
2442} 2465}
2443 2466
2444int 2467int ecb_cold
2445rxvt_term::pclose_printer (FILE *stream) 2468rxvt_term::pclose_printer (FILE *stream)
2446{ 2469{
2447 fflush (stream); 2470 fflush (stream);
2448 return pclose (stream); 2471 return pclose (stream);
2449} 2472}
2450 2473
2451/* 2474/*
2452 * simulate attached vt100 printer 2475 * simulate attached vt100 printer
2453 */ 2476 */
2454void 2477void ecb_cold
2455rxvt_term::process_print_pipe () 2478rxvt_term::process_print_pipe ()
2456{ 2479{
2457 FILE *fd = popen_printer (); 2480 FILE *fd = popen_printer ();
2458 2481
2459 if (!fd) 2482 if (!fd)
… …
2505 pclose_printer (fd); 2528 pclose_printer (fd);
2506} 2529}
2507#endif /* PRINTPIPE */ 2530#endif /* PRINTPIPE */
2508/*}}} */ 2531/*}}} */
2509 2532
2510/* *INDENT-OFF* */
2511enum { 2533enum {
2512 C1_40 = 0x40, 2534 C1_40 = 0x40,
2513 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA, 2535 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA,
2514 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3, 2536 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3,
2515 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA, 2537 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA,
2516 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC, 2538 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC,
2517}; 2539};
2518/* *INDENT-ON* */
2519 2540
2520/*{{{ process non-printing single characters */ 2541/*{{{ process non-printing single characters */
2521void 2542void ecb_hot
2522rxvt_term::process_nonprinting (unicode_t ch) 2543rxvt_term::process_nonprinting (unicode_t ch)
2523{ 2544{
2524 switch (ch) 2545 switch (ch)
2525 { 2546 {
2526 case C0_ESC: 2547 case C0_ESC:
… …
2556 scr_charset_choose (0); 2577 scr_charset_choose (0);
2557 break; 2578 break;
2558 2579
2559#ifdef EIGHT_BIT_CONTROLS 2580#ifdef EIGHT_BIT_CONTROLS
2560 // 8-bit controls 2581 // 8-bit controls
2561 case 0x90: /* DCS */ 2582 case 0x90: /* DCS */
2562 process_dcs_seq (); 2583 process_dcs_seq ();
2563 break; 2584 break;
2564 case 0x9b: /* CSI */ 2585 case 0x9b: /* CSI */
2565 process_csi_seq (); 2586 process_csi_seq ();
2566 break; 2587 break;
2567 case 0x9d: /* OSC */ 2588 case 0x9d: /* OSC */
2568 process_osc_seq (); 2589 process_osc_seq ();
2569 break; 2590 break;
2570#endif 2591#endif
2571 } 2592 }
2572} 2593}
2573/*}}} */ 2594/*}}} */
2574 2595
2575 2596
2576/*{{{ process VT52 escape sequences */ 2597/*{{{ process VT52 escape sequences */
2577void 2598void ecb_cold
2578rxvt_term::process_escape_vt52 (unicode_t ch) 2599rxvt_term::process_escape_vt52 (unicode_t ch)
2579{ 2600{
2580 int row, col; 2601 int row, col;
2581 2602
2582 switch (ch) 2603 switch (ch)
… …
2616 break; 2637 break;
2617 case 'Z': /* identify the terminal type */ 2638 case 'Z': /* identify the terminal type */
2618 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */ 2639 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
2619 break; 2640 break;
2620 case '<': /* turn off VT52 mode */ 2641 case '<': /* turn off VT52 mode */
2621 set_privmode (PrivMode_vt52, 0); 2642 priv_modes &= ~PrivMode_vt52;
2622 break; 2643 break;
2623 case 'F': /* use special graphics character set */ 2644 case 'F': /* use special graphics character set */
2624 case 'G': /* use regular character set */ 2645 case 'G': /* use regular character set */
2625 /* unimplemented */ 2646 /* unimplemented */
2626 break; 2647 break;
… …
2632} 2653}
2633/*}}} */ 2654/*}}} */
2634 2655
2635 2656
2636/*{{{ process escape sequences */ 2657/*{{{ process escape sequences */
2637void 2658void ecb_hot
2638rxvt_term::process_escape_seq () 2659rxvt_term::process_escape_seq ()
2639{ 2660{
2640 unicode_t ch = cmd_getc (); 2661 unicode_t ch = cmd_getc ();
2641 2662
2642 if (priv_modes & PrivMode_vt52) 2663 if (priv_modes & PrivMode_vt52)
… …
2645 return; 2666 return;
2646 } 2667 }
2647 2668
2648 switch (ch) 2669 switch (ch)
2649 { 2670 {
2650 /* case 1: do_tek_mode (); break; */
2651 case '#': 2671 case '#':
2652 if (cmd_getc () == '8') 2672 if (cmd_getc () == '8')
2653 scr_E (); 2673 scr_E ();
2654 break; 2674 break;
2655 case '(': 2675 case '(':
… …
2678#if !ENABLE_MINIMAL 2698#if !ENABLE_MINIMAL
2679 case '9': 2699 case '9':
2680 scr_forwardindex (); 2700 scr_forwardindex ();
2681 break; 2701 break;
2682#endif 2702#endif
2703 // DECPAM/DECPNM
2683 case '=': 2704 case '=':
2705 priv_modes |= PrivMode_aplKP;
2706 break;
2684 case '>': 2707 case '>':
2685 set_privmode (PrivMode_aplKP, ch == '='); 2708 priv_modes &= ~PrivMode_aplKP;
2686 break; 2709 break;
2687 2710
2688 case C1_40: 2711 case C1_40:
2689 cmd_getc (); 2712 cmd_getc ();
2690 break; 2713 break;
… …
2694 2717
2695 /* 8.3.87: NEXT LINE */ 2718 /* 8.3.87: NEXT LINE */
2696 case C1_NEL: /* ESC E */ 2719 case C1_NEL: /* ESC E */
2697 { 2720 {
2698 wchar_t nlcr[] = { C0_LF, C0_CR }; 2721 wchar_t nlcr[] = { C0_LF, C0_CR };
2699 scr_add_lines (nlcr, ARRAY_LENGTH(nlcr), 1); 2722 scr_add_lines (nlcr, ecb_array_length (nlcr), 1);
2700 } 2723 }
2701 break; 2724 break;
2702 2725
2703 /* kidnapped escape sequence: Should be 8.3.48 */ 2726 /* kidnapped escape sequence: Should be 8.3.48 */
2704 case C1_ESA: /* ESC G */ 2727 case C1_ESA: /* ESC G */
2705 process_graphics (); 2728 // used by original rxvt for rob nations own graphics mode
2729 if (cmd_getc () == 'Q')
2730 tt_printf ("\033G0\012"); /* query graphics - no graphics */
2706 break; 2731 break;
2707 2732
2708 /* 8.3.63: CHARACTER TABULATION SET */ 2733 /* 8.3.63: CHARACTER TABULATION SET */
2709 case C1_HTS: /* ESC H */ 2734 case C1_HTS: /* ESC H */
2710 scr_set_tab (1); 2735 scr_set_tab (1);
… …
2714 case C1_RI: /* ESC M */ 2739 case C1_RI: /* ESC M */
2715 scr_index (DN); 2740 scr_index (DN);
2716 break; 2741 break;
2717 2742
2718 /* 8.3.142: SINGLE-SHIFT TWO */ 2743 /* 8.3.142: SINGLE-SHIFT TWO */
2719 /*case C1_SS2: scr_single_shift (2); break; */ 2744 /* case C1_SS2: break; */
2720 2745
2721 /* 8.3.143: SINGLE-SHIFT THREE */ 2746 /* 8.3.143: SINGLE-SHIFT THREE */
2722 /*case C1_SS3: scr_single_shift (3); break; */ 2747 /* case C1_SS3: break; */
2723 2748
2724 /* 8.3.27: DEVICE CONTROL STRING */ 2749 /* 8.3.27: DEVICE CONTROL STRING */
2725 case C1_DCS: /* ESC P */ 2750 case C1_DCS: /* ESC P */
2726 process_dcs_seq (); 2751 process_dcs_seq ();
2727 break; 2752 break;
… …
2760 } 2785 }
2761} 2786}
2762/*}}} */ 2787/*}}} */
2763 2788
2764/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */ 2789/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */
2765/* *INDENT-OFF* */
2766enum { 2790enum {
2767 CSI_ICH = 0x40, 2791 CSI_ICH = 0x40,
2768 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA, 2792 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA,
2769 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA , 2793 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA ,
2770 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC, 2794 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC,
… …
2790 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */ 2814 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */
2791 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */ 2815 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */
2792 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */ 2816 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */
2793 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */ 2817 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */
2794 }; 2818 };
2795/* *INDENT-ON* */
2796 2819
2797void 2820void ecb_hot
2798rxvt_term::process_csi_seq () 2821rxvt_term::process_csi_seq ()
2799{ 2822{
2800 unicode_t ch, priv, i; 2823 unicode_t ch, priv, prev_ch, i;
2801 unsigned int nargs, p; 2824 unsigned int nargs, p;
2802 int n, ndef; 2825 int n, ndef;
2803 int arg[ESC_ARGS] = { }; 2826 int arg[ESC_ARGS] = { };
2804 2827
2805 nargs = 0; 2828 nargs = 0;
… …
2811 /* '<' '=' '>' '?' '!' */ 2834 /* '<' '=' '>' '?' '!' */
2812 priv = ch; 2835 priv = ch;
2813 ch = cmd_getc (); 2836 ch = cmd_getc ();
2814 } 2837 }
2815 2838
2839 prev_ch = 0;
2816 /* read any numerical arguments */ 2840 /* read any numerical arguments */
2817 for (n = -1; ch < CSI_ICH; ) 2841 for (n = -1; ch < CSI_ICH; )
2818 { 2842 {
2819 if (isdigit (ch)) 2843 if (isdigit (ch))
2820 { 2844 {
… …
2830 n = -1; 2854 n = -1;
2831 } 2855 }
2832 else if (IS_CONTROL (ch)) 2856 else if (IS_CONTROL (ch))
2833 process_nonprinting (ch); 2857 process_nonprinting (ch);
2834 2858
2859 prev_ch = ch;
2835 ch = cmd_getc (); 2860 ch = cmd_getc ();
2836 } 2861 }
2837 2862
2838 if (ch > CSI_7F) 2863 if (ch > CSI_7F)
2839 return; 2864 return;
… …
2880 scr_soft_reset (); 2905 scr_soft_reset ();
2881 2906
2882 static const int pm_h[] = { 7, 25 }; 2907 static const int pm_h[] = { 7, 25 };
2883 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1005, 1015, 1049 }; 2908 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1005, 1015, 1049 };
2884 2909
2885 process_terminal_mode ('h', 0, ARRAY_LENGTH(pm_h), pm_h); 2910 process_terminal_mode ('h', 0, ecb_array_length (pm_h), pm_h);
2886 process_terminal_mode ('l', 0, ARRAY_LENGTH(pm_l), pm_l); 2911 process_terminal_mode ('l', 0, ecb_array_length (pm_l), pm_l);
2887 } 2912 }
2888 break; 2913 break;
2889 } 2914 }
2890 2915
2891 return; 2916 return;
… …
2909 } 2934 }
2910 break; 2935 break;
2911#endif 2936#endif
2912 2937
2913 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */ 2938 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */
2914 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */ 2939 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */
2915 arg[0] = -arg[0]; 2940 arg[0] = -arg[0];
2916 /* FALLTHROUGH */ 2941 /* FALLTHROUGH */
2917 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */ 2942 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */
2918 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */ 2943 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */
2919 scr_gotorc (arg[0], 0, RELATIVE); 2944 scr_gotorc (arg[0], 0, RELATIVE);
2920 break; 2945 break;
2921 2946
2922 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */ 2947 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */
2923 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */ 2948 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */
… …
3073 scr_insert_mode (1); 3098 scr_insert_mode (1);
3074 else if (arg[0] == 20) 3099 else if (arg[0] == 20)
3075 priv_modes |= PrivMode_LFNL; 3100 priv_modes |= PrivMode_LFNL;
3076 break; 3101 break;
3077 3102
3103 case CSI_71: // DECSCUSR: set cursor style
3104 if (prev_ch == ' ')
3105 set_cursor_style (arg[0]);
3106 break;
3107
3078 /* 3108 /*
3079 * PRIVATE USE beyond this point. All CSI_7? sequences here 3109 * PRIVATE USE beyond this point. All CSI_7? sequences here
3080 */ 3110 */
3081 case CSI_72: /* DECSTBM: set top and bottom margins */ 3111 case CSI_72: /* DECSTBM: set top and bottom margins */
3082 if (nargs == 1) 3112 if (nargs == 1)
… …
3110 } 3140 }
3111} 3141}
3112/*}}} */ 3142/*}}} */
3113 3143
3114#if !ENABLE_MINIMAL 3144#if !ENABLE_MINIMAL
3115/* ARGSUSED */
3116void 3145void
3117rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3146rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3118{ 3147{
3119 int x, y; 3148 int x, y;
3120 XWindowAttributes wattr; 3149 XWindowAttributes wattr;
… …
3129 { 3158 {
3130 /* 3159 /*
3131 * commands 3160 * commands
3132 */ 3161 */
3133 case 1: /* deiconify window */ 3162 case 1: /* deiconify window */
3134 XMapWindow (dpy, parent[0]); 3163 XMapWindow (dpy, parent);
3135 break; 3164 break;
3136 case 2: /* iconify window */ 3165 case 2: /* iconify window */
3137 XIconifyWindow (dpy, parent[0], display->screen); 3166 XIconifyWindow (dpy, parent, display->screen);
3138 break; 3167 break;
3139 case 3: /* set position (pixels) */ 3168 case 3: /* set position (pixels) */
3140 XMoveWindow (dpy, parent[0], args[1], args[2]); 3169 XMoveWindow (dpy, parent, args[1], args[2]);
3141 break; 3170 break;
3142 case 4: /* set size (pixels) */ 3171 case 4: /* set size (pixels) */
3143 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3172 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3144 break; 3173 break;
3145 case 5: /* raise window */ 3174 case 5: /* raise window */
3146 XRaiseWindow (dpy, parent[0]); 3175 XRaiseWindow (dpy, parent);
3147 break; 3176 break;
3148 case 6: /* lower window */ 3177 case 6: /* lower window */
3149 XLowerWindow (dpy, parent[0]); 3178 XLowerWindow (dpy, parent);
3150 break; 3179 break;
3151 case 7: /* refresh window */ 3180 case 7: /* refresh window */
3152 scr_touch (true); 3181 scr_touch (true);
3153 break; 3182 break;
3154 case 8: /* set size (chars) */ 3183 case 8: /* set size (chars) */
… …
3157 break; 3186 break;
3158 3187
3159 //case 9: NYI, TODO, restore maximized window or maximize window 3188 //case 9: NYI, TODO, restore maximized window or maximize window
3160 default: 3189 default:
3161 if (args[0] >= 24) /* set height (chars) */ 3190 if (args[0] >= 24) /* set height (chars) */
3162 set_widthheight ((unsigned int)width, 3191 set_widthheight ((unsigned int)vt_width,
3163 (unsigned int) (args[1] * fheight)); 3192 (unsigned int) (args[1] * fheight));
3164 break; 3193 break;
3165 3194
3166 /* 3195 /*
3167 * reports - some output format copied from XTerm 3196 * reports - some output format copied from XTerm
3168 */ 3197 */
3169 case 11: /* report window state */ 3198 case 11: /* report window state */
3170 XGetWindowAttributes (dpy, parent[0], &wattr); 3199 XGetWindowAttributes (dpy, parent, &wattr);
3171 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3200 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3172 break; 3201 break;
3173 case 13: /* report window position */ 3202 case 13: /* report window position */
3174 XGetWindowAttributes (dpy, parent[0], &wattr); 3203 XGetWindowAttributes (dpy, parent, &wattr);
3175 XTranslateCoordinates (dpy, parent[0], wattr.root, 3204 XTranslateCoordinates (dpy, parent, wattr.root,
3176 -wattr.border_width, -wattr.border_width, 3205 -wattr.border_width, -wattr.border_width,
3177 &x, &y, &wdummy); 3206 &x, &y, &wdummy);
3178 tt_printf ("\033[3;%d;%dt", x, y); 3207 tt_printf ("\033[3;%d;%dt", x, y);
3179 break; 3208 break;
3180 case 14: /* report window size (pixels) */ 3209 case 14: /* report window size (pixels) */
3181 XGetWindowAttributes (dpy, parent[0], &wattr); 3210 XGetWindowAttributes (dpy, parent, &wattr);
3182 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3211 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3183 break; 3212 break;
3184 case 18: /* report text area size (chars) */ 3213 case 18: /* report text area size (chars) */
3185 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3214 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3186 break; 3215 break;
… …
3188 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3217 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3189 break; 3218 break;
3190 case 20: /* report icon label */ 3219 case 20: /* report icon label */
3191 { 3220 {
3192 char *s; 3221 char *s;
3193 XGetIconName (dpy, parent[0], &s); 3222 XGetIconName (dpy, parent, &s);
3194 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3223 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3195 XFree (s); 3224 XFree (s);
3196 } 3225 }
3197 break; 3226 break;
3198 case 21: /* report window title */ 3227 case 21: /* report window title */
3199 { 3228 {
3200 char *s; 3229 char *s;
3201 XFetchName (dpy, parent[0], &s); 3230 XFetchName (dpy, parent, &s);
3202 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3231 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3203 XFree (s); 3232 XFree (s);
3204 } 3233 }
3205 break; 3234 break;
3206 } 3235 }
… …
3216rxvt_term::get_to_st (unicode_t &ends_how) 3245rxvt_term::get_to_st (unicode_t &ends_how)
3217{ 3246{
3218 unicode_t ch; 3247 unicode_t ch;
3219 bool seen_esc = false; 3248 bool seen_esc = false;
3220 unsigned int n = 0; 3249 unsigned int n = 0;
3221 wchar_t string[STRING_MAX]; 3250 wchar_t string[CBUFSIZ];
3222 3251
3223 while ((ch = cmd_getc ()) != NOCHAR) 3252 while ((ch = cmd_getc ()) != NOCHAR)
3224 { 3253 {
3225 if (seen_esc) 3254 if (seen_esc)
3226 { 3255 {
… …
3241 else if (ch < 0x20) 3270 else if (ch < 0x20)
3242 return NULL; /* other control character - exit */ 3271 return NULL; /* other control character - exit */
3243 3272
3244 seen_esc = false; 3273 seen_esc = false;
3245 3274
3246 if (n >= STRING_MAX - 1) 3275 if (n >= sizeof (string) - 1)
3247 // stop at some sane length 3276 // stop at some sane length
3248 return NULL; 3277 return NULL;
3249 3278
3250 string[n++] = ch; 3279 string[n++] = ch;
3251 } 3280 }
… …
3360 unsigned long bytes_after; 3389 unsigned long bytes_after;
3361 unsigned char *value = 0; 3390 unsigned char *value = 0;
3362 const char *str = ""; 3391 const char *str = "";
3363 3392
3364 if (prop 3393 if (prop
3365 && XGetWindowProperty (dpy, parent[0], 3394 && XGetWindowProperty (dpy, parent,
3366 prop, 0, 1<<16, 0, AnyPropertyType, 3395 prop, 0, 1<<16, 0, AnyPropertyType,
3367 &actual_type, &actual_format, 3396 &actual_type, &actual_format,
3368 &nitems, &bytes_after, &value) == Success 3397 &nitems, &bytes_after, &value) == Success
3369 && actual_type != None 3398 && actual_type != None
3370 && actual_format == 8) 3399 && actual_format == 8)
3371 str = (const char *)(value); 3400 str = (const char *)(value);
3372 3401
3373 tt_printf ("\033]%d;%s%c", op, str, resp); 3402 tt_printf ("\033]%d;%s%c", op, option (Opt_insecure) ? str : "", resp);
3374 3403
3375 XFree (value); 3404 XFree (value);
3376 } 3405 }
3377 else 3406 else
3378 { 3407 {
… …
3382 { 3411 {
3383 *eq = 0; 3412 *eq = 0;
3384 set_utf8_property (display->atom (str), eq + 1); 3413 set_utf8_property (display->atom (str), eq + 1);
3385 } 3414 }
3386 else 3415 else
3387 XDeleteProperty (dpy, parent[0], 3416 XDeleteProperty (dpy, parent,
3388 display->atom (str)); 3417 display->atom (str));
3389 } 3418 }
3390 break; 3419 break;
3391 3420
3392 case XTerm_Color: 3421 case XTerm_Color:
… …
3446 break; 3475 break;
3447#endif 3476#endif
3448 case URxvt_Color_border: 3477 case URxvt_Color_border:
3449 process_color_seq (op, Color_border, str, resp); 3478 process_color_seq (op, Color_border, str, resp);
3450 break; 3479 break;
3451#if ENABLE_TRANSPARENCY 3480
3481#if BG_IMAGE_FROM_ROOT
3452 case URxvt_Color_tint: 3482 case URxvt_Color_tint:
3453 process_color_seq (op, Color_tint, str, resp); 3483 process_color_seq (op, Color_tint, str, resp);
3454 { 3484 {
3455 bool changed = false; 3485 bool changed = false;
3456 3486
3457 if (ISSET_PIXCOLOR (Color_tint)) 3487 if (ISSET_PIXCOLOR (Color_tint))
3458 changed = bg_set_tint (pix_colors_focused [Color_tint]); 3488 changed = root_effects.set_tint (pix_colors_focused [Color_tint]);
3459 3489
3460 if (changed) 3490 if (changed)
3461 update_background (); 3491 update_background ();
3462 } 3492 }
3463 3493
… …
3467#if BG_IMAGE_FROM_FILE 3497#if BG_IMAGE_FROM_FILE
3468 case Rxvt_Pixmap: 3498 case Rxvt_Pixmap:
3469 if (!strcmp (str, "?")) 3499 if (!strcmp (str, "?"))
3470 { 3500 {
3471 char str[256]; 3501 char str[256];
3502 int h_scale = fimage.h_scale;
3503 int v_scale = fimage.v_scale;
3504 int h_align = fimage.h_align;
3505 int v_align = fimage.v_align;
3472 3506
3473 sprintf (str, "[%dx%d+%d+%d]", 3507 sprintf (str, "[%dx%d+%d+%d]",
3474 min (h_scale, 32767), min (v_scale, 32767), 3508 h_scale, v_scale,
3475 min (h_align, 32767), min (v_align, 32767)); 3509 h_align, v_align);
3476 process_xterm_seq (XTerm_title, str, CHAR_ST); 3510 process_xterm_seq (XTerm_title, str, CHAR_ST);
3477 } 3511 }
3478 else 3512 else
3479 { 3513 {
3480 int changed = 0; 3514 bool changed = false;
3481 3515
3482 if (*str != ';') 3516 if (*str != ';')
3483 { 3517 {
3484 if (bg_set_file (str)) /* change pixmap */ 3518 try
3485 { 3519 {
3520 fimage.set_file_geometry (this, str);
3486 changed++; 3521 changed = true;
3487 str = strchr (str, ';');
3488 if (str == NULL)
3489 bg_set_default_geometry ();
3490 else 3522 }
3491 bg_set_geometry (str+1); 3523 catch (const class rxvt_failure_exception &e)
3524 {
3492 } 3525 }
3493 } 3526 }
3494 else 3527 else
3495 { 3528 {
3496 str++; 3529 str++;
3497 if (bg_set_geometry (str, true)) 3530 if (fimage.set_geometry (str, true))
3498 changed++; 3531 changed = true;
3499 } 3532 }
3500 3533
3501 if (changed) 3534 if (changed)
3502 { 3535 {
3503 if (bg_window_position_sensitive ()) 3536 if (bg_window_position_sensitive ())
3504 { 3537 {
3505 int x, y; 3538 int x, y;
3506 get_window_origin (x, y); 3539 get_window_origin (x, y);
3507 bg_set_position (x, y); 3540 parent_x = x;
3541 parent_y = y;
3508 } 3542 }
3509 update_background (); 3543 update_background ();
3510 } 3544 }
3511 } 3545 }
3512 break; 3546 break;
… …
3602 * 's' = save 3636 * 's' = save
3603 * 'r' = restore 3637 * 'r' = restore
3604 * 't' = toggle 3638 * 't' = toggle
3605 * so no need for fancy checking 3639 * so no need for fancy checking
3606 */ 3640 */
3607int 3641int ecb_cold
3608rxvt_term::privcases (int mode, unsigned long bit) 3642rxvt_term::privcases (int mode, unsigned long bit)
3609{ 3643{
3610 int state; 3644 int state;
3611 3645
3612 if (mode == 's') 3646 if (mode == 's')
3613 { 3647 {
3614 SavedModes |= (priv_modes & bit); 3648 if (priv_modes & bit)
3649 SavedModes |= bit;
3650 else
3651 SavedModes &= ~bit;
3615 return -1; 3652 return -1;
3616 } 3653 }
3617 else 3654 else
3618 { 3655 {
3619 if (mode == 'r') 3656 if (mode == 'r')
3620 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3657 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3621 else 3658 else
3622 state = (mode == 't') ? ! (priv_modes & bit) : mode; 3659 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3623 3660
3624 set_privmode (bit, state); 3661 if (state)
3662 priv_modes |= bit;
3663 else
3664 priv_modes &= ~bit;
3625 } 3665 }
3626 3666
3627 return state; 3667 return state;
3628} 3668}
3629 3669
3630/* we're not using priv _yet_ */ 3670/* we're not using priv _yet_ */
3631void 3671void
3632rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg) 3672rxvt_term::process_terminal_mode (int mode, int priv ecb_unused, unsigned int nargs, const int *arg)
3633{ 3673{
3634 unsigned int i, j; 3674 unsigned int i, j;
3635 int state; 3675 int state;
3636 3676
3637 static const struct 3677 static const struct
3638 { 3678 {
3639 const int argval; 3679 const int argval;
3640 const unsigned long bit; 3680 const unsigned long bit;
3641 } argtopriv[] = { 3681 } argtopriv[] = {
3642 { 1, PrivMode_aplCUR }, // DECCKM 3682 { 1, PrivMode_aplCUR }, // DECCKM
3643 { 2, PrivMode_vt52 }, 3683 { 2, PrivMode_vt52 }, // DECANM
3644 { 3, PrivMode_132 }, // DECCOLM 3684 { 3, PrivMode_132 }, // DECCOLM
3645 { 4, PrivMode_smoothScroll }, // DECSCLM 3685 { 4, PrivMode_smoothScroll }, // DECSCLM
3646 { 5, PrivMode_rVideo }, // DECSCNM 3686 { 5, PrivMode_rVideo }, // DECSCNM
3647 { 6, PrivMode_relOrigin }, // DECOM 3687 { 6, PrivMode_relOrigin }, // DECOM
3648 { 7, PrivMode_Autowrap }, // DECAWM 3688 { 7, PrivMode_Autowrap }, // DECAWM
3649 // 8, auto-repeat keys // DECARM 3689 // 8, auto-repeat keys // DECARM
3650 { 9, PrivMode_MouseX10 }, 3690 { 9, PrivMode_MouseX10 },
3691 { 12, PrivMode_BlinkingCursor },
3651 // 18 end FF to printer after print screen 3692 // 18 end FF to printer after print screen
3652 // 19 Print screen prints full screen/scroll region 3693 // 19 Print screen prints full screen/scroll region
3653 { 25, PrivMode_VisibleCursor }, // cnorm/cvvis/civis 3694 { 25, PrivMode_VisibleCursor }, // DECTCEM cnorm/cvvis/civis
3654#ifdef scrollBar_esc 3695#ifdef scrollBar_esc
3655 { scrollBar_esc, PrivMode_scrollBar }, 3696 { scrollBar_esc, PrivMode_scrollBar },
3656#endif 3697#endif
3657 { 35, PrivMode_ShiftKeys }, // rxvt extension 3698 { 35, PrivMode_ShiftKeys }, // rxvt extension
3658 // 38, tektronix mode // DECTEK 3699 // 38, tektronix mode // DECTEK
3659 { 40, PrivMode_132OK }, 3700 { 40, PrivMode_132OK },
3660 // 41 xterm more fixes NYI 3701 // 41 xterm more fixes NYI
3661 // 45 margin bell NYI 3702 // 45 margin bell NYI
3662 // 46 start logging 3703 // 46 start logging
3663 { 47, PrivMode_Screen }, 3704 { 47, PrivMode_Screen },
3664 { 66, PrivMode_aplKP }, // DECPAM/DECPNM 3705 { 66, PrivMode_aplKP }, // DECNKM
3665#ifndef NO_BACKSPACE_KEY 3706#ifndef NO_BACKSPACE_KEY
3666 { 67, PrivMode_BackSpace }, // DECBKM 3707 { 67, PrivMode_BackSpace }, // DECBKM
3667#endif 3708#endif
3668 { 1000, PrivMode_MouseX11 }, 3709 { 1000, PrivMode_MouseX11 },
3669 { 1002, PrivMode_MouseBtnEvent }, 3710 { 1002, PrivMode_MouseBtnEvent },
… …
3698 for (i = 0; i < nargs; i++) 3739 for (i = 0; i < nargs; i++)
3699 { 3740 {
3700 state = -1; 3741 state = -1;
3701 3742
3702 /* basic handling */ 3743 /* basic handling */
3703 for (j = 0; j < ARRAY_LENGTH(argtopriv); j++) 3744 for (j = 0; j < ecb_array_length (argtopriv); j++)
3704 if (argtopriv[j].argval == arg[i]) 3745 if (argtopriv[j].argval == arg[i])
3705 { 3746 {
3706 state = privcases (mode, argtopriv[j].bit); 3747 state = privcases (mode, argtopriv[j].bit);
3707 break; 3748 break;
3708 } 3749 }
… …
3734 case 2: /* VT52 mode */ 3775 case 2: /* VT52 mode */
3735 /* oddball mode. should be set regardless of set/reset 3776 /* oddball mode. should be set regardless of set/reset
3736 * parameter. Return from VT52 mode with an ESC < from 3777 * parameter. Return from VT52 mode with an ESC < from
3737 * within VT52 mode 3778 * within VT52 mode
3738 */ 3779 */
3739 set_privmode (PrivMode_vt52, 1); 3780 priv_modes |= PrivMode_vt52;
3740 break; 3781 break;
3741 case 3: /* 80/132 */ 3782 case 3: /* 80/132 */
3742 if (priv_modes & PrivMode_132OK) 3783 if (priv_modes & PrivMode_132OK)
3743 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight); 3784 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
3744 break; 3785 break;
… …
3759 if (state) /* orthogonal */ 3800 if (state) /* orthogonal */
3760 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent); 3801 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3761 break; 3802 break;
3762#ifdef scrollBar_esc 3803#ifdef scrollBar_esc
3763 case scrollBar_esc: 3804 case scrollBar_esc:
3764 if (scrollBar.map (state)) 3805 scrollBar.map (state);
3765 {
3766 resize_all_windows (0, 0, 0); 3806 resize_all_windows (0, 0, 0);
3767 scr_touch (true); 3807 scr_touch (true);
3768 } 3808 break;
3809#endif
3810#ifdef CURSOR_BLINK
3811 case 12:
3812 cursor_blink_reset ();
3769 break; 3813 break;
3770#endif 3814#endif
3771 case 25: /* visible/invisible cursor */ 3815 case 25: /* visible/invisible cursor */
3772 scr_cursor_visible (state); 3816 scr_cursor_visible (state);
3773 break; 3817 break;
… …
3828 } 3872 }
3829} 3873}
3830/*}}} */ 3874/*}}} */
3831 3875
3832/*{{{ process sgr sequences */ 3876/*{{{ process sgr sequences */
3833void 3877void ecb_hot
3834rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg) 3878rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg)
3835{ 3879{
3836 unsigned int i; 3880 unsigned int i;
3837 short rendset; 3881 short rendset;
3838 int rendstyle; 3882 int rendstyle;
… …
3880 //case 19: // ninth alt font 3924 //case 19: // ninth alt font
3881 //case 20: // gothic 3925 //case 20: // gothic
3882 case 21: // disable bold, faint, sometimes doubly underlined (iso 8613) 3926 case 21: // disable bold, faint, sometimes doubly underlined (iso 8613)
3883 rendset = 0, rendstyle = RS_Bold; 3927 rendset = 0, rendstyle = RS_Bold;
3884 break; 3928 break;
3885 case 22: // normal intensity 3929 case 22: // bold off (vt220)
3886 rendset = 0, rendstyle = RS_Bold; 3930 rendset = 0, rendstyle = RS_Bold;
3887 break; 3931 break;
3888 case 23: // disable italic 3932 case 23: // disable italic
3889 rendset = 0, rendstyle = RS_Italic; 3933 rendset = 0, rendstyle = RS_Italic;
3890 break; 3934 break;
3891 case 24: 3935 case 24: // underline off (vt220)
3892 rendset = 0, rendstyle = RS_Uline; 3936 rendset = 0, rendstyle = RS_Uline;
3893 break; 3937 break;
3894 case 25: 3938 case 25: // blink off (vt220)
3895 rendset = 0, rendstyle = RS_Blink; 3939 rendset = 0, rendstyle = RS_Blink;
3896 break; 3940 break;
3897 case 26: // variable spacing (iso 8613) 3941 case 26: // variable spacing (iso 8613)
3898 rendset = 0, rendstyle = RS_Blink; 3942 rendset = 0, rendstyle = RS_Blink;
3899 break; 3943 break;
3900 case 27: 3944 case 27: // reverse off (vt220)
3901 rendset = 0, rendstyle = RS_RVid; 3945 rendset = 0, rendstyle = RS_RVid;
3902 break; 3946 break;
3903 //case 28: // visible. NYI 3947 //case 28: // visible. NYI
3904 //case 29: // not crossed-out 3948 //case 29: // not crossed-out
3905 } 3949 }
… …
3979 break; 4023 break;
3980#endif 4024#endif
3981 } 4025 }
3982 } 4026 }
3983} 4027}
4028
4029void
4030rxvt_term::set_cursor_style (int style)
4031{
4032 if (!IN_RANGE_INC (style, 0, 6))
4033 return;
4034
4035 if (style == 0)
4036 style = 1;
4037
4038 cursor_type = (style - 1) / 2;
4039 set_option (Opt_cursorUnderline, cursor_type == 1);
4040
4041#ifdef CURSOR_BLINK
4042 set_option (Opt_cursorBlink, style & 1);
4043 cursor_blink_reset ();
4044#endif
4045
4046 want_refresh = 1;
4047}
3984/*}}} */ 4048/*}}} */
3985 4049
3986/*{{{ (do not) process Rob Nation's own graphics mode sequences */
3987void
3988rxvt_term::process_graphics ()
3989{
3990 unicode_t ch, cmd = cmd_getc ();
3991
3992 if (cmd == 'Q')
3993 {
3994 /* query graphics */
3995 tt_printf ("\033G0\012"); /* no graphics */
3996 return;
3997 }
3998 /* swallow other graphics sequences until terminating ':' */
3999 do
4000 ch = cmd_getc ();
4001 while (ch != ':');
4002}
4003/*}}} */
4004
4005/* ------------------------------------------------------------------------- */ 4050/* ---------------------------------------------------------------------- */
4051/* Write data to the pty as typed by the user, pasted with the mouse,
4052 * or generated by us in response to a query ESC sequence.
4053 */
4006 4054
4007/* 4055/*
4008 * Send printf () formatted output to the command. 4056 * Send printf () formatted output to the command.
4009 * Only use for small amounts of data. 4057 * Only use for small amounts of data.
4010 */ 4058 */
… …
4018 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4066 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
4019 va_end (arg_ptr); 4067 va_end (arg_ptr);
4020 tt_write (buf, strlen (buf)); 4068 tt_write (buf, strlen (buf));
4021} 4069}
4022 4070
4023/* ---------------------------------------------------------------------- */
4024/* Write data to the pty as typed by the user, pasted with the mouse, 4071/* Write data to the pty as typed by the user. */
4025 * or generated by us in response to a query ESC sequence. 4072void
4026 */ 4073rxvt_term::tt_write_user_input (const char *data, unsigned int len)
4027static const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 4074{
4075 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4076 return;
4077
4078 if (option (Opt_scrollTtyKeypress))
4079 if (view_start)
4080 {
4081 view_start = 0;
4082 want_refresh = 1;
4083 }
4084
4085 tt_write_ (data, len);
4086}
4028 4087
4029void 4088void
4030rxvt_term::tt_write (const char *data, unsigned int len) 4089rxvt_term::tt_write (const char *data, unsigned int len)
4031{ 4090{
4032 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END))) 4091 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4033 return; 4092 return;
4034 4093
4094 tt_write_ (data, len);
4095}
4096
4097static const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4098
4099void
4100rxvt_term::tt_write_ (const char *data, unsigned int len)
4101{
4035 if (pty->pty < 0) 4102 if (pty->pty < 0)
4036 return; 4103 return;
4037 4104
4038 if (v_buflen == 0) 4105 if (v_buflen == 0)
4039 { 4106 {
4040 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE)); 4107 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
4041 4108
4109 max_it (written, 0);
4110
4042 if ((unsigned int)written == len) 4111 if (written == len)
4043 return; 4112 return;
4044 4113
4045 data += written; 4114 data += written;
4046 len -= written; 4115 len -= written;
4047 } 4116 }

Diff Legend

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