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.376 by root, Fri Dec 14 02:08:18 2007 UTC vs.
Revision 1.499 by root, Wed Nov 16 20:15:45 2011 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.
… …
161 162
162void 163void
163rxvt_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)
164{ 165{
165 rxvt_fontset *fs = FONTSET (r); 166 rxvt_fontset *fs = FONTSET (r);
166 rxvt_font *f = (*fs)[fs->find_font (ch)];
167 wchar_t *chr, *alloc, ch2, *fname; 167 wchar_t *chr, *alloc, ch2, **fname;
168 int len; 168 int len;
169
170 fname = rxvt_utf8towcs (f->name);
171 169
172# if ENABLE_COMBINING 170# if ENABLE_COMBINING
173 if (IS_COMPOSE (ch)) 171 if (IS_COMPOSE (ch))
174 { 172 {
175 len = rxvt_composite.expand (ch, 0); 173 len = rxvt_composite.expand (ch, 0);
… …
196 r & RS_Blink ? " blink" : "", 194 r & RS_Blink ? " blink" : "",
197 r & RS_RVid ? " rvid" : "", 195 r & RS_RVid ? " rvid" : "",
198 r & RS_Uline ? " uline" : "", 196 r & RS_Uline ? " uline" : "",
199 r & RS_Careful ? " careful" : ""); 197 r & RS_Careful ? " careful" : "");
200 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);
201 int width = wcswidth (fname, wcslen (fname)); 205 max_it (width, wcswidth (fname[i], wcslen (fname[i])));
206 }
202 207
203 max_it (width, 8+5); // for char + hey 208 max_it (width, 8+5); // for char + hex
204 max_it (width, strlen (attr)); 209 max_it (width, strlen (attr));
205 210
206 if (y >= 0) 211 if (y >= 0)
207 { 212 {
208 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1; 213 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1;
209 x = 0; 214 x = 0;
210 } 215 }
211 216
212 scr_overlay_new (x, y, width, len + 2); 217 scr_overlay_new (x, y, width, len * 2 + 1);
213 218
214 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r)); 219 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));
215 220
216 for (int y = 0; y < len; y++) 221 for (int y = 0; y < len; y++)
217 { 222 {
… …
220 ch = *chr++; 225 ch = *chr++;
221 226
222 sprintf (buf, "%8x", ch); 227 sprintf (buf, "%8x", ch);
223 scr_overlay_set (0, y, buf); 228 scr_overlay_set (0, y, buf);
224 scr_overlay_set (9, y, '='); 229 scr_overlay_set (9, y, '=');
225# if !UNICODE3 230# if !UNICODE_3
226 if (ch >= 0x10000) 231 if (ch >= 0x10000)
227 ch = 0xfffd; 232 ch = 0xfffd;
228# endif 233# endif
229 scr_overlay_set (11, y, ch, r); 234 scr_overlay_set (11, y, ch, r);
230 235
… …
236// char buf[4+4+3+1]; 241// char buf[4+4+3+1];
237// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y); 242// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y);
238// scr_overlay_set (0, 0, buf); 243// scr_overlay_set (0, 0, buf);
239// } 244// }
240 scr_overlay_set (0, len , attr); 245 scr_overlay_set (0, len , attr);
246 for (int i = 0; i < len; i++)
247 {
241 scr_overlay_set (0, len + 1, fname); 248 scr_overlay_set (0, len + 1 + i, fname[i]);
242
243 free (fname); 249 free (fname[i]);
250 }
244 251
245# if ENABLE_COMBINING 252# if ENABLE_COMBINING
246 if (alloc) 253 if (alloc)
247 delete [] alloc; 254 delete [] alloc;
248# endif 255# endif
… …
250#endif 257#endif
251 258
252void 259void
253rxvt_term::commit_iso14755 () 260rxvt_term::commit_iso14755 ()
254{ 261{
255 wchar_t ch[2];
256
257 ch[0] = iso14755buf & ISO_14755_MASK; 262 wchar_t ch = iso14755buf & ISO_14755_MASK;
258 ch[1] = 0;
259 263
260 if (iso14755buf & ISO_14755_51) 264 if (iso14755buf & ISO_14755_51)
261 { 265 {
262 char mb[16]; 266 char mb[MB_LEN_MAX];
263 int len; 267 int len;
264 268
265 // allow verbatim 0-bytes and control-bytes to be entered 269 // allow verbatim 0-bytes and control-bytes to be entered
266 if (ch[0] >= 0x20) 270 if (ch >= 0x20)
267 len = wcstombs (mb, ch, 16); 271 len = wctomb (mb, ch);
268 else 272 else
269 { 273 {
270 mb[0] = ch[0]; 274 mb[0] = ch;
271 len = 1; 275 len = 1;
272 } 276 }
273 277
274 if (len > 0) 278 if (len > 0)
275 tt_write (mb, len); 279 tt_write (mb, len);
… …
278 } 282 }
279 283
280 iso14755buf = 0; 284 iso14755buf = 0;
281} 285}
282 286
283int 287static int
284rxvt_term::hex_keyval (XKeyEvent &ev) 288hex_keyval (XKeyEvent &ev)
285{ 289{
286 // check wether this event corresponds to a hex digit 290 // check whether this event corresponds to a hex digit
287 // if the modifiers had not been pressed. 291 // if the modifiers had not been pressed.
288 for (int index = 0; index < 8; index++) 292 for (int index = 0; index < 8; index++)
289 { 293 {
290 KeySym k = XLookupKeysym (&ev, index); 294 KeySym k = XLookupKeysym (&ev, index);
291 295
… …
297 301
298 return -1; 302 return -1;
299} 303}
300#endif 304#endif
301 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
302void 401void
303rxvt_term::key_press (XKeyEvent &ev) 402rxvt_term::key_press (XKeyEvent &ev)
304{ 403{
305 int ctrl, meta, shft, len; 404 int ctrl, meta, shft, len;
306 unsigned int newlen;
307 KeySym keysym; 405 KeySym keysym;
308 int valid_keysym; 406 int valid_keysym;
309 char kbuf[KBUFSZ]; 407 char kbuf[KBUFSZ];
310 408
311#if ISO_14755 409#if ISO_14755
… …
320 * Always permit `shift' to override the current setting 418 * Always permit `shift' to override the current setting
321 */ 419 */
322 shft = ev.state & ShiftMask; 420 shft = ev.state & ShiftMask;
323 ctrl = ev.state & ControlMask; 421 ctrl = ev.state & ControlMask;
324 meta = ev.state & ModMetaMask; 422 meta = ev.state & ModMetaMask;
325
326 if (numlock_state || (ev.state & ModNumLockMask))
327 {
328 numlock_state = (ev.state & ModNumLockMask);
329 PrivMode ((!numlock_state), PrivMode_aplKP);
330 }
331 423
332 kbuf[0] = 0; 424 kbuf[0] = 0;
333 425
334#ifdef USE_XIM 426#ifdef USE_XIM
335 if (Input_Context) 427 if (Input_Context)
… …
410#ifdef PAGING_CONTEXT_LINES 502#ifdef PAGING_CONTEXT_LINES
411 lnsppg = nrow - PAGING_CONTEXT_LINES; 503 lnsppg = nrow - PAGING_CONTEXT_LINES;
412#else 504#else
413 lnsppg = nrow * 4 / 5; 505 lnsppg = nrow * 4 / 5;
414#endif 506#endif
507 max_it (lnsppg, 1);
508
415 if (keysym == XK_Prior) 509 if (keysym == XK_Prior)
416 { 510 {
417 scr_page (UP, lnsppg); 511 scr_page (UP, lnsppg);
418 return; 512 return;
419 } 513 }
… …
472 selection_request (ev.time); 566 selection_request (ev.time);
473 return; 567 return;
474#if TODO 568#if TODO
475 /* rxvt extras */ 569 /* rxvt extras */
476 case XK_KP_Add: /* Shift+KP_Add = bigger font */ 570 case XK_KP_Add: /* Shift+KP_Add = bigger font */
477 change_font (FONT_UP);
478 return; 571 return;
479 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */ 572 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */
480 change_font (FONT_DN);
481 return; 573 return;
482#endif 574#endif
483 } 575 }
484 } 576 }
485 } 577 }
486 578
487#if ENABLE_FRILLS || ISO_14755 579#if ENABLE_FRILLS || ISO_14755
488 // ISO 14755 support 580 // ISO 14755 support
489 if (shft && ctrl) 581 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_51))
490 { 582 {
491 int hv; 583 int hv;
492 584
493 if (iso14755buf & ISO_14755_51 585 if (iso14755buf & ISO_14755_51
494 && (keysym == XK_space || keysym == XK_KP_Space 586 && (keysym == XK_space || keysym == XK_KP_Space
… …
524 scr_overlay_off (); 616 scr_overlay_off ();
525# endif 617# endif
526 iso14755buf = 0; 618 iso14755buf = 0;
527 } 619 }
528 } 620 }
621 else if (option (Opt_iso14755) &&
529 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R)) 622 ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R))
530 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))) 623 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))))
531 if (!(iso14755buf & ISO_14755_STARTED)) 624 if (!(iso14755buf & ISO_14755_STARTED))
532 { 625 {
533 iso14755buf |= ISO_14755_STARTED; 626 iso14755buf |= ISO_14755_STARTED;
534# if ISO_14755 627# if ISO_14755
535 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1); 628 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);
… …
546 } 639 }
547#endif 640#endif
548 641
549 if (keysym >= 0xFF00 && keysym <= 0xFFFF) 642 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
550 { 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)
551 { 653 {
552 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft; 654#ifndef NO_BACKSPACE_KEY
553 newlen = 1; 655 case XK_BackSpace:
554#ifdef XK_KP_Home 656 if (priv_modes & PrivMode_HaveBackSpace)
555 static const KeySym keypadtrans[] = { 657 {
556 XK_KP_7, // XK_KP_Home 658 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
557 XK_KP_4, // XK_KP_Left 659 ^ !!ctrl) ? '\b' : '\177';
558 XK_KP_8, // XK_KP_Up 660 kbuf[1] = '\0';
559 XK_KP_6, // XK_KP_Right
560 XK_KP_2, // XK_KP_Down
561#ifndef UNSHIFTED_SCROLLKEYS
562 XK_KP_9, // XK_KP_Prior
563 XK_KP_3, // XK_KP_Next
564#else
565 XK_Prior,
566 XK_Next,
567#endif
568 XK_KP_1, // XK_KP_End
569 XK_KP_5, // XK_KP_Begin
570 }; 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
684 newlen = 0;
685 }
686 break;
571 687
572 if (IN_RANGE_INC (keysym, XK_KP_Home, XK_KP_Begin)) 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:
573 { 768 {
574 unsigned int index = keysym - XK_KP_Home; 769 int param = map_function_key (keysym);
575 keysym = kp ? keypadtrans[index] : XK_Home + index; 770 if (param > 0)
771 sprintf (kbuf,"\033[%d~", param);
772 else
773 newlen = 0;
576 } 774 }
577 else if (keysym == XK_KP_Insert)
578 keysym = kp ? XK_KP_0 : XK_Insert;
579#ifndef NO_DELETE_KEY
580 else if (keysym == XK_KP_Delete)
581 keysym = kp ? XK_KP_Decimal : XK_Delete;
582#endif
583#endif
584 switch (keysym)
585 {
586#ifndef NO_BACKSPACE_KEY
587 case XK_BackSpace:
588 if (priv_modes & PrivMode_HaveBackSpace)
589 {
590 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
591 ^ !!ctrl) ? '\b' : '\177';
592 kbuf[1] = '\0';
593 }
594 else
595 strcpy (kbuf, rs[Rs_backspace_key]);
596 break; 775 break;
597#endif
598#ifndef NO_DELETE_KEY
599 case XK_Delete:
600 strcpy (kbuf, rs[Rs_delete_key]);
601 break;
602#endif
603 case XK_Tab:
604 if (shft)
605 strcpy (kbuf, "\033[Z");
606 else
607 {
608#ifdef CTRL_TAB_MAKES_META
609 if (ctrl)
610 meta = 1;
611#endif
612#ifdef MOD4_TAB_MAKES_META
613 if (ev.state & Mod4Mask)
614 meta = 1;
615#endif
616 newlen = 0;
617 }
618 break;
619
620 case XK_Up: /* "\033[A" */
621 case XK_Down: /* "\033[B" */
622 case XK_Right: /* "\033[C" */
623 case XK_Left: /* "\033[D" */
624 strcpy (kbuf, "\033[Z");
625 kbuf[2] = "DACB"[keysym - XK_Left];
626 /* do Shift first */
627 if (shft)
628 kbuf[2] = "dacb"[keysym - XK_Left];
629 else if (ctrl)
630 {
631 kbuf[1] = 'O';
632 kbuf[2] = "dacb"[keysym - XK_Left];
633 }
634 else if (priv_modes & PrivMode_aplCUR)
635 kbuf[1] = 'O';
636 break;
637
638#ifndef UNSHIFTED_SCROLLKEYS
639 case XK_Prior:
640 strcpy (kbuf, "\033[5~");
641 break;
642 case XK_Next:
643 strcpy (kbuf, "\033[6~");
644 break;
645#endif
646 case XK_KP_Enter:
647 /* allow shift to override */
648 if (kp)
649 {
650 strcpy (kbuf, "\033OM");
651 break;
652 }
653
654 /* FALLTHROUGH */
655
656 case XK_Return:
657 if (priv_modes & PrivMode_LFNL)
658 {
659 kbuf[0] = '\015';
660 kbuf[1] = '\012';
661 kbuf[2] = '\0';
662 }
663 else
664 {
665 kbuf[0] = '\015';
666 kbuf[1] = '\0';
667 }
668 break;
669
670 case XK_KP_F1: /* "\033OP" */
671 case XK_KP_F2: /* "\033OQ" */
672 case XK_KP_F3: /* "\033OR" */
673 case XK_KP_F4: /* "\033OS" */
674 strcpy (kbuf, "\033OP");
675 kbuf[2] += (keysym - XK_KP_F1);
676 break;
677
678 case XK_KP_Multiply: /* "\033Oj" : "*" */
679 case XK_KP_Add: /* "\033Ok" : "+" */
680 case XK_KP_Separator: /* "\033Ol" : "," */
681 case XK_KP_Subtract: /* "\033Om" : "-" */
682 case XK_KP_Decimal: /* "\033On" : "." */
683 case XK_KP_Divide: /* "\033Oo" : "/" */
684 case XK_KP_0: /* "\033Op" : "0" */
685 case XK_KP_1: /* "\033Oq" : "1" */
686 case XK_KP_2: /* "\033Or" : "2" */
687 case XK_KP_3: /* "\033Os" : "3" */
688 case XK_KP_4: /* "\033Ot" : "4" */
689 case XK_KP_5: /* "\033Ou" : "5" */
690 case XK_KP_6: /* "\033Ov" : "6" */
691 case XK_KP_7: /* "\033Ow" : "7" */
692 case XK_KP_8: /* "\033Ox" : "8" */
693 case XK_KP_9: /* "\033Oy" : "9" */
694 /* allow shift to override */
695 if (kp)
696 {
697 strcpy (kbuf, "\033Oj");
698 kbuf[2] += (keysym - XK_KP_Multiply);
699 }
700 else
701 {
702 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
703 kbuf[1] = '\0';
704 }
705 break;
706
707 case XK_Find:
708 strcpy (kbuf, "\033[1~");
709 break;
710
711 case XK_Insert:
712 strcpy (kbuf, "\033[2~");
713 break;
714#ifdef DXK_Remove /* support for DEC remove like key */
715 case DXK_Remove:
716 /* FALLTHROUGH */
717#endif
718 case XK_Execute:
719 strcpy (kbuf, "\033[3~");
720 break;
721 case XK_Select:
722 strcpy (kbuf, "\033[4~");
723 break;
724 case XK_End:
725 strcpy (kbuf, KS_END);
726 break;
727 case XK_Home:
728 strcpy (kbuf, KS_HOME);
729 break;
730
731#define FKEY(n, fkey) \
732 sprintf ((char *)kbuf,"\033[%2d~", (int) ((n) + (keysym - fkey)))
733
734 case XK_F1: /* "\033[11~" */
735 case XK_F2: /* "\033[12~" */
736 case XK_F3: /* "\033[13~" */
737 case XK_F4: /* "\033[14~" */
738 case XK_F5: /* "\033[15~" */
739 FKEY (11, XK_F1);
740 break;
741 case XK_F6: /* "\033[17~" */
742 case XK_F7: /* "\033[18~" */
743 case XK_F8: /* "\033[19~" */
744 case XK_F9: /* "\033[20~" */
745 case XK_F10: /* "\033[21~" */
746 FKEY (17, XK_F6);
747 break;
748 case XK_F11: /* "\033[23~" */
749 case XK_F12: /* "\033[24~" */
750 case XK_F13: /* "\033[25~" */
751 case XK_F14: /* "\033[26~" */
752 FKEY (23, XK_F11);
753 break;
754 case XK_F15: /* "\033[28~" */
755 case XK_F16: /* "\033[29~" */
756 FKEY (28, XK_F15);
757 break;
758 case XK_Help: /* "\033[28~" */
759 FKEY (28, XK_Help);
760 break;
761 case XK_Menu: /* "\033[29~" */
762 FKEY (29, XK_Menu);
763 break;
764 case XK_F17: /* "\033[31~" */
765 case XK_F18: /* "\033[32~" */
766 case XK_F19: /* "\033[33~" */
767 case XK_F20: /* "\033[34~" */
768 case XK_F21: /* "\033[35~" */
769 case XK_F22: /* "\033[36~" */
770 case XK_F23: /* "\033[37~" */
771 case XK_F24: /* "\033[38~" */
772 case XK_F25: /* "\033[39~" */
773 case XK_F26: /* "\033[40~" */
774 case XK_F27: /* "\033[41~" */
775 case XK_F28: /* "\033[42~" */
776 case XK_F29: /* "\033[43~" */
777 case XK_F30: /* "\033[44~" */
778 case XK_F31: /* "\033[45~" */
779 case XK_F32: /* "\033[46~" */
780 case XK_F33: /* "\033[47~" */
781 case XK_F34: /* "\033[48~" */
782 case XK_F35: /* "\033[49~" */
783 FKEY (31, XK_F17);
784 break;
785#undef FKEY
786 default:
787 newlen = 0;
788 break;
789 }
790
791 if (newlen)
792 len = strlen (kbuf);
793 } 776 }
777
778 if (newlen)
779 len = strlen (kbuf);
794 780
795 /* 781 /*
796 * Pass meta for all function keys, if 'meta' option set 782 * Pass meta for all function keys, if 'meta' option set
797 */ 783 */
798#ifdef META8_OPTION 784#ifdef META8_OPTION
… …
898 commit_iso14755 (); 884 commit_iso14755 ();
899 885
900 return; 886 return;
901 } 887 }
902 888
903 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2) 889 for (unsigned short *i = iso14755_symtab; i[0]; i += 2)
904 if (i[0] == keysym) 890 if (i[0] == keysym)
905 { 891 {
906 iso14755buf = ISO_14755_51 | i[1]; 892 iso14755buf = ISO_14755_51 | i[1];
907 commit_iso14755 (); 893 commit_iso14755 ();
908 894
… …
945 else if (keysym == XK_Control_L || keysym == XK_Control_R) 931 else if (keysym == XK_Control_L || keysym == XK_Control_R)
946 mouse_slip_wheel_speed = 0; 932 mouse_slip_wheel_speed = 0;
947#endif 933#endif
948} 934}
949 935
950#if defined (KEYSYM_RESOURCE)
951unsigned int
952rxvt_term::cmd_write (const char *str, unsigned int count)
953{
954 unsigned int n, s;
955
956 n = cmdbuf_ptr - cmdbuf_base;
957 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp;
958
959 if (n > 0 && s < count)
960 {
961 memmove (cmdbuf_base, cmdbuf_ptr,
962 (unsigned int) (cmdbuf_endp - cmdbuf_ptr));
963 cmdbuf_ptr = cmdbuf_base;
964 cmdbuf_endp -= n;
965 s += n;
966 }
967
968 if (count > s)
969 {
970 rxvt_warn ("data loss: cmd_write too large, continuing.\n");
971 count = s;
972 }
973
974 for (; count--;)
975 *cmdbuf_endp++ = *str++;
976
977 cmd_parse ();
978
979 return 0;
980}
981#endif
982
983void 936void
984rxvt_term::flush () 937rxvt_term::flush ()
985{ 938{
986 flush_ev.stop (); 939 flush_ev.stop ();
987 940
988#ifdef HAVE_BG_PIXMAP 941#ifdef HAVE_BG_PIXMAP
989 if (bgPixmap.check_clearChanged ()) 942 if (bg_flags & BG_NEEDS_REFRESH)
990 { 943 {
991// scr_clear (true); This needs to be researched further! 944 bg_flags &= ~BG_NEEDS_REFRESH;
992 scr_touch (false); 945 scr_touch (false);
993 } 946 }
994#endif 947#endif
995 948
996 if (want_refresh) 949 if (want_refresh)
… …
1032 } 985 }
1033 while (row < end_row); 986 while (row < end_row);
1034 } 987 }
1035 988
1036 scr_refresh (); 989 scr_refresh ();
1037 scrollbar_show (1); 990 scrollBar.show (1);
1038#ifdef USE_XIM 991#ifdef USE_XIM
1039 IMSendSpot (); 992 im_send_spot ();
1040#endif 993#endif
1041 } 994 }
1042 995
1043 display->flush (); 996 display->flush ();
1044} 997}
1045 998
999/* checks whether a refresh is requested and starts the refresh timer */
1046void 1000void
1047rxvt_term::prepare_cb (ev::prepare &w, int revents) 1001rxvt_term::refresh_check ()
1048{ 1002{
1049 make_current ();
1050
1051 display->flush ();
1052
1053 if (want_refresh && !flush_ev.is_active ()) 1003 if (want_refresh && !flush_ev.is_active ())
1054 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally 1004 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally
1005
1006 display->flush ();
1055} 1007}
1056 1008
1057void 1009void
1058rxvt_term::flush_cb (ev::timer &w, int revents) 1010rxvt_term::flush_cb (ev::timer &w, int revents)
1059{ 1011{
… …
1067void 1019void
1068rxvt_term::cursor_blink_cb (ev::timer &w, int revents) 1020rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
1069{ 1021{
1070 hidden_cursor = !hidden_cursor; 1022 hidden_cursor = !hidden_cursor;
1071 want_refresh = 1; 1023 want_refresh = 1;
1024 refresh_check ();
1072} 1025}
1073#endif 1026#endif
1074 1027
1075#ifdef TEXT_BLINK 1028#ifdef TEXT_BLINK
1076void 1029void
… …
1078{ 1031{
1079 if (scr_refresh_rend (RS_Blink, RS_Blink)) 1032 if (scr_refresh_rend (RS_Blink, RS_Blink))
1080 { 1033 {
1081 hidden_text = !hidden_text; 1034 hidden_text = !hidden_text;
1082 want_refresh = 1; 1035 want_refresh = 1;
1036 refresh_check ();
1083 } 1037 }
1084 else 1038 else
1085 w.stop (); 1039 w.stop ();
1086} 1040}
1087#endif 1041#endif
1088 1042
1089#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1043#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1090void 1044void
1091rxvt_term::cont_scroll_cb (ev::timer &w, int revents) 1045rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1092{ 1046{
1093 if ((scrollbar_isUp() || scrollbar_isDn()) && 1047 if ((scrollBar.state == SB_STATE_UP || scrollBar.state == SB_STATE_DOWN)
1094 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1048 && scr_page (scrollBar.state == SB_STATE_UP ? UP : DN, 1))
1049 {
1095 want_refresh = 1; 1050 want_refresh = 1;
1051 refresh_check ();
1052 }
1096 else 1053 else
1097 w.stop (); 1054 w.stop ();
1098} 1055}
1099#endif 1056#endif
1100 1057
… …
1104{ 1061{
1105 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1062 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1106 { 1063 {
1107 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1064 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1108 want_refresh = 1; 1065 want_refresh = 1;
1066 refresh_check ();
1109 } 1067 }
1110 else 1068 else
1111 w.stop (); 1069 w.stop ();
1112} 1070}
1113#endif 1071#endif
1114 1072
1115#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1073#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1116void 1074void
1117rxvt_term::slip_wheel_cb (ev::timer &w, int revents) 1075rxvt_term::slip_wheel_cb (ev::timer &w, int revents)
1118{ 1076{
1119 if (mouse_slip_wheel_speed == 0 1077 if (scr_changeview (view_start - mouse_slip_wheel_speed))
1120 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1121 : scr_page (UP, mouse_slip_wheel_speed))
1122 { 1078 {
1123 if (view_start == top_row || view_start == 0)
1124 mouse_slip_wheel_speed = 0;
1125
1126 want_refresh = 1; 1079 want_refresh = 1;
1080 refresh_check ();
1081 }
1082
1083 if (view_start == top_row || view_start == 0 || mouse_slip_wheel_speed == 0)
1127 } 1084 {
1128 else 1085 mouse_slip_wheel_speed = 0;
1129 w.stop (); 1086 w.stop ();
1087 }
1130} 1088}
1131#endif 1089#endif
1132 1090
1133#if LINUX_YIELD_HACK 1091#if LINUX_YIELD_HACK
1134static struct event_handler 1092static struct event_handler
… …
1139 { 1097 {
1140 // this should really be sched_yield(), but the linux guys thought 1098 // this should really be sched_yield(), but the linux guys thought
1141 // that giving a process calling sched_yield () less cpu time than 1099 // that giving a process calling sched_yield () less cpu time than
1142 // ones with high nice levels is a useful thing to do. It surely is is 1100 // ones with high nice levels is a useful thing to do. It surely is is
1143 // allowed by the sus... as is returning ENOSYS. 1101 // allowed by the sus... as is returning ENOSYS.
1102 // since the linux guys additionally thought that breaking the only
1103 // known workaround against their unusable sched_yield hack is cool,
1104 // we just nanosleep a bit and hope for the best.
1144 1105
1145 struct timespec ts = { 0, 0 }; 1106 struct timespec ts = { 0, 1000 };
1146 nanosleep (&ts, 0); 1107 nanosleep (&ts, 0);
1147 1108
1148 w.stop (); 1109 w.stop ();
1149 } 1110 }
1150 1111
… …
1153 { 1114 {
1154 } 1115 }
1155} event_handler; 1116} event_handler;
1156#endif 1117#endif
1157 1118
1119/* make sure all the cmd data is at beginning of cmdbuf */
1120void
1121rxvt_term::cmdbuf_reify ()
1122{
1123 if (cmdbuf_ptr == cmdbuf_base)
1124 return;
1125
1126 ssize_t used = cmdbuf_endp - cmdbuf_ptr;
1127
1128 memmove (cmdbuf_base, cmdbuf_ptr, used);
1129 cmdbuf_ptr = cmdbuf_base;
1130 cmdbuf_endp = cmdbuf_ptr + used;
1131
1132}
1133
1134#if defined (KEYSYM_RESOURCE)
1135void
1136rxvt_term::cmdbuf_append (const char *str, size_t count)
1137{
1138 cmdbuf_reify ();
1139
1140 size_t avail = cmdbuf_base + CBUFSIZ - cmdbuf_endp;
1141
1142 if (count > avail)
1143 return;
1144
1145 memcpy (cmdbuf_endp, str, count);
1146 cmdbuf_endp += count;
1147
1148 cmd_parse ();
1149}
1150#endif
1151
1158bool 1152bool
1159rxvt_term::pty_fill () 1153rxvt_term::pty_fill ()
1160{ 1154{
1161 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1155 cmdbuf_reify ();
1162 1156
1163 if (CBUFSIZ == n) 1157 size_t avail = cmdbuf_base + CBUFSIZ - cmdbuf_endp;
1164 { 1158
1165 rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n"); 1159 if (!avail)
1166 n = 0;
1167 } 1160 {
1168 1161 // normally this indicates a "too long" command sequence - just drop the data we have
1169 memmove (cmdbuf_base, cmdbuf_ptr, n);
1170 cmdbuf_ptr = cmdbuf_base; 1162 cmdbuf_ptr = cmdbuf_base;
1171 cmdbuf_endp = cmdbuf_ptr + n; 1163 cmdbuf_endp = cmdbuf_ptr;
1164 avail = CBUFSIZ;
1165 }
1172 1166
1173 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n); 1167 ssize_t r = read (pty->pty, cmdbuf_endp, avail);
1174 1168
1175 if (r > 0) 1169 if (r > 0)
1176 { 1170 {
1177 cmdbuf_endp += r; 1171 cmdbuf_endp += r;
1178 return true; 1172 return true;
… …
1200{ 1194{
1201 make_current (); 1195 make_current ();
1202 1196
1203 if (revents & ev::READ) 1197 if (revents & ev::READ)
1204 // loop, but don't allow a single term to monopolize us 1198 // loop, but don't allow a single term to monopolize us
1205 while (pty_fill ()) 1199 for (int i = CBUFCNT; i-- && pty_fill (); )
1206 if (cmd_parse ()) 1200 cmd_parse ();
1207 break;
1208 1201
1209 if (revents & ev::WRITE) 1202 if (revents & ev::WRITE)
1210 pty_write (); 1203 pty_write ();
1204
1205 refresh_check ();
1211} 1206}
1212 1207
1213void 1208void
1214rxvt_term::pointer_unblank () 1209rxvt_term::pointer_unblank ()
1215{ 1210{
… …
1251{ 1246{
1252 int button_number, key_state = 0; 1247 int button_number, key_state = 0;
1253 int x, y; 1248 int x, y;
1254 int code = 32; 1249 int code = 32;
1255 1250
1256 x = Pixel2Col (ev.x); 1251 x = Pixel2Col (ev.x) + 1;
1257 y = Pixel2Row (ev.y); 1252 y = Pixel2Row (ev.y) + 1;
1253
1258 if (ev.type == MotionNotify) 1254 if (ev.type == MotionNotify)
1259 { 1255 {
1260 if (x == mouse_row && y == mouse_col) 1256 if (x == mouse_row && y == mouse_col)
1261 return; 1257 return;
1258
1262 mouse_row = x; 1259 mouse_row = x;
1263 mouse_col = y; 1260 mouse_col = y;
1264 code += 32; 1261 code += 32;
1265 } 1262 }
1266 1263
… …
1269 else 1266 else
1270 { 1267 {
1271 button_number = MEvent.button - Button1; 1268 button_number = MEvent.button - Button1;
1272 /* add 0x3D for wheel events, like xterm does */ 1269 /* add 0x3D for wheel events, like xterm does */
1273 if (button_number >= 3) 1270 if (button_number >= 3)
1274 button_number += (64 - 3); 1271 button_number += 64 - 3;
1275 } 1272 }
1276 1273
1277 if (priv_modes & PrivMode_MouseX10) 1274 if (priv_modes & PrivMode_MouseX10)
1278 { 1275 {
1279 /* 1276 /*
… …
1311 fputc ('A', stderr); 1308 fputc ('A', stderr);
1312 if (key_state & 32) 1309 if (key_state & 32)
1313 fputc ('2', stderr); 1310 fputc ('2', stderr);
1314 fprintf (stderr, "]: <%d>, %d/%d\n", 1311 fprintf (stderr, "]: <%d>, %d/%d\n",
1315 button_number, 1312 button_number,
1316 x + 1, 1313 x,
1317 y + 1); 1314 y);
1318#endif 1315#endif
1319 1316
1317#if ENABLE_FRILLS
1318 if (priv_modes & PrivMode_ExtMouseRight)
1319 tt_printf ("\033[%d;%d;%dM",
1320 code + button_number + key_state,
1321 x,
1322 y);
1323 else if (priv_modes & PrivMode_ExtModeMouse)
1324 tt_printf ("\033[M%c%lc%lc",
1325 code + button_number + key_state,
1326 wint_t (32 + x),
1327 wint_t (32 + y));
1328 else
1329#endif
1320 tt_printf ("\033[M%c%c%c", 1330 tt_printf ("\033[M%c%c%c",
1321 (code + button_number + key_state), 1331 code + button_number + key_state,
1322 (32 + x + 1), 1332 32 + x,
1323 (32 + y + 1)); 1333 32 + y);
1324} 1334}
1325 1335
1326/*{{{ process an X event */ 1336/*{{{ process an X event */
1327void 1337void
1328rxvt_term::x_cb (XEvent &ev) 1338rxvt_term::x_cb (XEvent &ev)
… …
1430 && ev.xfocus.mode != NotifyGrab) 1440 && ev.xfocus.mode != NotifyGrab)
1431 focus_out (); 1441 focus_out ();
1432 break; 1442 break;
1433 1443
1434 case ConfigureNotify: 1444 case ConfigureNotify:
1435 /* fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",
1436 ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,
1437 szHint.width, szHint.height); */
1438 if (ev.xconfigure.window == parent[0]) 1445 if (ev.xconfigure.window == parent)
1439 { 1446 {
1440 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1447 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1441 ; 1448 ;
1449
1450#ifdef HAVE_BG_PIXMAP
1451 bool moved = false;
1452 if (bg_window_position_sensitive ())
1453 {
1454 int x, y;
1455 if (ev.xconfigure.send_event)
1456 {
1457 x = ev.xconfigure.x;
1458 y = ev.xconfigure.y;
1459 }
1460 else
1461 get_window_origin (x, y);
1462
1463 if (bg_set_position (x, y)
1464 || !(bg_flags & BG_IS_VALID))
1465 moved = true;
1466 }
1467#endif
1442 1468
1443 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1469 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1444 { 1470 {
1445 seen_resize = 1; 1471 seen_resize = 1;
1446 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1472 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1447 } 1473 }
1448 else 1474 else
1449 { 1475 {
1450#ifdef HAVE_BG_PIXMAP 1476#ifdef HAVE_BG_PIXMAP
1451 if (bgPixmap.window_position_sensitive ()) 1477 if (moved)
1452 update_background (); 1478 update_background ();
1453#endif 1479#endif
1454 } 1480 }
1481
1455 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1482 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1456 } 1483 }
1457 break; 1484 break;
1458 1485
1459 case PropertyNotify: 1486 case PropertyNotify:
1460 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END))) 1487 HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END));
1461 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1462 && ev.xproperty.state == PropertyNewValue)
1463 selection_property (ev.xproperty.window, ev.xproperty.atom);
1464
1465 break; 1488 break;
1466 1489
1467 case SelectionClear: 1490 case SelectionClear:
1468 selection_clear (); 1491 selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]);
1469 break;
1470
1471 case SelectionNotify:
1472 if (selection_wait == Sel_normal)
1473 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1474 break; 1492 break;
1475 1493
1476 case SelectionRequest: 1494 case SelectionRequest:
1477 selection_send (ev.xselectionrequest); 1495 selection_send (ev.xselectionrequest);
1478 break; 1496 break;
1479 1497
1480 case MapNotify: 1498 case MapNotify:
1499#ifdef HAVE_BG_PIXMAP
1500 /* This is needed specifically to fix the case of no window manager or a
1501 * non-reparenting window manager. In those cases we never get first
1502 * ConfigureNotify. Also that speeds startup under normal WM, by taking
1503 * care of multiplicity of ConfigureNotify events arriving while WM does
1504 * reparenting.
1505 * We should not render background immediately, as there could be several
1506 * ConfigureNotify's to follow. Lets take care of all of them in one scoop
1507 * by scheduling background redraw as soon as we can, but giving a short
1508 * bit of time for ConfigureNotifies to arrive.
1509 * We should render background PRIOR to drawing any text, but AFTER all
1510 * of ConfigureNotifys for the best results.
1511 */
1512 if (!(bg_flags & BG_IS_VALID))
1513 update_background_ev.start (0.025);
1514#endif
1481 mapped = 1; 1515 mapped = 1;
1482#ifdef TEXT_BLINK 1516#ifdef TEXT_BLINK
1483 text_blink_ev.start (); 1517 text_blink_ev.start ();
1484#endif 1518#endif
1485 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1519 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
… …
1498 if (ev.xany.window == vt) 1532 if (ev.xany.window == vt)
1499 { 1533 {
1500 do 1534 do
1501 { 1535 {
1502 scr_expose (ev.xexpose.x, ev.xexpose.y, 1536 scr_expose (ev.xexpose.x, ev.xexpose.y,
1503 ev.xexpose.width, ev.xexpose.height, False); 1537 ev.xexpose.width, ev.xexpose.height, false);
1504 } 1538 }
1505 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)); 1539 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1506 1540
1507 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1541 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1508 1542
1509 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)) 1543 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1510 { 1544 {
1511 scr_expose (ev.xexpose.x, ev.xexpose.y, 1545 scr_expose (ev.xexpose.x, ev.xexpose.y,
1512 ev.xexpose.width, ev.xexpose.height, False); 1546 ev.xexpose.width, ev.xexpose.height, false);
1513 } 1547 }
1548
1514 want_refresh = 1; 1549 want_refresh = 1;
1515 } 1550 }
1516 else 1551 else
1517 { 1552 {
1518 XEvent unused_event; 1553 XEvent unused_event;
… …
1520 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event)) 1555 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1521 ; 1556 ;
1522 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event)) 1557 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1523 ; 1558 ;
1524 1559
1525 if (isScrollbarWindow (ev.xany.window)) 1560 if (scrollBar.state && ev.xany.window == scrollBar.win)
1526 { 1561 {
1527 scrollBar.setIdle (); 1562 scrollBar.state = SB_STATE_IDLE;
1528 scrollbar_show (0); 1563 scrollBar.show (0);
1529 } 1564 }
1530 } 1565 }
1531 break; 1566 break;
1532 1567
1533 case MotionNotify: 1568 case MotionNotify:
… …
1620#ifdef MOUSE_THRESHOLD 1655#ifdef MOUSE_THRESHOLD
1621 } 1656 }
1622#endif 1657#endif
1623 } 1658 }
1624 } 1659 }
1625 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1660 else if (scrollBar.state == SB_STATE_MOTION && ev.xany.window == scrollBar.win)
1626 { 1661 {
1627 while (XCheckTypedWindowEvent (dpy, scrollBar.win, 1662 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1628 MotionNotify, &ev)) 1663 MotionNotify, &ev))
1629 ; 1664 ;
1630 1665
1631 XQueryPointer (dpy, scrollBar.win, 1666 XQueryPointer (dpy, scrollBar.win,
1632 &unused_root, &unused_child, 1667 &unused_root, &unused_child,
1633 &unused_root_x, &unused_root_y, 1668 &unused_root_x, &unused_root_y,
1634 &ev.xbutton.x, &ev.xbutton.y, 1669 &ev.xbutton.x, &ev.xbutton.y,
1635 &unused_mask); 1670 &unused_mask);
1636 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1671 scr_move_to (scrollBar.position (ev.xbutton.y) - csrO,
1637 scrollbar_size ()); 1672 scrollBar.size ());
1638 want_refresh = 1; 1673 want_refresh = 1;
1639 scrollbar_show (1); 1674 scrollBar.show (1);
1640 } 1675 }
1641 break; 1676 break;
1642 } 1677 }
1643 1678
1644#if defined(CURSOR_BLINK) 1679#if defined(CURSOR_BLINK)
… …
1665 1700
1666 if (ev.type == KeyPress && hidden_pointer == 0) 1701 if (ev.type == KeyPress && hidden_pointer == 0)
1667 pointer_blank (); 1702 pointer_blank ();
1668 } 1703 }
1669#endif 1704#endif
1705
1706 refresh_check ();
1670} 1707}
1708
1709#if ENABLE_FRILLS
1710void
1711rxvt_term::set_urgency (bool enable)
1712{
1713 if (enable == urgency_hint)
1714 return;
1715
1716 if (XWMHints *h = XGetWMHints (dpy, parent))
1717 {
1718 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0);
1719 XSetWMHints (dpy, parent, h);
1720 urgency_hint = enable;
1721 XFree (h);
1722 }
1723}
1724#endif
1671 1725
1672void 1726void
1673rxvt_term::focus_in () 1727rxvt_term::focus_in ()
1674{ 1728{
1675 if (!focus) 1729 if (!focus)
1676 { 1730 {
1677 focus = 1; 1731 focus = 1;
1678 want_refresh = 1; 1732 want_refresh = 1;
1679 1733
1680 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1681
1682#if USE_XIM 1734#if USE_XIM
1683 if (Input_Context != NULL) 1735 if (Input_Context != NULL)
1684 { 1736 {
1685 IMSetPosition (); 1737 im_set_position ();
1686 XSetICFocus (Input_Context); 1738 XSetICFocus (Input_Context);
1687 } 1739 }
1688#endif 1740#endif
1689#if CURSOR_BLINK 1741#if CURSOR_BLINK
1690 if (option (Opt_cursorBlink)) 1742 if (option (Opt_cursorBlink))
… …
1697 scr_recolour (); 1749 scr_recolour ();
1698 } 1750 }
1699#endif 1751#endif
1700#if ENABLE_FRILLS 1752#if ENABLE_FRILLS
1701 if (option (Opt_urgentOnBell)) 1753 if (option (Opt_urgentOnBell))
1702 { 1754 set_urgency (0);
1703 if (XWMHints *h = XGetWMHints(dpy, parent[0]))
1704 {
1705 h->flags &= ~XUrgencyHint;
1706 XSetWMHints (dpy, parent[0], h);
1707 }
1708 }
1709#endif 1755#endif
1756
1757 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1710 } 1758 }
1711} 1759}
1712 1760
1713void 1761void
1714rxvt_term::focus_out () 1762rxvt_term::focus_out ()
… …
1716 if (focus) 1764 if (focus)
1717 { 1765 {
1718 focus = 0; 1766 focus = 0;
1719 want_refresh = 1; 1767 want_refresh = 1;
1720 1768
1721 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1769#if ENABLE_FRILLS
1722 1770 if (option (Opt_urgentOnBell))
1771 set_urgency (0);
1772#endif
1723#if ENABLE_FRILLS || ISO_14755 1773#if ENABLE_FRILLS || ISO_14755
1724 if (iso14755buf) 1774 if (iso14755buf)
1725 { 1775 {
1726 iso14755buf = 0; 1776 iso14755buf = 0;
1727# if ISO_14755 1777# if ISO_14755
… …
1744 { 1794 {
1745 pix_colors = pix_colors_unfocused; 1795 pix_colors = pix_colors_unfocused;
1746 scr_recolour (); 1796 scr_recolour ();
1747 } 1797 }
1748#endif 1798#endif
1799
1800 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1749 } 1801 }
1750} 1802}
1751 1803
1752void 1804void
1753rxvt_term::update_fade_color (unsigned int idx) 1805rxvt_term::update_fade_color (unsigned int idx)
… …
1781 * use the property to determine the pixmap. We use it later on. 1833 * use the property to determine the pixmap. We use it later on.
1782 */ 1834 */
1783 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID] 1835 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1784 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID]) 1836 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1785 { 1837 {
1786 bgPixmap.set_root_pixmap (); 1838 bg_set_root_pixmap ();
1787 update_background (); 1839 update_background ();
1788 } 1840 }
1841
1789 break; 1842 break;
1790 } 1843 }
1791# endif 1844# endif
1845
1846 refresh_check ();
1792} 1847}
1793#endif 1848#endif
1794 1849
1795void 1850void
1796rxvt_term::button_press (XButtonEvent &ev) 1851rxvt_term::button_press (XButtonEvent &ev)
… …
1827 /* save the xbutton state (for ButtonRelease) */ 1882 /* save the xbutton state (for ButtonRelease) */
1828 MEvent.state = ev.state; 1883 MEvent.state = ev.state;
1829#ifdef MOUSE_REPORT_DOUBLECLICK 1884#ifdef MOUSE_REPORT_DOUBLECLICK
1830 if (ev.button == MEvent.button && clickintime) 1885 if (ev.button == MEvent.button && clickintime)
1831 { 1886 {
1832 /* same button, within alloted time */ 1887 /* same button, within allowed time */
1833 MEvent.clicks++; 1888 MEvent.clicks++;
1834 1889
1835 if (MEvent.clicks > 1) 1890 if (MEvent.clicks > 1)
1836 { 1891 {
1837 /* only report double clicks */ 1892 /* only report double clicks */
… …
1909 } 1964 }
1910 1965
1911 /* 1966 /*
1912 * Scrollbar window processing of button press 1967 * Scrollbar window processing of button press
1913 */ 1968 */
1914 if (isScrollbarWindow (ev.window)) 1969 if (scrollBar.state && ev.window == scrollBar.win)
1915 { 1970 {
1916 scrollBar.setIdle (); 1971 page_dirn direction = NO_DIR;
1972
1973 if (scrollBar.upButton (ev.y))
1974 direction = UP; /* up */
1975 else if (scrollBar.dnButton (ev.y))
1976 direction = DN; /* down */
1977
1978 scrollBar.state = SB_STATE_IDLE;
1917 /* 1979 /*
1918 * Rxvt-style scrollbar: 1980 * Rxvt-style scrollbar:
1919 * move up if mouse is above slider 1981 * move up if mouse is above slider
1920 * move dn if mouse is below slider 1982 * move dn if mouse is below slider
1921 * 1983 *
… …
1930 /* 1992 /*
1931 * Mouse report disabled scrollbar: 1993 * Mouse report disabled scrollbar:
1932 * arrow buttons - send up/down 1994 * arrow buttons - send up/down
1933 * click on scrollbar - send pageup/down 1995 * click on scrollbar - send pageup/down
1934 */ 1996 */
1935 if ((scrollBar.style == R_SB_NEXT 1997 if (direction == UP)
1936 && scrollbarnext_upButton (ev.y))
1937 || (scrollBar.style == R_SB_RXVT
1938 && scrollbarrxvt_upButton (ev.y)))
1939 tt_printf ("\033[A"); 1998 tt_printf ("\033[A");
1940 else if ((scrollBar.style == R_SB_NEXT 1999 else if (direction == DN)
1941 && scrollbarnext_dnButton (ev.y))
1942 || (scrollBar.style == R_SB_RXVT
1943 && scrollbarrxvt_dnButton (ev.y)))
1944 tt_printf ("\033[B"); 2000 tt_printf ("\033[B");
1945 else 2001 else
1946 switch (ev.button) 2002 switch (ev.button)
1947 { 2003 {
1948 case Button2: 2004 case Button2:
… …
1956 break; 2012 break;
1957 } 2013 }
1958 } 2014 }
1959 else 2015 else
1960#endif /* NO_SCROLLBAR_REPORT */ 2016#endif /* NO_SCROLLBAR_REPORT */
1961
1962 {
1963 char upordown = 0;
1964
1965 if (scrollBar.style == R_SB_NEXT)
1966 { 2017 {
1967 if (scrollbarnext_upButton (ev.y)) 2018 if (direction != NO_DIR)
1968 upordown = -1; /* up */
1969 else if (scrollbarnext_dnButton (ev.y))
1970 upordown = 1; /* down */
1971 }
1972 else if (scrollBar.style == R_SB_RXVT)
1973 {
1974 if (scrollbarrxvt_upButton (ev.y))
1975 upordown = -1; /* up */
1976 else if (scrollbarrxvt_dnButton (ev.y))
1977 upordown = 1; /* down */
1978 }
1979
1980 if (upordown)
1981 { 2019 {
1982#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 2020#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1983 if (!cont_scroll_ev.is_active ()) 2021 if (!cont_scroll_ev.is_active ())
1984 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY); 2022 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1985#endif 2023#endif
1986 if (scr_page (upordown < 0 ? UP : DN, 1)) 2024 if (scr_page (direction, 1))
1987 { 2025 {
1988 if (upordown < 0) 2026 if (direction == UP)
1989 scrollBar.setUp (); 2027 scrollBar.state = SB_STATE_UP;
1990 else 2028 else
1991 scrollBar.setDn (); 2029 scrollBar.state = SB_STATE_DOWN;
1992 } 2030 }
1993 } 2031 }
1994 else 2032 else
1995 switch (ev.button) 2033 switch (ev.button)
1996 { 2034 {
1997 case Button2: 2035 case Button2:
1998 switch (scrollbar_align) 2036 switch (scrollBar.align)
1999 { 2037 {
2000 case R_SB_ALIGN_TOP: 2038 case SB_ALIGN_TOP:
2001 csrO = 0; 2039 csrO = 0;
2002 break; 2040 break;
2003 case R_SB_ALIGN_CENTRE: 2041 case SB_ALIGN_CENTRE:
2004 csrO = (scrollBar.bot - scrollBar.top) / 2; 2042 csrO = (scrollBar.bot - scrollBar.top) / 2;
2005 break; 2043 break;
2006 case R_SB_ALIGN_BOTTOM: 2044 case SB_ALIGN_BOTTOM:
2007 csrO = scrollBar.bot - scrollBar.top; 2045 csrO = scrollBar.bot - scrollBar.top;
2008 break; 2046 break;
2009 } 2047 }
2010 2048
2011 if (scrollBar.style == R_SB_XTERM 2049 if (scrollBar.style == SB_STYLE_XTERM
2012 || scrollbar_above_slider (ev.y) 2050 || scrollBar.above_slider (ev.y)
2013 || scrollbar_below_slider (ev.y)) 2051 || scrollBar.below_slider (ev.y))
2014 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ()); 2052 scr_move_to (scrollBar.position (ev.y) - csrO, scrollBar.size ());
2015 2053
2016 scrollBar.setMotion (); 2054 scrollBar.state = SB_STATE_MOTION;
2017 break; 2055 break;
2018 2056
2019 case Button1: 2057 case Button1:
2020 if (scrollbar_align == R_SB_ALIGN_CENTRE) 2058 if (scrollBar.align == SB_ALIGN_CENTRE)
2021 csrO = ev.y - scrollBar.top; 2059 csrO = ev.y - scrollBar.top;
2022 /* FALLTHROUGH */ 2060 /* FALLTHROUGH */
2023 2061
2024 case Button3: 2062 case Button3:
2025 if (scrollBar.style != R_SB_XTERM) 2063 if (scrollBar.style != SB_STYLE_XTERM)
2026 { 2064 {
2027 if (scrollbar_above_slider (ev.y)) 2065 if (scrollBar.above_slider (ev.y))
2028# ifdef RXVT_SCROLL_FULL 2066# ifdef RXVT_SCROLL_FULL
2029 scr_page (UP, nrow - 1); 2067 scr_page (UP, nrow - 1);
2030# else 2068# else
2031 scr_page (UP, nrow / 4); 2069 scr_page (UP, nrow / 4);
2032# endif 2070# endif
2033 else if (scrollbar_below_slider (ev.y)) 2071 else if (scrollBar.below_slider (ev.y))
2034# ifdef RXVT_SCROLL_FULL 2072# ifdef RXVT_SCROLL_FULL
2035 scr_page (DN, nrow - 1); 2073 scr_page (DN, nrow - 1);
2036# else 2074# else
2037 scr_page (DN, nrow / 4); 2075 scr_page (DN, nrow / 4);
2038# endif 2076# endif
2039 else 2077 else
2040 scrollBar.setMotion (); 2078 scrollBar.state = SB_STATE_MOTION;
2041 } 2079 }
2042 else 2080 else
2043 { 2081 {
2044 scr_page ((ev.button == Button1 ? DN : UP), 2082 scr_page ((ev.button == Button1 ? DN : UP),
2045 (nrow 2083 (nrow
2046 * scrollbar_position (ev.y) 2084 * scrollBar.position (ev.y)
2047 / scrollbar_size ())); 2085 / scrollBar.size ()));
2048 } 2086 }
2049 2087
2050 break; 2088 break;
2051 } 2089 }
2052 } 2090 }
… …
2062 2100
2063 csrO = 0; /* reset csr Offset */ 2101 csrO = 0; /* reset csr Offset */
2064 if (!bypass_keystate) 2102 if (!bypass_keystate)
2065 reportmode = !! (priv_modes & PrivMode_mouse_report); 2103 reportmode = !! (priv_modes & PrivMode_mouse_report);
2066 2104
2067 if (scrollbar_isUpDn ()) 2105 if (scrollBar.state == SB_STATE_UP || scrollBar.state == SB_STATE_DOWN)
2068 { 2106 {
2069 scrollBar.setIdle (); 2107 scrollBar.state = SB_STATE_IDLE;
2070 scrollbar_show (0); 2108 scrollBar.show (0);
2071 } 2109 }
2072 2110
2073#ifdef SELECTION_SCROLLING 2111#ifdef SELECTION_SCROLLING
2074 sel_scroll_ev.stop(); 2112 sel_scroll_ev.stop();
2075#endif 2113#endif
… …
2125 selection_make (ev.time); 2163 selection_make (ev.time);
2126 break; 2164 break;
2127 2165
2128 case Button2: 2166 case Button2:
2129 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window? 2167 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2130 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary); 2168 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2131 break; 2169 break;
2132 2170
2133#ifdef MOUSE_WHEEL 2171#ifdef MOUSE_WHEEL
2134 case Button4: 2172 case Button4:
2135 case Button5: 2173 case Button5:
… …
2155 2193
2156 if (!slip_wheel_ev.is_active ()) 2194 if (!slip_wheel_ev.is_active ())
2157 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY); 2195 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2158 } 2196 }
2159 else 2197 else
2198# endif
2160 { 2199 {
2161# endif
2162 scr_page (v, i); 2200 scr_page (v, i);
2163 scrollbar_show (1); 2201 scrollBar.show (1);
2164# ifdef MOUSE_SLIP_WHEELING
2165 } 2202 }
2166# endif
2167 } 2203 }
2168 break; 2204 break;
2169#endif 2205#endif
2170 } 2206 }
2171 } 2207 }
2172} 2208}
2173 2209
2174/*}}} */ 2210/*}}} */
2175 2211
2176bool 2212void
2177rxvt_term::cmd_parse () 2213rxvt_term::cmd_parse ()
2178{ 2214{
2179 bool flag = false;
2180 wchar_t ch = NOCHAR; 2215 wchar_t ch = NOCHAR;
2181 char *seq_begin; // remember start of esc-sequence here 2216 char *seq_begin; // remember start of esc-sequence here
2182 2217
2183 for (;;) 2218 for (;;)
2184 { 2219 {
2185 if (ch == NOCHAR) 2220 if (ecb_unlikely (ch == NOCHAR))
2186 { 2221 {
2187 seq_begin = cmdbuf_ptr; 2222 seq_begin = cmdbuf_ptr;
2188 ch = next_char (); 2223 ch = next_char ();
2189 2224
2190 if (ch == NOCHAR) 2225 if (ch == NOCHAR)
2191 break; 2226 break;
2192 } 2227 }
2193 2228
2194 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2229 if (ecb_likely (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT))
2195 { 2230 {
2196 if (!seen_input) 2231 if (ecb_unlikely (!seen_input))
2197 { 2232 {
2198 seen_input = 1; 2233 seen_input = 1;
2199 // many badly-written programs (e.g. jed) contain a race condition: 2234 // many badly-written programs (e.g. jed) contain a race condition:
2200 // they first read the screensize and then install a SIGWINCH handler. 2235 // they first read the screensize and then install a SIGWINCH handler.
2201 // some window managers resize the window early, and these programs 2236 // some window managers resize the window early, and these programs
… …
2214 wchar_t *str = buf; 2249 wchar_t *str = buf;
2215 wchar_t *eol = str + min (ncol, UBUFSIZ); 2250 wchar_t *eol = str + min (ncol, UBUFSIZ);
2216 2251
2217 for (;;) 2252 for (;;)
2218 { 2253 {
2219 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2254 if (ecb_unlikely (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)))
2220 break; 2255 break;
2221 2256
2222 *str++ = ch; 2257 *str++ = ch;
2223 2258
2224 if (ch == C0_LF || str >= eol) 2259 if (ecb_unlikely (ch == C0_LF || str >= eol))
2225 { 2260 {
2226 if (ch == C0_LF) 2261 if (ch == C0_LF)
2227 nlines++; 2262 nlines++;
2228 2263
2229 refresh_count++; 2264 refresh_count++;
… …
2278 * What the heck we'll cheat and only refresh less than every page-full. 2313 * What the heck we'll cheat and only refresh less than every page-full.
2279 * if skipScroll is enabled. 2314 * if skipScroll is enabled.
2280 */ 2315 */
2281 if (refreshnow) 2316 if (refreshnow)
2282 { 2317 {
2283 flag = true;
2284 scr_refresh (); 2318 scr_refresh ();
2285 want_refresh = 1; 2319 want_refresh = 1;
2286 } 2320 }
2287
2288 } 2321 }
2289 else 2322 else
2290 { 2323 {
2291 try 2324 try
2292 { 2325 {
… …
2300 } 2333 }
2301 2334
2302 ch = NOCHAR; 2335 ch = NOCHAR;
2303 } 2336 }
2304 } 2337 }
2305
2306 return flag;
2307} 2338}
2308 2339
2309// read the next character 2340// read the next character
2310wchar_t 2341wchar_t
2311rxvt_term::next_char () NOTHROW 2342rxvt_term::next_char () NOTHROW
2312{ 2343{
2313 while (cmdbuf_ptr < cmdbuf_endp) 2344 while (cmdbuf_ptr < cmdbuf_endp)
2314 { 2345 {
2315 // assume 7-bit to be ascii ALWAYS 2346 // assume 7-bit to be ascii ALWAYS
2316 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2347 if (ecb_likely ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b))
2317 return *cmdbuf_ptr++; 2348 return *cmdbuf_ptr++;
2318 2349
2319 wchar_t wc; 2350 wchar_t wc;
2320 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2351 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2321 2352
… …
2325 cmdbuf_ptr = cmdbuf_endp; 2356 cmdbuf_ptr = cmdbuf_endp;
2326 break; 2357 break;
2327 } 2358 }
2328 2359
2329 if (len == (size_t)-1) 2360 if (len == (size_t)-1)
2361 {
2362 mbstate.reset (); // reset now undefined conversion state
2330 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2363 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2364 }
2331 2365
2332 // assume wchar == unicode 2366 // assume wchar == unicode
2333 cmdbuf_ptr += len; 2367 cmdbuf_ptr += len;
2334 return wc & UNICODE_MASK; 2368 return wc & UNICODE_MASK;
2335 } 2369 }
… …
2346 : NOCHAR; 2380 : NOCHAR;
2347} 2381}
2348 2382
2349static class out_of_input out_of_input; 2383static class out_of_input out_of_input;
2350 2384
2351/* rxvt_cmd_getc () - Return next input character */
2352/*
2353 * Return the next input character after first passing any keyboard input
2354 * to the command.
2355 */
2356wchar_t 2385wchar_t
2357rxvt_term::cmd_getc () THROW ((class out_of_input)) 2386rxvt_term::cmd_getc () THROW ((class out_of_input))
2358{ 2387{
2359 wchar_t c = next_char (); 2388 wchar_t c = next_char ();
2360 2389
… …
2379/*----------------------------------------------------------------------*/ 2408/*----------------------------------------------------------------------*/
2380#ifdef PRINTPIPE 2409#ifdef PRINTPIPE
2381FILE * 2410FILE *
2382rxvt_term::popen_printer () 2411rxvt_term::popen_printer ()
2383{ 2412{
2384 FILE *stream = popen (rs[Rs_print_pipe], "w"); 2413 FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");
2385 2414
2386 if (stream == NULL) 2415 if (stream == NULL)
2387 rxvt_warn ("can't open printer pipe, not printing.\n"); 2416 rxvt_warn ("can't open printer pipe, not printing.\n");
2388 2417
2389 return stream; 2418 return stream;
… …
2400 * simulate attached vt100 printer 2429 * simulate attached vt100 printer
2401 */ 2430 */
2402void 2431void
2403rxvt_term::process_print_pipe () 2432rxvt_term::process_print_pipe ()
2404{ 2433{
2405 int done; 2434 FILE *fd = popen_printer ();
2406 FILE *fd;
2407 2435
2408 if ((fd = popen_printer ()) == NULL) 2436 if (!fd)
2409 return; 2437 return;
2410 2438
2411 /* 2439 /*
2412 * Send all input to the printer until either ESC[4i or ESC[?4i 2440 * Send all input to the printer until either ESC[4i or ESC[?4i
2413 * is received. 2441 * is received.
2414 */ 2442 */
2415 for (done = 0; !done;) 2443 for (int done = 0; !done; )
2416 { 2444 {
2417 unsigned char buf[8]; 2445 unsigned char buf[8];
2418 unicode_t ch; 2446 unicode_t ch;
2419 unsigned int i, len; 2447 unsigned int i, len;
2420 2448
… …
2454 pclose_printer (fd); 2482 pclose_printer (fd);
2455} 2483}
2456#endif /* PRINTPIPE */ 2484#endif /* PRINTPIPE */
2457/*}}} */ 2485/*}}} */
2458 2486
2459/* *INDENT-OFF* */
2460enum { 2487enum {
2461 C1_40 = 0x40, 2488 C1_40 = 0x40,
2462 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA, 2489 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA,
2463 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3, 2490 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3,
2464 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA, 2491 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA,
2465 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC, 2492 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC,
2466}; 2493};
2467/* *INDENT-ON* */
2468 2494
2469/*{{{ process non-printing single characters */ 2495/*{{{ process non-printing single characters */
2470void 2496void
2471rxvt_term::process_nonprinting (unicode_t ch) 2497rxvt_term::process_nonprinting (unicode_t ch)
2472{ 2498{
… …
2565 break; 2591 break;
2566 case 'Z': /* identify the terminal type */ 2592 case 'Z': /* identify the terminal type */
2567 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */ 2593 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
2568 break; 2594 break;
2569 case '<': /* turn off VT52 mode */ 2595 case '<': /* turn off VT52 mode */
2570 PrivMode (0, PrivMode_vt52); 2596 priv_modes &= ~PrivMode_vt52;
2571 break; 2597 break;
2572 case 'F': /* use special graphics character set */ 2598 case 'F': /* use special graphics character set */
2573 case 'G': /* use regular character set */ 2599 case 'G': /* use regular character set */
2574 /* unimplemented */ 2600 /* unimplemented */
2575 break; 2601 break;
… …
2594 return; 2620 return;
2595 } 2621 }
2596 2622
2597 switch (ch) 2623 switch (ch)
2598 { 2624 {
2599 /* case 1: do_tek_mode (); break; */
2600 case '#': 2625 case '#':
2601 if (cmd_getc () == '8') 2626 if (cmd_getc () == '8')
2602 scr_E (); 2627 scr_E ();
2603 break; 2628 break;
2604 case '(': 2629 case '(':
… …
2627#if !ENABLE_MINIMAL 2652#if !ENABLE_MINIMAL
2628 case '9': 2653 case '9':
2629 scr_forwardindex (); 2654 scr_forwardindex ();
2630 break; 2655 break;
2631#endif 2656#endif
2657 // DECPAM/DECPNM
2632 case '=': 2658 case '=':
2659 priv_modes |= PrivMode_aplKP;
2660 break;
2633 case '>': 2661 case '>':
2634 PrivMode ((ch == '='), PrivMode_aplKP); 2662 priv_modes &= ~PrivMode_aplKP;
2635 break; 2663 break;
2636 2664
2637 case C1_40: 2665 case C1_40:
2638 cmd_getc (); 2666 cmd_getc ();
2639 break; 2667 break;
… …
2643 2671
2644 /* 8.3.87: NEXT LINE */ 2672 /* 8.3.87: NEXT LINE */
2645 case C1_NEL: /* ESC E */ 2673 case C1_NEL: /* ESC E */
2646 { 2674 {
2647 wchar_t nlcr[] = { C0_LF, C0_CR }; 2675 wchar_t nlcr[] = { C0_LF, C0_CR };
2648 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1); 2676 scr_add_lines (nlcr, ecb_array_length (nlcr), 1);
2649 } 2677 }
2650 break; 2678 break;
2651 2679
2652 /* kidnapped escape sequence: Should be 8.3.48 */ 2680 /* kidnapped escape sequence: Should be 8.3.48 */
2653 case C1_ESA: /* ESC G */ 2681 case C1_ESA: /* ESC G */
2654 process_graphics (); 2682 // used by original rxvt for rob nations own graphics mode
2683 if (cmd_getc () == 'Q')
2684 tt_printf ("\033G0\012"); /* query graphics - no graphics */
2655 break; 2685 break;
2656 2686
2657 /* 8.3.63: CHARACTER TABULATION SET */ 2687 /* 8.3.63: CHARACTER TABULATION SET */
2658 case C1_HTS: /* ESC H */ 2688 case C1_HTS: /* ESC H */
2659 scr_set_tab (1); 2689 scr_set_tab (1);
… …
2663 case C1_RI: /* ESC M */ 2693 case C1_RI: /* ESC M */
2664 scr_index (DN); 2694 scr_index (DN);
2665 break; 2695 break;
2666 2696
2667 /* 8.3.142: SINGLE-SHIFT TWO */ 2697 /* 8.3.142: SINGLE-SHIFT TWO */
2668 /*case C1_SS2: scr_single_shift (2); break; */ 2698 /* case C1_SS2: break; */
2669 2699
2670 /* 8.3.143: SINGLE-SHIFT THREE */ 2700 /* 8.3.143: SINGLE-SHIFT THREE */
2671 /*case C1_SS3: scr_single_shift (3); break; */ 2701 /* case C1_SS3: break; */
2672 2702
2673 /* 8.3.27: DEVICE CONTROL STRING */ 2703 /* 8.3.27: DEVICE CONTROL STRING */
2674 case C1_DCS: /* ESC P */ 2704 case C1_DCS: /* ESC P */
2675 process_dcs_seq (); 2705 process_dcs_seq ();
2676 break; 2706 break;
… …
2678 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2708 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
2679 case C1_SCI: /* ESC Z */ 2709 case C1_SCI: /* ESC Z */
2680 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1); 2710 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
2681 break; /* steal obsolete ESC [ c */ 2711 break; /* steal obsolete ESC [ c */
2682 2712
2683 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2713 /* 8.3.16: CONTROL SEQUENCE INTRODUCER (CSI) */
2684 case C1_CSI: /* ESC [ */ 2714 case C1_CSI: /* ESC [ */
2685 process_csi_seq (); 2715 process_csi_seq ();
2686 break; 2716 break;
2687 2717
2688 /* 8.3.90: OPERATING SYSTEM COMMAND */ 2718 /* 8.3.90: OPERATING SYSTEM COMMAND (OSC) */
2689 case C1_OSC: /* ESC ] */ 2719 case C1_OSC: /* ESC ] */
2690 process_osc_seq (); 2720 process_osc_seq ();
2691 break; 2721 break;
2692 2722
2693 /* 8.3.106: RESET TO INITIAL STATE */ 2723 /* 8.3.106: RESET TO INITIAL STATE (RIS) */
2694 case 'c': 2724 case 'c':
2695 mbstate.reset (); 2725 mbstate.reset ();
2696 scr_poweron (); 2726 scr_poweron ();
2697 scrollbar_show (1); 2727 scrollBar.show (1);
2698 break; 2728 break;
2699 2729
2700 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */ 2730 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
2701 case 'n': 2731 case 'n':
2702 scr_charset_choose (2); 2732 scr_charset_choose (2);
… …
2709 } 2739 }
2710} 2740}
2711/*}}} */ 2741/*}}} */
2712 2742
2713/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */ 2743/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */
2714/* *INDENT-OFF* */
2715enum { 2744enum {
2716 CSI_ICH = 0x40, 2745 CSI_ICH = 0x40,
2717 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA, 2746 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA,
2718 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA , 2747 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA ,
2719 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC, 2748 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC,
… …
2722 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ, 2751 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ,
2723 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 , 2752 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 ,
2724 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F 2753 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F
2725}; 2754};
2726 2755
2727#define make_byte(b7,b6,b5,b4,b3,b2,b1,b0) \ 2756#define make_byte(b0,b1,b2,b3,b4,b5,b6,b7) \
2728 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \ 2757 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \
2729 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0)) 2758 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0))
2730#define get_byte_array_bit(array, bit) \ 2759#define get_byte_array_bit(array, bit) \
2731 (!! ((array)[ (bit) / 8] & (128 >> ((bit) & 7)))) 2760 (!! ((array)[(bit) >> 3] & (1 << ((bit) & 7))))
2732 2761
2733const unsigned char csi_defaults[] = 2762static const unsigned char csi_defaults[] =
2734 { 2763 {
2735 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */ 2764 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */
2736 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */ 2765 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */
2737 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */ 2766 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */
2738 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */ 2767 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */
2739 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */ 2768 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */
2740 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */ 2769 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */
2741 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */ 2770 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */
2742 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */ 2771 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */
2743 }; 2772 };
2744/* *INDENT-ON* */
2745 2773
2746void 2774void
2747rxvt_term::process_csi_seq () 2775rxvt_term::process_csi_seq ()
2748{ 2776{
2749 unicode_t ch, priv, i; 2777 unicode_t ch, priv, i;
… …
2753 2781
2754 nargs = 0; 2782 nargs = 0;
2755 2783
2756 priv = 0; 2784 priv = 0;
2757 ch = cmd_getc (); 2785 ch = cmd_getc ();
2758 if (ch >= '<' && ch <= '?') 2786 if ((ch >= '<' && ch <= '?') || ch == '!')
2759 { 2787 {
2760 /* '<' '=' '>' '?' */ 2788 /* '<' '=' '>' '?' '!' */
2761 priv = ch; 2789 priv = ch;
2762 ch = cmd_getc (); 2790 ch = cmd_getc ();
2763 } 2791 }
2764 2792
2765 /* read any numerical arguments */ 2793 /* read any numerical arguments */
… …
2814 // versions. 2842 // versions.
2815 // 2843 //
2816 tt_printf ("\033[>%d;95;0c", 'U'); 2844 tt_printf ("\033[>%d;95;0c", 'U');
2817 } 2845 }
2818 break; 2846 break;
2847
2819 case '?': 2848 case '?':
2820 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2849 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2821 process_terminal_mode (ch, priv, nargs, arg); 2850 process_terminal_mode (ch, priv, nargs, arg);
2822 break; 2851 break;
2852
2853 case '!':
2854 if (ch == CSI_70)
2855 {
2856 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */
2857 scr_soft_reset ();
2858
2859 static const int pm_h[] = { 7, 25 };
2860 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1005, 1015, 1049 };
2861
2862 process_terminal_mode ('h', 0, ecb_array_length (pm_h), pm_h);
2863 process_terminal_mode ('l', 0, ecb_array_length (pm_l), pm_l);
2823 } 2864 }
2865 break;
2866 }
2867
2824 return; 2868 return;
2825 } 2869 }
2826 2870
2827 switch (ch) 2871 switch (ch)
2828 { 2872 {
… …
2842 } 2886 }
2843 break; 2887 break;
2844#endif 2888#endif
2845 2889
2846 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */ 2890 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */
2847 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */ 2891 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */
2848 arg[0] = -arg[0]; 2892 arg[0] = -arg[0];
2849 /* FALLTHROUGH */ 2893 /* FALLTHROUGH */
2850 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */ 2894 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */
2851 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */ 2895 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */
2852 scr_gotorc (arg[0], 0, RELATIVE); 2896 scr_gotorc (arg[0], 0, RELATIVE);
2853 break; 2897 break;
2854 2898
2855 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */ 2899 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */
2856 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */ 2900 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */
… …
3043 } 3087 }
3044} 3088}
3045/*}}} */ 3089/*}}} */
3046 3090
3047#if !ENABLE_MINIMAL 3091#if !ENABLE_MINIMAL
3048/* ARGSUSED */
3049void 3092void
3050rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3093rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3051{ 3094{
3052 int x, y; 3095 int x, y;
3053 XWindowAttributes wattr; 3096 XWindowAttributes wattr;
… …
3062 { 3105 {
3063 /* 3106 /*
3064 * commands 3107 * commands
3065 */ 3108 */
3066 case 1: /* deiconify window */ 3109 case 1: /* deiconify window */
3067 XMapWindow (dpy, parent[0]); 3110 XMapWindow (dpy, parent);
3068 break; 3111 break;
3069 case 2: /* iconify window */ 3112 case 2: /* iconify window */
3070 XIconifyWindow (dpy, parent[0], display->screen); 3113 XIconifyWindow (dpy, parent, display->screen);
3071 break; 3114 break;
3072 case 3: /* set position (pixels) */ 3115 case 3: /* set position (pixels) */
3073 XMoveWindow (dpy, parent[0], args[1], args[2]); 3116 XMoveWindow (dpy, parent, args[1], args[2]);
3074 break; 3117 break;
3075 case 4: /* set size (pixels) */ 3118 case 4: /* set size (pixels) */
3076 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3119 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3077 break; 3120 break;
3078 case 5: /* raise window */ 3121 case 5: /* raise window */
3079 XRaiseWindow (dpy, parent[0]); 3122 XRaiseWindow (dpy, parent);
3080 break; 3123 break;
3081 case 6: /* lower window */ 3124 case 6: /* lower window */
3082 XLowerWindow (dpy, parent[0]); 3125 XLowerWindow (dpy, parent);
3083 break; 3126 break;
3084 case 7: /* refresh window */ 3127 case 7: /* refresh window */
3085 scr_touch (true); 3128 scr_touch (true);
3086 break; 3129 break;
3087 case 8: /* set size (chars) */ 3130 case 8: /* set size (chars) */
… …
3098 3141
3099 /* 3142 /*
3100 * reports - some output format copied from XTerm 3143 * reports - some output format copied from XTerm
3101 */ 3144 */
3102 case 11: /* report window state */ 3145 case 11: /* report window state */
3103 XGetWindowAttributes (dpy, parent[0], &wattr); 3146 XGetWindowAttributes (dpy, parent, &wattr);
3104 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3147 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3105 break; 3148 break;
3106 case 13: /* report window position */ 3149 case 13: /* report window position */
3107 XGetWindowAttributes (dpy, parent[0], &wattr); 3150 XGetWindowAttributes (dpy, parent, &wattr);
3108 XTranslateCoordinates (dpy, parent[0], wattr.root, 3151 XTranslateCoordinates (dpy, parent, wattr.root,
3109 -wattr.border_width, -wattr.border_width, 3152 -wattr.border_width, -wattr.border_width,
3110 &x, &y, &wdummy); 3153 &x, &y, &wdummy);
3111 tt_printf ("\033[3;%d;%dt", x, y); 3154 tt_printf ("\033[3;%d;%dt", x, y);
3112 break; 3155 break;
3113 case 14: /* report window size (pixels) */ 3156 case 14: /* report window size (pixels) */
3114 XGetWindowAttributes (dpy, parent[0], &wattr); 3157 XGetWindowAttributes (dpy, parent, &wattr);
3115 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3158 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3116 break; 3159 break;
3117 case 18: /* report text area size (chars) */ 3160 case 18: /* report text area size (chars) */
3118 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3161 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3119 break; 3162 break;
… …
3121 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3164 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3122 break; 3165 break;
3123 case 20: /* report icon label */ 3166 case 20: /* report icon label */
3124 { 3167 {
3125 char *s; 3168 char *s;
3126 XGetIconName (dpy, parent[0], &s); 3169 XGetIconName (dpy, parent, &s);
3127 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3170 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3128 XFree (s); 3171 XFree (s);
3129 } 3172 }
3130 break; 3173 break;
3131 case 21: /* report window title */ 3174 case 21: /* report window title */
3132 { 3175 {
3133 char *s; 3176 char *s;
3134 XFetchName (dpy, parent[0], &s); 3177 XFetchName (dpy, parent, &s);
3135 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3178 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3136 XFree (s); 3179 XFree (s);
3137 } 3180 }
3138 break; 3181 break;
3139 } 3182 }
… …
3195 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3238 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3196 */ 3239 */
3197void 3240void
3198rxvt_term::process_dcs_seq () 3241rxvt_term::process_dcs_seq ()
3199{ 3242{
3200 char *s;
3201 unicode_t eh;
3202
3203 /* 3243 /*
3204 * Not handled yet 3244 * Not handled yet
3205 */ 3245 */
3246
3247 unicode_t eh;
3206 s = get_to_st (eh); 3248 char *s = get_to_st (eh);
3207 if (s) 3249 if (s)
3208 free (s); 3250 free (s);
3209 3251
3210 return; 3252 return;
3211} 3253}
… …
3215 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)' 3257 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)'
3216 */ 3258 */
3217void 3259void
3218rxvt_term::process_osc_seq () 3260rxvt_term::process_osc_seq ()
3219{ 3261{
3220 unicode_t ch, eh;
3221 int arg; 3262 int arg;
3222 3263
3223 ch = cmd_getc (); 3264 unicode_t ch = cmd_getc ();
3224 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3265 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3225 arg = arg * 10 + (ch - '0'); 3266 arg = arg * 10 + (ch - '0');
3226 3267
3227 if (ch == ';') 3268 if (ch == ';')
3228 { 3269 {
3270 unicode_t eh;
3229 char *s = get_to_st (eh); 3271 char *s = get_to_st (eh);
3230 3272
3231 if (s) 3273 if (s)
3232 { 3274 {
3233 process_xterm_seq (arg, s, eh); 3275 process_xterm_seq (arg, s, eh);
… …
3257 3299
3258/* 3300/*
3259 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3301 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3260 */ 3302 */
3261void 3303void
3262rxvt_term::process_xterm_seq (int op, const char *str, char resp) 3304rxvt_term::process_xterm_seq (int op, char *str, char resp)
3263{ 3305{
3264 int color; 3306 int color;
3265 char *buf, *name; 3307 char *buf, *name;
3266 bool query = str[0] == '?' && !str[1]; 3308 bool query = str[0] == '?' && !str[1];
3267 int saveop = op; 3309 int saveop = op;
… …
3294 unsigned long bytes_after; 3336 unsigned long bytes_after;
3295 unsigned char *value = 0; 3337 unsigned char *value = 0;
3296 const char *str = ""; 3338 const char *str = "";
3297 3339
3298 if (prop 3340 if (prop
3299 && XGetWindowProperty (dpy, parent[0], 3341 && XGetWindowProperty (dpy, parent,
3300 prop, 0, 1<<16, 0, AnyPropertyType, 3342 prop, 0, 1<<16, 0, AnyPropertyType,
3301 &actual_type, &actual_format, 3343 &actual_type, &actual_format,
3302 &nitems, &bytes_after, &value) == Success 3344 &nitems, &bytes_after, &value) == Success
3303 && actual_type != None 3345 && actual_type != None
3304 && actual_format == 8) 3346 && actual_format == 8)
… …
3308 3350
3309 XFree (value); 3351 XFree (value);
3310 } 3352 }
3311 else 3353 else
3312 { 3354 {
3313 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3355 char *eq = strchr (str, '=');
3314 3356
3315 if (eq) 3357 if (eq)
3316 { 3358 {
3317 *eq = 0; 3359 *eq = 0;
3318 set_utf8_property (display->atom (str), eq + 1); 3360 set_utf8_property (display->atom (str), eq + 1);
3319 } 3361 }
3320 else 3362 else
3321 XDeleteProperty (dpy, parent[0], 3363 XDeleteProperty (dpy, parent,
3322 display->atom (str)); 3364 display->atom (str));
3323 } 3365 }
3324 break; 3366 break;
3325 3367
3326 case XTerm_Color: 3368 case XTerm_Color:
… …
3339 *buf++ = '\0'; 3381 *buf++ = '\0';
3340 3382
3341 process_color_seq (op, color, name, resp); 3383 process_color_seq (op, color, name, resp);
3342 } 3384 }
3343 break; 3385 break;
3386 case Rxvt_restoreFG:
3344 case XTerm_Color00: 3387 case XTerm_Color00:
3345 process_color_seq (op, Color_fg, str, resp); 3388 process_color_seq (op, Color_fg, str, resp);
3346 break; 3389 break;
3390 case Rxvt_restoreBG:
3347 case XTerm_Color01: 3391 case XTerm_Color01:
3348 process_color_seq (op, Color_bg, str, resp); 3392 process_color_seq (op, Color_bg, str, resp);
3349 break; 3393 break;
3350#ifndef NO_CURSORCOLOR 3394#ifndef NO_CURSORCOLOR
3351 case XTerm_Color_cursor: 3395 case XTerm_Color_cursor:
… …
3356 process_color_seq (op, Color_pointer_fg, str, resp); 3400 process_color_seq (op, Color_pointer_fg, str, resp);
3357 break; 3401 break;
3358 case XTerm_Color_pointer_bg: 3402 case XTerm_Color_pointer_bg:
3359 process_color_seq (op, Color_pointer_bg, str, resp); 3403 process_color_seq (op, Color_pointer_bg, str, resp);
3360 break; 3404 break;
3405#ifdef OPTION_HC
3406 case XTerm_Color_HC:
3407 process_color_seq (op, Color_HC, str, resp);
3408 break;
3409 case XTerm_Color_HTC:
3410 process_color_seq (op, Color_HTC, str, resp);
3411 break;
3412#endif
3361#ifndef NO_BOLD_UNDERLINE_REVERSE 3413#ifndef NO_BOLD_UNDERLINE_REVERSE
3362 case XTerm_Color_RV:
3363 process_color_seq (op, Color_RV, str, resp);
3364 break;
3365 case Rxvt_Color_BD:
3366 case URxvt_Color_BD: 3414 case URxvt_Color_BD:
3367 process_color_seq (op, Color_BD, str, resp); 3415 process_color_seq (op, Color_BD, str, resp);
3368 break; 3416 break;
3369 case Rxvt_Color_UL:
3370 case URxvt_Color_UL: 3417 case URxvt_Color_UL:
3371 process_color_seq (op, Color_UL, str, resp); 3418 process_color_seq (op, Color_UL, str, resp);
3372 break; 3419 break;
3373 case URxvt_Color_IT: 3420 case URxvt_Color_IT:
3374 process_color_seq (op, Color_IT, str, resp); 3421 process_color_seq (op, Color_IT, str, resp);
3375 break; 3422 break;
3376#endif 3423#endif
3424 case URxvt_Color_border:
3425 process_color_seq (op, Color_border, str, resp);
3426 break;
3377#if ENABLE_TRANSPARENCY 3427#if ENABLE_TRANSPARENCY
3378 case URxvt_Color_tint: 3428 case URxvt_Color_tint:
3379 process_color_seq (op, Color_tint, str, resp); 3429 process_color_seq (op, Color_tint, str, resp);
3380 { 3430 {
3381 bool changed = false; 3431 bool changed = false;
3432
3382 if (ISSET_PIXCOLOR (Color_tint)) 3433 if (ISSET_PIXCOLOR (Color_tint))
3383 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]); 3434 changed = bg_set_tint (pix_colors_focused [Color_tint]);
3384 else 3435
3385 changed = bgPixmap.unset_tint ();
3386 if (changed) 3436 if (changed)
3387 update_background (); 3437 update_background ();
3388 } 3438 }
3389 3439
3390 break; 3440 break;
… …
3394 case Rxvt_Pixmap: 3444 case Rxvt_Pixmap:
3395 if (!strcmp (str, "?")) 3445 if (!strcmp (str, "?"))
3396 { 3446 {
3397 char str[256]; 3447 char str[256];
3398 3448
3399 sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */ 3449 sprintf (str, "[%dx%d+%d+%d]",
3400 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767), 3450 min (h_scale, 32767), min (v_scale, 32767),
3401 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767)); 3451 min (h_align, 32767), min (v_align, 32767));
3402 process_xterm_seq (XTerm_title, str, CHAR_ST); 3452 process_xterm_seq (XTerm_title, str, CHAR_ST);
3403 } 3453 }
3404 else 3454 else
3405 { 3455 {
3406 int changed = 0; 3456 bool changed = false;
3407 3457
3408 if (*str != ';') 3458 if (*str != ';')
3409 { 3459 {
3410 /* reset to default scaling :*/
3411 bgPixmap.unset_geometry ();
3412 if (bgPixmap.set_file (str)) /* change pixmap */ 3460 if (bg_set_file (str)) /* change pixmap */
3413 changed++; 3461 changed = true;
3414 str = strchr (str, ';');
3415 if (str == NULL)
3416 bgPixmap.set_defaultGeometry ();
3417 } 3462 }
3418 while (str) 3463 else
3419 { 3464 {
3420 str++; 3465 str++;
3421 if (bgPixmap.set_geometry (str)) 3466 if (bg_set_geometry (str, true))
3422 changed++; 3467 changed = true;
3423 str = strchr (str, ';');
3424 } 3468 }
3469
3425 if (changed) 3470 if (changed)
3471 {
3472 if (bg_window_position_sensitive ())
3473 {
3474 int x, y;
3475 get_window_origin (x, y);
3476 bg_set_position (x, y);
3477 }
3426 update_background (); 3478 update_background ();
3479 }
3427 } 3480 }
3428 break; 3481 break;
3429#endif 3482#endif
3430
3431 case Rxvt_restoreFG:
3432 set_window_color (Color_fg, str);
3433 break;
3434 case Rxvt_restoreBG:
3435 set_window_color (Color_bg, str);
3436 break;
3437 3483
3438 case XTerm_logfile: 3484 case XTerm_logfile:
3439 // TODO, when secure mode? 3485 // TODO, when secure mode?
3440 break; 3486 break;
3441 3487
… …
3508 break; 3554 break;
3509#endif 3555#endif
3510 3556
3511#if ENABLE_PERL 3557#if ENABLE_PERL
3512 case URxvt_perl: 3558 case URxvt_perl:
3513 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END))) 3559 HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_STR_LEN, &resp, 1, DT_END));
3514 ; // no responses yet
3515 break; 3560 break;
3516#endif 3561#endif
3517 } 3562 }
3518} 3563}
3519/*----------------------------------------------------------------------*/ 3564/*----------------------------------------------------------------------*/
… …
3542 { 3587 {
3543 if (mode == 'r') 3588 if (mode == 'r')
3544 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3589 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3545 else 3590 else
3546 state = (mode == 't') ? ! (priv_modes & bit) : mode; 3591 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3547 PrivMode (state, bit); 3592
3593 if (state)
3594 priv_modes |= bit;
3595 else
3596 priv_modes &= ~bit;
3548 } 3597 }
3549 3598
3550 return state; 3599 return state;
3551} 3600}
3552 3601
3553/* we're not using priv _yet_ */ 3602/* we're not using priv _yet_ */
3554void 3603void
3555rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg) 3604rxvt_term::process_terminal_mode (int mode, int priv ecb_unused, unsigned int nargs, const int *arg)
3556{ 3605{
3557 unsigned int i, j; 3606 unsigned int i, j;
3558 int state; 3607 int state;
3559 3608
3560 static const struct 3609 static const struct
3561 { 3610 {
3562 const int argval; 3611 const int argval;
3563 const unsigned long bit; 3612 const unsigned long bit;
3564 } argtopriv[] = { 3613 } argtopriv[] = {
3565 { 1, PrivMode_aplCUR }, 3614 { 1, PrivMode_aplCUR }, // DECCKM
3566 { 2, PrivMode_vt52 }, 3615 { 2, PrivMode_vt52 }, // DECANM
3567 { 3, PrivMode_132 }, 3616 { 3, PrivMode_132 }, // DECCOLM
3568 { 4, PrivMode_smoothScroll }, 3617 { 4, PrivMode_smoothScroll }, // DECSCLM
3569 { 5, PrivMode_rVideo }, 3618 { 5, PrivMode_rVideo }, // DECSCNM
3570 { 6, PrivMode_relOrigin }, 3619 { 6, PrivMode_relOrigin }, // DECOM
3571 { 7, PrivMode_Autowrap }, 3620 { 7, PrivMode_Autowrap }, // DECAWM
3572 // 8, bi-directional support mode 3621 // 8, auto-repeat keys // DECARM
3573 { 9, PrivMode_MouseX10 }, 3622 { 9, PrivMode_MouseX10 },
3574 // 18, 19 printing-related 3623 // 18 end FF to printer after print screen
3624 // 19 Print screen prints full screen/scroll region
3575 { 25, PrivMode_VisibleCursor }, 3625 { 25, PrivMode_VisibleCursor }, // DECTCEM cnorm/cvvis/civis
3576#ifdef scrollBar_esc 3626#ifdef scrollBar_esc
3577 { scrollBar_esc, PrivMode_scrollBar }, 3627 { scrollBar_esc, PrivMode_scrollBar },
3578#endif 3628#endif
3579 { 35, PrivMode_ShiftKeys }, // rxvt extension 3629 { 35, PrivMode_ShiftKeys }, // rxvt extension
3630 // 38, tektronix mode // DECTEK
3580 { 40, PrivMode_132OK }, 3631 { 40, PrivMode_132OK },
3581 // 41 xterm more fixes NYI 3632 // 41 xterm more fixes NYI
3582 // 45 margin bell NYI 3633 // 45 margin bell NYI
3583 // 46 start logging 3634 // 46 start logging
3584 { 47, PrivMode_Screen }, 3635 { 47, PrivMode_Screen },
3585 { 66, PrivMode_aplKP }, 3636 { 66, PrivMode_aplKP }, // DECNKM
3586#ifndef NO_BACKSPACE_KEY 3637#ifndef NO_BACKSPACE_KEY
3587 { 67, PrivMode_BackSpace }, 3638 { 67, PrivMode_BackSpace }, // DECBKM
3588#endif 3639#endif
3589 { 1000, PrivMode_MouseX11 }, 3640 { 1000, PrivMode_MouseX11 },
3590 { 1002, PrivMode_MouseBtnEvent }, 3641 { 1002, PrivMode_MouseBtnEvent },
3591 { 1003, PrivMode_MouseAnyEvent }, 3642 { 1003, PrivMode_MouseAnyEvent },
3643#if ENABLE_FRILLS
3644 { 1005, PrivMode_ExtModeMouse },
3645#endif
3592 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3646 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3593 { 1011, PrivMode_Keypress }, // rxvt extension 3647 { 1011, PrivMode_Keypress }, // rxvt extension
3648#if ENABLE_FRILLS
3649 { 1015, PrivMode_ExtMouseRight }, // urxvt extension of 1005
3650#endif
3594 // 1035 enable modifiers for alt, numlock NYI 3651 // 1035 enable modifiers for alt, numlock NYI
3595 // 1036 send ESC for meta keys NYI 3652 // 1036 send ESC for meta keys NYI
3596 // 1037 send DEL for keypad delete NYI 3653 // 1037 send DEL for keypad delete NYI
3597 { 1047, PrivMode_Screen }, 3654 { 1047, PrivMode_Screen },
3598 // 1048 save and restore cursor 3655 // 1048 save and restore cursor, implemented in code
3599 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */ 3656 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
3600 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3657 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3658 { 2004, PrivMode_BracketPaste },
3601 }; 3659 };
3602 3660
3603 if (nargs == 0) 3661 if (nargs == 0)
3604 return; 3662 return;
3605 3663
… …
3612 for (i = 0; i < nargs; i++) 3670 for (i = 0; i < nargs; i++)
3613 { 3671 {
3614 state = -1; 3672 state = -1;
3615 3673
3616 /* basic handling */ 3674 /* basic handling */
3617 for (j = 0; j < (sizeof (argtopriv)/sizeof (argtopriv[0])); j++) 3675 for (j = 0; j < ecb_array_length (argtopriv); j++)
3618 if (argtopriv[j].argval == arg[i]) 3676 if (argtopriv[j].argval == arg[i])
3619 { 3677 {
3620 state = privcases (mode, argtopriv[j].bit); 3678 state = privcases (mode, argtopriv[j].bit);
3621 break; 3679 break;
3622 } 3680 }
… …
3630 3688
3631 scr_touch (true); 3689 scr_touch (true);
3632 break; 3690 break;
3633#endif 3691#endif
3634 case 1048: /* alternative cursor save */ 3692 case 1048: /* alternative cursor save */
3635 case 1049:
3636 if (option (Opt_secondaryScreen)) 3693 if (option (Opt_secondaryScreen))
3637 if (mode == 0) 3694 if (mode == 0)
3638 scr_cursor (RESTORE); 3695 scr_cursor (RESTORE);
3639 else if (mode == 1) 3696 else if (mode == 1)
3640 scr_cursor (SAVE); 3697 scr_cursor (SAVE);
… …
3649 case 2: /* VT52 mode */ 3706 case 2: /* VT52 mode */
3650 /* oddball mode. should be set regardless of set/reset 3707 /* oddball mode. should be set regardless of set/reset
3651 * parameter. Return from VT52 mode with an ESC < from 3708 * parameter. Return from VT52 mode with an ESC < from
3652 * within VT52 mode 3709 * within VT52 mode
3653 */ 3710 */
3654 PrivMode (1, PrivMode_vt52); 3711 priv_modes |= PrivMode_vt52;
3655 break; 3712 break;
3656 case 3: /* 80/132 */ 3713 case 3: /* 80/132 */
3657 if (priv_modes & PrivMode_132OK) 3714 if (priv_modes & PrivMode_132OK)
3658 set_widthheight (((state ? 132 : 80) * fwidth), height); 3715 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
3659 break; 3716 break;
3660 case 4: /* smooth scrolling */ 3717 case 4: /* smooth scrolling */
3661 set_option (Opt_jumpScroll, !state); 3718 set_option (Opt_jumpScroll, !state);
3662 break; 3719 break;
3663 case 5: /* reverse video */ 3720 case 5: /* reverse video */
… …
3674 if (state) /* orthogonal */ 3731 if (state) /* orthogonal */
3675 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent); 3732 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3676 break; 3733 break;
3677#ifdef scrollBar_esc 3734#ifdef scrollBar_esc
3678 case scrollBar_esc: 3735 case scrollBar_esc:
3679 if (scrollbar_mapping (state)) 3736 scrollBar.map (state);
3680 {
3681 resize_all_windows (0, 0, 0); 3737 resize_all_windows (0, 0, 0);
3682 scr_touch (true); 3738 scr_touch (true);
3683 }
3684 break; 3739 break;
3685#endif 3740#endif
3686 case 25: /* visible/invisible cursor */ 3741 case 25: /* visible/invisible cursor */
3687 scr_cursor_visible (state); 3742 scr_cursor_visible (state);
3688 break; 3743 break;
… …
3701 case 1003: 3756 case 1003:
3702 if (state) 3757 if (state)
3703 { 3758 {
3704 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11); 3759 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3705 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent; 3760 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3761 mouse_row = mouse_col = 0;
3706 vt_emask_mouse = PointerMotionMask; 3762 vt_emask_mouse = PointerMotionMask;
3707 } 3763 }
3708 else 3764 else
3709 vt_emask_mouse = NoEventMask; 3765 vt_emask_mouse = NoEventMask;
3766
3710 vt_select_input (); 3767 vt_select_input ();
3711 break; 3768 break;
3712 case 1010: /* scroll to bottom on TTY output inhibit */ 3769 case 1010: /* scroll to bottom on TTY output inhibit */
3713 set_option (Opt_scrollTtyOutput, !state); 3770 set_option (Opt_scrollTtyOutput, !state);
3714 break; 3771 break;
3715 case 1011: /* scroll to bottom on key press */ 3772 case 1011: /* scroll to bottom on key press */
3716 set_option (Opt_scrollTtyKeypress, state); 3773 set_option (Opt_scrollTtyKeypress, state);
3717 break; 3774 break;
3718 case 1047: /* secondary screen w/ clearing last */ 3775 case 1047: /* secondary screen w/ clearing last */
3719 if (option (Opt_secondaryScreen)) 3776 if (option (Opt_secondaryScreen))
3720 if (current_screen != PRIMARY) 3777 if (!state)
3721 scr_erase_screen (2); 3778 scr_erase_screen (2);
3779
3722 scr_change_screen (state); 3780 scr_change_screen (state);
3723 break; 3781 break;
3724 case 1049: /* secondary screen w/ clearing first */ 3782 case 1049: /* secondary screen w/ clearing first */
3783 if (option (Opt_secondaryScreen))
3784 if (state)
3785 scr_cursor (SAVE);
3786
3725 scr_change_screen (state); 3787 scr_change_screen (state);
3788
3726 if (option (Opt_secondaryScreen)) 3789 if (option (Opt_secondaryScreen))
3727 if (current_screen != PRIMARY) 3790 if (state)
3728 scr_erase_screen (2); 3791 scr_erase_screen (2);
3792 else
3793 scr_cursor (RESTORE);
3729 break; 3794 break;
3730 default: 3795 default:
3731 break; 3796 break;
3732 } 3797 }
3733 } 3798 }
… …
3886 } 3951 }
3887 } 3952 }
3888} 3953}
3889/*}}} */ 3954/*}}} */
3890 3955
3891/*{{{ (do not) process Rob Nation's own graphics mode sequences */
3892void
3893rxvt_term::process_graphics ()
3894{
3895 unicode_t ch, cmd = cmd_getc ();
3896
3897 if (cmd == 'Q')
3898 {
3899 /* query graphics */
3900 tt_printf ("\033G0\012"); /* no graphics */
3901 return;
3902 }
3903 /* swallow other graphics sequences until terminating ':' */
3904 do
3905 ch = cmd_getc ();
3906 while (ch != ':');
3907}
3908/*}}} */
3909
3910/* ------------------------------------------------------------------------- */ 3956/* ------------------------------------------------------------------------- */
3911 3957
3912/* 3958/*
3913 * Send printf () formatted output to the command. 3959 * Send printf () formatted output to the command.
3914 * Only use for small amounts of data. 3960 * Only use for small amounts of data.
… …
3927 3973
3928/* ---------------------------------------------------------------------- */ 3974/* ---------------------------------------------------------------------- */
3929/* Write data to the pty as typed by the user, pasted with the mouse, 3975/* Write data to the pty as typed by the user, pasted with the mouse,
3930 * or generated by us in response to a query ESC sequence. 3976 * or generated by us in response to a query ESC sequence.
3931 */ 3977 */
3932const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 3978static const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
3933 3979
3934void 3980void
3935rxvt_term::tt_write (const char *data, unsigned int len) 3981rxvt_term::tt_write (const char *data, unsigned int len)
3936{ 3982{
3937 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END))) 3983 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
… …
3942 3988
3943 if (v_buflen == 0) 3989 if (v_buflen == 0)
3944 { 3990 {
3945 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE)); 3991 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
3946 3992
3993 max_it (written, 0);
3994
3947 if ((unsigned int)written == len) 3995 if (written == len)
3948 return; 3996 return;
3949 3997
3950 data += written; 3998 data += written;
3951 len -= written; 3999 len -= written;
3952 } 4000 }
3953 4001
3954 v_buffer = (char *)realloc (v_buffer, v_buflen + len); 4002 v_buffer = (char *)rxvt_realloc (v_buffer, v_buflen + len);
3955 4003
3956 memcpy (v_buffer + v_buflen, data, len); 4004 memcpy (v_buffer + v_buflen, data, len);
3957 v_buflen += len; 4005 v_buflen += len;
3958 4006
3959 pty_ev.set (ev::READ | ev::WRITE); 4007 pty_ev.set (ev::READ | ev::WRITE);

Diff Legend

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