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.207 by root, Tue Oct 25 19:04:45 2005 UTC vs.
Revision 1.355 by ayin, Fri Sep 14 09:46:18 2007 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-2006 Marc Lehmann <pcg@goof.com>
31 * 31 *
32 * This program is free software; you can redistribute it and/or modify 32 * 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 33 * 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 34 * the Free Software Foundation; either version 2 of the License, or
35 * (at your option) any later version. 35 * (at your option) any later version.
… …
43 * along with this program; if not, write to the Free Software 43 * along with this program; if not, write to the Free Software
44 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 44 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
45 *----------------------------------------------------------------------*/ 45 *----------------------------------------------------------------------*/
46 46
47/*{{{ includes: */ 47/*{{{ includes: */
48#include "../config.h" /* NECESSARY */ 48#include "../config.h"
49#include "rxvt.h" /* NECESSARY */ 49#include "rxvt.h"
50#include "rxvtperl.h"
50#include "version.h" 51#include "version.h"
51#include "command.h" 52#include "command.h"
52 53
53#ifdef KEYSYM_RESOURCE 54#ifdef KEYSYM_RESOURCE
54# include "keyboard.h" 55# include "keyboard.h"
55#endif 56#endif
56 57
57#include <csignal> 58#include <csignal>
58 59
60#if LINUX_YIELD_HACK
61# include <ctime>
62#endif
63
59/*----------------------------------------------------------------------*/ 64/*----------------------------------------------------------------------*/
60 65
61#define IS_CONTROL(ch) !((ch) & 0xffffff60UL) 66#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 67
66#if ENABLE_FRILLS || ISO_14755 68#if ENABLE_FRILLS || ISO_14755
67 69
68#define ISO_14755_STARTED 0x80000000UL 70#define ISO_14755_STARTED 0x80000000UL
69#define ISO_14755_51 0x40000000UL // basic (section 5.1) 71#define ISO_14755_51 0x40000000UL // basic (section 5.1)
… …
93 XK_Shift_L, 0x21e7, 95 XK_Shift_L, 0x21e7,
94 XK_Shift_R, 0x21e7, 96 XK_Shift_R, 0x21e7,
95 97
96 XK_Shift_Lock, 0x21eb, 98 XK_Shift_Lock, 0x21eb,
97 XK_ISO_Lock, 0x21eb, 99 XK_ISO_Lock, 0x21eb,
98 XK_ISO_Lock, 0x21eb,
99 XK_Caps_Lock, 0x21ec, 100 XK_Caps_Lock, 0x21ec,
100 XK_Num_Lock, 0x21ed, 101 XK_Num_Lock, 0x21ed,
101 XK_ISO_Level3_Shift, 0x21ee, 102 XK_ISO_Level3_Shift, 0x21ee,
102 XK_ISO_Level3_Lock, 0x21ef, 103 XK_ISO_Level3_Lock, 0x21ef,
103 XK_ISO_Group_Lock, 0x21f0, 104 XK_ISO_Group_Lock, 0x21f0,
… …
135rxvt_term::iso14755_54 (int x, int y) 136rxvt_term::iso14755_54 (int x, int y)
136{ 137{
137 x = Pixel2Col (x); 138 x = Pixel2Col (x);
138 y = Pixel2Row (y); 139 y = Pixel2Row (y);
139 140
140 if (x < 0 || x >= TermWin.ncol 141 if (!IN_RANGE_EXC (x, 0, ncol)
141 || y < 0 || y >= TermWin.nrow) 142 || !IN_RANGE_EXC (y, 0, nrow))
142 return; 143 return;
143 144
144 for (;;) 145 for (;;)
145 { 146 {
146 text_t t = screen.text[y + TermWin.saveLines - TermWin.view_start][x]; 147 const line_t &l = ROW(y + view_start);
148
149 text_t t = l.t[x];
147 150
148 if (t != NOCHAR || !x) 151 if (t != NOCHAR || !x)
149 { 152 {
150 iso14755_51 (screen.text[y + TermWin.saveLines - TermWin.view_start][x], 153 iso14755_51 (l.t[x], l.r[x], x, y);
151 screen.rend[y + TermWin.saveLines - TermWin.view_start][x]);
152 iso14755buf = ISO_14755_54; 154 iso14755buf = ISO_14755_54;
153 break; 155 break;
154 } 156 }
155 157
156 x--; 158 x--;
157 } 159 }
158
159} 160}
160#endif
161 161
162#if ENABLE_OVERLAY
163void 162void
164rxvt_term::iso14755_51 (unicode_t ch, rend_t r) 163rxvt_term::iso14755_51 (unicode_t ch, rend_t r, int x, int y)
165{ 164{
166 rxvt_fontset *fs = FONTSET (r); 165 rxvt_fontset *fs = FONTSET (r);
167 rxvt_font *f = (*fs)[fs->find_font (ch)]; 166 rxvt_font *f = (*fs)[fs->find_font (ch)];
168 wchar_t *chr, *alloc, ch2, *fname; 167 wchar_t *chr, *alloc, ch2, *fname;
169 int len; 168 int len;
170 169
171 fname = rxvt_utf8towcs (f->name); 170 fname = rxvt_utf8towcs (f->name);
172 171
173#if ENABLE_COMBINING 172# if ENABLE_COMBINING
174 if (IS_COMPOSE (ch)) 173 if (IS_COMPOSE (ch))
175 { 174 {
176 len = rxvt_composite.expand (ch, 0); 175 len = rxvt_composite.expand (ch, 0);
177 alloc = chr = new wchar_t[len]; 176 alloc = chr = new wchar_t[len];
178 rxvt_composite.expand (ch, chr); 177 rxvt_composite.expand (ch, chr);
179 } 178 }
180 else 179 else
181#endif 180# endif
182 { 181 {
183 ch2 = ch; 182 ch2 = ch;
184 183
185 alloc = 0; 184 alloc = 0;
186 chr = &ch2; 185 chr = &ch2;
187 len = 1; 186 len = 1;
188 } 187 }
189 188
189 char attr[80]; // plenty
190
191 sprintf (attr, "%08x = fg %d bg %d%s%s%s%s%s%s",
192 (int)r,
193 fgcolor_of (r), bgcolor_of (r),
194 r & RS_Bold ? " bold" : "",
195 r & RS_Italic ? " italic" : "",
196 r & RS_Blink ? " blink" : "",
197 r & RS_RVid ? " rvid" : "",
198 r & RS_Uline ? " uline" : "",
199 r & RS_Careful ? " careful" : "");
200
190 int width = wcswidth (fname, wcslen (fname)); 201 int width = wcswidth (fname, wcslen (fname));
191 202
192 scr_overlay_new (0, -1, width < 8+5 ? 8+5 : width, len + 1); 203 max_it (width, 8+5); // for char + hey
204 max_it (width, strlen (attr));
205
206 if (y >= 0)
207 {
208 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1;
209 x = 0;
210 }
211
212 scr_overlay_new (x, y, width, len + 2);
193 213
194 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r)); 214 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));
195 215
196 for (int y = 0; y < len; y++) 216 for (int y = 0; y < len; y++)
197 { 217 {
… …
200 ch = *chr++; 220 ch = *chr++;
201 221
202 sprintf (buf, "%8x", ch); 222 sprintf (buf, "%8x", ch);
203 scr_overlay_set (0, y, buf); 223 scr_overlay_set (0, y, buf);
204 scr_overlay_set (9, y, '='); 224 scr_overlay_set (9, y, '=');
205#if !UNICODE3 225# if !UNICODE3
206 if (ch >= 0x10000) 226 if (ch >= 0x10000)
207 ch = 0xfffd; 227 ch = 0xfffd;
208#endif 228# endif
209 scr_overlay_set (11, y, ch, r); 229 scr_overlay_set (11, y, ch, r);
230
231 if (WCWIDTH (ch) >= 2)
210 scr_overlay_set (12, y, NOCHAR, r); 232 scr_overlay_set (12, y, NOCHAR, r);
211 } 233 }
212 234
235// {
236// char buf[4+4+3+1];
237// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y);
238// scr_overlay_set (0, 0, buf);
239// }
240 scr_overlay_set (0, len , attr);
213 scr_overlay_set (0, len, fname); 241 scr_overlay_set (0, len + 1, fname);
214 242
215 free (fname); 243 free (fname);
216 244
217#if ENABLE_COMBINING 245# if ENABLE_COMBINING
218 if (alloc) 246 if (alloc)
219 delete [] alloc; 247 delete [] alloc;
220#endif 248# endif
221} 249}
222#endif 250#endif
223 251
224void 252void
225rxvt_term::commit_iso14755 () 253rxvt_term::commit_iso14755 ()
… …
242 mb[0] = ch[0]; 270 mb[0] = ch[0];
243 len = 1; 271 len = 1;
244 } 272 }
245 273
246 if (len > 0) 274 if (len > 0)
247 tt_write ((unsigned char *)mb, len); 275 tt_write (mb, len);
248 else 276 else
249 scr_bell (); 277 scr_bell ();
250 } 278 }
251 279
252 iso14755buf = 0; 280 iso14755buf = 0;
… …
269 297
270 return -1; 298 return -1;
271} 299}
272#endif 300#endif
273 301
274/*{{{ Convert the keypress event into a string */
275void 302void
276rxvt_term::lookup_key (XKeyEvent &ev) 303rxvt_term::key_press (XKeyEvent &ev)
277{ 304{
278 int ctrl, meta, shft, len; 305 int ctrl, meta, shft, len;
279 unsigned int newlen; 306 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 {
366#ifdef KEYSYM_RESOURCE 395#ifdef KEYSYM_RESOURCE
367 if (keyboard->dispatch (this, keysym, ev.state)) 396 if (keyboard->dispatch (this, keysym, ev.state))
368 return; 397 return;
369#endif 398#endif
370 399
371 if (TermWin.saveLines) 400 if (saveLines)
372 { 401 {
373#ifdef UNSHIFTED_SCROLLKEYS 402#ifdef UNSHIFTED_SCROLLKEYS
374 if (!ctrl && !meta) 403 if (!ctrl && !meta)
375#else 404#else
376 if (IS_SCROLL_MOD) 405 if (IS_SCROLL_MOD)
377#endif 406#endif
378 { 407 {
379 int lnsppg; 408 int lnsppg;
380 409
381#ifdef PAGING_CONTEXT_LINES 410#ifdef PAGING_CONTEXT_LINES
382 lnsppg = TermWin.nrow - PAGING_CONTEXT_LINES; 411 lnsppg = nrow - PAGING_CONTEXT_LINES;
383#else 412#else
384 lnsppg = TermWin.nrow * 4 / 5; 413 lnsppg = nrow * 4 / 5;
385#endif 414#endif
386 if (keysym == XK_Prior) 415 if (keysym == XK_Prior)
387 { 416 {
388 scr_page (UP, lnsppg); 417 scr_page (UP, lnsppg);
389 return; 418 return;
… …
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 newlen = 1;
516 switch (keysym) 554 switch (keysym)
517 { 555 {
518#ifndef NO_BACKSPACE_KEY 556#ifndef NO_BACKSPACE_KEY
519 case XK_BackSpace: 557 case XK_BackSpace:
… …
522 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace) 560 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
523 ^ !!ctrl) ? '\b' : '\177'; 561 ^ !!ctrl) ? '\b' : '\177';
524 kbuf[1] = '\0'; 562 kbuf[1] = '\0';
525 } 563 }
526 else 564 else
527 strcpy (kbuf, key_backspace); 565 strcpy (kbuf, rs[Rs_backspace_key]);
528 break; 566 break;
529#endif 567#endif
530#ifndef NO_DELETE_KEY 568#ifndef NO_DELETE_KEY
531# ifdef XK_KP_Prior 569# ifdef XK_KP_Delete
532 case XK_KP_Delete: 570 case XK_KP_Delete:
533 /* allow shift to override */ 571 /* allow shift to override */
534 if ((priv_modes & PrivMode_aplKP) ? !shft : shft) 572 if (kp)
535 { 573 {
536 strcpy (kbuf, "\033On"); 574 strcpy (kbuf, "\033On");
537 break; 575 break;
538 } 576 }
539 /* FALLTHROUGH */ 577 /* FALLTHROUGH */
540# endif 578# endif
541 case XK_Delete: 579 case XK_Delete:
542 strcpy (kbuf, key_delete); 580 strcpy (kbuf, rs[Rs_delete_key]);
543 break; 581 break;
544#endif 582#endif
545 case XK_Tab: 583 case XK_Tab:
546 if (shft) 584 if (shft)
547 strcpy (kbuf, "\033[Z"); 585 strcpy (kbuf, "\033[Z");
… …
562#ifdef XK_KP_Left 600#ifdef XK_KP_Left
563 case XK_KP_Up: /* \033Ox or standard */ 601 case XK_KP_Up: /* \033Ox or standard */
564 case XK_KP_Down: /* \033Or or standard */ 602 case XK_KP_Down: /* \033Or or standard */
565 case XK_KP_Right: /* \033Ov or standard */ 603 case XK_KP_Right: /* \033Ov or standard */
566 case XK_KP_Left: /* \033Ot or standard */ 604 case XK_KP_Left: /* \033Ot or standard */
567 if ((priv_modes & PrivMode_aplKP) ? !shft : shft) 605 if (kp)
568 { 606 {
569 strcpy (kbuf, "\033OZ"); 607 strcpy (kbuf, "\033OZ");
570 kbuf[2] = "txvr"[keysym - XK_KP_Left]; 608 kbuf[2] = "txvr"[keysym - XK_KP_Left];
571 break; 609 break;
572 } 610 }
… …
595 633
596#ifndef UNSHIFTED_SCROLLKEYS 634#ifndef UNSHIFTED_SCROLLKEYS
597# ifdef XK_KP_Prior 635# ifdef XK_KP_Prior
598 case XK_KP_Prior: 636 case XK_KP_Prior:
599 /* allow shift to override */ 637 /* allow shift to override */
600 if ((priv_modes & PrivMode_aplKP) ? !shft : shft) 638 if (kp)
601 { 639 {
602 strcpy (kbuf, "\033Oy"); 640 strcpy (kbuf, "\033Oy");
603 break; 641 break;
604 } 642 }
605 /* FALLTHROUGH */ 643 /* FALLTHROUGH */
… …
608 strcpy (kbuf, "\033[5~"); 646 strcpy (kbuf, "\033[5~");
609 break; 647 break;
610# ifdef XK_KP_Next 648# ifdef XK_KP_Next
611 case XK_KP_Next: 649 case XK_KP_Next:
612 /* allow shift to override */ 650 /* allow shift to override */
613 if ((priv_modes & PrivMode_aplKP) ? !shft : shft) 651 if (kp)
614 { 652 {
615 strcpy (kbuf, "\033Os"); 653 strcpy (kbuf, "\033Os");
616 break; 654 break;
617 } 655 }
618 /* FALLTHROUGH */ 656 /* FALLTHROUGH */
… …
621 strcpy (kbuf, "\033[6~"); 659 strcpy (kbuf, "\033[6~");
622 break; 660 break;
623#endif 661#endif
624 case XK_KP_Enter: 662 case XK_KP_Enter:
625 /* allow shift to override */ 663 /* allow shift to override */
626 if ((priv_modes & PrivMode_aplKP) ? !shft : shft) 664 if (kp)
627 { 665 {
628 strcpy (kbuf, "\033OM"); 666 strcpy (kbuf, "\033OM");
629 break; 667 break;
630 } 668 }
631 669
… …
674 case XK_KP_6: /* "\033Ov" : "6" */ 712 case XK_KP_6: /* "\033Ov" : "6" */
675 case XK_KP_7: /* "\033Ow" : "7" */ 713 case XK_KP_7: /* "\033Ow" : "7" */
676 case XK_KP_8: /* "\033Ox" : "8" */ 714 case XK_KP_8: /* "\033Ox" : "8" */
677 case XK_KP_9: /* "\033Oy" : "9" */ 715 case XK_KP_9: /* "\033Oy" : "9" */
678 /* allow shift to override */ 716 /* allow shift to override */
679 if ((priv_modes & PrivMode_aplKP) ? !shft : shft) 717 if (kp)
680 { 718 {
681 strcpy (kbuf, "\033Oj"); 719 strcpy (kbuf, "\033Oj");
682 kbuf[2] += (keysym - XK_KP_Multiply); 720 kbuf[2] += (keysym - XK_KP_Multiply);
683 } 721 }
684 else 722 else
… …
690 728
691 case XK_Find: 729 case XK_Find:
692 strcpy (kbuf, "\033[1~"); 730 strcpy (kbuf, "\033[1~");
693 break; 731 break;
694 732
695#ifdef XK_KP_End 733#ifdef XK_KP_Insert
696 case XK_KP_Insert: 734 case XK_KP_Insert:
697 /* allow shift to override */ 735 /* allow shift to override */
698 if ((priv_modes & PrivMode_aplKP) ? !shft : shft) 736 if (kp)
699 { 737 {
700 strcpy (kbuf, "\033Op"); 738 strcpy (kbuf, "\033Op");
701 break; 739 break;
702 } 740 }
703 /* FALLTHROUGH */ 741 /* FALLTHROUGH */
… …
716 strcpy (kbuf, "\033[4~"); 754 strcpy (kbuf, "\033[4~");
717 break; 755 break;
718#ifdef XK_KP_End 756#ifdef XK_KP_End
719 case XK_KP_End: 757 case XK_KP_End:
720 /* allow shift to override */ 758 /* allow shift to override */
721 if ((priv_modes & PrivMode_aplKP) ? !shft : shft) 759 if (kp)
722 { 760 {
723 strcpy (kbuf, "\033Oq"); 761 strcpy (kbuf, "\033Oq");
724 break; 762 break;
725 } 763 }
726 /* FALLTHROUGH */ 764 /* FALLTHROUGH */
… …
729 strcpy (kbuf, KS_END); 767 strcpy (kbuf, KS_END);
730 break; 768 break;
731#ifdef XK_KP_Home 769#ifdef XK_KP_Home
732 case XK_KP_Home: 770 case XK_KP_Home:
733 /* allow shift to override */ 771 /* allow shift to override */
734 if ((priv_modes & PrivMode_aplKP) ? !shft : shft) 772 if (kp)
735 { 773 {
736 strcpy (kbuf, "\033Ow"); 774 strcpy (kbuf, "\033Ow");
737 break; 775 break;
738 } 776 }
739 /* FALLTHROUGH */ 777 /* FALLTHROUGH */
… …
829 { 867 {
830#ifdef META8_OPTION 868#ifdef META8_OPTION
831 /* set 8-bit on */ 869 /* set 8-bit on */
832 if (meta && (meta_char == 0x80)) 870 if (meta && (meta_char == 0x80))
833 { 871 {
834 unsigned char *ch; 872 char *ch;
835 873
836 for (ch = kbuf; ch < kbuf + len; ch++) 874 for (ch = kbuf; ch < kbuf + len; ch++)
837 *ch |= 0x80; 875 *ch |= 0x80;
838 876
839 meta = 0; 877 meta = 0;
… …
841#endif 879#endif
842 /* nil */ ; 880 /* nil */ ;
843 } 881 }
844 } 882 }
845 883
884 if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_INT, keysym, DT_STR_LEN, kbuf, len, DT_END)))
885 return;
886
846 if (len <= 0) 887 if (len <= 0)
847 return; /* not mapped */ 888 return; /* not mapped */
848 889
849 if (options & Opt_scrollTtyKeypress) 890 if (option (Opt_scrollTtyKeypress))
850 if (TermWin.view_start) 891 if (view_start)
851 { 892 {
852 TermWin.view_start = 0; 893 view_start = 0;
853 want_refresh = 1; 894 want_refresh = 1;
854 } 895 }
855 896
856 /* 897 /*
857 * these modifications only affect the static keybuffer 898 * these modifications only affect the static keybuffer
… …
872#ifdef META8_OPTION 913#ifdef META8_OPTION
873 && meta_char == C0_ESC 914 && meta_char == C0_ESC
874#endif 915#endif
875 ) 916 )
876 { 917 {
877 const unsigned char ch = C0_ESC; 918 const char ch = C0_ESC;
878 tt_write (&ch, 1); 919 tt_write (&ch, 1);
879 } 920 }
880 921
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); 922 tt_write (kbuf, (unsigned int)len);
892} 923}
893/*}}} */
894 924
925void
926rxvt_term::key_release (XKeyEvent &ev)
927{
928#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
929 KeySym keysym;
930
931 keysym = XLookupKeysym (&ev, ev.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
932#endif
933
934#if ENABLE_FRILLS || ISO_14755
935 // ISO 14755 support
936 if (iso14755buf)
937 if (iso14755buf & ISO_14755_52)
938 {
939# if ISO_14755
940 scr_overlay_off ();
941# endif
942# if ISO_14755
943 // iso14755 part 5.2 handling: release time
944 // first: controls
945 if ((ev.state & ControlMask)
946 && ((keysym >= 0x40 && keysym <= 0x5f)
947 || (keysym >= 0x61 && keysym <= 0x7f)))
948 {
949 iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
950 commit_iso14755 ();
951
952 return;
953 }
954
955 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
956 if (i[0] == keysym)
957 {
958 iso14755buf = ISO_14755_51 | i[1];
959 commit_iso14755 ();
960
961 return;
962 }
963
964 scr_bell ();
965# endif
966 iso14755buf = 0;
967
968 return;
969 }
970 else if ((ev.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
971 {
972# if ISO_14755
973 scr_overlay_off ();
974# endif
975 if (iso14755buf & ISO_14755_51)
976 commit_iso14755 ();
977#if ISO_14755
978 else if (option (Opt_iso14755_52) && iso14755buf & ISO_14755_STARTED)
979 {
980 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
981
982 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
983 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
984 }
985# endif
986 else
987 iso14755buf = 0;
988 }
989#endif
990
991 if (HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
992 return;
993
994#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
995 if (!(ev.state & ControlMask))
996 slip_wheel_ev.stop ();
997 else if (keysym == XK_Control_L || keysym == XK_Control_R)
998 mouse_slip_wheel_speed = 0;
999#endif
1000}
1001
895#if MENUBAR_MAX || defined (KEYSYM_RESOURCE) 1002#if defined (KEYSYM_RESOURCE)
896/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */
897/* attempt to `write' count to the input buffer */
898unsigned int 1003unsigned int
899rxvt_term::cmd_write (const unsigned char *str, unsigned int count) 1004rxvt_term::cmd_write (const char *str, unsigned int count)
900{ 1005{
901 unsigned int n, s; 1006 unsigned int n, s;
902 1007
903 n = cmdbuf_ptr - cmdbuf_base; 1008 n = cmdbuf_ptr - cmdbuf_base;
904 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp; 1009 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp;
… …
930void 1035void
931rxvt_term::flush () 1036rxvt_term::flush ()
932{ 1037{
933 flush_ev.stop (); 1038 flush_ev.stop ();
934 1039
935#ifdef TRANSPARENT
936 if (want_full_refresh)
937 {
938 want_full_refresh = 0;
939 scr_clear ();
940 scr_touch (false);
941 }
942#endif
943
944 if (want_refresh) 1040 if (want_refresh)
945 { 1041 {
1042 if (SHOULD_INVOKE (HOOK_LINE_UPDATE))
1043 {
1044 int row = view_start;
1045 int end_row = row + nrow;
1046
1047 while (row > top_row && ROW (row - 1).is_longer ())
1048 --row;
1049
1050 do
1051 {
1052 int start_row = row;
1053 line_t *l;
1054
1055 do
1056 {
1057 l = &ROW (row++);
1058
1059 if (!(l->f & LINE_FILTERED))
1060 {
1061 // line not filtered, mark it as filtered
1062 l->f |= LINE_FILTERED;
1063 while (l->is_longer ())
1064 {
1065 l = &ROW (row++);
1066 l->f |= LINE_FILTERED;
1067 }
1068
1069 // and filter it
1070 HOOK_INVOKE ((this, HOOK_LINE_UPDATE, DT_INT, start_row, DT_END));
1071
1072 break;
1073 }
1074 }
1075 while (l->is_longer () && row < end_row);
1076 }
1077 while (row < end_row);
1078 }
1079
946 scr_refresh (refresh_type); 1080 scr_refresh ();
947 scrollbar_show (1); 1081 scrollbar_show (1);
948#ifdef USE_XIM 1082#ifdef USE_XIM
949 IMSendSpot (); 1083 IMSendSpot ();
950#endif 1084#endif
951 } 1085 }
… …
954} 1088}
955 1089
956void 1090void
957rxvt_term::check_cb (check_watcher &w) 1091rxvt_term::check_cb (check_watcher &w)
958{ 1092{
959 SET_R (this); 1093 make_current ();
960 SET_LOCALE (locale);
961 1094
962 display->flush (); 1095 display->flush ();
963 1096
964 if (want_refresh && !flush_ev.active) 1097 if (want_refresh && !flush_ev.active)
965 flush_ev.start (NOW + 0.01); 1098 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
966} 1099}
967 1100
968void 1101void
969rxvt_term::flush_cb (time_watcher &w) 1102rxvt_term::flush_cb (time_watcher &w)
970{ 1103{
971 SET_R (this); 1104 make_current ();
972 SET_LOCALE (locale);
973 1105
974 refresh_limit = 1;
975 refresh_count = 0; 1106 refresh_count = 0;
976 flush (); 1107 flush ();
977} 1108}
978 1109
979#ifdef CURSOR_BLINK 1110#ifdef CURSOR_BLINK
… …
981rxvt_term::cursor_blink_cb (time_watcher &w) 1112rxvt_term::cursor_blink_cb (time_watcher &w)
982{ 1113{
983 hidden_cursor = !hidden_cursor; 1114 hidden_cursor = !hidden_cursor;
984 want_refresh = 1; 1115 want_refresh = 1;
985 1116
986 w.start (w.at + BLINK_INTERVAL); 1117 w.start (w.at + CURSOR_BLINK_INTERVAL);
987} 1118}
988#endif 1119#endif
989 1120
990#ifdef TEXT_BLINK 1121#ifdef TEXT_BLINK
991void 1122void
… …
1005rxvt_term::cont_scroll_cb (time_watcher &w) 1136rxvt_term::cont_scroll_cb (time_watcher &w)
1006{ 1137{
1007 if ((scrollbar_isUp() || scrollbar_isDn()) && 1138 if ((scrollbar_isUp() || scrollbar_isDn()) &&
1008 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1139 scr_page (scrollbar_isUp() ? UP : DN, 1))
1009 { 1140 {
1010 refresh_type |= SMOOTH_REFRESH;
1011 want_refresh = 1; 1141 want_refresh = 1;
1012 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1142 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1013 } 1143 }
1014} 1144}
1015#endif 1145#endif
… …
1019rxvt_term::sel_scroll_cb (time_watcher &w) 1149rxvt_term::sel_scroll_cb (time_watcher &w)
1020{ 1150{
1021 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1151 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1022 { 1152 {
1023 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1153 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1024 refresh_type |= SMOOTH_REFRESH;
1025 want_refresh = 1; 1154 want_refresh = 1;
1026 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1155 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1027 } 1156 }
1028} 1157}
1029#endif 1158#endif
… …
1034{ 1163{
1035 if (mouse_slip_wheel_speed == 0 1164 if (mouse_slip_wheel_speed == 0
1036 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed) 1165 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1037 : scr_page (UP, mouse_slip_wheel_speed)) 1166 : scr_page (UP, mouse_slip_wheel_speed))
1038 { 1167 {
1039 if (TermWin.view_start == TermWin.nscrolled || 1168 if (view_start == top_row || view_start == 0)
1040 TermWin.view_start == 0)
1041 mouse_slip_wheel_speed = 0; 1169 mouse_slip_wheel_speed = 0;
1042 1170
1043 refresh_type |= SMOOTH_REFRESH;
1044 want_refresh = 1; 1171 want_refresh = 1;
1045 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1172 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1046 } 1173 }
1047} 1174}
1048#endif 1175#endif
1049 1176
1177#if LINUX_YIELD_HACK
1178static struct event_handler
1179{
1180 check_watcher yield_ev;
1181
1182 void yield_cb (check_watcher &w)
1183 {
1184 // this should really be sched_yield(), but the linux guys thought
1185 // that giving a process calling sched_yield () less cpu time than
1186 // ones with high nice levels is a useful thing to do. It surely is is
1187 // allowed by the sus... as is returning ENOSYS.
1188
1189 struct timespec ts = { 0, 0 };
1190 nanosleep (&ts, 0);
1191
1192 w.stop ();
1193 }
1194
1195 event_handler ()
1196 : yield_ev (this, &event_handler::yield_cb)
1197 {
1198 }
1199} event_handler;
1200#endif
1201
1050bool 1202bool
1051rxvt_term::pty_fill () 1203rxvt_term::pty_fill ()
1052{ 1204{
1053 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1205 ssize_t n = cmdbuf_endp - cmdbuf_ptr;
1054 1206
1055 if (CBUFSIZ == n) 1207 if (CBUFSIZ == n)
1056 { 1208 {
1057 rxvt_warn ("pty_fill on full buffer, draining input, continuing.\n"); 1209 rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n");
1058 n = 0; 1210 n = 0;
1059 } 1211 }
1060 1212
1061 memmove (cmdbuf_base, cmdbuf_ptr, n); 1213 memmove (cmdbuf_base, cmdbuf_ptr, n);
1062 cmdbuf_ptr = cmdbuf_base; 1214 cmdbuf_ptr = cmdbuf_base;
1063 cmdbuf_endp = cmdbuf_ptr + n; 1215 cmdbuf_endp = cmdbuf_ptr + n;
1064 1216
1065 n = read (pty.pty, cmdbuf_endp, CBUFSIZ - n); 1217 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n);
1066 1218
1067 if (n > 0) 1219 if (r > 0)
1068 { 1220 {
1069 cmdbuf_endp += n; 1221 cmdbuf_endp += r;
1070 return true; 1222 return true;
1071 } 1223 }
1072 else if (n < 0 && errno != EAGAIN) 1224 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1225 {
1226#if LINUX_YIELD_HACK
1227 if (display->is_local)
1228 event_handler.yield_ev.start ();
1229#endif
1230 }
1231 else
1232 {
1233 pty_ev.stop ();
1234
1235 if (!option (Opt_hold))
1073 destroy (); 1236 destroy ();
1074 1237 }
1238
1075 return false; 1239 return false;
1076} 1240}
1077 1241
1078void 1242void
1079rxvt_term::pty_cb (io_watcher &w, short revents) 1243rxvt_term::pty_cb (io_watcher &w, short revents)
1080{ 1244{
1081 SET_R (this); 1245 make_current ();
1082 SET_LOCALE (locale);
1083 1246
1084 if (revents & EVENT_READ) 1247 if (revents & EVENT_READ)
1085 // loop, but don't allow a single term to monopolize us 1248 // loop, but don't allow a single term to monopolize us
1086 while (pty_fill ()) 1249 while (pty_fill ())
1087 if (cmd_parse ()) 1250 if (cmd_parse ())
… …
1092} 1255}
1093 1256
1094void 1257void
1095rxvt_term::pointer_unblank () 1258rxvt_term::pointer_unblank ()
1096{ 1259{
1097 XDefineCursor (display->display, TermWin.vt, TermWin_cursor); 1260 XDefineCursor (dpy, vt, TermWin_cursor);
1098 recolour_cursor (); 1261 recolour_cursor ();
1099 1262
1100#ifdef POINTER_BLANK 1263#ifdef POINTER_BLANK
1101 hidden_pointer = 0; 1264 hidden_pointer = 0;
1102 1265
1103 if (options & Opt_pointerBlank) 1266 if (option (Opt_pointerBlank))
1104 pointer_ev.start (NOW + pointerBlankDelay); 1267 pointer_ev.start (NOW + pointerBlankDelay);
1105#endif 1268#endif
1106} 1269}
1107 1270
1108#ifdef POINTER_BLANK 1271#ifdef POINTER_BLANK
1109void 1272void
1110rxvt_term::pointer_blank () 1273rxvt_term::pointer_blank ()
1111{ 1274{
1112 if (! (options & Opt_pointerBlank)) 1275 if (!option (Opt_pointerBlank))
1113 return; 1276 return;
1114 1277
1115 XDefineCursor (display->display, TermWin.vt, display->blank_cursor); 1278 XDefineCursor (dpy, vt, display->blank_cursor);
1116 XFlush (display->display); 1279 XFlush (dpy);
1117 1280
1118 hidden_pointer = 1; 1281 hidden_pointer = 1;
1119} 1282}
1120 1283
1121void 1284void
1122rxvt_term::pointer_cb (time_watcher &w) 1285rxvt_term::pointer_cb (time_watcher &w)
1123{ 1286{
1124 SET_R (this); 1287 make_current ();
1125 SET_LOCALE (locale);
1126 1288
1127 pointer_blank (); 1289 pointer_blank ();
1128} 1290}
1129#endif 1291#endif
1130 1292
… …
1195 (32 + button_number + key_state), 1357 (32 + button_number + key_state),
1196 (32 + x + 1), 1358 (32 + x + 1),
1197 (32 + y + 1)); 1359 (32 + y + 1));
1198} 1360}
1199 1361
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
1210/*{{{ process an X event */ 1362/*{{{ process an X event */
1211void 1363void
1212rxvt_term::x_cb (XEvent &ev) 1364rxvt_term::x_cb (XEvent &ev)
1213{ 1365{
1214 dDisp; 1366 make_current ();
1215 1367
1216 SET_R (this); 1368 dLocal (Display *, dpy);
1217 SET_LOCALE (locale);
1218 1369
1219#if defined(CURSOR_BLINK) 1370 if (ev.xany.window == vt
1220 if ((options & Opt_cursorBlink) && ev.type == KeyPress) 1371 && SHOULD_INVOKE (HOOK_X_EVENT)
1221 { 1372 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1222 if (hidden_cursor) 1373 return;
1223 {
1224 hidden_cursor = 0;
1225 want_refresh = 1;
1226 }
1227 1374
1228 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1375 // 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; 1376 Window unused_root, unused_child;
1247 int unused_root_x, unused_root_y; 1377 int unused_root_x, unused_root_y;
1248 unsigned int unused_mask; 1378 unsigned int unused_mask;
1249 1379
1250 switch (ev.type) 1380 switch (ev.type)
1251 { 1381 {
1252 case KeyPress: 1382 case KeyPress:
1253#if ISO_14755 1383 key_press (ev.xkey);
1254 if (!(iso14755buf & ISO_14755_52))
1255#endif
1256 lookup_key (ev.xkey);
1257
1258 break; 1384 break;
1259 1385
1260 case KeyRelease: 1386 case KeyRelease:
1261 { 1387 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; 1388 break;
1329 }
1330 1389
1331 case ButtonPress: 1390 case ButtonPress:
1332 button_press (ev.xbutton); 1391 button_press (ev.xbutton);
1333 break; 1392 break;
1334 1393
… …
1336 button_release (ev.xbutton); 1395 button_release (ev.xbutton);
1337 break; 1396 break;
1338 1397
1339 case ClientMessage: 1398 case ClientMessage:
1340 if (ev.xclient.format == 32 1399 if (ev.xclient.format == 32
1341 && ev.xclient.message_type == xa[XA_WM_PROTOCOLS]) 1400 && !HOOK_INVOKE ((this, HOOK_CLIENT_MESSAGE, DT_XEVENT, &ev, DT_END)))
1342 { 1401 {
1402 if (ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
1403 {
1404 if (!HOOK_INVOKE ((this, HOOK_WM_PROTOCOLS, DT_XEVENT, &ev, DT_END)))
1405 {
1343 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW]) 1406 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1407 {
1408 if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END)))
1344 destroy (); 1409 destroy ();
1410 }
1345#if ENABLE_EWMH 1411#if ENABLE_EWMH
1346 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING]) 1412 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1347 XSendEvent (disp, ev.xclient.window = display->root, 1413 XSendEvent (dpy, ev.xclient.window = display->root,
1348 False, SubstructureRedirectMask | SubstructureNotifyMask, 1414 False, SubstructureRedirectMask | SubstructureNotifyMask,
1349 &ev); 1415 &ev);
1416#endif
1417 }
1418 }
1419#if ENABLE_XEMBED
1420 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1421 {
1422 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1423 focus_in ();
1424 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1425 focus_out ();
1426 }
1350#endif 1427#endif
1351 } 1428 }
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; 1429 break;
1392 1430
1393 /* 1431 /*
1394 * XXX: this is not the _current_ arrangement 1432 * XXX: this is not the _current_ arrangement
1395 * Here's my conclusion: 1433 * Here's my conclusion:
… …
1414 break; 1452 break;
1415 } 1453 }
1416 break; 1454 break;
1417 1455
1418 case FocusIn: 1456 case FocusIn:
1457 if (ev.xfocus.detail != NotifyInferior
1458 && ev.xfocus.detail != NotifyPointer
1459 && ev.xfocus.mode != NotifyGrab)
1419 focus_in (); 1460 focus_in ();
1420 break; 1461 break;
1421 1462
1422 case FocusOut: 1463 case FocusOut:
1464 if (ev.xfocus.detail != NotifyInferior
1465 && ev.xfocus.detail != NotifyPointer
1466 && ev.xfocus.mode != NotifyGrab)
1423 focus_out (); 1467 focus_out ();
1424 break; 1468 break;
1425 1469
1426 case ConfigureNotify: 1470 case ConfigureNotify:
1471/* fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",
1472 ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,
1473 szHint.width, szHint.height);*/
1427 if (ev.xconfigure.window == TermWin.parent[0]) 1474 if (ev.xconfigure.window == parent[0])
1428 { 1475 {
1429 int height, width;
1430
1431 do
1432 { /* Wrap lots of configures into one */
1433 width = ev.xconfigure.width;
1434 height = ev.xconfigure.height;
1435 D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height));
1436 }
1437 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev)); 1476 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1477 ;
1438 1478
1439 if (szHint.width != width || szHint.height != height) 1479 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1440 { 1480 {
1441 seen_resize = 1; 1481 seen_resize = 1;
1442 resize_all_windows (width, height, 1); 1482 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1443 } 1483 }
1444 1484 else
1445#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1485 {
1446 if (options & Opt_transparent) 1486#ifdef HAVE_BG_PIXMAP
1447 check_our_parents (); 1487 if (bgPixmap.window_position_sensitive ())
1488 update_background ();
1448#endif 1489#endif
1490 }
1491 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1449 } 1492 }
1450 break; 1493 break;
1451 1494
1452 case PropertyNotify: 1495 case PropertyNotify:
1496 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
1453 if (ev.xproperty.atom == xa[XA_VT_SELECTION] 1497 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1454 && ev.xproperty.state == PropertyNewValue) 1498 && ev.xproperty.state == PropertyNewValue)
1455 selection_property (ev.xproperty.window, ev.xproperty.atom); 1499 selection_property (ev.xproperty.window, ev.xproperty.atom);
1456 1500
1457 break; 1501 break;
1458 1502
1459 case SelectionClear: 1503 case SelectionClear:
1460 selection_clear (); 1504 selection_clear ();
… …
1467 1511
1468 case SelectionRequest: 1512 case SelectionRequest:
1469 selection_send (ev.xselectionrequest); 1513 selection_send (ev.xselectionrequest);
1470 break; 1514 break;
1471 1515
1516 case MapNotify:
1517 mapped = 1;
1518#ifdef TEXT_BLINK
1519 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1520#endif
1521 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1522 break;
1523
1472 case UnmapNotify: 1524 case UnmapNotify:
1473 TermWin.mapped = 0; 1525 mapped = 0;
1474#ifdef TEXT_BLINK 1526#ifdef TEXT_BLINK
1475 text_blink_ev.stop (); 1527 text_blink_ev.stop ();
1476#endif 1528#endif
1529 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1477 break; 1530 break;
1478
1479 case MapNotify:
1480 TermWin.mapped = 1;
1481#ifdef TEXT_BLINK
1482 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1483#endif
1484 break;
1485
1486#ifdef TRANSPARENT
1487 case ReparentNotify:
1488 rootwin_cb (ev);
1489 break;
1490#endif /* TRANSPARENT */
1491 1531
1492 case GraphicsExpose: 1532 case GraphicsExpose:
1493 case Expose: 1533 case Expose:
1494 if (ev.xany.window == TermWin.vt) 1534 if (ev.xany.window == vt)
1495 { 1535 {
1496 do 1536 do
1497 scr_expose (ev.xexpose.x, ev.xexpose.y, 1537 scr_expose (ev.xexpose.x, ev.xexpose.y,
1498 ev.xexpose.width, ev.xexpose.height, False); 1538 ev.xexpose.width, ev.xexpose.height, False);
1499 while (XCheckTypedWindowEvent (disp, TermWin.vt, ev.xany.type, &ev)); 1539 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1500 1540
1501 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1541 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1502 1542
1503 while (XCheckTypedWindowEvent (disp, TermWin.vt, ev.xany.type, &ev)) 1543 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1504 scr_expose (ev.xexpose.x, ev.xexpose.y, 1544 scr_expose (ev.xexpose.x, ev.xexpose.y,
1505 ev.xexpose.width, ev.xexpose.height, False); 1545 ev.xexpose.width, ev.xexpose.height, False);
1506 1546
1507 scr_refresh (refresh_type); 1547 want_refresh = 1;
1508 } 1548 }
1509 else 1549 else
1510 { 1550 {
1511 XEvent unused_event; 1551 XEvent unused_event;
1512 1552
1513 while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event)) 1553 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1514 ; 1554 ;
1515 while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event)) 1555 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1516 ; 1556 ;
1517 1557
1518 if (isScrollbarWindow (ev.xany.window)) 1558 if (isScrollbarWindow (ev.xany.window))
1519 { 1559 {
1520 scrollBar.setIdle (); 1560 scrollBar.setIdle ();
1521 scrollbar_show (0); 1561 scrollbar_show (0);
1522 } 1562 }
1523#ifdef MENUBAR
1524 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1525 menubar_expose ();
1526#endif
1527
1528#ifdef TRANSPARENT
1529 if (am_transparent && ev.xany.window == TermWin.parent[0])
1530 XClearWindow (disp, ev.xany.window);
1531#endif
1532 } 1563 }
1533 break; 1564 break;
1534 1565
1535 case MotionNotify: 1566 case MotionNotify:
1536#ifdef POINTER_BLANK 1567#ifdef POINTER_BLANK
1537 if (hidden_pointer) 1568 if (hidden_pointer)
1538 pointer_unblank (); 1569 pointer_unblank ();
1539#endif 1570#endif
1540#if MENUBAR
1541 if (isMenuBarWindow (ev.xany.window))
1542 {
1543 menubar_control (ev.xbutton);
1544 break;
1545 }
1546#endif
1547 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1571 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1548 break; 1572 break;
1549 1573
1550 if (ev.xany.window == TermWin.vt) 1574 if (ev.xany.window == vt)
1551 { 1575 {
1576 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1577 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1578 ; // nop
1552 if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1579 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1553 { 1580 {
1554 while (XCheckTypedWindowEvent (disp, TermWin.vt, MotionNotify, &ev)) 1581 while (XCheckTypedWindowEvent (dpy, vt, MotionNotify, &ev))
1555 ; 1582 ;
1556 1583
1557 XQueryPointer (disp, TermWin.vt, 1584 XQueryPointer (dpy, vt,
1558 &unused_root, &unused_child, 1585 &unused_root, &unused_child,
1559 &unused_root_x, &unused_root_y, 1586 &unused_root_x, &unused_root_y,
1560 &ev.xbutton.x, &ev.xbutton.y, 1587 &ev.xbutton.x, &ev.xbutton.y,
1561 &ev.xbutton.state); 1588 &ev.xbutton.state);
1562#ifdef MOUSE_THRESHOLD 1589#ifdef MOUSE_THRESHOLD
… …
1574#endif 1601#endif
1575 selection_extend (ev.xbutton.x, ev.xbutton.y, 1602 selection_extend (ev.xbutton.x, ev.xbutton.y,
1576 ev.xbutton.state & Button3Mask ? 2 : 0); 1603 ev.xbutton.state & Button3Mask ? 2 : 0);
1577 1604
1578#ifdef SELECTION_SCROLLING 1605#ifdef SELECTION_SCROLLING
1579 if (ev.xbutton.y < TermWin.int_bwidth 1606 if (ev.xbutton.y < int_bwidth
1580 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1)) 1607 || Pixel2Row (ev.xbutton.y) > (nrow-1))
1581 { 1608 {
1582 int dist; 1609 int dist;
1583 1610
1584 /* don't clobber the current delay if we are 1611 /* don't clobber the current delay if we are
1585 * already in the middle of scrolling. 1612 * already in the middle of scrolling.
… …
1593 selection_save_x = ev.xbutton.x; 1620 selection_save_x = ev.xbutton.x;
1594 selection_save_y = ev.xbutton.y; 1621 selection_save_y = ev.xbutton.y;
1595 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0; 1622 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;
1596 1623
1597 /* calc number of lines to scroll */ 1624 /* calc number of lines to scroll */
1598 if (ev.xbutton.y < TermWin.int_bwidth) 1625 if (ev.xbutton.y < int_bwidth)
1599 { 1626 {
1600 scroll_selection_dir = UP; 1627 scroll_selection_dir = UP;
1601 dist = TermWin.int_bwidth - ev.xbutton.y; 1628 dist = int_bwidth - ev.xbutton.y;
1602 } 1629 }
1603 else 1630 else
1604 { 1631 {
1605 scroll_selection_dir = DN; 1632 scroll_selection_dir = DN;
1606 dist = ev.xbutton.y - (TermWin.int_bwidth + TermWin.height); 1633 dist = ev.xbutton.y - (int_bwidth + height);
1607 } 1634 }
1608 1635
1609 scroll_selection_lines = Pixel2Height (dist) 1636 scroll_selection_lines = Pixel2Height (dist)
1610 / SELECTION_SCROLL_LINE_SPEEDUP 1637 / SELECTION_SCROLL_LINE_SPEEDUP
1611 + 1; 1638 + 1;
1612 MIN_IT (scroll_selection_lines, 1639 min_it (scroll_selection_lines,
1613 SELECTION_SCROLL_MAX_LINES); 1640 SELECTION_SCROLL_MAX_LINES);
1614 } 1641 }
1615 else 1642 else
1616 { 1643 {
1617 /* we are within the text window, so we 1644 /* we are within the text window, so we
… …
1626#endif 1653#endif
1627 } 1654 }
1628 } 1655 }
1629 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1656 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1630 { 1657 {
1631 while (XCheckTypedWindowEvent (disp, scrollBar.win, 1658 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1632 MotionNotify, &ev)) 1659 MotionNotify, &ev))
1633 ; 1660 ;
1634 1661
1635 XQueryPointer (disp, scrollBar.win, 1662 XQueryPointer (dpy, scrollBar.win,
1636 &unused_root, &unused_child, 1663 &unused_root, &unused_child,
1637 &unused_root_x, &unused_root_y, 1664 &unused_root_x, &unused_root_y,
1638 &ev.xbutton.x, &ev.xbutton.y, 1665 &ev.xbutton.x, &ev.xbutton.y,
1639 &unused_mask); 1666 &unused_mask);
1640 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1667 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1641 scrollbar_size ()); 1668 scrollbar_size ());
1642 scr_refresh (refresh_type);
1643 refresh_limit = 0; 1669 want_refresh = 1;
1644 scrollbar_show (1); 1670 scrollbar_show (1);
1645 } 1671 }
1646 break; 1672 break;
1647 } 1673 }
1674
1675#if defined(CURSOR_BLINK)
1676 if (option (Opt_cursorBlink) && ev.type == KeyPress)
1677 {
1678 if (hidden_cursor)
1679 {
1680 hidden_cursor = 0;
1681 want_refresh = 1;
1682 }
1683
1684 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1685 }
1686#endif
1687
1688#if defined(POINTER_BLANK)
1689 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1690 {
1691 if (ev.type == MotionNotify
1692 || ev.type == ButtonPress
1693 || ev.type == ButtonRelease)
1694 if (hidden_pointer)
1695 pointer_unblank ();
1696
1697 if (ev.type == KeyPress && hidden_pointer == 0)
1698 pointer_blank ();
1699 }
1700#endif
1648} 1701}
1649 1702
1650void 1703void
1651rxvt_term::focus_in () 1704rxvt_term::focus_in ()
1652{ 1705{
1653 if (!TermWin.focus) 1706 if (!focus)
1654 { 1707 {
1655 TermWin.focus = 1; 1708 focus = 1;
1656 want_refresh = 1; 1709 want_refresh = 1;
1710
1711 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1712
1657#if USE_XIM 1713#if USE_XIM
1658 if (Input_Context != NULL) 1714 if (Input_Context != NULL)
1659 { 1715 {
1660 IMSetStatusPosition (); 1716 IMSetPosition ();
1661 XSetICFocus (Input_Context); 1717 XSetICFocus (Input_Context);
1662 } 1718 }
1663#endif 1719#endif
1664#if CURSOR_BLINK 1720#if CURSOR_BLINK
1665 if (options & Opt_cursorBlink) 1721 if (option (Opt_cursorBlink))
1666 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1722 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1667#endif 1723#endif
1668#if OFF_FOCUS_FADING 1724#if OFF_FOCUS_FADING
1669 if (rs[Rs_fade]) 1725 if (rs[Rs_fade])
1670 { 1726 {
1671 pix_colors = pix_colors_focused; 1727 pix_colors = pix_colors_focused;
1672 scr_recolour (); 1728 scr_recolour ();
1673 } 1729 }
1674#endif 1730#endif
1731#if ENABLE_FRILLS
1732 if (option (Opt_urgentOnBell))
1733 {
1734 XWMHints *h;
1735
1736 h = XGetWMHints(dpy, parent[0]);
1737 if (h != NULL)
1738 {
1739 h->flags &= ~XUrgencyHint;
1740 XSetWMHints(dpy, parent[0], h);
1741 }
1742 }
1743#endif
1675 } 1744 }
1676} 1745}
1677 1746
1678void 1747void
1679rxvt_term::focus_out () 1748rxvt_term::focus_out ()
1680{ 1749{
1681 if (TermWin.focus) 1750 if (focus)
1682 { 1751 {
1683 TermWin.focus = 0; 1752 focus = 0;
1684 want_refresh = 1; 1753 want_refresh = 1;
1685 1754
1755 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1756
1686#if ENABLE_FRILLS || ISO_14755 1757#if ENABLE_FRILLS || ISO_14755
1758 if (iso14755buf)
1759 {
1687 iso14755buf = 0; 1760 iso14755buf = 0;
1688#endif 1761# if ISO_14755
1689#if ENABLE_OVERLAY
1690 scr_overlay_off (); 1762 scr_overlay_off ();
1763# endif
1764 }
1691#endif 1765#endif
1692#if USE_XIM 1766#if USE_XIM
1693 if (Input_Context != NULL) 1767 if (Input_Context != NULL)
1694 XUnsetICFocus (Input_Context); 1768 XUnsetICFocus (Input_Context);
1695#endif 1769#endif
1696#if CURSOR_BLINK 1770#if CURSOR_BLINK
1697 if (options & Opt_cursorBlink) 1771 if (option (Opt_cursorBlink))
1698 cursor_blink_ev.stop (); 1772 cursor_blink_ev.stop ();
1699 hidden_cursor = 0; 1773 hidden_cursor = 0;
1700#endif 1774#endif
1701#if OFF_FOCUS_FADING 1775#if OFF_FOCUS_FADING
1702 if (rs[Rs_fade]) 1776 if (rs[Rs_fade])
… …
1706 } 1780 }
1707#endif 1781#endif
1708 } 1782 }
1709} 1783}
1710 1784
1711#if TRANSPARENT 1785void
1786rxvt_term::update_fade_color (unsigned int idx)
1787{
1788#if OFF_FOCUS_FADING
1789 if (rs[Rs_fade])
1790 {
1791 rgba c;
1792 pix_colors [Color_fade].get (c);
1793 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1794 }
1795#endif
1796}
1797
1798#if ENABLE_TRANSPARENCY || ENABLE_PERL
1712void 1799void
1713rxvt_term::rootwin_cb (XEvent &ev) 1800rxvt_term::rootwin_cb (XEvent &ev)
1714{ 1801{
1715 SET_R (this); 1802 make_current ();
1716 SET_LOCALE (locale);
1717 1803
1804 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1805 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1806 return;
1807
1808# if ENABLE_TRANSPARENCY
1718 switch (ev.type) 1809 switch (ev.type)
1719 { 1810 {
1720 case PropertyNotify: 1811 case PropertyNotify:
1721 /* 1812 /*
1722 * if user used some Esetroot compatible prog to set the root bg, 1813 * if user used some Esetroot compatible prog to set the root bg,
1723 * use the property to determine the pixmap. We use it later on. 1814 * use the property to determine the pixmap. We use it later on.
1724 */ 1815 */
1725 if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID] 1816 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1726 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1817 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1727 return; 1818 {
1728 1819 bgPixmap.set_root_pixmap ();
1729 /* FALLTHROUGH */ 1820 update_background ();
1730 case ReparentNotify: 1821 }
1731 if ((options & Opt_transparent) && check_our_parents () && am_transparent)
1732 want_refresh = want_full_refresh = 1;
1733 break; 1822 break;
1734 } 1823 }
1824# endif
1735} 1825}
1736#endif 1826#endif
1737 1827
1738void 1828void
1739rxvt_term::button_press (XButtonEvent &ev) 1829rxvt_term::button_press (XButtonEvent &ev)
1740{ 1830{
1741 int reportmode = 0, clickintime; 1831 int reportmode = 0, clickintime;
1742 1832
1743 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1833 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1834
1744 if (!bypass_keystate) 1835 if (!bypass_keystate)
1745 reportmode = !! (priv_modes & PrivMode_mouse_report); 1836 reportmode = !! (priv_modes & PrivMode_mouse_report);
1746 1837
1747 /* 1838 /*
1748 * VT window processing of button press 1839 * VT window processing of button press
1749 */ 1840 */
1750 if (ev.window == TermWin.vt) 1841 if (ev.window == vt)
1751 { 1842 {
1843 if (HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1844 return;
1845
1752#if ISO_14755 1846#if ISO_14755
1753 // 5.4 1847 // 5.4
1754 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1848 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1755 { 1849 {
1756 iso14755_54 (ev.x, ev.y); 1850 iso14755_54 (ev.x, ev.y);
… …
1768#ifdef MOUSE_REPORT_DOUBLECLICK 1862#ifdef MOUSE_REPORT_DOUBLECLICK
1769 if (ev.button == MEvent.button && clickintime) 1863 if (ev.button == MEvent.button && clickintime)
1770 { 1864 {
1771 /* same button, within alloted time */ 1865 /* same button, within alloted time */
1772 MEvent.clicks++; 1866 MEvent.clicks++;
1867
1773 if (MEvent.clicks > 1) 1868 if (MEvent.clicks > 1)
1774 { 1869 {
1775 /* only report double clicks */ 1870 /* only report double clicks */
1776 MEvent.clicks = 2; 1871 MEvent.clicks = 2;
1777 mouse_report (ev); 1872 mouse_report (ev);
… …
1809#else 1904#else
1810 selection.rect = false; 1905 selection.rect = false;
1811#endif 1906#endif
1812 1907
1813 /* allow shift+left click to extend selection */ 1908 /* allow shift+left click to extend selection */
1814 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report)) 1909 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1815 { 1910 {
1816 if (MEvent.button == Button1 && clickintime) 1911 if (MEvent.button == Button1 && clickintime)
1817 selection_rotate (ev.x, ev.y); 1912 selection_rotate (ev.x, ev.y);
1818 else 1913 else
1819 selection_extend (ev.x, ev.y, 1); 1914 selection_extend (ev.x, ev.y, 1);
… …
1960 case Button3: 2055 case Button3:
1961 if (scrollBar.style != R_SB_XTERM) 2056 if (scrollBar.style != R_SB_XTERM)
1962 { 2057 {
1963 if (scrollbar_above_slider (ev.y)) 2058 if (scrollbar_above_slider (ev.y))
1964# ifdef RXVT_SCROLL_FULL 2059# ifdef RXVT_SCROLL_FULL
1965 scr_page (UP, TermWin.nrow - 1); 2060 scr_page (UP, nrow - 1);
1966# else 2061# else
1967 scr_page (UP, TermWin.nrow / 4); 2062 scr_page (UP, nrow / 4);
1968# endif 2063# endif
1969 else if (scrollbar_below_slider (ev.y)) 2064 else if (scrollbar_below_slider (ev.y))
1970# ifdef RXVT_SCROLL_FULL 2065# ifdef RXVT_SCROLL_FULL
1971 scr_page (DN, TermWin.nrow - 1); 2066 scr_page (DN, nrow - 1);
1972# else 2067# else
1973 scr_page (DN, TermWin.nrow / 4); 2068 scr_page (DN, nrow / 4);
1974# endif 2069# endif
1975 else 2070 else
1976 scrollBar.setMotion (); 2071 scrollBar.setMotion ();
1977 } 2072 }
1978 else 2073 else
1979 { 2074 {
1980 scr_page ((ev.button == Button1 ? DN : UP), 2075 scr_page ((ev.button == Button1 ? DN : UP),
1981 (TermWin.nrow 2076 (nrow
1982 * scrollbar_position (ev.y) 2077 * scrollbar_position (ev.y)
1983 / scrollbar_size ())); 2078 / scrollbar_size ()));
1984 } 2079 }
1985 2080
1986 break; 2081 break;
1987 } 2082 }
1988 } 2083 }
2084
1989 return; 2085 return;
1990 } 2086 }
1991#if MENUBAR
1992 /*
1993 * Menubar window processing of button press
1994 */
1995 if (isMenuBarWindow (ev.window))
1996 menubar_control (ev);
1997#endif
1998} 2087}
1999 2088
2000void 2089void
2001rxvt_term::button_release (XButtonEvent &ev) 2090rxvt_term::button_release (XButtonEvent &ev)
2002{ 2091{
… …
2008 2097
2009 if (scrollbar_isUpDn ()) 2098 if (scrollbar_isUpDn ())
2010 { 2099 {
2011 scrollBar.setIdle (); 2100 scrollBar.setIdle ();
2012 scrollbar_show (0); 2101 scrollbar_show (0);
2013#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2014 refresh_type &= ~SMOOTH_REFRESH;
2015#endif
2016 } 2102 }
2017 2103
2018#ifdef SELECTION_SCROLLING 2104#ifdef SELECTION_SCROLLING
2019 if (sel_scroll_ev.active) 2105 if (sel_scroll_ev.active)
2020 sel_scroll_ev.stop(); 2106 sel_scroll_ev.stop();
2021#endif 2107#endif
2022 2108
2023 if (ev.window == TermWin.vt) 2109 if (ev.window == vt)
2024 { 2110 {
2111 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2112 return;
2113
2025#if ISO_14755 2114#if ISO_14755
2026 // 5.4 2115 // 5.4
2027 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 2116 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2028 return; 2117 return;
2029#endif 2118#endif
2119
2030 if (reportmode) 2120 if (reportmode)
2031 { 2121 {
2032 /* mouse report from vt window */ 2122 /* mouse report from vt window */
2033 /* don't report release of wheel "buttons" */ 2123 /* don't report release of wheel "buttons" */
2034 if (ev.button >= 4) 2124 if (ev.button >= 4)
… …
2064 { 2154 {
2065 case Button1: 2155 case Button1:
2066 case Button3: 2156 case Button3:
2067 selection_make (ev.time); 2157 selection_make (ev.time);
2068 break; 2158 break;
2159
2069 case Button2: 2160 case Button2:
2070 selection_request (ev.time, ev.x, ev.y); 2161 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2162 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2071 break; 2163 break;
2164
2072#ifdef MOUSE_WHEEL 2165#ifdef MOUSE_WHEEL
2073 case Button4: 2166 case Button4:
2074 case Button5: 2167 case Button5:
2075 { 2168 {
2076 int i; 2169 int i;
… …
2078 2171
2079 v = ev.button == Button4 ? UP : DN; 2172 v = ev.button == Button4 ? UP : DN;
2080 2173
2081 if (ev.state & ShiftMask) 2174 if (ev.state & ShiftMask)
2082 i = 1; 2175 i = 1;
2083 else if (options & Opt_mouseWheelScrollPage) 2176 else if (option (Opt_mouseWheelScrollPage))
2084 i = TermWin.nrow - 1; 2177 i = nrow - 1;
2085 else 2178 else
2086 i = 5; 2179 i = 5;
2087 2180
2088# ifdef MOUSE_SLIP_WHEELING 2181# ifdef MOUSE_SLIP_WHEELING
2089 if (ev.state & ControlMask) 2182 if (ev.state & ControlMask)
2090 { 2183 {
2091 mouse_slip_wheel_speed += v ? -1 : 1; 2184 mouse_slip_wheel_speed += v ? -1 : 1;
2092 if (mouse_slip_wheel_speed < -TermWin.nrow) mouse_slip_wheel_speed = -TermWin.nrow; 2185 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2093 if (mouse_slip_wheel_speed > +TermWin.nrow) mouse_slip_wheel_speed = +TermWin.nrow; 2186 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2094 2187
2095 if (slip_wheel_ev.at < NOW) 2188 if (slip_wheel_ev.at < NOW)
2096 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; 2189 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;
2097 2190
2098 slip_wheel_ev.start (); 2191 slip_wheel_ev.start ();
2099 } 2192 }
2100 else 2193 else
2101 { 2194 {
2102# endif 2195# endif
2103# ifdef JUMP_MOUSE_WHEEL
2104 scr_page (v, i); 2196 scr_page (v, i);
2105 scr_refresh (SMOOTH_REFRESH);
2106 scrollbar_show (1); 2197 scrollbar_show (1);
2107# else
2108 while (i--)
2109 {
2110 scr_page (v, 1);
2111 scr_refresh (SMOOTH_REFRESH);
2112 scrollbar_show (1);
2113 }
2114# endif
2115# ifdef MOUSE_SLIP_WHEELING 2198# ifdef MOUSE_SLIP_WHEELING
2116 } 2199 }
2117#endif 2200# endif
2118 } 2201 }
2119 break; 2202 break;
2120#endif 2203#endif
2121 } 2204 }
2122 } 2205 }
2123#ifdef MENUBAR
2124 else if (isMenuBarWindow (ev.window))
2125 menubar_control (ev);
2126#endif
2127} 2206}
2128
2129#ifdef TRANSPARENT
2130#if TINTING
2131/* taken from aterm-0.4.2 */
2132
2133typedef uint32_t RUINT32T;
2134
2135void ShadeXImage(rxvt_display *display, XImage* srcImage, int shade, int rm, int gm, int bm)
2136{
2137 int sh_r, sh_g, sh_b;
2138 RUINT32T mask_r, mask_g, mask_b;
2139 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2140 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2141 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2142 int i;
2143
2144 Visual *visual = display->visual;
2145
2146 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2147
2148 /* for convenience */
2149 mask_r = visual->red_mask;
2150 mask_g = visual->green_mask;
2151 mask_b = visual->blue_mask;
2152
2153 /* boring lookup table pre-initialization */
2154 switch (srcImage->bits_per_pixel) {
2155 case 15:
2156 if ((mask_r != 0x7c00) ||
2157 (mask_g != 0x03e0) ||
2158 (mask_b != 0x001f))
2159 return;
2160 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32));
2161 lookup_r = lookup;
2162 lookup_g = lookup+32;
2163 lookup_b = lookup+32+32;
2164 sh_r = 10;
2165 sh_g = 5;
2166 sh_b = 0;
2167 break;
2168 case 16:
2169 if ((mask_r != 0xf800) ||
2170 (mask_g != 0x07e0) ||
2171 (mask_b != 0x001f))
2172 return;
2173 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32));
2174 lookup_r = lookup;
2175 lookup_g = lookup+32;
2176 lookup_b = lookup+32+64;
2177 sh_r = 11;
2178 sh_g = 5;
2179 sh_b = 0;
2180 break;
2181 case 24:
2182 if ((mask_r != 0xff0000) ||
2183 (mask_g != 0x00ff00) ||
2184 (mask_b != 0x0000ff))
2185 return;
2186 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2187 lookup_r = lookup;
2188 lookup_g = lookup+256;
2189 lookup_b = lookup+256+256;
2190 sh_r = 16;
2191 sh_g = 8;
2192 sh_b = 0;
2193 break;
2194 case 32:
2195 if ((mask_r != 0xff0000) ||
2196 (mask_g != 0x00ff00) ||
2197 (mask_b != 0x0000ff))
2198 return;
2199 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2200 lookup_r = lookup;
2201 lookup_g = lookup+256;
2202 lookup_b = lookup+256+256;
2203 sh_r = 16;
2204 sh_g = 8;
2205 sh_b = 0;
2206 break;
2207 default:
2208 return; /* we do not support this color depth */
2209 }
2210
2211 /* prepare limits for color transformation (each channel is handled separately) */
2212 if (shade < 0) {
2213 shade = -shade;
2214 if (shade < 0) shade = 0;
2215 if (shade > 100) shade = 100;
2216
2217 lower_lim_r = 65535-rm;
2218 lower_lim_g = 65535-gm;
2219 lower_lim_b = 65535-bm;
2220
2221 lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100);
2222 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100);
2223 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100);
2224
2225 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
2226 } else {
2227 if (shade < 0) shade = 0;
2228 if (shade > 100) shade = 100;
2229
2230 lower_lim_r = lower_lim_g = lower_lim_b = 0;
2231
2232 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
2233 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);
2234 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100);
2235 }
2236
2237 /* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */
2238 if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 ))
2239 {
2240 unsigned int tmp;
2241
2242 tmp = lower_lim_r;
2243 lower_lim_r = lower_lim_b;
2244 lower_lim_b = tmp;
2245
2246 tmp = upper_lim_r;
2247 upper_lim_r = upper_lim_b;
2248 upper_lim_b = tmp;
2249 }
2250
2251 /* fill our lookup tables */
2252 for (i = 0; i <= mask_r>>sh_r; i++)
2253 {
2254 RUINT32T tmp;
2255 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r));
2256 tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r);
2257 lookup_r[i] = (tmp/65535)<<sh_r;
2258 }
2259 for (i = 0; i <= mask_g>>sh_g; i++)
2260 {
2261 RUINT32T tmp;
2262 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g));
2263 tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g);
2264 lookup_g[i] = (tmp/65535)<<sh_g;
2265 }
2266 for (i = 0; i <= mask_b>>sh_b; i++)
2267 {
2268 RUINT32T tmp;
2269 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b));
2270 tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b);
2271 lookup_b[i] = (tmp/65535)<<sh_b;
2272 }
2273
2274 /* apply table to input image (replacing colors by newly calculated ones) */
2275 switch (srcImage->bits_per_pixel)
2276 {
2277 case 15:
2278 {
2279 unsigned short *p1, *pf, *p, *pl;
2280 p1 = (unsigned short *) srcImage->data;
2281 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2282 while (p1 < pf)
2283 {
2284 p = p1;
2285 pl = p1 + srcImage->width;
2286 for (; p < pl; p++)
2287 {
2288 *p = lookup_r[(*p & 0x7c00)>>10] |
2289 lookup_g[(*p & 0x03e0)>> 5] |
2290 lookup_b[(*p & 0x001f)];
2291 }
2292 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2293 }
2294 break;
2295 }
2296 case 16:
2297 {
2298 unsigned short *p1, *pf, *p, *pl;
2299 p1 = (unsigned short *) srcImage->data;
2300 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2301 while (p1 < pf)
2302 {
2303 p = p1;
2304 pl = p1 + srcImage->width;
2305 for (; p < pl; p++)
2306 {
2307 *p = lookup_r[(*p & 0xf800)>>11] |
2308 lookup_g[(*p & 0x07e0)>> 5] |
2309 lookup_b[(*p & 0x001f)];
2310 }
2311 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2312 }
2313 break;
2314 }
2315 case 24:
2316 {
2317 unsigned char *p1, *pf, *p, *pl;
2318 p1 = (unsigned char *) srcImage->data;
2319 pf = (unsigned char *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2320 while (p1 < pf)
2321 {
2322 p = p1;
2323 pl = p1 + srcImage->width * 3;
2324 for (; p < pl; p += 3)
2325 {
2326 p[0] = lookup_r[(p[0] & 0xff0000)>>16];
2327 p[1] = lookup_r[(p[1] & 0x00ff00)>> 8];
2328 p[2] = lookup_r[(p[2] & 0x0000ff)];
2329 }
2330 p1 = (unsigned char *) ((char *) p1 + srcImage->bytes_per_line);
2331 }
2332 break;
2333 }
2334 case 32:
2335 {
2336 RUINT32T *p1, *pf, *p, *pl;
2337 p1 = (RUINT32T *) srcImage->data;
2338 pf = (RUINT32T *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2339
2340 while (p1 < pf)
2341 {
2342 p = p1;
2343 pl = p1 + srcImage->width;
2344 for (; p < pl; p++)
2345 {
2346 *p = lookup_r[(*p & 0xff0000)>>16] |
2347 lookup_g[(*p & 0x00ff00)>> 8] |
2348 lookup_b[(*p & 0x0000ff)] |
2349 (*p & ~0xffffff);
2350 }
2351 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
2352 }
2353 break;
2354 }
2355 }
2356
2357 free (lookup);
2358}
2359#endif
2360
2361/*
2362 * Check our parents are still who we think they are.
2363 * Do transparency updates if required
2364 */
2365int
2366rxvt_term::check_our_parents ()
2367{
2368 int i, pchanged, aformat, have_pixmap, rootdepth;
2369 unsigned long nitems, bytes_after;
2370 Atom atype;
2371 unsigned char *prop = NULL;
2372 Window root, oldp, *list;
2373 Pixmap rootpixmap = None;
2374 XWindowAttributes wattr, wrootattr;
2375 dDisp;
2376
2377 pchanged = 0;
2378
2379 if (!(options & Opt_transparent))
2380 return pchanged; /* Don't try any more */
2381
2382 XGetWindowAttributes (disp, display->root, &wrootattr);
2383 rootdepth = wrootattr.depth;
2384
2385 XGetWindowAttributes (disp, TermWin.parent[0], &wattr);
2386
2387 if (rootdepth != wattr.depth)
2388 {
2389 if (am_transparent)
2390 {
2391 pchanged = 1;
2392 XSetWindowBackground (disp, TermWin.vt, pix_colors_focused[Color_bg]);
2393 am_transparent = am_pixmap_trans = 0;
2394 }
2395
2396 return pchanged; /* Don't try any more */
2397 }
2398
2399 /* Get all X ops out of the queue so that our information is up-to-date. */
2400 XSync (disp, False);
2401
2402 /*
2403 * Make the frame window set by the window manager have
2404 * the root background. Some window managers put multiple nested frame
2405 * windows for each client, so we have to take care about that.
2406 */
2407 i = (xa[XA_XROOTPMAP_ID]
2408 && XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID],
2409 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2410 &nitems, &bytes_after, &prop) == Success);
2411
2412 if (!i || prop == NULL)
2413 i = (xa[XA_ESETROOT_PMAP_ID]
2414 && XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID],
2415 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2416 &nitems, &bytes_after, &prop) == Success);
2417
2418 if (!i || prop == NULL
2419#if TINTING
2420 || !rs[Rs_color + Color_tint]
2421#endif
2422 )
2423 have_pixmap = 0;
2424 else
2425 {
2426 have_pixmap = 1;
2427 rootpixmap = *(Pixmap *)prop;
2428 XFree (prop);
2429 }
2430
2431 if (have_pixmap)
2432 {
2433 /*
2434 * Copy display->root pixmap transparency
2435 */
2436 int sx, sy, nx, ny;
2437 unsigned int nw, nh;
2438 Window cr;
2439 XImage *image;
2440 GC gc;
2441 XGCValues gcvalue;
2442
2443 XTranslateCoordinates (disp, TermWin.parent[0], display->root,
2444 0, 0, &sx, &sy, &cr);
2445 nw = (unsigned int)szHint.width;
2446 nh = (unsigned int)szHint.height;
2447 nx = ny = 0;
2448
2449 if (sx < 0)
2450 {
2451 nw += sx;
2452 nx = -sx;
2453 sx = 0;
2454 }
2455
2456 if (sy < 0)
2457 {
2458 nh += sy;
2459 ny = -sy;
2460 sy = 0;
2461 }
2462
2463 MIN_IT (nw, (unsigned int) (wrootattr.width - sx));
2464 MIN_IT (nh, (unsigned int) (wrootattr.height - sy));
2465
2466 XSync (disp, False);
2467 allowedxerror = -1;
2468 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2469
2470 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2471 /* XXX: may need a delay here? */
2472 allowedxerror = 0;
2473
2474 if (image == NULL)
2475 {
2476 if (am_transparent && am_pixmap_trans)
2477 {
2478 pchanged = 1;
2479 if (TermWin.pixmap != None)
2480 {
2481 XFreePixmap (disp, TermWin.pixmap);
2482 TermWin.pixmap = None;
2483 }
2484 }
2485
2486 am_pixmap_trans = 0;
2487 }
2488 else
2489 {
2490 if (TermWin.pixmap != None)
2491 XFreePixmap (disp, TermWin.pixmap);
2492
2493#if TINTING
2494 if (ISSET_PIXCOLOR (Color_tint))
2495 {
2496 unsigned short rm, gm, bm;
2497 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2498
2499 pix_colors_focused[Color_tint].get (display, rm, gm, bm);
2500
2501 ShadeXImage (display, image, shade, rm, gm, bm);
2502 }
2503#endif
2504
2505 TermWin.pixmap = XCreatePixmap (disp, TermWin.vt,
2506 szHint.width, szHint.height, image->depth);
2507 gc = XCreateGC (disp, TermWin.vt, 0UL, &gcvalue);
2508 XPutImage (disp, TermWin.pixmap, gc, image, 0, 0,
2509 nx, ny, image->width, image->height);
2510 XFreeGC (disp, gc);
2511 XDestroyImage (image);
2512 XSetWindowBackgroundPixmap (disp, TermWin.parent[0], TermWin.pixmap);
2513 XClearWindow (disp, TermWin.parent[0]);
2514
2515 if (!am_transparent || !am_pixmap_trans)
2516 pchanged = 1;
2517
2518 am_transparent = am_pixmap_trans = 1;
2519 }
2520 }
2521
2522 if (am_pixmap_trans)
2523 XSetWindowBackgroundPixmap (disp, TermWin.vt, ParentRelative);
2524 else
2525 {
2526 unsigned int n;
2527 /*
2528 * InheritPixmap transparency
2529 */
2530 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)
2531 {
2532 oldp = TermWin.parent[i];
2533 XQueryTree (disp, TermWin.parent[i - 1], &root,
2534 &TermWin.parent[i], &list, &n);
2535 XFree (list);
2536
2537 if (TermWin.parent[i] == display->root)
2538 {
2539 if (oldp != None)
2540 pchanged = 1;
2541
2542 break;
2543 }
2544
2545 if (oldp != TermWin.parent[i])
2546 pchanged = 1;
2547 }
2548
2549 n = 0;
2550
2551 if (pchanged)
2552 {
2553 for (; n < (unsigned int)i; n++)
2554 {
2555 XGetWindowAttributes (disp, TermWin.parent[n], &wattr);
2556 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2557 {
2558 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1;
2559 break;
2560 }
2561 }
2562 }
2563
2564 if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0])))
2565 {
2566 XSetWindowBackground (disp, TermWin.parent[0], pix_colors_focused[Color_border]);
2567 XSetWindowBackground (disp, TermWin.vt, pix_colors_focused[Color_bg]);
2568 am_transparent = 0;
2569 /* XXX: also turn off Opt_transparent? */
2570 }
2571 else
2572 {
2573#if WAIT_FOR_WM
2574 /* wait (an arbitrary period) for the WM to do its thing
2575 * needed for fvwm2.2.2 (and before?) */
2576 sleep (1);
2577#endif
2578 for (n = 0; n < (unsigned int)i; n++)
2579 {
2580 XSetWindowBackgroundPixmap (disp, TermWin.parent[n], ParentRelative);
2581 XClearWindow (disp, TermWin.parent[n]);
2582 }
2583
2584 XSetWindowBackgroundPixmap (disp, TermWin.vt, ParentRelative);
2585 am_transparent = 1;
2586 }
2587
2588 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)
2589 TermWin.parent[i] = None;
2590 }
2591
2592 if (scrollBar.win)
2593 {
2594 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);
2595 scrollBar.setIdle ();
2596 scrollbar_show (0);
2597 }
2598
2599 if (am_transparent)
2600 {
2601 want_refresh = want_full_refresh = 1;
2602 if (am_pixmap_trans)
2603 flush ();
2604 }
2605
2606 return pchanged;
2607}
2608#endif
2609 2207
2610/*}}} */ 2208/*}}} */
2611 2209
2612bool 2210bool
2613rxvt_term::cmd_parse () 2211rxvt_term::cmd_parse ()
2614{ 2212{
2615 bool flag = false; 2213 bool flag = false;
2616 unicode_t ch = NOCHAR; 2214 wchar_t ch = NOCHAR;
2617 unsigned char *seq_begin; // remember start of esc-sequence here 2215 char *seq_begin; // remember start of esc-sequence here
2618 2216
2619 for (;;) 2217 for (;;)
2620 { 2218 {
2621 if (ch == NOCHAR) 2219 if (ch == NOCHAR)
2622 { 2220 {
2623 seq_begin = cmdbuf_ptr; 2221 seq_begin = cmdbuf_ptr;
2624 ch = next_char (); 2222 ch = next_char ();
2625 }
2626 2223
2627 if (ch == NOCHAR) // TODO: improve 2224 if (ch == NOCHAR)
2628 break; 2225 break;
2226 }
2629 2227
2630 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2228 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)
2631 { 2229 {
2632 if (!seen_input) 2230 if (!seen_input)
2633 { 2231 {
… …
2642 if (seen_resize && cmd_pid) 2240 if (seen_resize && cmd_pid)
2643 kill (-cmd_pid, SIGWINCH); 2241 kill (-cmd_pid, SIGWINCH);
2644 } 2242 }
2645 2243
2646 /* Read a text string from the input buffer */ 2244 /* Read a text string from the input buffer */
2647 unicode_t buf[UBUFSIZ]; 2245 wchar_t buf[UBUFSIZ];
2648 bool refreshnow = false; 2246 bool refreshnow = false;
2649 int nlines = 0; 2247 int nlines = 0;
2650 unicode_t *str = buf; 2248 wchar_t *str = buf;
2651 unicode_t *eol = str + min (TermWin.ncol, UBUFSIZ); 2249 wchar_t *eol = str + min (ncol, UBUFSIZ);
2652 2250
2653 for (;;) 2251 for (;;)
2654 { 2252 {
2655 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2253 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2656 break; 2254 break;
… …
2662 if (ch == C0_LF) 2260 if (ch == C0_LF)
2663 nlines++; 2261 nlines++;
2664 2262
2665 refresh_count++; 2263 refresh_count++;
2666 2264
2667 if (!(options & Opt_jumpScroll) 2265 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1)
2668 || (refresh_count >= refresh_limit * (TermWin.nrow - 1)))
2669 { 2266 {
2267 refresh_count = 0;
2268
2269 if (!option (Opt_skipScroll) || io_manager::now () > NOW + 1. / 60.)
2270 {
2670 refreshnow = true; 2271 refreshnow = true;
2671 ch = NOCHAR; 2272 ch = NOCHAR;
2672 break; 2273 break;
2274 }
2673 } 2275 }
2674 2276
2675 // scr_add_lines only works for nlines <= TermWin.nrow - 1. 2277 // scr_add_lines only works for nlines <= nrow - 1.
2676 if (nlines >= TermWin.nrow - 1) 2278 if (nlines >= nrow - 1)
2677 { 2279 {
2280 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2281 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2678 scr_add_lines (buf, nlines, str - buf); 2282 scr_add_lines (buf, str - buf, nlines);
2283
2679 nlines = 0; 2284 nlines = 0;
2680 str = buf; 2285 str = buf;
2681 eol = str + min (TermWin.ncol, UBUFSIZ); 2286 eol = str + min (ncol, UBUFSIZ);
2682 } 2287 }
2683 2288
2684 if (str >= eol) 2289 if (str >= eol)
2685 { 2290 {
2686 if (eol >= buf + UBUFSIZ) 2291 if (eol >= buf + UBUFSIZ)
2687 { 2292 {
2688 ch = NOCHAR; 2293 ch = NOCHAR;
2689 break; 2294 break;
2690 } 2295 }
2691 else 2296 else
2692 eol = min (eol + TermWin.ncol, buf + UBUFSIZ); 2297 eol = min (eol + ncol, buf + UBUFSIZ);
2693 } 2298 }
2694 2299
2695 } 2300 }
2696 2301
2697 seq_begin = cmdbuf_ptr; 2302 seq_begin = cmdbuf_ptr;
2698 ch = next_char (); 2303 ch = next_char ();
2699 } 2304 }
2700 2305
2306 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2307 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2701 scr_add_lines (buf, nlines, str - buf); 2308 scr_add_lines (buf, str - buf, nlines);
2702 2309
2703 /* 2310 /*
2704 * If there have been a lot of new lines, then update the screen 2311 * If there have been a lot of new lines, then update the screen
2705 * What the heck I'll cheat and only refresh less than every page-full. 2312 * What the heck we'll cheat and only refresh less than every page-full.
2706 * the number of pages between refreshes is refresh_limit, which 2313 * if skipScroll is enabled.
2707 * is incremented here because we must be doing flat-out scrolling.
2708 */ 2314 */
2709 if (refreshnow) 2315 if (refreshnow)
2710 { 2316 {
2711 if ((options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2712 refresh_limit++;
2713 else
2714 {
2715 flag = true; 2317 flag = true;
2716 scr_refresh (refresh_type); 2318 scr_refresh ();
2717 } 2319 want_refresh = 1;
2718 } 2320 }
2719 2321
2720 } 2322 }
2721 else 2323 else
2722 { 2324 {
… …
2736 } 2338 }
2737 2339
2738 return flag; 2340 return flag;
2739} 2341}
2740 2342
2741// read the next octet
2742unicode_t
2743rxvt_term::next_octet ()
2744{
2745 return cmdbuf_ptr < cmdbuf_endp
2746 ? *cmdbuf_ptr++
2747 : NOCHAR;
2748}
2749
2750// read the next character 2343// read the next character
2751unicode_t 2344wchar_t
2752rxvt_term::next_char () 2345rxvt_term::next_char () NOTHROW
2753{ 2346{
2754 while (cmdbuf_ptr < cmdbuf_endp) 2347 while (cmdbuf_ptr < cmdbuf_endp)
2755 { 2348 {
2756 // assume 7-bit to be ascii ALWAYS 2349 // assume 7-bit to be ascii ALWAYS
2757 if (*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2350 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
2758 return *cmdbuf_ptr++; 2351 return *cmdbuf_ptr++;
2759 2352
2760 wchar_t wc; 2353 wchar_t wc;
2761 size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2354 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2762 2355
2763 if (len == (size_t)-2) 2356 if (len == (size_t)-2)
2764 { 2357 {
2765 // the mbstate stores incomplete sequences. didn't know this :/ 2358 // the mbstate stores incomplete sequences. didn't know this :/
2766 cmdbuf_ptr = cmdbuf_endp; 2359 cmdbuf_ptr = cmdbuf_endp;
2767 break; 2360 break;
2768 } 2361 }
2769 2362
2770 if (len == (size_t)-1) 2363 if (len == (size_t)-1)
2771 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2364 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2772 2365
2773 // assume wchar == unicode 2366 // assume wchar == unicode
2774 cmdbuf_ptr += len; 2367 cmdbuf_ptr += len;
2775 return wc & UNICODE_MASK; 2368 return wc & UNICODE_MASK;
2776 } 2369 }
2777 2370
2778 return NOCHAR; 2371 return NOCHAR;
2779} 2372}
2373
2374// read the next octet
2375uint32_t
2376rxvt_term::next_octet () NOTHROW
2377{
2378 return cmdbuf_ptr < cmdbuf_endp
2379 ? (unsigned char)*cmdbuf_ptr++
2380 : NOCHAR;
2381}
2382
2383static class out_of_input out_of_input;
2780 2384
2781/* rxvt_cmd_getc () - Return next input character */ 2385/* rxvt_cmd_getc () - Return next input character */
2782/* 2386/*
2783 * Return the next input character after first passing any keyboard input 2387 * Return the next input character after first passing any keyboard input
2784 * to the command. 2388 * to the command.
2785 */ 2389 */
2786unicode_t 2390wchar_t
2787rxvt_term::cmd_getc () 2391rxvt_term::cmd_getc () THROW ((class out_of_input))
2788{ 2392{
2789 unicode_t c = next_char (); 2393 wchar_t c = next_char ();
2790 2394
2791 if (c == NOCHAR) 2395 if (c == NOCHAR)
2792 throw out_of_input; 2396 throw out_of_input;
2793 2397
2794 return c; 2398 return c;
2795} 2399}
2796 2400
2797unicode_t 2401uint32_t
2798rxvt_term::cmd_get8 () 2402rxvt_term::cmd_get8 () THROW ((class out_of_input))
2799{ 2403{
2800 unicode_t c = next_octet (); 2404 uint32_t c = next_octet ();
2801 2405
2802 if (c == NOCHAR) 2406 if (c == NOCHAR)
2803 throw out_of_input; 2407 throw out_of_input;
2804 2408
2805 return c; 2409 return c;
… …
2869 { 2473 {
2870 if ((buf[len++] = cmd_getc ()) == 'i') 2474 if ((buf[len++] = cmd_getc ()) == 'i')
2871 break; /* done = 1 */ 2475 break; /* done = 1 */
2872 } 2476 }
2873 } 2477 }
2874 2478
2875 for (i = 0; i < len; i++) 2479 for (i = 0; i < len; i++)
2876 if (putc (buf[i], fd) == EOF) 2480 if (putc (buf[i], fd) == EOF)
2877 { 2481 {
2878 done = 1; 2482 done = 1;
2879 break; 2483 break;
… …
2905 case C0_ESC: 2509 case C0_ESC:
2906 process_escape_seq (); 2510 process_escape_seq ();
2907 break; 2511 break;
2908 case C0_ENQ: /* terminal Status */ 2512 case C0_ENQ: /* terminal Status */
2909 if (rs[Rs_answerbackstring]) 2513 if (rs[Rs_answerbackstring])
2910 tt_write ((const unsigned char *)rs[Rs_answerbackstring], 2514 tt_write (rs [Rs_answerbackstring], strlen (rs [Rs_answerbackstring]));
2911 (unsigned int)strlen (rs[Rs_answerbackstring]));
2912 else 2515 else
2913 tt_write ((unsigned char *)VT100_ANS, 2516 tt_write (VT100_ANS, strlen (VT100_ANS));
2914 (unsigned int)strlen (VT100_ANS));
2915 break; 2517 break;
2916 case C0_BEL: /* bell */ 2518 case C0_BEL: /* bell */
2917 scr_bell (); 2519 scr_bell ();
2918 break; 2520 break;
2919 case C0_BS: /* backspace */ 2521 case C0_BS: /* backspace */
… …
2943 process_dcs_seq (); 2545 process_dcs_seq ();
2944 break; 2546 break;
2945 case 0x9b: /* CSI */ 2547 case 0x9b: /* CSI */
2946 process_csi_seq (); 2548 process_csi_seq ();
2947 break; 2549 break;
2948 case 0x9d: /* CSI */ 2550 case 0x9d: /* OSC */
2949 process_osc_seq (); 2551 process_osc_seq ();
2950 break; 2552 break;
2951#endif 2553#endif
2952 } 2554 }
2953} 2555}
… …
3043 scr_charset_set (2, (unsigned int)cmd_getc ()); 2645 scr_charset_set (2, (unsigned int)cmd_getc ());
3044 break; 2646 break;
3045 case '+': 2647 case '+':
3046 scr_charset_set (3, (unsigned int)cmd_getc ()); 2648 scr_charset_set (3, (unsigned int)cmd_getc ());
3047 break; 2649 break;
3048#if ENABLE_FRILLS 2650#if !ENABLE_MINIMAL
3049 case '6': 2651 case '6':
3050 scr_backindex (); 2652 scr_backindex ();
3051 break; 2653 break;
3052#endif 2654#endif
3053 case '7': 2655 case '7':
3054 scr_cursor (SAVE); 2656 scr_cursor (SAVE);
3055 break; 2657 break;
3056 case '8': 2658 case '8':
3057 scr_cursor (RESTORE); 2659 scr_cursor (RESTORE);
3058 break; 2660 break;
3059#if ENABLE_FRILLS 2661#if !ENABLE_MINIMAL
3060 case '9': 2662 case '9':
3061 scr_forwardindex (); 2663 scr_forwardindex ();
3062 break; 2664 break;
3063#endif 2665#endif
3064 case '=': 2666 case '=':
… …
3074 break; 2676 break;
3075 2677
3076 /* 8.3.87: NEXT LINE */ 2678 /* 8.3.87: NEXT LINE */
3077 case C1_NEL: /* ESC E */ 2679 case C1_NEL: /* ESC E */
3078 { 2680 {
3079 unicode_t nlcr[] = { C0_LF, C0_CR }; 2681 wchar_t nlcr[] = { C0_LF, C0_CR };
3080 scr_add_lines (nlcr, 1, 2); 2682 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1);
3081 } 2683 }
3082 break; 2684 break;
3083 2685
3084 /* kidnapped escape sequence: Should be 8.3.48 */ 2686 /* kidnapped escape sequence: Should be 8.3.48 */
3085 case C1_ESA: /* ESC G */ 2687 case C1_ESA: /* ESC G */
… …
3107 process_dcs_seq (); 2709 process_dcs_seq ();
3108 break; 2710 break;
3109 2711
3110 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2712 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
3111 case C1_SCI: /* ESC Z */ 2713 case C1_SCI: /* ESC Z */
3112 tt_write ((const unsigned char *)ESCZ_ANSWER, 2714 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
3113 (unsigned int) (sizeof (ESCZ_ANSWER) - 1));
3114 break; /* steal obsolete ESC [ c */ 2715 break; /* steal obsolete ESC [ c */
3115 2716
3116 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2717 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */
3117 case C1_CSI: /* ESC [ */ 2718 case C1_CSI: /* ESC [ */
3118 process_csi_seq (); 2719 process_csi_seq ();
… …
3180rxvt_term::process_csi_seq () 2781rxvt_term::process_csi_seq ()
3181{ 2782{
3182 unicode_t ch, priv, i; 2783 unicode_t ch, priv, i;
3183 unsigned int nargs, p; 2784 unsigned int nargs, p;
3184 int n, ndef; 2785 int n, ndef;
3185 int arg[ESC_ARGS]; 2786 int arg[ESC_ARGS] = { };
3186 2787
3187 for (nargs = ESC_ARGS; nargs > 0;) 2788 nargs = 0;
3188 arg[--nargs] = 0;
3189 2789
3190 priv = 0; 2790 priv = 0;
3191 ch = cmd_getc (); 2791 ch = cmd_getc ();
3192 if (ch >= '<' && ch <= '?') 2792 if (ch >= '<' && ch <= '?')
3193 { /* '<' '=' '>' '?' */ 2793 { /* '<' '=' '>' '?' */
… …
3227 ndef = get_byte_array_bit (csi_defaults, i); 2827 ndef = get_byte_array_bit (csi_defaults, i);
3228 for (p = 0; p < nargs; p++) 2828 for (p = 0; p < nargs; p++)
3229 if (arg[p] == -1) 2829 if (arg[p] == -1)
3230 arg[p] = ndef; 2830 arg[p] = ndef;
3231 2831
3232#ifdef DEBUG_CMD
3233 fprintf (stderr, "CSI ");
3234 for (p = 0; p < nargs; p++)
3235 fprintf (stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : "");
3236 fprintf (stderr, "%c\n", ch);
3237#endif
3238
3239 /* 2832 /*
3240 * private mode handling 2833 * private mode handling
3241 */ 2834 */
3242 if (priv) 2835 if (priv)
3243 { 2836 {
3244 switch (priv) 2837 switch (priv)
3245 { 2838 {
3246 case '>': 2839 case '>':
3247 if (ch == CSI_DA) /* secondary device attributes */ 2840 if (ch == CSI_DA) /* secondary device attributes */
3248 tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]); 2841 {
2842 // first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt,
2843 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
2844 //
2845 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
2846 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify
2847 // that we do not support xterm mouse reporting (should be 95 when we do).
2848 //
2849 tt_printf ("\033[>%d;94;0c", 'U');
2850 }
3249 break; 2851 break;
3250 case '?': 2852 case '?':
3251 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2853 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3252 process_terminal_mode (ch, priv, nargs, arg); 2854 process_terminal_mode (ch, priv, nargs, arg);
3253 break; 2855 break;
… …
3358 2960
3359 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */ 2961 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */
3360 arg[0] = -arg[0]; 2962 arg[0] = -arg[0];
3361 /* FALLTHROUGH */ 2963 /* FALLTHROUGH */
3362 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 2964 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
3363 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0); 2965 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
3364 break; 2966 break;
3365 2967
3366 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 2968 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
3367 tt_write ((const unsigned char *)VT100_ANS, 2969 tt_write (VT100_ANS, sizeof (VT100_ANS) - 1);
3368 (unsigned int) (sizeof (VT100_ANS) - 1));
3369 break; 2970 break;
3370 2971
3371 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 2972 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
3372 process_sgr_mode (nargs, arg); 2973 process_sgr_mode (nargs, arg);
3373 break; 2974 break;
… …
3380 break; 2981 break;
3381 case 6: /* CPR requested */ 2982 case 6: /* CPR requested */
3382 scr_report_position (); 2983 scr_report_position ();
3383 break; 2984 break;
3384 case 7: /* unofficial extension */ 2985 case 7: /* unofficial extension */
3385 if (options & Opt_insecure) 2986 if (option (Opt_insecure))
3386 tt_printf ("%-.250s\012", rs[Rs_display_name]); 2987 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3387 break; 2988 break;
3388 case 8: /* unofficial extension */ 2989 case 8: /* unofficial extension */
3389 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 2990 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3390 break; 2991 break;
… …
3457 break; 3058 break;
3458 case CSI_75: 3059 case CSI_75:
3459 scr_cursor (RESTORE); 3060 scr_cursor (RESTORE);
3460 break; 3061 break;
3461 3062
3462#if ENABLE_FRILLS 3063#if !ENABLE_MINIMAL
3463 case CSI_74: 3064 case CSI_74:
3464 process_window_ops (arg, nargs); 3065 process_window_ops (arg, nargs);
3465 break; 3066 break;
3466#endif 3067#endif
3467 3068
… …
3474 break; 3075 break;
3475 } 3076 }
3476} 3077}
3477/*}}} */ 3078/*}}} */
3478 3079
3479#if ENABLE_FRILLS 3080#if !ENABLE_MINIMAL
3480/* ARGSUSED */ 3081/* ARGSUSED */
3481void 3082void
3482rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3083rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3483{ 3084{
3484 int x, y; 3085 int x, y;
3485 XWindowAttributes wattr; 3086 XWindowAttributes wattr;
3486 Window wdummy; 3087 Window wdummy;
3487 dDisp; 3088
3089 dLocal (Display *, dpy);
3488 3090
3489 if (nargs == 0) 3091 if (nargs == 0)
3490 return; 3092 return;
3491 3093
3492 switch (args[0]) 3094 switch (args[0])
3493 { 3095 {
3494 /* 3096 /*
3495 * commands 3097 * commands
3496 */ 3098 */
3497 case 1: /* deiconify window */ 3099 case 1: /* deiconify window */
3498 XMapWindow (disp, TermWin.parent[0]); 3100 XMapWindow (dpy, parent[0]);
3499 break; 3101 break;
3500 case 2: /* iconify window */ 3102 case 2: /* iconify window */
3501 XIconifyWindow (disp, TermWin.parent[0], display->screen); 3103 XIconifyWindow (dpy, parent[0], display->screen);
3502 break; 3104 break;
3503 case 3: /* set position (pixels) */ 3105 case 3: /* set position (pixels) */
3504 XMoveWindow (disp, TermWin.parent[0], args[1], args[2]); 3106 XMoveWindow (dpy, parent[0], args[1], args[2]);
3505 break; 3107 break;
3506 case 4: /* set size (pixels) */ 3108 case 4: /* set size (pixels) */
3507 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3109 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3508 break; 3110 break;
3509 case 5: /* raise window */ 3111 case 5: /* raise window */
3510 XRaiseWindow (disp, TermWin.parent[0]); 3112 XRaiseWindow (dpy, parent[0]);
3511 break; 3113 break;
3512 case 6: /* lower window */ 3114 case 6: /* lower window */
3513 XLowerWindow (disp, TermWin.parent[0]); 3115 XLowerWindow (dpy, parent[0]);
3514 break; 3116 break;
3515 case 7: /* refresh window */ 3117 case 7: /* refresh window */
3516 scr_touch (true); 3118 scr_touch (true);
3517 break; 3119 break;
3518 case 8: /* set size (chars) */ 3120 case 8: /* set size (chars) */
3519 set_widthheight ((unsigned int) (args[2] * TermWin.fwidth), 3121 set_widthheight ((unsigned int) (args[2] * fwidth),
3520 (unsigned int) (args[1] * TermWin.fheight)); 3122 (unsigned int) (args[1] * fheight));
3521 break; 3123 break;
3522 3124
3523 //case 9: NYI, TODO, restore maximized window or maximize window 3125 //case 9: NYI, TODO, restore maximized window or maximize window
3524 default: 3126 default:
3525 if (args[0] >= 24) /* set height (chars) */ 3127 if (args[0] >= 24) /* set height (chars) */
3526 set_widthheight ((unsigned int)TermWin.width, 3128 set_widthheight ((unsigned int)width,
3527 (unsigned int) (args[1] * TermWin.fheight)); 3129 (unsigned int) (args[1] * fheight));
3528 break; 3130 break;
3529
3530 3131
3531 /* 3132 /*
3532 * reports - some output format copied from XTerm 3133 * reports - some output format copied from XTerm
3533 */ 3134 */
3534 case 11: /* report window state */ 3135 case 11: /* report window state */
3535 XGetWindowAttributes (disp, TermWin.parent[0], &wattr); 3136 XGetWindowAttributes (dpy, parent[0], &wattr);
3536 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3137 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3537 break; 3138 break;
3538 case 13: /* report window position */ 3139 case 13: /* report window position */
3539 XGetWindowAttributes (disp, TermWin.parent[0], &wattr); 3140 XGetWindowAttributes (dpy, parent[0], &wattr);
3540 XTranslateCoordinates (disp, TermWin.parent[0], wattr.root, 3141 XTranslateCoordinates (dpy, parent[0], wattr.root,
3541 -wattr.border_width, -wattr.border_width, 3142 -wattr.border_width, -wattr.border_width,
3542 &x, &y, &wdummy); 3143 &x, &y, &wdummy);
3543 tt_printf ("\033[3;%d;%dt", x, y); 3144 tt_printf ("\033[3;%d;%dt", x, y);
3544 break; 3145 break;
3545 case 14: /* report window size (pixels) */ 3146 case 14: /* report window size (pixels) */
3546 XGetWindowAttributes (disp, TermWin.parent[0], &wattr); 3147 XGetWindowAttributes (dpy, parent[0], &wattr);
3547 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3148 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3548 break; 3149 break;
3549 case 18: /* report text area size (chars) */ 3150 case 18: /* report text area size (chars) */
3550 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); 3151 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3551 break; 3152 break;
3552 case 19: /* report window size (chars) */ 3153 case 19: /* report window size (chars) */
3553 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol); 3154 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3554 break; 3155 break;
3555 case 20: /* report icon label */ 3156 case 20: /* report icon label */
3556 { 3157 {
3557 char *s; 3158 char *s;
3558 XGetIconName (disp, TermWin.parent[0], &s); 3159 XGetIconName (dpy, parent[0], &s);
3559 tt_printf ("\033]L%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3160 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3560 XFree (s); 3161 XFree (s);
3561 } 3162 }
3562 break; 3163 break;
3563 case 21: /* report window title */ 3164 case 21: /* report window title */
3564 { 3165 {
3565 char *s; 3166 char *s;
3566 XFetchName (disp, TermWin.parent[0], &s); 3167 XFetchName (dpy, parent[0], &s);
3567 tt_printf ("\033]l%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3168 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3568 XFree (s); 3169 XFree (s);
3569 } 3170 }
3570 break; 3171 break;
3571 } 3172 }
3572} 3173}
… …
3575/*----------------------------------------------------------------------*/ 3176/*----------------------------------------------------------------------*/
3576/* 3177/*
3577 * get input up until STRING TERMINATOR (or BEL) 3178 * get input up until STRING TERMINATOR (or BEL)
3578 * ends_how is terminator used. returned input must be free()'d 3179 * ends_how is terminator used. returned input must be free()'d
3579 */ 3180 */
3580unsigned char * 3181char *
3581rxvt_term::get_to_st (unicode_t &ends_how) 3182rxvt_term::get_to_st (unicode_t &ends_how)
3582{ 3183{
3583 unicode_t ch; 3184 unicode_t ch;
3584 bool seen_esc = false; 3185 bool seen_esc = false;
3585 unsigned int n = 0; 3186 unsigned int n = 0;
… …
3599 seen_esc = true; 3200 seen_esc = true;
3600 continue; 3201 continue;
3601 } 3202 }
3602 else if (ch == C0_BEL || ch == CHAR_ST) 3203 else if (ch == C0_BEL || ch == CHAR_ST)
3603 break; 3204 break;
3205 else if (ch == C0_SYN)
3206 ch = cmd_get8 ();
3604 else if (ch < 0x20) 3207 else if (ch < 0x20)
3605 return NULL; /* other control character - exit */ 3208 return NULL; /* other control character - exit */
3606 3209
3607 seen_esc = false; 3210 seen_esc = false;
3608 3211
3609 if (n >= STRING_MAX - 1) 3212 if (n >= STRING_MAX - 1)
3610 // stop at some sane length 3213 // stop at some sane length
3611 return NULL; 3214 return NULL;
3612 3215
3613 if (ch == C0_SYN)
3614 string[n++] = cmd_get8 ();
3615 else
3616 string[n++] = ch; 3216 string[n++] = ch;
3617 } 3217 }
3618 3218
3619 string[n++] = '\0'; 3219 string[n++] = '\0';
3620 3220
3621 ends_how = (ch == 0x5c ? C0_ESC : ch); 3221 ends_how = (ch == 0x5c ? C0_ESC : ch);
3622 3222
3623 return (unsigned char *)rxvt_wcstombs (string); 3223 return rxvt_wcstombs (string);
3624} 3224}
3625 3225
3626/*----------------------------------------------------------------------*/ 3226/*----------------------------------------------------------------------*/
3627/* 3227/*
3628 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3228 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3629 */ 3229 */
3630void 3230void
3631rxvt_term::process_dcs_seq () 3231rxvt_term::process_dcs_seq ()
3632{ 3232{
3633 unsigned char *s; 3233 char *s;
3634 unicode_t eh; 3234 unicode_t eh;
3635 3235
3636 /* 3236 /*
3637 * Not handled yet 3237 * Not handled yet
3638 */ 3238 */
… …
3657 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3257 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3658 arg = arg * 10 + (ch - '0'); 3258 arg = arg * 10 + (ch - '0');
3659 3259
3660 if (ch == ';') 3260 if (ch == ';')
3661 { 3261 {
3662 unsigned char *s = get_to_st (eh); 3262 char *s = get_to_st (eh);
3663 3263
3664 if (s) 3264 if (s)
3665 { 3265 {
3666 process_xterm_seq (arg, (char *)s, eh); 3266 process_xterm_seq (arg, s, eh);
3667 free (s); 3267 free (s);
3668 } 3268 }
3669 } 3269 }
3670} 3270}
3671 3271
3672void 3272void
3673rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp) 3273rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3674{ 3274{
3675 if (str[0] == '?' && !str[1]) 3275 if (str[0] == '?' && !str[1])
3676 { 3276 {
3677 unsigned short r, g, b; 3277 rgba c;
3678 pix_colors_focused[color].get (display, r, g, b); 3278 pix_colors_focused[color].get (c);
3279
3280#if XFT
3281 if (c.a != rgba::MAX_CC)
3282 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp);
3283 else
3284#endif
3679 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp); 3285 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp);
3680 } 3286 }
3681 else 3287 else
3682 set_window_color (color, str); 3288 set_window_color (color, str);
3683} 3289}
3684 3290
3685/* 3291/*
3686 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3292 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3687 */ 3293 */
3688void 3294void
3689rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp) 3295rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3690{ 3296{
3691 int changed = 0;
3692 int color; 3297 int color;
3693 char *buf, *name; 3298 char *buf, *name;
3694 bool query = str[0] == '?' && !str[1]; 3299 bool query = str[0] == '?' && !str[1];
3695 int saveop = op; 3300 int saveop = op;
3696 dDisp; 3301
3302 dLocal (Display *, dpy);
3697 3303
3698 assert (str != NULL); 3304 assert (str != NULL);
3305
3306 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END)))
3307 return;
3308
3699 switch (op) 3309 switch (op)
3700 { 3310 {
3701 case XTerm_name: 3311 case XTerm_name:
3702 set_title (str); 3312 set_title (str);
3703 /* FALLTHROUGH */ 3313 /* FALLTHROUGH */
… …
3717 unsigned long bytes_after; 3327 unsigned long bytes_after;
3718 unsigned char *value = 0; 3328 unsigned char *value = 0;
3719 const char *str = ""; 3329 const char *str = "";
3720 3330
3721 if (prop 3331 if (prop
3722 && XGetWindowProperty (disp, TermWin.parent[0], 3332 && XGetWindowProperty (dpy, parent[0],
3723 prop, 0, 1<<16, 0, AnyPropertyType, 3333 prop, 0, 1<<16, 0, AnyPropertyType,
3724 &actual_type, &actual_format, 3334 &actual_type, &actual_format,
3725 &nitems, &bytes_after, &value) == Success 3335 &nitems, &bytes_after, &value) == Success
3726 && actual_type != None 3336 && actual_type != None
3727 && actual_format == 8) 3337 && actual_format == 8)
3728 str = (const char *)(value); 3338 str = (const char *)(value);
3729 3339
3730 tt_printf ("\033]%d;%s%c", XTerm_property, str, resp); 3340 tt_printf ("\033]%d;%s%c", op, str, resp);
3731 3341
3732 XFree (value); 3342 XFree (value);
3733 } 3343 }
3734 else 3344 else
3735 { 3345 {
… …
3739 { 3349 {
3740 *eq = 0; 3350 *eq = 0;
3741 set_utf8_property (display->atom (str), eq + 1); 3351 set_utf8_property (display->atom (str), eq + 1);
3742 } 3352 }
3743 else 3353 else
3744 XDeleteProperty (disp, TermWin.parent[0], 3354 XDeleteProperty (dpy, parent[0],
3745 display->atom (str)); 3355 display->atom (str));
3746 } 3356 }
3747 break; 3357 break;
3748 3358
3749 case XTerm_Color: 3359 case XTerm_Color:
… …
3751 { 3361 {
3752 if ((name = strchr (buf, ';')) == NULL) 3362 if ((name = strchr (buf, ';')) == NULL)
3753 break; 3363 break;
3754 3364
3755 *name++ = '\0'; 3365 *name++ = '\0';
3756 color = atoi (buf); 3366 color = atoi (buf) + minCOLOR;
3757 3367
3758 if (color < 0 || color >= TOTAL_COLORS) 3368 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
3759 break; 3369 break;
3760 3370
3761 if ((buf = strchr (name, ';')) != NULL) 3371 if ((buf = strchr (name, ';')) != NULL)
3762 *buf++ = '\0'; 3372 *buf++ = '\0';
3763 3373
3764 if (name[0] == '?' && !name[1]) 3374 process_color_seq (op, color, name, resp);
3765 {
3766 unsigned short r, g, b;
3767 pix_colors_focused[color + minCOLOR].get (display, r, g, b);
3768 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3769 }
3770 else
3771 set_window_color (color + minCOLOR, name);
3772 } 3375 }
3773 break; 3376 break;
3774 case XTerm_Color00: 3377 case XTerm_Color00:
3775 process_color_seq (XTerm_Color00, Color_fg, str, resp); 3378 process_color_seq (op, Color_fg, str, resp);
3776 break; 3379 break;
3777 case XTerm_Color01: 3380 case XTerm_Color01:
3778 process_color_seq (XTerm_Color00, Color_bg, str, resp); 3381 process_color_seq (op, Color_bg, str, resp);
3779 break; 3382 break;
3780#ifndef NO_CURSORCOLOR 3383#ifndef NO_CURSORCOLOR
3781 case XTerm_Color_cursor: 3384 case XTerm_Color_cursor:
3782 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); 3385 process_color_seq (op, Color_cursor, str, resp);
3783 break; 3386 break;
3784#endif 3387#endif
3785 case XTerm_Color_pointer_fg: 3388 case XTerm_Color_pointer_fg:
3786 process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp); 3389 process_color_seq (op, Color_pointer_fg, str, resp);
3787 break; 3390 break;
3788 case XTerm_Color_pointer_bg: 3391 case XTerm_Color_pointer_bg:
3789 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); 3392 process_color_seq (op, Color_pointer_bg, str, resp);
3790 break; 3393 break;
3791#ifndef NO_BOLD_UNDERLINE_REVERSE 3394#ifndef NO_BOLD_UNDERLINE_REVERSE
3792 case XTerm_Color_BD:
3793 process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3794 break;
3795 case XTerm_Color_UL:
3796 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3797 break;
3798 case XTerm_Color_RV: 3395 case XTerm_Color_RV:
3799 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3396 process_color_seq (op, Color_RV, str, resp);
3397 break;
3398 case Rxvt_Color_BD:
3399 case URxvt_Color_BD:
3400 process_color_seq (op, Color_BD, str, resp);
3401 break;
3402 case Rxvt_Color_UL:
3403 case URxvt_Color_UL:
3404 process_color_seq (op, Color_UL, str, resp);
3800 break; 3405 break;
3801 case URxvt_Color_IT: 3406 case URxvt_Color_IT:
3802 process_color_seq (URxvt_Color_IT, Color_IT, str, resp); 3407 process_color_seq (op, Color_IT, str, resp);
3803 break; 3408 break;
3804#endif 3409#endif
3805#if TRANSPARENT && TINTING 3410#if ENABLE_TRANSPARENCY
3806 case URxvt_Color_tint: 3411 case URxvt_Color_tint:
3807 process_color_seq (URxvt_Color_tint, Color_tint, str, resp); 3412 process_color_seq (op, Color_tint, str, resp);
3808 check_our_parents (); 3413 {
3809 if (am_transparent) 3414 bool changed = false;
3810 want_full_refresh = want_refresh = 1; 3415 if (ISSET_PIXCOLOR (Color_tint))
3811 break; 3416 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]);
3812#endif 3417 else
3418 changed = bgPixmap.unset_tint ();
3419 if (changed)
3420 update_background ();
3421 }
3813 3422
3423 break;
3424#endif
3425
3426#if BG_IMAGE_FROM_FILE
3814 case XTerm_Pixmap: 3427 case Rxvt_Pixmap:
3815 if (*str != ';') 3428 if (!strcmp (str, "?"))
3816 { 3429 {
3817#if XPM_BACKGROUND 3430 char str[256];
3818 scale_pixmap (""); /* reset to default scaling */ 3431
3819 set_bgPixmap (str); /* change pixmap */ 3432 sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */
3820#endif 3433 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767),
3821 scr_touch (true); 3434 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767));
3435 process_xterm_seq (XTerm_title, str, CHAR_ST);
3822 } 3436 }
3823 while ((str = strchr (str, ';')) != NULL) 3437 else
3824 { 3438 {
3439 int changed = 0;
3440
3441 if (*str != ';')
3442 {
3443 /* reset to default scaling :*/
3444 bgPixmap.unset_geometry ();
3445 if (bgPixmap.set_file (str)) /* change pixmap */
3446 changed++;
3447 str = strchr (str, ';');
3448 if (str == NULL)
3449 bgPixmap.set_defaultGeometry ();
3450 }
3451 while (str)
3452 {
3825 str++; 3453 str++;
3826#if XPM_BACKGROUND 3454 if (bgPixmap.set_geometry (str))
3827 changed += scale_pixmap (str); 3455 changed++;
3828#endif 3456 str = strchr (str, ';');
3457 }
3458 if (changed)
3459 update_background ();
3829 } 3460 }
3830
3831 if (changed)
3832 {
3833#ifdef XPM_BACKGROUND
3834 resize_pixmap ();
3835#endif
3836 scr_touch (true);
3837 }
3838 break; 3461 break;
3462#endif
3839 3463
3840 case XTerm_restoreFG: 3464 case Rxvt_restoreFG:
3841 set_window_color (Color_fg, str); 3465 set_window_color (Color_fg, str);
3842 break; 3466 break;
3843 case XTerm_restoreBG: 3467 case Rxvt_restoreBG:
3844 set_window_color (Color_bg, str); 3468 set_window_color (Color_bg, str);
3845 break; 3469 break;
3846 3470
3847 case XTerm_logfile: 3471 case XTerm_logfile:
3848 // TODO, when secure mode? 3472 // TODO, when secure mode?
3849 break; 3473 break;
3850 3474
3851#ifdef MENUBAR
3852 case URxvt_Menu:
3853 if (options & Opt_insecure)
3854 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3855 break;
3856#endif
3857#if 0 3475#if 0
3858 case XTerm_dumpscreen: /* no error notices */ 3476 case Rxvt_dumpscreen: /* no error notices */
3859 { 3477 {
3860 int fd; 3478 int fd;
3861 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) 3479 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3862 { 3480 {
3863 scr_dump (fd); 3481 scr_dump (fd);
… …
3874 case URxvt_italicFont: 3492 case URxvt_italicFont:
3875 case URxvt_boldItalicFont: 3493 case URxvt_boldItalicFont:
3876#endif 3494#endif
3877 if (query) 3495 if (query)
3878 tt_printf ("\33]%d;%-.250s%c", saveop, 3496 tt_printf ("\33]%d;%-.250s%c", saveop,
3879 (options & Opt_insecure) && TermWin.fontset[op - URxvt_font]->fontdesc 3497 option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3880 ? TermWin.fontset[op - URxvt_font]->fontdesc : "", 3498 ? fontset[op - URxvt_font]->fontdesc : "",
3881 resp); 3499 resp);
3882 else 3500 else
3883 { 3501 {
3884 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3502 const char *&res = rs[Rs_font + (op - URxvt_font)];
3885 3503
… …
3887 allocated.push_back ((void *)res); 3505 allocated.push_back ((void *)res);
3888 set_fonts (); 3506 set_fonts ();
3889 } 3507 }
3890 break; 3508 break;
3891 3509
3892#if ENABLE_FRILLS 3510 case URxvt_version:
3511 if (query)
3512 tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%c",
3513 op,
3514 rs[Rs_name], VERSION[0], VERSION[2],
3515 resp);
3516 break;
3517
3518#if !ENABLE_MINIMAL
3893 case URxvt_locale: 3519 case URxvt_locale:
3894 if (query) 3520 if (query)
3895 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, (options & Opt_insecure) ? locale : "", resp); 3521 tt_printf ("\33]%d;%-.250s%c", op, option (Opt_insecure) ? locale : "", resp);
3896 else 3522 else
3897 { 3523 {
3898 set_locale (str); 3524 set_locale (str);
3899 pty.set_utf8_mode (enc_utf8); 3525 pty->set_utf8_mode (enc_utf8);
3900 init_xlocale (); 3526 init_xlocale ();
3901 } 3527 }
3902 break; 3528 break;
3903 3529
3904 case URxvt_view_up: 3530 case URxvt_view_up:
3905 case URxvt_view_down: 3531 case URxvt_view_down:
3532 {
3906 int lines = atoi (str); 3533 int lines = atoi (str);
3907 3534
3908 if (lines) 3535 if (lines)
3909 scr_page (op == URxvt_view_up ? UP : DN, lines); 3536 scr_page (op == URxvt_view_up ? UP : DN, lines);
3910 else 3537 else
3911 {
3912 scr_erase_savelines (); 3538 scr_erase_savelines ();
3913 } 3539 }
3914 3540
3541 break;
3542#endif
3543
3544#if ENABLE_PERL
3545 case URxvt_perl:
3546 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END)))
3547 ; // no responses yet
3915 break; 3548 break;
3916#endif 3549#endif
3917 } 3550 }
3918} 3551}
3919/*----------------------------------------------------------------------*/ 3552/*----------------------------------------------------------------------*/
… …
3950 return state; 3583 return state;
3951} 3584}
3952 3585
3953/* we're not using priv _yet_ */ 3586/* we're not using priv _yet_ */
3954void 3587void
3955rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg) 3588rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg)
3956{ 3589{
3957 unsigned int i, j; 3590 unsigned int i, j;
3958 int state; 3591 int state;
3959 3592
3960 static const struct 3593 static const struct
3961 { 3594 {
3962 const int argval; 3595 const int argval;
3963 const unsigned long bit; 3596 const unsigned long bit;
3964 }
3965
3966 argtopriv[] = { 3597 } argtopriv[] = {
3967 { 1, PrivMode_aplCUR }, 3598 { 1, PrivMode_aplCUR },
3968 { 2, PrivMode_vt52 }, 3599 { 2, PrivMode_vt52 },
3969 { 3, PrivMode_132 }, 3600 { 3, PrivMode_132 },
3970 { 4, PrivMode_smoothScroll }, 3601 { 4, PrivMode_smoothScroll },
3971 { 5, PrivMode_rVideo }, 3602 { 5, PrivMode_rVideo },
3972 { 6, PrivMode_relOrigin }, 3603 { 6, PrivMode_relOrigin },
3973 { 7, PrivMode_Autowrap }, 3604 { 7, PrivMode_Autowrap },
3974 // 8, bi-directional support mode 3605 // 8, bi-directional support mode
3975 { 9, PrivMode_MouseX10 }, 3606 { 9, PrivMode_MouseX10 },
3976#ifdef menuBar_esc
3977 { menuBar_esc, PrivMode_menuBar },
3978#endif
3979 // 18, 19 printing-related 3607 // 18, 19 printing-related
3980 { 25, PrivMode_VisibleCursor }, 3608 { 25, PrivMode_VisibleCursor },
3981#ifdef scrollBar_esc 3609#ifdef scrollBar_esc
3982 { scrollBar_esc, PrivMode_scrollBar }, 3610 { scrollBar_esc, PrivMode_scrollBar },
3983#endif 3611#endif
… …
4028 } 3656 }
4029 3657
4030 /* extra handling for values with state unkept */ 3658 /* extra handling for values with state unkept */
4031 switch (arg[i]) 3659 switch (arg[i])
4032 { 3660 {
3661#if ENABLE_STYLES
3662 case 1021:
3663 set_option (Opt_intensityStyles, mode);
3664
3665 scr_touch (true);
3666 break;
3667#endif
4033 case 1048: /* alternative cursor save */ 3668 case 1048: /* alternative cursor save */
4034 case 1049: 3669 case 1049:
4035 if (options & Opt_secondaryScreen) 3670 if (option (Opt_secondaryScreen))
4036 if (mode == 0) 3671 if (mode == 0)
4037 scr_cursor (RESTORE); 3672 scr_cursor (RESTORE);
4038 else if (mode == 1) 3673 else if (mode == 1)
4039 scr_cursor (SAVE); 3674 scr_cursor (SAVE);
4040 break; 3675 break;
… …
4052 */ 3687 */
4053 PrivMode (1, PrivMode_vt52); 3688 PrivMode (1, PrivMode_vt52);
4054 break; 3689 break;
4055 case 3: /* 80/132 */ 3690 case 3: /* 80/132 */
4056 if (priv_modes & PrivMode_132OK) 3691 if (priv_modes & PrivMode_132OK)
4057 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height); 3692 set_widthheight (((state ? 132 : 80) * fwidth), height);
4058 break; 3693 break;
4059 case 4: /* smooth scrolling */ 3694 case 4: /* smooth scrolling */
4060 if (state)
4061 options &= ~Opt_jumpScroll;
4062 else
4063 options |= Opt_jumpScroll; 3695 set_option (Opt_jumpScroll, !state);
4064 break; 3696 break;
4065 case 5: /* reverse video */ 3697 case 5: /* reverse video */
4066 scr_rvideo_mode (state); 3698 scr_rvideo_mode (state);
4067 break; 3699 break;
4068 case 6: /* relative/absolute origins */ 3700 case 6: /* relative/absolute origins */
… …
4074 /* case 8: - auto repeat, can't do on a per window basis */ 3706 /* case 8: - auto repeat, can't do on a per window basis */
4075 case 9: /* X10 mouse reporting */ 3707 case 9: /* X10 mouse reporting */
4076 if (state) /* orthogonal */ 3708 if (state) /* orthogonal */
4077 priv_modes &= ~PrivMode_MouseX11; 3709 priv_modes &= ~PrivMode_MouseX11;
4078 break; 3710 break;
4079#ifdef menuBar_esc
4080 case menuBar_esc:
4081#ifdef MENUBAR
4082 map_menuBar (state);
4083#endif
4084 break;
4085#endif
4086#ifdef scrollBar_esc 3711#ifdef scrollBar_esc
4087 case scrollBar_esc: 3712 case scrollBar_esc:
4088 if (scrollbar_mapping (state)) 3713 if (scrollbar_mapping (state))
4089 { 3714 {
4090 resize_all_windows (0, 0, 0); 3715 resize_all_windows (0, 0, 0);
… …
4109#if 0 3734#if 0
4110 case 1001: 3735 case 1001:
4111 break; /* X11 mouse highlighting */ 3736 break; /* X11 mouse highlighting */
4112#endif 3737#endif
4113 case 1010: /* scroll to bottom on TTY output inhibit */ 3738 case 1010: /* scroll to bottom on TTY output inhibit */
4114 if (state)
4115 options &= ~Opt_scrollTtyOutput;
4116 else
4117 options |= Opt_scrollTtyOutput; 3739 set_option (Opt_scrollTtyOutput, !state);
4118 break; 3740 break;
4119 case 1011: /* scroll to bottom on key press */ 3741 case 1011: /* scroll to bottom on key press */
4120 if (state)
4121 options |= Opt_scrollTtyKeypress; 3742 set_option (Opt_scrollTtyKeypress, state);
4122 else
4123 options &= ~Opt_scrollTtyKeypress;
4124 break; 3743 break;
4125 case 1047: /* secondary screen w/ clearing last */ 3744 case 1047: /* secondary screen w/ clearing last */
4126 if (options & Opt_secondaryScreen) 3745 if (option (Opt_secondaryScreen))
4127 if (current_screen != PRIMARY) 3746 if (current_screen != PRIMARY)
4128 scr_erase_screen (2); 3747 scr_erase_screen (2);
4129 scr_change_screen (state); 3748 scr_change_screen (state);
4130 break; 3749 break;
4131 case 1049: /* secondary screen w/ clearing first */ 3750 case 1049: /* secondary screen w/ clearing first */
4132 scr_change_screen (state); 3751 scr_change_screen (state);
4133 if (options & Opt_secondaryScreen) 3752 if (option (Opt_secondaryScreen))
4134 if (current_screen != PRIMARY) 3753 if (current_screen != PRIMARY)
4135 scr_erase_screen (2); 3754 scr_erase_screen (2);
4136 break; 3755 break;
4137 default: 3756 default:
4138 break; 3757 break;
… …
4266 scr_color (Color_bg, Color_bg); 3885 scr_color (Color_bg, Color_bg);
4267 break; 3886 break;
4268 3887
4269 //case 50: // not variable spacing 3888 //case 50: // not variable spacing
4270 3889
4271#ifndef NO_BRIGHTCOLOR 3890#if !ENABLE_MINIMAL
4272 case 90: 3891 case 90:
4273 case 91: /* set bright fg color */ 3892 case 91: /* set bright fg color */
4274 case 92: 3893 case 92:
4275 case 93: 3894 case 93:
4276 case 94: 3895 case 94:
… …
4288 case 106: 3907 case 106:
4289 case 107: 3908 case 107:
4290 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg); 3909 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);
4291 break; 3910 break;
4292#endif 3911#endif
4293
4294 } 3912 }
4295 } 3913 }
4296} 3914}
4297/*}}} */ 3915/*}}} */
4298 3916
… …
4322 */ 3940 */
4323void 3941void
4324rxvt_term::tt_printf (const char *fmt,...) 3942rxvt_term::tt_printf (const char *fmt,...)
4325{ 3943{
4326 va_list arg_ptr; 3944 va_list arg_ptr;
4327 unsigned char buf[256]; 3945 char buf[256];
4328 3946
4329 va_start (arg_ptr, fmt); 3947 va_start (arg_ptr, fmt);
4330 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 3948 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
4331 va_end (arg_ptr); 3949 va_end (arg_ptr);
4332 tt_write (buf, strlen (buf)); 3950 tt_write (buf, strlen (buf));
… …
4337 * or generated by us in response to a query ESC sequence. 3955 * or generated by us in response to a query ESC sequence.
4338 */ 3956 */
4339const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 3957const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4340 3958
4341void 3959void
4342rxvt_term::tt_write (const unsigned char *data, unsigned int len) 3960rxvt_term::tt_write (const char *data, unsigned int len)
4343{ 3961{
3962 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
3963 return;
3964
3965 if (pty->pty < 0)
3966 return;
3967
4344 if (v_buflen == 0) 3968 if (v_buflen == 0)
4345 { 3969 {
4346 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE)); 3970 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
4347 3971
4348 if ((unsigned int)written == len) 3972 if ((unsigned int)written == len)
4349 return; 3973 return;
4350 3974
4351 data += written; 3975 data += written;
4352 len -= written; 3976 len -= written;
4353 } 3977 }
4354 3978
4355 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len); 3979 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
4356 3980
4357 memcpy (v_buffer + v_buflen, data, len); 3981 memcpy (v_buffer + v_buflen, data, len);
4358 v_buflen += len; 3982 v_buflen += len;
4359 3983
4360 pty_ev.set (EVENT_READ | EVENT_WRITE); 3984 pty_ev.set (EVENT_READ | EVENT_WRITE);
4361} 3985}
4362 3986
4363void rxvt_term::pty_write () 3987void rxvt_term::pty_write ()
4364{ 3988{
4365 int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE)); 3989 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4366 3990
4367 if (written > 0) 3991 if (written > 0)
4368 { 3992 {
4369 v_buflen -= written; 3993 v_buflen -= written;
4370 3994
4371 if (v_buflen == 0) 3995 if (v_buflen == 0)
4372 { 3996 {
4373 free (v_buffer); 3997 free (v_buffer);
4374 v_buffer = 0; 3998 v_buffer = 0;
4375 v_buflen = 0;
4376 3999
4377 pty_ev.set (EVENT_READ); 4000 pty_ev.set (EVENT_READ);
4378 return; 4001 return;
4379 } 4002 }
4380 4003
4381 memmove (v_buffer, v_buffer + written, v_buflen); 4004 memmove (v_buffer, v_buffer + written, v_buflen);
4382 } 4005 }
4383 else if (written != -1 || (errno != EAGAIN && errno != EINTR)) 4006 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4384 // original code just ignores this... 4007 pty_ev.set (EVENT_READ);
4385 destroy ();
4386} 4008}
4387 4009
4388/*----------------------- end-of-file (C source) -----------------------*/ 4010/*----------------------- end-of-file (C source) -----------------------*/
4389 4011

Diff Legend

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