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.312 by root, Sat Mar 4 22:05:05 2006 UTC vs.
Revision 1.504 by sf-exg, Mon Jan 9 21:12:08 2012 UTC

… …
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-2006 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 * 32 *
32 * 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
33 * 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
34 * the Free Software Foundation; either version 2 of the License, or 35 * the Free Software Foundation; either version 2 of the License, or
35 * (at your option) any later version. 36 * (at your option) any later version.
… …
95 XK_Shift_L, 0x21e7, 96 XK_Shift_L, 0x21e7,
96 XK_Shift_R, 0x21e7, 97 XK_Shift_R, 0x21e7,
97 98
98 XK_Shift_Lock, 0x21eb, 99 XK_Shift_Lock, 0x21eb,
99 XK_ISO_Lock, 0x21eb, 100 XK_ISO_Lock, 0x21eb,
100 XK_ISO_Lock, 0x21eb,
101 XK_Caps_Lock, 0x21ec, 101 XK_Caps_Lock, 0x21ec,
102 XK_Num_Lock, 0x21ed, 102 XK_Num_Lock, 0x21ed,
103 XK_ISO_Level3_Shift, 0x21ee, 103 XK_ISO_Level3_Shift, 0x21ee,
104 XK_ISO_Level3_Lock, 0x21ef, 104 XK_ISO_Level3_Lock, 0x21ef,
105 XK_ISO_Group_Lock, 0x21f0, 105 XK_ISO_Group_Lock, 0x21f0,
… …
162 162
163void 163void
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)
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);
… …
197 r & RS_Blink ? " blink" : "", 194 r & RS_Blink ? " blink" : "",
198 r & RS_RVid ? " rvid" : "", 195 r & RS_RVid ? " rvid" : "",
199 r & RS_Uline ? " uline" : "", 196 r & RS_Uline ? " uline" : "",
200 r & RS_Careful ? " careful" : ""); 197 r & RS_Careful ? " careful" : "");
201 198
199 int width = 0;
200 fname = rxvt_temp_buf<wchar_t *> (len);
201 for (int i = 0; i < len; i++)
202 {
203 rxvt_font *f = (*fs)[fs->find_font_idx (chr[i])];
204 fname[i] = rxvt_utf8towcs (f->name);
202 int width = wcswidth (fname, wcslen (fname)); 205 max_it (width, wcswidth (fname[i], wcslen (fname[i])));
206 }
203 207
204 max_it (width, 8+5); // for char + hey 208 max_it (width, 8+5); // for char + hex
205 max_it (width, strlen (attr)); 209 max_it (width, strlen (attr));
206 210
207 if (y >= 0) 211 if (y >= 0)
208 { 212 {
209 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1; 213 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1;
210 x = 0; 214 x = 0;
211 } 215 }
212 216
213 scr_overlay_new (x, y, width, len + 2); 217 scr_overlay_new (x, y, width, len * 2 + 1);
214 218
215 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r)); 219 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));
216 220
217 for (int y = 0; y < len; y++) 221 for (int y = 0; y < len; y++)
218 { 222 {
… …
221 ch = *chr++; 225 ch = *chr++;
222 226
223 sprintf (buf, "%8x", ch); 227 sprintf (buf, "%8x", ch);
224 scr_overlay_set (0, y, buf); 228 scr_overlay_set (0, y, buf);
225 scr_overlay_set (9, y, '='); 229 scr_overlay_set (9, y, '=');
226# if !UNICODE3 230# if !UNICODE_3
227 if (ch >= 0x10000) 231 if (ch >= 0x10000)
228 ch = 0xfffd; 232 ch = 0xfffd;
229# endif 233# endif
230 scr_overlay_set (11, y, ch, r); 234 scr_overlay_set (11, y, ch, r);
231 235
… …
237// char buf[4+4+3+1]; 241// char buf[4+4+3+1];
238// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y); 242// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y);
239// scr_overlay_set (0, 0, buf); 243// scr_overlay_set (0, 0, buf);
240// } 244// }
241 scr_overlay_set (0, len , attr); 245 scr_overlay_set (0, len , attr);
246 for (int i = 0; i < len; i++)
247 {
242 scr_overlay_set (0, len + 1, fname); 248 scr_overlay_set (0, len + 1 + i, fname[i]);
243
244 free (fname); 249 free (fname[i]);
250 }
245 251
246# if ENABLE_COMBINING 252# if ENABLE_COMBINING
247 if (alloc) 253 if (alloc)
248 delete [] alloc; 254 delete [] alloc;
249# endif 255# endif
… …
251#endif 257#endif
252 258
253void 259void
254rxvt_term::commit_iso14755 () 260rxvt_term::commit_iso14755 ()
255{ 261{
256 wchar_t ch[2];
257
258 ch[0] = iso14755buf & ISO_14755_MASK; 262 wchar_t ch = iso14755buf & ISO_14755_MASK;
259 ch[1] = 0;
260 263
261 if (iso14755buf & ISO_14755_51) 264 if (iso14755buf & ISO_14755_51)
262 { 265 {
263 char mb[16]; 266 char mb[MB_LEN_MAX];
264 int len; 267 int len;
265 268
266 // allow verbatim 0-bytes and control-bytes to be entered 269 // allow verbatim 0-bytes and control-bytes to be entered
267 if (ch[0] >= 0x20) 270 if (ch >= 0x20)
268 len = wcstombs (mb, ch, 16); 271 len = wctomb (mb, ch);
269 else 272 else
270 { 273 {
271 mb[0] = ch[0]; 274 mb[0] = ch;
272 len = 1; 275 len = 1;
273 } 276 }
274 277
275 if (len > 0) 278 if (len > 0)
276 tt_write (mb, len); 279 tt_write (mb, len);
… …
279 } 282 }
280 283
281 iso14755buf = 0; 284 iso14755buf = 0;
282} 285}
283 286
284int 287static int
285rxvt_term::hex_keyval (XKeyEvent &ev) 288hex_keyval (XKeyEvent &ev)
286{ 289{
287 // check wether this event corresponds to a hex digit 290 // check whether this event corresponds to a hex digit
288 // if the modifiers had not been pressed. 291 // if the modifiers had not been pressed.
289 for (int index = 0; index < 8; index++) 292 for (int index = 0; index < 8; index++)
290 { 293 {
291 KeySym k = XLookupKeysym (&ev, index); 294 KeySym k = XLookupKeysym (&ev, index);
292 295
… …
298 301
299 return -1; 302 return -1;
300} 303}
301#endif 304#endif
302 305
306static inline KeySym
307translate_keypad (KeySym keysym, bool kp)
308{
309#ifdef XK_KP_Home
310 static const KeySym keypadtrans[] = {
311 XK_KP_7, // XK_KP_Home
312 XK_KP_4, // XK_KP_Left
313 XK_KP_8, // XK_KP_Up
314 XK_KP_6, // XK_KP_Right
315 XK_KP_2, // XK_KP_Down
316# ifndef UNSHIFTED_SCROLLKEYS
317 XK_KP_9, // XK_KP_Prior
318 XK_KP_3, // XK_KP_Next
319# else
320 XK_Prior,
321 XK_Next,
322# endif
323 XK_KP_1, // XK_KP_End
324 XK_KP_5, // XK_KP_Begin
325 };
326
327 if (IN_RANGE_INC (keysym, XK_KP_Home, XK_KP_Begin))
328 {
329 unsigned int index = keysym - XK_KP_Home;
330 keysym = kp ? keypadtrans[index] : XK_Home + index;
331 }
332 else if (keysym == XK_KP_Insert)
333 keysym = kp ? XK_KP_0 : XK_Insert;
334# ifndef NO_DELETE_KEY
335 else if (keysym == XK_KP_Delete)
336 keysym = kp ? XK_KP_Decimal : XK_Delete;
337# endif
338#endif
339 return keysym;
340}
341
342static inline int
343map_function_key (KeySym keysym)
344{
345 int param = 0;
346
347 if (IN_RANGE_INC (keysym, XK_F1, XK_F35))
348 {
349 param = 11 + keysym - XK_F1;
350 if (keysym >= XK_F17)
351 param += 4;
352 else if (keysym >= XK_F15)
353 param += 3;
354 else if (keysym >= XK_F11)
355 param += 2;
356 else if (keysym >= XK_F6)
357 param += 1;
358 }
359 else
360 switch (keysym)
361 {
362 case XK_Find:
363 param = 1;
364 break;
365 case XK_Insert:
366 param = 2;
367 break;
368#ifdef DXK_Remove
369 case DXK_Remove:
370#endif
371 case XK_Execute:
372 param = 3;
373 break;
374 case XK_Select:
375 param = 4;
376 break;
377#ifndef UNSHIFTED_SCROLLKEYS
378 case XK_Prior:
379 param = 5;
380 break;
381 case XK_Next:
382 param = 6;
383 break;
384 case XK_Home:
385 param = 7;
386 break;
387 case XK_End:
388 param = 8;
389 break;
390#endif
391 case XK_Help:
392 param = 28;
393 break;
394 case XK_Menu:
395 param = 29;
396 break;
397 }
398 return param;
399}
400
303void 401void
304rxvt_term::key_press (XKeyEvent &ev) 402rxvt_term::key_press (XKeyEvent &ev)
305{ 403{
306 int ctrl, meta, shft, len; 404 int ctrl, meta, shft, len;
307 unsigned int newlen;
308 KeySym keysym; 405 KeySym keysym;
309 int valid_keysym; 406 int valid_keysym;
310 char kbuf[KBUFSZ]; 407 char kbuf[KBUFSZ];
311 408
312#if ISO_14755 409#if ISO_14755
… …
321 * Always permit `shift' to override the current setting 418 * Always permit `shift' to override the current setting
322 */ 419 */
323 shft = ev.state & ShiftMask; 420 shft = ev.state & ShiftMask;
324 ctrl = ev.state & ControlMask; 421 ctrl = ev.state & ControlMask;
325 meta = ev.state & ModMetaMask; 422 meta = ev.state & ModMetaMask;
326
327 if (numlock_state || (ev.state & ModNumLockMask))
328 {
329 numlock_state = (ev.state & ModNumLockMask);
330 PrivMode ((!numlock_state), PrivMode_aplKP);
331 }
332 423
333 kbuf[0] = 0; 424 kbuf[0] = 0;
334 425
335#ifdef USE_XIM 426#ifdef USE_XIM
336 if (Input_Context) 427 if (Input_Context)
… …
411#ifdef PAGING_CONTEXT_LINES 502#ifdef PAGING_CONTEXT_LINES
412 lnsppg = nrow - PAGING_CONTEXT_LINES; 503 lnsppg = nrow - PAGING_CONTEXT_LINES;
413#else 504#else
414 lnsppg = nrow * 4 / 5; 505 lnsppg = nrow * 4 / 5;
415#endif 506#endif
507 max_it (lnsppg, 1);
508
416 if (keysym == XK_Prior) 509 if (keysym == XK_Prior)
417 { 510 {
418 scr_page (UP, lnsppg); 511 scr_page (UP, lnsppg);
419 return; 512 return;
420 } 513 }
… …
473 selection_request (ev.time); 566 selection_request (ev.time);
474 return; 567 return;
475#if TODO 568#if TODO
476 /* rxvt extras */ 569 /* rxvt extras */
477 case XK_KP_Add: /* Shift+KP_Add = bigger font */ 570 case XK_KP_Add: /* Shift+KP_Add = bigger font */
478 change_font (FONT_UP);
479 return; 571 return;
480 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */ 572 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */
481 change_font (FONT_DN);
482 return; 573 return;
483#endif 574#endif
484 } 575 }
485 } 576 }
486 } 577 }
487 578
488#if ENABLE_FRILLS || ISO_14755 579#if ENABLE_FRILLS || ISO_14755
489 // ISO 14755 support 580 // ISO 14755 support
490 if (shft && ctrl) 581 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_51))
491 { 582 {
492 int hv; 583 int hv;
493 584
494 if (iso14755buf & ISO_14755_51 585 if (iso14755buf & ISO_14755_51
495 && (keysym == XK_space || keysym == XK_KP_Space 586 && (keysym == XK_space || keysym == XK_KP_Space
… …
497 { 588 {
498 commit_iso14755 (); 589 commit_iso14755 ();
499 iso14755buf = ISO_14755_51; 590 iso14755buf = ISO_14755_51;
500# if ISO_14755 591# if ISO_14755
501 iso14755_51 (0); 592 iso14755_51 (0);
593# endif
594 return;
595 }
596 else if (keysym == XK_BackSpace)
597 {
598 iso14755buf = ((iso14755buf & ISO_14755_MASK) >> 4) | ISO_14755_51;
599# if ISO_14755
600 iso14755_51 (iso14755buf & ISO_14755_MASK);
502# endif 601# endif
503 return; 602 return;
504 } 603 }
505 else if ((hv = hex_keyval (ev)) >= 0) 604 else if ((hv = hex_keyval (ev)) >= 0)
506 { 605 {
… …
511# endif 610# endif
512 return; 611 return;
513 } 612 }
514 else 613 else
515 { 614 {
516# if ENABLE_OVERLAY 615# if ISO_14755
517 scr_overlay_off (); 616 scr_overlay_off ();
518# endif 617# endif
519 iso14755buf = 0; 618 iso14755buf = 0;
520 } 619 }
521 } 620 }
621 else if (option (Opt_iso14755) &&
522 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R)) 622 ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R))
523 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))) 623 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))))
524 if (!(iso14755buf & ISO_14755_STARTED)) 624 if (!(iso14755buf & ISO_14755_STARTED))
525 { 625 {
526 iso14755buf |= ISO_14755_STARTED; 626 iso14755buf |= ISO_14755_STARTED;
527# if ENABLE_OVERLAY 627# if ISO_14755
528 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1); 628 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);
529 scr_overlay_set (0, 0, "ISO 14755 mode"); 629 scr_overlay_set (0, 0, "ISO 14755 mode");
530# endif 630# endif
531 } 631 }
532#endif 632#endif
533 633
534#ifdef PRINTPIPE 634#ifdef PRINTPIPE
535 if (keysym == XK_Print) 635 if (keysym == XK_Print)
536 { 636 {
537 scr_printscreen (ctrl | shft); 637 scr_printscreen (ctrl | shft);
538 return; 638 return;
539 } 639 }
540#endif 640#endif
541 641
542 if (keysym >= 0xFF00 && keysym <= 0xFFFF) 642 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
543 { 643 {
644 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
645 unsigned int newlen = 1;
646
647 if (ev.state & ModNumLockMask)
648 kp = false;
649
650 keysym = translate_keypad (keysym, kp);
651
652 switch (keysym)
544 { 653 {
654#ifndef NO_BACKSPACE_KEY
655 case XK_BackSpace:
656 if (priv_modes & PrivMode_HaveBackSpace)
657 {
658 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
659 ^ !!ctrl) ? '\b' : '\177';
660 kbuf[1] = '\0';
661 }
662 else
663 strcpy (kbuf, rs[Rs_backspace_key]);
664 break;
665#endif
666#ifndef NO_DELETE_KEY
667 case XK_Delete:
668 strcpy (kbuf, rs[Rs_delete_key]);
669 break;
670#endif
671 case XK_Tab:
672 if (shft)
673 strcpy (kbuf, "\033[Z");
674 else
675 {
676#ifdef CTRL_TAB_MAKES_META
677 if (ctrl)
678 meta = 1;
679#endif
680#ifdef MOD4_TAB_MAKES_META
681 if (ev.state & Mod4Mask)
682 meta = 1;
683#endif
545 newlen = 1; 684 newlen = 0;
546 switch (keysym) 685 }
686 break;
687
688 case XK_Up: /* "\033[A" */
689 case XK_Down: /* "\033[B" */
690 case XK_Right: /* "\033[C" */
691 case XK_Left: /* "\033[D" */
692 strcpy (kbuf, "\033[Z");
693 kbuf[2] = "DACB"[keysym - XK_Left];
694 /* do Shift first */
695 if (shft)
696 kbuf[2] = "dacb"[keysym - XK_Left];
697 else if (ctrl)
698 {
699 kbuf[1] = 'O';
700 kbuf[2] = "dacb"[keysym - XK_Left];
701 }
702 else if (priv_modes & PrivMode_aplCUR)
703 kbuf[1] = 'O';
704 break;
705
706 case XK_KP_Enter:
707 /* allow shift to override */
708 if (kp)
709 {
710 strcpy (kbuf, "\033OM");
711 break;
712 }
713
714 /* FALLTHROUGH */
715
716 case XK_Return:
717 if (priv_modes & PrivMode_LFNL)
718 {
719 kbuf[0] = '\015';
720 kbuf[1] = '\012';
721 kbuf[2] = '\0';
722 }
723 else
724 {
725 kbuf[0] = '\015';
726 kbuf[1] = '\0';
727 }
728 break;
729
730 case XK_KP_F1: /* "\033OP" */
731 case XK_KP_F2: /* "\033OQ" */
732 case XK_KP_F3: /* "\033OR" */
733 case XK_KP_F4: /* "\033OS" */
734 strcpy (kbuf, "\033OP");
735 kbuf[2] += (keysym - XK_KP_F1);
736 break;
737
738 case XK_KP_Multiply: /* "\033Oj" : "*" */
739 case XK_KP_Add: /* "\033Ok" : "+" */
740 case XK_KP_Separator: /* "\033Ol" : "," */
741 case XK_KP_Subtract: /* "\033Om" : "-" */
742 case XK_KP_Decimal: /* "\033On" : "." */
743 case XK_KP_Divide: /* "\033Oo" : "/" */
744 case XK_KP_0: /* "\033Op" : "0" */
745 case XK_KP_1: /* "\033Oq" : "1" */
746 case XK_KP_2: /* "\033Or" : "2" */
747 case XK_KP_3: /* "\033Os" : "3" */
748 case XK_KP_4: /* "\033Ot" : "4" */
749 case XK_KP_5: /* "\033Ou" : "5" */
750 case XK_KP_6: /* "\033Ov" : "6" */
751 case XK_KP_7: /* "\033Ow" : "7" */
752 case XK_KP_8: /* "\033Ox" : "8" */
753 case XK_KP_9: /* "\033Oy" : "9" */
754 /* allow shift to override */
755 if (kp)
756 {
757 strcpy (kbuf, "\033Oj");
758 kbuf[2] += (keysym - XK_KP_Multiply);
759 }
760 else
761 {
762 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
763 kbuf[1] = '\0';
764 }
765 break;
766
767 default:
547 { 768 {
548#ifndef NO_BACKSPACE_KEY 769 int param = map_function_key (keysym);
549 case XK_BackSpace: 770 if (param > 0)
550 if (priv_modes & PrivMode_HaveBackSpace) 771 sprintf (kbuf,"\033[%d~", param);
551 {
552 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
553 ^ !!ctrl) ? '\b' : '\177';
554 kbuf[1] = '\0';
555 }
556 else 772 else
557 strcpy (kbuf, key_backspace);
558 break;
559#endif
560#ifndef NO_DELETE_KEY
561# ifdef XK_KP_Prior
562 case XK_KP_Delete:
563 /* allow shift to override */
564 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
565 {
566 strcpy (kbuf, "\033On");
567 break;
568 }
569 /* FALLTHROUGH */
570# endif
571 case XK_Delete:
572 strcpy (kbuf, key_delete);
573 break;
574#endif
575 case XK_Tab:
576 if (shft)
577 strcpy (kbuf, "\033[Z");
578 else
579 {
580#ifdef CTRL_TAB_MAKES_META
581 if (ctrl)
582 meta = 1;
583#endif
584#ifdef MOD4_TAB_MAKES_META
585 if (ev.state & Mod4Mask)
586 meta = 1;
587#endif
588 newlen = 0;
589 }
590 break;
591
592#ifdef XK_KP_Left
593 case XK_KP_Up: /* \033Ox or standard */
594 case XK_KP_Down: /* \033Or or standard */
595 case XK_KP_Right: /* \033Ov or standard */
596 case XK_KP_Left: /* \033Ot or standard */
597 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
598 {
599 strcpy (kbuf, "\033OZ");
600 kbuf[2] = "txvr"[keysym - XK_KP_Left];
601 break;
602 }
603 else
604 /* translate to std. cursor key */
605 keysym = XK_Left + (keysym - XK_KP_Left);
606 /* FALLTHROUGH */
607#endif
608 case XK_Up: /* "\033[A" */
609 case XK_Down: /* "\033[B" */
610 case XK_Right: /* "\033[C" */
611 case XK_Left: /* "\033[D" */
612 strcpy (kbuf, "\033[Z");
613 kbuf[2] = "DACB"[keysym - XK_Left];
614 /* do Shift first */
615 if (shft)
616 kbuf[2] = "dacb"[keysym - XK_Left];
617 else if (ctrl)
618 {
619 kbuf[1] = 'O';
620 kbuf[2] = "dacb"[keysym - XK_Left];
621 }
622 else if (priv_modes & PrivMode_aplCUR)
623 kbuf[1] = 'O';
624 break;
625
626#ifndef UNSHIFTED_SCROLLKEYS
627# ifdef XK_KP_Prior
628 case XK_KP_Prior:
629 /* allow shift to override */
630 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
631 {
632 strcpy (kbuf, "\033Oy");
633 break;
634 }
635 /* FALLTHROUGH */
636# endif
637 case XK_Prior:
638 strcpy (kbuf, "\033[5~");
639 break;
640# ifdef XK_KP_Next
641 case XK_KP_Next:
642 /* allow shift to override */
643 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
644 {
645 strcpy (kbuf, "\033Os");
646 break;
647 }
648 /* FALLTHROUGH */
649# endif
650 case XK_Next:
651 strcpy (kbuf, "\033[6~");
652 break;
653#endif
654 case XK_KP_Enter:
655 /* allow shift to override */
656 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
657 {
658 strcpy (kbuf, "\033OM");
659 break;
660 }
661
662 /* FALLTHROUGH */
663
664 case XK_Return:
665 if (priv_modes & PrivMode_LFNL)
666 {
667 kbuf[0] = '\015';
668 kbuf[1] = '\012';
669 kbuf[2] = '\0';
670 }
671 else
672 {
673 kbuf[0] = '\015';
674 kbuf[1] = '\0';
675 }
676 break;
677
678#ifdef XK_KP_Begin
679 case XK_KP_Begin:
680 strcpy (kbuf, "\033Ou");
681 break;
682
683#endif
684 case XK_KP_F1: /* "\033OP" */
685 case XK_KP_F2: /* "\033OQ" */
686 case XK_KP_F3: /* "\033OR" */
687 case XK_KP_F4: /* "\033OS" */
688 strcpy (kbuf, "\033OP");
689 kbuf[2] += (keysym - XK_KP_F1);
690 break;
691
692 case XK_KP_Multiply: /* "\033Oj" : "*" */
693 case XK_KP_Add: /* "\033Ok" : "+" */
694 case XK_KP_Separator: /* "\033Ol" : "," */
695 case XK_KP_Subtract: /* "\033Om" : "-" */
696 case XK_KP_Decimal: /* "\033On" : "." */
697 case XK_KP_Divide: /* "\033Oo" : "/" */
698 case XK_KP_0: /* "\033Op" : "0" */
699 case XK_KP_1: /* "\033Oq" : "1" */
700 case XK_KP_2: /* "\033Or" : "2" */
701 case XK_KP_3: /* "\033Os" : "3" */
702 case XK_KP_4: /* "\033Ot" : "4" */
703 case XK_KP_5: /* "\033Ou" : "5" */
704 case XK_KP_6: /* "\033Ov" : "6" */
705 case XK_KP_7: /* "\033Ow" : "7" */
706 case XK_KP_8: /* "\033Ox" : "8" */
707 case XK_KP_9: /* "\033Oy" : "9" */
708 /* allow shift to override */
709 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
710 {
711 strcpy (kbuf, "\033Oj");
712 kbuf[2] += (keysym - XK_KP_Multiply);
713 }
714 else
715 {
716 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
717 kbuf[1] = '\0';
718 }
719 break;
720
721 case XK_Find:
722 strcpy (kbuf, "\033[1~");
723 break;
724
725#ifdef XK_KP_End
726 case XK_KP_Insert:
727 /* allow shift to override */
728 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
729 {
730 strcpy (kbuf, "\033Op");
731 break;
732 }
733 /* FALLTHROUGH */
734#endif
735 case XK_Insert:
736 strcpy (kbuf, "\033[2~");
737 break;
738#ifdef DXK_Remove /* support for DEC remove like key */
739 case DXK_Remove:
740 /* FALLTHROUGH */
741#endif
742 case XK_Execute:
743 strcpy (kbuf, "\033[3~");
744 break;
745 case XK_Select:
746 strcpy (kbuf, "\033[4~");
747 break;
748#ifdef XK_KP_End
749 case XK_KP_End:
750 /* allow shift to override */
751 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
752 {
753 strcpy (kbuf, "\033Oq");
754 break;
755 }
756 /* FALLTHROUGH */
757#endif
758 case XK_End:
759 strcpy (kbuf, KS_END);
760 break;
761#ifdef XK_KP_Home
762 case XK_KP_Home:
763 /* allow shift to override */
764 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
765 {
766 strcpy (kbuf, "\033Ow");
767 break;
768 }
769 /* FALLTHROUGH */
770#endif
771 case XK_Home:
772 strcpy (kbuf, KS_HOME);
773 break;
774
775#define FKEY(n, fkey) \
776 sprintf ((char *)kbuf,"\033[%2d~", (int) ((n) + (keysym - fkey)))
777
778 case XK_F1: /* "\033[11~" */
779 case XK_F2: /* "\033[12~" */
780 case XK_F3: /* "\033[13~" */
781 case XK_F4: /* "\033[14~" */
782 case XK_F5: /* "\033[15~" */
783 FKEY (11, XK_F1);
784 break;
785 case XK_F6: /* "\033[17~" */
786 case XK_F7: /* "\033[18~" */
787 case XK_F8: /* "\033[19~" */
788 case XK_F9: /* "\033[20~" */
789 case XK_F10: /* "\033[21~" */
790 FKEY (17, XK_F6);
791 break;
792 case XK_F11: /* "\033[23~" */
793 case XK_F12: /* "\033[24~" */
794 case XK_F13: /* "\033[25~" */
795 case XK_F14: /* "\033[26~" */
796 FKEY (23, XK_F11);
797 break;
798 case XK_F15: /* "\033[28~" */
799 case XK_F16: /* "\033[29~" */
800 FKEY (28, XK_F15);
801 break;
802 case XK_Help: /* "\033[28~" */
803 FKEY (28, XK_Help);
804 break;
805 case XK_Menu: /* "\033[29~" */
806 FKEY (29, XK_Menu);
807 break;
808 case XK_F17: /* "\033[31~" */
809 case XK_F18: /* "\033[32~" */
810 case XK_F19: /* "\033[33~" */
811 case XK_F20: /* "\033[34~" */
812 case XK_F21: /* "\033[35~" */
813 case XK_F22: /* "\033[36~" */
814 case XK_F23: /* "\033[37~" */
815 case XK_F24: /* "\033[38~" */
816 case XK_F25: /* "\033[39~" */
817 case XK_F26: /* "\033[40~" */
818 case XK_F27: /* "\033[41~" */
819 case XK_F28: /* "\033[42~" */
820 case XK_F29: /* "\033[43~" */
821 case XK_F30: /* "\033[44~" */
822 case XK_F31: /* "\033[45~" */
823 case XK_F32: /* "\033[46~" */
824 case XK_F33: /* "\033[47~" */
825 case XK_F34: /* "\033[48~" */
826 case XK_F35: /* "\033[49~" */
827 FKEY (31, XK_F17);
828 break;
829#undef FKEY
830 default:
831 newlen = 0; 773 newlen = 0;
832 break;
833 } 774 }
834 775 break;
835 if (newlen)
836 len = strlen (kbuf);
837 } 776 }
838 777
778 if (newlen)
779 len = strlen (kbuf);
780
781 if (len > 0)
782 {
839 /* 783 /*
784 * pass Shift/Control indicators for function keys ending with `~'
785 *
786 * eg,
787 * Prior = "ESC[5~"
788 * Shift+Prior = "ESC[5$"
789 * Ctrl+Prior = "ESC[5^"
790 * Ctrl+Shift+Prior = "ESC[5@"
791 */
792 if (kbuf[0] == C0_ESC && kbuf[1] == '[' && kbuf[len - 1] == '~')
793 kbuf[len - 1] = (shft ? (ctrl ? '@' : '$') : (ctrl ? '^' : '~'));
794
795 /*
840 * Pass meta for all function keys, if 'meta' option set 796 * Pass meta for all function keys, if 'meta' option set
841 */ 797 */
842#ifdef META8_OPTION 798#ifdef META8_OPTION
843 if (meta && (meta_char == 0x80) && len > 0) 799 if (meta && (meta_char == 0x80))
844 kbuf[len - 1] |= 0x80; 800 kbuf[len - 1] |= 0x80;
845#endif 801#endif
802 }
846 803
847 } 804 }
848 else if (ctrl && keysym == XK_minus) 805 else if (ctrl && keysym == XK_minus)
849 { 806 {
850 len = 1; 807 len = 1;
… …
877 return; 834 return;
878 835
879 if (len <= 0) 836 if (len <= 0)
880 return; /* not mapped */ 837 return; /* not mapped */
881 838
882 if (OPTION (Opt_scrollTtyKeypress)) 839 if (option (Opt_scrollTtyKeypress))
883 if (view_start) 840 if (view_start)
884 { 841 {
885 view_start = 0; 842 view_start = 0;
886 want_refresh = 1; 843 want_refresh = 1;
887 } 844 }
888 845
889 /*
890 * these modifications only affect the static keybuffer
891 * pass Shift/Control indicators for function keys ending with `~'
892 *
893 * eg,
894 * Prior = "ESC[5~"
895 * Shift+Prior = "ESC[5$"
896 * Ctrl+Prior = "ESC[5^"
897 * Ctrl+Shift+Prior = "ESC[5@"
898 * Meta adds an Escape prefix (with META8_OPTION, if meta == <escape>).
899 */
900 if (kbuf[0] == C0_ESC && kbuf[1] == '[' && kbuf[len - 1] == '~')
901 kbuf[len - 1] = (shft ? (ctrl ? '@' : '$') : (ctrl ? '^' : '~'));
902
903 /* escape prefix */ 846 /* escape prefix */
904 if (meta 847 if (meta
905#ifdef META8_OPTION 848#ifdef META8_OPTION
906 && meta_char == C0_ESC 849 && meta_char == C0_ESC
907#endif 850#endif
… …
926#if ENABLE_FRILLS || ISO_14755 869#if ENABLE_FRILLS || ISO_14755
927 // ISO 14755 support 870 // ISO 14755 support
928 if (iso14755buf) 871 if (iso14755buf)
929 if (iso14755buf & ISO_14755_52) 872 if (iso14755buf & ISO_14755_52)
930 { 873 {
931# if ENABLE_OVERLAY 874# if ISO_14755
932 scr_overlay_off (); 875 scr_overlay_off ();
933# endif 876# endif
934# if ISO_14755 877# if ISO_14755
935 // iso14755 part 5.2 handling: release time 878 // iso14755 part 5.2 handling: release time
936 // first: controls 879 // first: controls
… …
942 commit_iso14755 (); 885 commit_iso14755 ();
943 886
944 return; 887 return;
945 } 888 }
946 889
947 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2) 890 for (unsigned short *i = iso14755_symtab; i[0]; i += 2)
948 if (i[0] == keysym) 891 if (i[0] == keysym)
949 { 892 {
950 iso14755buf = ISO_14755_51 | i[1]; 893 iso14755buf = ISO_14755_51 | i[1];
951 commit_iso14755 (); 894 commit_iso14755 ();
952 895
… …
959 902
960 return; 903 return;
961 } 904 }
962 else if ((ev.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask)) 905 else if ((ev.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
963 { 906 {
964# if ENABLE_OVERLAY 907# if ISO_14755
965 scr_overlay_off (); 908 scr_overlay_off ();
966# endif 909# endif
967 if (iso14755buf & ISO_14755_51) 910 if (iso14755buf & ISO_14755_51)
968 commit_iso14755 (); 911 commit_iso14755 ();
969#if ISO_14755 912#if ISO_14755
970 else if (iso14755buf & ISO_14755_STARTED) 913 else if (option (Opt_iso14755_52) && iso14755buf & ISO_14755_STARTED)
971 { 914 {
972 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair 915 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
973 916
974 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1); 917 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
975 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE"); 918 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
… …
989 else if (keysym == XK_Control_L || keysym == XK_Control_R) 932 else if (keysym == XK_Control_L || keysym == XK_Control_R)
990 mouse_slip_wheel_speed = 0; 933 mouse_slip_wheel_speed = 0;
991#endif 934#endif
992} 935}
993 936
994#if defined (KEYSYM_RESOURCE)
995unsigned int
996rxvt_term::cmd_write (const char *str, unsigned int count)
997{
998 unsigned int n, s;
999
1000 n = cmdbuf_ptr - cmdbuf_base;
1001 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp;
1002
1003 if (n > 0 && s < count)
1004 {
1005 memmove (cmdbuf_base, cmdbuf_ptr,
1006 (unsigned int) (cmdbuf_endp - cmdbuf_ptr));
1007 cmdbuf_ptr = cmdbuf_base;
1008 cmdbuf_endp -= n;
1009 s += n;
1010 }
1011
1012 if (count > s)
1013 {
1014 rxvt_warn ("data loss: cmd_write too large, continuing.\n");
1015 count = s;
1016 }
1017
1018 for (; count--;)
1019 *cmdbuf_endp++ = *str++;
1020
1021 cmd_parse ();
1022
1023 return 0;
1024}
1025#endif
1026
1027void 937void
1028rxvt_term::flush () 938rxvt_term::flush ()
1029{ 939{
1030 flush_ev.stop (); 940 flush_ev.stop ();
1031 941
1032#ifdef TRANSPARENT 942#ifdef HAVE_BG_PIXMAP
1033 if (want_full_refresh) 943 if (bg_flags & BG_NEEDS_REFRESH)
1034 { 944 {
1035 want_full_refresh = 0; 945 bg_flags &= ~BG_NEEDS_REFRESH;
1036 scr_clear ();
1037 scr_touch (false); 946 scr_touch (false);
1038 } 947 }
1039#endif 948#endif
1040 949
1041 if (want_refresh) 950 if (want_refresh)
… …
1077 } 986 }
1078 while (row < end_row); 987 while (row < end_row);
1079 } 988 }
1080 989
1081 scr_refresh (); 990 scr_refresh ();
1082 scrollbar_show (1); 991 scrollBar.show (1);
1083#ifdef USE_XIM 992#ifdef USE_XIM
1084 IMSendSpot (); 993 im_send_spot ();
1085#endif 994#endif
1086 } 995 }
1087 996
1088 display->flush (); 997 display->flush ();
1089} 998}
1090 999
1000/* checks whether a refresh is requested and starts the refresh timer */
1091void 1001void
1092rxvt_term::check_cb (check_watcher &w) 1002rxvt_term::refresh_check ()
1003{
1004 if (want_refresh && !flush_ev.is_active ())
1005 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally
1006
1007 display->flush ();
1008}
1009
1010void
1011rxvt_term::flush_cb (ev::timer &w, int revents)
1093{ 1012{
1094 make_current (); 1013 make_current ();
1095 1014
1096 display->flush ();
1097
1098 if (want_refresh && !flush_ev.active)
1099 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
1100}
1101
1102void
1103rxvt_term::flush_cb (time_watcher &w)
1104{
1105 make_current ();
1106
1107 refresh_limit = 1;
1108 refresh_count = 0; 1015 refresh_count = 0;
1109 flush (); 1016 flush ();
1110} 1017}
1111 1018
1112#ifdef CURSOR_BLINK 1019#ifdef CURSOR_BLINK
1113void 1020void
1114rxvt_term::cursor_blink_cb (time_watcher &w) 1021rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
1115{ 1022{
1116 hidden_cursor = !hidden_cursor; 1023 hidden_cursor = !hidden_cursor;
1117 want_refresh = 1; 1024 want_refresh = 1;
1118 1025 refresh_check ();
1119 w.start (w.at + CURSOR_BLINK_INTERVAL);
1120} 1026}
1121#endif 1027#endif
1122 1028
1123#ifdef TEXT_BLINK 1029#ifdef TEXT_BLINK
1124void 1030void
1125rxvt_term::text_blink_cb (time_watcher &w) 1031rxvt_term::text_blink_cb (ev::timer &w, int revents)
1126{ 1032{
1127 if (scr_refresh_rend (RS_Blink, RS_Blink)) 1033 if (scr_refresh_rend (RS_Blink, RS_Blink))
1128 { 1034 {
1129 hidden_text = !hidden_text; 1035 hidden_text = !hidden_text;
1130 want_refresh = 1; 1036 want_refresh = 1;
1131 w.start (w.at + TEXT_BLINK_INTERVAL); 1037 refresh_check ();
1132 } 1038 }
1039 else
1040 w.stop ();
1133} 1041}
1134#endif 1042#endif
1135 1043
1136#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1044#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1137void 1045void
1138rxvt_term::cont_scroll_cb (time_watcher &w) 1046rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1139{ 1047{
1140 if ((scrollbar_isUp() || scrollbar_isDn()) && 1048 if ((scrollBar.state == SB_STATE_UP || scrollBar.state == SB_STATE_DOWN)
1141 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1049 && scr_page (scrollBar.state == SB_STATE_UP ? UP : DN, 1))
1142 { 1050 {
1143 want_refresh = 1; 1051 want_refresh = 1;
1144 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1052 refresh_check ();
1145 } 1053 }
1054 else
1055 w.stop ();
1146} 1056}
1147#endif 1057#endif
1148 1058
1149#ifdef SELECTION_SCROLLING 1059#ifdef SELECTION_SCROLLING
1150void 1060void
1151rxvt_term::sel_scroll_cb (time_watcher &w) 1061rxvt_term::sel_scroll_cb (ev::timer &w, int revents)
1152{ 1062{
1153 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1063 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1154 { 1064 {
1155 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1065 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1156 want_refresh = 1; 1066 want_refresh = 1;
1157 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1067 refresh_check ();
1158 } 1068 }
1069 else
1070 w.stop ();
1159} 1071}
1160#endif 1072#endif
1161 1073
1162#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1074#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1163void 1075void
1164rxvt_term::slip_wheel_cb (time_watcher &w) 1076rxvt_term::slip_wheel_cb (ev::timer &w, int revents)
1165{ 1077{
1166 if (mouse_slip_wheel_speed == 0 1078 if (scr_changeview (view_start - mouse_slip_wheel_speed))
1167 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1168 : scr_page (UP, mouse_slip_wheel_speed))
1169 { 1079 {
1170 if (view_start == top_row || view_start == 0)
1171 mouse_slip_wheel_speed = 0;
1172
1173 want_refresh = 1; 1080 want_refresh = 1;
1174 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1081 refresh_check ();
1082 }
1083
1084 if (view_start == top_row || view_start == 0 || mouse_slip_wheel_speed == 0)
1085 {
1086 mouse_slip_wheel_speed = 0;
1087 w.stop ();
1175 } 1088 }
1176} 1089}
1177#endif 1090#endif
1178 1091
1179#if LINUX_YIELD_HACK 1092#if LINUX_YIELD_HACK
1180static struct event_handler 1093static struct event_handler
1181{ 1094{
1182 check_watcher yield_ev; 1095 ev::prepare yield_ev;
1183 1096
1184 void yield_cb (check_watcher &w) 1097 void yield_cb (ev::prepare &w, int revents)
1185 { 1098 {
1186 // this should really be sched_yield(), but the linux guys thought 1099 // this should really be sched_yield(), but the linux guys thought
1187 // that giving a process calling sched_yield () less cpu time than 1100 // that giving a process calling sched_yield () less cpu time than
1188 // ones with high nice levels is a useful thing to do. It surely is is 1101 // ones with high nice levels is a useful thing to do. It surely is is
1189 // allowed by the sus... as is returning ENOSYS. 1102 // allowed by the sus... as is returning ENOSYS.
1103 // since the linux guys additionally thought that breaking the only
1104 // known workaround against their unusable sched_yield hack is cool,
1105 // we just nanosleep a bit and hope for the best.
1190 1106
1191 struct timespec ts = { 0, 0 }; 1107 struct timespec ts = { 0, 1000 };
1192 nanosleep (&ts, 0); 1108 nanosleep (&ts, 0);
1193 1109
1194 w.stop (); 1110 w.stop ();
1195 } 1111 }
1196 1112
… …
1199 { 1115 {
1200 } 1116 }
1201} event_handler; 1117} event_handler;
1202#endif 1118#endif
1203 1119
1120/* make sure all the cmd data is at beginning of cmdbuf */
1121void
1122rxvt_term::cmdbuf_reify ()
1123{
1124 if (cmdbuf_ptr == cmdbuf_base)
1125 return;
1126
1127 ssize_t used = cmdbuf_endp - cmdbuf_ptr;
1128
1129 memmove (cmdbuf_base, cmdbuf_ptr, used);
1130 cmdbuf_ptr = cmdbuf_base;
1131 cmdbuf_endp = cmdbuf_ptr + used;
1132
1133}
1134
1135#if defined (KEYSYM_RESOURCE)
1136void
1137rxvt_term::cmdbuf_append (const char *str, size_t count)
1138{
1139 cmdbuf_reify ();
1140
1141 size_t avail = cmdbuf_base + CBUFSIZ - cmdbuf_endp;
1142
1143 if (count > avail)
1144 return;
1145
1146 memcpy (cmdbuf_endp, str, count);
1147 cmdbuf_endp += count;
1148
1149 cmd_parse ();
1150}
1151#endif
1152
1204bool 1153bool
1205rxvt_term::pty_fill () 1154rxvt_term::pty_fill ()
1206{ 1155{
1207 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1156 cmdbuf_reify ();
1208 1157
1209 if (CBUFSIZ == n) 1158 size_t avail = cmdbuf_base + CBUFSIZ - cmdbuf_endp;
1210 { 1159
1211 rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n"); 1160 if (!avail)
1212 n = 0;
1213 } 1161 {
1214 1162 // normally this indicates a "too long" command sequence - just drop the data we have
1215 memmove (cmdbuf_base, cmdbuf_ptr, n);
1216 cmdbuf_ptr = cmdbuf_base; 1163 cmdbuf_ptr = cmdbuf_base;
1217 cmdbuf_endp = cmdbuf_ptr + n; 1164 cmdbuf_endp = cmdbuf_ptr;
1165 avail = CBUFSIZ;
1166 }
1218 1167
1219 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n); 1168 ssize_t r = read (pty->pty, cmdbuf_endp, avail);
1220 1169
1221 if (r > 0) 1170 if (r > 0)
1222 { 1171 {
1223 cmdbuf_endp += r; 1172 cmdbuf_endp += r;
1224 return true; 1173 return true;
… …
1232 } 1181 }
1233 else 1182 else
1234 { 1183 {
1235 pty_ev.stop (); 1184 pty_ev.stop ();
1236 1185
1237 if (!OPTION (Opt_hold)) 1186 if (!option (Opt_hold))
1238 destroy (); 1187 destroy ();
1239 } 1188 }
1240 1189
1241 return false; 1190 return false;
1242} 1191}
1243 1192
1244void 1193void
1245rxvt_term::pty_cb (io_watcher &w, short revents) 1194rxvt_term::pty_cb (ev::io &w, int revents)
1246{ 1195{
1247 make_current (); 1196 make_current ();
1248 1197
1249 if (revents & EVENT_READ) 1198 if (revents & ev::READ)
1250 // loop, but don't allow a single term to monopolize us 1199 // loop, but don't allow a single term to monopolize us
1251 while (pty_fill ()) 1200 for (int i = CBUFCNT; i-- && pty_fill (); )
1252 if (cmd_parse ()) 1201 cmd_parse ();
1253 break;
1254 1202
1255 if (revents & EVENT_WRITE) 1203 if (revents & ev::WRITE)
1256 pty_write (); 1204 pty_write ();
1205
1206 refresh_check ();
1257} 1207}
1258 1208
1259void 1209void
1260rxvt_term::pointer_unblank () 1210rxvt_term::pointer_unblank ()
1261{ 1211{
… …
1263 recolour_cursor (); 1213 recolour_cursor ();
1264 1214
1265#ifdef POINTER_BLANK 1215#ifdef POINTER_BLANK
1266 hidden_pointer = 0; 1216 hidden_pointer = 0;
1267 1217
1268 if (OPTION (Opt_pointerBlank)) 1218 if (option (Opt_pointerBlank))
1269 pointer_ev.start (NOW + pointerBlankDelay); 1219 pointer_ev.start (pointerBlankDelay);
1270#endif 1220#endif
1271} 1221}
1272 1222
1273#ifdef POINTER_BLANK 1223#ifdef POINTER_BLANK
1274void 1224void
1275rxvt_term::pointer_blank () 1225rxvt_term::pointer_blank ()
1276{ 1226{
1277 if (!OPTION (Opt_pointerBlank)) 1227 if (!option (Opt_pointerBlank))
1278 return; 1228 return;
1279 1229
1280 XDefineCursor (dpy, vt, display->blank_cursor); 1230 XDefineCursor (dpy, vt, display->blank_cursor);
1281 XFlush (dpy); 1231 XFlush (dpy);
1282 1232
1283 hidden_pointer = 1; 1233 hidden_pointer = 1;
1284} 1234}
1285 1235
1286void 1236void
1287rxvt_term::pointer_cb (time_watcher &w) 1237rxvt_term::pointer_cb (ev::timer &w, int revents)
1288{ 1238{
1289 make_current (); 1239 make_current ();
1290 1240
1291 pointer_blank (); 1241 pointer_blank ();
1292} 1242}
… …
1295void 1245void
1296rxvt_term::mouse_report (XButtonEvent &ev) 1246rxvt_term::mouse_report (XButtonEvent &ev)
1297{ 1247{
1298 int button_number, key_state = 0; 1248 int button_number, key_state = 0;
1299 int x, y; 1249 int x, y;
1250 int code = 32;
1300 1251
1301 x = ev.x; 1252 x = Pixel2Col (ev.x) + 1;
1302 y = ev.y; 1253 y = Pixel2Row (ev.y) + 1;
1303 pixel_position (&x, &y); 1254
1255 if (ev.type == MotionNotify)
1256 {
1257 if (x == mouse_row && y == mouse_col)
1258 return;
1259
1260 mouse_row = x;
1261 mouse_col = y;
1262 code += 32;
1263 }
1304 1264
1305 if (MEvent.button == AnyButton) 1265 if (MEvent.button == AnyButton)
1306 button_number = 3; 1266 button_number = 3;
1307 else 1267 else
1308 { 1268 {
1309 button_number = MEvent.button - Button1; 1269 button_number = MEvent.button - Button1;
1310 /* add 0x3D for wheel events, like xterm does */ 1270 /* add 0x3D for wheel events, like xterm does */
1311 if (button_number >= 3) 1271 if (button_number >= 3)
1312 button_number += (64 - 3); 1272 button_number += 64 - 3;
1313 } 1273 }
1314 1274
1315 if (priv_modes & PrivMode_MouseX10) 1275 if (priv_modes & PrivMode_MouseX10)
1316 { 1276 {
1317 /* 1277 /*
… …
1349 fputc ('A', stderr); 1309 fputc ('A', stderr);
1350 if (key_state & 32) 1310 if (key_state & 32)
1351 fputc ('2', stderr); 1311 fputc ('2', stderr);
1352 fprintf (stderr, "]: <%d>, %d/%d\n", 1312 fprintf (stderr, "]: <%d>, %d/%d\n",
1353 button_number, 1313 button_number,
1354 x + 1, 1314 x,
1355 y + 1); 1315 y);
1356#endif 1316#endif
1357 1317
1318#if ENABLE_FRILLS
1319 if (priv_modes & PrivMode_ExtMouseRight)
1320 tt_printf ("\033[%d;%d;%dM",
1321 code + button_number + key_state,
1322 x,
1323 y);
1324 else if (priv_modes & PrivMode_ExtModeMouse)
1325 tt_printf ("\033[M%c%lc%lc",
1326 code + button_number + key_state,
1327 wint_t (32 + x),
1328 wint_t (32 + y));
1329 else
1330#endif
1358 tt_printf ("\033[M%c%c%c", 1331 tt_printf ("\033[M%c%c%c",
1359 (32 + button_number + key_state), 1332 code + button_number + key_state,
1360 (32 + x + 1), 1333 32 + x,
1361 (32 + y + 1)); 1334 32 + y);
1362} 1335}
1363 1336
1364/*{{{ process an X event */ 1337/*{{{ process an X event */
1365void 1338void
1366rxvt_term::x_cb (XEvent &ev) 1339rxvt_term::x_cb (XEvent &ev)
… …
1426 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT) 1399 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1427 focus_out (); 1400 focus_out ();
1428 } 1401 }
1429#endif 1402#endif
1430 } 1403 }
1431 break;
1432
1433 case MappingNotify:
1434 XRefreshKeyboardMapping (&ev.xmapping);
1435 break; 1404 break;
1436 1405
1437 /* 1406 /*
1438 * XXX: this is not the _current_ arrangement 1407 * XXX: this is not the _current_ arrangement
1439 * Here's my conclusion: 1408 * Here's my conclusion:
… …
1458 break; 1427 break;
1459 } 1428 }
1460 break; 1429 break;
1461 1430
1462 case FocusIn: 1431 case FocusIn:
1432 if (ev.xfocus.detail != NotifyInferior
1433 && ev.xfocus.detail != NotifyPointer
1434 && ev.xfocus.mode != NotifyGrab)
1463 focus_in (); 1435 focus_in ();
1464 break; 1436 break;
1465 1437
1466 case FocusOut: 1438 case FocusOut:
1439 if (ev.xfocus.detail != NotifyInferior
1440 && ev.xfocus.detail != NotifyPointer
1441 && ev.xfocus.mode != NotifyGrab)
1467 focus_out (); 1442 focus_out ();
1468 break; 1443 break;
1469 1444
1470 case ConfigureNotify: 1445 case ConfigureNotify:
1471 if (ev.xconfigure.window == parent[0]) 1446 if (ev.xconfigure.window == parent)
1472 { 1447 {
1473 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1448 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1474 ; 1449 ;
1450
1451#ifdef HAVE_BG_PIXMAP
1452 bool moved = false;
1453 if (bg_window_position_sensitive ())
1454 {
1455 int x, y;
1456 if (ev.xconfigure.send_event)
1457 {
1458 x = ev.xconfigure.x;
1459 y = ev.xconfigure.y;
1460 }
1461 else
1462 get_window_origin (x, y);
1463
1464 if (bg_set_position (x, y)
1465 || !(bg_flags & BG_IS_VALID))
1466 moved = true;
1467 }
1468#endif
1475 1469
1476 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1470 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1477 { 1471 {
1478 seen_resize = 1; 1472 seen_resize = 1;
1479 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1473 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1480 } 1474 }
1475 else
1476 {
1477#ifdef HAVE_BG_PIXMAP
1478 if (moved)
1479 update_background ();
1480#endif
1481 }
1481 1482
1482 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1483 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1483
1484#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1485 if (OPTION (Opt_transparent))
1486 check_our_parents ();
1487#endif
1488 } 1484 }
1489 break; 1485 break;
1490 1486
1491 case PropertyNotify: 1487 case PropertyNotify:
1492 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END))) 1488 HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END));
1493 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1494 && ev.xproperty.state == PropertyNewValue)
1495 selection_property (ev.xproperty.window, ev.xproperty.atom);
1496
1497 break; 1489 break;
1498 1490
1499 case SelectionClear: 1491 case SelectionClear:
1500 selection_clear (); 1492 selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]);
1501 break;
1502
1503 case SelectionNotify:
1504 if (selection_wait == Sel_normal)
1505 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1506 break; 1493 break;
1507 1494
1508 case SelectionRequest: 1495 case SelectionRequest:
1509 selection_send (ev.xselectionrequest); 1496 selection_send (ev.xselectionrequest);
1510 break; 1497 break;
1511 1498
1512 case MapNotify: 1499 case MapNotify:
1500#ifdef HAVE_BG_PIXMAP
1501 /* This is needed specifically to fix the case of no window manager or a
1502 * non-reparenting window manager. In those cases we never get first
1503 * ConfigureNotify. Also that speeds startup under normal WM, by taking
1504 * care of multiplicity of ConfigureNotify events arriving while WM does
1505 * reparenting.
1506 * We should not render background immediately, as there could be several
1507 * ConfigureNotify's to follow. Lets take care of all of them in one scoop
1508 * by scheduling background redraw as soon as we can, but giving a short
1509 * bit of time for ConfigureNotifies to arrive.
1510 * We should render background PRIOR to drawing any text, but AFTER all
1511 * of ConfigureNotifys for the best results.
1512 */
1513 if (!(bg_flags & BG_IS_VALID))
1514 update_background_ev.start (0.025);
1515#endif
1513 mapped = 1; 1516 mapped = 1;
1514#ifdef TEXT_BLINK 1517#ifdef TEXT_BLINK
1515 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 1518 text_blink_ev.start ();
1516#endif 1519#endif
1517 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1520 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1518 break; 1521 break;
1519 1522
1520 case UnmapNotify: 1523 case UnmapNotify:
… …
1522#ifdef TEXT_BLINK 1525#ifdef TEXT_BLINK
1523 text_blink_ev.stop (); 1526 text_blink_ev.stop ();
1524#endif 1527#endif
1525 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1528 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1526 break; 1529 break;
1527
1528#ifdef TRANSPARENT
1529 case ReparentNotify:
1530 rootwin_cb (ev);
1531 break;
1532#endif /* TRANSPARENT */
1533 1530
1534 case GraphicsExpose: 1531 case GraphicsExpose:
1535 case Expose: 1532 case Expose:
1536 if (ev.xany.window == vt) 1533 if (ev.xany.window == vt)
1537 { 1534 {
1538 do 1535 do
1536 {
1539 scr_expose (ev.xexpose.x, ev.xexpose.y, 1537 scr_expose (ev.xexpose.x, ev.xexpose.y,
1540 ev.xexpose.width, ev.xexpose.height, False); 1538 ev.xexpose.width, ev.xexpose.height, false);
1539 }
1541 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)); 1540 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1542 1541
1543 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1542 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1544 1543
1545 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)) 1544 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1545 {
1546 scr_expose (ev.xexpose.x, ev.xexpose.y, 1546 scr_expose (ev.xexpose.x, ev.xexpose.y,
1547 ev.xexpose.width, ev.xexpose.height, False); 1547 ev.xexpose.width, ev.xexpose.height, false);
1548 }
1548 1549
1549 want_refresh = 1; 1550 want_refresh = 1;
1550 } 1551 }
1551 else 1552 else
1552 { 1553 {
… …
1555 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event)) 1556 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1556 ; 1557 ;
1557 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event)) 1558 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1558 ; 1559 ;
1559 1560
1560 if (isScrollbarWindow (ev.xany.window)) 1561 if (scrollBar.state && ev.xany.window == scrollBar.win)
1561 { 1562 {
1562 scrollBar.setIdle (); 1563 scrollBar.state = SB_STATE_IDLE;
1563 scrollbar_show (0); 1564 scrollBar.show (0);
1564 } 1565 }
1565
1566#ifdef TRANSPARENT
1567 if (am_transparent && ev.xany.window == parent[0])
1568 XClearWindow (dpy, ev.xany.window);
1569#endif
1570 } 1566 }
1571 break; 1567 break;
1572 1568
1573 case MotionNotify: 1569 case MotionNotify:
1574#ifdef POINTER_BLANK 1570#ifdef POINTER_BLANK
1575 if (hidden_pointer) 1571 if (hidden_pointer)
1576 pointer_unblank (); 1572 pointer_unblank ();
1577#endif 1573#endif
1574 if ((priv_modes & PrivMode_MouseBtnEvent && ev.xbutton.state & (Button1Mask|Button2Mask|Button3Mask))
1575 || priv_modes & PrivMode_MouseAnyEvent)
1576 mouse_report (ev.xbutton);
1578 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1577 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1579 break; 1578 break;
1580 1579
1581 if (ev.xany.window == vt) 1580 if (ev.xany.window == vt)
1582 { 1581 {
… …
1616 int dist; 1615 int dist;
1617 1616
1618 /* don't clobber the current delay if we are 1617 /* don't clobber the current delay if we are
1619 * already in the middle of scrolling. 1618 * already in the middle of scrolling.
1620 */ 1619 */
1621 if (!sel_scroll_ev.active) 1620 if (!sel_scroll_ev.is_active ())
1622 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1621 sel_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1623 1622
1624 /* save the event params so we can highlight 1623 /* save the event params so we can highlight
1625 * the selection in the pending-scroll loop 1624 * the selection in the pending-scroll loop
1626 */ 1625 */
1627 selection_save_x = ev.xbutton.x; 1626 selection_save_x = ev.xbutton.x;
… …
1635 dist = int_bwidth - ev.xbutton.y; 1634 dist = int_bwidth - ev.xbutton.y;
1636 } 1635 }
1637 else 1636 else
1638 { 1637 {
1639 scroll_selection_dir = DN; 1638 scroll_selection_dir = DN;
1640 dist = ev.xbutton.y - (int_bwidth + height); 1639 dist = ev.xbutton.y - (int_bwidth + vt_height);
1641 } 1640 }
1642 1641
1643 scroll_selection_lines = Pixel2Height (dist) 1642 scroll_selection_lines = Pixel2Height (dist)
1644 / SELECTION_SCROLL_LINE_SPEEDUP 1643 / SELECTION_SCROLL_LINE_SPEEDUP
1645 + 1; 1644 + 1;
… …
1649 else 1648 else
1650 { 1649 {
1651 /* we are within the text window, so we 1650 /* we are within the text window, so we
1652 * shouldn't be scrolling 1651 * shouldn't be scrolling
1653 */ 1652 */
1654 if (sel_scroll_ev.active)
1655 sel_scroll_ev.stop(); 1653 sel_scroll_ev.stop();
1656 } 1654 }
1657#endif 1655#endif
1658#ifdef MOUSE_THRESHOLD 1656#ifdef MOUSE_THRESHOLD
1659 } 1657 }
1660#endif 1658#endif
1661 } 1659 }
1662 } 1660 }
1663 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1661 else if (scrollBar.state == SB_STATE_MOTION && ev.xany.window == scrollBar.win)
1664 { 1662 {
1665 while (XCheckTypedWindowEvent (dpy, scrollBar.win, 1663 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1666 MotionNotify, &ev)) 1664 MotionNotify, &ev))
1667 ; 1665 ;
1668 1666
1669 XQueryPointer (dpy, scrollBar.win, 1667 XQueryPointer (dpy, scrollBar.win,
1670 &unused_root, &unused_child, 1668 &unused_root, &unused_child,
1671 &unused_root_x, &unused_root_y, 1669 &unused_root_x, &unused_root_y,
1672 &ev.xbutton.x, &ev.xbutton.y, 1670 &ev.xbutton.x, &ev.xbutton.y,
1673 &unused_mask); 1671 &unused_mask);
1674 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1672 scr_move_to (scrollBar.position (ev.xbutton.y) - csrO,
1675 scrollbar_size ()); 1673 scrollBar.size ());
1676 want_refresh = 1; 1674 want_refresh = 1;
1677 refresh_limit = 0;
1678 scrollbar_show (1); 1675 scrollBar.show (1);
1679 } 1676 }
1680 break; 1677 break;
1681 } 1678 }
1682 1679
1683#if defined(CURSOR_BLINK) 1680#if defined(CURSOR_BLINK)
1684 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress) 1681 if (option (Opt_cursorBlink) && ev.type == KeyPress)
1685 { 1682 {
1686 if (hidden_cursor) 1683 if (hidden_cursor)
1687 { 1684 {
1688 hidden_cursor = 0; 1685 hidden_cursor = 0;
1689 want_refresh = 1; 1686 want_refresh = 1;
1690 } 1687 }
1691 1688
1692 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1689 cursor_blink_ev.again ();
1693 } 1690 }
1694#endif 1691#endif
1695 1692
1696#if defined(POINTER_BLANK) 1693#if defined(POINTER_BLANK)
1697 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0) 1694 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1698 { 1695 {
1699 if (ev.type == MotionNotify 1696 if (ev.type == MotionNotify
1700 || ev.type == ButtonPress 1697 || ev.type == ButtonPress
1701 || ev.type == ButtonRelease) 1698 || ev.type == ButtonRelease)
1702 if (hidden_pointer) 1699 if (hidden_pointer)
… …
1704 1701
1705 if (ev.type == KeyPress && hidden_pointer == 0) 1702 if (ev.type == KeyPress && hidden_pointer == 0)
1706 pointer_blank (); 1703 pointer_blank ();
1707 } 1704 }
1708#endif 1705#endif
1706
1707 refresh_check ();
1709} 1708}
1709
1710#if ENABLE_FRILLS
1711void
1712rxvt_term::set_urgency (bool enable)
1713{
1714 if (enable == urgency_hint)
1715 return;
1716
1717 if (XWMHints *h = XGetWMHints (dpy, parent))
1718 {
1719 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0);
1720 XSetWMHints (dpy, parent, h);
1721 urgency_hint = enable;
1722 XFree (h);
1723 }
1724}
1725#endif
1710 1726
1711void 1727void
1712rxvt_term::focus_in () 1728rxvt_term::focus_in ()
1713{ 1729{
1714 if (!focus) 1730 if (!focus)
1715 { 1731 {
1716 focus = 1; 1732 focus = 1;
1717 want_refresh = 1; 1733 want_refresh = 1;
1718 1734
1719 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1720
1721#if USE_XIM 1735#if USE_XIM
1722 if (Input_Context != NULL) 1736 if (Input_Context != NULL)
1723 { 1737 {
1724 IMSetPosition (); 1738 im_set_position ();
1725 XSetICFocus (Input_Context); 1739 XSetICFocus (Input_Context);
1726 } 1740 }
1727#endif 1741#endif
1728#if CURSOR_BLINK 1742#if CURSOR_BLINK
1729 if (OPTION (Opt_cursorBlink)) 1743 if (option (Opt_cursorBlink))
1730 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1744 cursor_blink_ev.again ();
1731#endif 1745#endif
1732#if OFF_FOCUS_FADING 1746#if OFF_FOCUS_FADING
1733 if (rs[Rs_fade]) 1747 if (rs[Rs_fade])
1734 { 1748 {
1735 pix_colors = pix_colors_focused; 1749 pix_colors = pix_colors_focused;
1736 scr_recolour (); 1750 scr_recolour ();
1737 } 1751 }
1738#endif 1752#endif
1753#if ENABLE_FRILLS
1754 if (option (Opt_urgentOnBell))
1755 set_urgency (0);
1756#endif
1757
1758 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1739 } 1759 }
1740} 1760}
1741 1761
1742void 1762void
1743rxvt_term::focus_out () 1763rxvt_term::focus_out ()
… …
1745 if (focus) 1765 if (focus)
1746 { 1766 {
1747 focus = 0; 1767 focus = 0;
1748 want_refresh = 1; 1768 want_refresh = 1;
1749 1769
1750 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1770#if ENABLE_FRILLS
1751 1771 if (option (Opt_urgentOnBell))
1772 set_urgency (0);
1773#endif
1752#if ENABLE_FRILLS || ISO_14755 1774#if ENABLE_FRILLS || ISO_14755
1753 if (iso14755buf) 1775 if (iso14755buf)
1754 { 1776 {
1755 iso14755buf = 0; 1777 iso14755buf = 0;
1756# if ENABLE_OVERLAY 1778# if ISO_14755
1757 scr_overlay_off (); 1779 scr_overlay_off ();
1758# endif 1780# endif
1759 } 1781 }
1760#endif 1782#endif
1761#if USE_XIM 1783#if USE_XIM
1762 if (Input_Context != NULL) 1784 if (Input_Context != NULL)
1763 XUnsetICFocus (Input_Context); 1785 XUnsetICFocus (Input_Context);
1764#endif 1786#endif
1765#if CURSOR_BLINK 1787#if CURSOR_BLINK
1766 if (OPTION (Opt_cursorBlink)) 1788 if (option (Opt_cursorBlink))
1767 cursor_blink_ev.stop (); 1789 cursor_blink_ev.stop ();
1790
1768 hidden_cursor = 0; 1791 hidden_cursor = 0;
1769#endif 1792#endif
1770#if OFF_FOCUS_FADING 1793#if OFF_FOCUS_FADING
1771 if (rs[Rs_fade]) 1794 if (rs[Rs_fade])
1772 { 1795 {
1773 pix_colors = pix_colors_unfocused; 1796 pix_colors = pix_colors_unfocused;
1774 scr_recolour (); 1797 scr_recolour ();
1775 } 1798 }
1776#endif 1799#endif
1800
1801 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1802 }
1803}
1804
1805void
1806rxvt_term::update_fade_color (unsigned int idx)
1807{
1808#if OFF_FOCUS_FADING
1809 if (rs[Rs_fade])
1777 } 1810 {
1811 rgba c;
1812 pix_colors [Color_fade].get (c);
1813 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1814 }
1815#endif
1778} 1816}
1779 1817
1780#if TRANSPARENT 1818#if ENABLE_TRANSPARENCY || ENABLE_PERL
1781void 1819void
1782rxvt_term::rootwin_cb (XEvent &ev) 1820rxvt_term::rootwin_cb (XEvent &ev)
1783{ 1821{
1784 make_current (); 1822 make_current ();
1785 1823
1824 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1825 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1826 return;
1827
1828# if ENABLE_TRANSPARENCY
1786 switch (ev.type) 1829 switch (ev.type)
1787 { 1830 {
1788 case PropertyNotify: 1831 case PropertyNotify:
1789 /* 1832 /*
1790 * if user used some Esetroot compatible prog to set the root bg, 1833 * if user used some Esetroot compatible prog to set the root bg,
1791 * use the property to determine the pixmap. We use it later on. 1834 * use the property to determine the pixmap. We use it later on.
1792 */ 1835 */
1793 if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID] 1836 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1794 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1837 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1795 return; 1838 {
1839 bg_set_root_pixmap ();
1840 update_background ();
1841 }
1796 1842
1797 /* FALLTHROUGH */
1798 case ReparentNotify:
1799 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)
1800 want_refresh = want_full_refresh = 1;
1801 break; 1843 break;
1802 } 1844 }
1845# endif
1846
1847 refresh_check ();
1803} 1848}
1804#endif 1849#endif
1805 1850
1806void 1851void
1807rxvt_term::button_press (XButtonEvent &ev) 1852rxvt_term::button_press (XButtonEvent &ev)
… …
1838 /* save the xbutton state (for ButtonRelease) */ 1883 /* save the xbutton state (for ButtonRelease) */
1839 MEvent.state = ev.state; 1884 MEvent.state = ev.state;
1840#ifdef MOUSE_REPORT_DOUBLECLICK 1885#ifdef MOUSE_REPORT_DOUBLECLICK
1841 if (ev.button == MEvent.button && clickintime) 1886 if (ev.button == MEvent.button && clickintime)
1842 { 1887 {
1843 /* same button, within alloted time */ 1888 /* same button, within allowed time */
1844 MEvent.clicks++; 1889 MEvent.clicks++;
1845 1890
1846 if (MEvent.clicks > 1) 1891 if (MEvent.clicks > 1)
1847 { 1892 {
1848 /* only report double clicks */ 1893 /* only report double clicks */
… …
1862 mouse_report (ev); 1907 mouse_report (ev);
1863 } 1908 }
1864#else 1909#else
1865 MEvent.button = ev.button; 1910 MEvent.button = ev.button;
1866 mouse_report (ev); 1911 mouse_report (ev);
1867#endif /* MOUSE_REPORT_DOUBLECLICK */ 1912#endif /* MOUSE_REPORT_DOUBLECLICK */
1868 1913
1869 } 1914 }
1870 else 1915 else
1871 { 1916 {
1872 if (ev.button != MEvent.button) 1917 if (ev.button != MEvent.button)
… …
1920 } 1965 }
1921 1966
1922 /* 1967 /*
1923 * Scrollbar window processing of button press 1968 * Scrollbar window processing of button press
1924 */ 1969 */
1925 if (isScrollbarWindow (ev.window)) 1970 if (scrollBar.state && ev.window == scrollBar.win)
1926 { 1971 {
1927 scrollBar.setIdle (); 1972 page_dirn direction = NO_DIR;
1973
1974 if (scrollBar.upButton (ev.y))
1975 direction = UP; /* up */
1976 else if (scrollBar.dnButton (ev.y))
1977 direction = DN; /* down */
1978
1979 scrollBar.state = SB_STATE_IDLE;
1928 /* 1980 /*
1929 * Rxvt-style scrollbar: 1981 * Rxvt-style scrollbar:
1930 * move up if mouse is above slider 1982 * move up if mouse is above slider
1931 * move dn if mouse is below slider 1983 * move dn if mouse is below slider
1932 * 1984 *
… …
1941 /* 1993 /*
1942 * Mouse report disabled scrollbar: 1994 * Mouse report disabled scrollbar:
1943 * arrow buttons - send up/down 1995 * arrow buttons - send up/down
1944 * click on scrollbar - send pageup/down 1996 * click on scrollbar - send pageup/down
1945 */ 1997 */
1946 if ((scrollBar.style == R_SB_NEXT 1998 if (direction == UP)
1947 && scrollbarnext_upButton (ev.y))
1948 || (scrollBar.style == R_SB_RXVT
1949 && scrollbarrxvt_upButton (ev.y)))
1950 tt_printf ("\033[A"); 1999 tt_printf ("\033[A");
1951 else if ((scrollBar.style == R_SB_NEXT 2000 else if (direction == DN)
1952 && scrollbarnext_dnButton (ev.y))
1953 || (scrollBar.style == R_SB_RXVT
1954 && scrollbarrxvt_dnButton (ev.y)))
1955 tt_printf ("\033[B"); 2001 tt_printf ("\033[B");
1956 else 2002 else
1957 switch (ev.button) 2003 switch (ev.button)
1958 { 2004 {
1959 case Button2: 2005 case Button2:
… …
1966 tt_printf ("\033[5~"); 2012 tt_printf ("\033[5~");
1967 break; 2013 break;
1968 } 2014 }
1969 } 2015 }
1970 else 2016 else
1971#endif /* NO_SCROLLBAR_REPORT */ 2017#endif /* NO_SCROLLBAR_REPORT */
1972
1973 {
1974 char upordown = 0;
1975
1976 if (scrollBar.style == R_SB_NEXT)
1977 { 2018 {
1978 if (scrollbarnext_upButton (ev.y)) 2019 if (direction != NO_DIR)
1979 upordown = -1; /* up */
1980 else if (scrollbarnext_dnButton (ev.y))
1981 upordown = 1; /* down */
1982 }
1983 else if (scrollBar.style == R_SB_RXVT)
1984 {
1985 if (scrollbarrxvt_upButton (ev.y))
1986 upordown = -1; /* up */
1987 else if (scrollbarrxvt_dnButton (ev.y))
1988 upordown = 1; /* down */
1989 }
1990 if (upordown)
1991 { 2020 {
1992#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 2021#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2022 if (!cont_scroll_ev.is_active ())
1993 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 2023 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1994#endif 2024#endif
1995 if (scr_page (upordown < 0 ? UP : DN, 1)) 2025 if (scr_page (direction, 1))
1996 { 2026 {
1997 if (upordown < 0) 2027 if (direction == UP)
1998 scrollBar.setUp (); 2028 scrollBar.state = SB_STATE_UP;
1999 else 2029 else
2000 scrollBar.setDn (); 2030 scrollBar.state = SB_STATE_DOWN;
2001 } 2031 }
2002 } 2032 }
2003 else 2033 else
2004 switch (ev.button) 2034 switch (ev.button)
2005 { 2035 {
2006 case Button2: 2036 case Button2:
2007 switch (scrollbar_align) 2037 switch (scrollBar.align)
2008 { 2038 {
2009 case R_SB_ALIGN_TOP: 2039 case SB_ALIGN_TOP:
2010 csrO = 0; 2040 csrO = 0;
2011 break; 2041 break;
2012 case R_SB_ALIGN_CENTRE: 2042 case SB_ALIGN_CENTRE:
2013 csrO = (scrollBar.bot - scrollBar.top) / 2; 2043 csrO = (scrollBar.bot - scrollBar.top) / 2;
2014 break; 2044 break;
2015 case R_SB_ALIGN_BOTTOM: 2045 case SB_ALIGN_BOTTOM:
2016 csrO = scrollBar.bot - scrollBar.top; 2046 csrO = scrollBar.bot - scrollBar.top;
2017 break; 2047 break;
2018 } 2048 }
2019 2049
2020 if (scrollBar.style == R_SB_XTERM 2050 if (scrollBar.style == SB_STYLE_XTERM
2021 || scrollbar_above_slider (ev.y) 2051 || scrollBar.above_slider (ev.y)
2022 || scrollbar_below_slider (ev.y)) 2052 || scrollBar.below_slider (ev.y))
2023 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ()); 2053 scr_move_to (scrollBar.position (ev.y) - csrO, scrollBar.size ());
2024 2054
2025 scrollBar.setMotion (); 2055 scrollBar.state = SB_STATE_MOTION;
2026 break; 2056 break;
2027 2057
2028 case Button1: 2058 case Button1:
2029 if (scrollbar_align == R_SB_ALIGN_CENTRE) 2059 if (scrollBar.align == SB_ALIGN_CENTRE)
2030 csrO = ev.y - scrollBar.top; 2060 csrO = ev.y - scrollBar.top;
2031 /* FALLTHROUGH */ 2061 /* FALLTHROUGH */
2032 2062
2033 case Button3: 2063 case Button3:
2034 if (scrollBar.style != R_SB_XTERM) 2064 if (scrollBar.style != SB_STYLE_XTERM)
2035 { 2065 {
2036 if (scrollbar_above_slider (ev.y)) 2066 if (scrollBar.above_slider (ev.y))
2037# ifdef RXVT_SCROLL_FULL 2067# ifdef RXVT_SCROLL_FULL
2038 scr_page (UP, nrow - 1); 2068 scr_page (UP, nrow - 1);
2039# else 2069# else
2040 scr_page (UP, nrow / 4); 2070 scr_page (UP, nrow / 4);
2041# endif 2071# endif
2042 else if (scrollbar_below_slider (ev.y)) 2072 else if (scrollBar.below_slider (ev.y))
2043# ifdef RXVT_SCROLL_FULL 2073# ifdef RXVT_SCROLL_FULL
2044 scr_page (DN, nrow - 1); 2074 scr_page (DN, nrow - 1);
2045# else 2075# else
2046 scr_page (DN, nrow / 4); 2076 scr_page (DN, nrow / 4);
2047# endif 2077# endif
2048 else 2078 else
2049 scrollBar.setMotion (); 2079 scrollBar.state = SB_STATE_MOTION;
2050 } 2080 }
2051 else 2081 else
2052 { 2082 {
2053 scr_page ((ev.button == Button1 ? DN : UP), 2083 scr_page ((ev.button == Button1 ? DN : UP),
2054 (nrow 2084 (nrow
2055 * scrollbar_position (ev.y) 2085 * scrollBar.position (ev.y)
2056 / scrollbar_size ())); 2086 / scrollBar.size ()));
2057 } 2087 }
2058 2088
2059 break; 2089 break;
2060 } 2090 }
2061 } 2091 }
… …
2071 2101
2072 csrO = 0; /* reset csr Offset */ 2102 csrO = 0; /* reset csr Offset */
2073 if (!bypass_keystate) 2103 if (!bypass_keystate)
2074 reportmode = !! (priv_modes & PrivMode_mouse_report); 2104 reportmode = !! (priv_modes & PrivMode_mouse_report);
2075 2105
2076 if (scrollbar_isUpDn ()) 2106 if (scrollBar.state == SB_STATE_UP || scrollBar.state == SB_STATE_DOWN)
2077 { 2107 {
2078 scrollBar.setIdle (); 2108 scrollBar.state = SB_STATE_IDLE;
2079 scrollbar_show (0); 2109 scrollBar.show (0);
2080 } 2110 }
2081 2111
2082#ifdef SELECTION_SCROLLING 2112#ifdef SELECTION_SCROLLING
2083 if (sel_scroll_ev.active)
2084 sel_scroll_ev.stop(); 2113 sel_scroll_ev.stop();
2085#endif 2114#endif
2086 2115
2087 if (ev.window == vt) 2116 if (ev.window == vt)
2088 { 2117 {
2089 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END))) 2118 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
… …
2113 mouse_report (ev); 2142 mouse_report (ev);
2114 } 2143 }
2115#else /* MOUSE_REPORT_DOUBLECLICK */ 2144#else /* MOUSE_REPORT_DOUBLECLICK */
2116 MEvent.button = AnyButton; 2145 MEvent.button = AnyButton;
2117 mouse_report (ev); 2146 mouse_report (ev);
2118#endif /* MOUSE_REPORT_DOUBLECLICK */ 2147#endif /* MOUSE_REPORT_DOUBLECLICK */
2119 return; 2148 return;
2120 } 2149 }
2121 2150
2122 /* 2151 /*
2123 * dumb hack to compensate for the failure of click-and-drag 2152 * dumb hack to compensate for the failure of click-and-drag
… …
2134 case Button3: 2163 case Button3:
2135 selection_make (ev.time); 2164 selection_make (ev.time);
2136 break; 2165 break;
2137 2166
2138 case Button2: 2167 case Button2:
2139 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window? 2168 if (IN_RANGE_EXC (ev.x, 0, vt_width) && IN_RANGE_EXC (ev.y, 0, vt_height)) // inside window?
2140 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Primary : Sel_Primary); 2169 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2141 break; 2170 break;
2142 2171
2143#ifdef MOUSE_WHEEL 2172#ifdef MOUSE_WHEEL
2144 case Button4: 2173 case Button4:
2145 case Button5: 2174 case Button5:
… …
2149 2178
2150 v = ev.button == Button4 ? UP : DN; 2179 v = ev.button == Button4 ? UP : DN;
2151 2180
2152 if (ev.state & ShiftMask) 2181 if (ev.state & ShiftMask)
2153 i = 1; 2182 i = 1;
2154 else if (OPTION (Opt_mouseWheelScrollPage)) 2183 else if (option (Opt_mouseWheelScrollPage))
2155 i = nrow - 1; 2184 i = nrow - 1;
2156 else 2185 else
2157 i = 5; 2186 i = 5;
2158 2187
2159# ifdef MOUSE_SLIP_WHEELING 2188# ifdef MOUSE_SLIP_WHEELING
… …
2161 { 2190 {
2162 mouse_slip_wheel_speed += v ? -1 : 1; 2191 mouse_slip_wheel_speed += v ? -1 : 1;
2163 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow; 2192 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2164 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow; 2193 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2165 2194
2166 if (slip_wheel_ev.at < NOW) 2195 if (!slip_wheel_ev.is_active ())
2167 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; 2196 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2168
2169 slip_wheel_ev.start ();
2170 } 2197 }
2171 else 2198 else
2199# endif
2172 { 2200 {
2173# endif
2174 scr_page (v, i); 2201 scr_page (v, i);
2175 scrollbar_show (1); 2202 scrollBar.show (1);
2176# ifdef MOUSE_SLIP_WHEELING
2177 } 2203 }
2178# endif
2179 } 2204 }
2180 break; 2205 break;
2181#endif 2206#endif
2182 } 2207 }
2183 } 2208 }
2184} 2209}
2185 2210
2186#ifdef TRANSPARENT
2187#if TINTING
2188/* taken from aterm-0.4.2 */
2189
2190typedef uint32_t RUINT32T;
2191
2192void ShadeXImage(rxvt_term *term, XImage* srcImage, int shade, int rm, int gm, int bm)
2193{
2194 int sh_r, sh_g, sh_b;
2195 RUINT32T mask_r, mask_g, mask_b;
2196 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2197 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2198 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2199 int i;
2200
2201 Visual *visual = term->visual;
2202
2203 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2204
2205 /* for convenience */
2206 mask_r = visual->red_mask;
2207 mask_g = visual->green_mask;
2208 mask_b = visual->blue_mask;
2209
2210 /* boring lookup table pre-initialization */
2211 switch (srcImage->bits_per_pixel) {
2212 case 15:
2213 if ((mask_r != 0x7c00) ||
2214 (mask_g != 0x03e0) ||
2215 (mask_b != 0x001f))
2216 return;
2217 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32));
2218 lookup_r = lookup;
2219 lookup_g = lookup+32;
2220 lookup_b = lookup+32+32;
2221 sh_r = 10;
2222 sh_g = 5;
2223 sh_b = 0;
2224 break;
2225 case 16:
2226 if ((mask_r != 0xf800) ||
2227 (mask_g != 0x07e0) ||
2228 (mask_b != 0x001f))
2229 return;
2230 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32));
2231 lookup_r = lookup;
2232 lookup_g = lookup+32;
2233 lookup_b = lookup+32+64;
2234 sh_r = 11;
2235 sh_g = 5;
2236 sh_b = 0;
2237 break;
2238 case 24:
2239 if ((mask_r != 0xff0000) ||
2240 (mask_g != 0x00ff00) ||
2241 (mask_b != 0x0000ff))
2242 return;
2243 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2244 lookup_r = lookup;
2245 lookup_g = lookup+256;
2246 lookup_b = lookup+256+256;
2247 sh_r = 16;
2248 sh_g = 8;
2249 sh_b = 0;
2250 break;
2251 case 32:
2252 if ((mask_r != 0xff0000) ||
2253 (mask_g != 0x00ff00) ||
2254 (mask_b != 0x0000ff))
2255 return;
2256 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2257 lookup_r = lookup;
2258 lookup_g = lookup+256;
2259 lookup_b = lookup+256+256;
2260 sh_r = 16;
2261 sh_g = 8;
2262 sh_b = 0;
2263 break;
2264 default:
2265 return; /* we do not support this color depth */
2266 }
2267
2268 /* prepare limits for color transformation (each channel is handled separately) */
2269 if (shade < 0) {
2270 shade = -shade;
2271 if (shade < 0) shade = 0;
2272 if (shade > 100) shade = 100;
2273
2274 lower_lim_r = 65535-rm;
2275 lower_lim_g = 65535-gm;
2276 lower_lim_b = 65535-bm;
2277
2278 lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100);
2279 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100);
2280 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100);
2281
2282 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
2283 } else {
2284 if (shade < 0) shade = 0;
2285 if (shade > 100) shade = 100;
2286
2287 lower_lim_r = lower_lim_g = lower_lim_b = 0;
2288
2289 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
2290 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);
2291 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100);
2292 }
2293
2294 /* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */
2295 if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 ))
2296 {
2297 unsigned int tmp;
2298
2299 tmp = lower_lim_r;
2300 lower_lim_r = lower_lim_b;
2301 lower_lim_b = tmp;
2302
2303 tmp = upper_lim_r;
2304 upper_lim_r = upper_lim_b;
2305 upper_lim_b = tmp;
2306 }
2307
2308 /* fill our lookup tables */
2309 for (i = 0; i <= mask_r>>sh_r; i++)
2310 {
2311 RUINT32T tmp;
2312 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r));
2313 tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r);
2314 lookup_r[i] = (tmp/65535)<<sh_r;
2315 }
2316 for (i = 0; i <= mask_g>>sh_g; i++)
2317 {
2318 RUINT32T tmp;
2319 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g));
2320 tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g);
2321 lookup_g[i] = (tmp/65535)<<sh_g;
2322 }
2323 for (i = 0; i <= mask_b>>sh_b; i++)
2324 {
2325 RUINT32T tmp;
2326 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b));
2327 tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b);
2328 lookup_b[i] = (tmp/65535)<<sh_b;
2329 }
2330
2331 /* apply table to input image (replacing colors by newly calculated ones) */
2332 switch (srcImage->bits_per_pixel)
2333 {
2334 case 15:
2335 {
2336 unsigned short *p1, *pf, *p, *pl;
2337 p1 = (unsigned short *) srcImage->data;
2338 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2339 while (p1 < pf)
2340 {
2341 p = p1;
2342 pl = p1 + srcImage->width;
2343 for (; p < pl; p++)
2344 {
2345 *p = lookup_r[(*p & 0x7c00)>>10] |
2346 lookup_g[(*p & 0x03e0)>> 5] |
2347 lookup_b[(*p & 0x001f)];
2348 }
2349 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2350 }
2351 break;
2352 }
2353 case 16:
2354 {
2355 unsigned short *p1, *pf, *p, *pl;
2356 p1 = (unsigned short *) srcImage->data;
2357 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2358 while (p1 < pf)
2359 {
2360 p = p1;
2361 pl = p1 + srcImage->width;
2362 for (; p < pl; p++)
2363 {
2364 *p = lookup_r[(*p & 0xf800)>>11] |
2365 lookup_g[(*p & 0x07e0)>> 5] |
2366 lookup_b[(*p & 0x001f)];
2367 }
2368 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2369 }
2370 break;
2371 }
2372 case 24:
2373 {
2374 unsigned char *p1, *pf, *p, *pl;
2375 p1 = (unsigned char *) srcImage->data;
2376 pf = (unsigned char *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2377 while (p1 < pf)
2378 {
2379 p = p1;
2380 pl = p1 + srcImage->width * 3;
2381 for (; p < pl; p += 3)
2382 {
2383 p[0] = lookup_r[(p[0] & 0xff0000)>>16];
2384 p[1] = lookup_r[(p[1] & 0x00ff00)>> 8];
2385 p[2] = lookup_r[(p[2] & 0x0000ff)];
2386 }
2387 p1 = (unsigned char *) ((char *) p1 + srcImage->bytes_per_line);
2388 }
2389 break;
2390 }
2391 case 32:
2392 {
2393 RUINT32T *p1, *pf, *p, *pl;
2394 p1 = (RUINT32T *) srcImage->data;
2395 pf = (RUINT32T *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2396
2397 while (p1 < pf)
2398 {
2399 p = p1;
2400 pl = p1 + srcImage->width;
2401 for (; p < pl; p++)
2402 {
2403 *p = lookup_r[(*p & 0xff0000)>>16] |
2404 lookup_g[(*p & 0x00ff00)>> 8] |
2405 lookup_b[(*p & 0x0000ff)] |
2406 (*p & ~0xffffff);
2407 }
2408 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
2409 }
2410 break;
2411 }
2412 }
2413
2414 free (lookup);
2415}
2416#endif
2417
2418/*
2419 * Check our parents are still who we think they are.
2420 * Do transparency updates if required
2421 */
2422int
2423rxvt_term::check_our_parents ()
2424{
2425 int i, pchanged, aformat, have_pixmap, rootdepth;
2426 unsigned long nitems, bytes_after;
2427 Atom atype;
2428 unsigned char *prop = NULL;
2429 Window root, oldp, *list;
2430 Pixmap rootpixmap = None;
2431 XWindowAttributes wattr, wrootattr;
2432
2433 pchanged = 0;
2434
2435 if (!OPTION (Opt_transparent))
2436 return pchanged; /* Don't try any more */
2437
2438 XGetWindowAttributes (dpy, display->root, &wrootattr);
2439 rootdepth = wrootattr.depth;
2440
2441 XGetWindowAttributes (dpy, parent[0], &wattr);
2442
2443 if (rootdepth != wattr.depth)
2444 {
2445 if (am_transparent)
2446 {
2447 pchanged = 1;
2448 XSetWindowBackground (dpy, vt, pix_colors_focused[Color_bg]);
2449 am_transparent = am_pixmap_trans = 0;
2450 }
2451
2452 return pchanged; /* Don't try any more */
2453 }
2454
2455 /* Get all X ops out of the queue so that our information is up-to-date. */
2456 XSync (dpy, False);
2457
2458 /*
2459 * Make the frame window set by the window manager have
2460 * the root background. Some window managers put multiple nested frame
2461 * windows for each client, so we have to take care about that.
2462 */
2463 i = (xa[XA_XROOTPMAP_ID]
2464 && XGetWindowProperty (dpy, display->root, xa[XA_XROOTPMAP_ID],
2465 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2466 &nitems, &bytes_after, &prop) == Success);
2467
2468 if (!i || prop == NULL)
2469 i = (xa[XA_ESETROOT_PMAP_ID]
2470 && XGetWindowProperty (dpy, display->root, xa[XA_ESETROOT_PMAP_ID],
2471 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2472 &nitems, &bytes_after, &prop) == Success);
2473
2474 if (!i || prop == NULL
2475#if TINTING
2476 || !ISSET_PIXCOLOR (Color_tint)
2477#endif
2478 )
2479 have_pixmap = 0;
2480 else
2481 {
2482 have_pixmap = 1;
2483 rootpixmap = *(Pixmap *)prop;
2484 XFree (prop);
2485 }
2486
2487 if (have_pixmap)
2488 {
2489 /*
2490 * Copy display->root pixmap transparency
2491 */
2492 int sx, sy, nx, ny;
2493 unsigned int nw, nh;
2494 Window cr;
2495 XImage *image;
2496 GC gc;
2497 XGCValues gcvalue;
2498
2499 XTranslateCoordinates (dpy, parent[0], display->root,
2500 0, 0, &sx, &sy, &cr);
2501 nw = (unsigned int)szHint.width;
2502 nh = (unsigned int)szHint.height;
2503 nx = ny = 0;
2504
2505 if (sx < 0)
2506 {
2507 nw += sx;
2508 nx = -sx;
2509 sx = 0;
2510 }
2511
2512 if (sy < 0)
2513 {
2514 nh += sy;
2515 ny = -sy;
2516 sy = 0;
2517 }
2518
2519 min_it (nw, (unsigned int) (wrootattr.width - sx));
2520 min_it (nh, (unsigned int) (wrootattr.height - sy));
2521
2522 XSync (dpy, False);
2523 allowedxerror = -1;
2524 image = XGetImage (dpy, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2525
2526 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2527 /* XXX: may need a delay here? */
2528 allowedxerror = 0;
2529
2530 if (image == NULL)
2531 {
2532 if (am_transparent && am_pixmap_trans)
2533 {
2534 pchanged = 1;
2535 if (pixmap != None)
2536 {
2537 XFreePixmap (dpy, pixmap);
2538 pixmap = None;
2539 }
2540 }
2541
2542 am_pixmap_trans = 0;
2543 }
2544 else
2545 {
2546 if (pixmap != None)
2547 XFreePixmap (dpy, pixmap);
2548
2549#if TINTING
2550 if (ISSET_PIXCOLOR (Color_tint))
2551 {
2552 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2553
2554 rgba c;
2555 pix_colors_focused [Color_tint].get (c);
2556
2557 ShadeXImage (this, image, shade, c.r, c.g, c.b);
2558 }
2559#endif
2560
2561 pixmap = XCreatePixmap (dpy, vt, szHint.width, szHint.height, image->depth);
2562 gc = XCreateGC (dpy, vt, 0UL, &gcvalue);
2563 XPutImage (dpy, pixmap, gc, image, 0, 0,
2564 nx, ny, image->width, image->height);
2565 XFreeGC (dpy, gc);
2566 XDestroyImage (image);
2567 XSetWindowBackgroundPixmap (dpy, parent[0], pixmap);
2568 XClearWindow (dpy, parent[0]);
2569
2570 if (!am_transparent || !am_pixmap_trans)
2571 pchanged = 1;
2572
2573 am_transparent = am_pixmap_trans = 1;
2574 }
2575 }
2576
2577 if (am_pixmap_trans)
2578 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2579 else
2580 {
2581 unsigned int n;
2582 /*
2583 * InheritPixmap transparency
2584 */
2585 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2586 {
2587 oldp = parent[i];
2588 XQueryTree (dpy, parent[i - 1], &root, &parent[i], &list, &n);
2589 XFree (list);
2590
2591 if (parent[i] == display->root)
2592 {
2593 if (oldp != None)
2594 pchanged = 1;
2595
2596 break;
2597 }
2598
2599 if (oldp != parent[i])
2600 pchanged = 1;
2601 }
2602
2603 n = 0;
2604
2605 if (pchanged)
2606 for (; n < (unsigned int)i; n++)
2607 {
2608 XGetWindowAttributes (dpy, parent[n], &wattr);
2609
2610 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2611 {
2612 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2613 break;
2614 }
2615 }
2616
2617 if (n > (sizeof (parent) / sizeof (parent[0])))
2618 {
2619 XSetWindowBackground (dpy, parent[0], pix_colors_focused[Color_border]);
2620 XSetWindowBackground (dpy, vt, pix_colors_focused[Color_bg]);
2621 am_transparent = 0;
2622 /* XXX: also turn off Opt_transparent? */
2623 }
2624 else
2625 {
2626 for (n = 0; n < (unsigned int)i; n++)
2627 {
2628 XSetWindowBackgroundPixmap (dpy, parent[n], ParentRelative);
2629 XClearWindow (dpy, parent[n]);
2630 }
2631
2632 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2633 am_transparent = 1;
2634 }
2635
2636 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2637 parent[i] = None;
2638 }
2639
2640 if (scrollBar.win)
2641 {
2642 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2643 scrollBar.setIdle ();
2644 scrollbar_show (0);
2645 }
2646
2647 if (am_transparent)
2648 {
2649 want_refresh = want_full_refresh = 1;
2650 if (am_pixmap_trans)
2651 flush ();
2652 }
2653
2654 return pchanged;
2655}
2656#endif
2657
2658/*}}} */ 2211/*}}} */
2659 2212
2660bool 2213void
2661rxvt_term::cmd_parse () 2214rxvt_term::cmd_parse ()
2662{ 2215{
2663 bool flag = false;
2664 wchar_t ch = NOCHAR; 2216 wchar_t ch = NOCHAR;
2665 char *seq_begin; // remember start of esc-sequence here 2217 char *seq_begin; // remember start of esc-sequence here
2666 2218
2667 for (;;) 2219 for (;;)
2668 { 2220 {
2669 if (ch == NOCHAR) 2221 if (ecb_unlikely (ch == NOCHAR))
2670 { 2222 {
2671 seq_begin = cmdbuf_ptr; 2223 seq_begin = cmdbuf_ptr;
2672 ch = next_char (); 2224 ch = next_char ();
2673 2225
2674 if (ch == NOCHAR) 2226 if (ch == NOCHAR)
2675 break; 2227 break;
2676 } 2228 }
2677 2229
2678 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2230 if (ecb_likely (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT))
2679 { 2231 {
2680 if (!seen_input) 2232 if (ecb_unlikely (!seen_input))
2681 { 2233 {
2682 seen_input = 1; 2234 seen_input = 1;
2683 // many badly-written programs (e.g. jed) contain a race condition: 2235 // many badly-written programs (e.g. jed) contain a race condition:
2684 // they first read the screensize and then install a SIGWINCH handler. 2236 // they first read the screensize and then install a SIGWINCH handler.
2685 // some window managers resize the window early, and these programs 2237 // some window managers resize the window early, and these programs
… …
2698 wchar_t *str = buf; 2250 wchar_t *str = buf;
2699 wchar_t *eol = str + min (ncol, UBUFSIZ); 2251 wchar_t *eol = str + min (ncol, UBUFSIZ);
2700 2252
2701 for (;;) 2253 for (;;)
2702 { 2254 {
2703 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2255 if (ecb_unlikely (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)))
2704 break; 2256 break;
2705 2257
2706 *str++ = ch; 2258 *str++ = ch;
2707 2259
2708 if (ch == C0_LF || str >= eol) 2260 if (ecb_unlikely (ch == C0_LF || str >= eol))
2709 { 2261 {
2710 if (ch == C0_LF) 2262 if (ch == C0_LF)
2711 nlines++; 2263 nlines++;
2712 2264
2713 refresh_count++; 2265 refresh_count++;
2714 2266
2715 if (!OPTION (Opt_jumpScroll) 2267 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1)
2716 || (refresh_count >= refresh_limit * (nrow - 1)))
2717 { 2268 {
2718 refreshnow = true;
2719 refresh_count = 0; 2269 refresh_count = 0;
2270
2271 if (!option (Opt_skipScroll) || ev_time () > ev::now () + 1. / 60.)
2272 {
2273 refreshnow = true;
2720 ch = NOCHAR; 2274 ch = NOCHAR;
2721 break; 2275 break;
2276 }
2722 } 2277 }
2723 2278
2724 // scr_add_lines only works for nlines <= nrow - 1. 2279 // scr_add_lines only works for nlines <= nrow - 1.
2725 if (nlines >= nrow - 1) 2280 if (nlines >= nrow - 1)
2726 { 2281 {
… …
2754 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END)))) 2309 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2755 scr_add_lines (buf, str - buf, nlines); 2310 scr_add_lines (buf, str - buf, nlines);
2756 2311
2757 /* 2312 /*
2758 * If there have been a lot of new lines, then update the screen 2313 * If there have been a lot of new lines, then update the screen
2759 * What the heck I'll cheat and only refresh less than every page-full. 2314 * What the heck we'll cheat and only refresh less than every page-full.
2760 * the number of pages between refreshes is refresh_limit, which 2315 * if skipScroll is enabled.
2761 * is incremented here because we must be doing flat-out scrolling.
2762 */ 2316 */
2763 if (refreshnow) 2317 if (refreshnow)
2764 { 2318 {
2765 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2766 refresh_limit++;
2767 else
2768 {
2769 flag = true;
2770 //TODO: due to popular request, implement "skipscroll" option here
2771 scr_refresh (); 2319 scr_refresh ();
2772 want_refresh = 1; 2320 want_refresh = 1;
2773 }
2774 } 2321 }
2775
2776 } 2322 }
2777 else 2323 else
2778 { 2324 {
2779 try 2325 try
2780 { 2326 {
… …
2788 } 2334 }
2789 2335
2790 ch = NOCHAR; 2336 ch = NOCHAR;
2791 } 2337 }
2792 } 2338 }
2793
2794 return flag;
2795} 2339}
2796 2340
2797// read the next character 2341// read the next character
2798wchar_t 2342wchar_t
2799rxvt_term::next_char () NOTHROW 2343rxvt_term::next_char () NOTHROW
2800{ 2344{
2801 while (cmdbuf_ptr < cmdbuf_endp) 2345 while (cmdbuf_ptr < cmdbuf_endp)
2802 { 2346 {
2803 // assume 7-bit to be ascii ALWAYS 2347 // assume 7-bit to be ascii ALWAYS
2804 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2348 if (ecb_likely ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b))
2805 return *cmdbuf_ptr++; 2349 return *cmdbuf_ptr++;
2806 2350
2807 wchar_t wc; 2351 wchar_t wc;
2808 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2352 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2809 2353
… …
2813 cmdbuf_ptr = cmdbuf_endp; 2357 cmdbuf_ptr = cmdbuf_endp;
2814 break; 2358 break;
2815 } 2359 }
2816 2360
2817 if (len == (size_t)-1) 2361 if (len == (size_t)-1)
2362 {
2363 mbstate.reset (); // reset now undefined conversion state
2818 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2364 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2365 }
2819 2366
2820 // assume wchar == unicode 2367 // assume wchar == unicode
2821 cmdbuf_ptr += len; 2368 cmdbuf_ptr += len;
2822 return wc & UNICODE_MASK; 2369 return wc & UNICODE_MASK;
2823 } 2370 }
… …
2834 : NOCHAR; 2381 : NOCHAR;
2835} 2382}
2836 2383
2837static class out_of_input out_of_input; 2384static class out_of_input out_of_input;
2838 2385
2839/* rxvt_cmd_getc () - Return next input character */
2840/*
2841 * Return the next input character after first passing any keyboard input
2842 * to the command.
2843 */
2844wchar_t 2386wchar_t
2845rxvt_term::cmd_getc () THROW ((class out_of_input)) 2387rxvt_term::cmd_getc () THROW ((class out_of_input))
2846{ 2388{
2847 wchar_t c = next_char (); 2389 wchar_t c = next_char ();
2848 2390
… …
2867/*----------------------------------------------------------------------*/ 2409/*----------------------------------------------------------------------*/
2868#ifdef PRINTPIPE 2410#ifdef PRINTPIPE
2869FILE * 2411FILE *
2870rxvt_term::popen_printer () 2412rxvt_term::popen_printer ()
2871{ 2413{
2872 FILE *stream = popen (rs[Rs_print_pipe], "w"); 2414 FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");
2873 2415
2874 if (stream == NULL) 2416 if (stream == NULL)
2875 rxvt_warn ("can't open printer pipe, not printing.\n"); 2417 rxvt_warn ("can't open printer pipe, not printing.\n");
2876 2418
2877 return stream; 2419 return stream;
… …
2888 * simulate attached vt100 printer 2430 * simulate attached vt100 printer
2889 */ 2431 */
2890void 2432void
2891rxvt_term::process_print_pipe () 2433rxvt_term::process_print_pipe ()
2892{ 2434{
2893 int done; 2435 FILE *fd = popen_printer ();
2894 FILE *fd;
2895 2436
2896 if ((fd = popen_printer ()) == NULL) 2437 if (!fd)
2897 return; 2438 return;
2898 2439
2899 /* 2440 /*
2900 * Send all input to the printer until either ESC[4i or ESC[?4i 2441 * Send all input to the printer until either ESC[4i or ESC[?4i
2901 * is received. 2442 * is received.
2902 */ 2443 */
2903 for (done = 0; !done;) 2444 for (int done = 0; !done; )
2904 { 2445 {
2905 unsigned char buf[8]; 2446 unsigned char buf[8];
2906 unicode_t ch; 2447 unicode_t ch;
2907 unsigned int i, len; 2448 unsigned int i, len;
2908 2449
… …
2927 { 2468 {
2928 if ((buf[len++] = cmd_getc ()) == 'i') 2469 if ((buf[len++] = cmd_getc ()) == 'i')
2929 break; /* done = 1 */ 2470 break; /* done = 1 */
2930 } 2471 }
2931 } 2472 }
2932 2473
2933 for (i = 0; i < len; i++) 2474 for (i = 0; i < len; i++)
2934 if (putc (buf[i], fd) == EOF) 2475 if (putc (buf[i], fd) == EOF)
2935 { 2476 {
2936 done = 1; 2477 done = 1;
2937 break; 2478 break;
… …
2939 } 2480 }
2940 } 2481 }
2941 2482
2942 pclose_printer (fd); 2483 pclose_printer (fd);
2943} 2484}
2944#endif /* PRINTPIPE */ 2485#endif /* PRINTPIPE */
2945/*}}} */ 2486/*}}} */
2946 2487
2947/* *INDENT-OFF* */
2948enum { 2488enum {
2949 C1_40 = 0x40, 2489 C1_40 = 0x40,
2950 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA, 2490 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA,
2951 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3, 2491 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3,
2952 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA, 2492 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA,
2953 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC, 2493 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC,
2954}; 2494};
2955/* *INDENT-ON* */
2956 2495
2957/*{{{ process non-printing single characters */ 2496/*{{{ process non-printing single characters */
2958void 2497void
2959rxvt_term::process_nonprinting (unicode_t ch) 2498rxvt_term::process_nonprinting (unicode_t ch)
2960{ 2499{
… …
2999 process_dcs_seq (); 2538 process_dcs_seq ();
3000 break; 2539 break;
3001 case 0x9b: /* CSI */ 2540 case 0x9b: /* CSI */
3002 process_csi_seq (); 2541 process_csi_seq ();
3003 break; 2542 break;
3004 case 0x9d: /* CSI */ 2543 case 0x9d: /* OSC */
3005 process_osc_seq (); 2544 process_osc_seq ();
3006 break; 2545 break;
3007#endif 2546#endif
3008 } 2547 }
3009} 2548}
… …
3053 break; 2592 break;
3054 case 'Z': /* identify the terminal type */ 2593 case 'Z': /* identify the terminal type */
3055 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */ 2594 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
3056 break; 2595 break;
3057 case '<': /* turn off VT52 mode */ 2596 case '<': /* turn off VT52 mode */
3058 PrivMode (0, PrivMode_vt52); 2597 priv_modes &= ~PrivMode_vt52;
3059 break; 2598 break;
3060 case 'F': /* use special graphics character set */ 2599 case 'F': /* use special graphics character set */
3061 case 'G': /* use regular character set */ 2600 case 'G': /* use regular character set */
3062 /* unimplemented */ 2601 /* unimplemented */
3063 break; 2602 break;
… …
3082 return; 2621 return;
3083 } 2622 }
3084 2623
3085 switch (ch) 2624 switch (ch)
3086 { 2625 {
3087 /* case 1: do_tek_mode (); break; */
3088 case '#': 2626 case '#':
3089 if (cmd_getc () == '8') 2627 if (cmd_getc () == '8')
3090 scr_E (); 2628 scr_E ();
3091 break; 2629 break;
3092 case '(': 2630 case '(':
… …
3115#if !ENABLE_MINIMAL 2653#if !ENABLE_MINIMAL
3116 case '9': 2654 case '9':
3117 scr_forwardindex (); 2655 scr_forwardindex ();
3118 break; 2656 break;
3119#endif 2657#endif
2658 // DECPAM/DECPNM
3120 case '=': 2659 case '=':
2660 priv_modes |= PrivMode_aplKP;
2661 break;
3121 case '>': 2662 case '>':
3122 PrivMode ((ch == '='), PrivMode_aplKP); 2663 priv_modes &= ~PrivMode_aplKP;
3123 break; 2664 break;
3124 2665
3125 case C1_40: 2666 case C1_40:
3126 cmd_getc (); 2667 cmd_getc ();
3127 break; 2668 break;
… …
3131 2672
3132 /* 8.3.87: NEXT LINE */ 2673 /* 8.3.87: NEXT LINE */
3133 case C1_NEL: /* ESC E */ 2674 case C1_NEL: /* ESC E */
3134 { 2675 {
3135 wchar_t nlcr[] = { C0_LF, C0_CR }; 2676 wchar_t nlcr[] = { C0_LF, C0_CR };
3136 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1); 2677 scr_add_lines (nlcr, ecb_array_length (nlcr), 1);
3137 } 2678 }
3138 break; 2679 break;
3139 2680
3140 /* kidnapped escape sequence: Should be 8.3.48 */ 2681 /* kidnapped escape sequence: Should be 8.3.48 */
3141 case C1_ESA: /* ESC G */ 2682 case C1_ESA: /* ESC G */
3142 process_graphics (); 2683 // used by original rxvt for rob nations own graphics mode
2684 if (cmd_getc () == 'Q')
2685 tt_printf ("\033G0\012"); /* query graphics - no graphics */
3143 break; 2686 break;
3144 2687
3145 /* 8.3.63: CHARACTER TABULATION SET */ 2688 /* 8.3.63: CHARACTER TABULATION SET */
3146 case C1_HTS: /* ESC H */ 2689 case C1_HTS: /* ESC H */
3147 scr_set_tab (1); 2690 scr_set_tab (1);
… …
3151 case C1_RI: /* ESC M */ 2694 case C1_RI: /* ESC M */
3152 scr_index (DN); 2695 scr_index (DN);
3153 break; 2696 break;
3154 2697
3155 /* 8.3.142: SINGLE-SHIFT TWO */ 2698 /* 8.3.142: SINGLE-SHIFT TWO */
3156 /*case C1_SS2: scr_single_shift (2); break; */ 2699 /* case C1_SS2: break; */
3157 2700
3158 /* 8.3.143: SINGLE-SHIFT THREE */ 2701 /* 8.3.143: SINGLE-SHIFT THREE */
3159 /*case C1_SS3: scr_single_shift (3); break; */ 2702 /* case C1_SS3: break; */
3160 2703
3161 /* 8.3.27: DEVICE CONTROL STRING */ 2704 /* 8.3.27: DEVICE CONTROL STRING */
3162 case C1_DCS: /* ESC P */ 2705 case C1_DCS: /* ESC P */
3163 process_dcs_seq (); 2706 process_dcs_seq ();
3164 break; 2707 break;
… …
3166 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2709 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
3167 case C1_SCI: /* ESC Z */ 2710 case C1_SCI: /* ESC Z */
3168 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1); 2711 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
3169 break; /* steal obsolete ESC [ c */ 2712 break; /* steal obsolete ESC [ c */
3170 2713
3171 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2714 /* 8.3.16: CONTROL SEQUENCE INTRODUCER (CSI) */
3172 case C1_CSI: /* ESC [ */ 2715 case C1_CSI: /* ESC [ */
3173 process_csi_seq (); 2716 process_csi_seq ();
3174 break; 2717 break;
3175 2718
3176 /* 8.3.90: OPERATING SYSTEM COMMAND */ 2719 /* 8.3.90: OPERATING SYSTEM COMMAND (OSC) */
3177 case C1_OSC: /* ESC ] */ 2720 case C1_OSC: /* ESC ] */
3178 process_osc_seq (); 2721 process_osc_seq ();
3179 break; 2722 break;
3180 2723
3181 /* 8.3.106: RESET TO INITIAL STATE */ 2724 /* 8.3.106: RESET TO INITIAL STATE (RIS) */
3182 case 'c': 2725 case 'c':
3183 mbstate.reset (); 2726 mbstate.reset ();
3184 scr_poweron (); 2727 scr_poweron ();
3185 scrollbar_show (1); 2728 scrollBar.show (1);
3186 break; 2729 break;
3187 2730
3188 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */ 2731 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
3189 case 'n': 2732 case 'n':
3190 scr_charset_choose (2); 2733 scr_charset_choose (2);
… …
3197 } 2740 }
3198} 2741}
3199/*}}} */ 2742/*}}} */
3200 2743
3201/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */ 2744/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */
3202/* *INDENT-OFF* */
3203enum { 2745enum {
3204 CSI_ICH = 0x40, 2746 CSI_ICH = 0x40,
3205 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA, 2747 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA,
3206 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA , 2748 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA ,
3207 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC, 2749 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC,
… …
3210 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ, 2752 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ,
3211 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 , 2753 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 ,
3212 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F 2754 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F
3213}; 2755};
3214 2756
3215#define make_byte(b7,b6,b5,b4,b3,b2,b1,b0) \ 2757#define make_byte(b0,b1,b2,b3,b4,b5,b6,b7) \
3216 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \ 2758 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \
3217 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0)) 2759 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0))
3218#define get_byte_array_bit(array, bit) \ 2760#define get_byte_array_bit(array, bit) \
3219 (!! ((array)[ (bit) / 8] & (128 >> ((bit) & 7)))) 2761 (!! ((array)[(bit) >> 3] & (1 << ((bit) & 7))))
3220 2762
3221const unsigned char csi_defaults[] = 2763static const unsigned char csi_defaults[] =
3222 { 2764 {
3223 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */ 2765 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */
3224 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */ 2766 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */
3225 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */ 2767 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */
3226 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */ 2768 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */
3227 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */ 2769 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */
3228 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */ 2770 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */
3229 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */ 2771 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */
3230 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */ 2772 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */
3231 }; 2773 };
3232/* *INDENT-ON* */
3233 2774
3234void 2775void
3235rxvt_term::process_csi_seq () 2776rxvt_term::process_csi_seq ()
3236{ 2777{
3237 unicode_t ch, priv, i; 2778 unicode_t ch, priv, i;
3238 unsigned int nargs, p; 2779 unsigned int nargs, p;
3239 int n, ndef; 2780 int n, ndef;
3240 int arg[ESC_ARGS]; 2781 int arg[ESC_ARGS] = { };
3241 2782
3242 for (nargs = ESC_ARGS; nargs > 0;) 2783 nargs = 0;
3243 arg[--nargs] = 0;
3244 2784
3245 priv = 0; 2785 priv = 0;
3246 ch = cmd_getc (); 2786 ch = cmd_getc ();
3247 if (ch >= '<' && ch <= '?') 2787 if ((ch >= '<' && ch <= '?') || ch == '!')
2788 {
3248 { /* '<' '=' '>' '?' */ 2789 /* '<' '=' '>' '?' '!' */
3249 priv = ch; 2790 priv = ch;
3250 ch = cmd_getc (); 2791 ch = cmd_getc ();
3251 } 2792 }
3252 2793
3253 /* read any numerical arguments */ 2794 /* read any numerical arguments */
… …
3292 switch (priv) 2833 switch (priv)
3293 { 2834 {
3294 case '>': 2835 case '>':
3295 if (ch == CSI_DA) /* secondary device attributes */ 2836 if (ch == CSI_DA) /* secondary device attributes */
3296 { 2837 {
3297 // first parameter is normally 0 for vt100, 1 for some newer vtxxx, 'R' for rxvt, 2838 // first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt,
3298 // 'U' for rxvt-unicode != 7.[34] (where it was broken). 2839 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
3299 // 2840 //
3300 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt 2841 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
3301 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify 2842 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, 94 for urxvt <= 8.3, and 95 for later
3302 // that we do not support xterm mouse reporting (should be 95 when we do). 2843 // versions.
3303 // 2844 //
3304 tt_printf ("\033[>%d;94;0c", 'U'); 2845 tt_printf ("\033[>%d;95;0c", 'U');
3305 } 2846 }
3306 break; 2847 break;
2848
3307 case '?': 2849 case '?':
3308 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2850 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3309 process_terminal_mode (ch, priv, nargs, arg); 2851 process_terminal_mode (ch, priv, nargs, arg);
3310 break; 2852 break;
2853
2854 case '!':
2855 if (ch == CSI_70)
2856 {
2857 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */
2858 scr_soft_reset ();
2859
2860 static const int pm_h[] = { 7, 25 };
2861 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1005, 1015, 1049 };
2862
2863 process_terminal_mode ('h', 0, ecb_array_length (pm_h), pm_h);
2864 process_terminal_mode ('l', 0, ecb_array_length (pm_l), pm_l);
3311 } 2865 }
2866 break;
2867 }
2868
3312 return; 2869 return;
3313 } 2870 }
3314 2871
3315 switch (ch) 2872 switch (ch)
3316 { 2873 {
… …
3330 } 2887 }
3331 break; 2888 break;
3332#endif 2889#endif
3333 2890
3334 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */ 2891 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */
3335 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */ 2892 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */
3336 arg[0] = -arg[0]; 2893 arg[0] = -arg[0];
3337 /* FALLTHROUGH */ 2894 /* FALLTHROUGH */
3338 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */ 2895 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */
3339 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */ 2896 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */
3340 scr_gotorc (arg[0], 0, RELATIVE); 2897 scr_gotorc (arg[0], 0, RELATIVE);
3341 break; 2898 break;
3342 2899
3343 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */ 2900 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */
3344 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */ 2901 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */
… …
3436 break; 2993 break;
3437 case 6: /* CPR requested */ 2994 case 6: /* CPR requested */
3438 scr_report_position (); 2995 scr_report_position ();
3439 break; 2996 break;
3440 case 7: /* unofficial extension */ 2997 case 7: /* unofficial extension */
3441 if (OPTION (Opt_insecure)) 2998 if (option (Opt_insecure))
3442 tt_printf ("%-.250s\012", rs[Rs_display_name]); 2999 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3443 break; 3000 break;
3444 case 8: /* unofficial extension */ 3001 case 8: /* unofficial extension */
3445 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3002 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3446 break; 3003 break;
… …
3531 } 3088 }
3532} 3089}
3533/*}}} */ 3090/*}}} */
3534 3091
3535#if !ENABLE_MINIMAL 3092#if !ENABLE_MINIMAL
3536/* ARGSUSED */
3537void 3093void
3538rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3094rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3539{ 3095{
3540 int x, y; 3096 int x, y;
3541 XWindowAttributes wattr; 3097 XWindowAttributes wattr;
… …
3550 { 3106 {
3551 /* 3107 /*
3552 * commands 3108 * commands
3553 */ 3109 */
3554 case 1: /* deiconify window */ 3110 case 1: /* deiconify window */
3555 XMapWindow (dpy, parent[0]); 3111 XMapWindow (dpy, parent);
3556 break; 3112 break;
3557 case 2: /* iconify window */ 3113 case 2: /* iconify window */
3558 XIconifyWindow (dpy, parent[0], display->screen); 3114 XIconifyWindow (dpy, parent, display->screen);
3559 break; 3115 break;
3560 case 3: /* set position (pixels) */ 3116 case 3: /* set position (pixels) */
3561 XMoveWindow (dpy, parent[0], args[1], args[2]); 3117 XMoveWindow (dpy, parent, args[1], args[2]);
3562 break; 3118 break;
3563 case 4: /* set size (pixels) */ 3119 case 4: /* set size (pixels) */
3564 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3120 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3565 break; 3121 break;
3566 case 5: /* raise window */ 3122 case 5: /* raise window */
3567 XRaiseWindow (dpy, parent[0]); 3123 XRaiseWindow (dpy, parent);
3568 break; 3124 break;
3569 case 6: /* lower window */ 3125 case 6: /* lower window */
3570 XLowerWindow (dpy, parent[0]); 3126 XLowerWindow (dpy, parent);
3571 break; 3127 break;
3572 case 7: /* refresh window */ 3128 case 7: /* refresh window */
3573 scr_touch (true); 3129 scr_touch (true);
3574 break; 3130 break;
3575 case 8: /* set size (chars) */ 3131 case 8: /* set size (chars) */
… …
3578 break; 3134 break;
3579 3135
3580 //case 9: NYI, TODO, restore maximized window or maximize window 3136 //case 9: NYI, TODO, restore maximized window or maximize window
3581 default: 3137 default:
3582 if (args[0] >= 24) /* set height (chars) */ 3138 if (args[0] >= 24) /* set height (chars) */
3583 set_widthheight ((unsigned int)width, 3139 set_widthheight ((unsigned int)vt_width,
3584 (unsigned int) (args[1] * fheight)); 3140 (unsigned int) (args[1] * fheight));
3585 break; 3141 break;
3586 3142
3587 /* 3143 /*
3588 * reports - some output format copied from XTerm 3144 * reports - some output format copied from XTerm
3589 */ 3145 */
3590 case 11: /* report window state */ 3146 case 11: /* report window state */
3591 XGetWindowAttributes (dpy, parent[0], &wattr); 3147 XGetWindowAttributes (dpy, parent, &wattr);
3592 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3148 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3593 break; 3149 break;
3594 case 13: /* report window position */ 3150 case 13: /* report window position */
3595 XGetWindowAttributes (dpy, parent[0], &wattr); 3151 XGetWindowAttributes (dpy, parent, &wattr);
3596 XTranslateCoordinates (dpy, parent[0], wattr.root, 3152 XTranslateCoordinates (dpy, parent, wattr.root,
3597 -wattr.border_width, -wattr.border_width, 3153 -wattr.border_width, -wattr.border_width,
3598 &x, &y, &wdummy); 3154 &x, &y, &wdummy);
3599 tt_printf ("\033[3;%d;%dt", x, y); 3155 tt_printf ("\033[3;%d;%dt", x, y);
3600 break; 3156 break;
3601 case 14: /* report window size (pixels) */ 3157 case 14: /* report window size (pixels) */
3602 XGetWindowAttributes (dpy, parent[0], &wattr); 3158 XGetWindowAttributes (dpy, parent, &wattr);
3603 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3159 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3604 break; 3160 break;
3605 case 18: /* report text area size (chars) */ 3161 case 18: /* report text area size (chars) */
3606 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3162 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3607 break; 3163 break;
… …
3609 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3165 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3610 break; 3166 break;
3611 case 20: /* report icon label */ 3167 case 20: /* report icon label */
3612 { 3168 {
3613 char *s; 3169 char *s;
3614 XGetIconName (dpy, parent[0], &s); 3170 XGetIconName (dpy, parent, &s);
3615 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3171 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3616 XFree (s); 3172 XFree (s);
3617 } 3173 }
3618 break; 3174 break;
3619 case 21: /* report window title */ 3175 case 21: /* report window title */
3620 { 3176 {
3621 char *s; 3177 char *s;
3622 XFetchName (dpy, parent[0], &s); 3178 XFetchName (dpy, parent, &s);
3623 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3179 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3624 XFree (s); 3180 XFree (s);
3625 } 3181 }
3626 break; 3182 break;
3627 } 3183 }
3628} 3184}
… …
3655 seen_esc = true; 3211 seen_esc = true;
3656 continue; 3212 continue;
3657 } 3213 }
3658 else if (ch == C0_BEL || ch == CHAR_ST) 3214 else if (ch == C0_BEL || ch == CHAR_ST)
3659 break; 3215 break;
3216 else if (ch == C0_SYN)
3217 ch = cmd_get8 ();
3660 else if (ch < 0x20) 3218 else if (ch < 0x20)
3661 return NULL; /* other control character - exit */ 3219 return NULL; /* other control character - exit */
3662 3220
3663 seen_esc = false; 3221 seen_esc = false;
3664 3222
3665 if (n >= STRING_MAX - 1) 3223 if (n >= STRING_MAX - 1)
3666 // stop at some sane length 3224 // stop at some sane length
3667 return NULL; 3225 return NULL;
3668 3226
3669 if (ch == C0_SYN)
3670 string[n++] = cmd_get8 ();
3671 else
3672 string[n++] = ch; 3227 string[n++] = ch;
3673 } 3228 }
3674 3229
3675 string[n++] = '\0'; 3230 string[n++] = '\0';
3676 3231
3677 ends_how = (ch == 0x5c ? C0_ESC : ch); 3232 ends_how = (ch == 0x5c ? C0_ESC : ch);
… …
3684 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3239 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3685 */ 3240 */
3686void 3241void
3687rxvt_term::process_dcs_seq () 3242rxvt_term::process_dcs_seq ()
3688{ 3243{
3689 char *s;
3690 unicode_t eh;
3691
3692 /* 3244 /*
3693 * Not handled yet 3245 * Not handled yet
3694 */ 3246 */
3247
3248 unicode_t eh;
3695 s = get_to_st (eh); 3249 char *s = get_to_st (eh);
3696 if (s) 3250 if (s)
3697 free (s); 3251 free (s);
3698 3252
3699 return; 3253 return;
3700} 3254}
… …
3704 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)' 3258 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)'
3705 */ 3259 */
3706void 3260void
3707rxvt_term::process_osc_seq () 3261rxvt_term::process_osc_seq ()
3708{ 3262{
3709 unicode_t ch, eh;
3710 int arg; 3263 int arg;
3711 3264
3712 ch = cmd_getc (); 3265 unicode_t ch = cmd_getc ();
3713 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3266 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3714 arg = arg * 10 + (ch - '0'); 3267 arg = arg * 10 + (ch - '0');
3715 3268
3716 if (ch == ';') 3269 if (ch == ';')
3717 { 3270 {
3271 unicode_t eh;
3718 char *s = get_to_st (eh); 3272 char *s = get_to_st (eh);
3719 3273
3720 if (s) 3274 if (s)
3721 { 3275 {
3722 process_xterm_seq (arg, s, eh); 3276 process_xterm_seq (arg, s, eh);
… …
3746 3300
3747/* 3301/*
3748 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3302 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3749 */ 3303 */
3750void 3304void
3751rxvt_term::process_xterm_seq (int op, const char *str, char resp) 3305rxvt_term::process_xterm_seq (int op, char *str, char resp)
3752{ 3306{
3753 int color; 3307 int color;
3754 char *buf, *name; 3308 char *buf, *name;
3755 bool query = str[0] == '?' && !str[1]; 3309 bool query = str[0] == '?' && !str[1];
3756 int saveop = op; 3310 int saveop = op;
3757 3311
3758 dLocal (Display *, dpy); 3312 dLocal (Display *, dpy);
3759 3313
3760 assert (str != NULL); 3314 assert (str != NULL);
3761 3315
3762 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END))) 3316 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END)))
3763 return; 3317 return;
3764 3318
3765 switch (op) 3319 switch (op)
3766 { 3320 {
… …
3783 unsigned long bytes_after; 3337 unsigned long bytes_after;
3784 unsigned char *value = 0; 3338 unsigned char *value = 0;
3785 const char *str = ""; 3339 const char *str = "";
3786 3340
3787 if (prop 3341 if (prop
3788 && XGetWindowProperty (dpy, parent[0], 3342 && XGetWindowProperty (dpy, parent,
3789 prop, 0, 1<<16, 0, AnyPropertyType, 3343 prop, 0, 1<<16, 0, AnyPropertyType,
3790 &actual_type, &actual_format, 3344 &actual_type, &actual_format,
3791 &nitems, &bytes_after, &value) == Success 3345 &nitems, &bytes_after, &value) == Success
3792 && actual_type != None 3346 && actual_type != None
3793 && actual_format == 8) 3347 && actual_format == 8)
… …
3797 3351
3798 XFree (value); 3352 XFree (value);
3799 } 3353 }
3800 else 3354 else
3801 { 3355 {
3802 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3356 char *eq = strchr (str, '=');
3803 3357
3804 if (eq) 3358 if (eq)
3805 { 3359 {
3806 *eq = 0; 3360 *eq = 0;
3807 set_utf8_property (display->atom (str), eq + 1); 3361 set_utf8_property (display->atom (str), eq + 1);
3808 } 3362 }
3809 else 3363 else
3810 XDeleteProperty (dpy, parent[0], 3364 XDeleteProperty (dpy, parent,
3811 display->atom (str)); 3365 display->atom (str));
3812 } 3366 }
3813 break; 3367 break;
3814 3368
3815 case XTerm_Color: 3369 case XTerm_Color:
… …
3828 *buf++ = '\0'; 3382 *buf++ = '\0';
3829 3383
3830 process_color_seq (op, color, name, resp); 3384 process_color_seq (op, color, name, resp);
3831 } 3385 }
3832 break; 3386 break;
3387 case Rxvt_restoreFG:
3833 case XTerm_Color00: 3388 case XTerm_Color00:
3834 process_color_seq (op, Color_fg, str, resp); 3389 process_color_seq (op, Color_fg, str, resp);
3835 break; 3390 break;
3391 case Rxvt_restoreBG:
3836 case XTerm_Color01: 3392 case XTerm_Color01:
3837 process_color_seq (op, Color_bg, str, resp); 3393 process_color_seq (op, Color_bg, str, resp);
3838 break; 3394 break;
3839#ifndef NO_CURSORCOLOR 3395#ifndef NO_CURSORCOLOR
3840 case XTerm_Color_cursor: 3396 case XTerm_Color_cursor:
… …
3845 process_color_seq (op, Color_pointer_fg, str, resp); 3401 process_color_seq (op, Color_pointer_fg, str, resp);
3846 break; 3402 break;
3847 case XTerm_Color_pointer_bg: 3403 case XTerm_Color_pointer_bg:
3848 process_color_seq (op, Color_pointer_bg, str, resp); 3404 process_color_seq (op, Color_pointer_bg, str, resp);
3849 break; 3405 break;
3406#ifdef OPTION_HC
3407 case XTerm_Color_HC:
3408 process_color_seq (op, Color_HC, str, resp);
3409 break;
3410 case XTerm_Color_HTC:
3411 process_color_seq (op, Color_HTC, str, resp);
3412 break;
3413#endif
3850#ifndef NO_BOLD_UNDERLINE_REVERSE 3414#ifndef NO_BOLD_UNDERLINE_REVERSE
3851 case XTerm_Color_RV:
3852 process_color_seq (op, Color_RV, str, resp);
3853 break;
3854 case Rxvt_Color_BD:
3855 case URxvt_Color_BD: 3415 case URxvt_Color_BD:
3856 process_color_seq (op, Color_BD, str, resp); 3416 process_color_seq (op, Color_BD, str, resp);
3857 break; 3417 break;
3858 case Rxvt_Color_UL:
3859 case URxvt_Color_UL: 3418 case URxvt_Color_UL:
3860 process_color_seq (op, Color_UL, str, resp); 3419 process_color_seq (op, Color_UL, str, resp);
3861 break; 3420 break;
3862 case URxvt_Color_IT: 3421 case URxvt_Color_IT:
3863 process_color_seq (op, Color_IT, str, resp); 3422 process_color_seq (op, Color_IT, str, resp);
3864 break; 3423 break;
3865#endif 3424#endif
3866#if TRANSPARENT && TINTING 3425 case URxvt_Color_border:
3426 process_color_seq (op, Color_border, str, resp);
3427 break;
3428#if ENABLE_TRANSPARENCY
3867 case URxvt_Color_tint: 3429 case URxvt_Color_tint:
3868 process_color_seq (op, Color_tint, str, resp); 3430 process_color_seq (op, Color_tint, str, resp);
3431 {
3432 bool changed = false;
3869 3433
3870 check_our_parents (); 3434 if (ISSET_PIXCOLOR (Color_tint))
3435 changed = bg_set_tint (pix_colors_focused [Color_tint]);
3871 3436
3872 if (am_transparent) 3437 if (changed)
3873 want_full_refresh = want_refresh = 1; 3438 update_background ();
3439 }
3874 3440
3875 break; 3441 break;
3876#endif 3442#endif
3877 3443
3444#if BG_IMAGE_FROM_FILE
3878 case Rxvt_Pixmap: 3445 case Rxvt_Pixmap:
3446 if (!strcmp (str, "?"))
3879 { 3447 {
3448 char str[256];
3449
3450 sprintf (str, "[%dx%d+%d+%d]",
3451 min (h_scale, 32767), min (v_scale, 32767),
3452 min (h_align, 32767), min (v_align, 32767));
3453 process_xterm_seq (XTerm_title, str, CHAR_ST);
3454 }
3455 else
3456 {
3457 bool changed = false;
3458
3880 if (*str != ';') 3459 if (*str != ';')
3881 { 3460 {
3882#if XPM_BACKGROUND
3883 scale_pixmap (""); /* reset to default scaling */
3884 set_bgPixmap (str); /* change pixmap */ 3461 if (bg_set_file (str)) /* change pixmap */
3885 scr_touch (true); 3462 changed = true;
3886#endif
3887 } 3463 }
3888 3464 else
3889 int changed = 0;
3890
3891 while ((str = strchr (str, ';')) != NULL)
3892 { 3465 {
3893 str++; 3466 str++;
3894#if XPM_BACKGROUND 3467 if (bg_set_geometry (str, true))
3895 changed += scale_pixmap (str); 3468 changed = true;
3896#endif
3897 } 3469 }
3898 3470
3899 if (changed) 3471 if (changed)
3900 { 3472 {
3901#ifdef XPM_BACKGROUND 3473 if (bg_window_position_sensitive ())
3902 resize_pixmap (); 3474 {
3903 scr_touch (true); 3475 int x, y;
3904#endif 3476 get_window_origin (x, y);
3477 bg_set_position (x, y);
3478 }
3479 update_background ();
3905 } 3480 }
3906 } 3481 }
3907 break; 3482 break;
3908 3483#endif
3909 case Rxvt_restoreFG:
3910 set_window_color (Color_fg, str);
3911 break;
3912 case Rxvt_restoreBG:
3913 set_window_color (Color_bg, str);
3914 break;
3915 3484
3916 case XTerm_logfile: 3485 case XTerm_logfile:
3917 // TODO, when secure mode? 3486 // TODO, when secure mode?
3918 break; 3487 break;
3919 3488
… …
3937 case URxvt_italicFont: 3506 case URxvt_italicFont:
3938 case URxvt_boldItalicFont: 3507 case URxvt_boldItalicFont:
3939#endif 3508#endif
3940 if (query) 3509 if (query)
3941 tt_printf ("\33]%d;%-.250s%c", saveop, 3510 tt_printf ("\33]%d;%-.250s%c", saveop,
3942 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc 3511 option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3943 ? fontset[op - URxvt_font]->fontdesc : "", 3512 ? fontset[op - URxvt_font]->fontdesc : "",
3944 resp); 3513 resp);
3945 else 3514 else
3946 { 3515 {
3947 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3516 const char *&res = rs[Rs_font + (op - URxvt_font)];
… …
3961 break; 3530 break;
3962 3531
3963#if !ENABLE_MINIMAL 3532#if !ENABLE_MINIMAL
3964 case URxvt_locale: 3533 case URxvt_locale:
3965 if (query) 3534 if (query)
3966 tt_printf ("\33]%d;%-.250s%c", op, OPTION (Opt_insecure) ? locale : "", resp); 3535 tt_printf ("\33]%d;%-.250s%c", op, option (Opt_insecure) ? locale : "", resp);
3967 else 3536 else
3968 { 3537 {
3969 set_locale (str); 3538 set_locale (str);
3970 pty->set_utf8_mode (enc_utf8); 3539 pty->set_utf8_mode (enc_utf8);
3971 init_xlocale (); 3540 init_xlocale ();
… …
3986 break; 3555 break;
3987#endif 3556#endif
3988 3557
3989#if ENABLE_PERL 3558#if ENABLE_PERL
3990 case URxvt_perl: 3559 case URxvt_perl:
3991 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END))) 3560 HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_STR_LEN, &resp, 1, DT_END));
3992 ; // no responses yet
3993 break; 3561 break;
3994#endif 3562#endif
3995 } 3563 }
3996} 3564}
3997/*----------------------------------------------------------------------*/ 3565/*----------------------------------------------------------------------*/
… …
4020 { 3588 {
4021 if (mode == 'r') 3589 if (mode == 'r')
4022 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3590 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
4023 else 3591 else
4024 state = (mode == 't') ? ! (priv_modes & bit) : mode; 3592 state = (mode == 't') ? ! (priv_modes & bit) : mode;
4025 PrivMode (state, bit); 3593
3594 if (state)
3595 priv_modes |= bit;
3596 else
3597 priv_modes &= ~bit;
4026 } 3598 }
4027 3599
4028 return state; 3600 return state;
4029} 3601}
4030 3602
4031/* we're not using priv _yet_ */ 3603/* we're not using priv _yet_ */
4032void 3604void
4033rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg) 3605rxvt_term::process_terminal_mode (int mode, int priv ecb_unused, unsigned int nargs, const int *arg)
4034{ 3606{
4035 unsigned int i, j; 3607 unsigned int i, j;
4036 int state; 3608 int state;
4037 3609
4038 static const struct 3610 static const struct
4039 { 3611 {
4040 const int argval; 3612 const int argval;
4041 const unsigned long bit; 3613 const unsigned long bit;
4042 }
4043
4044 argtopriv[] = { 3614 } argtopriv[] = {
4045 { 1, PrivMode_aplCUR }, 3615 { 1, PrivMode_aplCUR }, // DECCKM
4046 { 2, PrivMode_vt52 }, 3616 { 2, PrivMode_vt52 }, // DECANM
4047 { 3, PrivMode_132 }, 3617 { 3, PrivMode_132 }, // DECCOLM
4048 { 4, PrivMode_smoothScroll }, 3618 { 4, PrivMode_smoothScroll }, // DECSCLM
4049 { 5, PrivMode_rVideo }, 3619 { 5, PrivMode_rVideo }, // DECSCNM
4050 { 6, PrivMode_relOrigin }, 3620 { 6, PrivMode_relOrigin }, // DECOM
4051 { 7, PrivMode_Autowrap }, 3621 { 7, PrivMode_Autowrap }, // DECAWM
4052 // 8, bi-directional support mode 3622 // 8, auto-repeat keys // DECARM
4053 { 9, PrivMode_MouseX10 }, 3623 { 9, PrivMode_MouseX10 },
4054 // 18, 19 printing-related 3624 // 18 end FF to printer after print screen
3625 // 19 Print screen prints full screen/scroll region
4055 { 25, PrivMode_VisibleCursor }, 3626 { 25, PrivMode_VisibleCursor }, // DECTCEM cnorm/cvvis/civis
4056#ifdef scrollBar_esc 3627#ifdef scrollBar_esc
4057 { scrollBar_esc, PrivMode_scrollBar }, 3628 { scrollBar_esc, PrivMode_scrollBar },
4058#endif 3629#endif
4059 { 35, PrivMode_ShiftKeys }, // rxvt extension 3630 { 35, PrivMode_ShiftKeys }, // rxvt extension
3631 // 38, tektronix mode // DECTEK
4060 { 40, PrivMode_132OK }, 3632 { 40, PrivMode_132OK },
4061 // 41 xterm more fixes NYI 3633 // 41 xterm more fixes NYI
4062 // 45 margin bell NYI 3634 // 45 margin bell NYI
4063 // 46 start logging 3635 // 46 start logging
4064 { 47, PrivMode_Screen }, 3636 { 47, PrivMode_Screen },
4065 { 66, PrivMode_aplKP }, 3637 { 66, PrivMode_aplKP }, // DECNKM
4066#ifndef NO_BACKSPACE_KEY 3638#ifndef NO_BACKSPACE_KEY
4067 { 67, PrivMode_BackSpace }, 3639 { 67, PrivMode_BackSpace }, // DECBKM
4068#endif 3640#endif
4069 { 1000, PrivMode_MouseX11 }, 3641 { 1000, PrivMode_MouseX11 },
4070 // 1001 Use Hilite Mouse Tracking. NYI, TODO 3642 { 1002, PrivMode_MouseBtnEvent },
4071 // 1002 Use Cell Motion Mouse Tracking. NYI, TODO 3643 { 1003, PrivMode_MouseAnyEvent },
4072 // 1003 Use All Motion Mouse Tracking. NYI, TODO 3644#if ENABLE_FRILLS
3645 { 1005, PrivMode_ExtModeMouse },
3646#endif
4073 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3647 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
4074 { 1011, PrivMode_Keypress }, // rxvt extension 3648 { 1011, PrivMode_Keypress }, // rxvt extension
3649#if ENABLE_FRILLS
3650 { 1015, PrivMode_ExtMouseRight }, // urxvt extension of 1005
3651#endif
4075 // 1035 enable modifiers for alt, numlock NYI 3652 // 1035 enable modifiers for alt, numlock NYI
4076 // 1036 send ESC for meta keys NYI 3653 // 1036 send ESC for meta keys NYI
4077 // 1037 send DEL for keypad delete NYI 3654 // 1037 send DEL for keypad delete NYI
4078 { 1047, PrivMode_Screen }, 3655 { 1047, PrivMode_Screen },
4079 // 1048 save and restore cursor 3656 // 1048 save and restore cursor, implemented in code
4080 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */ 3657 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
4081 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3658 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3659 { 2004, PrivMode_BracketPaste },
4082 }; 3660 };
4083 3661
4084 if (nargs == 0) 3662 if (nargs == 0)
4085 return; 3663 return;
4086 3664
… …
4093 for (i = 0; i < nargs; i++) 3671 for (i = 0; i < nargs; i++)
4094 { 3672 {
4095 state = -1; 3673 state = -1;
4096 3674
4097 /* basic handling */ 3675 /* basic handling */
4098 for (j = 0; j < (sizeof (argtopriv)/sizeof (argtopriv[0])); j++) 3676 for (j = 0; j < ecb_array_length (argtopriv); j++)
4099 if (argtopriv[j].argval == arg[i]) 3677 if (argtopriv[j].argval == arg[i])
4100 { 3678 {
4101 state = privcases (mode, argtopriv[j].bit); 3679 state = privcases (mode, argtopriv[j].bit);
4102 break; 3680 break;
4103 } 3681 }
… …
4111 3689
4112 scr_touch (true); 3690 scr_touch (true);
4113 break; 3691 break;
4114#endif 3692#endif
4115 case 1048: /* alternative cursor save */ 3693 case 1048: /* alternative cursor save */
4116 case 1049:
4117 if (OPTION (Opt_secondaryScreen)) 3694 if (option (Opt_secondaryScreen))
4118 if (mode == 0) 3695 if (mode == 0)
4119 scr_cursor (RESTORE); 3696 scr_cursor (RESTORE);
4120 else if (mode == 1) 3697 else if (mode == 1)
4121 scr_cursor (SAVE); 3698 scr_cursor (SAVE);
4122 break; 3699 break;
… …
4130 case 2: /* VT52 mode */ 3707 case 2: /* VT52 mode */
4131 /* oddball mode. should be set regardless of set/reset 3708 /* oddball mode. should be set regardless of set/reset
4132 * parameter. Return from VT52 mode with an ESC < from 3709 * parameter. Return from VT52 mode with an ESC < from
4133 * within VT52 mode 3710 * within VT52 mode
4134 */ 3711 */
4135 PrivMode (1, PrivMode_vt52); 3712 priv_modes |= PrivMode_vt52;
4136 break; 3713 break;
4137 case 3: /* 80/132 */ 3714 case 3: /* 80/132 */
4138 if (priv_modes & PrivMode_132OK) 3715 if (priv_modes & PrivMode_132OK)
4139 set_widthheight (((state ? 132 : 80) * fwidth), height); 3716 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
4140 break; 3717 break;
4141 case 4: /* smooth scrolling */ 3718 case 4: /* smooth scrolling */
4142 set_option (Opt_jumpScroll, !state); 3719 set_option (Opt_jumpScroll, !state);
4143 break; 3720 break;
4144 case 5: /* reverse video */ 3721 case 5: /* reverse video */
… …
4151 scr_autowrap (state); 3728 scr_autowrap (state);
4152 break; 3729 break;
4153 /* case 8: - auto repeat, can't do on a per window basis */ 3730 /* case 8: - auto repeat, can't do on a per window basis */
4154 case 9: /* X10 mouse reporting */ 3731 case 9: /* X10 mouse reporting */
4155 if (state) /* orthogonal */ 3732 if (state) /* orthogonal */
4156 priv_modes &= ~PrivMode_MouseX11; 3733 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
4157 break; 3734 break;
4158#ifdef scrollBar_esc 3735#ifdef scrollBar_esc
4159 case scrollBar_esc: 3736 case scrollBar_esc:
4160 if (scrollbar_mapping (state)) 3737 scrollBar.map (state);
4161 {
4162 resize_all_windows (0, 0, 0); 3738 resize_all_windows (0, 0, 0);
4163 scr_touch (true); 3739 scr_touch (true);
4164 }
4165 break; 3740 break;
4166#endif 3741#endif
4167 case 25: /* visible/invisible cursor */ 3742 case 25: /* visible/invisible cursor */
4168 scr_cursor_visible (state); 3743 scr_cursor_visible (state);
4169 break; 3744 break;
… …
4174 break; 3749 break;
4175 /* case 66: - application key pad */ 3750 /* case 66: - application key pad */
4176 /* case 67: - backspace key */ 3751 /* case 67: - backspace key */
4177 case 1000: /* X11 mouse reporting */ 3752 case 1000: /* X11 mouse reporting */
4178 if (state) /* orthogonal */ 3753 if (state) /* orthogonal */
4179 priv_modes &= ~PrivMode_MouseX10; 3754 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
4180 break; 3755 break;
4181#if 0
4182 case 1001: 3756 case 1002:
4183 break; /* X11 mouse highlighting */ 3757 case 1003:
4184#endif 3758 if (state)
3759 {
3760 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3761 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3762 mouse_row = mouse_col = 0;
3763 vt_emask_mouse = PointerMotionMask;
3764 }
3765 else
3766 vt_emask_mouse = NoEventMask;
3767
3768 vt_select_input ();
3769 break;
4185 case 1010: /* scroll to bottom on TTY output inhibit */ 3770 case 1010: /* scroll to bottom on TTY output inhibit */
4186 set_option (Opt_scrollTtyOutput, !state); 3771 set_option (Opt_scrollTtyOutput, !state);
4187 break; 3772 break;
4188 case 1011: /* scroll to bottom on key press */ 3773 case 1011: /* scroll to bottom on key press */
4189 set_option (Opt_scrollTtyKeypress, state); 3774 set_option (Opt_scrollTtyKeypress, state);
4190 break; 3775 break;
4191 case 1047: /* secondary screen w/ clearing last */ 3776 case 1047: /* secondary screen w/ clearing last */
4192 if (OPTION (Opt_secondaryScreen)) 3777 if (option (Opt_secondaryScreen))
4193 if (current_screen != PRIMARY) 3778 if (!state)
4194 scr_erase_screen (2); 3779 scr_erase_screen (2);
3780
4195 scr_change_screen (state); 3781 scr_change_screen (state);
4196 break; 3782 break;
4197 case 1049: /* secondary screen w/ clearing first */ 3783 case 1049: /* secondary screen w/ clearing first */
3784 if (option (Opt_secondaryScreen))
3785 if (state)
3786 scr_cursor (SAVE);
3787
4198 scr_change_screen (state); 3788 scr_change_screen (state);
3789
4199 if (OPTION (Opt_secondaryScreen)) 3790 if (option (Opt_secondaryScreen))
4200 if (current_screen != PRIMARY) 3791 if (state)
4201 scr_erase_screen (2); 3792 scr_erase_screen (2);
3793 else
3794 scr_cursor (RESTORE);
4202 break; 3795 break;
4203 default: 3796 default:
4204 break; 3797 break;
4205 } 3798 }
4206 } 3799 }
… …
4359 } 3952 }
4360 } 3953 }
4361} 3954}
4362/*}}} */ 3955/*}}} */
4363 3956
4364/*{{{ (do not) process Rob Nation's own graphics mode sequences */
4365void
4366rxvt_term::process_graphics ()
4367{
4368 unicode_t ch, cmd = cmd_getc ();
4369
4370 if (cmd == 'Q')
4371 { /* query graphics */
4372 tt_printf ("\033G0\012"); /* no graphics */
4373 return;
4374 }
4375 /* swallow other graphics sequences until terminating ':' */
4376 do
4377 ch = cmd_getc ();
4378 while (ch != ':');
4379}
4380/*}}} */
4381
4382/* ------------------------------------------------------------------------- */ 3957/* ------------------------------------------------------------------------- */
4383 3958
4384/* 3959/*
4385 * Send printf () formatted output to the command. 3960 * Send printf () formatted output to the command.
4386 * Only use for small amounts of data. 3961 * Only use for small amounts of data.
… …
4399 3974
4400/* ---------------------------------------------------------------------- */ 3975/* ---------------------------------------------------------------------- */
4401/* Write data to the pty as typed by the user, pasted with the mouse, 3976/* Write data to the pty as typed by the user, pasted with the mouse,
4402 * or generated by us in response to a query ESC sequence. 3977 * or generated by us in response to a query ESC sequence.
4403 */ 3978 */
4404const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 3979static const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4405 3980
4406void 3981void
4407rxvt_term::tt_write (const char *data, unsigned int len) 3982rxvt_term::tt_write (const char *data, unsigned int len)
4408{ 3983{
4409 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END))) 3984 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
… …
4414 3989
4415 if (v_buflen == 0) 3990 if (v_buflen == 0)
4416 { 3991 {
4417 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE)); 3992 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
4418 3993
3994 max_it (written, 0);
3995
4419 if ((unsigned int)written == len) 3996 if (written == len)
4420 return; 3997 return;
4421 3998
4422 data += written; 3999 data += written;
4423 len -= written; 4000 len -= written;
4424 } 4001 }
4425 4002
4426 v_buffer = (char *)realloc (v_buffer, v_buflen + len); 4003 v_buffer = (char *)rxvt_realloc (v_buffer, v_buflen + len);
4427 4004
4428 memcpy (v_buffer + v_buflen, data, len); 4005 memcpy (v_buffer + v_buflen, data, len);
4429 v_buflen += len; 4006 v_buflen += len;
4430 4007
4431 pty_ev.set (EVENT_READ | EVENT_WRITE); 4008 pty_ev.set (ev::READ | ev::WRITE);
4432} 4009}
4433 4010
4434void rxvt_term::pty_write () 4011void rxvt_term::pty_write ()
4435{ 4012{
4436 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE)); 4013 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
… …
4441 4018
4442 if (v_buflen == 0) 4019 if (v_buflen == 0)
4443 { 4020 {
4444 free (v_buffer); 4021 free (v_buffer);
4445 v_buffer = 0; 4022 v_buffer = 0;
4446 v_buflen = 0;
4447 4023
4448 pty_ev.set (EVENT_READ); 4024 pty_ev.set (ev::READ);
4449 return; 4025 return;
4450 } 4026 }
4451 4027
4452 memmove (v_buffer, v_buffer + written, v_buflen); 4028 memmove (v_buffer, v_buffer + written, v_buflen);
4453 } 4029 }
4454 else if (written != -1 || (errno != EAGAIN && errno != EINTR)) 4030 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4455 pty_ev.set (EVENT_READ); 4031 pty_ev.set (ev::READ);
4456} 4032}
4457 4033
4458/*----------------------- end-of-file (C source) -----------------------*/ 4034/*----------------------- end-of-file (C source) -----------------------*/
4459 4035

Diff Legend

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