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.445 by sf-exg, Fri Apr 2 13:52:30 2010 UTC vs.
Revision 1.558 by root, Tue Sep 2 16:28:34 2014 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 switch (translate_keypad (keysym, kp))
655 {
656#ifndef NO_BACKSPACE_KEY
657 case XK_BackSpace:
658 if (priv_modes & PrivMode_HaveBackSpace)
659 {
660 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
661 ^ !!ctrl) ? '\b' : '\177';
662 kbuf[1] = '\0';
663 }
664 else
665 strcpy (kbuf, rs[Rs_backspace_key]);
666 break;
667#endif
668#ifndef NO_DELETE_KEY
669 case XK_Delete:
670 strcpy (kbuf, rs[Rs_delete_key]);
671 break;
672#endif
673 case XK_Tab:
674 if (shft)
675 strcpy (kbuf, "\033[Z");
676 else
677 {
678#ifdef CTRL_TAB_MAKES_META
679 if (ctrl)
680 meta = 1;
681#endif
682#ifdef MOD4_TAB_MAKES_META
683 if (ev.state & Mod4Mask)
684 meta = 1;
685#endif
686 newlen = 0;
687 }
688 break;
689
690 case XK_Up: /* "\033[A" */
691 case XK_Down: /* "\033[B" */
692 case XK_Right: /* "\033[C" */
693 case XK_Left: /* "\033[D" */
694 strcpy (kbuf, "\033[Z");
695 kbuf[2] = "DACB"[keysym - XK_Left];
696 /* do Shift first */
697 if (shft)
698 kbuf[2] = "dacb"[keysym - XK_Left];
699 else if (ctrl)
700 {
701 kbuf[1] = 'O';
702 kbuf[2] = "dacb"[keysym - XK_Left];
703 }
704 else if (priv_modes & PrivMode_aplCUR)
705 kbuf[1] = 'O';
706 break;
707
708 case XK_KP_Enter:
709 /* allow shift to override */
710 if (kp)
711 {
712 strcpy (kbuf, "\033OM");
713 break;
714 }
715
716 /* FALLTHROUGH */
717
718 case XK_Return:
719 if (priv_modes & PrivMode_LFNL)
720 {
721 kbuf[0] = '\015';
722 kbuf[1] = '\012';
723 kbuf[2] = '\0';
724 }
725 else
726 {
727 kbuf[0] = '\015';
728 kbuf[1] = '\0';
729 }
730 break;
731
732 case XK_KP_F1: /* "\033OP" */
733 case XK_KP_F2: /* "\033OQ" */
734 case XK_KP_F3: /* "\033OR" */
735 case XK_KP_F4: /* "\033OS" */
736 strcpy (kbuf, "\033OP");
737 kbuf[2] += (keysym - XK_KP_F1);
738 break;
739
740 case XK_KP_Multiply: /* "\033Oj" : "*" */
741 case XK_KP_Add: /* "\033Ok" : "+" */
742 case XK_KP_Separator: /* "\033Ol" : "," */
743 case XK_KP_Subtract: /* "\033Om" : "-" */
744 case XK_KP_Decimal: /* "\033On" : "." */
745 case XK_KP_Divide: /* "\033Oo" : "/" */
746 case XK_KP_0: /* "\033Op" : "0" */
747 case XK_KP_1: /* "\033Oq" : "1" */
748 case XK_KP_2: /* "\033Or" : "2" */
749 case XK_KP_3: /* "\033Os" : "3" */
750 case XK_KP_4: /* "\033Ot" : "4" */
751 case XK_KP_5: /* "\033Ou" : "5" */
752 case XK_KP_6: /* "\033Ov" : "6" */
753 case XK_KP_7: /* "\033Ow" : "7" */
754 case XK_KP_8: /* "\033Ox" : "8" */
755 case XK_KP_9: /* "\033Oy" : "9" */
756 /* allow shift to override */
757 if (kp)
758 {
759 strcpy (kbuf, "\033Oj");
760 kbuf[2] += (keysym - XK_KP_Multiply);
761 }
762 else
763 {
764 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
765 kbuf[1] = '\0';
766 }
767 break;
768
769 default:
770 {
771 int param = map_function_key (keysym);
772 if (param > 0)
773 sprintf (kbuf,"\033[%d~", param);
774 else
775 newlen = 0;
776 }
777 break;
778 }
779
780 if (newlen)
781 len = strlen (kbuf);
782
783 /*
784 * Pass meta for all function keys, if 'meta' option set
785 */
786#ifdef META8_OPTION
787 if (meta && (meta_char == 0x80) && len > 0)
788 kbuf[len - 1] |= 0x80;
789#endif
790
791 }
792 else if (ctrl && keysym == XK_minus)
793 {
794 len = 1;
795 kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */
796 }
797 else if (keysym == XK_ISO_Left_Tab)
798 {
799 strcpy (kbuf, "\033[Z");
800 len = 3;
801 }
802 else
803 {
804#ifdef META8_OPTION
805 /* set 8-bit on */
806 if (meta && (meta_char == 0x80))
807 {
808 char *ch;
809
810 for (ch = kbuf; ch < kbuf + len; ch++)
811 *ch |= 0x80;
812
813 meta = 0;
814 }
815#endif
816 /* nil */ ;
817 }
818 } 868 }
819
820 if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_INT, keysym, DT_STR_LEN, kbuf, len, DT_END)))
821 return;
822 869
823 if (len <= 0) 870 if (len <= 0)
824 return; /* not mapped */ 871 return; /* not mapped */
825 872
826 if (option (Opt_scrollTtyKeypress))
827 if (view_start)
828 {
829 view_start = 0;
830 want_refresh = 1;
831 }
832
833 /*
834 * these modifications only affect the static keybuffer
835 * pass Shift/Control indicators for function keys ending with `~'
836 *
837 * eg,
838 * Prior = "ESC[5~"
839 * Shift+Prior = "ESC[5$"
840 * Ctrl+Prior = "ESC[5^"
841 * Ctrl+Shift+Prior = "ESC[5@"
842 * Meta adds an Escape prefix (with META8_OPTION, if meta == <escape>).
843 */
844 if (kbuf[0] == C0_ESC && kbuf[1] == '[' && kbuf[len - 1] == '~')
845 kbuf[len - 1] = (shft ? (ctrl ? '@' : '$') : (ctrl ? '^' : '~'));
846
847 /* escape prefix */
848 if (meta
849#ifdef META8_OPTION
850 && meta_char == C0_ESC
851#endif
852 )
853 {
854 const char ch = C0_ESC;
855 tt_write (&ch, 1);
856 }
857
858 tt_write (kbuf, (unsigned int)len); 873 tt_write_user_input (kbuf, (unsigned int)len);
859} 874}
860 875
861void 876void ecb_cold
862rxvt_term::key_release (XKeyEvent &ev) 877rxvt_term::key_release (XKeyEvent &ev)
863{ 878{
864#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL 879#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
865 KeySym keysym; 880 KeySym keysym;
866 881
… …
886 commit_iso14755 (); 901 commit_iso14755 ();
887 902
888 return; 903 return;
889 } 904 }
890 905
891 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2) 906 for (unsigned short *i = iso14755_symtab; i[0]; i += 2)
892 if (i[0] == keysym) 907 if (i[0] == keysym)
893 { 908 {
894 iso14755buf = ISO_14755_51 | i[1]; 909 iso14755buf = ISO_14755_51 | i[1];
895 commit_iso14755 (); 910 commit_iso14755 ();
896 911
… …
933 else if (keysym == XK_Control_L || keysym == XK_Control_R) 948 else if (keysym == XK_Control_L || keysym == XK_Control_R)
934 mouse_slip_wheel_speed = 0; 949 mouse_slip_wheel_speed = 0;
935#endif 950#endif
936} 951}
937 952
938#if defined (KEYSYM_RESOURCE)
939unsigned int
940rxvt_term::cmd_write (const char *str, unsigned int count)
941{
942 unsigned int n, s;
943
944 n = cmdbuf_ptr - cmdbuf_base;
945 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp;
946
947 if (n > 0 && s < count)
948 {
949 memmove (cmdbuf_base, cmdbuf_ptr,
950 (unsigned int) (cmdbuf_endp - cmdbuf_ptr));
951 cmdbuf_ptr = cmdbuf_base;
952 cmdbuf_endp -= n;
953 s += n;
954 }
955
956 if (count > s)
957 {
958 rxvt_warn ("data loss: cmd_write too large, continuing.\n");
959 count = s;
960 }
961
962 for (; count--;)
963 *cmdbuf_endp++ = *str++;
964
965 cmd_parse ();
966
967 return 0;
968}
969#endif
970
971void 953void
972rxvt_term::flush () 954rxvt_term::flush ()
973{ 955{
974 flush_ev.stop (); 956 flush_ev.stop ();
975 957
976#ifdef HAVE_BG_PIXMAP 958#ifdef HAVE_IMG
977 if (bgPixmap.check_clearChanged ()) 959 if (bg_flags & BG_NEEDS_REFRESH)
978 { 960 {
979// scr_clear (true); This needs to be researched further! 961 bg_flags &= ~BG_NEEDS_REFRESH;
980 scr_touch (false); 962 scr_touch (false);
981 } 963 }
982#endif 964#endif
983 965
984 if (want_refresh) 966 if (want_refresh)
… …
1021 while (row < end_row); 1003 while (row < end_row);
1022 } 1004 }
1023 1005
1024 scr_refresh (); 1006 scr_refresh ();
1025 scrollBar.show (1); 1007 scrollBar.show (1);
1026#ifdef USE_XIM 1008#if USE_XIM
1027 IMSendSpot (); 1009 im_send_spot ();
1028#endif 1010#endif
1029 } 1011 }
1030 1012
1031 display->flush (); 1013 display->flush ();
1032} 1014}
… …
1050 flush (); 1032 flush ();
1051} 1033}
1052 1034
1053#ifdef CURSOR_BLINK 1035#ifdef CURSOR_BLINK
1054void 1036void
1037rxvt_term::cursor_blink_reset ()
1038{
1039 if (hidden_cursor)
1040 {
1041 hidden_cursor = 0;
1042 want_refresh = 1;
1043 }
1044
1045 if (option (Opt_cursorBlink))
1046 cursor_blink_ev.again ();
1047 else
1048 cursor_blink_ev.stop ();
1049}
1050
1051void
1055rxvt_term::cursor_blink_cb (ev::timer &w, int revents) 1052rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
1056{ 1053{
1057 hidden_cursor = !hidden_cursor; 1054 hidden_cursor = !hidden_cursor;
1058 want_refresh = 1; 1055 want_refresh = 1;
1059 refresh_check (); 1056 refresh_check ();
… …
1077 1074
1078#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1075#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1079void 1076void
1080rxvt_term::cont_scroll_cb (ev::timer &w, int revents) 1077rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1081{ 1078{
1082 if ((scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN) 1079 if ((scrollBar.state == SB_STATE_UP || scrollBar.state == SB_STATE_DOWN)
1083 && scr_page (scrollBar.state == STATE_UP ? UP : DN, 1)) 1080 && scr_page (scrollBar.state == SB_STATE_UP ? UP : DN, 1))
1084 { 1081 {
1085 want_refresh = 1; 1082 want_refresh = 1;
1086 refresh_check (); 1083 refresh_check ();
1087 } 1084 }
1088 else 1085 else
… …
1092 1089
1093#ifdef SELECTION_SCROLLING 1090#ifdef SELECTION_SCROLLING
1094void 1091void
1095rxvt_term::sel_scroll_cb (ev::timer &w, int revents) 1092rxvt_term::sel_scroll_cb (ev::timer &w, int revents)
1096{ 1093{
1097 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1094 if (scr_page (scroll_selection_lines))
1098 { 1095 {
1099 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1096 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1100 want_refresh = 1; 1097 want_refresh = 1;
1101 refresh_check (); 1098 refresh_check ();
1102 } 1099 }
… …
1107 1104
1108#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1105#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1109void 1106void
1110rxvt_term::slip_wheel_cb (ev::timer &w, int revents) 1107rxvt_term::slip_wheel_cb (ev::timer &w, int revents)
1111{ 1108{
1112 if (scr_changeview (view_start - mouse_slip_wheel_speed)) 1109 if (scr_page (mouse_slip_wheel_speed))
1113 { 1110 {
1114 want_refresh = 1; 1111 want_refresh = 1;
1115 refresh_check (); 1112 refresh_check ();
1116 } 1113 }
1117 1114
… …
1149 { 1146 {
1150 } 1147 }
1151} event_handler; 1148} event_handler;
1152#endif 1149#endif
1153 1150
1151/* make sure all the cmd data is at beginning of cmdbuf */
1152void
1153rxvt_term::cmdbuf_reify ()
1154{
1155 if (cmdbuf_ptr == cmdbuf_base)
1156 return;
1157
1158 ssize_t used = cmdbuf_endp - cmdbuf_ptr;
1159
1160 memmove (cmdbuf_base, cmdbuf_ptr, used);
1161 cmdbuf_ptr = cmdbuf_base;
1162 cmdbuf_endp = cmdbuf_ptr + used;
1163
1164}
1165
1166#if defined (KEYSYM_RESOURCE)
1167void
1168rxvt_term::cmdbuf_append (const char *str, size_t count)
1169{
1170 cmdbuf_reify ();
1171
1172 size_t avail = cmdbuf_base + CBUFSIZ - cmdbuf_endp;
1173
1174 if (count > avail)
1175 return;
1176
1177 memcpy (cmdbuf_endp, str, count);
1178 cmdbuf_endp += count;
1179
1180 cmd_parse ();
1181}
1182#endif
1183
1154bool 1184bool
1155rxvt_term::pty_fill () 1185rxvt_term::pty_fill ()
1156{ 1186{
1157 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1187 cmdbuf_reify ();
1158 1188
1159 if (CBUFSIZ == n) 1189 size_t avail = cmdbuf_base + CBUFSIZ - cmdbuf_endp;
1160 { 1190
1161 rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n"); 1191 if (!avail)
1162 n = 0;
1163 } 1192 {
1164 1193 // normally this indicates a "too long" command sequence - just drop the data we have
1165 memmove (cmdbuf_base, cmdbuf_ptr, n);
1166 cmdbuf_ptr = cmdbuf_base; 1194 cmdbuf_ptr = cmdbuf_base;
1167 cmdbuf_endp = cmdbuf_ptr + n; 1195 cmdbuf_endp = cmdbuf_ptr;
1196 avail = CBUFSIZ;
1197 }
1168 1198
1169 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n); 1199 ssize_t r = read (pty->pty, cmdbuf_endp, avail);
1170 1200
1171 if (r > 0) 1201 if (r > 0)
1172 { 1202 {
1173 cmdbuf_endp += r; 1203 cmdbuf_endp += r;
1174 return true; 1204 return true;
… …
1205 pty_write (); 1235 pty_write ();
1206 1236
1207 refresh_check (); 1237 refresh_check ();
1208} 1238}
1209 1239
1210void 1240void ecb_cold
1211rxvt_term::pointer_unblank () 1241rxvt_term::pointer_unblank ()
1212{ 1242{
1213 XDefineCursor (dpy, vt, TermWin_cursor); 1243 XDefineCursor (dpy, vt, TermWin_cursor);
1214 recolour_cursor (); 1244 recolour_cursor ();
1215 1245
… …
1220 pointer_ev.start (pointerBlankDelay); 1250 pointer_ev.start (pointerBlankDelay);
1221#endif 1251#endif
1222} 1252}
1223 1253
1224#ifdef POINTER_BLANK 1254#ifdef POINTER_BLANK
1225void 1255void ecb_cold
1226rxvt_term::pointer_blank () 1256rxvt_term::pointer_blank ()
1227{ 1257{
1228 if (!option (Opt_pointerBlank)) 1258 if (!option (Opt_pointerBlank))
1229 return; 1259 return;
1230 1260
… …
1232 XFlush (dpy); 1262 XFlush (dpy);
1233 1263
1234 hidden_pointer = 1; 1264 hidden_pointer = 1;
1235} 1265}
1236 1266
1237void 1267void ecb_cold
1238rxvt_term::pointer_cb (ev::timer &w, int revents) 1268rxvt_term::pointer_cb (ev::timer &w, int revents)
1239{ 1269{
1240 make_current (); 1270 make_current ();
1241 1271
1242 pointer_blank (); 1272 pointer_blank ();
… …
1248{ 1278{
1249 int button_number, key_state = 0; 1279 int button_number, key_state = 0;
1250 int x, y; 1280 int x, y;
1251 int code = 32; 1281 int code = 32;
1252 1282
1253 x = Pixel2Col (ev.x); 1283 x = Pixel2Col (ev.x) + 1;
1254 y = Pixel2Row (ev.y); 1284 y = Pixel2Row (ev.y) + 1;
1285
1255 if (ev.type == MotionNotify) 1286 if (ev.type == MotionNotify)
1256 { 1287 {
1257 if (x == mouse_row && y == mouse_col) 1288 if (x == mouse_row && y == mouse_col)
1258 return; 1289 return;
1290
1259 mouse_row = x; 1291 mouse_row = x;
1260 mouse_col = y; 1292 mouse_col = y;
1261 code += 32; 1293 code += 32;
1262 } 1294 }
1263 1295
… …
1266 else 1298 else
1267 { 1299 {
1268 button_number = MEvent.button - Button1; 1300 button_number = MEvent.button - Button1;
1269 /* add 0x3D for wheel events, like xterm does */ 1301 /* add 0x3D for wheel events, like xterm does */
1270 if (button_number >= 3) 1302 if (button_number >= 3)
1271 button_number += (64 - 3); 1303 button_number += 64 - 3;
1272 } 1304 }
1273 1305
1274 if (priv_modes & PrivMode_MouseX10) 1306 if (priv_modes & PrivMode_MouseX10)
1275 { 1307 {
1276 /* 1308 /*
… …
1308 fputc ('A', stderr); 1340 fputc ('A', stderr);
1309 if (key_state & 32) 1341 if (key_state & 32)
1310 fputc ('2', stderr); 1342 fputc ('2', stderr);
1311 fprintf (stderr, "]: <%d>, %d/%d\n", 1343 fprintf (stderr, "]: <%d>, %d/%d\n",
1312 button_number, 1344 button_number,
1313 x + 1, 1345 x,
1314 y + 1); 1346 y);
1315#endif 1347#endif
1316 1348
1349#if ENABLE_FRILLS
1350 if (priv_modes & PrivMode_ExtMouseRight)
1351 tt_printf ("\033[%d;%d;%dM",
1352 code + button_number + key_state,
1353 x,
1354 y);
1355 else if (priv_modes & PrivMode_ExtModeMouse)
1356 tt_printf ("\033[M%c%lc%lc",
1357 code + button_number + key_state,
1358 wint_t (32 + x),
1359 wint_t (32 + y));
1360 else
1361#endif
1317 tt_printf ("\033[M%c%c%c", 1362 tt_printf ("\033[M%c%c%c",
1318 (code + button_number + key_state), 1363 code + button_number + key_state,
1319 (32 + x + 1), 1364 32 + x,
1320 (32 + y + 1)); 1365 32 + y);
1321} 1366}
1322 1367
1323/*{{{ process an X event */ 1368/*{{{ process an X event */
1324void 1369void ecb_hot
1325rxvt_term::x_cb (XEvent &ev) 1370rxvt_term::x_cb (XEvent &ev)
1326{ 1371{
1327 make_current (); 1372 make_current ();
1328 1373
1329 dLocal (Display *, dpy); 1374 dLocal (Display *, dpy);
… …
1427 && ev.xfocus.mode != NotifyGrab) 1472 && ev.xfocus.mode != NotifyGrab)
1428 focus_out (); 1473 focus_out ();
1429 break; 1474 break;
1430 1475
1431 case ConfigureNotify: 1476 case ConfigureNotify:
1432 /*fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",
1433 ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,
1434 szHint.width, szHint.height);*/
1435 if (ev.xconfigure.window == parent[0]) 1477 if (ev.xconfigure.window == parent)
1436 { 1478 {
1437 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1479 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1438 ; 1480 ;
1481
1482 bool want_position_change = SHOULD_INVOKE (HOOK_POSITION_CHANGE);
1483
1484 bool moved = false;
1485#ifdef HAVE_BG_PIXMAP
1486 if (bg_window_position_sensitive ())
1487 {
1488 want_position_change = true;
1489 if (bg_img == 0)
1490 moved = true;
1491 }
1492#endif
1493
1494 if (want_position_change)
1495 {
1496 int x, y;
1497
1498 if (ev.xconfigure.send_event)
1499 {
1500 x = ev.xconfigure.x;
1501 y = ev.xconfigure.y;
1502 }
1503 else
1504 get_window_origin (x, y);
1505
1506 if (x != parent_x || y != parent_y)
1507 {
1508 parent_x = x;
1509 parent_y = y;
1510 HOOK_INVOKE ((this, HOOK_POSITION_CHANGE, DT_INT, x, DT_INT, y, DT_END));
1511 moved = true;
1512 }
1513 }
1439 1514
1440 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1515 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1441 { 1516 {
1442 seen_resize = 1; 1517 seen_resize = 1;
1443 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1518 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1444 } 1519 }
1445 else 1520 else
1446 { 1521 {
1447#ifdef HAVE_BG_PIXMAP 1522#ifdef HAVE_BG_PIXMAP
1448 if (bgPixmap.window_position_sensitive ())
1449 {
1450 if (mapped) 1523 if (moved)
1451 update_background (); 1524 update_background ();
1452 else
1453 bgPixmap.invalidate ();
1454 }
1455#endif 1525#endif
1456 } 1526 }
1457 1527
1458 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1528 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1459 } 1529 }
1460 break; 1530 break;
1461 1531
1462 case PropertyNotify: 1532 case PropertyNotify:
1463 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END))) 1533 HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END));
1464 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1465 && ev.xproperty.state == PropertyNewValue)
1466 selection_property (ev.xproperty.window, ev.xproperty.atom);
1467
1468 break; 1534 break;
1469 1535
1470 case SelectionClear: 1536 case SelectionClear:
1471 selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]); 1537 selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]);
1472 break; 1538 break;
1473 1539
1474 case SelectionNotify:
1475 if (selection_wait == Sel_normal)
1476 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1477 break;
1478
1479 case SelectionRequest: 1540 case SelectionRequest:
1480 selection_send (ev.xselectionrequest); 1541 selection_send (ev.xselectionrequest);
1481 break; 1542 break;
1482 1543
1483 case MapNotify: 1544 case MapNotify:
1484#ifdef HAVE_BG_PIXMAP 1545#ifdef HAVE_BG_PIXMAP
1485 /* This is needed spcifically to fix the case of no window manager or a 1546 // This is needed at startup for the case of no window manager
1486 * non-reparenting window manager. In those cases we never get first 1547 // or a non-reparenting window manager and also because we
1487 * ConfigureNotify. Also that speeds startup under normal WM, by taking 1548 // defer bg image updates if the window is not mapped. The
1488 * care of multiplicity of ConfigureNotify events arriwing while WM does 1549 // short delay is to optimize for multiple ConfigureNotify
1489 * reparenting. 1550 // events at startup when the window manager reparents the
1490 * We should not render background immidiately, as there could be several 1551 // window, so as to perform the computation after we have
1491 * ConfigureNotify's to follow. Lets take care of all of them in one scoop 1552 // received all of them.
1492 * by scheduling background redraw as soon as we can, but giving a short 1553 if (bg_img == 0)
1493 * bit of time for ConfigureNotifies to arrive.
1494 * We should render background PRIOR to drawing any text, but AFTER all
1495 * of ConfigureNotifys for the best results.
1496 */
1497 if (bgPixmap.flags & bgPixmap_t::isInvalid)
1498 update_background_ev.start (0.025); 1554 update_background_ev.start (0.025);
1499#endif 1555#endif
1500 mapped = 1; 1556 mapped = 1;
1501#ifdef TEXT_BLINK 1557#ifdef TEXT_BLINK
1502 text_blink_ev.start (); 1558 text_blink_ev.start ();
… …
1517 if (ev.xany.window == vt) 1573 if (ev.xany.window == vt)
1518 { 1574 {
1519 do 1575 do
1520 { 1576 {
1521 scr_expose (ev.xexpose.x, ev.xexpose.y, 1577 scr_expose (ev.xexpose.x, ev.xexpose.y,
1522 ev.xexpose.width, ev.xexpose.height, False); 1578 ev.xexpose.width, ev.xexpose.height, false);
1523 } 1579 }
1524 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)); 1580 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1525 1581
1526 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1582 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1527 1583
1528 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)) 1584 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1529 { 1585 {
1530 scr_expose (ev.xexpose.x, ev.xexpose.y, 1586 scr_expose (ev.xexpose.x, ev.xexpose.y,
1531 ev.xexpose.width, ev.xexpose.height, False); 1587 ev.xexpose.width, ev.xexpose.height, false);
1532 } 1588 }
1533 1589
1534 want_refresh = 1; 1590 want_refresh = 1;
1535 } 1591 }
1536 else 1592 else
… …
1542 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event)) 1598 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1543 ; 1599 ;
1544 1600
1545 if (scrollBar.state && ev.xany.window == scrollBar.win) 1601 if (scrollBar.state && ev.xany.window == scrollBar.win)
1546 { 1602 {
1547 scrollBar.state = STATE_IDLE; 1603 scrollBar.state = SB_STATE_IDLE;
1548 scrollBar.show (0); 1604 scrollBar.show (0);
1549 } 1605 }
1550 } 1606 }
1551 break; 1607 break;
1552 1608
… …
1594 1650
1595#ifdef SELECTION_SCROLLING 1651#ifdef SELECTION_SCROLLING
1596 if (ev.xbutton.y < int_bwidth 1652 if (ev.xbutton.y < int_bwidth
1597 || Pixel2Row (ev.xbutton.y) > (nrow-1)) 1653 || Pixel2Row (ev.xbutton.y) > (nrow-1))
1598 { 1654 {
1655 page_dirn scroll_selection_dir;
1599 int dist; 1656 int dist;
1600 1657
1601 /* don't clobber the current delay if we are 1658 /* don't clobber the current delay if we are
1602 * already in the middle of scrolling. 1659 * already in the middle of scrolling.
1603 */ 1660 */
… …
1618 dist = int_bwidth - ev.xbutton.y; 1675 dist = int_bwidth - ev.xbutton.y;
1619 } 1676 }
1620 else 1677 else
1621 { 1678 {
1622 scroll_selection_dir = DN; 1679 scroll_selection_dir = DN;
1623 dist = ev.xbutton.y - (int_bwidth + height); 1680 dist = ev.xbutton.y - (int_bwidth + vt_height);
1624 } 1681 }
1625 1682
1626 scroll_selection_lines = Pixel2Height (dist) 1683 scroll_selection_lines = Pixel2Height (dist)
1627 / SELECTION_SCROLL_LINE_SPEEDUP 1684 / SELECTION_SCROLL_LINE_SPEEDUP
1628 + 1; 1685 + 1;
1629 min_it (scroll_selection_lines, 1686 min_it (scroll_selection_lines,
1630 SELECTION_SCROLL_MAX_LINES); 1687 SELECTION_SCROLL_MAX_LINES);
1688 scroll_selection_lines *= scroll_selection_dir;
1631 } 1689 }
1632 else 1690 else
1633 { 1691 {
1634 /* we are within the text window, so we 1692 /* we are within the text window, so we
1635 * shouldn't be scrolling 1693 * shouldn't be scrolling
… …
1640#ifdef MOUSE_THRESHOLD 1698#ifdef MOUSE_THRESHOLD
1641 } 1699 }
1642#endif 1700#endif
1643 } 1701 }
1644 } 1702 }
1645 else if (scrollBar.state == STATE_MOTION && ev.xany.window == scrollBar.win) 1703 else if (scrollBar.state == SB_STATE_MOTION && ev.xany.window == scrollBar.win)
1646 { 1704 {
1647 while (XCheckTypedWindowEvent (dpy, scrollBar.win, 1705 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1648 MotionNotify, &ev)) 1706 MotionNotify, &ev))
1649 ; 1707 ;
1650 1708
1651 XQueryPointer (dpy, scrollBar.win, 1709 XQueryPointer (dpy, scrollBar.win,
1652 &unused_root, &unused_child, 1710 &unused_root, &unused_child,
1653 &unused_root_x, &unused_root_y, 1711 &unused_root_x, &unused_root_y,
1654 &ev.xbutton.x, &ev.xbutton.y, 1712 &ev.xbutton.x, &ev.xbutton.y,
1655 &unused_mask); 1713 &unused_mask);
1656 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1714 scr_move_to (scrollBar.position (ev.xbutton.y) - csrO,
1657 scrollBar.size ()); 1715 scrollBar.size ());
1658 want_refresh = 1; 1716 want_refresh = 1;
1659 scrollBar.show (1); 1717 scrollBar.show (1);
1660 } 1718 }
1661 break; 1719 break;
1662 } 1720 }
1663 1721
1664#if defined(CURSOR_BLINK) 1722#if defined(CURSOR_BLINK)
1665 if (option (Opt_cursorBlink) && ev.type == KeyPress) 1723 if (ev.type == KeyPress)
1666 {
1667 if (hidden_cursor)
1668 {
1669 hidden_cursor = 0;
1670 want_refresh = 1;
1671 }
1672
1673 cursor_blink_ev.again (); 1724 cursor_blink_reset ();
1674 }
1675#endif 1725#endif
1676 1726
1677#if defined(POINTER_BLANK) 1727#if defined(POINTER_BLANK)
1678 if (option (Opt_pointerBlank) && pointerBlankDelay > 0) 1728 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1679 { 1729 {
… …
1690 1740
1691 refresh_check (); 1741 refresh_check ();
1692} 1742}
1693 1743
1694#if ENABLE_FRILLS 1744#if ENABLE_FRILLS
1695void 1745void ecb_cold
1696rxvt_term::set_urgency (bool enable) 1746rxvt_term::set_urgency (bool enable)
1697{ 1747{
1698 if (enable == urgency_hint) 1748 if (enable == urgency_hint)
1699 return; 1749 return;
1700 1750
1701 if (XWMHints *h = XGetWMHints (dpy, parent[0])) 1751 if (XWMHints *h = XGetWMHints (dpy, parent))
1702 { 1752 {
1703 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0); 1753 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0);
1704 XSetWMHints (dpy, parent[0], h); 1754 XSetWMHints (dpy, parent, h);
1705 urgency_hint = enable; 1755 urgency_hint = enable;
1756 XFree (h);
1706 } 1757 }
1707} 1758}
1708#endif 1759#endif
1709 1760
1710void 1761void ecb_cold
1711rxvt_term::focus_in () 1762rxvt_term::focus_in ()
1712{ 1763{
1713 if (!focus) 1764 if (!focus)
1714 { 1765 {
1715 focus = 1; 1766 focus = 1;
1716 want_refresh = 1; 1767 want_refresh = 1;
1717 1768
1718#if USE_XIM 1769#if USE_XIM
1719 if (Input_Context != NULL) 1770 if (Input_Context != NULL)
1720 { 1771 {
1721 IMSetPosition (); 1772 im_set_position ();
1722 XSetICFocus (Input_Context); 1773 XSetICFocus (Input_Context);
1723 } 1774 }
1724#endif 1775#endif
1725#if CURSOR_BLINK 1776#if CURSOR_BLINK
1726 if (option (Opt_cursorBlink)) 1777 if (option (Opt_cursorBlink))
… …
1740 1791
1741 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END)); 1792 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1742 } 1793 }
1743} 1794}
1744 1795
1745void 1796void ecb_cold
1746rxvt_term::focus_out () 1797rxvt_term::focus_out ()
1747{ 1798{
1748 if (focus) 1799 if (focus)
1749 { 1800 {
1750 focus = 0; 1801 focus = 0;
… …
1783 1834
1784 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1835 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1785 } 1836 }
1786} 1837}
1787 1838
1788void 1839void ecb_cold
1789rxvt_term::update_fade_color (unsigned int idx) 1840rxvt_term::update_fade_color (unsigned int idx)
1790{ 1841{
1791#if OFF_FOCUS_FADING 1842#if OFF_FOCUS_FADING
1792 if (rs[Rs_fade]) 1843 if (rs[Rs_fade])
1793 { 1844 {
… …
1796 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c); 1847 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1797 } 1848 }
1798#endif 1849#endif
1799} 1850}
1800 1851
1801#if ENABLE_TRANSPARENCY || ENABLE_PERL 1852#if BG_IMAGE_FROM_ROOT || ENABLE_PERL
1802void 1853void ecb_hot
1803rxvt_term::rootwin_cb (XEvent &ev) 1854rxvt_term::rootwin_cb (XEvent &ev)
1804{ 1855{
1805 make_current (); 1856 make_current ();
1806 1857
1807 if (SHOULD_INVOKE (HOOK_ROOT_EVENT) 1858 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1808 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END))) 1859 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1809 return; 1860 return;
1810 1861
1811# if ENABLE_TRANSPARENCY
1812 switch (ev.type) 1862 switch (ev.type)
1813 { 1863 {
1814 case PropertyNotify: 1864 case PropertyNotify:
1815 /* 1865 /*
1816 * if user used some Esetroot compatible prog to set the root bg, 1866 * if user used some Esetroot compatible prog to set the root bg,
1817 * use the property to determine the pixmap. We use it later on. 1867 * use the property to determine the pixmap. We use it later on.
1818 */ 1868 */
1819 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID] 1869 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1820 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID]) 1870 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1821 { 1871 {
1822 bgPixmap.set_root_pixmap (); 1872#if BG_IMAGE_FROM_ROOT
1873 if (option (Opt_transparent))
1874 {
1875 rxvt_img::new_from_root (this)->replace (root_img);
1823 update_background (); 1876 update_background ();
1877 }
1878#endif
1879 HOOK_INVOKE ((this, HOOK_ROOTPMAP_CHANGE, DT_END));
1824 } 1880 }
1825 1881
1826 break; 1882 break;
1827 } 1883 }
1828# endif
1829 1884
1830 refresh_check (); 1885 refresh_check ();
1831} 1886}
1832#endif 1887#endif
1833 1888
… …
1856 iso14755_54 (ev.x, ev.y); 1911 iso14755_54 (ev.x, ev.y);
1857 return; 1912 return;
1858 } 1913 }
1859#endif 1914#endif
1860 1915
1861 clickintime = ev.time - MEvent.time < MULTICLICK_TIME; 1916 clickintime = ev.time - MEvent.time < multiClickTime;
1862 1917
1863 if (reportmode) 1918 if (reportmode)
1864 { 1919 {
1865 /* mouse report from vt window */ 1920 /* mouse report from vt window */
1866 /* save the xbutton state (for ButtonRelease) */ 1921 /* save the xbutton state (for ButtonRelease) */
1867 MEvent.state = ev.state; 1922 MEvent.state = ev.state;
1868#ifdef MOUSE_REPORT_DOUBLECLICK 1923#ifdef MOUSE_REPORT_DOUBLECLICK
1869 if (ev.button == MEvent.button && clickintime) 1924 if (ev.button == MEvent.button && clickintime)
1870 { 1925 {
1871 /* same button, within alloted time */ 1926 /* same button, within allowed time */
1872 MEvent.clicks++; 1927 MEvent.clicks++;
1873 1928
1874 if (MEvent.clicks > 1) 1929 if (MEvent.clicks > 1)
1875 { 1930 {
1876 /* only report double clicks */ 1931 /* only report double clicks */
… …
1957 if (scrollBar.upButton (ev.y)) 2012 if (scrollBar.upButton (ev.y))
1958 direction = UP; /* up */ 2013 direction = UP; /* up */
1959 else if (scrollBar.dnButton (ev.y)) 2014 else if (scrollBar.dnButton (ev.y))
1960 direction = DN; /* down */ 2015 direction = DN; /* down */
1961 2016
1962 scrollBar.state = STATE_IDLE; 2017 scrollBar.state = SB_STATE_IDLE;
1963 /* 2018 /*
1964 * Rxvt-style scrollbar: 2019 * Rxvt-style scrollbar:
1965 * move up if mouse is above slider 2020 * move up if mouse is above slider
1966 * move dn if mouse is below slider 2021 * move dn if mouse is below slider
1967 * 2022 *
… …
2006 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY); 2061 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2007#endif 2062#endif
2008 if (scr_page (direction, 1)) 2063 if (scr_page (direction, 1))
2009 { 2064 {
2010 if (direction == UP) 2065 if (direction == UP)
2011 scrollBar.state = STATE_UP; 2066 scrollBar.state = SB_STATE_UP;
2012 else 2067 else
2013 scrollBar.state = STATE_DOWN; 2068 scrollBar.state = SB_STATE_DOWN;
2014 } 2069 }
2015 } 2070 }
2016 else 2071 else
2017 switch (ev.button) 2072 switch (ev.button)
2018 { 2073 {
2019 case Button2: 2074 case Button2:
2020 switch (scrollBar.align) 2075 switch (scrollBar.align)
2021 { 2076 {
2022 case R_SB_ALIGN_TOP: 2077 case SB_ALIGN_TOP:
2023 csrO = 0; 2078 csrO = 0;
2024 break; 2079 break;
2025 case R_SB_ALIGN_CENTRE: 2080 case SB_ALIGN_CENTRE:
2026 csrO = (scrollBar.bot - scrollBar.top) / 2; 2081 csrO = (scrollBar.bot - scrollBar.top) / 2;
2027 break; 2082 break;
2028 case R_SB_ALIGN_BOTTOM: 2083 case SB_ALIGN_BOTTOM:
2029 csrO = scrollBar.bot - scrollBar.top; 2084 csrO = scrollBar.bot - scrollBar.top;
2030 break; 2085 break;
2031 } 2086 }
2032 2087
2033 if (scrollBar.style == R_SB_XTERM 2088 if (scrollBar.style == SB_STYLE_XTERM
2034 || scrollbar_above_slider (ev.y) 2089 || scrollBar.above_slider (ev.y)
2035 || scrollbar_below_slider (ev.y)) 2090 || scrollBar.below_slider (ev.y))
2036 scr_move_to (scrollbar_position (ev.y) - csrO, scrollBar.size ()); 2091 scr_move_to (scrollBar.position (ev.y) - csrO, scrollBar.size ());
2037 2092
2038 scrollBar.state = STATE_MOTION; 2093 scrollBar.state = SB_STATE_MOTION;
2039 break; 2094 break;
2040 2095
2041 case Button1: 2096 case Button1:
2042 if (scrollBar.align == R_SB_ALIGN_CENTRE) 2097 if (scrollBar.align == SB_ALIGN_CENTRE)
2043 csrO = ev.y - scrollBar.top; 2098 csrO = ev.y - scrollBar.top;
2044 /* FALLTHROUGH */ 2099 /* FALLTHROUGH */
2045 2100
2046 case Button3: 2101 case Button3:
2047 if (scrollBar.style != R_SB_XTERM) 2102 if (scrollBar.style != SB_STYLE_XTERM)
2048 { 2103 {
2049 if (scrollbar_above_slider (ev.y)) 2104 if (scrollBar.above_slider (ev.y))
2050# ifdef RXVT_SCROLL_FULL 2105# ifdef RXVT_SCROLL_FULL
2051 scr_page (UP, nrow - 1); 2106 scr_page (UP, nrow - 1);
2052# else 2107# else
2053 scr_page (UP, nrow / 4); 2108 scr_page (UP, nrow / 4);
2054# endif 2109# endif
2055 else if (scrollbar_below_slider (ev.y)) 2110 else if (scrollBar.below_slider (ev.y))
2056# ifdef RXVT_SCROLL_FULL 2111# ifdef RXVT_SCROLL_FULL
2057 scr_page (DN, nrow - 1); 2112 scr_page (DN, nrow - 1);
2058# else 2113# else
2059 scr_page (DN, nrow / 4); 2114 scr_page (DN, nrow / 4);
2060# endif 2115# endif
2061 else 2116 else
2062 scrollBar.state = STATE_MOTION; 2117 scrollBar.state = SB_STATE_MOTION;
2063 } 2118 }
2064 else 2119 else
2065 { 2120 {
2066 scr_page ((ev.button == Button1 ? DN : UP), 2121 scr_page ((ev.button == Button1 ? DN : UP),
2067 (nrow 2122 (nrow
2068 * scrollbar_position (ev.y) 2123 * scrollBar.position (ev.y)
2069 / scrollBar.size ())); 2124 / scrollBar.size ()));
2070 } 2125 }
2071 2126
2072 break; 2127 break;
2073 } 2128 }
… …
2084 2139
2085 csrO = 0; /* reset csr Offset */ 2140 csrO = 0; /* reset csr Offset */
2086 if (!bypass_keystate) 2141 if (!bypass_keystate)
2087 reportmode = !! (priv_modes & PrivMode_mouse_report); 2142 reportmode = !! (priv_modes & PrivMode_mouse_report);
2088 2143
2089 if (scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN) 2144 if (scrollBar.state == SB_STATE_UP || scrollBar.state == SB_STATE_DOWN)
2090 { 2145 {
2091 scrollBar.state = STATE_IDLE; 2146 scrollBar.state = SB_STATE_IDLE;
2092 scrollBar.show (0); 2147 scrollBar.show (0);
2093 } 2148 }
2094 2149
2095#ifdef SELECTION_SCROLLING 2150#ifdef SELECTION_SCROLLING
2096 sel_scroll_ev.stop(); 2151 sel_scroll_ev.stop();
… …
2116#ifdef MOUSE_REPORT_DOUBLECLICK 2171#ifdef MOUSE_REPORT_DOUBLECLICK
2117 /* only report the release of 'slow' single clicks */ 2172 /* only report the release of 'slow' single clicks */
2118 if (MEvent.button != AnyButton 2173 if (MEvent.button != AnyButton
2119 && (ev.button != MEvent.button 2174 && (ev.button != MEvent.button
2120 || (ev.time - MEvent.time 2175 || (ev.time - MEvent.time
2121 > MULTICLICK_TIME / 2))) 2176 > multiClickTime / 2)))
2122 { 2177 {
2123 MEvent.clicks = 0; 2178 MEvent.clicks = 0;
2124 MEvent.button = AnyButton; 2179 MEvent.button = AnyButton;
2125 mouse_report (ev); 2180 mouse_report (ev);
2126 } 2181 }
… …
2146 case Button3: 2201 case Button3:
2147 selection_make (ev.time); 2202 selection_make (ev.time);
2148 break; 2203 break;
2149 2204
2150 case Button2: 2205 case Button2:
2151 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window? 2206 if (IN_RANGE_EXC (ev.x, 0, vt_width) && IN_RANGE_EXC (ev.y, 0, vt_height)) // inside window?
2152 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary); 2207 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2153 break; 2208 break;
2154 2209
2155#ifdef MOUSE_WHEEL 2210#ifdef MOUSE_WHEEL
2156 case Button4: 2211 case Button4:
2157 case Button5: 2212 case Button5:
2158 { 2213 {
2159 int i; 2214 int lines;
2160 page_dirn v; 2215 page_dirn dirn;
2161 2216
2162 v = ev.button == Button4 ? UP : DN; 2217 dirn = ev.button == Button4 ? UP : DN;
2163 2218
2164 if (ev.state & ShiftMask) 2219 if (ev.state & ShiftMask)
2165 i = 1; 2220 lines = 1;
2166 else if (option (Opt_mouseWheelScrollPage)) 2221 else if (option (Opt_mouseWheelScrollPage))
2167 i = nrow - 1; 2222 lines = nrow - 1;
2168 else 2223 else
2169 i = 5; 2224 lines = 5;
2170 2225
2171# ifdef MOUSE_SLIP_WHEELING 2226# ifdef MOUSE_SLIP_WHEELING
2172 if (ev.state & ControlMask) 2227 if (ev.state & ControlMask)
2173 { 2228 {
2174 mouse_slip_wheel_speed += v ? -1 : 1; 2229 mouse_slip_wheel_speed += dirn;
2175 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow; 2230 clamp_it (mouse_slip_wheel_speed, -nrow, nrow);
2176 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2177 2231
2178 if (!slip_wheel_ev.is_active ()) 2232 if (!slip_wheel_ev.is_active ())
2179 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY); 2233 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2180 } 2234 }
2181 else 2235 else
2182# endif 2236# endif
2183 { 2237 {
2184 scr_page (v, i); 2238 scr_page (dirn, lines);
2185 scrollBar.show (1); 2239 scrollBar.show (1);
2186 } 2240 }
2187 } 2241 }
2188 break; 2242 break;
2189#endif 2243#endif
… …
2191 } 2245 }
2192} 2246}
2193 2247
2194/*}}} */ 2248/*}}} */
2195 2249
2196void 2250void ecb_hot
2197rxvt_term::cmd_parse () 2251rxvt_term::cmd_parse ()
2198{ 2252{
2199 wchar_t ch = NOCHAR; 2253 wchar_t ch = NOCHAR;
2200 char *seq_begin; // remember start of esc-sequence here 2254 char *seq_begin; // remember start of esc-sequence here
2201 2255
2202 for (;;) 2256 for (;;)
2203 { 2257 {
2204 if (expect_false (ch == NOCHAR)) 2258 if (ecb_unlikely (ch == NOCHAR))
2205 { 2259 {
2206 seq_begin = cmdbuf_ptr; 2260 seq_begin = cmdbuf_ptr;
2207 ch = next_char (); 2261 ch = next_char ();
2208 2262
2209 if (ch == NOCHAR) 2263 if (ch == NOCHAR)
2210 break; 2264 break;
2211 } 2265 }
2212 2266
2213 if (expect_true (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)) 2267 if (ecb_likely (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT))
2214 { 2268 {
2215 if (expect_false (!seen_input)) 2269 if (ecb_unlikely (!seen_input))
2216 { 2270 {
2217 seen_input = 1; 2271 seen_input = 1;
2218 // many badly-written programs (e.g. jed) contain a race condition: 2272 // many badly-written programs (e.g. jed) contain a race condition:
2219 // they first read the screensize and then install a SIGWINCH handler. 2273 // they first read the screensize and then install a SIGWINCH handler.
2220 // some window managers resize the window early, and these programs 2274 // some window managers resize the window early, and these programs
… …
2233 wchar_t *str = buf; 2287 wchar_t *str = buf;
2234 wchar_t *eol = str + min (ncol, UBUFSIZ); 2288 wchar_t *eol = str + min (ncol, UBUFSIZ);
2235 2289
2236 for (;;) 2290 for (;;)
2237 { 2291 {
2238 if (expect_false (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))) 2292 if (ecb_unlikely (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)))
2239 break; 2293 break;
2240 2294
2241 *str++ = ch; 2295 *str++ = ch;
2242 2296
2243 if (expect_false (ch == C0_LF || str >= eol)) 2297 if (ecb_unlikely (ch == C0_LF || str >= eol))
2244 { 2298 {
2245 if (ch == C0_LF) 2299 if (ch == C0_LF)
2246 nlines++; 2300 nlines++;
2247 2301
2248 refresh_count++; 2302 refresh_count++;
… …
2320 } 2374 }
2321 } 2375 }
2322} 2376}
2323 2377
2324// read the next character 2378// read the next character
2325wchar_t 2379wchar_t ecb_hot
2326rxvt_term::next_char () NOTHROW 2380rxvt_term::next_char () NOTHROW
2327{ 2381{
2328 while (cmdbuf_ptr < cmdbuf_endp) 2382 while (cmdbuf_ptr < cmdbuf_endp)
2329 { 2383 {
2330 // assume 7-bit to be ascii ALWAYS 2384 // assume 7-bit to be ascii ALWAYS
2331 if (expect_true ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)) 2385 if (ecb_likely ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b))
2332 return *cmdbuf_ptr++; 2386 return *cmdbuf_ptr++;
2333 2387
2334 wchar_t wc; 2388 wchar_t wc;
2335 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2389 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2336 2390
… …
2342 } 2396 }
2343 2397
2344 if (len == (size_t)-1) 2398 if (len == (size_t)-1)
2345 { 2399 {
2346 mbstate.reset (); // reset now undefined conversion state 2400 mbstate.reset (); // reset now undefined conversion state
2401 // a -1 might indicate that a previous incomplete char is invalid (previous return -2)
2402 // in which case we "erroneously" return the next byte which might be valid.
2347 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2403 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2348 } 2404 }
2349 2405
2350 // assume wchar == unicode 2406 // assume wchar == unicode
2351 cmdbuf_ptr += len; 2407 cmdbuf_ptr += len;
… …
2354 2410
2355 return NOCHAR; 2411 return NOCHAR;
2356} 2412}
2357 2413
2358// read the next octet 2414// read the next octet
2359uint32_t 2415uint32_t ecb_hot
2360rxvt_term::next_octet () NOTHROW 2416rxvt_term::next_octet () NOTHROW
2361{ 2417{
2362 return cmdbuf_ptr < cmdbuf_endp 2418 return cmdbuf_ptr < cmdbuf_endp
2363 ? (unsigned char)*cmdbuf_ptr++ 2419 ? (unsigned char)*cmdbuf_ptr++
2364 : NOCHAR; 2420 : NOCHAR;
2365} 2421}
2366 2422
2367static class out_of_input out_of_input; 2423static class out_of_input out_of_input;
2368 2424
2369/* rxvt_cmd_getc () - Return next input character */ 2425wchar_t ecb_hot
2370/*
2371 * Return the next input character after first passing any keyboard input
2372 * to the command.
2373 */
2374wchar_t
2375rxvt_term::cmd_getc () THROW ((class out_of_input)) 2426rxvt_term::cmd_getc () THROW ((class out_of_input))
2376{ 2427{
2377 wchar_t c = next_char (); 2428 wchar_t c = next_char ();
2378 2429
2379 if (c == NOCHAR) 2430 if (c == NOCHAR)
2380 throw out_of_input; 2431 throw out_of_input;
2381 2432
2382 return c; 2433 return c;
2383} 2434}
2384 2435
2385uint32_t 2436uint32_t ecb_hot
2386rxvt_term::cmd_get8 () THROW ((class out_of_input)) 2437rxvt_term::cmd_get8 () THROW ((class out_of_input))
2387{ 2438{
2388 uint32_t c = next_octet (); 2439 uint32_t c = next_octet ();
2389 2440
2390 if (c == NOCHAR) 2441 if (c == NOCHAR)
… …
2394} 2445}
2395 2446
2396/*{{{ print pipe */ 2447/*{{{ print pipe */
2397/*----------------------------------------------------------------------*/ 2448/*----------------------------------------------------------------------*/
2398#ifdef PRINTPIPE 2449#ifdef PRINTPIPE
2399FILE * 2450FILE * ecb_cold
2400rxvt_term::popen_printer () 2451rxvt_term::popen_printer ()
2401{ 2452{
2402 FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w"); 2453 FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");
2403 2454
2404 if (stream == NULL) 2455 if (stream == NULL)
2405 rxvt_warn ("can't open printer pipe, not printing.\n"); 2456 rxvt_warn ("can't open printer pipe, not printing.\n");
2406 2457
2407 return stream; 2458 return stream;
2408} 2459}
2409 2460
2410int 2461int ecb_cold
2411rxvt_term::pclose_printer (FILE *stream) 2462rxvt_term::pclose_printer (FILE *stream)
2412{ 2463{
2413 fflush (stream); 2464 fflush (stream);
2414 return pclose (stream); 2465 return pclose (stream);
2415} 2466}
2416 2467
2417/* 2468/*
2418 * simulate attached vt100 printer 2469 * simulate attached vt100 printer
2419 */ 2470 */
2420void 2471void ecb_cold
2421rxvt_term::process_print_pipe () 2472rxvt_term::process_print_pipe ()
2422{ 2473{
2423 FILE *fd = popen_printer (); 2474 FILE *fd = popen_printer ();
2424 2475
2425 if (!fd) 2476 if (!fd)
… …
2471 pclose_printer (fd); 2522 pclose_printer (fd);
2472} 2523}
2473#endif /* PRINTPIPE */ 2524#endif /* PRINTPIPE */
2474/*}}} */ 2525/*}}} */
2475 2526
2476/* *INDENT-OFF* */
2477enum { 2527enum {
2478 C1_40 = 0x40, 2528 C1_40 = 0x40,
2479 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA, 2529 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA,
2480 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3, 2530 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3,
2481 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA, 2531 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA,
2482 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC, 2532 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC,
2483}; 2533};
2484/* *INDENT-ON* */
2485 2534
2486/*{{{ process non-printing single characters */ 2535/*{{{ process non-printing single characters */
2487void 2536void ecb_hot
2488rxvt_term::process_nonprinting (unicode_t ch) 2537rxvt_term::process_nonprinting (unicode_t ch)
2489{ 2538{
2490 switch (ch) 2539 switch (ch)
2491 { 2540 {
2492 case C0_ESC: 2541 case C0_ESC:
… …
2538} 2587}
2539/*}}} */ 2588/*}}} */
2540 2589
2541 2590
2542/*{{{ process VT52 escape sequences */ 2591/*{{{ process VT52 escape sequences */
2543void 2592void ecb_cold
2544rxvt_term::process_escape_vt52 (unicode_t ch) 2593rxvt_term::process_escape_vt52 (unicode_t ch)
2545{ 2594{
2546 int row, col; 2595 int row, col;
2547 2596
2548 switch (ch) 2597 switch (ch)
… …
2582 break; 2631 break;
2583 case 'Z': /* identify the terminal type */ 2632 case 'Z': /* identify the terminal type */
2584 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */ 2633 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
2585 break; 2634 break;
2586 case '<': /* turn off VT52 mode */ 2635 case '<': /* turn off VT52 mode */
2587 set_privmode (PrivMode_vt52, 0); 2636 priv_modes &= ~PrivMode_vt52;
2588 break; 2637 break;
2589 case 'F': /* use special graphics character set */ 2638 case 'F': /* use special graphics character set */
2590 case 'G': /* use regular character set */ 2639 case 'G': /* use regular character set */
2591 /* unimplemented */ 2640 /* unimplemented */
2592 break; 2641 break;
… …
2598} 2647}
2599/*}}} */ 2648/*}}} */
2600 2649
2601 2650
2602/*{{{ process escape sequences */ 2651/*{{{ process escape sequences */
2603void 2652void ecb_hot
2604rxvt_term::process_escape_seq () 2653rxvt_term::process_escape_seq ()
2605{ 2654{
2606 unicode_t ch = cmd_getc (); 2655 unicode_t ch = cmd_getc ();
2607 2656
2608 if (priv_modes & PrivMode_vt52) 2657 if (priv_modes & PrivMode_vt52)
… …
2611 return; 2660 return;
2612 } 2661 }
2613 2662
2614 switch (ch) 2663 switch (ch)
2615 { 2664 {
2616 /* case 1: do_tek_mode (); break; */
2617 case '#': 2665 case '#':
2618 if (cmd_getc () == '8') 2666 if (cmd_getc () == '8')
2619 scr_E (); 2667 scr_E ();
2620 break; 2668 break;
2621 case '(': 2669 case '(':
… …
2644#if !ENABLE_MINIMAL 2692#if !ENABLE_MINIMAL
2645 case '9': 2693 case '9':
2646 scr_forwardindex (); 2694 scr_forwardindex ();
2647 break; 2695 break;
2648#endif 2696#endif
2697 // DECPAM/DECPNM
2649 case '=': 2698 case '=':
2699 priv_modes |= PrivMode_aplKP;
2700 break;
2650 case '>': 2701 case '>':
2651 set_privmode (PrivMode_aplKP, ch == '='); 2702 priv_modes &= ~PrivMode_aplKP;
2652 break; 2703 break;
2653 2704
2654 case C1_40: 2705 case C1_40:
2655 cmd_getc (); 2706 cmd_getc ();
2656 break; 2707 break;
… …
2660 2711
2661 /* 8.3.87: NEXT LINE */ 2712 /* 8.3.87: NEXT LINE */
2662 case C1_NEL: /* ESC E */ 2713 case C1_NEL: /* ESC E */
2663 { 2714 {
2664 wchar_t nlcr[] = { C0_LF, C0_CR }; 2715 wchar_t nlcr[] = { C0_LF, C0_CR };
2665 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1); 2716 scr_add_lines (nlcr, ecb_array_length (nlcr), 1);
2666 } 2717 }
2667 break; 2718 break;
2668 2719
2669 /* kidnapped escape sequence: Should be 8.3.48 */ 2720 /* kidnapped escape sequence: Should be 8.3.48 */
2670 case C1_ESA: /* ESC G */ 2721 case C1_ESA: /* ESC G */
2671 process_graphics (); 2722 // used by original rxvt for rob nations own graphics mode
2723 if (cmd_getc () == 'Q')
2724 tt_printf ("\033G0\012"); /* query graphics - no graphics */
2672 break; 2725 break;
2673 2726
2674 /* 8.3.63: CHARACTER TABULATION SET */ 2727 /* 8.3.63: CHARACTER TABULATION SET */
2675 case C1_HTS: /* ESC H */ 2728 case C1_HTS: /* ESC H */
2676 scr_set_tab (1); 2729 scr_set_tab (1);
… …
2680 case C1_RI: /* ESC M */ 2733 case C1_RI: /* ESC M */
2681 scr_index (DN); 2734 scr_index (DN);
2682 break; 2735 break;
2683 2736
2684 /* 8.3.142: SINGLE-SHIFT TWO */ 2737 /* 8.3.142: SINGLE-SHIFT TWO */
2685 /*case C1_SS2: scr_single_shift (2); break; */ 2738 /* case C1_SS2: break; */
2686 2739
2687 /* 8.3.143: SINGLE-SHIFT THREE */ 2740 /* 8.3.143: SINGLE-SHIFT THREE */
2688 /*case C1_SS3: scr_single_shift (3); break; */ 2741 /* case C1_SS3: break; */
2689 2742
2690 /* 8.3.27: DEVICE CONTROL STRING */ 2743 /* 8.3.27: DEVICE CONTROL STRING */
2691 case C1_DCS: /* ESC P */ 2744 case C1_DCS: /* ESC P */
2692 process_dcs_seq (); 2745 process_dcs_seq ();
2693 break; 2746 break;
… …
2726 } 2779 }
2727} 2780}
2728/*}}} */ 2781/*}}} */
2729 2782
2730/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */ 2783/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */
2731/* *INDENT-OFF* */
2732enum { 2784enum {
2733 CSI_ICH = 0x40, 2785 CSI_ICH = 0x40,
2734 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA, 2786 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA,
2735 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA , 2787 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA ,
2736 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC, 2788 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC,
… …
2739 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ, 2791 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ,
2740 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 , 2792 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 ,
2741 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F 2793 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F
2742}; 2794};
2743 2795
2744#define make_byte(b7,b6,b5,b4,b3,b2,b1,b0) \ 2796#define make_byte(b0,b1,b2,b3,b4,b5,b6,b7) \
2745 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \ 2797 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \
2746 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0)) 2798 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0))
2747#define get_byte_array_bit(array, bit) \ 2799#define get_byte_array_bit(array, bit) \
2748 (!! ((array)[ (bit) / 8] & (128 >> ((bit) & 7)))) 2800 (!! ((array)[(bit) >> 3] & (1 << ((bit) & 7))))
2749 2801
2750const unsigned char csi_defaults[] = 2802static const unsigned char csi_defaults[] =
2751 { 2803 {
2752 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */ 2804 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */
2753 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */ 2805 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */
2754 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */ 2806 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */
2755 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */ 2807 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */
2756 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */ 2808 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */
2757 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */ 2809 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */
2758 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */ 2810 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */
2759 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */ 2811 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */
2760 }; 2812 };
2761/* *INDENT-ON* */
2762 2813
2763void 2814void ecb_hot
2764rxvt_term::process_csi_seq () 2815rxvt_term::process_csi_seq ()
2765{ 2816{
2766 unicode_t ch, priv, i; 2817 unicode_t ch, priv, prev_ch, i;
2767 unsigned int nargs, p; 2818 unsigned int nargs, p;
2768 int n, ndef; 2819 int n, ndef;
2769 int arg[ESC_ARGS] = { }; 2820 int arg[ESC_ARGS] = { };
2770 2821
2771 nargs = 0; 2822 nargs = 0;
… …
2777 /* '<' '=' '>' '?' '!' */ 2828 /* '<' '=' '>' '?' '!' */
2778 priv = ch; 2829 priv = ch;
2779 ch = cmd_getc (); 2830 ch = cmd_getc ();
2780 } 2831 }
2781 2832
2833 prev_ch = 0;
2782 /* read any numerical arguments */ 2834 /* read any numerical arguments */
2783 for (n = -1; ch < CSI_ICH; ) 2835 for (n = -1; ch < CSI_ICH; )
2784 { 2836 {
2785 if (isdigit (ch)) 2837 if (isdigit (ch))
2786 { 2838 {
… …
2796 n = -1; 2848 n = -1;
2797 } 2849 }
2798 else if (IS_CONTROL (ch)) 2850 else if (IS_CONTROL (ch))
2799 process_nonprinting (ch); 2851 process_nonprinting (ch);
2800 2852
2853 prev_ch = ch;
2801 ch = cmd_getc (); 2854 ch = cmd_getc ();
2802 } 2855 }
2803 2856
2804 if (ch > CSI_7F) 2857 if (ch > CSI_7F)
2805 return; 2858 return;
… …
2844 { 2897 {
2845 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */ 2898 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */
2846 scr_soft_reset (); 2899 scr_soft_reset ();
2847 2900
2848 static const int pm_h[] = { 7, 25 }; 2901 static const int pm_h[] = { 7, 25 };
2849 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1049 }; 2902 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1005, 1015, 1049 };
2850 2903
2851 process_terminal_mode ('h', 0, sizeof (pm_h) / sizeof (pm_h[0]), pm_h); 2904 process_terminal_mode ('h', 0, ecb_array_length (pm_h), pm_h);
2852 process_terminal_mode ('l', 0, sizeof (pm_l) / sizeof (pm_l[0]), pm_l); 2905 process_terminal_mode ('l', 0, ecb_array_length (pm_l), pm_l);
2853 } 2906 }
2854 break; 2907 break;
2855 } 2908 }
2856 2909
2857 return; 2910 return;
… …
2875 } 2928 }
2876 break; 2929 break;
2877#endif 2930#endif
2878 2931
2879 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */ 2932 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */
2880 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */ 2933 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */
2881 arg[0] = -arg[0]; 2934 arg[0] = -arg[0];
2882 /* FALLTHROUGH */ 2935 /* FALLTHROUGH */
2883 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */ 2936 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */
2884 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */ 2937 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */
2885 scr_gotorc (arg[0], 0, RELATIVE); 2938 scr_gotorc (arg[0], 0, RELATIVE);
2886 break; 2939 break;
2887 2940
2888 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */ 2941 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */
2889 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */ 2942 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */
… …
3039 scr_insert_mode (1); 3092 scr_insert_mode (1);
3040 else if (arg[0] == 20) 3093 else if (arg[0] == 20)
3041 priv_modes |= PrivMode_LFNL; 3094 priv_modes |= PrivMode_LFNL;
3042 break; 3095 break;
3043 3096
3097 case CSI_71: // DECSCUSR: set cursor style
3098 if (prev_ch == ' ')
3099 set_cursor_style (arg[0]);
3100 break;
3101
3044 /* 3102 /*
3045 * PRIVATE USE beyond this point. All CSI_7? sequences here 3103 * PRIVATE USE beyond this point. All CSI_7? sequences here
3046 */ 3104 */
3047 case CSI_72: /* DECSTBM: set top and bottom margins */ 3105 case CSI_72: /* DECSTBM: set top and bottom margins */
3048 if (nargs == 1) 3106 if (nargs == 1)
… …
3076 } 3134 }
3077} 3135}
3078/*}}} */ 3136/*}}} */
3079 3137
3080#if !ENABLE_MINIMAL 3138#if !ENABLE_MINIMAL
3081/* ARGSUSED */
3082void 3139void
3083rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3140rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3084{ 3141{
3085 int x, y; 3142 int x, y;
3086 XWindowAttributes wattr; 3143 XWindowAttributes wattr;
… …
3095 { 3152 {
3096 /* 3153 /*
3097 * commands 3154 * commands
3098 */ 3155 */
3099 case 1: /* deiconify window */ 3156 case 1: /* deiconify window */
3100 XMapWindow (dpy, parent[0]); 3157 XMapWindow (dpy, parent);
3101 break; 3158 break;
3102 case 2: /* iconify window */ 3159 case 2: /* iconify window */
3103 XIconifyWindow (dpy, parent[0], display->screen); 3160 XIconifyWindow (dpy, parent, display->screen);
3104 break; 3161 break;
3105 case 3: /* set position (pixels) */ 3162 case 3: /* set position (pixels) */
3106 XMoveWindow (dpy, parent[0], args[1], args[2]); 3163 XMoveWindow (dpy, parent, args[1], args[2]);
3107 break; 3164 break;
3108 case 4: /* set size (pixels) */ 3165 case 4: /* set size (pixels) */
3109 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3166 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3110 break; 3167 break;
3111 case 5: /* raise window */ 3168 case 5: /* raise window */
3112 XRaiseWindow (dpy, parent[0]); 3169 XRaiseWindow (dpy, parent);
3113 break; 3170 break;
3114 case 6: /* lower window */ 3171 case 6: /* lower window */
3115 XLowerWindow (dpy, parent[0]); 3172 XLowerWindow (dpy, parent);
3116 break; 3173 break;
3117 case 7: /* refresh window */ 3174 case 7: /* refresh window */
3118 scr_touch (true); 3175 scr_touch (true);
3119 break; 3176 break;
3120 case 8: /* set size (chars) */ 3177 case 8: /* set size (chars) */
… …
3123 break; 3180 break;
3124 3181
3125 //case 9: NYI, TODO, restore maximized window or maximize window 3182 //case 9: NYI, TODO, restore maximized window or maximize window
3126 default: 3183 default:
3127 if (args[0] >= 24) /* set height (chars) */ 3184 if (args[0] >= 24) /* set height (chars) */
3128 set_widthheight ((unsigned int)width, 3185 set_widthheight ((unsigned int)vt_width,
3129 (unsigned int) (args[1] * fheight)); 3186 (unsigned int) (args[1] * fheight));
3130 break; 3187 break;
3131 3188
3132 /* 3189 /*
3133 * reports - some output format copied from XTerm 3190 * reports - some output format copied from XTerm
3134 */ 3191 */
3135 case 11: /* report window state */ 3192 case 11: /* report window state */
3136 XGetWindowAttributes (dpy, parent[0], &wattr); 3193 XGetWindowAttributes (dpy, parent, &wattr);
3137 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3194 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3138 break; 3195 break;
3139 case 13: /* report window position */ 3196 case 13: /* report window position */
3140 XGetWindowAttributes (dpy, parent[0], &wattr); 3197 XGetWindowAttributes (dpy, parent, &wattr);
3141 XTranslateCoordinates (dpy, parent[0], wattr.root, 3198 XTranslateCoordinates (dpy, parent, wattr.root,
3142 -wattr.border_width, -wattr.border_width, 3199 -wattr.border_width, -wattr.border_width,
3143 &x, &y, &wdummy); 3200 &x, &y, &wdummy);
3144 tt_printf ("\033[3;%d;%dt", x, y); 3201 tt_printf ("\033[3;%d;%dt", x, y);
3145 break; 3202 break;
3146 case 14: /* report window size (pixels) */ 3203 case 14: /* report window size (pixels) */
3147 XGetWindowAttributes (dpy, parent[0], &wattr); 3204 XGetWindowAttributes (dpy, parent, &wattr);
3148 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3205 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3149 break; 3206 break;
3150 case 18: /* report text area size (chars) */ 3207 case 18: /* report text area size (chars) */
3151 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3208 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3152 break; 3209 break;
… …
3154 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3211 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3155 break; 3212 break;
3156 case 20: /* report icon label */ 3213 case 20: /* report icon label */
3157 { 3214 {
3158 char *s; 3215 char *s;
3159 XGetIconName (dpy, parent[0], &s); 3216 XGetIconName (dpy, parent, &s);
3160 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3217 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3161 XFree (s); 3218 XFree (s);
3162 } 3219 }
3163 break; 3220 break;
3164 case 21: /* report window title */ 3221 case 21: /* report window title */
3165 { 3222 {
3166 char *s; 3223 char *s;
3167 XFetchName (dpy, parent[0], &s); 3224 XFetchName (dpy, parent, &s);
3168 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3225 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3169 XFree (s); 3226 XFree (s);
3170 } 3227 }
3171 break; 3228 break;
3172 } 3229 }
… …
3182rxvt_term::get_to_st (unicode_t &ends_how) 3239rxvt_term::get_to_st (unicode_t &ends_how)
3183{ 3240{
3184 unicode_t ch; 3241 unicode_t ch;
3185 bool seen_esc = false; 3242 bool seen_esc = false;
3186 unsigned int n = 0; 3243 unsigned int n = 0;
3187 wchar_t string[STRING_MAX]; 3244 wchar_t string[CBUFSIZ];
3188 3245
3189 while ((ch = cmd_getc ()) != NOCHAR) 3246 while ((ch = cmd_getc ()) != NOCHAR)
3190 { 3247 {
3191 if (seen_esc) 3248 if (seen_esc)
3192 { 3249 {
… …
3207 else if (ch < 0x20) 3264 else if (ch < 0x20)
3208 return NULL; /* other control character - exit */ 3265 return NULL; /* other control character - exit */
3209 3266
3210 seen_esc = false; 3267 seen_esc = false;
3211 3268
3212 if (n >= STRING_MAX - 1) 3269 if (n >= sizeof (string) - 1)
3213 // stop at some sane length 3270 // stop at some sane length
3214 return NULL; 3271 return NULL;
3215 3272
3216 string[n++] = ch; 3273 string[n++] = ch;
3217 } 3274 }
… …
3228 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3285 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3229 */ 3286 */
3230void 3287void
3231rxvt_term::process_dcs_seq () 3288rxvt_term::process_dcs_seq ()
3232{ 3289{
3233 char *s;
3234 unicode_t eh;
3235
3236 /* 3290 /*
3237 * Not handled yet 3291 * Not handled yet
3238 */ 3292 */
3293
3294 unicode_t eh;
3239 s = get_to_st (eh); 3295 char *s = get_to_st (eh);
3240 if (s) 3296 if (s)
3241 free (s); 3297 free (s);
3242 3298
3243 return; 3299 return;
3244} 3300}
… …
3248 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)' 3304 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)'
3249 */ 3305 */
3250void 3306void
3251rxvt_term::process_osc_seq () 3307rxvt_term::process_osc_seq ()
3252{ 3308{
3253 unicode_t ch, eh;
3254 int arg; 3309 int arg;
3255 3310
3256 ch = cmd_getc (); 3311 unicode_t ch = cmd_getc ();
3257 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3312 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3258 arg = arg * 10 + (ch - '0'); 3313 arg = arg * 10 + (ch - '0');
3259 3314
3260 if (ch == ';') 3315 if (ch == ';')
3261 { 3316 {
3317 unicode_t eh;
3262 char *s = get_to_st (eh); 3318 char *s = get_to_st (eh);
3263 3319
3264 if (s) 3320 if (s)
3265 { 3321 {
3266 process_xterm_seq (arg, s, eh); 3322 process_xterm_seq (arg, s, eh);
… …
3327 unsigned long bytes_after; 3383 unsigned long bytes_after;
3328 unsigned char *value = 0; 3384 unsigned char *value = 0;
3329 const char *str = ""; 3385 const char *str = "";
3330 3386
3331 if (prop 3387 if (prop
3332 && XGetWindowProperty (dpy, parent[0], 3388 && XGetWindowProperty (dpy, parent,
3333 prop, 0, 1<<16, 0, AnyPropertyType, 3389 prop, 0, 1<<16, 0, AnyPropertyType,
3334 &actual_type, &actual_format, 3390 &actual_type, &actual_format,
3335 &nitems, &bytes_after, &value) == Success 3391 &nitems, &bytes_after, &value) == Success
3336 && actual_type != None 3392 && actual_type != None
3337 && actual_format == 8) 3393 && actual_format == 8)
3338 str = (const char *)(value); 3394 str = (const char *)(value);
3339 3395
3340 tt_printf ("\033]%d;%s%c", op, str, resp); 3396 tt_printf ("\033]%d;%s%c", op, option (Opt_insecure) ? str : "", resp);
3341 3397
3342 XFree (value); 3398 XFree (value);
3343 } 3399 }
3344 else 3400 else
3345 { 3401 {
… …
3349 { 3405 {
3350 *eq = 0; 3406 *eq = 0;
3351 set_utf8_property (display->atom (str), eq + 1); 3407 set_utf8_property (display->atom (str), eq + 1);
3352 } 3408 }
3353 else 3409 else
3354 XDeleteProperty (dpy, parent[0], 3410 XDeleteProperty (dpy, parent,
3355 display->atom (str)); 3411 display->atom (str));
3356 } 3412 }
3357 break; 3413 break;
3358 3414
3359 case XTerm_Color: 3415 case XTerm_Color:
… …
3391 process_color_seq (op, Color_pointer_fg, str, resp); 3447 process_color_seq (op, Color_pointer_fg, str, resp);
3392 break; 3448 break;
3393 case XTerm_Color_pointer_bg: 3449 case XTerm_Color_pointer_bg:
3394 process_color_seq (op, Color_pointer_bg, str, resp); 3450 process_color_seq (op, Color_pointer_bg, str, resp);
3395 break; 3451 break;
3452#ifdef OPTION_HC
3453 case XTerm_Color_HC:
3454 process_color_seq (op, Color_HC, str, resp);
3455 break;
3456 case XTerm_Color_HTC:
3457 process_color_seq (op, Color_HTC, str, resp);
3458 break;
3459#endif
3396#ifndef NO_BOLD_UNDERLINE_REVERSE 3460#ifndef NO_BOLD_UNDERLINE_REVERSE
3397 case XTerm_Color_RV:
3398 process_color_seq (op, Color_RV, str, resp);
3399 break;
3400 case Rxvt_Color_BD:
3401 case URxvt_Color_BD: 3461 case URxvt_Color_BD:
3402 process_color_seq (op, Color_BD, str, resp); 3462 process_color_seq (op, Color_BD, str, resp);
3403 break; 3463 break;
3404 case Rxvt_Color_UL:
3405 case URxvt_Color_UL: 3464 case URxvt_Color_UL:
3406 process_color_seq (op, Color_UL, str, resp); 3465 process_color_seq (op, Color_UL, str, resp);
3407 break; 3466 break;
3408 case URxvt_Color_IT: 3467 case URxvt_Color_IT:
3409 process_color_seq (op, Color_IT, str, resp); 3468 process_color_seq (op, Color_IT, str, resp);
3410 break; 3469 break;
3411#endif 3470#endif
3412 case URxvt_Color_border: 3471 case URxvt_Color_border:
3413 process_color_seq (op, Color_border, str, resp); 3472 process_color_seq (op, Color_border, str, resp);
3414 break; 3473 break;
3415#if ENABLE_TRANSPARENCY 3474
3475#if BG_IMAGE_FROM_ROOT
3416 case URxvt_Color_tint: 3476 case URxvt_Color_tint:
3417 process_color_seq (op, Color_tint, str, resp); 3477 process_color_seq (op, Color_tint, str, resp);
3418 { 3478 {
3419 bool changed = false; 3479 bool changed = false;
3420 3480
3421 if (ISSET_PIXCOLOR (Color_tint)) 3481 if (ISSET_PIXCOLOR (Color_tint))
3422 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]); 3482 changed = root_effects.set_tint (pix_colors_focused [Color_tint]);
3423 else
3424 changed = bgPixmap.unset_tint ();
3425 3483
3426 if (changed) 3484 if (changed)
3427 update_background (); 3485 update_background ();
3428 } 3486 }
3429 3487
… …
3433#if BG_IMAGE_FROM_FILE 3491#if BG_IMAGE_FROM_FILE
3434 case Rxvt_Pixmap: 3492 case Rxvt_Pixmap:
3435 if (!strcmp (str, "?")) 3493 if (!strcmp (str, "?"))
3436 { 3494 {
3437 char str[256]; 3495 char str[256];
3496 int h_scale = fimage.h_scale;
3497 int v_scale = fimage.v_scale;
3498 int h_align = fimage.h_align;
3499 int v_align = fimage.v_align;
3438 3500
3439 sprintf (str, "[%dx%d+%d+%d]", 3501 sprintf (str, "[%dx%d+%d+%d]",
3440 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767), 3502 h_scale, v_scale,
3441 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767)); 3503 h_align, v_align);
3442 process_xterm_seq (XTerm_title, str, CHAR_ST); 3504 process_xterm_seq (XTerm_title, str, CHAR_ST);
3443 } 3505 }
3444 else 3506 else
3445 { 3507 {
3446 int changed = 0; 3508 bool changed = false;
3447 3509
3448 if (*str != ';') 3510 if (*str != ';')
3449 { 3511 {
3450 /* reset to default scaling :*/ 3512 try
3451 bgPixmap.unset_geometry (); 3513 {
3452 if (bgPixmap.set_file (str)) /* change pixmap */ 3514 fimage.set_file_geometry (this, str);
3453 changed++; 3515 changed = true;
3454 str = strchr (str, ';'); 3516 }
3455 if (str == NULL) 3517 catch (const class rxvt_failure_exception &e)
3456 bgPixmap.set_defaultGeometry (); 3518 {
3519 }
3457 } 3520 }
3458 3521 else
3459 while (str)
3460 { 3522 {
3461 str++; 3523 str++;
3462 if (bgPixmap.set_geometry (str)) 3524 if (fimage.set_geometry (str, true))
3463 changed++; 3525 changed = true;
3464 str = strchr (str, ';');
3465 } 3526 }
3466 3527
3467 if (changed) 3528 if (changed)
3529 {
3530 if (bg_window_position_sensitive ())
3531 {
3532 int x, y;
3533 get_window_origin (x, y);
3534 parent_x = x;
3535 parent_y = y;
3536 }
3468 update_background (); 3537 update_background ();
3538 }
3469 } 3539 }
3470 break; 3540 break;
3471#endif 3541#endif
3472 3542
3473 case XTerm_logfile: 3543 case XTerm_logfile:
… …
3560 * 's' = save 3630 * 's' = save
3561 * 'r' = restore 3631 * 'r' = restore
3562 * 't' = toggle 3632 * 't' = toggle
3563 * so no need for fancy checking 3633 * so no need for fancy checking
3564 */ 3634 */
3565int 3635int ecb_cold
3566rxvt_term::privcases (int mode, unsigned long bit) 3636rxvt_term::privcases (int mode, unsigned long bit)
3567{ 3637{
3568 int state; 3638 int state;
3569 3639
3570 if (mode == 's') 3640 if (mode == 's')
3571 { 3641 {
3572 SavedModes |= (priv_modes & bit); 3642 if (priv_modes & bit)
3643 SavedModes |= bit;
3644 else
3645 SavedModes &= ~bit;
3573 return -1; 3646 return -1;
3574 } 3647 }
3575 else 3648 else
3576 { 3649 {
3577 if (mode == 'r') 3650 if (mode == 'r')
3578 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3651 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3579 else 3652 else
3580 state = (mode == 't') ? ! (priv_modes & bit) : mode; 3653 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3581 set_privmode (bit, state); 3654
3655 if (state)
3656 priv_modes |= bit;
3657 else
3658 priv_modes &= ~bit;
3582 } 3659 }
3583 3660
3584 return state; 3661 return state;
3585} 3662}
3586 3663
3587/* we're not using priv _yet_ */ 3664/* we're not using priv _yet_ */
3588void 3665void
3589rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg) 3666rxvt_term::process_terminal_mode (int mode, int priv ecb_unused, unsigned int nargs, const int *arg)
3590{ 3667{
3591 unsigned int i, j; 3668 unsigned int i, j;
3592 int state; 3669 int state;
3593 3670
3594 static const struct 3671 static const struct
3595 { 3672 {
3596 const int argval; 3673 const int argval;
3597 const unsigned long bit; 3674 const unsigned long bit;
3598 } argtopriv[] = { 3675 } argtopriv[] = {
3599 { 1, PrivMode_aplCUR }, // DECCKM 3676 { 1, PrivMode_aplCUR }, // DECCKM
3600 { 2, PrivMode_vt52 }, 3677 { 2, PrivMode_vt52 }, // DECANM
3601 { 3, PrivMode_132 }, // DECCOLM 3678 { 3, PrivMode_132 }, // DECCOLM
3602 { 4, PrivMode_smoothScroll }, // DECSCLM 3679 { 4, PrivMode_smoothScroll }, // DECSCLM
3603 { 5, PrivMode_rVideo }, // DECSCNM 3680 { 5, PrivMode_rVideo }, // DECSCNM
3604 { 6, PrivMode_relOrigin }, // DECOM 3681 { 6, PrivMode_relOrigin }, // DECOM
3605 { 7, PrivMode_Autowrap }, // DECAWM 3682 { 7, PrivMode_Autowrap }, // DECAWM
3606 // 8, auto-repeat keys // DECARM 3683 // 8, auto-repeat keys // DECARM
3607 { 9, PrivMode_MouseX10 }, 3684 { 9, PrivMode_MouseX10 },
3608 // 18 end FF to printer after print screen 3685 // 18 end FF to printer after print screen
3609 // 19 Print screen prints full screen/scorll region 3686 // 19 Print screen prints full screen/scroll region
3610 { 25, PrivMode_VisibleCursor }, // cnorm/cvvis/civis 3687 { 25, PrivMode_VisibleCursor }, // DECTCEM cnorm/cvvis/civis
3611#ifdef scrollBar_esc 3688#ifdef scrollBar_esc
3612 { scrollBar_esc, PrivMode_scrollBar }, 3689 { scrollBar_esc, PrivMode_scrollBar },
3613#endif 3690#endif
3614 { 35, PrivMode_ShiftKeys }, // rxvt extension 3691 { 35, PrivMode_ShiftKeys }, // rxvt extension
3615 // 38, tektronix mode // DECTEK 3692 // 38, tektronix mode // DECTEK
3616 { 40, PrivMode_132OK }, 3693 { 40, PrivMode_132OK },
3617 // 41 xterm more fixes NYI 3694 // 41 xterm more fixes NYI
3618 // 45 margin bell NYI 3695 // 45 margin bell NYI
3619 // 46 start logging 3696 // 46 start logging
3620 { 47, PrivMode_Screen }, 3697 { 47, PrivMode_Screen },
3621 { 66, PrivMode_aplKP }, // DECPAM/DECPNM 3698 { 66, PrivMode_aplKP }, // DECNKM
3622#ifndef NO_BACKSPACE_KEY 3699#ifndef NO_BACKSPACE_KEY
3623 { 67, PrivMode_BackSpace }, // DECBKM 3700 { 67, PrivMode_BackSpace }, // DECBKM
3624#endif 3701#endif
3625 { 1000, PrivMode_MouseX11 }, 3702 { 1000, PrivMode_MouseX11 },
3626 { 1002, PrivMode_MouseBtnEvent }, 3703 { 1002, PrivMode_MouseBtnEvent },
3627 { 1003, PrivMode_MouseAnyEvent }, 3704 { 1003, PrivMode_MouseAnyEvent },
3705#if ENABLE_FRILLS
3706 { 1005, PrivMode_ExtModeMouse },
3707#endif
3628 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3708 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3629 { 1011, PrivMode_Keypress }, // rxvt extension 3709 { 1011, PrivMode_Keypress }, // rxvt extension
3710#if ENABLE_FRILLS
3711 { 1015, PrivMode_ExtMouseRight }, // urxvt extension of 1005
3712#endif
3630 // 1035 enable modifiers for alt, numlock NYI 3713 // 1035 enable modifiers for alt, numlock NYI
3631 // 1036 send ESC for meta keys NYI 3714 // 1036 send ESC for meta keys NYI
3632 // 1037 send DEL for keypad delete NYI 3715 // 1037 send DEL for keypad delete NYI
3633 { 1047, PrivMode_Screen }, 3716 { 1047, PrivMode_Screen },
3634 // 1048 save and restore cursor 3717 // 1048 save and restore cursor, implemented in code
3635 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */ 3718 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
3636 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3719 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3637 { 2004, PrivMode_BracketPaste }, 3720 { 2004, PrivMode_BracketPaste },
3638 }; 3721 };
3639 3722
… …
3649 for (i = 0; i < nargs; i++) 3732 for (i = 0; i < nargs; i++)
3650 { 3733 {
3651 state = -1; 3734 state = -1;
3652 3735
3653 /* basic handling */ 3736 /* basic handling */
3654 for (j = 0; j < (sizeof (argtopriv)/sizeof (argtopriv[0])); j++) 3737 for (j = 0; j < ecb_array_length (argtopriv); j++)
3655 if (argtopriv[j].argval == arg[i]) 3738 if (argtopriv[j].argval == arg[i])
3656 { 3739 {
3657 state = privcases (mode, argtopriv[j].bit); 3740 state = privcases (mode, argtopriv[j].bit);
3658 break; 3741 break;
3659 } 3742 }
… …
3685 case 2: /* VT52 mode */ 3768 case 2: /* VT52 mode */
3686 /* oddball mode. should be set regardless of set/reset 3769 /* oddball mode. should be set regardless of set/reset
3687 * parameter. Return from VT52 mode with an ESC < from 3770 * parameter. Return from VT52 mode with an ESC < from
3688 * within VT52 mode 3771 * within VT52 mode
3689 */ 3772 */
3690 set_privmode (PrivMode_vt52, 1); 3773 priv_modes |= PrivMode_vt52;
3691 break; 3774 break;
3692 case 3: /* 80/132 */ 3775 case 3: /* 80/132 */
3693 if (priv_modes & PrivMode_132OK) 3776 if (priv_modes & PrivMode_132OK)
3694 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight); 3777 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
3695 break; 3778 break;
… …
3710 if (state) /* orthogonal */ 3793 if (state) /* orthogonal */
3711 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent); 3794 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3712 break; 3795 break;
3713#ifdef scrollBar_esc 3796#ifdef scrollBar_esc
3714 case scrollBar_esc: 3797 case scrollBar_esc:
3715 if (scrollBar.map (state)) 3798 scrollBar.map (state);
3716 {
3717 resize_all_windows (0, 0, 0); 3799 resize_all_windows (0, 0, 0);
3718 scr_touch (true); 3800 scr_touch (true);
3719 }
3720 break; 3801 break;
3721#endif 3802#endif
3722 case 25: /* visible/invisible cursor */ 3803 case 25: /* visible/invisible cursor */
3723 scr_cursor_visible (state); 3804 scr_cursor_visible (state);
3724 break; 3805 break;
… …
3737 case 1003: 3818 case 1003:
3738 if (state) 3819 if (state)
3739 { 3820 {
3740 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11); 3821 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3741 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent; 3822 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3823 mouse_row = mouse_col = 0;
3742 vt_emask_mouse = PointerMotionMask; 3824 vt_emask_mouse = PointerMotionMask;
3743 } 3825 }
3744 else 3826 else
3745 vt_emask_mouse = NoEventMask; 3827 vt_emask_mouse = NoEventMask;
3746 3828
… …
3778 } 3860 }
3779} 3861}
3780/*}}} */ 3862/*}}} */
3781 3863
3782/*{{{ process sgr sequences */ 3864/*{{{ process sgr sequences */
3783void 3865void ecb_hot
3784rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg) 3866rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg)
3785{ 3867{
3786 unsigned int i; 3868 unsigned int i;
3787 short rendset; 3869 short rendset;
3788 int rendstyle; 3870 int rendstyle;
… …
3929 break; 4011 break;
3930#endif 4012#endif
3931 } 4013 }
3932 } 4014 }
3933} 4015}
4016
4017void
4018rxvt_term::set_cursor_style (int style)
4019{
4020 if (!IN_RANGE_INC (style, 0, 6))
4021 return;
4022
4023 if (style == 0)
4024 style = 1;
4025
4026 cursor_type = (style - 1) / 2;
4027 set_option (Opt_cursorUnderline, cursor_type == 1);
4028
4029#ifdef CURSOR_BLINK
4030 set_option (Opt_cursorBlink, style & 1);
4031 cursor_blink_reset ();
4032#endif
4033
4034 want_refresh = 1;
4035}
3934/*}}} */ 4036/*}}} */
3935 4037
3936/*{{{ (do not) process Rob Nation's own graphics mode sequences */
3937void
3938rxvt_term::process_graphics ()
3939{
3940 unicode_t ch, cmd = cmd_getc ();
3941
3942 if (cmd == 'Q')
3943 {
3944 /* query graphics */
3945 tt_printf ("\033G0\012"); /* no graphics */
3946 return;
3947 }
3948 /* swallow other graphics sequences until terminating ':' */
3949 do
3950 ch = cmd_getc ();
3951 while (ch != ':');
3952}
3953/*}}} */
3954
3955/* ------------------------------------------------------------------------- */ 4038/* ---------------------------------------------------------------------- */
4039/* Write data to the pty as typed by the user, pasted with the mouse,
4040 * or generated by us in response to a query ESC sequence.
4041 */
3956 4042
3957/* 4043/*
3958 * Send printf () formatted output to the command. 4044 * Send printf () formatted output to the command.
3959 * Only use for small amounts of data. 4045 * Only use for small amounts of data.
3960 */ 4046 */
… …
3968 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4054 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
3969 va_end (arg_ptr); 4055 va_end (arg_ptr);
3970 tt_write (buf, strlen (buf)); 4056 tt_write (buf, strlen (buf));
3971} 4057}
3972 4058
3973/* ---------------------------------------------------------------------- */
3974/* Write data to the pty as typed by the user, pasted with the mouse, 4059/* Write data to the pty as typed by the user. */
3975 * or generated by us in response to a query ESC sequence. 4060void
3976 */ 4061rxvt_term::tt_write_user_input (const char *data, unsigned int len)
3977const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 4062{
4063 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4064 return;
4065
4066 if (option (Opt_scrollTtyKeypress))
4067 if (view_start)
4068 {
4069 view_start = 0;
4070 want_refresh = 1;
4071 }
4072
4073 tt_write_ (data, len);
4074}
3978 4075
3979void 4076void
3980rxvt_term::tt_write (const char *data, unsigned int len) 4077rxvt_term::tt_write (const char *data, unsigned int len)
3981{ 4078{
3982 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END))) 4079 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
3983 return; 4080 return;
3984 4081
4082 tt_write_ (data, len);
4083}
4084
4085static const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4086
4087void
4088rxvt_term::tt_write_ (const char *data, unsigned int len)
4089{
3985 if (pty->pty < 0) 4090 if (pty->pty < 0)
3986 return; 4091 return;
3987 4092
3988 if (v_buflen == 0) 4093 if (v_buflen == 0)
3989 { 4094 {
3990 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE)); 4095 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
3991 4096
4097 max_it (written, 0);
4098
3992 if ((unsigned int)written == len) 4099 if (written == len)
3993 return; 4100 return;
3994 4101
3995 data += written; 4102 data += written;
3996 len -= written; 4103 len -= written;
3997 } 4104 }
3998 4105
3999 v_buffer = (char *)realloc (v_buffer, v_buflen + len); 4106 v_buffer = (char *)rxvt_realloc (v_buffer, v_buflen + len);
4000 4107
4001 memcpy (v_buffer + v_buflen, data, len); 4108 memcpy (v_buffer + v_buflen, data, len);
4002 v_buflen += len; 4109 v_buflen += len;
4003 4110
4004 pty_ev.set (ev::READ | ev::WRITE); 4111 pty_ev.set (ev::READ | ev::WRITE);

Diff Legend

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