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.409 by ayin, Sat Feb 16 15:39:20 2008 UTC vs.
Revision 1.541 by root, Thu Feb 20 18:59:13 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-2011 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 2 of the License, or
… …
54 54
55#ifdef KEYSYM_RESOURCE 55#ifdef KEYSYM_RESOURCE
56# include "keyboard.h" 56# include "keyboard.h"
57#endif 57#endif
58 58
59#include <csignal> 59#include <signal.h>
60 60
61#if LINUX_YIELD_HACK 61#if LINUX_YIELD_HACK
62# include <ctime> 62# include <time.h>
63#endif 63#endif
64 64
65/*----------------------------------------------------------------------*/ 65/*----------------------------------------------------------------------*/
66 66
67#define IS_CONTROL(ch) !((ch) & 0xffffff60UL) 67#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
… …
131 XK_KP_Space, 0x2422, 131 XK_KP_Space, 0x2422,
132#endif 132#endif
133 0, 133 0,
134}; 134};
135 135
136void 136void ecb_cold
137rxvt_term::iso14755_54 (int x, int y) 137rxvt_term::iso14755_54 (int x, int y)
138{ 138{
139 x = Pixel2Col (x); 139 x = Pixel2Col (x);
140 y = Pixel2Row (y); 140 y = Pixel2Row (y);
141 141
… …
149 149
150 text_t t = l.t[x]; 150 text_t t = l.t[x];
151 151
152 if (t != NOCHAR || !x) 152 if (t != NOCHAR || !x)
153 { 153 {
154 iso14755_51 (l.t[x], l.r[x], x, y); 154 iso14755_51 (l.t[x], l.r[x], x, y, view_start);
155 iso14755buf = ISO_14755_54; 155 iso14755buf = ISO_14755_54;
156 break; 156 break;
157 } 157 }
158 158
159 x--; 159 x--;
160 } 160 }
161} 161}
162 162
163void 163void ecb_cold
164rxvt_term::iso14755_51 (unicode_t ch, rend_t r, int x, int y) 164rxvt_term::iso14755_51 (unicode_t ch, rend_t r, int x, int y, int y2)
165{ 165{
166 rxvt_fontset *fs = FONTSET (r); 166 rxvt_fontset *fs = FONTSET (r);
167 rxvt_font *f = (*fs)[fs->find_font (ch)];
168 wchar_t *chr, *alloc, ch2, *fname; 167 wchar_t *chr, *alloc, ch2, **fname;
169 int len; 168 int len;
170
171 fname = rxvt_utf8towcs (f->name);
172 169
173# if ENABLE_COMBINING 170# if ENABLE_COMBINING
174 if (IS_COMPOSE (ch)) 171 if (IS_COMPOSE (ch))
175 { 172 {
176 len = rxvt_composite.expand (ch, 0); 173 len = rxvt_composite.expand (ch, 0);
… …
184 181
185 alloc = 0; 182 alloc = 0;
186 chr = &ch2; 183 chr = &ch2;
187 len = 1; 184 len = 1;
188 } 185 }
186
187 char rowcol[40];
188 snprintf (rowcol, sizeof rowcol, "col %d row %d @%d", x, y, y2);
189 189
190 char attr[80]; // plenty 190 char attr[80]; // plenty
191 191
192 sprintf (attr, "%08x = fg %d bg %d%s%s%s%s%s%s", 192 sprintf (attr, "%08x = fg %d bg %d%s%s%s%s%s%s",
193 (int)r, 193 (int)r,
… …
197 r & RS_Blink ? " blink" : "", 197 r & RS_Blink ? " blink" : "",
198 r & RS_RVid ? " rvid" : "", 198 r & RS_RVid ? " rvid" : "",
199 r & RS_Uline ? " uline" : "", 199 r & RS_Uline ? " uline" : "",
200 r & RS_Careful ? " careful" : ""); 200 r & RS_Careful ? " careful" : "");
201 201
202 int width = 0;
203 fname = rxvt_temp_buf<wchar_t *> (len);
204 for (int i = 0; i < len; i++)
205 {
206 rxvt_font *f = (*fs)[fs->find_font_idx (chr[i])];
207 fname[i] = rxvt_utf8towcs (f->name);
202 int width = wcswidth (fname, wcslen (fname)); 208 max_it (width, wcswidth (fname[i], wcslen (fname[i])));
209 }
203 210
204 max_it (width, 8+5); // for char + hex
205 max_it (width, strlen (attr)); 211 max_it (width, strlen (attr));
206 212
207 if (y >= 0) 213 if (y >= 0)
208 { 214 {
209 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1; 215 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1;
210 x = 0; 216 x = 0;
211 } 217 }
212 218
213 scr_overlay_new (x, y, width, len + 2); 219 scr_overlay_new (x, y, width, len * 2 + 2);
220
221 scr_overlay_set (0, 0, rowcol);
214 222
215 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r)); 223 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));
216 224
217 for (int y = 0; y < len; y++) 225 for (int y = 0; y < len; y++)
218 { 226 {
219 char buf[9]; 227 char buf[9];
220 228
221 ch = *chr++; 229 ch = *chr++;
222 230
223 sprintf (buf, "%8x", ch); 231 sprintf (buf, "%8x", ch);
224 scr_overlay_set (0, y, buf); 232 scr_overlay_set (0, y + 1, buf);
225 scr_overlay_set (9, y, '='); 233 scr_overlay_set (9, y + 1, '=');
226# if !UNICODE_3 234# if !UNICODE_3
227 if (ch >= 0x10000) 235 if (ch >= 0x10000)
228 ch = 0xfffd; 236 ch = 0xfffd;
229# endif 237# endif
230 scr_overlay_set (11, y, ch, r); 238 scr_overlay_set (11, y + 1, ch, r);
231 239
232 if (WCWIDTH (ch) >= 2) 240 if (WCWIDTH (ch) >= 2)
233 scr_overlay_set (12, y, NOCHAR, r); 241 scr_overlay_set (12, y + 1, NOCHAR, r);
234 } 242 }
235 243
236// { 244// {
237// char buf[4+4+3+1]; 245// char buf[4+4+3+1];
238// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y); 246// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y);
239// scr_overlay_set (0, 0, buf); 247// scr_overlay_set (0, 0, buf);
240// } 248// }
241 scr_overlay_set (0, len , attr); 249 scr_overlay_set (0, len + 1, attr);
250 for (int i = 0; i < len; i++)
251 {
242 scr_overlay_set (0, len + 1, fname); 252 scr_overlay_set (0, len + 2 + i, fname[i]);
243
244 free (fname); 253 free (fname[i]);
254 }
245 255
246# if ENABLE_COMBINING 256# if ENABLE_COMBINING
247 if (alloc) 257 if (alloc)
248 delete [] alloc; 258 delete [] alloc;
249# endif 259# endif
250} 260}
251#endif 261#endif
252 262
253void 263void ecb_cold
254rxvt_term::commit_iso14755 () 264rxvt_term::commit_iso14755 ()
255{ 265{
256 wchar_t ch[2];
257
258 ch[0] = iso14755buf & ISO_14755_MASK; 266 wchar_t ch = iso14755buf & ISO_14755_MASK;
259 ch[1] = 0;
260 267
261 if (iso14755buf & ISO_14755_51) 268 if (iso14755buf & ISO_14755_51)
262 { 269 {
263 char mb[16]; 270 char mb[MB_LEN_MAX];
264 int len; 271 int len;
265 272
266 // allow verbatim 0-bytes and control-bytes to be entered 273 // allow verbatim 0-bytes and control-bytes to be entered
267 if (ch[0] >= 0x20) 274 if (ch >= 0x20)
268 len = wcstombs (mb, ch, 16); 275 len = wctomb (mb, ch);
269 else 276 else
270 { 277 {
271 mb[0] = ch[0]; 278 mb[0] = ch;
272 len = 1; 279 len = 1;
273 } 280 }
274 281
275 if (len > 0) 282 if (len > 0)
276 tt_write (mb, len); 283 tt_write (mb, len);
… …
279 } 286 }
280 287
281 iso14755buf = 0; 288 iso14755buf = 0;
282} 289}
283 290
284static int 291static int ecb_cold
285hex_keyval (XKeyEvent &ev) 292hex_keyval (XKeyEvent &ev)
286{ 293{
287 // check wether this event corresponds to a hex digit 294 // check whether this event corresponds to a hex digit
288 // if the modifiers had not been pressed. 295 // if the modifiers had not been pressed.
289 for (int index = 0; index < 8; index++) 296 for (int index = 0; index < 8; index++)
290 { 297 {
291 KeySym k = XLookupKeysym (&ev, index); 298 KeySym k = XLookupKeysym (&ev, index);
292 299
… …
298 305
299 return -1; 306 return -1;
300} 307}
301#endif 308#endif
302 309
303static inline KeySym 310static inline KeySym ecb_cold
304translate_keypad (KeySym keysym, bool kp) 311translate_keypad (KeySym keysym, bool kp)
305{ 312{
306#ifdef XK_KP_Home 313#ifdef XK_KP_Home
307 static const KeySym keypadtrans[] = { 314 static const KeySym keypadtrans[] = {
308 XK_KP_7, // XK_KP_Home 315 XK_KP_7, // XK_KP_Home
… …
334# endif 341# endif
335#endif 342#endif
336 return keysym; 343 return keysym;
337} 344}
338 345
339static inline int 346static inline int ecb_cold
340map_function_key (KeySym keysym) 347map_function_key (KeySym keysym)
341{ 348{
342 int param = 0; 349 int param = 0;
343 350
344 if (IN_RANGE_INC (keysym, XK_F1, XK_F35)) 351 if (IN_RANGE_INC (keysym, XK_F1, XK_F35))
… …
376 param = 5; 383 param = 5;
377 break; 384 break;
378 case XK_Next: 385 case XK_Next:
379 param = 6; 386 param = 6;
380 break; 387 break;
388 case XK_Home:
389 param = 7;
390 break;
391 case XK_End:
392 param = 8;
393 break;
381#endif 394#endif
382 case XK_Help: 395 case XK_Help:
383 param = 28; 396 param = 28;
384 break; 397 break;
385 case XK_Menu: 398 case XK_Menu:
… …
387 break; 400 break;
388 } 401 }
389 return param; 402 return param;
390} 403}
391 404
392void 405void ecb_cold
393rxvt_term::key_press (XKeyEvent &ev) 406rxvt_term::key_press (XKeyEvent &ev)
394{ 407{
395 int ctrl, meta, shft, len; 408 int ctrl, meta, shft, len;
396 KeySym keysym; 409 KeySym keysym;
397 int valid_keysym; 410 int valid_keysym;
… …
410 */ 423 */
411 shft = ev.state & ShiftMask; 424 shft = ev.state & ShiftMask;
412 ctrl = ev.state & ControlMask; 425 ctrl = ev.state & ControlMask;
413 meta = ev.state & ModMetaMask; 426 meta = ev.state & ModMetaMask;
414 427
415 if (numlock_state || (ev.state & ModNumLockMask))
416 {
417 numlock_state = (ev.state & ModNumLockMask);
418 PrivMode ((!numlock_state), PrivMode_aplKP);
419 }
420
421 kbuf[0] = 0; 428 kbuf[0] = 0;
422 429
423#ifdef USE_XIM 430#if USE_XIM
424 if (Input_Context) 431 if (Input_Context)
425 { 432 {
426 Status status_return; 433 Status status_return;
427 434
428#if 0 435#if 0
… …
499#ifdef PAGING_CONTEXT_LINES 506#ifdef PAGING_CONTEXT_LINES
500 lnsppg = nrow - PAGING_CONTEXT_LINES; 507 lnsppg = nrow - PAGING_CONTEXT_LINES;
501#else 508#else
502 lnsppg = nrow * 4 / 5; 509 lnsppg = nrow * 4 / 5;
503#endif 510#endif
511 max_it (lnsppg, 1);
512
504 if (keysym == XK_Prior) 513 if (keysym == XK_Prior)
505 { 514 {
506 scr_page (UP, lnsppg); 515 scr_page (lnsppg);
507 return; 516 return;
508 } 517 }
509 else if (keysym == XK_Next) 518 else if (keysym == XK_Next)
510 { 519 {
511 scr_page (DN, lnsppg); 520 scr_page (-lnsppg);
512 return; 521 return;
513 } 522 }
514 } 523 }
515#ifdef SCROLL_ON_UPDOWN_KEYS 524#ifdef SCROLL_ON_UPDOWN_KEYS
516 if (IS_SCROLL_MOD) 525 if (IS_SCROLL_MOD)
517 { 526 {
518 if (keysym == XK_Up) 527 if (keysym == XK_Up)
519 { 528 {
520 scr_page (UP, 1); 529 scr_page (1);
521 return; 530 return;
522 } 531 }
523 else if (keysym == XK_Down) 532 else if (keysym == XK_Down)
524 { 533 {
525 scr_page (DN, 1); 534 scr_page (-1);
526 return; 535 return;
527 } 536 }
528 } 537 }
529#endif 538#endif
530#ifdef SCROLL_ON_HOMEEND_KEYS 539#ifdef SCROLL_ON_HOMEEND_KEYS
531 if (IS_SCROLL_MOD) 540 if (IS_SCROLL_MOD)
532 { 541 {
533 if (keysym == XK_Home) 542 if (keysym == XK_Home)
534 { 543 {
535 scr_move_to (0, 1); 544 scr_changeview (top_row);
536 return; 545 return;
537 } 546 }
538 else if (keysym == XK_End) 547 else if (keysym == XK_End)
539 { 548 {
540 scr_move_to (1, 1); 549 scr_changeview (0);
541 return; 550 return;
542 } 551 }
543 } 552 }
544#endif 553#endif
545 } 554 }
… …
561 selection_request (ev.time); 570 selection_request (ev.time);
562 return; 571 return;
563#if TODO 572#if TODO
564 /* rxvt extras */ 573 /* rxvt extras */
565 case XK_KP_Add: /* Shift+KP_Add = bigger font */ 574 case XK_KP_Add: /* Shift+KP_Add = bigger font */
566 change_font (FONT_UP);
567 return; 575 return;
568 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */ 576 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */
569 change_font (FONT_DN);
570 return; 577 return;
571#endif 578#endif
572 } 579 }
573 } 580 }
574 } 581 }
575 582
576#if ENABLE_FRILLS || ISO_14755 583#if ENABLE_FRILLS || ISO_14755
577 // ISO 14755 support 584 // ISO 14755 support
578 if (shft && ctrl) 585 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_51))
579 { 586 {
580 int hv; 587 int hv;
581 588
582 if (iso14755buf & ISO_14755_51 589 if (iso14755buf & ISO_14755_51
583 && (keysym == XK_space || keysym == XK_KP_Space 590 && (keysym == XK_space || keysym == XK_KP_Space
… …
613 scr_overlay_off (); 620 scr_overlay_off ();
614# endif 621# endif
615 iso14755buf = 0; 622 iso14755buf = 0;
616 } 623 }
617 } 624 }
625 else if (option (Opt_iso14755) &&
618 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R)) 626 ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R))
619 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))) 627 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))))
620 if (!(iso14755buf & ISO_14755_STARTED)) 628 if (!(iso14755buf & ISO_14755_STARTED))
621 { 629 {
622 iso14755buf |= ISO_14755_STARTED; 630 iso14755buf |= ISO_14755_STARTED;
623# if ISO_14755 631# if ISO_14755
624 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1); 632 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);
… …
635 } 643 }
636#endif 644#endif
637 645
638 if (keysym >= 0xFF00 && keysym <= 0xFFFF) 646 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
639 { 647 {
640 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft; 648 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
641 unsigned int newlen = 1; 649 unsigned int newlen = 1;
642 650
651 if (ev.state & ModNumLockMask)
652 kp = false;
653
643 switch (translate_keypad (keysym, kp)) 654 keysym = translate_keypad (keysym, kp);
655
656 switch (keysym)
657 {
658#ifndef NO_BACKSPACE_KEY
659 case XK_BackSpace:
660 if (priv_modes & PrivMode_HaveBackSpace)
661 {
662 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
663 ^ !!ctrl) ? '\b' : '\177';
664 kbuf[1] = '\0';
665 }
666 else
667 strcpy (kbuf, rs[Rs_backspace_key]);
668 break;
669#endif
670#ifndef NO_DELETE_KEY
671 case XK_Delete:
672 strcpy (kbuf, rs[Rs_delete_key]);
673 break;
674#endif
675 case XK_Tab:
676 if (shft)
677 strcpy (kbuf, "\033[Z");
678 else
679 {
680#ifdef CTRL_TAB_MAKES_META
681 if (ctrl)
682 meta = 1;
683#endif
684#ifdef MOD4_TAB_MAKES_META
685 if (ev.state & Mod4Mask)
686 meta = 1;
687#endif
688 newlen = 0;
689 }
690 break;
691
692 case XK_Up: /* "\033[A" */
693 case XK_Down: /* "\033[B" */
694 case XK_Right: /* "\033[C" */
695 case XK_Left: /* "\033[D" */
696 strcpy (kbuf, "\033[Z");
697 kbuf[2] = "DACB"[keysym - XK_Left];
698 /* do Shift first */
699 if (shft)
700 kbuf[2] = "dacb"[keysym - XK_Left];
701 else if (ctrl)
702 {
703 kbuf[1] = 'O';
704 kbuf[2] = "dacb"[keysym - XK_Left];
705 }
706 else if (priv_modes & PrivMode_aplCUR)
707 kbuf[1] = 'O';
708 break;
709
710 case XK_KP_Enter:
711 /* allow shift to override */
712 if (kp)
713 {
714 strcpy (kbuf, "\033OM");
715 break;
716 }
717
718 /* FALLTHROUGH */
719
720 case XK_Return:
721 if (priv_modes & PrivMode_LFNL)
722 {
723 kbuf[0] = '\015';
724 kbuf[1] = '\012';
725 kbuf[2] = '\0';
726 }
727 else
728 {
729 kbuf[0] = '\015';
730 kbuf[1] = '\0';
731 }
732 break;
733
734 case XK_KP_F1: /* "\033OP" */
735 case XK_KP_F2: /* "\033OQ" */
736 case XK_KP_F3: /* "\033OR" */
737 case XK_KP_F4: /* "\033OS" */
738 strcpy (kbuf, "\033OP");
739 kbuf[2] += (keysym - XK_KP_F1);
740 break;
741
742 case XK_KP_Multiply: /* "\033Oj" : "*" */
743 case XK_KP_Add: /* "\033Ok" : "+" */
744 case XK_KP_Separator: /* "\033Ol" : "," */
745 case XK_KP_Subtract: /* "\033Om" : "-" */
746 case XK_KP_Decimal: /* "\033On" : "." */
747 case XK_KP_Divide: /* "\033Oo" : "/" */
748 case XK_KP_0: /* "\033Op" : "0" */
749 case XK_KP_1: /* "\033Oq" : "1" */
750 case XK_KP_2: /* "\033Or" : "2" */
751 case XK_KP_3: /* "\033Os" : "3" */
752 case XK_KP_4: /* "\033Ot" : "4" */
753 case XK_KP_5: /* "\033Ou" : "5" */
754 case XK_KP_6: /* "\033Ov" : "6" */
755 case XK_KP_7: /* "\033Ow" : "7" */
756 case XK_KP_8: /* "\033Ox" : "8" */
757 case XK_KP_9: /* "\033Oy" : "9" */
758 /* allow shift to override */
759 if (kp)
760 {
761 strcpy (kbuf, "\033Oj");
762 kbuf[2] += (keysym - XK_KP_Multiply);
763 }
764 else
765 {
766 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
767 kbuf[1] = '\0';
768 }
769 break;
770
771 default:
644 { 772 {
645#ifndef NO_BACKSPACE_KEY
646 case XK_BackSpace:
647 if (priv_modes & PrivMode_HaveBackSpace)
648 {
649 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
650 ^ !!ctrl) ? '\b' : '\177';
651 kbuf[1] = '\0';
652 }
653 else
654 strcpy (kbuf, rs[Rs_backspace_key]);
655 break;
656#endif
657#ifndef NO_DELETE_KEY
658 case XK_Delete:
659 strcpy (kbuf, rs[Rs_delete_key]);
660 break;
661#endif
662 case XK_Tab:
663 if (shft)
664 strcpy (kbuf, "\033[Z");
665 else
666 {
667#ifdef CTRL_TAB_MAKES_META
668 if (ctrl)
669 meta = 1;
670#endif
671#ifdef MOD4_TAB_MAKES_META
672 if (ev.state & Mod4Mask)
673 meta = 1;
674#endif
675 newlen = 0;
676 }
677 break;
678
679 case XK_Up: /* "\033[A" */
680 case XK_Down: /* "\033[B" */
681 case XK_Right: /* "\033[C" */
682 case XK_Left: /* "\033[D" */
683 strcpy (kbuf, "\033[Z");
684 kbuf[2] = "DACB"[keysym - XK_Left];
685 /* do Shift first */
686 if (shft)
687 kbuf[2] = "dacb"[keysym - XK_Left];
688 else if (ctrl)
689 {
690 kbuf[1] = 'O';
691 kbuf[2] = "dacb"[keysym - XK_Left];
692 }
693 else if (priv_modes & PrivMode_aplCUR)
694 kbuf[1] = 'O';
695 break;
696
697 case XK_KP_Enter:
698 /* allow shift to override */
699 if (kp)
700 {
701 strcpy (kbuf, "\033OM");
702 break;
703 }
704
705 /* FALLTHROUGH */
706
707 case XK_Return:
708 if (priv_modes & PrivMode_LFNL)
709 {
710 kbuf[0] = '\015';
711 kbuf[1] = '\012';
712 kbuf[2] = '\0';
713 }
714 else
715 {
716 kbuf[0] = '\015';
717 kbuf[1] = '\0';
718 }
719 break;
720
721 case XK_KP_F1: /* "\033OP" */
722 case XK_KP_F2: /* "\033OQ" */
723 case XK_KP_F3: /* "\033OR" */
724 case XK_KP_F4: /* "\033OS" */
725 strcpy (kbuf, "\033OP");
726 kbuf[2] += (keysym - XK_KP_F1);
727 break;
728
729 case XK_KP_Multiply: /* "\033Oj" : "*" */
730 case XK_KP_Add: /* "\033Ok" : "+" */
731 case XK_KP_Separator: /* "\033Ol" : "," */
732 case XK_KP_Subtract: /* "\033Om" : "-" */
733 case XK_KP_Decimal: /* "\033On" : "." */
734 case XK_KP_Divide: /* "\033Oo" : "/" */
735 case XK_KP_0: /* "\033Op" : "0" */
736 case XK_KP_1: /* "\033Oq" : "1" */
737 case XK_KP_2: /* "\033Or" : "2" */
738 case XK_KP_3: /* "\033Os" : "3" */
739 case XK_KP_4: /* "\033Ot" : "4" */
740 case XK_KP_5: /* "\033Ou" : "5" */
741 case XK_KP_6: /* "\033Ov" : "6" */
742 case XK_KP_7: /* "\033Ow" : "7" */
743 case XK_KP_8: /* "\033Ox" : "8" */
744 case XK_KP_9: /* "\033Oy" : "9" */
745 /* allow shift to override */
746 if (kp)
747 {
748 strcpy (kbuf, "\033Oj");
749 kbuf[2] += (keysym - XK_KP_Multiply);
750 }
751 else
752 {
753 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
754 kbuf[1] = '\0';
755 }
756 break;
757
758 case XK_End:
759 strcpy (kbuf, KS_END);
760 break;
761 case XK_Home:
762 strcpy (kbuf, KS_HOME);
763 break;
764
765 default:
766 {
767 int param = map_function_key (keysym); 773 int param = map_function_key (keysym);
768 if (param > 0) 774 if (param > 0)
769 sprintf (kbuf,"\033[%d~", param); 775 sprintf (kbuf,"\033[%d~", param);
770 else 776 else
771 newlen = 0; 777 newlen = 0;
772 }
773 break;
774 } 778 }
779 break;
780 }
775 781
776 if (newlen) 782 if (newlen)
777 len = strlen (kbuf); 783 len = strlen (kbuf);
778 784
785 if (len > 0)
786 {
779 /* 787 /*
788 * pass Shift/Control indicators for function keys ending with `~'
789 *
790 * eg,
791 * Prior = "ESC[5~"
792 * Shift+Prior = "ESC[5$"
793 * Ctrl+Prior = "ESC[5^"
794 * Ctrl+Shift+Prior = "ESC[5@"
795 */
796 if (kbuf[0] == C0_ESC && kbuf[1] == '[' && kbuf[len - 1] == '~')
797 kbuf[len - 1] = (shft ? (ctrl ? '@' : '$') : (ctrl ? '^' : '~'));
798
799 /*
780 * Pass meta for all function keys, if 'meta' option set 800 * Pass meta for all function keys, if 'meta' option set
781 */ 801 */
782#ifdef META8_OPTION 802#ifdef META8_OPTION
783 if (meta && (meta_char == 0x80) && len > 0) 803 if (meta && (meta_char == 0x80))
784 kbuf[len - 1] |= 0x80; 804 kbuf[len - 1] |= 0x80;
785#endif 805#endif
806 }
786 807
787 } 808 }
788 else if (ctrl && keysym == XK_minus) 809 else if (ctrl && keysym == XK_minus)
789 { 810 {
790 len = 1; 811 len = 1;
… …
824 { 845 {
825 view_start = 0; 846 view_start = 0;
826 want_refresh = 1; 847 want_refresh = 1;
827 } 848 }
828 849
829 /*
830 * these modifications only affect the static keybuffer
831 * pass Shift/Control indicators for function keys ending with `~'
832 *
833 * eg,
834 * Prior = "ESC[5~"
835 * Shift+Prior = "ESC[5$"
836 * Ctrl+Prior = "ESC[5^"
837 * Ctrl+Shift+Prior = "ESC[5@"
838 * Meta adds an Escape prefix (with META8_OPTION, if meta == <escape>).
839 */
840 if (kbuf[0] == C0_ESC && kbuf[1] == '[' && kbuf[len - 1] == '~')
841 kbuf[len - 1] = (shft ? (ctrl ? '@' : '$') : (ctrl ? '^' : '~'));
842
843 /* escape prefix */ 850 /* escape prefix */
844 if (meta 851 if (meta
845#ifdef META8_OPTION 852#ifdef META8_OPTION
846 && meta_char == C0_ESC 853 && meta_char == C0_ESC
847#endif 854#endif
… …
852 } 859 }
853 860
854 tt_write (kbuf, (unsigned int)len); 861 tt_write (kbuf, (unsigned int)len);
855} 862}
856 863
857void 864void ecb_cold
858rxvt_term::key_release (XKeyEvent &ev) 865rxvt_term::key_release (XKeyEvent &ev)
859{ 866{
860#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL 867#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
861 KeySym keysym; 868 KeySym keysym;
862 869
… …
882 commit_iso14755 (); 889 commit_iso14755 ();
883 890
884 return; 891 return;
885 } 892 }
886 893
887 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2) 894 for (unsigned short *i = iso14755_symtab; i[0]; i += 2)
888 if (i[0] == keysym) 895 if (i[0] == keysym)
889 { 896 {
890 iso14755buf = ISO_14755_51 | i[1]; 897 iso14755buf = ISO_14755_51 | i[1];
891 commit_iso14755 (); 898 commit_iso14755 ();
892 899
… …
929 else if (keysym == XK_Control_L || keysym == XK_Control_R) 936 else if (keysym == XK_Control_L || keysym == XK_Control_R)
930 mouse_slip_wheel_speed = 0; 937 mouse_slip_wheel_speed = 0;
931#endif 938#endif
932} 939}
933 940
934#if defined (KEYSYM_RESOURCE)
935unsigned int
936rxvt_term::cmd_write (const char *str, unsigned int count)
937{
938 unsigned int n, s;
939
940 n = cmdbuf_ptr - cmdbuf_base;
941 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp;
942
943 if (n > 0 && s < count)
944 {
945 memmove (cmdbuf_base, cmdbuf_ptr,
946 (unsigned int) (cmdbuf_endp - cmdbuf_ptr));
947 cmdbuf_ptr = cmdbuf_base;
948 cmdbuf_endp -= n;
949 s += n;
950 }
951
952 if (count > s)
953 {
954 rxvt_warn ("data loss: cmd_write too large, continuing.\n");
955 count = s;
956 }
957
958 for (; count--;)
959 *cmdbuf_endp++ = *str++;
960
961 cmd_parse ();
962
963 return 0;
964}
965#endif
966
967void 941void
968rxvt_term::flush () 942rxvt_term::flush ()
969{ 943{
970 flush_ev.stop (); 944 flush_ev.stop ();
971 945
972#ifdef HAVE_BG_PIXMAP 946#ifdef HAVE_IMG
973 if (bgPixmap.check_clearChanged ()) 947 if (bg_flags & BG_NEEDS_REFRESH)
974 { 948 {
975// scr_clear (true); This needs to be researched further! 949 bg_flags &= ~BG_NEEDS_REFRESH;
976 scr_touch (false); 950 scr_touch (false);
977 } 951 }
978#endif 952#endif
979 953
980 if (want_refresh) 954 if (want_refresh)
… …
1016 } 990 }
1017 while (row < end_row); 991 while (row < end_row);
1018 } 992 }
1019 993
1020 scr_refresh (); 994 scr_refresh ();
1021 scrollbar_show (1); 995 scrollBar.show (1);
1022#ifdef USE_XIM 996#if USE_XIM
1023 IMSendSpot (); 997 im_send_spot ();
1024#endif 998#endif
1025 } 999 }
1026 1000
1027 display->flush (); 1001 display->flush ();
1028} 1002}
1029 1003
1030/* checks wether a refresh is requested and starts the refresh timer */ 1004/* checks whether a refresh is requested and starts the refresh timer */
1031void 1005void
1032rxvt_term::refresh_check () 1006rxvt_term::refresh_check ()
1033{ 1007{
1034 if (want_refresh && !flush_ev.is_active ()) 1008 if (want_refresh && !flush_ev.is_active ())
1035 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally 1009 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally
… …
1045 refresh_count = 0; 1019 refresh_count = 0;
1046 flush (); 1020 flush ();
1047} 1021}
1048 1022
1049#ifdef CURSOR_BLINK 1023#ifdef CURSOR_BLINK
1024void
1025rxvt_term::cursor_blink_reset ()
1026{
1027 if (hidden_cursor)
1028 {
1029 hidden_cursor = 0;
1030 want_refresh = 1;
1031 }
1032
1033 if (option (Opt_cursorBlink))
1034 cursor_blink_ev.again ();
1035 else
1036 cursor_blink_ev.stop ();
1037}
1038
1050void 1039void
1051rxvt_term::cursor_blink_cb (ev::timer &w, int revents) 1040rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
1052{ 1041{
1053 hidden_cursor = !hidden_cursor; 1042 hidden_cursor = !hidden_cursor;
1054 want_refresh = 1; 1043 want_refresh = 1;
… …
1073 1062
1074#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1063#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1075void 1064void
1076rxvt_term::cont_scroll_cb (ev::timer &w, int revents) 1065rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1077{ 1066{
1078 if ((scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN) 1067 if ((scrollBar.state == SB_STATE_UP || scrollBar.state == SB_STATE_DOWN)
1079 && scr_page (scrollBar.state == STATE_UP ? UP : DN, 1)) 1068 && scr_page (scrollBar.state == SB_STATE_UP ? UP : DN, 1))
1080 { 1069 {
1081 want_refresh = 1; 1070 want_refresh = 1;
1082 refresh_check (); 1071 refresh_check ();
1083 } 1072 }
1084 else 1073 else
… …
1088 1077
1089#ifdef SELECTION_SCROLLING 1078#ifdef SELECTION_SCROLLING
1090void 1079void
1091rxvt_term::sel_scroll_cb (ev::timer &w, int revents) 1080rxvt_term::sel_scroll_cb (ev::timer &w, int revents)
1092{ 1081{
1093 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1082 if (scr_page (scroll_selection_lines))
1094 { 1083 {
1095 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1084 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1096 want_refresh = 1; 1085 want_refresh = 1;
1097 refresh_check (); 1086 refresh_check ();
1098 } 1087 }
… …
1103 1092
1104#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1093#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1105void 1094void
1106rxvt_term::slip_wheel_cb (ev::timer &w, int revents) 1095rxvt_term::slip_wheel_cb (ev::timer &w, int revents)
1107{ 1096{
1108 if (scr_changeview (view_start - mouse_slip_wheel_speed)) 1097 if (scr_page (mouse_slip_wheel_speed))
1109 { 1098 {
1110 want_refresh = 1; 1099 want_refresh = 1;
1111 refresh_check (); 1100 refresh_check ();
1112 } 1101 }
1113 1102
… …
1128 { 1117 {
1129 // this should really be sched_yield(), but the linux guys thought 1118 // this should really be sched_yield(), but the linux guys thought
1130 // that giving a process calling sched_yield () less cpu time than 1119 // that giving a process calling sched_yield () less cpu time than
1131 // ones with high nice levels is a useful thing to do. It surely is is 1120 // ones with high nice levels is a useful thing to do. It surely is is
1132 // allowed by the sus... as is returning ENOSYS. 1121 // allowed by the sus... as is returning ENOSYS.
1122 // since the linux guys additionally thought that breaking the only
1123 // known workaround against their unusable sched_yield hack is cool,
1124 // we just nanosleep a bit and hope for the best.
1133 1125
1134 struct timespec ts = { 0, 0 }; 1126 struct timespec ts = { 0, 1000 };
1135 nanosleep (&ts, 0); 1127 nanosleep (&ts, 0);
1136 1128
1137 w.stop (); 1129 w.stop ();
1138 } 1130 }
1139 1131
… …
1142 { 1134 {
1143 } 1135 }
1144} event_handler; 1136} event_handler;
1145#endif 1137#endif
1146 1138
1139/* make sure all the cmd data is at beginning of cmdbuf */
1140void
1141rxvt_term::cmdbuf_reify ()
1142{
1143 if (cmdbuf_ptr == cmdbuf_base)
1144 return;
1145
1146 ssize_t used = cmdbuf_endp - cmdbuf_ptr;
1147
1148 memmove (cmdbuf_base, cmdbuf_ptr, used);
1149 cmdbuf_ptr = cmdbuf_base;
1150 cmdbuf_endp = cmdbuf_ptr + used;
1151
1152}
1153
1154#if defined (KEYSYM_RESOURCE)
1155void
1156rxvt_term::cmdbuf_append (const char *str, size_t count)
1157{
1158 cmdbuf_reify ();
1159
1160 size_t avail = cmdbuf_base + CBUFSIZ - cmdbuf_endp;
1161
1162 if (count > avail)
1163 return;
1164
1165 memcpy (cmdbuf_endp, str, count);
1166 cmdbuf_endp += count;
1167
1168 cmd_parse ();
1169}
1170#endif
1171
1147bool 1172bool
1148rxvt_term::pty_fill () 1173rxvt_term::pty_fill ()
1149{ 1174{
1150 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1175 cmdbuf_reify ();
1151 1176
1152 if (CBUFSIZ == n) 1177 size_t avail = cmdbuf_base + CBUFSIZ - cmdbuf_endp;
1153 { 1178
1154 rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n"); 1179 if (!avail)
1155 n = 0;
1156 } 1180 {
1157 1181 // normally this indicates a "too long" command sequence - just drop the data we have
1158 memmove (cmdbuf_base, cmdbuf_ptr, n);
1159 cmdbuf_ptr = cmdbuf_base; 1182 cmdbuf_ptr = cmdbuf_base;
1160 cmdbuf_endp = cmdbuf_ptr + n; 1183 cmdbuf_endp = cmdbuf_ptr;
1184 avail = CBUFSIZ;
1185 }
1161 1186
1162 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n); 1187 ssize_t r = read (pty->pty, cmdbuf_endp, avail);
1163 1188
1164 if (r > 0) 1189 if (r > 0)
1165 { 1190 {
1166 cmdbuf_endp += r; 1191 cmdbuf_endp += r;
1167 return true; 1192 return true;
… …
1189{ 1214{
1190 make_current (); 1215 make_current ();
1191 1216
1192 if (revents & ev::READ) 1217 if (revents & ev::READ)
1193 // loop, but don't allow a single term to monopolize us 1218 // loop, but don't allow a single term to monopolize us
1194 while (pty_fill ()) 1219 for (int i = CBUFCNT; i-- && pty_fill (); )
1195 if (cmd_parse ()) 1220 cmd_parse ();
1196 break;
1197 1221
1198 if (revents & ev::WRITE) 1222 if (revents & ev::WRITE)
1199 pty_write (); 1223 pty_write ();
1200 1224
1201 refresh_check (); 1225 refresh_check ();
1202} 1226}
1203 1227
1204void 1228void ecb_cold
1205rxvt_term::pointer_unblank () 1229rxvt_term::pointer_unblank ()
1206{ 1230{
1207 XDefineCursor (dpy, vt, TermWin_cursor); 1231 XDefineCursor (dpy, vt, TermWin_cursor);
1208 recolour_cursor (); 1232 recolour_cursor ();
1209 1233
… …
1214 pointer_ev.start (pointerBlankDelay); 1238 pointer_ev.start (pointerBlankDelay);
1215#endif 1239#endif
1216} 1240}
1217 1241
1218#ifdef POINTER_BLANK 1242#ifdef POINTER_BLANK
1219void 1243void ecb_cold
1220rxvt_term::pointer_blank () 1244rxvt_term::pointer_blank ()
1221{ 1245{
1222 if (!option (Opt_pointerBlank)) 1246 if (!option (Opt_pointerBlank))
1223 return; 1247 return;
1224 1248
… …
1226 XFlush (dpy); 1250 XFlush (dpy);
1227 1251
1228 hidden_pointer = 1; 1252 hidden_pointer = 1;
1229} 1253}
1230 1254
1231void 1255void ecb_cold
1232rxvt_term::pointer_cb (ev::timer &w, int revents) 1256rxvt_term::pointer_cb (ev::timer &w, int revents)
1233{ 1257{
1234 make_current (); 1258 make_current ();
1235 1259
1236 pointer_blank (); 1260 pointer_blank ();
… …
1242{ 1266{
1243 int button_number, key_state = 0; 1267 int button_number, key_state = 0;
1244 int x, y; 1268 int x, y;
1245 int code = 32; 1269 int code = 32;
1246 1270
1247 x = Pixel2Col (ev.x); 1271 x = Pixel2Col (ev.x) + 1;
1248 y = Pixel2Row (ev.y); 1272 y = Pixel2Row (ev.y) + 1;
1273
1249 if (ev.type == MotionNotify) 1274 if (ev.type == MotionNotify)
1250 { 1275 {
1251 if (x == mouse_row && y == mouse_col) 1276 if (x == mouse_row && y == mouse_col)
1252 return; 1277 return;
1278
1253 mouse_row = x; 1279 mouse_row = x;
1254 mouse_col = y; 1280 mouse_col = y;
1255 code += 32; 1281 code += 32;
1256 } 1282 }
1257 1283
… …
1260 else 1286 else
1261 { 1287 {
1262 button_number = MEvent.button - Button1; 1288 button_number = MEvent.button - Button1;
1263 /* add 0x3D for wheel events, like xterm does */ 1289 /* add 0x3D for wheel events, like xterm does */
1264 if (button_number >= 3) 1290 if (button_number >= 3)
1265 button_number += (64 - 3); 1291 button_number += 64 - 3;
1266 } 1292 }
1267 1293
1268 if (priv_modes & PrivMode_MouseX10) 1294 if (priv_modes & PrivMode_MouseX10)
1269 { 1295 {
1270 /* 1296 /*
… …
1302 fputc ('A', stderr); 1328 fputc ('A', stderr);
1303 if (key_state & 32) 1329 if (key_state & 32)
1304 fputc ('2', stderr); 1330 fputc ('2', stderr);
1305 fprintf (stderr, "]: <%d>, %d/%d\n", 1331 fprintf (stderr, "]: <%d>, %d/%d\n",
1306 button_number, 1332 button_number,
1307 x + 1, 1333 x,
1308 y + 1); 1334 y);
1309#endif 1335#endif
1310 1336
1337#if ENABLE_FRILLS
1338 if (priv_modes & PrivMode_ExtMouseRight)
1339 tt_printf ("\033[%d;%d;%dM",
1340 code + button_number + key_state,
1341 x,
1342 y);
1343 else if (priv_modes & PrivMode_ExtModeMouse)
1344 tt_printf ("\033[M%c%lc%lc",
1345 code + button_number + key_state,
1346 wint_t (32 + x),
1347 wint_t (32 + y));
1348 else
1349#endif
1311 tt_printf ("\033[M%c%c%c", 1350 tt_printf ("\033[M%c%c%c",
1312 (code + button_number + key_state), 1351 code + button_number + key_state,
1313 (32 + x + 1), 1352 32 + x,
1314 (32 + y + 1)); 1353 32 + y);
1315} 1354}
1316 1355
1317/*{{{ process an X event */ 1356/*{{{ process an X event */
1318void 1357void ecb_hot
1319rxvt_term::x_cb (XEvent &ev) 1358rxvt_term::x_cb (XEvent &ev)
1320{ 1359{
1321 make_current (); 1360 make_current ();
1322 1361
1323 dLocal (Display *, dpy); 1362 dLocal (Display *, dpy);
… …
1421 && ev.xfocus.mode != NotifyGrab) 1460 && ev.xfocus.mode != NotifyGrab)
1422 focus_out (); 1461 focus_out ();
1423 break; 1462 break;
1424 1463
1425 case ConfigureNotify: 1464 case ConfigureNotify:
1426 /*fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",
1427 ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,
1428 szHint.width, szHint.height);*/
1429 if (ev.xconfigure.window == parent[0]) 1465 if (ev.xconfigure.window == parent)
1430 { 1466 {
1431 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1467 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1432 ; 1468 ;
1469
1470 bool want_position_change = SHOULD_INVOKE (HOOK_POSITION_CHANGE);
1471
1472 bool moved = false;
1473#ifdef HAVE_BG_PIXMAP
1474 if (bg_window_position_sensitive ())
1475 {
1476 want_position_change = true;
1477 if (bg_img == 0)
1478 moved = true;
1479 }
1480#endif
1481
1482 if (want_position_change)
1483 {
1484 int x, y;
1485
1486 if (ev.xconfigure.send_event)
1487 {
1488 x = ev.xconfigure.x;
1489 y = ev.xconfigure.y;
1490 }
1491 else
1492 get_window_origin (x, y);
1493
1494 if (x != parent_x || y != parent_y)
1495 {
1496 parent_x = x;
1497 parent_y = y;
1498 HOOK_INVOKE ((this, HOOK_POSITION_CHANGE, DT_INT, x, DT_INT, y, DT_END));
1499 moved = true;
1500 }
1501 }
1433 1502
1434 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1503 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1435 { 1504 {
1436 seen_resize = 1; 1505 seen_resize = 1;
1437 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1506 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1438 } 1507 }
1439 else 1508 else
1440 { 1509 {
1441#ifdef HAVE_BG_PIXMAP 1510#ifdef HAVE_BG_PIXMAP
1442 if (bgPixmap.window_position_sensitive ())
1443 {
1444 if (mapped) 1511 if (moved)
1445 update_background (); 1512 update_background ();
1446 else
1447 bgPixmap.invalidate ();
1448 }
1449#endif 1513#endif
1450 } 1514 }
1451 1515
1452 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1516 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1453 } 1517 }
1454 break; 1518 break;
1455 1519
1456 case PropertyNotify: 1520 case PropertyNotify:
1457 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END))) 1521 HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END));
1458 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1459 && ev.xproperty.state == PropertyNewValue)
1460 selection_property (ev.xproperty.window, ev.xproperty.atom);
1461
1462 break; 1522 break;
1463 1523
1464 case SelectionClear: 1524 case SelectionClear:
1465 selection_clear (); 1525 selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]);
1466 break;
1467
1468 case SelectionNotify:
1469 if (selection_wait == Sel_normal)
1470 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1471 break; 1526 break;
1472 1527
1473 case SelectionRequest: 1528 case SelectionRequest:
1474 selection_send (ev.xselectionrequest); 1529 selection_send (ev.xselectionrequest);
1475 break; 1530 break;
1476 1531
1477 case MapNotify: 1532 case MapNotify:
1478#ifdef HAVE_BG_PIXMAP 1533#ifdef HAVE_BG_PIXMAP
1479 /* This is needed spcifically to fix the case of no window manager or a 1534 // This is needed at startup for the case of no window manager
1480 * non-reparenting window manager. In those cases we never get first 1535 // or a non-reparenting window manager and also because we
1481 * ConfigureNotify. Also that speeds startup under normal WM, by taking 1536 // defer bg image updates if the window is not mapped. The
1482 * care of multiplicity of ConfigureNotify events arriwing while WM does 1537 // short delay is to optimize for multiple ConfigureNotify
1483 * reparenting. 1538 // events at startup when the window manager reparents the
1484 * We should not render background immidiately, as there could be several 1539 // window, so as to perform the computation after we have
1485 * ConfigureNotify's to follow. Lets take care of all of them in one scoop 1540 // received all of them.
1486 * by scheduling background redraw as soon as we can, but giving a short 1541 if (bg_img == 0)
1487 * bit of time for ConfigureNotifies to arrive.
1488 * We should render background PRIOR to drawing any text, but AFTER all
1489 * of ConfigureNotifys for the best results.
1490 */
1491 if (bgPixmap.flags & bgPixmap_t::isInvalid)
1492 update_background_ev.start (0.025); 1542 update_background_ev.start (0.025);
1493#endif 1543#endif
1494 mapped = 1; 1544 mapped = 1;
1495#ifdef TEXT_BLINK 1545#ifdef TEXT_BLINK
1496 text_blink_ev.start (); 1546 text_blink_ev.start ();
… …
1511 if (ev.xany.window == vt) 1561 if (ev.xany.window == vt)
1512 { 1562 {
1513 do 1563 do
1514 { 1564 {
1515 scr_expose (ev.xexpose.x, ev.xexpose.y, 1565 scr_expose (ev.xexpose.x, ev.xexpose.y,
1516 ev.xexpose.width, ev.xexpose.height, False); 1566 ev.xexpose.width, ev.xexpose.height, false);
1517 } 1567 }
1518 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)); 1568 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1519 1569
1520 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1570 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1521 1571
1522 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)) 1572 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1523 { 1573 {
1524 scr_expose (ev.xexpose.x, ev.xexpose.y, 1574 scr_expose (ev.xexpose.x, ev.xexpose.y,
1525 ev.xexpose.width, ev.xexpose.height, False); 1575 ev.xexpose.width, ev.xexpose.height, false);
1526 } 1576 }
1527 1577
1528 want_refresh = 1; 1578 want_refresh = 1;
1529 } 1579 }
1530 else 1580 else
… …
1536 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event)) 1586 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1537 ; 1587 ;
1538 1588
1539 if (scrollBar.state && ev.xany.window == scrollBar.win) 1589 if (scrollBar.state && ev.xany.window == scrollBar.win)
1540 { 1590 {
1541 scrollBar.state = STATE_IDLE; 1591 scrollBar.state = SB_STATE_IDLE;
1542 scrollbar_show (0); 1592 scrollBar.show (0);
1543 } 1593 }
1544 } 1594 }
1545 break; 1595 break;
1546 1596
1547 case MotionNotify: 1597 case MotionNotify:
… …
1588 1638
1589#ifdef SELECTION_SCROLLING 1639#ifdef SELECTION_SCROLLING
1590 if (ev.xbutton.y < int_bwidth 1640 if (ev.xbutton.y < int_bwidth
1591 || Pixel2Row (ev.xbutton.y) > (nrow-1)) 1641 || Pixel2Row (ev.xbutton.y) > (nrow-1))
1592 { 1642 {
1643 page_dirn scroll_selection_dir;
1593 int dist; 1644 int dist;
1594 1645
1595 /* don't clobber the current delay if we are 1646 /* don't clobber the current delay if we are
1596 * already in the middle of scrolling. 1647 * already in the middle of scrolling.
1597 */ 1648 */
… …
1612 dist = int_bwidth - ev.xbutton.y; 1663 dist = int_bwidth - ev.xbutton.y;
1613 } 1664 }
1614 else 1665 else
1615 { 1666 {
1616 scroll_selection_dir = DN; 1667 scroll_selection_dir = DN;
1617 dist = ev.xbutton.y - (int_bwidth + height); 1668 dist = ev.xbutton.y - (int_bwidth + vt_height);
1618 } 1669 }
1619 1670
1620 scroll_selection_lines = Pixel2Height (dist) 1671 scroll_selection_lines = Pixel2Height (dist)
1621 / SELECTION_SCROLL_LINE_SPEEDUP 1672 / SELECTION_SCROLL_LINE_SPEEDUP
1622 + 1; 1673 + 1;
1623 min_it (scroll_selection_lines, 1674 min_it (scroll_selection_lines,
1624 SELECTION_SCROLL_MAX_LINES); 1675 SELECTION_SCROLL_MAX_LINES);
1676 scroll_selection_lines *= scroll_selection_dir;
1625 } 1677 }
1626 else 1678 else
1627 { 1679 {
1628 /* we are within the text window, so we 1680 /* we are within the text window, so we
1629 * shouldn't be scrolling 1681 * shouldn't be scrolling
… …
1634#ifdef MOUSE_THRESHOLD 1686#ifdef MOUSE_THRESHOLD
1635 } 1687 }
1636#endif 1688#endif
1637 } 1689 }
1638 } 1690 }
1639 else if (scrollBar.state == STATE_MOTION && ev.xany.window == scrollBar.win) 1691 else if (scrollBar.state == SB_STATE_MOTION && ev.xany.window == scrollBar.win)
1640 { 1692 {
1641 while (XCheckTypedWindowEvent (dpy, scrollBar.win, 1693 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1642 MotionNotify, &ev)) 1694 MotionNotify, &ev))
1643 ; 1695 ;
1644 1696
1645 XQueryPointer (dpy, scrollBar.win, 1697 XQueryPointer (dpy, scrollBar.win,
1646 &unused_root, &unused_child, 1698 &unused_root, &unused_child,
1647 &unused_root_x, &unused_root_y, 1699 &unused_root_x, &unused_root_y,
1648 &ev.xbutton.x, &ev.xbutton.y, 1700 &ev.xbutton.x, &ev.xbutton.y,
1649 &unused_mask); 1701 &unused_mask);
1650 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1702 scr_move_to (scrollBar.position (ev.xbutton.y) - csrO,
1651 scrollbar_size ()); 1703 scrollBar.size ());
1652 want_refresh = 1; 1704 want_refresh = 1;
1653 scrollbar_show (1); 1705 scrollBar.show (1);
1654 } 1706 }
1655 break; 1707 break;
1656 } 1708 }
1657 1709
1658#if defined(CURSOR_BLINK) 1710#if defined(CURSOR_BLINK)
1659 if (option (Opt_cursorBlink) && ev.type == KeyPress) 1711 if (ev.type == KeyPress)
1660 {
1661 if (hidden_cursor)
1662 {
1663 hidden_cursor = 0;
1664 want_refresh = 1;
1665 }
1666
1667 cursor_blink_ev.again (); 1712 cursor_blink_reset ();
1668 }
1669#endif 1713#endif
1670 1714
1671#if defined(POINTER_BLANK) 1715#if defined(POINTER_BLANK)
1672 if (option (Opt_pointerBlank) && pointerBlankDelay > 0) 1716 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1673 { 1717 {
… …
1683#endif 1727#endif
1684 1728
1685 refresh_check (); 1729 refresh_check ();
1686} 1730}
1687 1731
1688void 1732#if ENABLE_FRILLS
1733void ecb_cold
1734rxvt_term::set_urgency (bool enable)
1735{
1736 if (enable == urgency_hint)
1737 return;
1738
1739 if (XWMHints *h = XGetWMHints (dpy, parent))
1740 {
1741 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0);
1742 XSetWMHints (dpy, parent, h);
1743 urgency_hint = enable;
1744 XFree (h);
1745 }
1746}
1747#endif
1748
1749void ecb_cold
1689rxvt_term::focus_in () 1750rxvt_term::focus_in ()
1690{ 1751{
1691 if (!focus) 1752 if (!focus)
1692 { 1753 {
1693 focus = 1; 1754 focus = 1;
1694 want_refresh = 1; 1755 want_refresh = 1;
1695 1756
1696 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1697
1698#if USE_XIM 1757#if USE_XIM
1699 if (Input_Context != NULL) 1758 if (Input_Context != NULL)
1700 { 1759 {
1701 IMSetPosition (); 1760 im_set_position ();
1702 XSetICFocus (Input_Context); 1761 XSetICFocus (Input_Context);
1703 } 1762 }
1704#endif 1763#endif
1705#if CURSOR_BLINK 1764#if CURSOR_BLINK
1706 if (option (Opt_cursorBlink)) 1765 if (option (Opt_cursorBlink))
… …
1713 scr_recolour (); 1772 scr_recolour ();
1714 } 1773 }
1715#endif 1774#endif
1716#if ENABLE_FRILLS 1775#if ENABLE_FRILLS
1717 if (option (Opt_urgentOnBell)) 1776 if (option (Opt_urgentOnBell))
1718 { 1777 set_urgency (0);
1719 if (XWMHints *h = XGetWMHints(dpy, parent[0]))
1720 {
1721 h->flags &= ~XUrgencyHint;
1722 XSetWMHints (dpy, parent[0], h);
1723 }
1724 }
1725#endif 1778#endif
1726 }
1727}
1728 1779
1729void 1780 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1781 }
1782}
1783
1784void ecb_cold
1730rxvt_term::focus_out () 1785rxvt_term::focus_out ()
1731{ 1786{
1732 if (focus) 1787 if (focus)
1733 { 1788 {
1734 focus = 0; 1789 focus = 0;
1735 want_refresh = 1; 1790 want_refresh = 1;
1736 1791
1737 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1792#if ENABLE_FRILLS
1738 1793 if (option (Opt_urgentOnBell))
1794 set_urgency (0);
1795#endif
1739#if ENABLE_FRILLS || ISO_14755 1796#if ENABLE_FRILLS || ISO_14755
1740 if (iso14755buf) 1797 if (iso14755buf)
1741 { 1798 {
1742 iso14755buf = 0; 1799 iso14755buf = 0;
1743# if ISO_14755 1800# if ISO_14755
… …
1760 { 1817 {
1761 pix_colors = pix_colors_unfocused; 1818 pix_colors = pix_colors_unfocused;
1762 scr_recolour (); 1819 scr_recolour ();
1763 } 1820 }
1764#endif 1821#endif
1765 }
1766}
1767 1822
1768void 1823 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1824 }
1825}
1826
1827void ecb_cold
1769rxvt_term::update_fade_color (unsigned int idx) 1828rxvt_term::update_fade_color (unsigned int idx)
1770{ 1829{
1771#if OFF_FOCUS_FADING 1830#if OFF_FOCUS_FADING
1772 if (rs[Rs_fade]) 1831 if (rs[Rs_fade])
1773 { 1832 {
… …
1776 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c); 1835 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1777 } 1836 }
1778#endif 1837#endif
1779} 1838}
1780 1839
1781#if ENABLE_TRANSPARENCY || ENABLE_PERL 1840#if BG_IMAGE_FROM_ROOT || ENABLE_PERL
1782void 1841void ecb_hot
1783rxvt_term::rootwin_cb (XEvent &ev) 1842rxvt_term::rootwin_cb (XEvent &ev)
1784{ 1843{
1785 make_current (); 1844 make_current ();
1786 1845
1787 if (SHOULD_INVOKE (HOOK_ROOT_EVENT) 1846 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1788 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END))) 1847 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1789 return; 1848 return;
1790 1849
1791# if ENABLE_TRANSPARENCY
1792 switch (ev.type) 1850 switch (ev.type)
1793 { 1851 {
1794 case PropertyNotify: 1852 case PropertyNotify:
1795 /* 1853 /*
1796 * if user used some Esetroot compatible prog to set the root bg, 1854 * if user used some Esetroot compatible prog to set the root bg,
1797 * use the property to determine the pixmap. We use it later on. 1855 * use the property to determine the pixmap. We use it later on.
1798 */ 1856 */
1799 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID] 1857 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1800 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID]) 1858 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1801 { 1859 {
1802 bgPixmap.set_root_pixmap (); 1860#if BG_IMAGE_FROM_ROOT
1861 if (option (Opt_transparent))
1862 {
1863 rxvt_img::new_from_root (this)->replace (root_img);
1803 update_background (); 1864 update_background ();
1865 }
1866#endif
1867 HOOK_INVOKE ((this, HOOK_ROOTPMAP_CHANGE, DT_END));
1804 } 1868 }
1805 1869
1806 break; 1870 break;
1807 } 1871 }
1808# endif
1809 1872
1810 refresh_check (); 1873 refresh_check ();
1811} 1874}
1812#endif 1875#endif
1813 1876
… …
1846 /* save the xbutton state (for ButtonRelease) */ 1909 /* save the xbutton state (for ButtonRelease) */
1847 MEvent.state = ev.state; 1910 MEvent.state = ev.state;
1848#ifdef MOUSE_REPORT_DOUBLECLICK 1911#ifdef MOUSE_REPORT_DOUBLECLICK
1849 if (ev.button == MEvent.button && clickintime) 1912 if (ev.button == MEvent.button && clickintime)
1850 { 1913 {
1851 /* same button, within alloted time */ 1914 /* same button, within allowed time */
1852 MEvent.clicks++; 1915 MEvent.clicks++;
1853 1916
1854 if (MEvent.clicks > 1) 1917 if (MEvent.clicks > 1)
1855 { 1918 {
1856 /* only report double clicks */ 1919 /* only report double clicks */
… …
1937 if (scrollBar.upButton (ev.y)) 2000 if (scrollBar.upButton (ev.y))
1938 direction = UP; /* up */ 2001 direction = UP; /* up */
1939 else if (scrollBar.dnButton (ev.y)) 2002 else if (scrollBar.dnButton (ev.y))
1940 direction = DN; /* down */ 2003 direction = DN; /* down */
1941 2004
1942 scrollBar.state = STATE_IDLE; 2005 scrollBar.state = SB_STATE_IDLE;
1943 /* 2006 /*
1944 * Rxvt-style scrollbar: 2007 * Rxvt-style scrollbar:
1945 * move up if mouse is above slider 2008 * move up if mouse is above slider
1946 * move dn if mouse is below slider 2009 * move dn if mouse is below slider
1947 * 2010 *
… …
1986 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY); 2049 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1987#endif 2050#endif
1988 if (scr_page (direction, 1)) 2051 if (scr_page (direction, 1))
1989 { 2052 {
1990 if (direction == UP) 2053 if (direction == UP)
1991 scrollBar.state = STATE_UP; 2054 scrollBar.state = SB_STATE_UP;
1992 else 2055 else
1993 scrollBar.state = STATE_DOWN; 2056 scrollBar.state = SB_STATE_DOWN;
1994 } 2057 }
1995 } 2058 }
1996 else 2059 else
1997 switch (ev.button) 2060 switch (ev.button)
1998 { 2061 {
1999 case Button2: 2062 case Button2:
2000 switch (scrollBar.align) 2063 switch (scrollBar.align)
2001 { 2064 {
2002 case R_SB_ALIGN_TOP: 2065 case SB_ALIGN_TOP:
2003 csrO = 0; 2066 csrO = 0;
2004 break; 2067 break;
2005 case R_SB_ALIGN_CENTRE: 2068 case SB_ALIGN_CENTRE:
2006 csrO = (scrollBar.bot - scrollBar.top) / 2; 2069 csrO = (scrollBar.bot - scrollBar.top) / 2;
2007 break; 2070 break;
2008 case R_SB_ALIGN_BOTTOM: 2071 case SB_ALIGN_BOTTOM:
2009 csrO = scrollBar.bot - scrollBar.top; 2072 csrO = scrollBar.bot - scrollBar.top;
2010 break; 2073 break;
2011 } 2074 }
2012 2075
2013 if (scrollBar.style == R_SB_XTERM 2076 if (scrollBar.style == SB_STYLE_XTERM
2014 || scrollbar_above_slider (ev.y) 2077 || scrollBar.above_slider (ev.y)
2015 || scrollbar_below_slider (ev.y)) 2078 || scrollBar.below_slider (ev.y))
2016 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ()); 2079 scr_move_to (scrollBar.position (ev.y) - csrO, scrollBar.size ());
2017 2080
2018 scrollBar.state = STATE_MOTION; 2081 scrollBar.state = SB_STATE_MOTION;
2019 break; 2082 break;
2020 2083
2021 case Button1: 2084 case Button1:
2022 if (scrollBar.align == R_SB_ALIGN_CENTRE) 2085 if (scrollBar.align == SB_ALIGN_CENTRE)
2023 csrO = ev.y - scrollBar.top; 2086 csrO = ev.y - scrollBar.top;
2024 /* FALLTHROUGH */ 2087 /* FALLTHROUGH */
2025 2088
2026 case Button3: 2089 case Button3:
2027 if (scrollBar.style != R_SB_XTERM) 2090 if (scrollBar.style != SB_STYLE_XTERM)
2028 { 2091 {
2029 if (scrollbar_above_slider (ev.y)) 2092 if (scrollBar.above_slider (ev.y))
2030# ifdef RXVT_SCROLL_FULL 2093# ifdef RXVT_SCROLL_FULL
2031 scr_page (UP, nrow - 1); 2094 scr_page (UP, nrow - 1);
2032# else 2095# else
2033 scr_page (UP, nrow / 4); 2096 scr_page (UP, nrow / 4);
2034# endif 2097# endif
2035 else if (scrollbar_below_slider (ev.y)) 2098 else if (scrollBar.below_slider (ev.y))
2036# ifdef RXVT_SCROLL_FULL 2099# ifdef RXVT_SCROLL_FULL
2037 scr_page (DN, nrow - 1); 2100 scr_page (DN, nrow - 1);
2038# else 2101# else
2039 scr_page (DN, nrow / 4); 2102 scr_page (DN, nrow / 4);
2040# endif 2103# endif
2041 else 2104 else
2042 scrollBar.state = STATE_MOTION; 2105 scrollBar.state = SB_STATE_MOTION;
2043 } 2106 }
2044 else 2107 else
2045 { 2108 {
2046 scr_page ((ev.button == Button1 ? DN : UP), 2109 scr_page ((ev.button == Button1 ? DN : UP),
2047 (nrow 2110 (nrow
2048 * scrollbar_position (ev.y) 2111 * scrollBar.position (ev.y)
2049 / scrollbar_size ())); 2112 / scrollBar.size ()));
2050 } 2113 }
2051 2114
2052 break; 2115 break;
2053 } 2116 }
2054 } 2117 }
… …
2064 2127
2065 csrO = 0; /* reset csr Offset */ 2128 csrO = 0; /* reset csr Offset */
2066 if (!bypass_keystate) 2129 if (!bypass_keystate)
2067 reportmode = !! (priv_modes & PrivMode_mouse_report); 2130 reportmode = !! (priv_modes & PrivMode_mouse_report);
2068 2131
2069 if (scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN) 2132 if (scrollBar.state == SB_STATE_UP || scrollBar.state == SB_STATE_DOWN)
2070 { 2133 {
2071 scrollBar.state = STATE_IDLE; 2134 scrollBar.state = SB_STATE_IDLE;
2072 scrollbar_show (0); 2135 scrollBar.show (0);
2073 } 2136 }
2074 2137
2075#ifdef SELECTION_SCROLLING 2138#ifdef SELECTION_SCROLLING
2076 sel_scroll_ev.stop(); 2139 sel_scroll_ev.stop();
2077#endif 2140#endif
… …
2126 case Button3: 2189 case Button3:
2127 selection_make (ev.time); 2190 selection_make (ev.time);
2128 break; 2191 break;
2129 2192
2130 case Button2: 2193 case Button2:
2131 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window? 2194 if (IN_RANGE_EXC (ev.x, 0, vt_width) && IN_RANGE_EXC (ev.y, 0, vt_height)) // inside window?
2132 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary); 2195 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2133 break; 2196 break;
2134 2197
2135#ifdef MOUSE_WHEEL 2198#ifdef MOUSE_WHEEL
2136 case Button4: 2199 case Button4:
2137 case Button5: 2200 case Button5:
2138 { 2201 {
2139 int i; 2202 int lines;
2140 page_dirn v; 2203 page_dirn dirn;
2141 2204
2142 v = ev.button == Button4 ? UP : DN; 2205 dirn = ev.button == Button4 ? UP : DN;
2143 2206
2144 if (ev.state & ShiftMask) 2207 if (ev.state & ShiftMask)
2145 i = 1; 2208 lines = 1;
2146 else if (option (Opt_mouseWheelScrollPage)) 2209 else if (option (Opt_mouseWheelScrollPage))
2147 i = nrow - 1; 2210 lines = nrow - 1;
2148 else 2211 else
2149 i = 5; 2212 lines = 5;
2150 2213
2151# ifdef MOUSE_SLIP_WHEELING 2214# ifdef MOUSE_SLIP_WHEELING
2152 if (ev.state & ControlMask) 2215 if (ev.state & ControlMask)
2153 { 2216 {
2154 mouse_slip_wheel_speed += v ? -1 : 1; 2217 mouse_slip_wheel_speed += dirn;
2155 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow; 2218 clamp_it (mouse_slip_wheel_speed, -nrow, nrow);
2156 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2157 2219
2158 if (!slip_wheel_ev.is_active ()) 2220 if (!slip_wheel_ev.is_active ())
2159 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY); 2221 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2160 } 2222 }
2161 else 2223 else
2162# endif 2224# endif
2163 { 2225 {
2164 scr_page (v, i); 2226 scr_page (dirn, lines);
2165 scrollbar_show (1); 2227 scrollBar.show (1);
2166 } 2228 }
2167 } 2229 }
2168 break; 2230 break;
2169#endif 2231#endif
2170 } 2232 }
2171 } 2233 }
2172} 2234}
2173 2235
2174/*}}} */ 2236/*}}} */
2175 2237
2176bool 2238void ecb_hot
2177rxvt_term::cmd_parse () 2239rxvt_term::cmd_parse ()
2178{ 2240{
2179 bool flag = false;
2180 wchar_t ch = NOCHAR; 2241 wchar_t ch = NOCHAR;
2181 char *seq_begin; // remember start of esc-sequence here 2242 char *seq_begin; // remember start of esc-sequence here
2182 2243
2183 for (;;) 2244 for (;;)
2184 { 2245 {
2185 if (ch == NOCHAR) 2246 if (ecb_unlikely (ch == NOCHAR))
2186 { 2247 {
2187 seq_begin = cmdbuf_ptr; 2248 seq_begin = cmdbuf_ptr;
2188 ch = next_char (); 2249 ch = next_char ();
2189 2250
2190 if (ch == NOCHAR) 2251 if (ch == NOCHAR)
2191 break; 2252 break;
2192 } 2253 }
2193 2254
2194 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2255 if (ecb_likely (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT))
2195 { 2256 {
2196 if (!seen_input) 2257 if (ecb_unlikely (!seen_input))
2197 { 2258 {
2198 seen_input = 1; 2259 seen_input = 1;
2199 // many badly-written programs (e.g. jed) contain a race condition: 2260 // many badly-written programs (e.g. jed) contain a race condition:
2200 // they first read the screensize and then install a SIGWINCH handler. 2261 // they first read the screensize and then install a SIGWINCH handler.
2201 // some window managers resize the window early, and these programs 2262 // some window managers resize the window early, and these programs
… …
2214 wchar_t *str = buf; 2275 wchar_t *str = buf;
2215 wchar_t *eol = str + min (ncol, UBUFSIZ); 2276 wchar_t *eol = str + min (ncol, UBUFSIZ);
2216 2277
2217 for (;;) 2278 for (;;)
2218 { 2279 {
2219 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2280 if (ecb_unlikely (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)))
2220 break; 2281 break;
2221 2282
2222 *str++ = ch; 2283 *str++ = ch;
2223 2284
2224 if (ch == C0_LF || str >= eol) 2285 if (ecb_unlikely (ch == C0_LF || str >= eol))
2225 { 2286 {
2226 if (ch == C0_LF) 2287 if (ch == C0_LF)
2227 nlines++; 2288 nlines++;
2228 2289
2229 refresh_count++; 2290 refresh_count++;
… …
2278 * What the heck we'll cheat and only refresh less than every page-full. 2339 * What the heck we'll cheat and only refresh less than every page-full.
2279 * if skipScroll is enabled. 2340 * if skipScroll is enabled.
2280 */ 2341 */
2281 if (refreshnow) 2342 if (refreshnow)
2282 { 2343 {
2283 flag = true;
2284 scr_refresh (); 2344 scr_refresh ();
2285 want_refresh = 1; 2345 want_refresh = 1;
2286 } 2346 }
2287
2288 } 2347 }
2289 else 2348 else
2290 { 2349 {
2291 try 2350 try
2292 { 2351 {
… …
2300 } 2359 }
2301 2360
2302 ch = NOCHAR; 2361 ch = NOCHAR;
2303 } 2362 }
2304 } 2363 }
2305
2306 return flag;
2307} 2364}
2308 2365
2309// read the next character 2366// read the next character
2310wchar_t 2367wchar_t ecb_hot
2311rxvt_term::next_char () NOTHROW 2368rxvt_term::next_char () NOTHROW
2312{ 2369{
2313 while (cmdbuf_ptr < cmdbuf_endp) 2370 while (cmdbuf_ptr < cmdbuf_endp)
2314 { 2371 {
2315 // assume 7-bit to be ascii ALWAYS 2372 // assume 7-bit to be ascii ALWAYS
2316 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2373 if (ecb_likely ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b))
2317 return *cmdbuf_ptr++; 2374 return *cmdbuf_ptr++;
2318 2375
2319 wchar_t wc; 2376 wchar_t wc;
2320 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2377 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2321 2378
… …
2325 cmdbuf_ptr = cmdbuf_endp; 2382 cmdbuf_ptr = cmdbuf_endp;
2326 break; 2383 break;
2327 } 2384 }
2328 2385
2329 if (len == (size_t)-1) 2386 if (len == (size_t)-1)
2387 {
2388 mbstate.reset (); // reset now undefined conversion state
2389 // a -1 might indicate that a previous incomplete char is invalid (previous return -2)
2390 // in which case we "erroneously" return the next byte which might be valid.
2330 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2391 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2392 }
2331 2393
2332 // assume wchar == unicode 2394 // assume wchar == unicode
2333 cmdbuf_ptr += len; 2395 cmdbuf_ptr += len;
2334 return wc & UNICODE_MASK; 2396 return wc & UNICODE_MASK;
2335 } 2397 }
2336 2398
2337 return NOCHAR; 2399 return NOCHAR;
2338} 2400}
2339 2401
2340// read the next octet 2402// read the next octet
2341uint32_t 2403uint32_t ecb_hot
2342rxvt_term::next_octet () NOTHROW 2404rxvt_term::next_octet () NOTHROW
2343{ 2405{
2344 return cmdbuf_ptr < cmdbuf_endp 2406 return cmdbuf_ptr < cmdbuf_endp
2345 ? (unsigned char)*cmdbuf_ptr++ 2407 ? (unsigned char)*cmdbuf_ptr++
2346 : NOCHAR; 2408 : NOCHAR;
2347} 2409}
2348 2410
2349static class out_of_input out_of_input; 2411static class out_of_input out_of_input;
2350 2412
2351/* rxvt_cmd_getc () - Return next input character */ 2413wchar_t ecb_hot
2352/*
2353 * Return the next input character after first passing any keyboard input
2354 * to the command.
2355 */
2356wchar_t
2357rxvt_term::cmd_getc () THROW ((class out_of_input)) 2414rxvt_term::cmd_getc () THROW ((class out_of_input))
2358{ 2415{
2359 wchar_t c = next_char (); 2416 wchar_t c = next_char ();
2360 2417
2361 if (c == NOCHAR) 2418 if (c == NOCHAR)
2362 throw out_of_input; 2419 throw out_of_input;
2363 2420
2364 return c; 2421 return c;
2365} 2422}
2366 2423
2367uint32_t 2424uint32_t ecb_hot
2368rxvt_term::cmd_get8 () THROW ((class out_of_input)) 2425rxvt_term::cmd_get8 () THROW ((class out_of_input))
2369{ 2426{
2370 uint32_t c = next_octet (); 2427 uint32_t c = next_octet ();
2371 2428
2372 if (c == NOCHAR) 2429 if (c == NOCHAR)
… …
2376} 2433}
2377 2434
2378/*{{{ print pipe */ 2435/*{{{ print pipe */
2379/*----------------------------------------------------------------------*/ 2436/*----------------------------------------------------------------------*/
2380#ifdef PRINTPIPE 2437#ifdef PRINTPIPE
2381FILE * 2438FILE * ecb_cold
2382rxvt_term::popen_printer () 2439rxvt_term::popen_printer ()
2383{ 2440{
2384 FILE *stream = popen (rs[Rs_print_pipe], "w"); 2441 FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");
2385 2442
2386 if (stream == NULL) 2443 if (stream == NULL)
2387 rxvt_warn ("can't open printer pipe, not printing.\n"); 2444 rxvt_warn ("can't open printer pipe, not printing.\n");
2388 2445
2389 return stream; 2446 return stream;
2390} 2447}
2391 2448
2392int 2449int ecb_cold
2393rxvt_term::pclose_printer (FILE *stream) 2450rxvt_term::pclose_printer (FILE *stream)
2394{ 2451{
2395 fflush (stream); 2452 fflush (stream);
2396 return pclose (stream); 2453 return pclose (stream);
2397} 2454}
2398 2455
2399/* 2456/*
2400 * simulate attached vt100 printer 2457 * simulate attached vt100 printer
2401 */ 2458 */
2402void 2459void ecb_cold
2403rxvt_term::process_print_pipe () 2460rxvt_term::process_print_pipe ()
2404{ 2461{
2405 int done; 2462 FILE *fd = popen_printer ();
2406 FILE *fd;
2407 2463
2408 if ((fd = popen_printer ()) == NULL) 2464 if (!fd)
2409 return; 2465 return;
2410 2466
2411 /* 2467 /*
2412 * Send all input to the printer until either ESC[4i or ESC[?4i 2468 * Send all input to the printer until either ESC[4i or ESC[?4i
2413 * is received. 2469 * is received.
2414 */ 2470 */
2415 for (done = 0; !done;) 2471 for (int done = 0; !done; )
2416 { 2472 {
2417 unsigned char buf[8]; 2473 unsigned char buf[8];
2418 unicode_t ch; 2474 unicode_t ch;
2419 unsigned int i, len; 2475 unsigned int i, len;
2420 2476
… …
2454 pclose_printer (fd); 2510 pclose_printer (fd);
2455} 2511}
2456#endif /* PRINTPIPE */ 2512#endif /* PRINTPIPE */
2457/*}}} */ 2513/*}}} */
2458 2514
2459/* *INDENT-OFF* */
2460enum { 2515enum {
2461 C1_40 = 0x40, 2516 C1_40 = 0x40,
2462 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA, 2517 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA,
2463 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3, 2518 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3,
2464 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA, 2519 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA,
2465 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC, 2520 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC,
2466}; 2521};
2467/* *INDENT-ON* */
2468 2522
2469/*{{{ process non-printing single characters */ 2523/*{{{ process non-printing single characters */
2470void 2524void ecb_hot
2471rxvt_term::process_nonprinting (unicode_t ch) 2525rxvt_term::process_nonprinting (unicode_t ch)
2472{ 2526{
2473 switch (ch) 2527 switch (ch)
2474 { 2528 {
2475 case C0_ESC: 2529 case C0_ESC:
… …
2521} 2575}
2522/*}}} */ 2576/*}}} */
2523 2577
2524 2578
2525/*{{{ process VT52 escape sequences */ 2579/*{{{ process VT52 escape sequences */
2526void 2580void ecb_cold
2527rxvt_term::process_escape_vt52 (unicode_t ch) 2581rxvt_term::process_escape_vt52 (unicode_t ch)
2528{ 2582{
2529 int row, col; 2583 int row, col;
2530 2584
2531 switch (ch) 2585 switch (ch)
… …
2565 break; 2619 break;
2566 case 'Z': /* identify the terminal type */ 2620 case 'Z': /* identify the terminal type */
2567 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */ 2621 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
2568 break; 2622 break;
2569 case '<': /* turn off VT52 mode */ 2623 case '<': /* turn off VT52 mode */
2570 PrivMode (0, PrivMode_vt52); 2624 priv_modes &= ~PrivMode_vt52;
2571 break; 2625 break;
2572 case 'F': /* use special graphics character set */ 2626 case 'F': /* use special graphics character set */
2573 case 'G': /* use regular character set */ 2627 case 'G': /* use regular character set */
2574 /* unimplemented */ 2628 /* unimplemented */
2575 break; 2629 break;
… …
2581} 2635}
2582/*}}} */ 2636/*}}} */
2583 2637
2584 2638
2585/*{{{ process escape sequences */ 2639/*{{{ process escape sequences */
2586void 2640void ecb_hot
2587rxvt_term::process_escape_seq () 2641rxvt_term::process_escape_seq ()
2588{ 2642{
2589 unicode_t ch = cmd_getc (); 2643 unicode_t ch = cmd_getc ();
2590 2644
2591 if (priv_modes & PrivMode_vt52) 2645 if (priv_modes & PrivMode_vt52)
… …
2594 return; 2648 return;
2595 } 2649 }
2596 2650
2597 switch (ch) 2651 switch (ch)
2598 { 2652 {
2599 /* case 1: do_tek_mode (); break; */
2600 case '#': 2653 case '#':
2601 if (cmd_getc () == '8') 2654 if (cmd_getc () == '8')
2602 scr_E (); 2655 scr_E ();
2603 break; 2656 break;
2604 case '(': 2657 case '(':
… …
2627#if !ENABLE_MINIMAL 2680#if !ENABLE_MINIMAL
2628 case '9': 2681 case '9':
2629 scr_forwardindex (); 2682 scr_forwardindex ();
2630 break; 2683 break;
2631#endif 2684#endif
2685 // DECPAM/DECPNM
2632 case '=': 2686 case '=':
2687 priv_modes |= PrivMode_aplKP;
2688 break;
2633 case '>': 2689 case '>':
2634 PrivMode ((ch == '='), PrivMode_aplKP); 2690 priv_modes &= ~PrivMode_aplKP;
2635 break; 2691 break;
2636 2692
2637 case C1_40: 2693 case C1_40:
2638 cmd_getc (); 2694 cmd_getc ();
2639 break; 2695 break;
… …
2643 2699
2644 /* 8.3.87: NEXT LINE */ 2700 /* 8.3.87: NEXT LINE */
2645 case C1_NEL: /* ESC E */ 2701 case C1_NEL: /* ESC E */
2646 { 2702 {
2647 wchar_t nlcr[] = { C0_LF, C0_CR }; 2703 wchar_t nlcr[] = { C0_LF, C0_CR };
2648 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1); 2704 scr_add_lines (nlcr, ecb_array_length (nlcr), 1);
2649 } 2705 }
2650 break; 2706 break;
2651 2707
2652 /* kidnapped escape sequence: Should be 8.3.48 */ 2708 /* kidnapped escape sequence: Should be 8.3.48 */
2653 case C1_ESA: /* ESC G */ 2709 case C1_ESA: /* ESC G */
2654 process_graphics (); 2710 // used by original rxvt for rob nations own graphics mode
2711 if (cmd_getc () == 'Q')
2712 tt_printf ("\033G0\012"); /* query graphics - no graphics */
2655 break; 2713 break;
2656 2714
2657 /* 8.3.63: CHARACTER TABULATION SET */ 2715 /* 8.3.63: CHARACTER TABULATION SET */
2658 case C1_HTS: /* ESC H */ 2716 case C1_HTS: /* ESC H */
2659 scr_set_tab (1); 2717 scr_set_tab (1);
… …
2663 case C1_RI: /* ESC M */ 2721 case C1_RI: /* ESC M */
2664 scr_index (DN); 2722 scr_index (DN);
2665 break; 2723 break;
2666 2724
2667 /* 8.3.142: SINGLE-SHIFT TWO */ 2725 /* 8.3.142: SINGLE-SHIFT TWO */
2668 /*case C1_SS2: scr_single_shift (2); break; */ 2726 /* case C1_SS2: break; */
2669 2727
2670 /* 8.3.143: SINGLE-SHIFT THREE */ 2728 /* 8.3.143: SINGLE-SHIFT THREE */
2671 /*case C1_SS3: scr_single_shift (3); break; */ 2729 /* case C1_SS3: break; */
2672 2730
2673 /* 8.3.27: DEVICE CONTROL STRING */ 2731 /* 8.3.27: DEVICE CONTROL STRING */
2674 case C1_DCS: /* ESC P */ 2732 case C1_DCS: /* ESC P */
2675 process_dcs_seq (); 2733 process_dcs_seq ();
2676 break; 2734 break;
… …
2678 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2736 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
2679 case C1_SCI: /* ESC Z */ 2737 case C1_SCI: /* ESC Z */
2680 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1); 2738 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
2681 break; /* steal obsolete ESC [ c */ 2739 break; /* steal obsolete ESC [ c */
2682 2740
2683 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2741 /* 8.3.16: CONTROL SEQUENCE INTRODUCER (CSI) */
2684 case C1_CSI: /* ESC [ */ 2742 case C1_CSI: /* ESC [ */
2685 process_csi_seq (); 2743 process_csi_seq ();
2686 break; 2744 break;
2687 2745
2688 /* 8.3.90: OPERATING SYSTEM COMMAND */ 2746 /* 8.3.90: OPERATING SYSTEM COMMAND (OSC) */
2689 case C1_OSC: /* ESC ] */ 2747 case C1_OSC: /* ESC ] */
2690 process_osc_seq (); 2748 process_osc_seq ();
2691 break; 2749 break;
2692 2750
2693 /* 8.3.106: RESET TO INITIAL STATE */ 2751 /* 8.3.106: RESET TO INITIAL STATE (RIS) */
2694 case 'c': 2752 case 'c':
2695 mbstate.reset (); 2753 mbstate.reset ();
2696 scr_poweron (); 2754 scr_poweron ();
2697 scrollbar_show (1); 2755 scrollBar.show (1);
2698 break; 2756 break;
2699 2757
2700 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */ 2758 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
2701 case 'n': 2759 case 'n':
2702 scr_charset_choose (2); 2760 scr_charset_choose (2);
… …
2709 } 2767 }
2710} 2768}
2711/*}}} */ 2769/*}}} */
2712 2770
2713/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */ 2771/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */
2714/* *INDENT-OFF* */
2715enum { 2772enum {
2716 CSI_ICH = 0x40, 2773 CSI_ICH = 0x40,
2717 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA, 2774 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA,
2718 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA , 2775 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA ,
2719 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC, 2776 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC,
… …
2722 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ, 2779 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ,
2723 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 , 2780 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 ,
2724 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F 2781 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F
2725}; 2782};
2726 2783
2727#define make_byte(b7,b6,b5,b4,b3,b2,b1,b0) \ 2784#define make_byte(b0,b1,b2,b3,b4,b5,b6,b7) \
2728 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \ 2785 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \
2729 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0)) 2786 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0))
2730#define get_byte_array_bit(array, bit) \ 2787#define get_byte_array_bit(array, bit) \
2731 (!! ((array)[ (bit) / 8] & (128 >> ((bit) & 7)))) 2788 (!! ((array)[(bit) >> 3] & (1 << ((bit) & 7))))
2732 2789
2733const unsigned char csi_defaults[] = 2790static const unsigned char csi_defaults[] =
2734 { 2791 {
2735 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */ 2792 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */
2736 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */ 2793 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */
2737 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */ 2794 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */
2738 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */ 2795 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */
2739 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */ 2796 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */
2740 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */ 2797 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */
2741 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */ 2798 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */
2742 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */ 2799 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */
2743 }; 2800 };
2744/* *INDENT-ON* */
2745 2801
2746void 2802void ecb_hot
2747rxvt_term::process_csi_seq () 2803rxvt_term::process_csi_seq ()
2748{ 2804{
2749 unicode_t ch, priv, i; 2805 unicode_t ch, priv, prev_ch, i;
2750 unsigned int nargs, p; 2806 unsigned int nargs, p;
2751 int n, ndef; 2807 int n, ndef;
2752 int arg[ESC_ARGS] = { }; 2808 int arg[ESC_ARGS] = { };
2753 2809
2754 nargs = 0; 2810 nargs = 0;
2755 2811
2756 priv = 0; 2812 priv = 0;
2757 ch = cmd_getc (); 2813 ch = cmd_getc ();
2758 if (ch >= '<' && ch <= '?') 2814 if ((ch >= '<' && ch <= '?') || ch == '!')
2759 { 2815 {
2760 /* '<' '=' '>' '?' */ 2816 /* '<' '=' '>' '?' '!' */
2761 priv = ch; 2817 priv = ch;
2762 ch = cmd_getc (); 2818 ch = cmd_getc ();
2763 } 2819 }
2764 2820
2821 prev_ch = 0;
2765 /* read any numerical arguments */ 2822 /* read any numerical arguments */
2766 for (n = -1; ch < CSI_ICH; ) 2823 for (n = -1; ch < CSI_ICH; )
2767 { 2824 {
2768 if (isdigit (ch)) 2825 if (isdigit (ch))
2769 { 2826 {
… …
2779 n = -1; 2836 n = -1;
2780 } 2837 }
2781 else if (IS_CONTROL (ch)) 2838 else if (IS_CONTROL (ch))
2782 process_nonprinting (ch); 2839 process_nonprinting (ch);
2783 2840
2841 prev_ch = ch;
2784 ch = cmd_getc (); 2842 ch = cmd_getc ();
2785 } 2843 }
2786 2844
2787 if (ch > CSI_7F) 2845 if (ch > CSI_7F)
2788 return; 2846 return;
… …
2819 2877
2820 case '?': 2878 case '?':
2821 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2879 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2822 process_terminal_mode (ch, priv, nargs, arg); 2880 process_terminal_mode (ch, priv, nargs, arg);
2823 break; 2881 break;
2882
2883 case '!':
2884 if (ch == CSI_70)
2885 {
2886 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */
2887 scr_soft_reset ();
2888
2889 static const int pm_h[] = { 7, 25 };
2890 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1005, 1015, 1049 };
2891
2892 process_terminal_mode ('h', 0, ecb_array_length (pm_h), pm_h);
2893 process_terminal_mode ('l', 0, ecb_array_length (pm_l), pm_l);
2824 } 2894 }
2895 break;
2896 }
2897
2825 return; 2898 return;
2826 } 2899 }
2827 2900
2828 switch (ch) 2901 switch (ch)
2829 { 2902 {
… …
2843 } 2916 }
2844 break; 2917 break;
2845#endif 2918#endif
2846 2919
2847 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */ 2920 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */
2848 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */ 2921 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */
2849 arg[0] = -arg[0]; 2922 arg[0] = -arg[0];
2850 /* FALLTHROUGH */ 2923 /* FALLTHROUGH */
2851 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */ 2924 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */
2852 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */ 2925 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */
2853 scr_gotorc (arg[0], 0, RELATIVE); 2926 scr_gotorc (arg[0], 0, RELATIVE);
2854 break; 2927 break;
2855 2928
2856 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */ 2929 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */
2857 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */ 2930 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */
… …
3007 scr_insert_mode (1); 3080 scr_insert_mode (1);
3008 else if (arg[0] == 20) 3081 else if (arg[0] == 20)
3009 priv_modes |= PrivMode_LFNL; 3082 priv_modes |= PrivMode_LFNL;
3010 break; 3083 break;
3011 3084
3085 case CSI_71: // DESCUSR: set cursor style
3086 if (prev_ch == ' ')
3087 set_cursor_style (arg[0]);
3088 break;
3089
3012 /* 3090 /*
3013 * PRIVATE USE beyond this point. All CSI_7? sequences here 3091 * PRIVATE USE beyond this point. All CSI_7? sequences here
3014 */ 3092 */
3015 case CSI_72: /* DECSTBM: set top and bottom margins */ 3093 case CSI_72: /* DECSTBM: set top and bottom margins */
3016 if (nargs == 1) 3094 if (nargs == 1)
… …
3044 } 3122 }
3045} 3123}
3046/*}}} */ 3124/*}}} */
3047 3125
3048#if !ENABLE_MINIMAL 3126#if !ENABLE_MINIMAL
3049/* ARGSUSED */
3050void 3127void
3051rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3128rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3052{ 3129{
3053 int x, y; 3130 int x, y;
3054 XWindowAttributes wattr; 3131 XWindowAttributes wattr;
… …
3063 { 3140 {
3064 /* 3141 /*
3065 * commands 3142 * commands
3066 */ 3143 */
3067 case 1: /* deiconify window */ 3144 case 1: /* deiconify window */
3068 XMapWindow (dpy, parent[0]); 3145 XMapWindow (dpy, parent);
3069 break; 3146 break;
3070 case 2: /* iconify window */ 3147 case 2: /* iconify window */
3071 XIconifyWindow (dpy, parent[0], display->screen); 3148 XIconifyWindow (dpy, parent, display->screen);
3072 break; 3149 break;
3073 case 3: /* set position (pixels) */ 3150 case 3: /* set position (pixels) */
3074 XMoveWindow (dpy, parent[0], args[1], args[2]); 3151 XMoveWindow (dpy, parent, args[1], args[2]);
3075 break; 3152 break;
3076 case 4: /* set size (pixels) */ 3153 case 4: /* set size (pixels) */
3077 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3154 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3078 break; 3155 break;
3079 case 5: /* raise window */ 3156 case 5: /* raise window */
3080 XRaiseWindow (dpy, parent[0]); 3157 XRaiseWindow (dpy, parent);
3081 break; 3158 break;
3082 case 6: /* lower window */ 3159 case 6: /* lower window */
3083 XLowerWindow (dpy, parent[0]); 3160 XLowerWindow (dpy, parent);
3084 break; 3161 break;
3085 case 7: /* refresh window */ 3162 case 7: /* refresh window */
3086 scr_touch (true); 3163 scr_touch (true);
3087 break; 3164 break;
3088 case 8: /* set size (chars) */ 3165 case 8: /* set size (chars) */
… …
3091 break; 3168 break;
3092 3169
3093 //case 9: NYI, TODO, restore maximized window or maximize window 3170 //case 9: NYI, TODO, restore maximized window or maximize window
3094 default: 3171 default:
3095 if (args[0] >= 24) /* set height (chars) */ 3172 if (args[0] >= 24) /* set height (chars) */
3096 set_widthheight ((unsigned int)width, 3173 set_widthheight ((unsigned int)vt_width,
3097 (unsigned int) (args[1] * fheight)); 3174 (unsigned int) (args[1] * fheight));
3098 break; 3175 break;
3099 3176
3100 /* 3177 /*
3101 * reports - some output format copied from XTerm 3178 * reports - some output format copied from XTerm
3102 */ 3179 */
3103 case 11: /* report window state */ 3180 case 11: /* report window state */
3104 XGetWindowAttributes (dpy, parent[0], &wattr); 3181 XGetWindowAttributes (dpy, parent, &wattr);
3105 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3182 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3106 break; 3183 break;
3107 case 13: /* report window position */ 3184 case 13: /* report window position */
3108 XGetWindowAttributes (dpy, parent[0], &wattr); 3185 XGetWindowAttributes (dpy, parent, &wattr);
3109 XTranslateCoordinates (dpy, parent[0], wattr.root, 3186 XTranslateCoordinates (dpy, parent, wattr.root,
3110 -wattr.border_width, -wattr.border_width, 3187 -wattr.border_width, -wattr.border_width,
3111 &x, &y, &wdummy); 3188 &x, &y, &wdummy);
3112 tt_printf ("\033[3;%d;%dt", x, y); 3189 tt_printf ("\033[3;%d;%dt", x, y);
3113 break; 3190 break;
3114 case 14: /* report window size (pixels) */ 3191 case 14: /* report window size (pixels) */
3115 XGetWindowAttributes (dpy, parent[0], &wattr); 3192 XGetWindowAttributes (dpy, parent, &wattr);
3116 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3193 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3117 break; 3194 break;
3118 case 18: /* report text area size (chars) */ 3195 case 18: /* report text area size (chars) */
3119 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3196 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3120 break; 3197 break;
… …
3122 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3199 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3123 break; 3200 break;
3124 case 20: /* report icon label */ 3201 case 20: /* report icon label */
3125 { 3202 {
3126 char *s; 3203 char *s;
3127 XGetIconName (dpy, parent[0], &s); 3204 XGetIconName (dpy, parent, &s);
3128 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3205 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3129 XFree (s); 3206 XFree (s);
3130 } 3207 }
3131 break; 3208 break;
3132 case 21: /* report window title */ 3209 case 21: /* report window title */
3133 { 3210 {
3134 char *s; 3211 char *s;
3135 XFetchName (dpy, parent[0], &s); 3212 XFetchName (dpy, parent, &s);
3136 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3213 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3137 XFree (s); 3214 XFree (s);
3138 } 3215 }
3139 break; 3216 break;
3140 } 3217 }
… …
3150rxvt_term::get_to_st (unicode_t &ends_how) 3227rxvt_term::get_to_st (unicode_t &ends_how)
3151{ 3228{
3152 unicode_t ch; 3229 unicode_t ch;
3153 bool seen_esc = false; 3230 bool seen_esc = false;
3154 unsigned int n = 0; 3231 unsigned int n = 0;
3155 wchar_t string[STRING_MAX]; 3232 wchar_t string[CBUFSIZ];
3156 3233
3157 while ((ch = cmd_getc ()) != NOCHAR) 3234 while ((ch = cmd_getc ()) != NOCHAR)
3158 { 3235 {
3159 if (seen_esc) 3236 if (seen_esc)
3160 { 3237 {
… …
3175 else if (ch < 0x20) 3252 else if (ch < 0x20)
3176 return NULL; /* other control character - exit */ 3253 return NULL; /* other control character - exit */
3177 3254
3178 seen_esc = false; 3255 seen_esc = false;
3179 3256
3180 if (n >= STRING_MAX - 1) 3257 if (n >= sizeof (string) - 1)
3181 // stop at some sane length 3258 // stop at some sane length
3182 return NULL; 3259 return NULL;
3183 3260
3184 string[n++] = ch; 3261 string[n++] = ch;
3185 } 3262 }
… …
3196 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3273 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3197 */ 3274 */
3198void 3275void
3199rxvt_term::process_dcs_seq () 3276rxvt_term::process_dcs_seq ()
3200{ 3277{
3201 char *s;
3202 unicode_t eh;
3203
3204 /* 3278 /*
3205 * Not handled yet 3279 * Not handled yet
3206 */ 3280 */
3281
3282 unicode_t eh;
3207 s = get_to_st (eh); 3283 char *s = get_to_st (eh);
3208 if (s) 3284 if (s)
3209 free (s); 3285 free (s);
3210 3286
3211 return; 3287 return;
3212} 3288}
… …
3216 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)' 3292 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)'
3217 */ 3293 */
3218void 3294void
3219rxvt_term::process_osc_seq () 3295rxvt_term::process_osc_seq ()
3220{ 3296{
3221 unicode_t ch, eh;
3222 int arg; 3297 int arg;
3223 3298
3224 ch = cmd_getc (); 3299 unicode_t ch = cmd_getc ();
3225 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3300 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3226 arg = arg * 10 + (ch - '0'); 3301 arg = arg * 10 + (ch - '0');
3227 3302
3228 if (ch == ';') 3303 if (ch == ';')
3229 { 3304 {
3305 unicode_t eh;
3230 char *s = get_to_st (eh); 3306 char *s = get_to_st (eh);
3231 3307
3232 if (s) 3308 if (s)
3233 { 3309 {
3234 process_xterm_seq (arg, s, eh); 3310 process_xterm_seq (arg, s, eh);
… …
3258 3334
3259/* 3335/*
3260 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3336 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3261 */ 3337 */
3262void 3338void
3263rxvt_term::process_xterm_seq (int op, const char *str, char resp) 3339rxvt_term::process_xterm_seq (int op, char *str, char resp)
3264{ 3340{
3265 int color; 3341 int color;
3266 char *buf, *name; 3342 char *buf, *name;
3267 bool query = str[0] == '?' && !str[1]; 3343 bool query = str[0] == '?' && !str[1];
3268 int saveop = op; 3344 int saveop = op;
… …
3295 unsigned long bytes_after; 3371 unsigned long bytes_after;
3296 unsigned char *value = 0; 3372 unsigned char *value = 0;
3297 const char *str = ""; 3373 const char *str = "";
3298 3374
3299 if (prop 3375 if (prop
3300 && XGetWindowProperty (dpy, parent[0], 3376 && XGetWindowProperty (dpy, parent,
3301 prop, 0, 1<<16, 0, AnyPropertyType, 3377 prop, 0, 1<<16, 0, AnyPropertyType,
3302 &actual_type, &actual_format, 3378 &actual_type, &actual_format,
3303 &nitems, &bytes_after, &value) == Success 3379 &nitems, &bytes_after, &value) == Success
3304 && actual_type != None 3380 && actual_type != None
3305 && actual_format == 8) 3381 && actual_format == 8)
… …
3309 3385
3310 XFree (value); 3386 XFree (value);
3311 } 3387 }
3312 else 3388 else
3313 { 3389 {
3314 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3390 char *eq = strchr (str, '=');
3315 3391
3316 if (eq) 3392 if (eq)
3317 { 3393 {
3318 *eq = 0; 3394 *eq = 0;
3319 set_utf8_property (display->atom (str), eq + 1); 3395 set_utf8_property (display->atom (str), eq + 1);
3320 } 3396 }
3321 else 3397 else
3322 XDeleteProperty (dpy, parent[0], 3398 XDeleteProperty (dpy, parent,
3323 display->atom (str)); 3399 display->atom (str));
3324 } 3400 }
3325 break; 3401 break;
3326 3402
3327 case XTerm_Color: 3403 case XTerm_Color:
… …
3359 process_color_seq (op, Color_pointer_fg, str, resp); 3435 process_color_seq (op, Color_pointer_fg, str, resp);
3360 break; 3436 break;
3361 case XTerm_Color_pointer_bg: 3437 case XTerm_Color_pointer_bg:
3362 process_color_seq (op, Color_pointer_bg, str, resp); 3438 process_color_seq (op, Color_pointer_bg, str, resp);
3363 break; 3439 break;
3440#ifdef OPTION_HC
3441 case XTerm_Color_HC:
3442 process_color_seq (op, Color_HC, str, resp);
3443 break;
3444 case XTerm_Color_HTC:
3445 process_color_seq (op, Color_HTC, str, resp);
3446 break;
3447#endif
3364#ifndef NO_BOLD_UNDERLINE_REVERSE 3448#ifndef NO_BOLD_UNDERLINE_REVERSE
3365 case XTerm_Color_RV:
3366 process_color_seq (op, Color_RV, str, resp);
3367 break;
3368 case Rxvt_Color_BD:
3369 case URxvt_Color_BD: 3449 case URxvt_Color_BD:
3370 process_color_seq (op, Color_BD, str, resp); 3450 process_color_seq (op, Color_BD, str, resp);
3371 break; 3451 break;
3372 case Rxvt_Color_UL:
3373 case URxvt_Color_UL: 3452 case URxvt_Color_UL:
3374 process_color_seq (op, Color_UL, str, resp); 3453 process_color_seq (op, Color_UL, str, resp);
3375 break; 3454 break;
3376 case URxvt_Color_IT: 3455 case URxvt_Color_IT:
3377 process_color_seq (op, Color_IT, str, resp); 3456 process_color_seq (op, Color_IT, str, resp);
3378 break; 3457 break;
3379#endif 3458#endif
3380#if ENABLE_TRANSPARENCY 3459 case URxvt_Color_border:
3460 process_color_seq (op, Color_border, str, resp);
3461 break;
3462
3463#if BG_IMAGE_FROM_ROOT
3381 case URxvt_Color_tint: 3464 case URxvt_Color_tint:
3382 process_color_seq (op, Color_tint, str, resp); 3465 process_color_seq (op, Color_tint, str, resp);
3383 { 3466 {
3384 bool changed = false; 3467 bool changed = false;
3385 3468
3386 if (ISSET_PIXCOLOR (Color_tint)) 3469 if (ISSET_PIXCOLOR (Color_tint))
3387 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]); 3470 changed = root_effects.set_tint (pix_colors_focused [Color_tint]);
3388 else
3389 changed = bgPixmap.unset_tint ();
3390 3471
3391 if (changed) 3472 if (changed)
3392 update_background (); 3473 update_background ();
3393 } 3474 }
3394 3475
… …
3398#if BG_IMAGE_FROM_FILE 3479#if BG_IMAGE_FROM_FILE
3399 case Rxvt_Pixmap: 3480 case Rxvt_Pixmap:
3400 if (!strcmp (str, "?")) 3481 if (!strcmp (str, "?"))
3401 { 3482 {
3402 char str[256]; 3483 char str[256];
3484 int h_scale = fimage.h_scale;
3485 int v_scale = fimage.v_scale;
3486 int h_align = fimage.h_align;
3487 int v_align = fimage.v_align;
3403 3488
3404 sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */ 3489 sprintf (str, "[%dx%d+%d+%d]",
3405 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767), 3490 h_scale, v_scale,
3406 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767)); 3491 h_align, v_align);
3407 process_xterm_seq (XTerm_title, str, CHAR_ST); 3492 process_xterm_seq (XTerm_title, str, CHAR_ST);
3408 } 3493 }
3409 else 3494 else
3410 { 3495 {
3411 int changed = 0; 3496 bool changed = false;
3412 3497
3413 if (*str != ';') 3498 if (*str != ';')
3414 { 3499 {
3415 /* reset to default scaling :*/ 3500 try
3416 bgPixmap.unset_geometry (); 3501 {
3417 if (bgPixmap.set_file (str)) /* change pixmap */ 3502 fimage.set_file_geometry (this, str);
3418 changed++; 3503 changed = true;
3419 str = strchr (str, ';'); 3504 }
3420 if (str == NULL) 3505 catch (const class rxvt_failure_exception &e)
3421 bgPixmap.set_defaultGeometry (); 3506 {
3507 }
3422 } 3508 }
3423 3509 else
3424 while (str)
3425 { 3510 {
3426 str++; 3511 str++;
3427 if (bgPixmap.set_geometry (str)) 3512 if (fimage.set_geometry (str, true))
3428 changed++; 3513 changed = true;
3429 str = strchr (str, ';');
3430 } 3514 }
3431 3515
3432 if (changed) 3516 if (changed)
3517 {
3518 if (bg_window_position_sensitive ())
3519 {
3520 int x, y;
3521 get_window_origin (x, y);
3522 parent_x = x;
3523 parent_y = y;
3524 }
3433 update_background (); 3525 update_background ();
3526 }
3434 } 3527 }
3435 break; 3528 break;
3436#endif 3529#endif
3437 3530
3438 case XTerm_logfile: 3531 case XTerm_logfile:
… …
3508 break; 3601 break;
3509#endif 3602#endif
3510 3603
3511#if ENABLE_PERL 3604#if ENABLE_PERL
3512 case URxvt_perl: 3605 case URxvt_perl:
3513 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END))) 3606 HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_STR_LEN, &resp, 1, DT_END));
3514 ; // no responses yet
3515 break; 3607 break;
3516#endif 3608#endif
3517 } 3609 }
3518} 3610}
3519/*----------------------------------------------------------------------*/ 3611/*----------------------------------------------------------------------*/
… …
3526 * 's' = save 3618 * 's' = save
3527 * 'r' = restore 3619 * 'r' = restore
3528 * 't' = toggle 3620 * 't' = toggle
3529 * so no need for fancy checking 3621 * so no need for fancy checking
3530 */ 3622 */
3531int 3623int ecb_cold
3532rxvt_term::privcases (int mode, unsigned long bit) 3624rxvt_term::privcases (int mode, unsigned long bit)
3533{ 3625{
3534 int state; 3626 int state;
3535 3627
3536 if (mode == 's') 3628 if (mode == 's')
3537 { 3629 {
3538 SavedModes |= (priv_modes & bit); 3630 if (priv_modes & bit)
3631 SavedModes |= bit;
3632 else
3633 SavedModes &= ~bit;
3539 return -1; 3634 return -1;
3540 } 3635 }
3541 else 3636 else
3542 { 3637 {
3543 if (mode == 'r') 3638 if (mode == 'r')
3544 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3639 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3545 else 3640 else
3546 state = (mode == 't') ? ! (priv_modes & bit) : mode; 3641 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3547 PrivMode (state, bit); 3642
3643 if (state)
3644 priv_modes |= bit;
3645 else
3646 priv_modes &= ~bit;
3548 } 3647 }
3549 3648
3550 return state; 3649 return state;
3551} 3650}
3552 3651
3553/* we're not using priv _yet_ */ 3652/* we're not using priv _yet_ */
3554void 3653void
3555rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg) 3654rxvt_term::process_terminal_mode (int mode, int priv ecb_unused, unsigned int nargs, const int *arg)
3556{ 3655{
3557 unsigned int i, j; 3656 unsigned int i, j;
3558 int state; 3657 int state;
3559 3658
3560 static const struct 3659 static const struct
3561 { 3660 {
3562 const int argval; 3661 const int argval;
3563 const unsigned long bit; 3662 const unsigned long bit;
3564 } argtopriv[] = { 3663 } argtopriv[] = {
3565 { 1, PrivMode_aplCUR }, 3664 { 1, PrivMode_aplCUR }, // DECCKM
3566 { 2, PrivMode_vt52 }, 3665 { 2, PrivMode_vt52 }, // DECANM
3567 { 3, PrivMode_132 }, 3666 { 3, PrivMode_132 }, // DECCOLM
3568 { 4, PrivMode_smoothScroll }, 3667 { 4, PrivMode_smoothScroll }, // DECSCLM
3569 { 5, PrivMode_rVideo }, 3668 { 5, PrivMode_rVideo }, // DECSCNM
3570 { 6, PrivMode_relOrigin }, 3669 { 6, PrivMode_relOrigin }, // DECOM
3571 { 7, PrivMode_Autowrap }, 3670 { 7, PrivMode_Autowrap }, // DECAWM
3572 // 8, bi-directional support mode 3671 // 8, auto-repeat keys // DECARM
3573 { 9, PrivMode_MouseX10 }, 3672 { 9, PrivMode_MouseX10 },
3574 // 18, 19 printing-related 3673 // 18 end FF to printer after print screen
3674 // 19 Print screen prints full screen/scroll region
3575 { 25, PrivMode_VisibleCursor }, 3675 { 25, PrivMode_VisibleCursor }, // DECTCEM cnorm/cvvis/civis
3576#ifdef scrollBar_esc 3676#ifdef scrollBar_esc
3577 { scrollBar_esc, PrivMode_scrollBar }, 3677 { scrollBar_esc, PrivMode_scrollBar },
3578#endif 3678#endif
3579 { 35, PrivMode_ShiftKeys }, // rxvt extension 3679 { 35, PrivMode_ShiftKeys }, // rxvt extension
3680 // 38, tektronix mode // DECTEK
3580 { 40, PrivMode_132OK }, 3681 { 40, PrivMode_132OK },
3581 // 41 xterm more fixes NYI 3682 // 41 xterm more fixes NYI
3582 // 45 margin bell NYI 3683 // 45 margin bell NYI
3583 // 46 start logging 3684 // 46 start logging
3584 { 47, PrivMode_Screen }, 3685 { 47, PrivMode_Screen },
3585 { 66, PrivMode_aplKP }, 3686 { 66, PrivMode_aplKP }, // DECNKM
3586#ifndef NO_BACKSPACE_KEY 3687#ifndef NO_BACKSPACE_KEY
3587 { 67, PrivMode_BackSpace }, 3688 { 67, PrivMode_BackSpace }, // DECBKM
3588#endif 3689#endif
3589 { 1000, PrivMode_MouseX11 }, 3690 { 1000, PrivMode_MouseX11 },
3590 { 1002, PrivMode_MouseBtnEvent }, 3691 { 1002, PrivMode_MouseBtnEvent },
3591 { 1003, PrivMode_MouseAnyEvent }, 3692 { 1003, PrivMode_MouseAnyEvent },
3693#if ENABLE_FRILLS
3694 { 1005, PrivMode_ExtModeMouse },
3695#endif
3592 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3696 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3593 { 1011, PrivMode_Keypress }, // rxvt extension 3697 { 1011, PrivMode_Keypress }, // rxvt extension
3698#if ENABLE_FRILLS
3699 { 1015, PrivMode_ExtMouseRight }, // urxvt extension of 1005
3700#endif
3594 // 1035 enable modifiers for alt, numlock NYI 3701 // 1035 enable modifiers for alt, numlock NYI
3595 // 1036 send ESC for meta keys NYI 3702 // 1036 send ESC for meta keys NYI
3596 // 1037 send DEL for keypad delete NYI 3703 // 1037 send DEL for keypad delete NYI
3597 { 1047, PrivMode_Screen }, 3704 { 1047, PrivMode_Screen },
3598 // 1048 save and restore cursor 3705 // 1048 save and restore cursor, implemented in code
3599 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */ 3706 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
3600 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3707 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3601 { 2004, PrivMode_BracketPaste }, 3708 { 2004, PrivMode_BracketPaste },
3602 }; 3709 };
3603 3710
… …
3613 for (i = 0; i < nargs; i++) 3720 for (i = 0; i < nargs; i++)
3614 { 3721 {
3615 state = -1; 3722 state = -1;
3616 3723
3617 /* basic handling */ 3724 /* basic handling */
3618 for (j = 0; j < (sizeof (argtopriv)/sizeof (argtopriv[0])); j++) 3725 for (j = 0; j < ecb_array_length (argtopriv); j++)
3619 if (argtopriv[j].argval == arg[i]) 3726 if (argtopriv[j].argval == arg[i])
3620 { 3727 {
3621 state = privcases (mode, argtopriv[j].bit); 3728 state = privcases (mode, argtopriv[j].bit);
3622 break; 3729 break;
3623 } 3730 }
… …
3631 3738
3632 scr_touch (true); 3739 scr_touch (true);
3633 break; 3740 break;
3634#endif 3741#endif
3635 case 1048: /* alternative cursor save */ 3742 case 1048: /* alternative cursor save */
3636 case 1049:
3637 if (option (Opt_secondaryScreen)) 3743 if (option (Opt_secondaryScreen))
3638 if (mode == 0) 3744 if (mode == 0)
3639 scr_cursor (RESTORE); 3745 scr_cursor (RESTORE);
3640 else if (mode == 1) 3746 else if (mode == 1)
3641 scr_cursor (SAVE); 3747 scr_cursor (SAVE);
… …
3650 case 2: /* VT52 mode */ 3756 case 2: /* VT52 mode */
3651 /* oddball mode. should be set regardless of set/reset 3757 /* oddball mode. should be set regardless of set/reset
3652 * parameter. Return from VT52 mode with an ESC < from 3758 * parameter. Return from VT52 mode with an ESC < from
3653 * within VT52 mode 3759 * within VT52 mode
3654 */ 3760 */
3655 PrivMode (1, PrivMode_vt52); 3761 priv_modes |= PrivMode_vt52;
3656 break; 3762 break;
3657 case 3: /* 80/132 */ 3763 case 3: /* 80/132 */
3658 if (priv_modes & PrivMode_132OK) 3764 if (priv_modes & PrivMode_132OK)
3659 {
3660 scr_poweron ();
3661 set_widthheight (((state ? 132 : 80) * fwidth), 24 * fheight); 3765 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
3662 }
3663 break; 3766 break;
3664 case 4: /* smooth scrolling */ 3767 case 4: /* smooth scrolling */
3665 set_option (Opt_jumpScroll, !state); 3768 set_option (Opt_jumpScroll, !state);
3666 break; 3769 break;
3667 case 5: /* reverse video */ 3770 case 5: /* reverse video */
… …
3678 if (state) /* orthogonal */ 3781 if (state) /* orthogonal */
3679 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent); 3782 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3680 break; 3783 break;
3681#ifdef scrollBar_esc 3784#ifdef scrollBar_esc
3682 case scrollBar_esc: 3785 case scrollBar_esc:
3683 if (scrollbar_mapping (state)) 3786 scrollBar.map (state);
3684 {
3685 resize_all_windows (0, 0, 0); 3787 resize_all_windows (0, 0, 0);
3686 scr_touch (true); 3788 scr_touch (true);
3687 }
3688 break; 3789 break;
3689#endif 3790#endif
3690 case 25: /* visible/invisible cursor */ 3791 case 25: /* visible/invisible cursor */
3691 scr_cursor_visible (state); 3792 scr_cursor_visible (state);
3692 break; 3793 break;
… …
3705 case 1003: 3806 case 1003:
3706 if (state) 3807 if (state)
3707 { 3808 {
3708 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11); 3809 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3709 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent; 3810 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3811 mouse_row = mouse_col = 0;
3710 vt_emask_mouse = PointerMotionMask; 3812 vt_emask_mouse = PointerMotionMask;
3711 } 3813 }
3712 else 3814 else
3713 vt_emask_mouse = NoEventMask; 3815 vt_emask_mouse = NoEventMask;
3816
3714 vt_select_input (); 3817 vt_select_input ();
3715 break; 3818 break;
3716 case 1010: /* scroll to bottom on TTY output inhibit */ 3819 case 1010: /* scroll to bottom on TTY output inhibit */
3717 set_option (Opt_scrollTtyOutput, !state); 3820 set_option (Opt_scrollTtyOutput, !state);
3718 break; 3821 break;
3719 case 1011: /* scroll to bottom on key press */ 3822 case 1011: /* scroll to bottom on key press */
3720 set_option (Opt_scrollTtyKeypress, state); 3823 set_option (Opt_scrollTtyKeypress, state);
3721 break; 3824 break;
3722 case 1047: /* secondary screen w/ clearing last */ 3825 case 1047: /* secondary screen w/ clearing last */
3723 if (option (Opt_secondaryScreen)) 3826 if (option (Opt_secondaryScreen))
3724 if (current_screen != PRIMARY) 3827 if (!state)
3725 scr_erase_screen (2); 3828 scr_erase_screen (2);
3829
3726 scr_change_screen (state); 3830 scr_change_screen (state);
3727 break; 3831 break;
3728 case 1049: /* secondary screen w/ clearing first */ 3832 case 1049: /* secondary screen w/ clearing first */
3833 if (option (Opt_secondaryScreen))
3834 if (state)
3835 scr_cursor (SAVE);
3836
3729 scr_change_screen (state); 3837 scr_change_screen (state);
3838
3730 if (option (Opt_secondaryScreen)) 3839 if (option (Opt_secondaryScreen))
3731 if (current_screen != PRIMARY) 3840 if (state)
3732 scr_erase_screen (2); 3841 scr_erase_screen (2);
3842 else
3843 scr_cursor (RESTORE);
3733 break; 3844 break;
3734 default: 3845 default:
3735 break; 3846 break;
3736 } 3847 }
3737 } 3848 }
3738} 3849}
3739/*}}} */ 3850/*}}} */
3740 3851
3741/*{{{ process sgr sequences */ 3852/*{{{ process sgr sequences */
3742void 3853void ecb_hot
3743rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg) 3854rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg)
3744{ 3855{
3745 unsigned int i; 3856 unsigned int i;
3746 short rendset; 3857 short rendset;
3747 int rendstyle; 3858 int rendstyle;
… …
3888 break; 3999 break;
3889#endif 4000#endif
3890 } 4001 }
3891 } 4002 }
3892} 4003}
3893/*}}} */
3894 4004
3895/*{{{ (do not) process Rob Nation's own graphics mode sequences */
3896void 4005void
3897rxvt_term::process_graphics () 4006rxvt_term::set_cursor_style (int style)
3898{ 4007{
3899 unicode_t ch, cmd = cmd_getc (); 4008 if (!IN_RANGE_INC (style, 0, 4))
3900
3901 if (cmd == 'Q')
3902 {
3903 /* query graphics */
3904 tt_printf ("\033G0\012"); /* no graphics */
3905 return; 4009 return;
3906 } 4010
3907 /* swallow other graphics sequences until terminating ':' */ 4011 set_option (Opt_cursorUnderline, style >= 3);
3908 do 4012
3909 ch = cmd_getc (); 4013#ifdef CURSOR_BLINK
3910 while (ch != ':'); 4014 set_option (Opt_cursorBlink, !style || (style & 1));
4015 cursor_blink_reset ();
4016#endif
4017
4018 want_refresh = 1;
3911} 4019}
3912/*}}} */ 4020/*}}} */
3913 4021
3914/* ------------------------------------------------------------------------- */ 4022/* ------------------------------------------------------------------------- */
3915 4023
… …
3931 4039
3932/* ---------------------------------------------------------------------- */ 4040/* ---------------------------------------------------------------------- */
3933/* Write data to the pty as typed by the user, pasted with the mouse, 4041/* Write data to the pty as typed by the user, pasted with the mouse,
3934 * or generated by us in response to a query ESC sequence. 4042 * or generated by us in response to a query ESC sequence.
3935 */ 4043 */
3936const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 4044static const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
3937 4045
3938void 4046void
3939rxvt_term::tt_write (const char *data, unsigned int len) 4047rxvt_term::tt_write (const char *data, unsigned int len)
3940{ 4048{
3941 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END))) 4049 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
… …
3946 4054
3947 if (v_buflen == 0) 4055 if (v_buflen == 0)
3948 { 4056 {
3949 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE)); 4057 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
3950 4058
4059 max_it (written, 0);
4060
3951 if ((unsigned int)written == len) 4061 if (written == len)
3952 return; 4062 return;
3953 4063
3954 data += written; 4064 data += written;
3955 len -= written; 4065 len -= written;
3956 } 4066 }
3957 4067
3958 v_buffer = (char *)realloc (v_buffer, v_buflen + len); 4068 v_buffer = (char *)rxvt_realloc (v_buffer, v_buflen + len);
3959 4069
3960 memcpy (v_buffer + v_buflen, data, len); 4070 memcpy (v_buffer + v_buflen, data, len);
3961 v_buflen += len; 4071 v_buflen += len;
3962 4072
3963 pty_ev.set (ev::READ | ev::WRITE); 4073 pty_ev.set (ev::READ | ev::WRITE);

Diff Legend

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