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.212 by root, Wed Dec 21 14:19:19 2005 UTC vs.
Revision 1.405 by ayin, Thu Feb 14 23:51:46 2008 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*----------------------------------------------------------------------*
2 * File: command.C 2 * File: command.C
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * 4 *
5 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk> 6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk>
… …
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-2005 Marc Lehmann <pcg@goof.com> 30 * Copyright (c) 2003-2007 Marc Lehmann <pcg@goof.com>
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.
… …
43 * along with this program; if not, write to the Free Software 44 * along with this program; if not, write to the Free Software
44 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 45 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
45 *----------------------------------------------------------------------*/ 46 *----------------------------------------------------------------------*/
46 47
47/*{{{ includes: */ 48/*{{{ includes: */
48#include "../config.h" /* NECESSARY */ 49#include "../config.h"
49#include "rxvt.h" /* NECESSARY */ 50#include "rxvt.h"
51#include "rxvtperl.h"
50#include "version.h" 52#include "version.h"
51#include "command.h" 53#include "command.h"
52 54
53#ifdef KEYSYM_RESOURCE 55#ifdef KEYSYM_RESOURCE
54# include "keyboard.h" 56# include "keyboard.h"
55#endif 57#endif
56 58
57#include <csignal> 59#include <csignal>
58 60
61#if LINUX_YIELD_HACK
62# include <ctime>
63#endif
64
59/*----------------------------------------------------------------------*/ 65/*----------------------------------------------------------------------*/
60 66
61#define IS_CONTROL(ch) !((ch) & 0xffffff60UL) 67#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
62
63// exception thrown when the command parser runs out of input data
64class out_of_input { } out_of_input;
65 68
66#if ENABLE_FRILLS || ISO_14755 69#if ENABLE_FRILLS || ISO_14755
67 70
68#define ISO_14755_STARTED 0x80000000UL 71#define ISO_14755_STARTED 0x80000000UL
69#define ISO_14755_51 0x40000000UL // basic (section 5.1) 72#define ISO_14755_51 0x40000000UL // basic (section 5.1)
… …
93 XK_Shift_L, 0x21e7, 96 XK_Shift_L, 0x21e7,
94 XK_Shift_R, 0x21e7, 97 XK_Shift_R, 0x21e7,
95 98
96 XK_Shift_Lock, 0x21eb, 99 XK_Shift_Lock, 0x21eb,
97 XK_ISO_Lock, 0x21eb, 100 XK_ISO_Lock, 0x21eb,
98 XK_ISO_Lock, 0x21eb,
99 XK_Caps_Lock, 0x21ec, 101 XK_Caps_Lock, 0x21ec,
100 XK_Num_Lock, 0x21ed, 102 XK_Num_Lock, 0x21ed,
101 XK_ISO_Level3_Shift, 0x21ee, 103 XK_ISO_Level3_Shift, 0x21ee,
102 XK_ISO_Level3_Lock, 0x21ef, 104 XK_ISO_Level3_Lock, 0x21ef,
103 XK_ISO_Group_Lock, 0x21f0, 105 XK_ISO_Group_Lock, 0x21f0,
… …
141 || !IN_RANGE_EXC (y, 0, nrow)) 143 || !IN_RANGE_EXC (y, 0, nrow))
142 return; 144 return;
143 145
144 for (;;) 146 for (;;)
145 { 147 {
146 const line_t &l = ROW(-view_start); 148 const line_t &l = ROW(y + view_start);
147 149
148 text_t t = l.t[x]; 150 text_t t = l.t[x];
149 151
150 if (t != NOCHAR || !x) 152 if (t != NOCHAR || !x)
151 { 153 {
152 iso14755_51 (l.t[x], l.r[x]); 154 iso14755_51 (l.t[x], l.r[x], x, y);
153 iso14755buf = ISO_14755_54; 155 iso14755buf = ISO_14755_54;
154 break; 156 break;
155 } 157 }
156 158
157 x--; 159 x--;
158 } 160 }
159} 161}
160#endif
161 162
162#if ENABLE_OVERLAY
163void 163void
164rxvt_term::iso14755_51 (unicode_t ch, rend_t r) 164rxvt_term::iso14755_51 (unicode_t ch, rend_t r, int x, int y)
165{ 165{
166 rxvt_fontset *fs = FONTSET (r); 166 rxvt_fontset *fs = FONTSET (r);
167 rxvt_font *f = (*fs)[fs->find_font (ch)]; 167 rxvt_font *f = (*fs)[fs->find_font (ch)];
168 wchar_t *chr, *alloc, ch2, *fname; 168 wchar_t *chr, *alloc, ch2, *fname;
169 int len; 169 int len;
170 170
171 fname = rxvt_utf8towcs (f->name); 171 fname = rxvt_utf8towcs (f->name);
172 172
173#if ENABLE_COMBINING 173# if ENABLE_COMBINING
174 if (IS_COMPOSE (ch)) 174 if (IS_COMPOSE (ch))
175 { 175 {
176 len = rxvt_composite.expand (ch, 0); 176 len = rxvt_composite.expand (ch, 0);
177 alloc = chr = new wchar_t[len]; 177 alloc = chr = new wchar_t[len];
178 rxvt_composite.expand (ch, chr); 178 rxvt_composite.expand (ch, chr);
179 } 179 }
180 else 180 else
181#endif 181# endif
182 { 182 {
183 ch2 = ch; 183 ch2 = ch;
184 184
185 alloc = 0; 185 alloc = 0;
186 chr = &ch2; 186 chr = &ch2;
187 len = 1; 187 len = 1;
188 } 188 }
189 189
190 char attr[80]; // plenty
191
192 sprintf (attr, "%08x = fg %d bg %d%s%s%s%s%s%s",
193 (int)r,
194 fgcolor_of (r), bgcolor_of (r),
195 r & RS_Bold ? " bold" : "",
196 r & RS_Italic ? " italic" : "",
197 r & RS_Blink ? " blink" : "",
198 r & RS_RVid ? " rvid" : "",
199 r & RS_Uline ? " uline" : "",
200 r & RS_Careful ? " careful" : "");
201
190 int width = wcswidth (fname, wcslen (fname)); 202 int width = wcswidth (fname, wcslen (fname));
191 203
192 scr_overlay_new (0, -1, width < 8+5 ? 8+5 : width, len + 1); 204 max_it (width, 8+5); // for char + hex
205 max_it (width, strlen (attr));
206
207 if (y >= 0)
208 {
209 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1;
210 x = 0;
211 }
212
213 scr_overlay_new (x, y, width, len + 2);
193 214
194 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r)); 215 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));
195 216
196 for (int y = 0; y < len; y++) 217 for (int y = 0; y < len; y++)
197 { 218 {
… …
200 ch = *chr++; 221 ch = *chr++;
201 222
202 sprintf (buf, "%8x", ch); 223 sprintf (buf, "%8x", ch);
203 scr_overlay_set (0, y, buf); 224 scr_overlay_set (0, y, buf);
204 scr_overlay_set (9, y, '='); 225 scr_overlay_set (9, y, '=');
205#if !UNICODE3 226# if !UNICODE_3
206 if (ch >= 0x10000) 227 if (ch >= 0x10000)
207 ch = 0xfffd; 228 ch = 0xfffd;
208#endif 229# endif
209 scr_overlay_set (11, y, ch, r); 230 scr_overlay_set (11, y, ch, r);
231
232 if (WCWIDTH (ch) >= 2)
210 scr_overlay_set (12, y, NOCHAR, r); 233 scr_overlay_set (12, y, NOCHAR, r);
211 } 234 }
212 235
236// {
237// char buf[4+4+3+1];
238// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y);
239// scr_overlay_set (0, 0, buf);
240// }
241 scr_overlay_set (0, len , attr);
213 scr_overlay_set (0, len, fname); 242 scr_overlay_set (0, len + 1, fname);
214 243
215 free (fname); 244 free (fname);
216 245
217#if ENABLE_COMBINING 246# if ENABLE_COMBINING
218 if (alloc) 247 if (alloc)
219 delete [] alloc; 248 delete [] alloc;
220#endif 249# endif
221} 250}
222#endif 251#endif
223 252
224void 253void
225rxvt_term::commit_iso14755 () 254rxvt_term::commit_iso14755 ()
… …
242 mb[0] = ch[0]; 271 mb[0] = ch[0];
243 len = 1; 272 len = 1;
244 } 273 }
245 274
246 if (len > 0) 275 if (len > 0)
247 tt_write ((unsigned char *)mb, len); 276 tt_write (mb, len);
248 else 277 else
249 scr_bell (); 278 scr_bell ();
250 } 279 }
251 280
252 iso14755buf = 0; 281 iso14755buf = 0;
… …
269 298
270 return -1; 299 return -1;
271} 300}
272#endif 301#endif
273 302
274/*{{{ Convert the keypress event into a string */
275void 303void
276rxvt_term::lookup_key (XKeyEvent &ev) 304rxvt_term::key_press (XKeyEvent &ev)
277{ 305{
278 int ctrl, meta, shft, len; 306 int ctrl, meta, shft, len;
279 unsigned int newlen;
280 KeySym keysym; 307 KeySym keysym;
281#ifdef DEBUG_CMD
282 static int debug_key = 1; /* accessible by a debugger only */
283#endif
284 int valid_keysym; 308 int valid_keysym;
285 unsigned char kbuf[KBUFSZ]; 309 char kbuf[KBUFSZ];
310
311#if ISO_14755
312 if (iso14755buf & ISO_14755_52)
313 return;
314#endif
286 315
287 /* 316 /*
288 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an 317 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an
289 * escape sequence to toggle the Keypad. 318 * escape sequence to toggle the Keypad.
290 * 319 *
… …
308 Status status_return; 337 Status status_return;
309 338
310#if 0 339#if 0
311#ifdef X_HAVE_UTF8_STRING 340#ifdef X_HAVE_UTF8_STRING
312 if (enc_utf8 && 0) // currently disabled, doesn't seem to work, nor is useful 341 if (enc_utf8 && 0) // currently disabled, doesn't seem to work, nor is useful
313 len = Xutf8LookupString (Input_Context, &ev, (char *)kbuf, 342 len = Xutf8LookupString (Input_Context, &ev, kbuf,
314 KBUFSZ, &keysym, &status_return); 343 KBUFSZ, &keysym, &status_return);
315 else 344 else
316#endif 345#endif
317#endif 346#endif
318 { 347 {
… …
355 || status_return == XLookupBoth; 384 || status_return == XLookupBoth;
356 } 385 }
357 else 386 else
358#endif 387#endif
359 { 388 {
360 len = XLookupString (&ev, (char *)kbuf, KBUFSZ, &keysym, &compose); 389 len = XLookupString (&ev, kbuf, KBUFSZ, &keysym, &compose);
361 valid_keysym = keysym != NoSymbol; 390 valid_keysym = keysym != NoSymbol;
362 } 391 }
363 392
364 if (valid_keysym) 393 if (valid_keysym)
365 { 394 {
… …
417 scr_move_to (0, 1); 446 scr_move_to (0, 1);
418 return; 447 return;
419 } 448 }
420 else if (keysym == XK_End) 449 else if (keysym == XK_End)
421 { 450 {
422 scr_move_to (1, 0); 451 scr_move_to (1, 1);
423 return; 452 return;
424 } 453 }
425 } 454 }
426#endif 455#endif
427 } 456 }
… …
438 { 467 {
439 switch (keysym) 468 switch (keysym)
440 { 469 {
441 /* normal XTerm key bindings */ 470 /* normal XTerm key bindings */
442 case XK_Insert: /* Shift+Insert = paste mouse selection */ 471 case XK_Insert: /* Shift+Insert = paste mouse selection */
443 selection_request (ev.time, 0, 0); 472 selection_request (ev.time);
444 return; 473 return;
445#if TODO 474#if TODO
446 /* rxvt extras */ 475 /* rxvt extras */
447 case XK_KP_Add: /* Shift+KP_Add = bigger font */ 476 case XK_KP_Add: /* Shift+KP_Add = bigger font */
448 change_font (FONT_UP); 477 change_font (FONT_UP);
… …
467 { 496 {
468 commit_iso14755 (); 497 commit_iso14755 ();
469 iso14755buf = ISO_14755_51; 498 iso14755buf = ISO_14755_51;
470# if ISO_14755 499# if ISO_14755
471 iso14755_51 (0); 500 iso14755_51 (0);
501# endif
502 return;
503 }
504 else if (keysym == XK_BackSpace)
505 {
506 iso14755buf = ((iso14755buf & ISO_14755_MASK) >> 4) | ISO_14755_51;
507# if ISO_14755
508 iso14755_51 (iso14755buf & ISO_14755_MASK);
472# endif 509# endif
473 return; 510 return;
474 } 511 }
475 else if ((hv = hex_keyval (ev)) >= 0) 512 else if ((hv = hex_keyval (ev)) >= 0)
476 { 513 {
… …
481# endif 518# endif
482 return; 519 return;
483 } 520 }
484 else 521 else
485 { 522 {
486# if ENABLE_OVERLAY 523# if ISO_14755
487 scr_overlay_off (); 524 scr_overlay_off ();
488# endif 525# endif
489 iso14755buf = 0; 526 iso14755buf = 0;
490 } 527 }
491 } 528 }
492 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R)) 529 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R))
493 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))) 530 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R)))
494 if (!(iso14755buf & ISO_14755_STARTED)) 531 if (!(iso14755buf & ISO_14755_STARTED))
495 { 532 {
496 iso14755buf |= ISO_14755_STARTED; 533 iso14755buf |= ISO_14755_STARTED;
497# if ENABLE_OVERLAY 534# if ISO_14755
498 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1); 535 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);
499 scr_overlay_set (0, 0, "ISO 14755 mode"); 536 scr_overlay_set (0, 0, "ISO 14755 mode");
500# endif 537# endif
501 } 538 }
502#endif 539#endif
503 540
504#ifdef PRINTPIPE 541#ifdef PRINTPIPE
505 if (keysym == XK_Print) 542 if (keysym == XK_Print)
506 { 543 {
507 scr_printscreen (ctrl | shft); 544 scr_printscreen (ctrl | shft);
508 return; 545 return;
… …
510#endif 547#endif
511 548
512 if (keysym >= 0xFF00 && keysym <= 0xFFFF) 549 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
513 { 550 {
514 { 551 {
552 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
515 newlen = 1; 553 unsigned int newlen = 1;
554#ifdef XK_KP_Home
555 static const KeySym keypadtrans[] = {
556 XK_KP_7, // XK_KP_Home
557 XK_KP_4, // XK_KP_Left
558 XK_KP_8, // XK_KP_Up
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 };
571
572 if (IN_RANGE_INC (keysym, XK_KP_Home, XK_KP_Begin))
573 {
574 unsigned int index = keysym - XK_KP_Home;
575 keysym = kp ? keypadtrans[index] : XK_Home + index;
576 }
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
516 switch (keysym) 584 switch (keysym)
517 { 585 {
518#ifndef NO_BACKSPACE_KEY 586#ifndef NO_BACKSPACE_KEY
519 case XK_BackSpace: 587 case XK_BackSpace:
520 if (priv_modes & PrivMode_HaveBackSpace) 588 if (priv_modes & PrivMode_HaveBackSpace)
… …
522 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace) 590 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
523 ^ !!ctrl) ? '\b' : '\177'; 591 ^ !!ctrl) ? '\b' : '\177';
524 kbuf[1] = '\0'; 592 kbuf[1] = '\0';
525 } 593 }
526 else 594 else
527 strcpy (kbuf, key_backspace); 595 strcpy (kbuf, rs[Rs_backspace_key]);
528 break; 596 break;
529#endif 597#endif
530#ifndef NO_DELETE_KEY 598#ifndef NO_DELETE_KEY
531# ifdef XK_KP_Prior
532 case XK_KP_Delete:
533 /* allow shift to override */
534 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
535 {
536 strcpy (kbuf, "\033On");
537 break;
538 }
539 /* FALLTHROUGH */
540# endif
541 case XK_Delete: 599 case XK_Delete:
542 strcpy (kbuf, key_delete); 600 strcpy (kbuf, rs[Rs_delete_key]);
543 break; 601 break;
544#endif 602#endif
545 case XK_Tab: 603 case XK_Tab:
546 if (shft) 604 if (shft)
547 strcpy (kbuf, "\033[Z"); 605 strcpy (kbuf, "\033[Z");
… …
557#endif 615#endif
558 newlen = 0; 616 newlen = 0;
559 } 617 }
560 break; 618 break;
561 619
562#ifdef XK_KP_Left
563 case XK_KP_Up: /* \033Ox or standard */
564 case XK_KP_Down: /* \033Or or standard */
565 case XK_KP_Right: /* \033Ov or standard */
566 case XK_KP_Left: /* \033Ot or standard */
567 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
568 {
569 strcpy (kbuf, "\033OZ");
570 kbuf[2] = "txvr"[keysym - XK_KP_Left];
571 break;
572 }
573 else
574 /* translate to std. cursor key */
575 keysym = XK_Left + (keysym - XK_KP_Left);
576 /* FALLTHROUGH */
577#endif
578 case XK_Up: /* "\033[A" */ 620 case XK_Up: /* "\033[A" */
579 case XK_Down: /* "\033[B" */ 621 case XK_Down: /* "\033[B" */
580 case XK_Right: /* "\033[C" */ 622 case XK_Right: /* "\033[C" */
581 case XK_Left: /* "\033[D" */ 623 case XK_Left: /* "\033[D" */
582 strcpy (kbuf, "\033[Z"); 624 strcpy (kbuf, "\033[Z");
… …
592 else if (priv_modes & PrivMode_aplCUR) 634 else if (priv_modes & PrivMode_aplCUR)
593 kbuf[1] = 'O'; 635 kbuf[1] = 'O';
594 break; 636 break;
595 637
596#ifndef UNSHIFTED_SCROLLKEYS 638#ifndef UNSHIFTED_SCROLLKEYS
597# ifdef XK_KP_Prior
598 case XK_KP_Prior:
599 /* allow shift to override */
600 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
601 {
602 strcpy (kbuf, "\033Oy");
603 break;
604 }
605 /* FALLTHROUGH */
606# endif
607 case XK_Prior: 639 case XK_Prior:
608 strcpy (kbuf, "\033[5~"); 640 strcpy (kbuf, "\033[5~");
609 break; 641 break;
610# ifdef XK_KP_Next
611 case XK_KP_Next:
612 /* allow shift to override */
613 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
614 {
615 strcpy (kbuf, "\033Os");
616 break;
617 }
618 /* FALLTHROUGH */
619# endif
620 case XK_Next: 642 case XK_Next:
621 strcpy (kbuf, "\033[6~"); 643 strcpy (kbuf, "\033[6~");
622 break; 644 break;
623#endif 645#endif
624 case XK_KP_Enter: 646 case XK_KP_Enter:
625 /* allow shift to override */ 647 /* allow shift to override */
626 if ((priv_modes & PrivMode_aplKP) ? !shft : shft) 648 if (kp)
627 { 649 {
628 strcpy (kbuf, "\033OM"); 650 strcpy (kbuf, "\033OM");
629 break; 651 break;
630 } 652 }
631 653
… …
643 kbuf[0] = '\015'; 665 kbuf[0] = '\015';
644 kbuf[1] = '\0'; 666 kbuf[1] = '\0';
645 } 667 }
646 break; 668 break;
647 669
648#ifdef XK_KP_Begin
649 case XK_KP_Begin:
650 strcpy (kbuf, "\033Ou");
651 break;
652
653#endif
654 case XK_KP_F1: /* "\033OP" */ 670 case XK_KP_F1: /* "\033OP" */
655 case XK_KP_F2: /* "\033OQ" */ 671 case XK_KP_F2: /* "\033OQ" */
656 case XK_KP_F3: /* "\033OR" */ 672 case XK_KP_F3: /* "\033OR" */
657 case XK_KP_F4: /* "\033OS" */ 673 case XK_KP_F4: /* "\033OS" */
658 strcpy (kbuf, "\033OP"); 674 strcpy (kbuf, "\033OP");
… …
674 case XK_KP_6: /* "\033Ov" : "6" */ 690 case XK_KP_6: /* "\033Ov" : "6" */
675 case XK_KP_7: /* "\033Ow" : "7" */ 691 case XK_KP_7: /* "\033Ow" : "7" */
676 case XK_KP_8: /* "\033Ox" : "8" */ 692 case XK_KP_8: /* "\033Ox" : "8" */
677 case XK_KP_9: /* "\033Oy" : "9" */ 693 case XK_KP_9: /* "\033Oy" : "9" */
678 /* allow shift to override */ 694 /* allow shift to override */
679 if ((priv_modes & PrivMode_aplKP) ? !shft : shft) 695 if (kp)
680 { 696 {
681 strcpy (kbuf, "\033Oj"); 697 strcpy (kbuf, "\033Oj");
682 kbuf[2] += (keysym - XK_KP_Multiply); 698 kbuf[2] += (keysym - XK_KP_Multiply);
683 } 699 }
684 else 700 else
… …
690 706
691 case XK_Find: 707 case XK_Find:
692 strcpy (kbuf, "\033[1~"); 708 strcpy (kbuf, "\033[1~");
693 break; 709 break;
694 710
695#ifdef XK_KP_End
696 case XK_KP_Insert:
697 /* allow shift to override */
698 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
699 {
700 strcpy (kbuf, "\033Op");
701 break;
702 }
703 /* FALLTHROUGH */
704#endif
705 case XK_Insert: 711 case XK_Insert:
706 strcpy (kbuf, "\033[2~"); 712 strcpy (kbuf, "\033[2~");
707 break; 713 break;
708#ifdef DXK_Remove /* support for DEC remove like key */ 714#ifdef DXK_Remove /* support for DEC remove like key */
709 case DXK_Remove: 715 case DXK_Remove:
… …
713 strcpy (kbuf, "\033[3~"); 719 strcpy (kbuf, "\033[3~");
714 break; 720 break;
715 case XK_Select: 721 case XK_Select:
716 strcpy (kbuf, "\033[4~"); 722 strcpy (kbuf, "\033[4~");
717 break; 723 break;
718#ifdef XK_KP_End
719 case XK_KP_End:
720 /* allow shift to override */
721 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
722 {
723 strcpy (kbuf, "\033Oq");
724 break;
725 }
726 /* FALLTHROUGH */
727#endif
728 case XK_End: 724 case XK_End:
729 strcpy (kbuf, KS_END); 725 strcpy (kbuf, KS_END);
730 break; 726 break;
731#ifdef XK_KP_Home
732 case XK_KP_Home:
733 /* allow shift to override */
734 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
735 {
736 strcpy (kbuf, "\033Ow");
737 break;
738 }
739 /* FALLTHROUGH */
740#endif
741 case XK_Home: 727 case XK_Home:
742 strcpy (kbuf, KS_HOME); 728 strcpy (kbuf, KS_HOME);
743 break; 729 break;
744 730
745#define FKEY(n, fkey) \ 731#define FKEY(n, fkey) \
… …
829 { 815 {
830#ifdef META8_OPTION 816#ifdef META8_OPTION
831 /* set 8-bit on */ 817 /* set 8-bit on */
832 if (meta && (meta_char == 0x80)) 818 if (meta && (meta_char == 0x80))
833 { 819 {
834 unsigned char *ch; 820 char *ch;
835 821
836 for (ch = kbuf; ch < kbuf + len; ch++) 822 for (ch = kbuf; ch < kbuf + len; ch++)
837 *ch |= 0x80; 823 *ch |= 0x80;
838 824
839 meta = 0; 825 meta = 0;
… …
841#endif 827#endif
842 /* nil */ ; 828 /* nil */ ;
843 } 829 }
844 } 830 }
845 831
832 if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_INT, keysym, DT_STR_LEN, kbuf, len, DT_END)))
833 return;
834
846 if (len <= 0) 835 if (len <= 0)
847 return; /* not mapped */ 836 return; /* not mapped */
848 837
849 if (options & Opt_scrollTtyKeypress) 838 if (option (Opt_scrollTtyKeypress))
850 if (view_start) 839 if (view_start)
851 { 840 {
852 view_start = 0; 841 view_start = 0;
853 want_refresh = 1; 842 want_refresh = 1;
854 } 843 }
… …
872#ifdef META8_OPTION 861#ifdef META8_OPTION
873 && meta_char == C0_ESC 862 && meta_char == C0_ESC
874#endif 863#endif
875 ) 864 )
876 { 865 {
877 const unsigned char ch = C0_ESC; 866 const char ch = C0_ESC;
878 tt_write (&ch, 1); 867 tt_write (&ch, 1);
879 } 868 }
880 869
881#if defined(DEBUG_CMD)
882 /* Display keyboard buffer contents */
883 unsigned char *p;
884 int i;
885
886 fprintf (stderr, "key 0x%04X [%d]: `", (unsigned int)keysym, len);
887 for (i = 0, p = kbuf; i < len; i++, p++)
888 fprintf (stderr, (*p >= ' ' && *p < '\177' ? "%c" : "\\%03o"), *p);
889 fprintf (stderr, "'\n");
890#endif /* DEBUG_CMD */
891 tt_write (kbuf, (unsigned int)len); 870 tt_write (kbuf, (unsigned int)len);
892} 871}
893/*}}} */
894 872
873void
874rxvt_term::key_release (XKeyEvent &ev)
875{
876#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
877 KeySym keysym;
878
879 keysym = XLookupKeysym (&ev, ev.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
880#endif
881
882#if ENABLE_FRILLS || ISO_14755
883 // ISO 14755 support
884 if (iso14755buf)
885 if (iso14755buf & ISO_14755_52)
886 {
887# if ISO_14755
888 scr_overlay_off ();
889# endif
890# if ISO_14755
891 // iso14755 part 5.2 handling: release time
892 // first: controls
893 if ((ev.state & ControlMask)
894 && ((keysym >= 0x40 && keysym <= 0x5f)
895 || (keysym >= 0x61 && keysym <= 0x7f)))
896 {
897 iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
898 commit_iso14755 ();
899
900 return;
901 }
902
903 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
904 if (i[0] == keysym)
905 {
906 iso14755buf = ISO_14755_51 | i[1];
907 commit_iso14755 ();
908
909 return;
910 }
911
912 scr_bell ();
913# endif
914 iso14755buf = 0;
915
916 return;
917 }
918 else if ((ev.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
919 {
920# if ISO_14755
921 scr_overlay_off ();
922# endif
923 if (iso14755buf & ISO_14755_51)
924 commit_iso14755 ();
925#if ISO_14755
926 else if (option (Opt_iso14755_52) && iso14755buf & ISO_14755_STARTED)
927 {
928 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
929
930 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
931 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
932 }
933# endif
934 else
935 iso14755buf = 0;
936 }
937#endif
938
939 if (HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
940 return;
941
942#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
943 if (!(ev.state & ControlMask))
944 slip_wheel_ev.stop ();
945 else if (keysym == XK_Control_L || keysym == XK_Control_R)
946 mouse_slip_wheel_speed = 0;
947#endif
948}
949
895#if MENUBAR_MAX || defined (KEYSYM_RESOURCE) 950#if defined (KEYSYM_RESOURCE)
896/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */
897/* attempt to `write' count to the input buffer */
898unsigned int 951unsigned int
899rxvt_term::cmd_write (const unsigned char *str, unsigned int count) 952rxvt_term::cmd_write (const char *str, unsigned int count)
900{ 953{
901 unsigned int n, s; 954 unsigned int n, s;
902 955
903 n = cmdbuf_ptr - cmdbuf_base; 956 n = cmdbuf_ptr - cmdbuf_base;
904 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp; 957 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp;
… …
930void 983void
931rxvt_term::flush () 984rxvt_term::flush ()
932{ 985{
933 flush_ev.stop (); 986 flush_ev.stop ();
934 987
935#ifdef TRANSPARENT 988#ifdef HAVE_BG_PIXMAP
936 if (want_full_refresh) 989 if (bgPixmap.check_clearChanged ())
937 { 990 {
938 want_full_refresh = 0; 991// scr_clear (true); This needs to be researched further!
939 scr_clear ();
940 scr_touch (false); 992 scr_touch (false);
941 } 993 }
942#endif 994#endif
943 995
944 if (want_refresh) 996 if (want_refresh)
945 { 997 {
998 if (SHOULD_INVOKE (HOOK_LINE_UPDATE))
999 {
1000 int row = view_start;
1001 int end_row = row + nrow;
1002
1003 while (row > top_row && ROW (row - 1).is_longer ())
1004 --row;
1005
1006 do
1007 {
1008 int start_row = row;
1009 line_t *l;
1010
1011 do
1012 {
1013 l = &ROW (row++);
1014
1015 if (!(l->f & LINE_FILTERED))
1016 {
1017 // line not filtered, mark it as filtered
1018 l->f |= LINE_FILTERED;
1019 while (l->is_longer ())
1020 {
1021 l = &ROW (row++);
1022 l->f |= LINE_FILTERED;
1023 }
1024
1025 // and filter it
1026 HOOK_INVOKE ((this, HOOK_LINE_UPDATE, DT_INT, start_row, DT_END));
1027
1028 break;
1029 }
1030 }
1031 while (l->is_longer () && row < end_row);
1032 }
1033 while (row < end_row);
1034 }
1035
946 scr_refresh (refresh_type); 1036 scr_refresh ();
947 scrollbar_show (1); 1037 scrollbar_show (1);
948#ifdef USE_XIM 1038#ifdef USE_XIM
949 IMSendSpot (); 1039 IMSendSpot ();
950#endif 1040#endif
951 } 1041 }
952 1042
953 display->flush (); 1043 display->flush ();
954} 1044}
955 1045
1046/* checks wether a refresh is requested and starts the refresh timer */
956void 1047void
957rxvt_term::check_cb (check_watcher &w) 1048rxvt_term::refresh_check ()
958{ 1049{
959 SET_R (this); 1050 if (want_refresh && !flush_ev.is_active ())
960 SET_LOCALE (locale); 1051 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally
961 1052
962 display->flush (); 1053 display->flush ();
963
964 if (want_refresh && !flush_ev.active)
965 flush_ev.start (NOW + 0.01);
966} 1054}
967 1055
968void 1056void
969rxvt_term::flush_cb (time_watcher &w) 1057rxvt_term::flush_cb (ev::timer &w, int revents)
970{ 1058{
971 SET_R (this); 1059 make_current ();
972 SET_LOCALE (locale);
973 1060
974 refresh_limit = 1;
975 refresh_count = 0; 1061 refresh_count = 0;
976 flush (); 1062 flush ();
977} 1063}
978 1064
979#ifdef CURSOR_BLINK 1065#ifdef CURSOR_BLINK
980void 1066void
981rxvt_term::cursor_blink_cb (time_watcher &w) 1067rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
982{ 1068{
983 hidden_cursor = !hidden_cursor; 1069 hidden_cursor = !hidden_cursor;
984 want_refresh = 1; 1070 want_refresh = 1;
985 1071 refresh_check ();
986 w.start (w.at + BLINK_INTERVAL);
987} 1072}
988#endif 1073#endif
989 1074
990#ifdef TEXT_BLINK 1075#ifdef TEXT_BLINK
991void 1076void
992rxvt_term::text_blink_cb (time_watcher &w) 1077rxvt_term::text_blink_cb (ev::timer &w, int revents)
993{ 1078{
994 if (scr_refresh_rend (RS_Blink, RS_Blink)) 1079 if (scr_refresh_rend (RS_Blink, RS_Blink))
995 { 1080 {
996 hidden_text = !hidden_text; 1081 hidden_text = !hidden_text;
997 want_refresh = 1; 1082 want_refresh = 1;
998 w.start (w.at + TEXT_BLINK_INTERVAL); 1083 refresh_check ();
999 } 1084 }
1085 else
1086 w.stop ();
1000} 1087}
1001#endif 1088#endif
1002 1089
1003#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1090#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1004void 1091void
1005rxvt_term::cont_scroll_cb (time_watcher &w) 1092rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1006{ 1093{
1007 if ((scrollbar_isUp() || scrollbar_isDn()) && 1094 if ((scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
1008 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1095 && scr_page (scrollBar.state == STATE_UP ? UP : DN, 1))
1009 { 1096 {
1010 refresh_type |= SMOOTH_REFRESH;
1011 want_refresh = 1; 1097 want_refresh = 1;
1012 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1098 refresh_check ();
1013 } 1099 }
1100 else
1101 w.stop ();
1014} 1102}
1015#endif 1103#endif
1016 1104
1017#ifdef SELECTION_SCROLLING 1105#ifdef SELECTION_SCROLLING
1018void 1106void
1019rxvt_term::sel_scroll_cb (time_watcher &w) 1107rxvt_term::sel_scroll_cb (ev::timer &w, int revents)
1020{ 1108{
1021 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1109 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1022 { 1110 {
1023 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1111 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1024 refresh_type |= SMOOTH_REFRESH;
1025 want_refresh = 1; 1112 want_refresh = 1;
1026 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1113 refresh_check ();
1027 } 1114 }
1115 else
1116 w.stop ();
1028} 1117}
1029#endif 1118#endif
1030 1119
1031#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1120#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1032void 1121void
1033rxvt_term::slip_wheel_cb (time_watcher &w) 1122rxvt_term::slip_wheel_cb (ev::timer &w, int revents)
1034{ 1123{
1035 if (mouse_slip_wheel_speed == 0 1124 if (scr_changeview (view_start - mouse_slip_wheel_speed))
1036 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1037 : scr_page (UP, mouse_slip_wheel_speed))
1038 { 1125 {
1039 if (view_start == nsaved ||
1040 view_start == 0)
1041 mouse_slip_wheel_speed = 0;
1042
1043 refresh_type |= SMOOTH_REFRESH;
1044 want_refresh = 1; 1126 want_refresh = 1;
1045 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1127 refresh_check ();
1128 }
1129
1130 if (view_start == top_row || view_start == 0 || mouse_slip_wheel_speed == 0)
1046 } 1131 {
1132 mouse_slip_wheel_speed = 0;
1133 w.stop ();
1134 }
1047} 1135}
1136#endif
1137
1138#if LINUX_YIELD_HACK
1139static struct event_handler
1140{
1141 ev::prepare yield_ev;
1142
1143 void yield_cb (ev::prepare &w, int revents)
1144 {
1145 // this should really be sched_yield(), but the linux guys thought
1146 // that giving a process calling sched_yield () less cpu time than
1147 // ones with high nice levels is a useful thing to do. It surely is is
1148 // allowed by the sus... as is returning ENOSYS.
1149
1150 struct timespec ts = { 0, 0 };
1151 nanosleep (&ts, 0);
1152
1153 w.stop ();
1154 }
1155
1156 event_handler ()
1157 : yield_ev (this, &event_handler::yield_cb)
1158 {
1159 }
1160} event_handler;
1048#endif 1161#endif
1049 1162
1050bool 1163bool
1051rxvt_term::pty_fill () 1164rxvt_term::pty_fill ()
1052{ 1165{
1053 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1166 ssize_t n = cmdbuf_endp - cmdbuf_ptr;
1054 1167
1055 if (CBUFSIZ == n) 1168 if (CBUFSIZ == n)
1056 { 1169 {
1057 rxvt_warn ("pty_fill on full buffer, draining input, continuing.\n"); 1170 rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n");
1058 n = 0; 1171 n = 0;
1059 } 1172 }
1060 1173
1061 memmove (cmdbuf_base, cmdbuf_ptr, n); 1174 memmove (cmdbuf_base, cmdbuf_ptr, n);
1062 cmdbuf_ptr = cmdbuf_base; 1175 cmdbuf_ptr = cmdbuf_base;
1063 cmdbuf_endp = cmdbuf_ptr + n; 1176 cmdbuf_endp = cmdbuf_ptr + n;
1064 1177
1065 n = read (pty.pty, cmdbuf_endp, CBUFSIZ - n); 1178 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n);
1066 1179
1067 if (n > 0) 1180 if (r > 0)
1068 { 1181 {
1069 cmdbuf_endp += n; 1182 cmdbuf_endp += r;
1070 return true; 1183 return true;
1071 } 1184 }
1072 else if (n < 0 && errno != EAGAIN) 1185 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1186 {
1187#if LINUX_YIELD_HACK
1188 if (display->is_local)
1189 event_handler.yield_ev.start ();
1190#endif
1191 }
1192 else
1193 {
1194 pty_ev.stop ();
1195
1196 if (!option (Opt_hold))
1073 destroy (); 1197 destroy ();
1074 1198 }
1199
1075 return false; 1200 return false;
1076} 1201}
1077 1202
1078void 1203void
1079rxvt_term::pty_cb (io_watcher &w, short revents) 1204rxvt_term::pty_cb (ev::io &w, int revents)
1080{ 1205{
1081 SET_R (this); 1206 make_current ();
1082 SET_LOCALE (locale);
1083 1207
1084 if (revents & EVENT_READ) 1208 if (revents & ev::READ)
1085 // loop, but don't allow a single term to monopolize us 1209 // loop, but don't allow a single term to monopolize us
1086 while (pty_fill ()) 1210 while (pty_fill ())
1087 if (cmd_parse ()) 1211 if (cmd_parse ())
1088 break; 1212 break;
1089 1213
1090 if (revents & EVENT_WRITE) 1214 if (revents & ev::WRITE)
1091 pty_write (); 1215 pty_write ();
1216
1217 refresh_check ();
1092} 1218}
1093 1219
1094void 1220void
1095rxvt_term::pointer_unblank () 1221rxvt_term::pointer_unblank ()
1096{ 1222{
1097 XDefineCursor (display->display, vt, TermWin_cursor); 1223 XDefineCursor (dpy, vt, TermWin_cursor);
1098 recolour_cursor (); 1224 recolour_cursor ();
1099 1225
1100#ifdef POINTER_BLANK 1226#ifdef POINTER_BLANK
1101 hidden_pointer = 0; 1227 hidden_pointer = 0;
1102 1228
1103 if (options & Opt_pointerBlank) 1229 if (option (Opt_pointerBlank))
1104 pointer_ev.start (NOW + pointerBlankDelay); 1230 pointer_ev.start (pointerBlankDelay);
1105#endif 1231#endif
1106} 1232}
1107 1233
1108#ifdef POINTER_BLANK 1234#ifdef POINTER_BLANK
1109void 1235void
1110rxvt_term::pointer_blank () 1236rxvt_term::pointer_blank ()
1111{ 1237{
1112 if (! (options & Opt_pointerBlank)) 1238 if (!option (Opt_pointerBlank))
1113 return; 1239 return;
1114 1240
1115 XDefineCursor (display->display, vt, display->blank_cursor); 1241 XDefineCursor (dpy, vt, display->blank_cursor);
1116 XFlush (display->display); 1242 XFlush (dpy);
1117 1243
1118 hidden_pointer = 1; 1244 hidden_pointer = 1;
1119} 1245}
1120 1246
1121void 1247void
1122rxvt_term::pointer_cb (time_watcher &w) 1248rxvt_term::pointer_cb (ev::timer &w, int revents)
1123{ 1249{
1124 SET_R (this); 1250 make_current ();
1125 SET_LOCALE (locale);
1126 1251
1127 pointer_blank (); 1252 pointer_blank ();
1128} 1253}
1129#endif 1254#endif
1130 1255
1131void 1256void
1132rxvt_term::mouse_report (XButtonEvent &ev) 1257rxvt_term::mouse_report (XButtonEvent &ev)
1133{ 1258{
1134 int button_number, key_state = 0; 1259 int button_number, key_state = 0;
1135 int x, y; 1260 int x, y;
1261 int code = 32;
1136 1262
1137 x = ev.x; 1263 x = Pixel2Col (ev.x);
1138 y = ev.y; 1264 y = Pixel2Row (ev.y);
1139 pixel_position (&x, &y); 1265 if (ev.type == MotionNotify)
1266 {
1267 if (x == mouse_row && y == mouse_col)
1268 return;
1269 mouse_row = x;
1270 mouse_col = y;
1271 code += 32;
1272 }
1140 1273
1141 if (MEvent.button == AnyButton) 1274 if (MEvent.button == AnyButton)
1142 button_number = 3; 1275 button_number = 3;
1143 else 1276 else
1144 { 1277 {
… …
1190 x + 1, 1323 x + 1,
1191 y + 1); 1324 y + 1);
1192#endif 1325#endif
1193 1326
1194 tt_printf ("\033[M%c%c%c", 1327 tt_printf ("\033[M%c%c%c",
1195 (32 + button_number + key_state), 1328 (code + button_number + key_state),
1196 (32 + x + 1), 1329 (32 + x + 1),
1197 (32 + y + 1)); 1330 (32 + y + 1));
1198} 1331}
1199
1200#ifdef USING_W11LIB
1201void
1202rxvt_W11_process_x_event (XEvent *ev)
1203{
1204 rxvt_t *r = rxvt_get_r ();
1205
1206 x_cb (*ev);
1207}
1208#endif
1209 1332
1210/*{{{ process an X event */ 1333/*{{{ process an X event */
1211void 1334void
1212rxvt_term::x_cb (XEvent &ev) 1335rxvt_term::x_cb (XEvent &ev)
1213{ 1336{
1214 dDisp; 1337 make_current ();
1215 1338
1216 SET_R (this); 1339 dLocal (Display *, dpy);
1217 SET_LOCALE (locale);
1218 1340
1219#if defined(CURSOR_BLINK) 1341 if (ev.xany.window == vt
1220 if ((options & Opt_cursorBlink) && ev.type == KeyPress) 1342 && SHOULD_INVOKE (HOOK_X_EVENT)
1221 { 1343 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1222 if (hidden_cursor) 1344 return;
1223 {
1224 hidden_cursor = 0;
1225 want_refresh = 1;
1226 }
1227 1345
1228 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1346 // for XQueryPointer
1229 }
1230#endif
1231
1232#if defined(POINTER_BLANK)
1233 if ((options & Opt_pointerBlank) && pointerBlankDelay > 0)
1234 {
1235 if (ev.type == MotionNotify
1236 || ev.type == ButtonPress
1237 || ev.type == ButtonRelease)
1238 if (hidden_pointer)
1239 pointer_unblank ();
1240
1241 if (ev.type == KeyPress && hidden_pointer == 0)
1242 pointer_blank ();
1243 }
1244#endif
1245
1246 Window unused_root, unused_child; 1347 Window unused_root, unused_child;
1247 int unused_root_x, unused_root_y; 1348 int unused_root_x, unused_root_y;
1248 unsigned int unused_mask; 1349 unsigned int unused_mask;
1249 1350
1250 switch (ev.type) 1351 switch (ev.type)
1251 { 1352 {
1252 case KeyPress: 1353 case KeyPress:
1253#if ISO_14755 1354 key_press (ev.xkey);
1254 if (!(iso14755buf & ISO_14755_52))
1255#endif
1256 lookup_key (ev.xkey);
1257
1258 break; 1355 break;
1259 1356
1260 case KeyRelease: 1357 case KeyRelease:
1261 { 1358 key_release (ev.xkey);
1262#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755
1263 KeySym ks;
1264
1265 ks = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1266#endif
1267
1268#if ENABLE_FRILLS || ISO_14755
1269 // ISO 14755 support
1270 if (iso14755buf)
1271 if (iso14755buf & ISO_14755_52)
1272 {
1273# if ENABLE_OVERLAY
1274 scr_overlay_off ();
1275# endif
1276# if ISO_14755
1277 // iso14755 part 5.2 handling: release time
1278 // first: controls
1279 if ((ev.xkey.state & ControlMask)
1280 && ((ks >= 0x40 && ks <= 0x5f)
1281 || (ks >= 0x61 && ks <= 0x7f)))
1282 {
1283 iso14755buf = ISO_14755_51 | 0x2400 | (ks & 0x1f);
1284 commit_iso14755 ();
1285 return; // case-break;
1286 }
1287
1288 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1289 if (i[0] == ks)
1290 {
1291 iso14755buf = ISO_14755_51 | i[1];
1292 commit_iso14755 ();
1293 return; // case-break;
1294 }
1295
1296 scr_bell ();
1297# endif
1298 iso14755buf = 0;
1299 break;
1300 }
1301 else if ((ev.xkey.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
1302 {
1303# if ENABLE_OVERLAY
1304 scr_overlay_off ();
1305# endif
1306 if (iso14755buf & ISO_14755_51)
1307 commit_iso14755 ();
1308#if ISO_14755
1309 else if (iso14755buf & ISO_14755_STARTED)
1310 {
1311 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
1312
1313 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
1314 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
1315 }
1316# endif
1317 else
1318 iso14755buf = 0;
1319 }
1320#endif
1321
1322#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1323 if (!(ev.xkey.state & ControlMask))
1324 slip_wheel_ev.stop ();
1325 else if (ks == XK_Control_L || ks == XK_Control_R)
1326 mouse_slip_wheel_speed = 0;
1327#endif
1328 break; 1359 break;
1329 }
1330 1360
1331 case ButtonPress: 1361 case ButtonPress:
1332 button_press (ev.xbutton); 1362 button_press (ev.xbutton);
1333 break; 1363 break;
1334 1364
… …
1336 button_release (ev.xbutton); 1366 button_release (ev.xbutton);
1337 break; 1367 break;
1338 1368
1339 case ClientMessage: 1369 case ClientMessage:
1340 if (ev.xclient.format == 32 1370 if (ev.xclient.format == 32
1341 && ev.xclient.message_type == xa[XA_WM_PROTOCOLS]) 1371 && !HOOK_INVOKE ((this, HOOK_CLIENT_MESSAGE, DT_XEVENT, &ev, DT_END)))
1342 { 1372 {
1373 if (ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
1374 {
1375 if (!HOOK_INVOKE ((this, HOOK_WM_PROTOCOLS, DT_XEVENT, &ev, DT_END)))
1376 {
1343 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW]) 1377 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1378 {
1379 if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END)))
1344 destroy (); 1380 destroy ();
1381 }
1345#if ENABLE_EWMH 1382#if ENABLE_EWMH
1346 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING]) 1383 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1347 XSendEvent (disp, ev.xclient.window = display->root, 1384 XSendEvent (dpy, ev.xclient.window = display->root,
1348 False, SubstructureRedirectMask | SubstructureNotifyMask, 1385 False, SubstructureRedirectMask | SubstructureNotifyMask,
1349 &ev); 1386 &ev);
1387#endif
1388 }
1389 }
1390#if ENABLE_XEMBED
1391 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1392 {
1393 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1394 focus_in ();
1395 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1396 focus_out ();
1397 }
1350#endif 1398#endif
1351 } 1399 }
1352#if ENABLE_XEMBED
1353 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1354 {
1355 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1356 focus_in ();
1357 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1358 focus_out ();
1359 }
1360#endif
1361#ifdef OFFIX_DND
1362 /* OffiX Dnd (drag 'n' drop) protocol */
1363 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1364 && (ev.xclient.data.l[0] == DndFile
1365 || ev.xclient.data.l[0] == DndDir
1366 || ev.xclient.data.l[0] == DndLink))
1367 {
1368 /* Get Dnd data */
1369 Atom ActualType;
1370 int ActualFormat;
1371 unsigned char *data;
1372 unsigned long Size, RemainingBytes;
1373
1374 XGetWindowProperty (disp, display->root,
1375 xa[XA_DNDSELECTION],
1376 0L, 1000000L,
1377 False, AnyPropertyType,
1378 &ActualType, &ActualFormat,
1379 &Size, &RemainingBytes,
1380 &data);
1381 set_string_property (XA_CUT_BUFFER0, data);
1382 XFree (data);
1383 selection_paste (display->root, XA_CUT_BUFFER0, true);
1384 XSetInputFocus (disp, display->root, RevertToNone, CurrentTime);
1385 }
1386#endif /* OFFIX_DND */
1387 break;
1388
1389 case MappingNotify:
1390 XRefreshKeyboardMapping (&ev.xmapping);
1391 break; 1400 break;
1392 1401
1393 /* 1402 /*
1394 * XXX: this is not the _current_ arrangement 1403 * XXX: this is not the _current_ arrangement
1395 * Here's my conclusion: 1404 * Here's my conclusion:
… …
1414 break; 1423 break;
1415 } 1424 }
1416 break; 1425 break;
1417 1426
1418 case FocusIn: 1427 case FocusIn:
1428 if (ev.xfocus.detail != NotifyInferior
1429 && ev.xfocus.detail != NotifyPointer
1430 && ev.xfocus.mode != NotifyGrab)
1419 focus_in (); 1431 focus_in ();
1420 break; 1432 break;
1421 1433
1422 case FocusOut: 1434 case FocusOut:
1435 if (ev.xfocus.detail != NotifyInferior
1436 && ev.xfocus.detail != NotifyPointer
1437 && ev.xfocus.mode != NotifyGrab)
1423 focus_out (); 1438 focus_out ();
1424 break; 1439 break;
1425 1440
1426 case ConfigureNotify: 1441 case ConfigureNotify:
1442 /*fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",
1443 ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,
1444 szHint.width, szHint.height);*/
1427 if (ev.xconfigure.window == parent[0]) 1445 if (ev.xconfigure.window == parent[0])
1428 { 1446 {
1429 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev)) 1447 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1430 ; 1448 ;
1431 1449
1432 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1450 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1433 { 1451 {
1434 seen_resize = 1; 1452 seen_resize = 1;
1435 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1453 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1436 } 1454 }
1437 1455 else
1438#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1456 {
1439 if (options & Opt_transparent) 1457#ifdef HAVE_BG_PIXMAP
1440 check_our_parents (); 1458 if (bgPixmap.window_position_sensitive ())
1459 {
1460 if (mapped)
1461 update_background ();
1462 else
1463 bgPixmap.invalidate ();
1464 }
1441#endif 1465#endif
1466 }
1467
1468 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1442 } 1469 }
1443 break; 1470 break;
1444 1471
1445 case PropertyNotify: 1472 case PropertyNotify:
1473 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
1446 if (ev.xproperty.atom == xa[XA_VT_SELECTION] 1474 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1447 && ev.xproperty.state == PropertyNewValue) 1475 && ev.xproperty.state == PropertyNewValue)
1448 selection_property (ev.xproperty.window, ev.xproperty.atom); 1476 selection_property (ev.xproperty.window, ev.xproperty.atom);
1449 1477
1450 break; 1478 break;
1451 1479
1452 case SelectionClear: 1480 case SelectionClear:
1453 selection_clear (); 1481 selection_clear ();
… …
1458 selection_paste (ev.xselection.requestor, ev.xselection.property, true); 1486 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1459 break; 1487 break;
1460 1488
1461 case SelectionRequest: 1489 case SelectionRequest:
1462 selection_send (ev.xselectionrequest); 1490 selection_send (ev.xselectionrequest);
1491 break;
1492
1493 case MapNotify:
1494#ifdef HAVE_BG_PIXMAP
1495 /* This is needed spcifically to fix the case of no window manager or a
1496 * non-reparenting window manager. In those cases we never get first
1497 * ConfigureNotify. Also that speeds startup under normal WM, by taking
1498 * care of multiplicity of ConfigureNotify events arriwing while WM does
1499 * reparenting.
1500 * We should not render background immidiately, as there could be several
1501 * ConfigureNotify's to follow. Lets take care of all of them in one scoop
1502 * by scheduling background redraw as soon as we can, but giving a short
1503 * bit of time for ConfigureNotifies to arrive.
1504 * We should render background PRIOR to drawing any text, but AFTER all
1505 * of ConfigureNotifys for the best results.
1506 */
1507 if (bgPixmap.flags & bgPixmap_t::isInvalid)
1508 update_background_ev.start (0.025);
1509#endif
1510 mapped = 1;
1511#ifdef TEXT_BLINK
1512 text_blink_ev.start ();
1513#endif
1514 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1463 break; 1515 break;
1464 1516
1465 case UnmapNotify: 1517 case UnmapNotify:
1466 mapped = 0; 1518 mapped = 0;
1467#ifdef TEXT_BLINK 1519#ifdef TEXT_BLINK
1468 text_blink_ev.stop (); 1520 text_blink_ev.stop ();
1469#endif 1521#endif
1522 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1470 break; 1523 break;
1471
1472 case MapNotify:
1473 mapped = 1;
1474#ifdef TEXT_BLINK
1475 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1476#endif
1477 break;
1478
1479#ifdef TRANSPARENT
1480 case ReparentNotify:
1481 rootwin_cb (ev);
1482 break;
1483#endif /* TRANSPARENT */
1484 1524
1485 case GraphicsExpose: 1525 case GraphicsExpose:
1486 case Expose: 1526 case Expose:
1487 if (ev.xany.window == vt) 1527 if (ev.xany.window == vt)
1488 { 1528 {
1489 do 1529 do
1530 {
1490 scr_expose (ev.xexpose.x, ev.xexpose.y, 1531 scr_expose (ev.xexpose.x, ev.xexpose.y,
1491 ev.xexpose.width, ev.xexpose.height, False); 1532 ev.xexpose.width, ev.xexpose.height, False);
1533 }
1492 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)); 1534 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1493 1535
1494 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1536 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1495 1537
1496 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)) 1538 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1539 {
1497 scr_expose (ev.xexpose.x, ev.xexpose.y, 1540 scr_expose (ev.xexpose.x, ev.xexpose.y,
1498 ev.xexpose.width, ev.xexpose.height, False); 1541 ev.xexpose.width, ev.xexpose.height, False);
1542 }
1499 1543
1500 scr_refresh (refresh_type); 1544 want_refresh = 1;
1501 } 1545 }
1502 else 1546 else
1503 { 1547 {
1504 XEvent unused_event; 1548 XEvent unused_event;
1505 1549
1506 while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event)) 1550 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1507 ; 1551 ;
1508 while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event)) 1552 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1509 ; 1553 ;
1510 1554
1511 if (isScrollbarWindow (ev.xany.window)) 1555 if (scrollBar.state && ev.xany.window == scrollBar.win)
1512 { 1556 {
1513 scrollBar.setIdle (); 1557 scrollBar.state = STATE_IDLE;
1514 scrollbar_show (0); 1558 scrollbar_show (0);
1515 } 1559 }
1516#ifdef MENUBAR
1517 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1518 menubar_expose ();
1519#endif
1520
1521#ifdef TRANSPARENT
1522 if (am_transparent && ev.xany.window == parent[0])
1523 XClearWindow (disp, ev.xany.window);
1524#endif
1525 } 1560 }
1526 break; 1561 break;
1527 1562
1528 case MotionNotify: 1563 case MotionNotify:
1529#ifdef POINTER_BLANK 1564#ifdef POINTER_BLANK
1530 if (hidden_pointer) 1565 if (hidden_pointer)
1531 pointer_unblank (); 1566 pointer_unblank ();
1532#endif 1567#endif
1533#if MENUBAR 1568 if ((priv_modes & PrivMode_MouseBtnEvent && ev.xbutton.state & (Button1Mask|Button2Mask|Button3Mask))
1534 if (isMenuBarWindow (ev.xany.window)) 1569 || priv_modes & PrivMode_MouseAnyEvent)
1535 {
1536 menubar_control (ev.xbutton); 1570 mouse_report (ev.xbutton);
1537 break;
1538 }
1539#endif
1540 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1571 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1541 break; 1572 break;
1542 1573
1543 if (ev.xany.window == vt) 1574 if (ev.xany.window == vt)
1544 { 1575 {
1576 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1577 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1578 ; // nop
1545 if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1579 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1546 { 1580 {
1547 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev)) 1581 while (XCheckTypedWindowEvent (dpy, vt, MotionNotify, &ev))
1548 ; 1582 ;
1549 1583
1550 XQueryPointer (disp, vt, 1584 XQueryPointer (dpy, vt,
1551 &unused_root, &unused_child, 1585 &unused_root, &unused_child,
1552 &unused_root_x, &unused_root_y, 1586 &unused_root_x, &unused_root_y,
1553 &ev.xbutton.x, &ev.xbutton.y, 1587 &ev.xbutton.x, &ev.xbutton.y,
1554 &ev.xbutton.state); 1588 &ev.xbutton.state);
1555#ifdef MOUSE_THRESHOLD 1589#ifdef MOUSE_THRESHOLD
… …
1575 int dist; 1609 int dist;
1576 1610
1577 /* don't clobber the current delay if we are 1611 /* don't clobber the current delay if we are
1578 * already in the middle of scrolling. 1612 * already in the middle of scrolling.
1579 */ 1613 */
1580 if (!sel_scroll_ev.active) 1614 if (!sel_scroll_ev.is_active ())
1581 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1615 sel_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1582 1616
1583 /* save the event params so we can highlight 1617 /* save the event params so we can highlight
1584 * the selection in the pending-scroll loop 1618 * the selection in the pending-scroll loop
1585 */ 1619 */
1586 selection_save_x = ev.xbutton.x; 1620 selection_save_x = ev.xbutton.x;
… …
1608 else 1642 else
1609 { 1643 {
1610 /* we are within the text window, so we 1644 /* we are within the text window, so we
1611 * shouldn't be scrolling 1645 * shouldn't be scrolling
1612 */ 1646 */
1613 if (sel_scroll_ev.active)
1614 sel_scroll_ev.stop(); 1647 sel_scroll_ev.stop();
1615 } 1648 }
1616#endif 1649#endif
1617#ifdef MOUSE_THRESHOLD 1650#ifdef MOUSE_THRESHOLD
1618 } 1651 }
1619#endif 1652#endif
1620 } 1653 }
1621 } 1654 }
1622 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1655 else if (scrollBar.state == STATE_MOTION && ev.xany.window == scrollBar.win)
1623 { 1656 {
1624 while (XCheckTypedWindowEvent (disp, scrollBar.win, 1657 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1625 MotionNotify, &ev)) 1658 MotionNotify, &ev))
1626 ; 1659 ;
1627 1660
1628 XQueryPointer (disp, scrollBar.win, 1661 XQueryPointer (dpy, scrollBar.win,
1629 &unused_root, &unused_child, 1662 &unused_root, &unused_child,
1630 &unused_root_x, &unused_root_y, 1663 &unused_root_x, &unused_root_y,
1631 &ev.xbutton.x, &ev.xbutton.y, 1664 &ev.xbutton.x, &ev.xbutton.y,
1632 &unused_mask); 1665 &unused_mask);
1633 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1666 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1634 scrollbar_size ()); 1667 scrollbar_size ());
1635 scr_refresh (refresh_type);
1636 refresh_limit = 0; 1668 want_refresh = 1;
1637 scrollbar_show (1); 1669 scrollbar_show (1);
1638 } 1670 }
1639 break; 1671 break;
1640 } 1672 }
1673
1674#if defined(CURSOR_BLINK)
1675 if (option (Opt_cursorBlink) && ev.type == KeyPress)
1676 {
1677 if (hidden_cursor)
1678 {
1679 hidden_cursor = 0;
1680 want_refresh = 1;
1681 }
1682
1683 cursor_blink_ev.again ();
1684 }
1685#endif
1686
1687#if defined(POINTER_BLANK)
1688 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1689 {
1690 if (ev.type == MotionNotify
1691 || ev.type == ButtonPress
1692 || ev.type == ButtonRelease)
1693 if (hidden_pointer)
1694 pointer_unblank ();
1695
1696 if (ev.type == KeyPress && hidden_pointer == 0)
1697 pointer_blank ();
1698 }
1699#endif
1700
1701 refresh_check ();
1641} 1702}
1642 1703
1643void 1704void
1644rxvt_term::focus_in () 1705rxvt_term::focus_in ()
1645{ 1706{
1646 if (!focus) 1707 if (!focus)
1647 { 1708 {
1648 focus = 1; 1709 focus = 1;
1649 want_refresh = 1; 1710 want_refresh = 1;
1711
1712 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1713
1650#if USE_XIM 1714#if USE_XIM
1651 if (Input_Context != NULL) 1715 if (Input_Context != NULL)
1652 { 1716 {
1653 IMSetStatusPosition (); 1717 IMSetPosition ();
1654 XSetICFocus (Input_Context); 1718 XSetICFocus (Input_Context);
1655 } 1719 }
1656#endif 1720#endif
1657#if CURSOR_BLINK 1721#if CURSOR_BLINK
1658 if (options & Opt_cursorBlink) 1722 if (option (Opt_cursorBlink))
1659 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1723 cursor_blink_ev.again ();
1660#endif 1724#endif
1661#if OFF_FOCUS_FADING 1725#if OFF_FOCUS_FADING
1662 if (rs[Rs_fade]) 1726 if (rs[Rs_fade])
1663 { 1727 {
1664 pix_colors = pix_colors_focused; 1728 pix_colors = pix_colors_focused;
1665 scr_recolour (); 1729 scr_recolour ();
1666 } 1730 }
1667#endif 1731#endif
1732#if ENABLE_FRILLS
1733 if (option (Opt_urgentOnBell))
1734 {
1735 if (XWMHints *h = XGetWMHints(dpy, parent[0]))
1736 {
1737 h->flags &= ~XUrgencyHint;
1738 XSetWMHints (dpy, parent[0], h);
1739 }
1740 }
1741#endif
1668 } 1742 }
1669} 1743}
1670 1744
1671void 1745void
1672rxvt_term::focus_out () 1746rxvt_term::focus_out ()
… …
1674 if (focus) 1748 if (focus)
1675 { 1749 {
1676 focus = 0; 1750 focus = 0;
1677 want_refresh = 1; 1751 want_refresh = 1;
1678 1752
1753 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1754
1679#if ENABLE_FRILLS || ISO_14755 1755#if ENABLE_FRILLS || ISO_14755
1756 if (iso14755buf)
1757 {
1680 iso14755buf = 0; 1758 iso14755buf = 0;
1681#endif 1759# if ISO_14755
1682#if ENABLE_OVERLAY
1683 scr_overlay_off (); 1760 scr_overlay_off ();
1761# endif
1762 }
1684#endif 1763#endif
1685#if USE_XIM 1764#if USE_XIM
1686 if (Input_Context != NULL) 1765 if (Input_Context != NULL)
1687 XUnsetICFocus (Input_Context); 1766 XUnsetICFocus (Input_Context);
1688#endif 1767#endif
1689#if CURSOR_BLINK 1768#if CURSOR_BLINK
1690 if (options & Opt_cursorBlink) 1769 if (option (Opt_cursorBlink))
1691 cursor_blink_ev.stop (); 1770 cursor_blink_ev.stop ();
1771
1692 hidden_cursor = 0; 1772 hidden_cursor = 0;
1693#endif 1773#endif
1694#if OFF_FOCUS_FADING 1774#if OFF_FOCUS_FADING
1695 if (rs[Rs_fade]) 1775 if (rs[Rs_fade])
1696 { 1776 {
… …
1699 } 1779 }
1700#endif 1780#endif
1701 } 1781 }
1702} 1782}
1703 1783
1704#if TRANSPARENT 1784void
1785rxvt_term::update_fade_color (unsigned int idx)
1786{
1787#if OFF_FOCUS_FADING
1788 if (rs[Rs_fade])
1789 {
1790 rgba c;
1791 pix_colors [Color_fade].get (c);
1792 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1793 }
1794#endif
1795}
1796
1797#if ENABLE_TRANSPARENCY || ENABLE_PERL
1705void 1798void
1706rxvt_term::rootwin_cb (XEvent &ev) 1799rxvt_term::rootwin_cb (XEvent &ev)
1707{ 1800{
1708 SET_R (this); 1801 make_current ();
1709 SET_LOCALE (locale);
1710 1802
1803 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1804 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1805 return;
1806
1807# if ENABLE_TRANSPARENCY
1711 switch (ev.type) 1808 switch (ev.type)
1712 { 1809 {
1713 case PropertyNotify: 1810 case PropertyNotify:
1714 /* 1811 /*
1715 * if user used some Esetroot compatible prog to set the root bg, 1812 * if user used some Esetroot compatible prog to set the root bg,
1716 * use the property to determine the pixmap. We use it later on. 1813 * use the property to determine the pixmap. We use it later on.
1717 */ 1814 */
1718 if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID] 1815 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1719 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1816 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1720 return; 1817 {
1818 bgPixmap.set_root_pixmap ();
1819 update_background ();
1820 }
1721 1821
1722 /* FALLTHROUGH */
1723 case ReparentNotify:
1724 if ((options & Opt_transparent) && check_our_parents () && am_transparent)
1725 want_refresh = want_full_refresh = 1;
1726 break; 1822 break;
1727 } 1823 }
1824# endif
1825
1826 refresh_check ();
1728} 1827}
1729#endif 1828#endif
1730 1829
1731void 1830void
1732rxvt_term::button_press (XButtonEvent &ev) 1831rxvt_term::button_press (XButtonEvent &ev)
1733{ 1832{
1734 int reportmode = 0, clickintime; 1833 int reportmode = 0, clickintime;
1735 1834
1736 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1835 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1836
1737 if (!bypass_keystate) 1837 if (!bypass_keystate)
1738 reportmode = !! (priv_modes & PrivMode_mouse_report); 1838 reportmode = !! (priv_modes & PrivMode_mouse_report);
1739 1839
1740 /* 1840 /*
1741 * VT window processing of button press 1841 * VT window processing of button press
1742 */ 1842 */
1743 if (ev.window == vt) 1843 if (ev.window == vt)
1744 { 1844 {
1845 if (HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1846 return;
1847
1745#if ISO_14755 1848#if ISO_14755
1746 // 5.4 1849 // 5.4
1747 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1850 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1748 { 1851 {
1749 iso14755_54 (ev.x, ev.y); 1852 iso14755_54 (ev.x, ev.y);
… …
1761#ifdef MOUSE_REPORT_DOUBLECLICK 1864#ifdef MOUSE_REPORT_DOUBLECLICK
1762 if (ev.button == MEvent.button && clickintime) 1865 if (ev.button == MEvent.button && clickintime)
1763 { 1866 {
1764 /* same button, within alloted time */ 1867 /* same button, within alloted time */
1765 MEvent.clicks++; 1868 MEvent.clicks++;
1869
1766 if (MEvent.clicks > 1) 1870 if (MEvent.clicks > 1)
1767 { 1871 {
1768 /* only report double clicks */ 1872 /* only report double clicks */
1769 MEvent.clicks = 2; 1873 MEvent.clicks = 2;
1770 mouse_report (ev); 1874 mouse_report (ev);
… …
1782 mouse_report (ev); 1886 mouse_report (ev);
1783 } 1887 }
1784#else 1888#else
1785 MEvent.button = ev.button; 1889 MEvent.button = ev.button;
1786 mouse_report (ev); 1890 mouse_report (ev);
1787#endif /* MOUSE_REPORT_DOUBLECLICK */ 1891#endif /* MOUSE_REPORT_DOUBLECLICK */
1788 1892
1789 } 1893 }
1790 else 1894 else
1791 { 1895 {
1792 if (ev.button != MEvent.button) 1896 if (ev.button != MEvent.button)
… …
1802#else 1906#else
1803 selection.rect = false; 1907 selection.rect = false;
1804#endif 1908#endif
1805 1909
1806 /* allow shift+left click to extend selection */ 1910 /* allow shift+left click to extend selection */
1807 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report)) 1911 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1808 { 1912 {
1809 if (MEvent.button == Button1 && clickintime) 1913 if (MEvent.button == Button1 && clickintime)
1810 selection_rotate (ev.x, ev.y); 1914 selection_rotate (ev.x, ev.y);
1811 else 1915 else
1812 selection_extend (ev.x, ev.y, 1); 1916 selection_extend (ev.x, ev.y, 1);
… …
1840 } 1944 }
1841 1945
1842 /* 1946 /*
1843 * Scrollbar window processing of button press 1947 * Scrollbar window processing of button press
1844 */ 1948 */
1845 if (isScrollbarWindow (ev.window)) 1949 if (scrollBar.state && ev.window == scrollBar.win)
1846 { 1950 {
1847 scrollBar.setIdle (); 1951 page_dirn direction = NO_DIR;
1952
1953 if (scrollBar.upButton (ev.y))
1954 direction = UP; /* up */
1955 else if (scrollBar.dnButton (ev.y))
1956 direction = DN; /* down */
1957
1958 scrollBar.state = STATE_IDLE;
1848 /* 1959 /*
1849 * Rxvt-style scrollbar: 1960 * Rxvt-style scrollbar:
1850 * move up if mouse is above slider 1961 * move up if mouse is above slider
1851 * move dn if mouse is below slider 1962 * move dn if mouse is below slider
1852 * 1963 *
… …
1861 /* 1972 /*
1862 * Mouse report disabled scrollbar: 1973 * Mouse report disabled scrollbar:
1863 * arrow buttons - send up/down 1974 * arrow buttons - send up/down
1864 * click on scrollbar - send pageup/down 1975 * click on scrollbar - send pageup/down
1865 */ 1976 */
1866 if ((scrollBar.style == R_SB_NEXT 1977 if (direction == UP)
1867 && scrollbarnext_upButton (ev.y))
1868 || (scrollBar.style == R_SB_RXVT
1869 && scrollbarrxvt_upButton (ev.y)))
1870 tt_printf ("\033[A"); 1978 tt_printf ("\033[A");
1871 else if ((scrollBar.style == R_SB_NEXT 1979 else if (direction == DN)
1872 && scrollbarnext_dnButton (ev.y))
1873 || (scrollBar.style == R_SB_RXVT
1874 && scrollbarrxvt_dnButton (ev.y)))
1875 tt_printf ("\033[B"); 1980 tt_printf ("\033[B");
1876 else 1981 else
1877 switch (ev.button) 1982 switch (ev.button)
1878 { 1983 {
1879 case Button2: 1984 case Button2:
… …
1886 tt_printf ("\033[5~"); 1991 tt_printf ("\033[5~");
1887 break; 1992 break;
1888 } 1993 }
1889 } 1994 }
1890 else 1995 else
1891#endif /* NO_SCROLLBAR_REPORT */ 1996#endif /* NO_SCROLLBAR_REPORT */
1892
1893 {
1894 char upordown = 0;
1895
1896 if (scrollBar.style == R_SB_NEXT)
1897 { 1997 {
1898 if (scrollbarnext_upButton (ev.y)) 1998 if (direction != NO_DIR)
1899 upordown = -1; /* up */
1900 else if (scrollbarnext_dnButton (ev.y))
1901 upordown = 1; /* down */
1902 }
1903 else if (scrollBar.style == R_SB_RXVT)
1904 {
1905 if (scrollbarrxvt_upButton (ev.y))
1906 upordown = -1; /* up */
1907 else if (scrollbarrxvt_dnButton (ev.y))
1908 upordown = 1; /* down */
1909 }
1910 if (upordown)
1911 { 1999 {
1912#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 2000#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2001 if (!cont_scroll_ev.is_active ())
1913 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 2002 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1914#endif 2003#endif
1915 if (scr_page (upordown < 0 ? UP : DN, 1)) 2004 if (scr_page (direction, 1))
1916 { 2005 {
1917 if (upordown < 0) 2006 if (direction == UP)
1918 scrollBar.setUp (); 2007 scrollBar.state = STATE_UP;
1919 else 2008 else
1920 scrollBar.setDn (); 2009 scrollBar.state = STATE_DOWN;
1921 } 2010 }
1922 } 2011 }
1923 else 2012 else
1924 switch (ev.button) 2013 switch (ev.button)
1925 { 2014 {
1926 case Button2: 2015 case Button2:
1927 switch (scrollbar_align) 2016 switch (scrollBar.align)
1928 { 2017 {
1929 case R_SB_ALIGN_TOP: 2018 case R_SB_ALIGN_TOP:
1930 csrO = 0; 2019 csrO = 0;
1931 break; 2020 break;
1932 case R_SB_ALIGN_CENTRE: 2021 case R_SB_ALIGN_CENTRE:
… …
1940 if (scrollBar.style == R_SB_XTERM 2029 if (scrollBar.style == R_SB_XTERM
1941 || scrollbar_above_slider (ev.y) 2030 || scrollbar_above_slider (ev.y)
1942 || scrollbar_below_slider (ev.y)) 2031 || scrollbar_below_slider (ev.y))
1943 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ()); 2032 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ());
1944 2033
1945 scrollBar.setMotion (); 2034 scrollBar.state = STATE_MOTION;
1946 break; 2035 break;
1947 2036
1948 case Button1: 2037 case Button1:
1949 if (scrollbar_align == R_SB_ALIGN_CENTRE) 2038 if (scrollBar.align == R_SB_ALIGN_CENTRE)
1950 csrO = ev.y - scrollBar.top; 2039 csrO = ev.y - scrollBar.top;
1951 /* FALLTHROUGH */ 2040 /* FALLTHROUGH */
1952 2041
1953 case Button3: 2042 case Button3:
1954 if (scrollBar.style != R_SB_XTERM) 2043 if (scrollBar.style != R_SB_XTERM)
… …
1964 scr_page (DN, nrow - 1); 2053 scr_page (DN, nrow - 1);
1965# else 2054# else
1966 scr_page (DN, nrow / 4); 2055 scr_page (DN, nrow / 4);
1967# endif 2056# endif
1968 else 2057 else
1969 scrollBar.setMotion (); 2058 scrollBar.state = STATE_MOTION;
1970 } 2059 }
1971 else 2060 else
1972 { 2061 {
1973 scr_page ((ev.button == Button1 ? DN : UP), 2062 scr_page ((ev.button == Button1 ? DN : UP),
1974 (nrow 2063 (nrow
… …
1977 } 2066 }
1978 2067
1979 break; 2068 break;
1980 } 2069 }
1981 } 2070 }
2071
1982 return; 2072 return;
1983 } 2073 }
1984#if MENUBAR
1985 /*
1986 * Menubar window processing of button press
1987 */
1988 if (isMenuBarWindow (ev.window))
1989 menubar_control (ev);
1990#endif
1991} 2074}
1992 2075
1993void 2076void
1994rxvt_term::button_release (XButtonEvent &ev) 2077rxvt_term::button_release (XButtonEvent &ev)
1995{ 2078{
… …
1997 2080
1998 csrO = 0; /* reset csr Offset */ 2081 csrO = 0; /* reset csr Offset */
1999 if (!bypass_keystate) 2082 if (!bypass_keystate)
2000 reportmode = !! (priv_modes & PrivMode_mouse_report); 2083 reportmode = !! (priv_modes & PrivMode_mouse_report);
2001 2084
2002 if (scrollbar_isUpDn ()) 2085 if (scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
2003 { 2086 {
2004 scrollBar.setIdle (); 2087 scrollBar.state = STATE_IDLE;
2005 scrollbar_show (0); 2088 scrollbar_show (0);
2006#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2007 refresh_type &= ~SMOOTH_REFRESH;
2008#endif
2009 } 2089 }
2010 2090
2011#ifdef SELECTION_SCROLLING 2091#ifdef SELECTION_SCROLLING
2012 if (sel_scroll_ev.active)
2013 sel_scroll_ev.stop(); 2092 sel_scroll_ev.stop();
2014#endif 2093#endif
2015 2094
2016 if (ev.window == vt) 2095 if (ev.window == vt)
2017 { 2096 {
2097 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2098 return;
2099
2018#if ISO_14755 2100#if ISO_14755
2019 // 5.4 2101 // 5.4
2020 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 2102 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2021 return; 2103 return;
2022#endif 2104#endif
2105
2023 if (reportmode) 2106 if (reportmode)
2024 { 2107 {
2025 /* mouse report from vt window */ 2108 /* mouse report from vt window */
2026 /* don't report release of wheel "buttons" */ 2109 /* don't report release of wheel "buttons" */
2027 if (ev.button >= 4) 2110 if (ev.button >= 4)
… …
2038 mouse_report (ev); 2121 mouse_report (ev);
2039 } 2122 }
2040#else /* MOUSE_REPORT_DOUBLECLICK */ 2123#else /* MOUSE_REPORT_DOUBLECLICK */
2041 MEvent.button = AnyButton; 2124 MEvent.button = AnyButton;
2042 mouse_report (ev); 2125 mouse_report (ev);
2043#endif /* MOUSE_REPORT_DOUBLECLICK */ 2126#endif /* MOUSE_REPORT_DOUBLECLICK */
2044 return; 2127 return;
2045 } 2128 }
2046 2129
2047 /* 2130 /*
2048 * dumb hack to compensate for the failure of click-and-drag 2131 * dumb hack to compensate for the failure of click-and-drag
… …
2057 { 2140 {
2058 case Button1: 2141 case Button1:
2059 case Button3: 2142 case Button3:
2060 selection_make (ev.time); 2143 selection_make (ev.time);
2061 break; 2144 break;
2145
2062 case Button2: 2146 case Button2:
2063 selection_request (ev.time, ev.x, ev.y); 2147 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2148 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2064 break; 2149 break;
2150
2065#ifdef MOUSE_WHEEL 2151#ifdef MOUSE_WHEEL
2066 case Button4: 2152 case Button4:
2067 case Button5: 2153 case Button5:
2068 { 2154 {
2069 int i; 2155 int i;
… …
2071 2157
2072 v = ev.button == Button4 ? UP : DN; 2158 v = ev.button == Button4 ? UP : DN;
2073 2159
2074 if (ev.state & ShiftMask) 2160 if (ev.state & ShiftMask)
2075 i = 1; 2161 i = 1;
2076 else if (options & Opt_mouseWheelScrollPage) 2162 else if (option (Opt_mouseWheelScrollPage))
2077 i = nrow - 1; 2163 i = nrow - 1;
2078 else 2164 else
2079 i = 5; 2165 i = 5;
2080 2166
2081# ifdef MOUSE_SLIP_WHEELING 2167# ifdef MOUSE_SLIP_WHEELING
… …
2083 { 2169 {
2084 mouse_slip_wheel_speed += v ? -1 : 1; 2170 mouse_slip_wheel_speed += v ? -1 : 1;
2085 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow; 2171 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2086 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow; 2172 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2087 2173
2088 if (slip_wheel_ev.at < NOW) 2174 if (!slip_wheel_ev.is_active ())
2089 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; 2175 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2090
2091 slip_wheel_ev.start ();
2092 } 2176 }
2093 else 2177 else
2178# endif
2094 { 2179 {
2095# endif
2096# ifdef JUMP_MOUSE_WHEEL
2097 scr_page (v, i); 2180 scr_page (v, i);
2098 scr_refresh (SMOOTH_REFRESH);
2099 scrollbar_show (1); 2181 scrollbar_show (1);
2100# else
2101 while (i--)
2102 {
2103 scr_page (v, 1);
2104 scr_refresh (SMOOTH_REFRESH);
2105 scrollbar_show (1);
2106 }
2107# endif
2108# ifdef MOUSE_SLIP_WHEELING
2109 } 2182 }
2110#endif
2111 } 2183 }
2112 break; 2184 break;
2113#endif 2185#endif
2114 } 2186 }
2115 } 2187 }
2116#ifdef MENUBAR
2117 else if (isMenuBarWindow (ev.window))
2118 menubar_control (ev);
2119#endif
2120} 2188}
2121
2122#ifdef TRANSPARENT
2123#if TINTING
2124/* taken from aterm-0.4.2 */
2125
2126typedef uint32_t RUINT32T;
2127
2128void ShadeXImage(rxvt_display *display, XImage* srcImage, int shade, int rm, int gm, int bm)
2129{
2130 int sh_r, sh_g, sh_b;
2131 RUINT32T mask_r, mask_g, mask_b;
2132 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2133 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2134 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2135 int i;
2136
2137 Visual *visual = display->visual;
2138
2139 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2140
2141 /* for convenience */
2142 mask_r = visual->red_mask;
2143 mask_g = visual->green_mask;
2144 mask_b = visual->blue_mask;
2145
2146 /* boring lookup table pre-initialization */
2147 switch (srcImage->bits_per_pixel) {
2148 case 15:
2149 if ((mask_r != 0x7c00) ||
2150 (mask_g != 0x03e0) ||
2151 (mask_b != 0x001f))
2152 return;
2153 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32));
2154 lookup_r = lookup;
2155 lookup_g = lookup+32;
2156 lookup_b = lookup+32+32;
2157 sh_r = 10;
2158 sh_g = 5;
2159 sh_b = 0;
2160 break;
2161 case 16:
2162 if ((mask_r != 0xf800) ||
2163 (mask_g != 0x07e0) ||
2164 (mask_b != 0x001f))
2165 return;
2166 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32));
2167 lookup_r = lookup;
2168 lookup_g = lookup+32;
2169 lookup_b = lookup+32+64;
2170 sh_r = 11;
2171 sh_g = 5;
2172 sh_b = 0;
2173 break;
2174 case 24:
2175 if ((mask_r != 0xff0000) ||
2176 (mask_g != 0x00ff00) ||
2177 (mask_b != 0x0000ff))
2178 return;
2179 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2180 lookup_r = lookup;
2181 lookup_g = lookup+256;
2182 lookup_b = lookup+256+256;
2183 sh_r = 16;
2184 sh_g = 8;
2185 sh_b = 0;
2186 break;
2187 case 32:
2188 if ((mask_r != 0xff0000) ||
2189 (mask_g != 0x00ff00) ||
2190 (mask_b != 0x0000ff))
2191 return;
2192 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2193 lookup_r = lookup;
2194 lookup_g = lookup+256;
2195 lookup_b = lookup+256+256;
2196 sh_r = 16;
2197 sh_g = 8;
2198 sh_b = 0;
2199 break;
2200 default:
2201 return; /* we do not support this color depth */
2202 }
2203
2204 /* prepare limits for color transformation (each channel is handled separately) */
2205 if (shade < 0) {
2206 shade = -shade;
2207 if (shade < 0) shade = 0;
2208 if (shade > 100) shade = 100;
2209
2210 lower_lim_r = 65535-rm;
2211 lower_lim_g = 65535-gm;
2212 lower_lim_b = 65535-bm;
2213
2214 lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100);
2215 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100);
2216 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100);
2217
2218 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
2219 } else {
2220 if (shade < 0) shade = 0;
2221 if (shade > 100) shade = 100;
2222
2223 lower_lim_r = lower_lim_g = lower_lim_b = 0;
2224
2225 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
2226 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);
2227 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100);
2228 }
2229
2230 /* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */
2231 if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 ))
2232 {
2233 unsigned int tmp;
2234
2235 tmp = lower_lim_r;
2236 lower_lim_r = lower_lim_b;
2237 lower_lim_b = tmp;
2238
2239 tmp = upper_lim_r;
2240 upper_lim_r = upper_lim_b;
2241 upper_lim_b = tmp;
2242 }
2243
2244 /* fill our lookup tables */
2245 for (i = 0; i <= mask_r>>sh_r; i++)
2246 {
2247 RUINT32T tmp;
2248 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r));
2249 tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r);
2250 lookup_r[i] = (tmp/65535)<<sh_r;
2251 }
2252 for (i = 0; i <= mask_g>>sh_g; i++)
2253 {
2254 RUINT32T tmp;
2255 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g));
2256 tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g);
2257 lookup_g[i] = (tmp/65535)<<sh_g;
2258 }
2259 for (i = 0; i <= mask_b>>sh_b; i++)
2260 {
2261 RUINT32T tmp;
2262 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b));
2263 tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b);
2264 lookup_b[i] = (tmp/65535)<<sh_b;
2265 }
2266
2267 /* apply table to input image (replacing colors by newly calculated ones) */
2268 switch (srcImage->bits_per_pixel)
2269 {
2270 case 15:
2271 {
2272 unsigned short *p1, *pf, *p, *pl;
2273 p1 = (unsigned short *) srcImage->data;
2274 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2275 while (p1 < pf)
2276 {
2277 p = p1;
2278 pl = p1 + srcImage->width;
2279 for (; p < pl; p++)
2280 {
2281 *p = lookup_r[(*p & 0x7c00)>>10] |
2282 lookup_g[(*p & 0x03e0)>> 5] |
2283 lookup_b[(*p & 0x001f)];
2284 }
2285 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2286 }
2287 break;
2288 }
2289 case 16:
2290 {
2291 unsigned short *p1, *pf, *p, *pl;
2292 p1 = (unsigned short *) srcImage->data;
2293 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2294 while (p1 < pf)
2295 {
2296 p = p1;
2297 pl = p1 + srcImage->width;
2298 for (; p < pl; p++)
2299 {
2300 *p = lookup_r[(*p & 0xf800)>>11] |
2301 lookup_g[(*p & 0x07e0)>> 5] |
2302 lookup_b[(*p & 0x001f)];
2303 }
2304 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2305 }
2306 break;
2307 }
2308 case 24:
2309 {
2310 unsigned char *p1, *pf, *p, *pl;
2311 p1 = (unsigned char *) srcImage->data;
2312 pf = (unsigned char *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2313 while (p1 < pf)
2314 {
2315 p = p1;
2316 pl = p1 + srcImage->width * 3;
2317 for (; p < pl; p += 3)
2318 {
2319 p[0] = lookup_r[(p[0] & 0xff0000)>>16];
2320 p[1] = lookup_r[(p[1] & 0x00ff00)>> 8];
2321 p[2] = lookup_r[(p[2] & 0x0000ff)];
2322 }
2323 p1 = (unsigned char *) ((char *) p1 + srcImage->bytes_per_line);
2324 }
2325 break;
2326 }
2327 case 32:
2328 {
2329 RUINT32T *p1, *pf, *p, *pl;
2330 p1 = (RUINT32T *) srcImage->data;
2331 pf = (RUINT32T *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2332
2333 while (p1 < pf)
2334 {
2335 p = p1;
2336 pl = p1 + srcImage->width;
2337 for (; p < pl; p++)
2338 {
2339 *p = lookup_r[(*p & 0xff0000)>>16] |
2340 lookup_g[(*p & 0x00ff00)>> 8] |
2341 lookup_b[(*p & 0x0000ff)] |
2342 (*p & ~0xffffff);
2343 }
2344 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
2345 }
2346 break;
2347 }
2348 }
2349
2350 free (lookup);
2351}
2352#endif
2353
2354/*
2355 * Check our parents are still who we think they are.
2356 * Do transparency updates if required
2357 */
2358int
2359rxvt_term::check_our_parents ()
2360{
2361 int i, pchanged, aformat, have_pixmap, rootdepth;
2362 unsigned long nitems, bytes_after;
2363 Atom atype;
2364 unsigned char *prop = NULL;
2365 Window root, oldp, *list;
2366 Pixmap rootpixmap = None;
2367 XWindowAttributes wattr, wrootattr;
2368 dDisp;
2369
2370 pchanged = 0;
2371
2372 if (!(options & Opt_transparent))
2373 return pchanged; /* Don't try any more */
2374
2375 XGetWindowAttributes (disp, display->root, &wrootattr);
2376 rootdepth = wrootattr.depth;
2377
2378 XGetWindowAttributes (disp, parent[0], &wattr);
2379
2380 if (rootdepth != wattr.depth)
2381 {
2382 if (am_transparent)
2383 {
2384 pchanged = 1;
2385 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2386 am_transparent = am_pixmap_trans = 0;
2387 }
2388
2389 return pchanged; /* Don't try any more */
2390 }
2391
2392 /* Get all X ops out of the queue so that our information is up-to-date. */
2393 XSync (disp, False);
2394
2395 /*
2396 * Make the frame window set by the window manager have
2397 * the root background. Some window managers put multiple nested frame
2398 * windows for each client, so we have to take care about that.
2399 */
2400 i = (xa[XA_XROOTPMAP_ID]
2401 && XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID],
2402 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2403 &nitems, &bytes_after, &prop) == Success);
2404
2405 if (!i || prop == NULL)
2406 i = (xa[XA_ESETROOT_PMAP_ID]
2407 && XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID],
2408 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2409 &nitems, &bytes_after, &prop) == Success);
2410
2411 if (!i || prop == NULL
2412#if TINTING
2413 || !rs[Rs_color + Color_tint]
2414#endif
2415 )
2416 have_pixmap = 0;
2417 else
2418 {
2419 have_pixmap = 1;
2420 rootpixmap = *(Pixmap *)prop;
2421 XFree (prop);
2422 }
2423
2424 if (have_pixmap)
2425 {
2426 /*
2427 * Copy display->root pixmap transparency
2428 */
2429 int sx, sy, nx, ny;
2430 unsigned int nw, nh;
2431 Window cr;
2432 XImage *image;
2433 GC gc;
2434 XGCValues gcvalue;
2435
2436 XTranslateCoordinates (disp, parent[0], display->root,
2437 0, 0, &sx, &sy, &cr);
2438 nw = (unsigned int)szHint.width;
2439 nh = (unsigned int)szHint.height;
2440 nx = ny = 0;
2441
2442 if (sx < 0)
2443 {
2444 nw += sx;
2445 nx = -sx;
2446 sx = 0;
2447 }
2448
2449 if (sy < 0)
2450 {
2451 nh += sy;
2452 ny = -sy;
2453 sy = 0;
2454 }
2455
2456 min_it (nw, (unsigned int) (wrootattr.width - sx));
2457 min_it (nh, (unsigned int) (wrootattr.height - sy));
2458
2459 XSync (disp, False);
2460 allowedxerror = -1;
2461 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2462
2463 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2464 /* XXX: may need a delay here? */
2465 allowedxerror = 0;
2466
2467 if (image == NULL)
2468 {
2469 if (am_transparent && am_pixmap_trans)
2470 {
2471 pchanged = 1;
2472 if (pixmap != None)
2473 {
2474 XFreePixmap (disp, pixmap);
2475 pixmap = None;
2476 }
2477 }
2478
2479 am_pixmap_trans = 0;
2480 }
2481 else
2482 {
2483 if (pixmap != None)
2484 XFreePixmap (disp, pixmap);
2485
2486#if TINTING
2487 if (ISSET_PIXCOLOR (Color_tint))
2488 {
2489 unsigned short rm, gm, bm;
2490 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2491
2492 pix_colors_focused[Color_tint].get (display, rm, gm, bm);
2493
2494 ShadeXImage (display, image, shade, rm, gm, bm);
2495 }
2496#endif
2497
2498 pixmap = XCreatePixmap (disp, vt,
2499 szHint.width, szHint.height, image->depth);
2500 gc = XCreateGC (disp, vt, 0UL, &gcvalue);
2501 XPutImage (disp, pixmap, gc, image, 0, 0,
2502 nx, ny, image->width, image->height);
2503 XFreeGC (disp, gc);
2504 XDestroyImage (image);
2505 XSetWindowBackgroundPixmap (disp, parent[0], pixmap);
2506 XClearWindow (disp, parent[0]);
2507
2508 if (!am_transparent || !am_pixmap_trans)
2509 pchanged = 1;
2510
2511 am_transparent = am_pixmap_trans = 1;
2512 }
2513 }
2514
2515 if (am_pixmap_trans)
2516 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2517 else
2518 {
2519 unsigned int n;
2520 /*
2521 * InheritPixmap transparency
2522 */
2523 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2524 {
2525 oldp = parent[i];
2526 XQueryTree (disp, parent[i - 1], &root,
2527 &parent[i], &list, &n);
2528 XFree (list);
2529
2530 if (parent[i] == display->root)
2531 {
2532 if (oldp != None)
2533 pchanged = 1;
2534
2535 break;
2536 }
2537
2538 if (oldp != parent[i])
2539 pchanged = 1;
2540 }
2541
2542 n = 0;
2543
2544 if (pchanged)
2545 {
2546 for (; n < (unsigned int)i; n++)
2547 {
2548 XGetWindowAttributes (disp, parent[n], &wattr);
2549 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2550 {
2551 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2552 break;
2553 }
2554 }
2555 }
2556
2557 if (n > (int) (sizeof (parent) / sizeof (parent[0])))
2558 {
2559 XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]);
2560 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2561 am_transparent = 0;
2562 /* XXX: also turn off Opt_transparent? */
2563 }
2564 else
2565 {
2566#if WAIT_FOR_WM
2567 /* wait (an arbitrary period) for the WM to do its thing
2568 * needed for fvwm2.2.2 (and before?) */
2569 sleep (1);
2570#endif
2571 for (n = 0; n < (unsigned int)i; n++)
2572 {
2573 XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative);
2574 XClearWindow (disp, parent[n]);
2575 }
2576
2577 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2578 am_transparent = 1;
2579 }
2580
2581 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2582 parent[i] = None;
2583 }
2584
2585 if (scrollBar.win)
2586 {
2587 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);
2588 scrollBar.setIdle ();
2589 scrollbar_show (0);
2590 }
2591
2592 if (am_transparent)
2593 {
2594 want_refresh = want_full_refresh = 1;
2595 if (am_pixmap_trans)
2596 flush ();
2597 }
2598
2599 return pchanged;
2600}
2601#endif
2602 2189
2603/*}}} */ 2190/*}}} */
2604 2191
2605bool 2192bool
2606rxvt_term::cmd_parse () 2193rxvt_term::cmd_parse ()
2607{ 2194{
2608 bool flag = false; 2195 bool flag = false;
2609 unicode_t ch = NOCHAR; 2196 wchar_t ch = NOCHAR;
2610 unsigned char *seq_begin; // remember start of esc-sequence here 2197 char *seq_begin; // remember start of esc-sequence here
2611 2198
2612 for (;;) 2199 for (;;)
2613 { 2200 {
2614 if (ch == NOCHAR) 2201 if (ch == NOCHAR)
2615 { 2202 {
2616 seq_begin = cmdbuf_ptr; 2203 seq_begin = cmdbuf_ptr;
2617 ch = next_char (); 2204 ch = next_char ();
2618 }
2619 2205
2620 if (ch == NOCHAR) // TODO: improve 2206 if (ch == NOCHAR)
2621 break; 2207 break;
2208 }
2622 2209
2623 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2210 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)
2624 { 2211 {
2625 if (!seen_input) 2212 if (!seen_input)
2626 { 2213 {
… …
2635 if (seen_resize && cmd_pid) 2222 if (seen_resize && cmd_pid)
2636 kill (-cmd_pid, SIGWINCH); 2223 kill (-cmd_pid, SIGWINCH);
2637 } 2224 }
2638 2225
2639 /* Read a text string from the input buffer */ 2226 /* Read a text string from the input buffer */
2640 unicode_t buf[UBUFSIZ]; 2227 wchar_t buf[UBUFSIZ];
2641 bool refreshnow = false; 2228 bool refreshnow = false;
2642 int nlines = 0; 2229 int nlines = 0;
2643 unicode_t *str = buf; 2230 wchar_t *str = buf;
2644 unicode_t *eol = str + min (ncol, UBUFSIZ); 2231 wchar_t *eol = str + min (ncol, UBUFSIZ);
2645 2232
2646 for (;;) 2233 for (;;)
2647 { 2234 {
2648 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2235 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2649 break; 2236 break;
… …
2655 if (ch == C0_LF) 2242 if (ch == C0_LF)
2656 nlines++; 2243 nlines++;
2657 2244
2658 refresh_count++; 2245 refresh_count++;
2659 2246
2660 if (!(options & Opt_jumpScroll) 2247 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1)
2661 || (refresh_count >= refresh_limit * (nrow - 1)))
2662 { 2248 {
2249 refresh_count = 0;
2250
2251 if (!option (Opt_skipScroll) || ev_time () > ev::now () + 1. / 60.)
2252 {
2663 refreshnow = true; 2253 refreshnow = true;
2664 ch = NOCHAR; 2254 ch = NOCHAR;
2665 break; 2255 break;
2256 }
2666 } 2257 }
2667 2258
2668 // scr_add_lines only works for nlines <= nrow - 1. 2259 // scr_add_lines only works for nlines <= nrow - 1.
2669 if (nlines >= nrow - 1) 2260 if (nlines >= nrow - 1)
2670 { 2261 {
2262 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2263 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2671 scr_add_lines (buf, nlines, str - buf); 2264 scr_add_lines (buf, str - buf, nlines);
2265
2672 nlines = 0; 2266 nlines = 0;
2673 str = buf; 2267 str = buf;
2674 eol = str + min (ncol, UBUFSIZ); 2268 eol = str + min (ncol, UBUFSIZ);
2675 } 2269 }
2676 2270
… …
2689 2283
2690 seq_begin = cmdbuf_ptr; 2284 seq_begin = cmdbuf_ptr;
2691 ch = next_char (); 2285 ch = next_char ();
2692 } 2286 }
2693 2287
2288 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2289 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2694 scr_add_lines (buf, nlines, str - buf); 2290 scr_add_lines (buf, str - buf, nlines);
2695 2291
2696 /* 2292 /*
2697 * If there have been a lot of new lines, then update the screen 2293 * If there have been a lot of new lines, then update the screen
2698 * What the heck I'll cheat and only refresh less than every page-full. 2294 * What the heck we'll cheat and only refresh less than every page-full.
2699 * the number of pages between refreshes is refresh_limit, which 2295 * if skipScroll is enabled.
2700 * is incremented here because we must be doing flat-out scrolling.
2701 */ 2296 */
2702 if (refreshnow) 2297 if (refreshnow)
2703 { 2298 {
2704 if ((options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2705 refresh_limit++;
2706 else
2707 {
2708 flag = true; 2299 flag = true;
2709 scr_refresh (refresh_type); 2300 scr_refresh ();
2710 } 2301 want_refresh = 1;
2711 } 2302 }
2712 2303
2713 } 2304 }
2714 else 2305 else
2715 { 2306 {
… …
2729 } 2320 }
2730 2321
2731 return flag; 2322 return flag;
2732} 2323}
2733 2324
2734// read the next octet
2735unicode_t
2736rxvt_term::next_octet ()
2737{
2738 return cmdbuf_ptr < cmdbuf_endp
2739 ? *cmdbuf_ptr++
2740 : NOCHAR;
2741}
2742
2743// read the next character 2325// read the next character
2744unicode_t 2326wchar_t
2745rxvt_term::next_char () 2327rxvt_term::next_char () NOTHROW
2746{ 2328{
2747 while (cmdbuf_ptr < cmdbuf_endp) 2329 while (cmdbuf_ptr < cmdbuf_endp)
2748 { 2330 {
2749 // assume 7-bit to be ascii ALWAYS 2331 // assume 7-bit to be ascii ALWAYS
2750 if (*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2332 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
2751 return *cmdbuf_ptr++; 2333 return *cmdbuf_ptr++;
2752 2334
2753 wchar_t wc; 2335 wchar_t wc;
2754 size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2336 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2755 2337
2756 if (len == (size_t)-2) 2338 if (len == (size_t)-2)
2757 { 2339 {
2758 // the mbstate stores incomplete sequences. didn't know this :/ 2340 // the mbstate stores incomplete sequences. didn't know this :/
2759 cmdbuf_ptr = cmdbuf_endp; 2341 cmdbuf_ptr = cmdbuf_endp;
2760 break; 2342 break;
2761 } 2343 }
2762 2344
2763 if (len == (size_t)-1) 2345 if (len == (size_t)-1)
2764 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2346 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2765 2347
2766 // assume wchar == unicode 2348 // assume wchar == unicode
2767 cmdbuf_ptr += len; 2349 cmdbuf_ptr += len;
2768 return wc & UNICODE_MASK; 2350 return wc & UNICODE_MASK;
2769 } 2351 }
2770 2352
2771 return NOCHAR; 2353 return NOCHAR;
2772} 2354}
2355
2356// read the next octet
2357uint32_t
2358rxvt_term::next_octet () NOTHROW
2359{
2360 return cmdbuf_ptr < cmdbuf_endp
2361 ? (unsigned char)*cmdbuf_ptr++
2362 : NOCHAR;
2363}
2364
2365static class out_of_input out_of_input;
2773 2366
2774/* rxvt_cmd_getc () - Return next input character */ 2367/* rxvt_cmd_getc () - Return next input character */
2775/* 2368/*
2776 * Return the next input character after first passing any keyboard input 2369 * Return the next input character after first passing any keyboard input
2777 * to the command. 2370 * to the command.
2778 */ 2371 */
2779unicode_t 2372wchar_t
2780rxvt_term::cmd_getc () 2373rxvt_term::cmd_getc () THROW ((class out_of_input))
2781{ 2374{
2782 unicode_t c = next_char (); 2375 wchar_t c = next_char ();
2783 2376
2784 if (c == NOCHAR) 2377 if (c == NOCHAR)
2785 throw out_of_input; 2378 throw out_of_input;
2786 2379
2787 return c; 2380 return c;
2788} 2381}
2789 2382
2790unicode_t 2383uint32_t
2791rxvt_term::cmd_get8 () 2384rxvt_term::cmd_get8 () THROW ((class out_of_input))
2792{ 2385{
2793 unicode_t c = next_octet (); 2386 uint32_t c = next_octet ();
2794 2387
2795 if (c == NOCHAR) 2388 if (c == NOCHAR)
2796 throw out_of_input; 2389 throw out_of_input;
2797 2390
2798 return c; 2391 return c;
… …
2862 { 2455 {
2863 if ((buf[len++] = cmd_getc ()) == 'i') 2456 if ((buf[len++] = cmd_getc ()) == 'i')
2864 break; /* done = 1 */ 2457 break; /* done = 1 */
2865 } 2458 }
2866 } 2459 }
2867 2460
2868 for (i = 0; i < len; i++) 2461 for (i = 0; i < len; i++)
2869 if (putc (buf[i], fd) == EOF) 2462 if (putc (buf[i], fd) == EOF)
2870 { 2463 {
2871 done = 1; 2464 done = 1;
2872 break; 2465 break;
… …
2874 } 2467 }
2875 } 2468 }
2876 2469
2877 pclose_printer (fd); 2470 pclose_printer (fd);
2878} 2471}
2879#endif /* PRINTPIPE */ 2472#endif /* PRINTPIPE */
2880/*}}} */ 2473/*}}} */
2881 2474
2882/* *INDENT-OFF* */ 2475/* *INDENT-OFF* */
2883enum { 2476enum {
2884 C1_40 = 0x40, 2477 C1_40 = 0x40,
… …
2898 case C0_ESC: 2491 case C0_ESC:
2899 process_escape_seq (); 2492 process_escape_seq ();
2900 break; 2493 break;
2901 case C0_ENQ: /* terminal Status */ 2494 case C0_ENQ: /* terminal Status */
2902 if (rs[Rs_answerbackstring]) 2495 if (rs[Rs_answerbackstring])
2903 tt_write ((const unsigned char *)rs[Rs_answerbackstring], 2496 tt_write (rs [Rs_answerbackstring], strlen (rs [Rs_answerbackstring]));
2904 (unsigned int)strlen (rs[Rs_answerbackstring]));
2905 else 2497 else
2906 tt_write ((unsigned char *)VT100_ANS, 2498 tt_write (VT100_ANS, strlen (VT100_ANS));
2907 (unsigned int)strlen (VT100_ANS));
2908 break; 2499 break;
2909 case C0_BEL: /* bell */ 2500 case C0_BEL: /* bell */
2910 scr_bell (); 2501 scr_bell ();
2911 break; 2502 break;
2912 case C0_BS: /* backspace */ 2503 case C0_BS: /* backspace */
… …
2936 process_dcs_seq (); 2527 process_dcs_seq ();
2937 break; 2528 break;
2938 case 0x9b: /* CSI */ 2529 case 0x9b: /* CSI */
2939 process_csi_seq (); 2530 process_csi_seq ();
2940 break; 2531 break;
2941 case 0x9d: /* CSI */ 2532 case 0x9d: /* OSC */
2942 process_osc_seq (); 2533 process_osc_seq ();
2943 break; 2534 break;
2944#endif 2535#endif
2945 } 2536 }
2946} 2537}
… …
3036 scr_charset_set (2, (unsigned int)cmd_getc ()); 2627 scr_charset_set (2, (unsigned int)cmd_getc ());
3037 break; 2628 break;
3038 case '+': 2629 case '+':
3039 scr_charset_set (3, (unsigned int)cmd_getc ()); 2630 scr_charset_set (3, (unsigned int)cmd_getc ());
3040 break; 2631 break;
3041#if ENABLE_FRILLS 2632#if !ENABLE_MINIMAL
3042 case '6': 2633 case '6':
3043 scr_backindex (); 2634 scr_backindex ();
3044 break; 2635 break;
3045#endif 2636#endif
3046 case '7': 2637 case '7':
3047 scr_cursor (SAVE); 2638 scr_cursor (SAVE);
3048 break; 2639 break;
3049 case '8': 2640 case '8':
3050 scr_cursor (RESTORE); 2641 scr_cursor (RESTORE);
3051 break; 2642 break;
3052#if ENABLE_FRILLS 2643#if !ENABLE_MINIMAL
3053 case '9': 2644 case '9':
3054 scr_forwardindex (); 2645 scr_forwardindex ();
3055 break; 2646 break;
3056#endif 2647#endif
3057 case '=': 2648 case '=':
… …
3067 break; 2658 break;
3068 2659
3069 /* 8.3.87: NEXT LINE */ 2660 /* 8.3.87: NEXT LINE */
3070 case C1_NEL: /* ESC E */ 2661 case C1_NEL: /* ESC E */
3071 { 2662 {
3072 unicode_t nlcr[] = { C0_LF, C0_CR }; 2663 wchar_t nlcr[] = { C0_LF, C0_CR };
3073 scr_add_lines (nlcr, 1, 2); 2664 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1);
3074 } 2665 }
3075 break; 2666 break;
3076 2667
3077 /* kidnapped escape sequence: Should be 8.3.48 */ 2668 /* kidnapped escape sequence: Should be 8.3.48 */
3078 case C1_ESA: /* ESC G */ 2669 case C1_ESA: /* ESC G */
… …
3100 process_dcs_seq (); 2691 process_dcs_seq ();
3101 break; 2692 break;
3102 2693
3103 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2694 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
3104 case C1_SCI: /* ESC Z */ 2695 case C1_SCI: /* ESC Z */
3105 tt_write ((const unsigned char *)ESCZ_ANSWER, 2696 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
3106 (unsigned int) (sizeof (ESCZ_ANSWER) - 1));
3107 break; /* steal obsolete ESC [ c */ 2697 break; /* steal obsolete ESC [ c */
3108 2698
3109 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2699 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */
3110 case C1_CSI: /* ESC [ */ 2700 case C1_CSI: /* ESC [ */
3111 process_csi_seq (); 2701 process_csi_seq ();
… …
3173rxvt_term::process_csi_seq () 2763rxvt_term::process_csi_seq ()
3174{ 2764{
3175 unicode_t ch, priv, i; 2765 unicode_t ch, priv, i;
3176 unsigned int nargs, p; 2766 unsigned int nargs, p;
3177 int n, ndef; 2767 int n, ndef;
3178 int arg[ESC_ARGS]; 2768 int arg[ESC_ARGS] = { };
3179 2769
3180 for (nargs = ESC_ARGS; nargs > 0;) 2770 nargs = 0;
3181 arg[--nargs] = 0;
3182 2771
3183 priv = 0; 2772 priv = 0;
3184 ch = cmd_getc (); 2773 ch = cmd_getc ();
3185 if (ch >= '<' && ch <= '?') 2774 if (ch >= '<' && ch <= '?')
2775 {
3186 { /* '<' '=' '>' '?' */ 2776 /* '<' '=' '>' '?' */
3187 priv = ch; 2777 priv = ch;
3188 ch = cmd_getc (); 2778 ch = cmd_getc ();
3189 } 2779 }
3190 2780
3191 /* read any numerical arguments */ 2781 /* read any numerical arguments */
… …
3220 ndef = get_byte_array_bit (csi_defaults, i); 2810 ndef = get_byte_array_bit (csi_defaults, i);
3221 for (p = 0; p < nargs; p++) 2811 for (p = 0; p < nargs; p++)
3222 if (arg[p] == -1) 2812 if (arg[p] == -1)
3223 arg[p] = ndef; 2813 arg[p] = ndef;
3224 2814
3225#ifdef DEBUG_CMD
3226 fprintf (stderr, "CSI ");
3227 for (p = 0; p < nargs; p++)
3228 fprintf (stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : "");
3229 fprintf (stderr, "%c\n", ch);
3230#endif
3231
3232 /* 2815 /*
3233 * private mode handling 2816 * private mode handling
3234 */ 2817 */
3235 if (priv) 2818 if (priv)
3236 { 2819 {
3237 switch (priv) 2820 switch (priv)
3238 { 2821 {
3239 case '>': 2822 case '>':
3240 if (ch == CSI_DA) /* secondary device attributes */ 2823 if (ch == CSI_DA) /* secondary device attributes */
3241 tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]); 2824 {
2825 // first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt,
2826 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
2827 //
2828 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
2829 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, 94 for urxvt <= 8.3, and 95 for later
2830 // versions.
2831 //
2832 tt_printf ("\033[>%d;95;0c", 'U');
2833 }
3242 break; 2834 break;
2835
3243 case '?': 2836 case '?':
3244 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2837 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3245 process_terminal_mode (ch, priv, nargs, arg); 2838 process_terminal_mode (ch, priv, nargs, arg);
3246 break; 2839 break;
3247 } 2840 }
… …
3355 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 2948 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
3356 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]); 2949 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
3357 break; 2950 break;
3358 2951
3359 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 2952 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
3360 tt_write ((const unsigned char *)VT100_ANS, 2953 tt_write (VT100_ANS, sizeof (VT100_ANS) - 1);
3361 (unsigned int) (sizeof (VT100_ANS) - 1));
3362 break; 2954 break;
3363 2955
3364 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 2956 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
3365 process_sgr_mode (nargs, arg); 2957 process_sgr_mode (nargs, arg);
3366 break; 2958 break;
… …
3373 break; 2965 break;
3374 case 6: /* CPR requested */ 2966 case 6: /* CPR requested */
3375 scr_report_position (); 2967 scr_report_position ();
3376 break; 2968 break;
3377 case 7: /* unofficial extension */ 2969 case 7: /* unofficial extension */
3378 if (options & Opt_insecure) 2970 if (option (Opt_insecure))
3379 tt_printf ("%-.250s\012", rs[Rs_display_name]); 2971 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3380 break; 2972 break;
3381 case 8: /* unofficial extension */ 2973 case 8: /* unofficial extension */
3382 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 2974 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3383 break; 2975 break;
… …
3450 break; 3042 break;
3451 case CSI_75: 3043 case CSI_75:
3452 scr_cursor (RESTORE); 3044 scr_cursor (RESTORE);
3453 break; 3045 break;
3454 3046
3455#if ENABLE_FRILLS 3047#if !ENABLE_MINIMAL
3456 case CSI_74: 3048 case CSI_74:
3457 process_window_ops (arg, nargs); 3049 process_window_ops (arg, nargs);
3458 break; 3050 break;
3459#endif 3051#endif
3460 3052
… …
3467 break; 3059 break;
3468 } 3060 }
3469} 3061}
3470/*}}} */ 3062/*}}} */
3471 3063
3472#if ENABLE_FRILLS 3064#if !ENABLE_MINIMAL
3473/* ARGSUSED */ 3065/* ARGSUSED */
3474void 3066void
3475rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3067rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3476{ 3068{
3477 int x, y; 3069 int x, y;
3478 XWindowAttributes wattr; 3070 XWindowAttributes wattr;
3479 Window wdummy; 3071 Window wdummy;
3480 dDisp; 3072
3073 dLocal (Display *, dpy);
3481 3074
3482 if (nargs == 0) 3075 if (nargs == 0)
3483 return; 3076 return;
3484 3077
3485 switch (args[0]) 3078 switch (args[0])
3486 { 3079 {
3487 /* 3080 /*
3488 * commands 3081 * commands
3489 */ 3082 */
3490 case 1: /* deiconify window */ 3083 case 1: /* deiconify window */
3491 XMapWindow (disp, parent[0]); 3084 XMapWindow (dpy, parent[0]);
3492 break; 3085 break;
3493 case 2: /* iconify window */ 3086 case 2: /* iconify window */
3494 XIconifyWindow (disp, parent[0], display->screen); 3087 XIconifyWindow (dpy, parent[0], display->screen);
3495 break; 3088 break;
3496 case 3: /* set position (pixels) */ 3089 case 3: /* set position (pixels) */
3497 XMoveWindow (disp, parent[0], args[1], args[2]); 3090 XMoveWindow (dpy, parent[0], args[1], args[2]);
3498 break; 3091 break;
3499 case 4: /* set size (pixels) */ 3092 case 4: /* set size (pixels) */
3500 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3093 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3501 break; 3094 break;
3502 case 5: /* raise window */ 3095 case 5: /* raise window */
3503 XRaiseWindow (disp, parent[0]); 3096 XRaiseWindow (dpy, parent[0]);
3504 break; 3097 break;
3505 case 6: /* lower window */ 3098 case 6: /* lower window */
3506 XLowerWindow (disp, parent[0]); 3099 XLowerWindow (dpy, parent[0]);
3507 break; 3100 break;
3508 case 7: /* refresh window */ 3101 case 7: /* refresh window */
3509 scr_touch (true); 3102 scr_touch (true);
3510 break; 3103 break;
3511 case 8: /* set size (chars) */ 3104 case 8: /* set size (chars) */
… …
3518 if (args[0] >= 24) /* set height (chars) */ 3111 if (args[0] >= 24) /* set height (chars) */
3519 set_widthheight ((unsigned int)width, 3112 set_widthheight ((unsigned int)width,
3520 (unsigned int) (args[1] * fheight)); 3113 (unsigned int) (args[1] * fheight));
3521 break; 3114 break;
3522 3115
3523
3524 /* 3116 /*
3525 * reports - some output format copied from XTerm 3117 * reports - some output format copied from XTerm
3526 */ 3118 */
3527 case 11: /* report window state */ 3119 case 11: /* report window state */
3528 XGetWindowAttributes (disp, parent[0], &wattr); 3120 XGetWindowAttributes (dpy, parent[0], &wattr);
3529 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3121 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3530 break; 3122 break;
3531 case 13: /* report window position */ 3123 case 13: /* report window position */
3532 XGetWindowAttributes (disp, parent[0], &wattr); 3124 XGetWindowAttributes (dpy, parent[0], &wattr);
3533 XTranslateCoordinates (disp, parent[0], wattr.root, 3125 XTranslateCoordinates (dpy, parent[0], wattr.root,
3534 -wattr.border_width, -wattr.border_width, 3126 -wattr.border_width, -wattr.border_width,
3535 &x, &y, &wdummy); 3127 &x, &y, &wdummy);
3536 tt_printf ("\033[3;%d;%dt", x, y); 3128 tt_printf ("\033[3;%d;%dt", x, y);
3537 break; 3129 break;
3538 case 14: /* report window size (pixels) */ 3130 case 14: /* report window size (pixels) */
3539 XGetWindowAttributes (disp, parent[0], &wattr); 3131 XGetWindowAttributes (dpy, parent[0], &wattr);
3540 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3132 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3541 break; 3133 break;
3542 case 18: /* report text area size (chars) */ 3134 case 18: /* report text area size (chars) */
3543 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3135 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3544 break; 3136 break;
… …
3546 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3138 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3547 break; 3139 break;
3548 case 20: /* report icon label */ 3140 case 20: /* report icon label */
3549 { 3141 {
3550 char *s; 3142 char *s;
3551 XGetIconName (disp, parent[0], &s); 3143 XGetIconName (dpy, parent[0], &s);
3552 tt_printf ("\033]L%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3144 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3553 XFree (s); 3145 XFree (s);
3554 } 3146 }
3555 break; 3147 break;
3556 case 21: /* report window title */ 3148 case 21: /* report window title */
3557 { 3149 {
3558 char *s; 3150 char *s;
3559 XFetchName (disp, parent[0], &s); 3151 XFetchName (dpy, parent[0], &s);
3560 tt_printf ("\033]l%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3152 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3561 XFree (s); 3153 XFree (s);
3562 } 3154 }
3563 break; 3155 break;
3564 } 3156 }
3565} 3157}
… …
3568/*----------------------------------------------------------------------*/ 3160/*----------------------------------------------------------------------*/
3569/* 3161/*
3570 * get input up until STRING TERMINATOR (or BEL) 3162 * get input up until STRING TERMINATOR (or BEL)
3571 * ends_how is terminator used. returned input must be free()'d 3163 * ends_how is terminator used. returned input must be free()'d
3572 */ 3164 */
3573unsigned char * 3165char *
3574rxvt_term::get_to_st (unicode_t &ends_how) 3166rxvt_term::get_to_st (unicode_t &ends_how)
3575{ 3167{
3576 unicode_t ch; 3168 unicode_t ch;
3577 bool seen_esc = false; 3169 bool seen_esc = false;
3578 unsigned int n = 0; 3170 unsigned int n = 0;
… …
3592 seen_esc = true; 3184 seen_esc = true;
3593 continue; 3185 continue;
3594 } 3186 }
3595 else if (ch == C0_BEL || ch == CHAR_ST) 3187 else if (ch == C0_BEL || ch == CHAR_ST)
3596 break; 3188 break;
3189 else if (ch == C0_SYN)
3190 ch = cmd_get8 ();
3597 else if (ch < 0x20) 3191 else if (ch < 0x20)
3598 return NULL; /* other control character - exit */ 3192 return NULL; /* other control character - exit */
3599 3193
3600 seen_esc = false; 3194 seen_esc = false;
3601 3195
3602 if (n >= STRING_MAX - 1) 3196 if (n >= STRING_MAX - 1)
3603 // stop at some sane length 3197 // stop at some sane length
3604 return NULL; 3198 return NULL;
3605 3199
3606 if (ch == C0_SYN)
3607 string[n++] = cmd_get8 ();
3608 else
3609 string[n++] = ch; 3200 string[n++] = ch;
3610 } 3201 }
3611 3202
3612 string[n++] = '\0'; 3203 string[n++] = '\0';
3613 3204
3614 ends_how = (ch == 0x5c ? C0_ESC : ch); 3205 ends_how = (ch == 0x5c ? C0_ESC : ch);
3615 3206
3616 return (unsigned char *)rxvt_wcstombs (string); 3207 return rxvt_wcstombs (string);
3617} 3208}
3618 3209
3619/*----------------------------------------------------------------------*/ 3210/*----------------------------------------------------------------------*/
3620/* 3211/*
3621 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3212 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3622 */ 3213 */
3623void 3214void
3624rxvt_term::process_dcs_seq () 3215rxvt_term::process_dcs_seq ()
3625{ 3216{
3626 unsigned char *s; 3217 char *s;
3627 unicode_t eh; 3218 unicode_t eh;
3628 3219
3629 /* 3220 /*
3630 * Not handled yet 3221 * Not handled yet
3631 */ 3222 */
… …
3650 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3241 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3651 arg = arg * 10 + (ch - '0'); 3242 arg = arg * 10 + (ch - '0');
3652 3243
3653 if (ch == ';') 3244 if (ch == ';')
3654 { 3245 {
3655 unsigned char *s = get_to_st (eh); 3246 char *s = get_to_st (eh);
3656 3247
3657 if (s) 3248 if (s)
3658 { 3249 {
3659 process_xterm_seq (arg, (char *)s, eh); 3250 process_xterm_seq (arg, s, eh);
3660 free (s); 3251 free (s);
3661 } 3252 }
3662 } 3253 }
3663} 3254}
3664 3255
3665void 3256void
3666rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp) 3257rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3667{ 3258{
3668 if (str[0] == '?' && !str[1]) 3259 if (str[0] == '?' && !str[1])
3669 { 3260 {
3670 unsigned short r, g, b; 3261 rgba c;
3671 pix_colors_focused[color].get (display, r, g, b); 3262 pix_colors_focused[color].get (c);
3263
3264#if XFT
3265 if (c.a != rgba::MAX_CC)
3266 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp);
3267 else
3268#endif
3672 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp); 3269 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp);
3673 } 3270 }
3674 else 3271 else
3675 set_window_color (color, str); 3272 set_window_color (color, str);
3676} 3273}
3677 3274
3678/* 3275/*
3679 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3276 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3680 */ 3277 */
3681void 3278void
3682rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp) 3279rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3683{ 3280{
3684 int changed = 0;
3685 int color; 3281 int color;
3686 char *buf, *name; 3282 char *buf, *name;
3687 bool query = str[0] == '?' && !str[1]; 3283 bool query = str[0] == '?' && !str[1];
3688 int saveop = op; 3284 int saveop = op;
3689 dDisp; 3285
3286 dLocal (Display *, dpy);
3690 3287
3691 assert (str != NULL); 3288 assert (str != NULL);
3289
3290 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END)))
3291 return;
3292
3692 switch (op) 3293 switch (op)
3693 { 3294 {
3694 case XTerm_name: 3295 case XTerm_name:
3695 set_title (str); 3296 set_title (str);
3696 /* FALLTHROUGH */ 3297 /* FALLTHROUGH */
… …
3710 unsigned long bytes_after; 3311 unsigned long bytes_after;
3711 unsigned char *value = 0; 3312 unsigned char *value = 0;
3712 const char *str = ""; 3313 const char *str = "";
3713 3314
3714 if (prop 3315 if (prop
3715 && XGetWindowProperty (disp, parent[0], 3316 && XGetWindowProperty (dpy, parent[0],
3716 prop, 0, 1<<16, 0, AnyPropertyType, 3317 prop, 0, 1<<16, 0, AnyPropertyType,
3717 &actual_type, &actual_format, 3318 &actual_type, &actual_format,
3718 &nitems, &bytes_after, &value) == Success 3319 &nitems, &bytes_after, &value) == Success
3719 && actual_type != None 3320 && actual_type != None
3720 && actual_format == 8) 3321 && actual_format == 8)
3721 str = (const char *)(value); 3322 str = (const char *)(value);
3722 3323
3723 tt_printf ("\033]%d;%s%c", XTerm_property, str, resp); 3324 tt_printf ("\033]%d;%s%c", op, str, resp);
3724 3325
3725 XFree (value); 3326 XFree (value);
3726 } 3327 }
3727 else 3328 else
3728 { 3329 {
… …
3732 { 3333 {
3733 *eq = 0; 3334 *eq = 0;
3734 set_utf8_property (display->atom (str), eq + 1); 3335 set_utf8_property (display->atom (str), eq + 1);
3735 } 3336 }
3736 else 3337 else
3737 XDeleteProperty (disp, parent[0], 3338 XDeleteProperty (dpy, parent[0],
3738 display->atom (str)); 3339 display->atom (str));
3739 } 3340 }
3740 break; 3341 break;
3741 3342
3742 case XTerm_Color: 3343 case XTerm_Color:
… …
3744 { 3345 {
3745 if ((name = strchr (buf, ';')) == NULL) 3346 if ((name = strchr (buf, ';')) == NULL)
3746 break; 3347 break;
3747 3348
3748 *name++ = '\0'; 3349 *name++ = '\0';
3749 color = atoi (buf); 3350 color = atoi (buf) + minCOLOR;
3750 3351
3751 if (color < 0 || color >= TOTAL_COLORS) 3352 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
3752 break; 3353 break;
3753 3354
3754 if ((buf = strchr (name, ';')) != NULL) 3355 if ((buf = strchr (name, ';')) != NULL)
3755 *buf++ = '\0'; 3356 *buf++ = '\0';
3756 3357
3757 if (name[0] == '?' && !name[1]) 3358 process_color_seq (op, color, name, resp);
3758 {
3759 unsigned short r, g, b;
3760 pix_colors_focused[color + minCOLOR].get (display, r, g, b);
3761 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3762 }
3763 else
3764 set_window_color (color + minCOLOR, name);
3765 } 3359 }
3766 break; 3360 break;
3361 case Rxvt_restoreFG:
3767 case XTerm_Color00: 3362 case XTerm_Color00:
3768 process_color_seq (XTerm_Color00, Color_fg, str, resp); 3363 process_color_seq (op, Color_fg, str, resp);
3769 break; 3364 break;
3365 case Rxvt_restoreBG:
3770 case XTerm_Color01: 3366 case XTerm_Color01:
3771 process_color_seq (XTerm_Color00, Color_bg, str, resp); 3367 process_color_seq (op, Color_bg, str, resp);
3772 break; 3368 break;
3773#ifndef NO_CURSORCOLOR 3369#ifndef NO_CURSORCOLOR
3774 case XTerm_Color_cursor: 3370 case XTerm_Color_cursor:
3775 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); 3371 process_color_seq (op, Color_cursor, str, resp);
3776 break; 3372 break;
3777#endif 3373#endif
3778 case XTerm_Color_pointer_fg: 3374 case XTerm_Color_pointer_fg:
3779 process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp); 3375 process_color_seq (op, Color_pointer_fg, str, resp);
3780 break; 3376 break;
3781 case XTerm_Color_pointer_bg: 3377 case XTerm_Color_pointer_bg:
3782 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); 3378 process_color_seq (op, Color_pointer_bg, str, resp);
3783 break; 3379 break;
3784#ifndef NO_BOLD_UNDERLINE_REVERSE 3380#ifndef NO_BOLD_UNDERLINE_REVERSE
3785 case XTerm_Color_BD:
3786 process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3787 break;
3788 case XTerm_Color_UL:
3789 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3790 break;
3791 case XTerm_Color_RV: 3381 case XTerm_Color_RV:
3792 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3382 process_color_seq (op, Color_RV, str, resp);
3383 break;
3384 case Rxvt_Color_BD:
3385 case URxvt_Color_BD:
3386 process_color_seq (op, Color_BD, str, resp);
3387 break;
3388 case Rxvt_Color_UL:
3389 case URxvt_Color_UL:
3390 process_color_seq (op, Color_UL, str, resp);
3793 break; 3391 break;
3794 case URxvt_Color_IT: 3392 case URxvt_Color_IT:
3795 process_color_seq (URxvt_Color_IT, Color_IT, str, resp); 3393 process_color_seq (op, Color_IT, str, resp);
3796 break; 3394 break;
3797#endif 3395#endif
3798#if TRANSPARENT && TINTING 3396#if ENABLE_TRANSPARENCY
3799 case URxvt_Color_tint: 3397 case URxvt_Color_tint:
3800 process_color_seq (URxvt_Color_tint, Color_tint, str, resp); 3398 process_color_seq (op, Color_tint, str, resp);
3801 check_our_parents (); 3399 {
3802 if (am_transparent) 3400 bool changed = false;
3803 want_full_refresh = want_refresh = 1;
3804 break;
3805#endif
3806 3401
3402 if (ISSET_PIXCOLOR (Color_tint))
3403 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]);
3404 else
3405 changed = bgPixmap.unset_tint ();
3406
3407 if (changed)
3408 update_background ();
3409 }
3410
3411 break;
3412#endif
3413
3414#if BG_IMAGE_FROM_FILE
3807 case XTerm_Pixmap: 3415 case Rxvt_Pixmap:
3808 if (*str != ';') 3416 if (!strcmp (str, "?"))
3809 { 3417 {
3810#if XPM_BACKGROUND 3418 char str[256];
3811 scale_pixmap (""); /* reset to default scaling */ 3419
3812 set_bgPixmap (str); /* change pixmap */ 3420 sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */
3813#endif 3421 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767),
3814 scr_touch (true); 3422 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767));
3423 process_xterm_seq (XTerm_title, str, CHAR_ST);
3815 } 3424 }
3816 while ((str = strchr (str, ';')) != NULL) 3425 else
3817 { 3426 {
3427 int changed = 0;
3428
3429 if (*str != ';')
3430 {
3431 /* reset to default scaling :*/
3432 bgPixmap.unset_geometry ();
3433 if (bgPixmap.set_file (str)) /* change pixmap */
3434 changed++;
3435 str = strchr (str, ';');
3436 if (str == NULL)
3437 bgPixmap.set_defaultGeometry ();
3438 }
3439
3440 while (str)
3441 {
3818 str++; 3442 str++;
3819#if XPM_BACKGROUND 3443 if (bgPixmap.set_geometry (str))
3820 changed += scale_pixmap (str); 3444 changed++;
3821#endif 3445 str = strchr (str, ';');
3446 }
3447
3448 if (changed)
3449 update_background ();
3822 } 3450 }
3823
3824 if (changed)
3825 {
3826#ifdef XPM_BACKGROUND
3827 resize_pixmap ();
3828#endif
3829 scr_touch (true);
3830 }
3831 break; 3451 break;
3832 3452#endif
3833 case XTerm_restoreFG:
3834 set_window_color (Color_fg, str);
3835 break;
3836 case XTerm_restoreBG:
3837 set_window_color (Color_bg, str);
3838 break;
3839 3453
3840 case XTerm_logfile: 3454 case XTerm_logfile:
3841 // TODO, when secure mode? 3455 // TODO, when secure mode?
3842 break; 3456 break;
3843 3457
3844#ifdef MENUBAR
3845 case URxvt_Menu:
3846 if (options & Opt_insecure)
3847 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3848 break;
3849#endif
3850#if 0 3458#if 0
3851 case XTerm_dumpscreen: /* no error notices */ 3459 case Rxvt_dumpscreen: /* no error notices */
3852 { 3460 {
3853 int fd; 3461 int fd;
3854 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) 3462 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3855 { 3463 {
3856 scr_dump (fd); 3464 scr_dump (fd);
… …
3867 case URxvt_italicFont: 3475 case URxvt_italicFont:
3868 case URxvt_boldItalicFont: 3476 case URxvt_boldItalicFont:
3869#endif 3477#endif
3870 if (query) 3478 if (query)
3871 tt_printf ("\33]%d;%-.250s%c", saveop, 3479 tt_printf ("\33]%d;%-.250s%c", saveop,
3872 (options & Opt_insecure) && fontset[op - URxvt_font]->fontdesc 3480 option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3873 ? fontset[op - URxvt_font]->fontdesc : "", 3481 ? fontset[op - URxvt_font]->fontdesc : "",
3874 resp); 3482 resp);
3875 else 3483 else
3876 { 3484 {
3877 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3485 const char *&res = rs[Rs_font + (op - URxvt_font)];
… …
3880 allocated.push_back ((void *)res); 3488 allocated.push_back ((void *)res);
3881 set_fonts (); 3489 set_fonts ();
3882 } 3490 }
3883 break; 3491 break;
3884 3492
3885#if ENABLE_FRILLS 3493 case URxvt_version:
3494 if (query)
3495 tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%c",
3496 op,
3497 rs[Rs_name], VERSION[0], VERSION[2],
3498 resp);
3499 break;
3500
3501#if !ENABLE_MINIMAL
3886 case URxvt_locale: 3502 case URxvt_locale:
3887 if (query) 3503 if (query)
3888 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, (options & Opt_insecure) ? locale : "", resp); 3504 tt_printf ("\33]%d;%-.250s%c", op, option (Opt_insecure) ? locale : "", resp);
3889 else 3505 else
3890 { 3506 {
3891 set_locale (str); 3507 set_locale (str);
3892 pty.set_utf8_mode (enc_utf8); 3508 pty->set_utf8_mode (enc_utf8);
3893 init_xlocale (); 3509 init_xlocale ();
3894 } 3510 }
3895 break; 3511 break;
3896 3512
3897 case URxvt_view_up: 3513 case URxvt_view_up:
3898 case URxvt_view_down: 3514 case URxvt_view_down:
3515 {
3899 int lines = atoi (str); 3516 int lines = atoi (str);
3900 3517
3901 if (lines) 3518 if (lines)
3902 scr_page (op == URxvt_view_up ? UP : DN, lines); 3519 scr_page (op == URxvt_view_up ? UP : DN, lines);
3903 else 3520 else
3904 {
3905 scr_erase_savelines (); 3521 scr_erase_savelines ();
3906 } 3522 }
3907 3523
3524 break;
3525#endif
3526
3527#if ENABLE_PERL
3528 case URxvt_perl:
3529 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END)))
3530 ; // no responses yet
3908 break; 3531 break;
3909#endif 3532#endif
3910 } 3533 }
3911} 3534}
3912/*----------------------------------------------------------------------*/ 3535/*----------------------------------------------------------------------*/
… …
3943 return state; 3566 return state;
3944} 3567}
3945 3568
3946/* we're not using priv _yet_ */ 3569/* we're not using priv _yet_ */
3947void 3570void
3948rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg) 3571rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg)
3949{ 3572{
3950 unsigned int i, j; 3573 unsigned int i, j;
3951 int state; 3574 int state;
3952 3575
3953 static const struct 3576 static const struct
3954 { 3577 {
3955 const int argval; 3578 const int argval;
3956 const unsigned long bit; 3579 const unsigned long bit;
3957 }
3958
3959 argtopriv[] = { 3580 } argtopriv[] = {
3960 { 1, PrivMode_aplCUR }, 3581 { 1, PrivMode_aplCUR },
3961 { 2, PrivMode_vt52 }, 3582 { 2, PrivMode_vt52 },
3962 { 3, PrivMode_132 }, 3583 { 3, PrivMode_132 },
3963 { 4, PrivMode_smoothScroll }, 3584 { 4, PrivMode_smoothScroll },
3964 { 5, PrivMode_rVideo }, 3585 { 5, PrivMode_rVideo },
3965 { 6, PrivMode_relOrigin }, 3586 { 6, PrivMode_relOrigin },
3966 { 7, PrivMode_Autowrap }, 3587 { 7, PrivMode_Autowrap },
3967 // 8, bi-directional support mode 3588 // 8, bi-directional support mode
3968 { 9, PrivMode_MouseX10 }, 3589 { 9, PrivMode_MouseX10 },
3969#ifdef menuBar_esc
3970 { menuBar_esc, PrivMode_menuBar },
3971#endif
3972 // 18, 19 printing-related 3590 // 18, 19 printing-related
3973 { 25, PrivMode_VisibleCursor }, 3591 { 25, PrivMode_VisibleCursor },
3974#ifdef scrollBar_esc 3592#ifdef scrollBar_esc
3975 { scrollBar_esc, PrivMode_scrollBar }, 3593 { scrollBar_esc, PrivMode_scrollBar },
3976#endif 3594#endif
… …
3983 { 66, PrivMode_aplKP }, 3601 { 66, PrivMode_aplKP },
3984#ifndef NO_BACKSPACE_KEY 3602#ifndef NO_BACKSPACE_KEY
3985 { 67, PrivMode_BackSpace }, 3603 { 67, PrivMode_BackSpace },
3986#endif 3604#endif
3987 { 1000, PrivMode_MouseX11 }, 3605 { 1000, PrivMode_MouseX11 },
3988 // 1001 Use Hilite Mouse Tracking. NYI, TODO 3606 { 1002, PrivMode_MouseBtnEvent },
3989 // 1002 Use Cell Motion Mouse Tracking. NYI, TODO 3607 { 1003, PrivMode_MouseAnyEvent },
3990 // 1003 Use All Motion Mouse Tracking. NYI, TODO
3991 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3608 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3992 { 1011, PrivMode_Keypress }, // rxvt extension 3609 { 1011, PrivMode_Keypress }, // rxvt extension
3993 // 1035 enable modifiers for alt, numlock NYI 3610 // 1035 enable modifiers for alt, numlock NYI
3994 // 1036 send ESC for meta keys NYI 3611 // 1036 send ESC for meta keys NYI
3995 // 1037 send DEL for keypad delete NYI 3612 // 1037 send DEL for keypad delete NYI
3996 { 1047, PrivMode_Screen }, 3613 { 1047, PrivMode_Screen },
3997 // 1048 save and restore cursor 3614 // 1048 save and restore cursor
3998 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */ 3615 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
3999 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3616 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3617 { 2004, PrivMode_BracketPaste },
4000 }; 3618 };
4001 3619
4002 if (nargs == 0) 3620 if (nargs == 0)
4003 return; 3621 return;
4004 3622
… …
4021 } 3639 }
4022 3640
4023 /* extra handling for values with state unkept */ 3641 /* extra handling for values with state unkept */
4024 switch (arg[i]) 3642 switch (arg[i])
4025 { 3643 {
3644#if ENABLE_STYLES
3645 case 1021:
3646 set_option (Opt_intensityStyles, mode);
3647
3648 scr_touch (true);
3649 break;
3650#endif
4026 case 1048: /* alternative cursor save */ 3651 case 1048: /* alternative cursor save */
4027 case 1049: 3652 case 1049:
4028 if (options & Opt_secondaryScreen) 3653 if (option (Opt_secondaryScreen))
4029 if (mode == 0) 3654 if (mode == 0)
4030 scr_cursor (RESTORE); 3655 scr_cursor (RESTORE);
4031 else if (mode == 1) 3656 else if (mode == 1)
4032 scr_cursor (SAVE); 3657 scr_cursor (SAVE);
4033 break; 3658 break;
… …
4045 */ 3670 */
4046 PrivMode (1, PrivMode_vt52); 3671 PrivMode (1, PrivMode_vt52);
4047 break; 3672 break;
4048 case 3: /* 80/132 */ 3673 case 3: /* 80/132 */
4049 if (priv_modes & PrivMode_132OK) 3674 if (priv_modes & PrivMode_132OK)
3675 {
3676 scr_poweron ();
4050 set_widthheight (((state ? 132 : 80) * fwidth), height); 3677 set_widthheight (((state ? 132 : 80) * fwidth), 24 * fheight);
3678 }
4051 break; 3679 break;
4052 case 4: /* smooth scrolling */ 3680 case 4: /* smooth scrolling */
4053 if (state)
4054 options &= ~Opt_jumpScroll;
4055 else
4056 options |= Opt_jumpScroll; 3681 set_option (Opt_jumpScroll, !state);
4057 break; 3682 break;
4058 case 5: /* reverse video */ 3683 case 5: /* reverse video */
4059 scr_rvideo_mode (state); 3684 scr_rvideo_mode (state);
4060 break; 3685 break;
4061 case 6: /* relative/absolute origins */ 3686 case 6: /* relative/absolute origins */
… …
4065 scr_autowrap (state); 3690 scr_autowrap (state);
4066 break; 3691 break;
4067 /* case 8: - auto repeat, can't do on a per window basis */ 3692 /* case 8: - auto repeat, can't do on a per window basis */
4068 case 9: /* X10 mouse reporting */ 3693 case 9: /* X10 mouse reporting */
4069 if (state) /* orthogonal */ 3694 if (state) /* orthogonal */
4070 priv_modes &= ~PrivMode_MouseX11; 3695 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
4071 break; 3696 break;
4072#ifdef menuBar_esc
4073 case menuBar_esc:
4074#ifdef MENUBAR
4075 map_menuBar (state);
4076#endif
4077 break;
4078#endif
4079#ifdef scrollBar_esc 3697#ifdef scrollBar_esc
4080 case scrollBar_esc: 3698 case scrollBar_esc:
4081 if (scrollbar_mapping (state)) 3699 if (scrollbar_mapping (state))
4082 { 3700 {
4083 resize_all_windows (0, 0, 0); 3701 resize_all_windows (0, 0, 0);
… …
4095 break; 3713 break;
4096 /* case 66: - application key pad */ 3714 /* case 66: - application key pad */
4097 /* case 67: - backspace key */ 3715 /* case 67: - backspace key */
4098 case 1000: /* X11 mouse reporting */ 3716 case 1000: /* X11 mouse reporting */
4099 if (state) /* orthogonal */ 3717 if (state) /* orthogonal */
4100 priv_modes &= ~PrivMode_MouseX10; 3718 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
4101 break; 3719 break;
4102#if 0
4103 case 1001: 3720 case 1002:
4104 break; /* X11 mouse highlighting */ 3721 case 1003:
4105#endif 3722 if (state)
3723 {
3724 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3725 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3726 vt_emask_mouse = PointerMotionMask;
3727 }
3728 else
3729 vt_emask_mouse = NoEventMask;
3730 vt_select_input ();
3731 break;
4106 case 1010: /* scroll to bottom on TTY output inhibit */ 3732 case 1010: /* scroll to bottom on TTY output inhibit */
4107 if (state)
4108 options &= ~Opt_scrollTtyOutput;
4109 else
4110 options |= Opt_scrollTtyOutput; 3733 set_option (Opt_scrollTtyOutput, !state);
4111 break; 3734 break;
4112 case 1011: /* scroll to bottom on key press */ 3735 case 1011: /* scroll to bottom on key press */
4113 if (state)
4114 options |= Opt_scrollTtyKeypress; 3736 set_option (Opt_scrollTtyKeypress, state);
4115 else
4116 options &= ~Opt_scrollTtyKeypress;
4117 break; 3737 break;
4118 case 1047: /* secondary screen w/ clearing last */ 3738 case 1047: /* secondary screen w/ clearing last */
4119 if (options & Opt_secondaryScreen) 3739 if (option (Opt_secondaryScreen))
4120 if (current_screen != PRIMARY) 3740 if (current_screen != PRIMARY)
4121 scr_erase_screen (2); 3741 scr_erase_screen (2);
4122 scr_change_screen (state); 3742 scr_change_screen (state);
4123 break; 3743 break;
4124 case 1049: /* secondary screen w/ clearing first */ 3744 case 1049: /* secondary screen w/ clearing first */
4125 scr_change_screen (state); 3745 scr_change_screen (state);
4126 if (options & Opt_secondaryScreen) 3746 if (option (Opt_secondaryScreen))
4127 if (current_screen != PRIMARY) 3747 if (current_screen != PRIMARY)
4128 scr_erase_screen (2); 3748 scr_erase_screen (2);
4129 break; 3749 break;
4130 default: 3750 default:
4131 break; 3751 break;
… …
4259 scr_color (Color_bg, Color_bg); 3879 scr_color (Color_bg, Color_bg);
4260 break; 3880 break;
4261 3881
4262 //case 50: // not variable spacing 3882 //case 50: // not variable spacing
4263 3883
4264#ifndef NO_BRIGHTCOLOR 3884#if !ENABLE_MINIMAL
4265 case 90: 3885 case 90:
4266 case 91: /* set bright fg color */ 3886 case 91: /* set bright fg color */
4267 case 92: 3887 case 92:
4268 case 93: 3888 case 93:
4269 case 94: 3889 case 94:
… …
4281 case 106: 3901 case 106:
4282 case 107: 3902 case 107:
4283 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg); 3903 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);
4284 break; 3904 break;
4285#endif 3905#endif
4286
4287 } 3906 }
4288 } 3907 }
4289} 3908}
4290/*}}} */ 3909/*}}} */
4291 3910
… …
4294rxvt_term::process_graphics () 3913rxvt_term::process_graphics ()
4295{ 3914{
4296 unicode_t ch, cmd = cmd_getc (); 3915 unicode_t ch, cmd = cmd_getc ();
4297 3916
4298 if (cmd == 'Q') 3917 if (cmd == 'Q')
3918 {
4299 { /* query graphics */ 3919 /* query graphics */
4300 tt_printf ("\033G0\012"); /* no graphics */ 3920 tt_printf ("\033G0\012"); /* no graphics */
4301 return; 3921 return;
4302 } 3922 }
4303 /* swallow other graphics sequences until terminating ':' */ 3923 /* swallow other graphics sequences until terminating ':' */
4304 do 3924 do
… …
4315 */ 3935 */
4316void 3936void
4317rxvt_term::tt_printf (const char *fmt,...) 3937rxvt_term::tt_printf (const char *fmt,...)
4318{ 3938{
4319 va_list arg_ptr; 3939 va_list arg_ptr;
4320 unsigned char buf[256]; 3940 char buf[256];
4321 3941
4322 va_start (arg_ptr, fmt); 3942 va_start (arg_ptr, fmt);
4323 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 3943 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
4324 va_end (arg_ptr); 3944 va_end (arg_ptr);
4325 tt_write (buf, strlen (buf)); 3945 tt_write (buf, strlen (buf));
… …
4330 * or generated by us in response to a query ESC sequence. 3950 * or generated by us in response to a query ESC sequence.
4331 */ 3951 */
4332const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 3952const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4333 3953
4334void 3954void
4335rxvt_term::tt_write (const unsigned char *data, unsigned int len) 3955rxvt_term::tt_write (const char *data, unsigned int len)
4336{ 3956{
3957 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
3958 return;
3959
3960 if (pty->pty < 0)
3961 return;
3962
4337 if (v_buflen == 0) 3963 if (v_buflen == 0)
4338 { 3964 {
4339 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE)); 3965 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
4340 3966
4341 if ((unsigned int)written == len) 3967 if ((unsigned int)written == len)
4342 return; 3968 return;
4343 3969
4344 data += written; 3970 data += written;
4345 len -= written; 3971 len -= written;
4346 } 3972 }
4347 3973
4348 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len); 3974 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
4349 3975
4350 memcpy (v_buffer + v_buflen, data, len); 3976 memcpy (v_buffer + v_buflen, data, len);
4351 v_buflen += len; 3977 v_buflen += len;
4352 3978
4353 pty_ev.set (EVENT_READ | EVENT_WRITE); 3979 pty_ev.set (ev::READ | ev::WRITE);
4354} 3980}
4355 3981
4356void rxvt_term::pty_write () 3982void rxvt_term::pty_write ()
4357{ 3983{
4358 int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE)); 3984 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4359 3985
4360 if (written > 0) 3986 if (written > 0)
4361 { 3987 {
4362 v_buflen -= written; 3988 v_buflen -= written;
4363 3989
4364 if (v_buflen == 0) 3990 if (v_buflen == 0)
4365 { 3991 {
4366 free (v_buffer); 3992 free (v_buffer);
4367 v_buffer = 0; 3993 v_buffer = 0;
4368 v_buflen = 0;
4369 3994
4370 pty_ev.set (EVENT_READ); 3995 pty_ev.set (ev::READ);
4371 return; 3996 return;
4372 } 3997 }
4373 3998
4374 memmove (v_buffer, v_buffer + written, v_buflen); 3999 memmove (v_buffer, v_buffer + written, v_buflen);
4375 } 4000 }
4376 else if (written != -1 || (errno != EAGAIN && errno != EINTR)) 4001 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4377 // original code just ignores this... 4002 pty_ev.set (ev::READ);
4378 destroy ();
4379} 4003}
4380 4004
4381/*----------------------- end-of-file (C source) -----------------------*/ 4005/*----------------------- end-of-file (C source) -----------------------*/
4382 4006

Diff Legend

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