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.204 by root, Wed Jul 13 02:47:02 2005 UTC vs.
Revision 1.381 by root, Fri Dec 14 05:25:23 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-2007 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;
554#ifdef XK_KP_Home
555 static const KeySym keypadtrans[] = {
556 XK_KP_7, // XK_KP_Home
557 XK_KP_4, // XK_KP_Left
558 XK_KP_8, // XK_KP_Up
559 XK_KP_6, // XK_KP_Right
560 XK_KP_2, // XK_KP_Down
561#ifndef UNSHIFTED_SCROLLKEYS
562 XK_KP_9, // XK_KP_Prior
563 XK_KP_3, // XK_KP_Next
564#else
565 XK_Prior,
566 XK_Next,
567#endif
568 XK_KP_1, // XK_KP_End
569 XK_KP_5, // XK_KP_Begin
570 };
571
572 if (IN_RANGE_INC (keysym, XK_KP_Home, XK_KP_Begin))
573 {
574 unsigned int index = keysym - XK_KP_Home;
575 keysym = kp ? keypadtrans[index] : XK_Home + index;
576 }
577 else if (keysym == XK_KP_Insert)
578 keysym = kp ? XK_KP_0 : XK_Insert;
579#ifndef NO_DELETE_KEY
580 else if (keysym == XK_KP_Delete)
581 keysym = kp ? XK_KP_Decimal : XK_Delete;
582#endif
583#endif
516 switch (keysym) 584 switch (keysym)
517 { 585 {
518#ifndef NO_BACKSPACE_KEY 586#ifndef NO_BACKSPACE_KEY
519 case XK_BackSpace: 587 case XK_BackSpace:
520 if (priv_modes & PrivMode_HaveBackSpace) 588 if (priv_modes & PrivMode_HaveBackSpace)
… …
522 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace) 590 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
523 ^ !!ctrl) ? '\b' : '\177'; 591 ^ !!ctrl) ? '\b' : '\177';
524 kbuf[1] = '\0'; 592 kbuf[1] = '\0';
525 } 593 }
526 else 594 else
527 strcpy (kbuf, key_backspace); 595 strcpy (kbuf, rs[Rs_backspace_key]);
528 break; 596 break;
529#endif 597#endif
530#ifndef NO_DELETE_KEY 598#ifndef NO_DELETE_KEY
531# ifdef XK_KP_Prior
532 case XK_KP_Delete:
533 /* allow shift to override */
534 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
535 {
536 strcpy (kbuf, "\033On");
537 break;
538 }
539 /* FALLTHROUGH */
540# endif
541 case XK_Delete: 599 case XK_Delete:
542 strcpy (kbuf, key_delete); 600 strcpy (kbuf, rs[Rs_delete_key]);
543 break; 601 break;
544#endif 602#endif
545 case XK_Tab: 603 case XK_Tab:
546 if (shft) 604 if (shft)
547 strcpy (kbuf, "\033[Z"); 605 strcpy (kbuf, "\033[Z");
… …
557#endif 615#endif
558 newlen = 0; 616 newlen = 0;
559 } 617 }
560 break; 618 break;
561 619
562#ifdef XK_KP_Left
563 case XK_KP_Up: /* \033Ox or standard */
564 case XK_KP_Down: /* \033Or or standard */
565 case XK_KP_Right: /* \033Ov or standard */
566 case XK_KP_Left: /* \033Ot or standard */
567 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
568 {
569 strcpy (kbuf, "\033OZ");
570 kbuf[2] = "txvr"[keysym - XK_KP_Left];
571 break;
572 }
573 else
574 /* translate to std. cursor key */
575 keysym = XK_Left + (keysym - XK_KP_Left);
576 /* FALLTHROUGH */
577#endif
578 case XK_Up: /* "\033[A" */ 620 case XK_Up: /* "\033[A" */
579 case XK_Down: /* "\033[B" */ 621 case XK_Down: /* "\033[B" */
580 case XK_Right: /* "\033[C" */ 622 case XK_Right: /* "\033[C" */
581 case XK_Left: /* "\033[D" */ 623 case XK_Left: /* "\033[D" */
582 strcpy (kbuf, "\033[Z"); 624 strcpy (kbuf, "\033[Z");
… …
592 else if (priv_modes & PrivMode_aplCUR) 634 else if (priv_modes & PrivMode_aplCUR)
593 kbuf[1] = 'O'; 635 kbuf[1] = 'O';
594 break; 636 break;
595 637
596#ifndef UNSHIFTED_SCROLLKEYS 638#ifndef UNSHIFTED_SCROLLKEYS
597# ifdef XK_KP_Prior
598 case XK_KP_Prior:
599 /* allow shift to override */
600 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
601 {
602 strcpy (kbuf, "\033Oy");
603 break;
604 }
605 /* FALLTHROUGH */
606# endif
607 case XK_Prior: 639 case XK_Prior:
608 strcpy (kbuf, "\033[5~"); 640 strcpy (kbuf, "\033[5~");
609 break; 641 break;
610# ifdef XK_KP_Next
611 case XK_KP_Next:
612 /* allow shift to override */
613 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
614 {
615 strcpy (kbuf, "\033Os");
616 break;
617 }
618 /* FALLTHROUGH */
619# endif
620 case XK_Next: 642 case XK_Next:
621 strcpy (kbuf, "\033[6~"); 643 strcpy (kbuf, "\033[6~");
622 break; 644 break;
623#endif 645#endif
624 case XK_KP_Enter: 646 case XK_KP_Enter:
625 /* allow shift to override */ 647 /* allow shift to override */
626 if ((priv_modes & PrivMode_aplKP) ? !shft : shft) 648 if (kp)
627 { 649 {
628 strcpy (kbuf, "\033OM"); 650 strcpy (kbuf, "\033OM");
629 break; 651 break;
630 } 652 }
631 653
… …
643 kbuf[0] = '\015'; 665 kbuf[0] = '\015';
644 kbuf[1] = '\0'; 666 kbuf[1] = '\0';
645 } 667 }
646 break; 668 break;
647 669
648#ifdef XK_KP_Begin
649 case XK_KP_Begin:
650 strcpy (kbuf, "\033Ou");
651 break;
652
653#endif
654 case XK_KP_F1: /* "\033OP" */ 670 case XK_KP_F1: /* "\033OP" */
655 case XK_KP_F2: /* "\033OQ" */ 671 case XK_KP_F2: /* "\033OQ" */
656 case XK_KP_F3: /* "\033OR" */ 672 case XK_KP_F3: /* "\033OR" */
657 case XK_KP_F4: /* "\033OS" */ 673 case XK_KP_F4: /* "\033OS" */
658 strcpy (kbuf, "\033OP"); 674 strcpy (kbuf, "\033OP");
… …
674 case XK_KP_6: /* "\033Ov" : "6" */ 690 case XK_KP_6: /* "\033Ov" : "6" */
675 case XK_KP_7: /* "\033Ow" : "7" */ 691 case XK_KP_7: /* "\033Ow" : "7" */
676 case XK_KP_8: /* "\033Ox" : "8" */ 692 case XK_KP_8: /* "\033Ox" : "8" */
677 case XK_KP_9: /* "\033Oy" : "9" */ 693 case XK_KP_9: /* "\033Oy" : "9" */
678 /* allow shift to override */ 694 /* allow shift to override */
679 if ((priv_modes & PrivMode_aplKP) ? !shft : shft) 695 if (kp)
680 { 696 {
681 strcpy (kbuf, "\033Oj"); 697 strcpy (kbuf, "\033Oj");
682 kbuf[2] += (keysym - XK_KP_Multiply); 698 kbuf[2] += (keysym - XK_KP_Multiply);
683 } 699 }
684 else 700 else
… …
690 706
691 case XK_Find: 707 case XK_Find:
692 strcpy (kbuf, "\033[1~"); 708 strcpy (kbuf, "\033[1~");
693 break; 709 break;
694 710
695#ifdef XK_KP_End
696 case XK_KP_Insert:
697 /* allow shift to override */
698 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
699 {
700 strcpy (kbuf, "\033Op");
701 break;
702 }
703 /* FALLTHROUGH */
704#endif
705 case XK_Insert: 711 case XK_Insert:
706 strcpy (kbuf, "\033[2~"); 712 strcpy (kbuf, "\033[2~");
707 break; 713 break;
708#ifdef DXK_Remove /* support for DEC remove like key */ 714#ifdef DXK_Remove /* support for DEC remove like key */
709 case DXK_Remove: 715 case DXK_Remove:
… …
713 strcpy (kbuf, "\033[3~"); 719 strcpy (kbuf, "\033[3~");
714 break; 720 break;
715 case XK_Select: 721 case XK_Select:
716 strcpy (kbuf, "\033[4~"); 722 strcpy (kbuf, "\033[4~");
717 break; 723 break;
718#ifdef XK_KP_End
719 case XK_KP_End:
720 /* allow shift to override */
721 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
722 {
723 strcpy (kbuf, "\033Oq");
724 break;
725 }
726 /* FALLTHROUGH */
727#endif
728 case XK_End: 724 case XK_End:
729 strcpy (kbuf, KS_END); 725 strcpy (kbuf, KS_END);
730 break; 726 break;
731#ifdef XK_KP_Home
732 case XK_KP_Home:
733 /* allow shift to override */
734 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
735 {
736 strcpy (kbuf, "\033Ow");
737 break;
738 }
739 /* FALLTHROUGH */
740#endif
741 case XK_Home: 727 case XK_Home:
742 strcpy (kbuf, KS_HOME); 728 strcpy (kbuf, KS_HOME);
743 break; 729 break;
744 730
745#define FKEY(n, fkey) \ 731#define FKEY(n, fkey) \
… …
829 { 815 {
830#ifdef META8_OPTION 816#ifdef META8_OPTION
831 /* set 8-bit on */ 817 /* set 8-bit on */
832 if (meta && (meta_char == 0x80)) 818 if (meta && (meta_char == 0x80))
833 { 819 {
834 unsigned char *ch; 820 char *ch;
835 821
836 for (ch = kbuf; ch < kbuf + len; ch++) 822 for (ch = kbuf; ch < kbuf + len; ch++)
837 *ch |= 0x80; 823 *ch |= 0x80;
838 824
839 meta = 0; 825 meta = 0;
… …
841#endif 827#endif
842 /* nil */ ; 828 /* nil */ ;
843 } 829 }
844 } 830 }
845 831
832 if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_INT, keysym, DT_STR_LEN, kbuf, len, DT_END)))
833 return;
834
846 if (len <= 0) 835 if (len <= 0)
847 return; /* not mapped */ 836 return; /* not mapped */
848 837
849 if (options & Opt_scrollTtyKeypress) 838 if (option (Opt_scrollTtyKeypress))
850 if (TermWin.view_start) 839 if (view_start)
851 { 840 {
852 TermWin.view_start = 0; 841 view_start = 0;
853 want_refresh = 1; 842 want_refresh = 1;
854 } 843 }
855 844
856 /* 845 /*
857 * these modifications only affect the static keybuffer 846 * these modifications only affect the static keybuffer
… …
872#ifdef META8_OPTION 861#ifdef META8_OPTION
873 && meta_char == C0_ESC 862 && meta_char == C0_ESC
874#endif 863#endif
875 ) 864 )
876 { 865 {
877 const unsigned char ch = C0_ESC; 866 const char ch = C0_ESC;
878 tt_write (&ch, 1); 867 tt_write (&ch, 1);
879 } 868 }
880 869
881#if defined(DEBUG_CMD)
882 /* Display keyboard buffer contents */
883 unsigned char *p;
884 int i;
885
886 fprintf (stderr, "key 0x%04X [%d]: `", (unsigned int)keysym, len);
887 for (i = 0, p = kbuf; i < len; i++, p++)
888 fprintf (stderr, (*p >= ' ' && *p < '\177' ? "%c" : "\\%03o"), *p);
889 fprintf (stderr, "'\n");
890#endif /* DEBUG_CMD */
891 tt_write (kbuf, (unsigned int)len); 870 tt_write (kbuf, (unsigned int)len);
892} 871}
893/*}}} */
894 872
873void
874rxvt_term::key_release (XKeyEvent &ev)
875{
876#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
877 KeySym keysym;
878
879 keysym = XLookupKeysym (&ev, ev.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
880#endif
881
882#if ENABLE_FRILLS || ISO_14755
883 // ISO 14755 support
884 if (iso14755buf)
885 if (iso14755buf & ISO_14755_52)
886 {
887# if ISO_14755
888 scr_overlay_off ();
889# endif
890# if ISO_14755
891 // iso14755 part 5.2 handling: release time
892 // first: controls
893 if ((ev.state & ControlMask)
894 && ((keysym >= 0x40 && keysym <= 0x5f)
895 || (keysym >= 0x61 && keysym <= 0x7f)))
896 {
897 iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
898 commit_iso14755 ();
899
900 return;
901 }
902
903 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
904 if (i[0] == keysym)
905 {
906 iso14755buf = ISO_14755_51 | i[1];
907 commit_iso14755 ();
908
909 return;
910 }
911
912 scr_bell ();
913# endif
914 iso14755buf = 0;
915
916 return;
917 }
918 else if ((ev.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
919 {
920# if ISO_14755
921 scr_overlay_off ();
922# endif
923 if (iso14755buf & ISO_14755_51)
924 commit_iso14755 ();
925#if ISO_14755
926 else if (option (Opt_iso14755_52) && iso14755buf & ISO_14755_STARTED)
927 {
928 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
929
930 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
931 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
932 }
933# endif
934 else
935 iso14755buf = 0;
936 }
937#endif
938
939 if (HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
940 return;
941
942#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
943 if (!(ev.state & ControlMask))
944 slip_wheel_ev.stop ();
945 else if (keysym == XK_Control_L || keysym == XK_Control_R)
946 mouse_slip_wheel_speed = 0;
947#endif
948}
949
895#if MENUBAR_MAX || defined (KEYSYM_RESOURCE) 950#if defined (KEYSYM_RESOURCE)
896/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */
897/* attempt to `write' count to the input buffer */
898unsigned int 951unsigned int
899rxvt_term::cmd_write (const unsigned char *str, unsigned int count) 952rxvt_term::cmd_write (const char *str, unsigned int count)
900{ 953{
901 unsigned int n, s; 954 unsigned int n, s;
902 955
903 n = cmdbuf_ptr - cmdbuf_base; 956 n = cmdbuf_ptr - cmdbuf_base;
904 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp; 957 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp;
… …
930void 983void
931rxvt_term::flush () 984rxvt_term::flush ()
932{ 985{
933 flush_ev.stop (); 986 flush_ev.stop ();
934 987
935#ifdef TRANSPARENT 988#ifdef HAVE_BG_PIXMAP
936 if (want_full_refresh) 989 if (bgPixmap.check_clearChanged ())
937 { 990 {
938 want_full_refresh = 0; 991// scr_clear (true); This needs to be researched further!
939 scr_clear ();
940 scr_touch (false); 992 scr_touch (false);
941 } 993 }
942#endif 994#endif
943 995
944 if (want_refresh) 996 if (want_refresh)
945 { 997 {
998 if (SHOULD_INVOKE (HOOK_LINE_UPDATE))
999 {
1000 int row = view_start;
1001 int end_row = row + nrow;
1002
1003 while (row > top_row && ROW (row - 1).is_longer ())
1004 --row;
1005
1006 do
1007 {
1008 int start_row = row;
1009 line_t *l;
1010
1011 do
1012 {
1013 l = &ROW (row++);
1014
1015 if (!(l->f & LINE_FILTERED))
1016 {
1017 // line not filtered, mark it as filtered
1018 l->f |= LINE_FILTERED;
1019 while (l->is_longer ())
1020 {
1021 l = &ROW (row++);
1022 l->f |= LINE_FILTERED;
1023 }
1024
1025 // and filter it
1026 HOOK_INVOKE ((this, HOOK_LINE_UPDATE, DT_INT, start_row, DT_END));
1027
1028 break;
1029 }
1030 }
1031 while (l->is_longer () && row < end_row);
1032 }
1033 while (row < end_row);
1034 }
1035
946 scr_refresh (refresh_type); 1036 scr_refresh ();
947 scrollbar_show (1); 1037 scrollbar_show (1);
948#ifdef USE_XIM 1038#ifdef USE_XIM
949 IMSendSpot (); 1039 IMSendSpot ();
950#endif 1040#endif
951 } 1041 }
952 1042
953 display->flush (); 1043 display->flush ();
954} 1044}
955 1045
1046/* checks wether a refresh is requested and starts the refresh timer */
956void 1047void
957rxvt_term::check_cb (check_watcher &w) 1048rxvt_term::refresh_check ()
958{ 1049{
959 SET_R (this);
960 SET_LOCALE (locale);
961
962 display->flush ();
963
964 if (want_refresh && !flush_ev.active) 1050 if (want_refresh && !flush_ev.is_active ())
965 flush_ev.start (NOW + 0.01); 1051 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally
966} 1052}
967 1053
968void 1054void
969rxvt_term::flush_cb (time_watcher &w) 1055rxvt_term::flush_cb (ev::timer &w, int revents)
970{ 1056{
971 SET_R (this); 1057 make_current ();
972 SET_LOCALE (locale);
973 1058
974 refresh_limit = 1;
975 refresh_count = 0; 1059 refresh_count = 0;
976 flush (); 1060 flush ();
977} 1061}
978 1062
979#ifdef CURSOR_BLINK 1063#ifdef CURSOR_BLINK
980void 1064void
981rxvt_term::cursor_blink_cb (time_watcher &w) 1065rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
982{ 1066{
983 hidden_cursor = !hidden_cursor; 1067 hidden_cursor = !hidden_cursor;
984 want_refresh = 1; 1068 want_refresh = 1;
985 1069 refresh_check ();
986 w.start (w.at + BLINK_INTERVAL);
987} 1070}
988#endif 1071#endif
989 1072
990#ifdef TEXT_BLINK 1073#ifdef TEXT_BLINK
991void 1074void
992rxvt_term::text_blink_cb (time_watcher &w) 1075rxvt_term::text_blink_cb (ev::timer &w, int revents)
993{ 1076{
994 if (scr_refresh_rend (RS_Blink, RS_Blink)) 1077 if (scr_refresh_rend (RS_Blink, RS_Blink))
995 { 1078 {
996 hidden_text = !hidden_text; 1079 hidden_text = !hidden_text;
997 want_refresh = 1; 1080 want_refresh = 1;
998 w.start (w.at + TEXT_BLINK_INTERVAL); 1081 refresh_check ();
999 } 1082 }
1083 else
1084 w.stop ();
1000} 1085}
1001#endif 1086#endif
1002 1087
1003#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1088#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1004void 1089void
1005rxvt_term::cont_scroll_cb (time_watcher &w) 1090rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1006{ 1091{
1007 if ((scrollbar_isUp() || scrollbar_isDn()) && 1092 if ((scrollbar_isUp () || scrollbar_isDn ())
1008 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1093 && scr_page (scrollbar_isUp () ? UP : DN, 1))
1009 { 1094 {
1010 refresh_type |= SMOOTH_REFRESH;
1011 want_refresh = 1; 1095 want_refresh = 1;
1012 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1096 refresh_check ();
1013 } 1097 }
1098 else
1099 w.stop ();
1014} 1100}
1015#endif 1101#endif
1016 1102
1017#ifdef SELECTION_SCROLLING 1103#ifdef SELECTION_SCROLLING
1018void 1104void
1019rxvt_term::sel_scroll_cb (time_watcher &w) 1105rxvt_term::sel_scroll_cb (ev::timer &w, int revents)
1020{ 1106{
1021 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1107 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1022 { 1108 {
1023 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1109 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1024 refresh_type |= SMOOTH_REFRESH;
1025 want_refresh = 1; 1110 want_refresh = 1;
1026 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1111 refresh_check ();
1027 } 1112 }
1113 else
1114 w.stop ();
1028} 1115}
1029#endif 1116#endif
1030 1117
1031#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1118#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1032void 1119void
1033rxvt_term::slip_wheel_cb (time_watcher &w) 1120rxvt_term::slip_wheel_cb (ev::timer &w, int revents)
1034{ 1121{
1035 if (mouse_slip_wheel_speed == 0 1122 if (scr_changeview (view_start - mouse_slip_wheel_speed))
1036 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1037 : scr_page (UP, mouse_slip_wheel_speed))
1038 { 1123 {
1039 if (TermWin.view_start == TermWin.nscrolled ||
1040 TermWin.view_start == 0)
1041 mouse_slip_wheel_speed = 0;
1042
1043 refresh_type |= SMOOTH_REFRESH;
1044 want_refresh = 1; 1124 want_refresh = 1;
1045 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1125 refresh_check ();
1126 }
1127
1128 if (view_start == top_row || view_start == 0 || mouse_slip_wheel_speed == 0)
1046 } 1129 {
1130 mouse_slip_wheel_speed = 0;
1131 w.stop ();
1132 }
1047} 1133}
1134#endif
1135
1136#if LINUX_YIELD_HACK
1137static struct event_handler
1138{
1139 ev::prepare yield_ev;
1140
1141 void yield_cb (ev::prepare &w, int revents)
1142 {
1143 // this should really be sched_yield(), but the linux guys thought
1144 // that giving a process calling sched_yield () less cpu time than
1145 // ones with high nice levels is a useful thing to do. It surely is is
1146 // allowed by the sus... as is returning ENOSYS.
1147
1148 struct timespec ts = { 0, 0 };
1149 nanosleep (&ts, 0);
1150
1151 w.stop ();
1152 }
1153
1154 event_handler ()
1155 : yield_ev (this, &event_handler::yield_cb)
1156 {
1157 }
1158} event_handler;
1048#endif 1159#endif
1049 1160
1050bool 1161bool
1051rxvt_term::pty_fill () 1162rxvt_term::pty_fill ()
1052{ 1163{
1053 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1164 ssize_t n = cmdbuf_endp - cmdbuf_ptr;
1054 1165
1055 if (CBUFSIZ == n) 1166 if (CBUFSIZ == n)
1056 { 1167 {
1057 rxvt_warn ("pty_fill on full buffer, draining input, continuing.\n"); 1168 rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n");
1058 n = 0; 1169 n = 0;
1059 } 1170 }
1060 1171
1061 memmove (cmdbuf_base, cmdbuf_ptr, n); 1172 memmove (cmdbuf_base, cmdbuf_ptr, n);
1062 cmdbuf_ptr = cmdbuf_base; 1173 cmdbuf_ptr = cmdbuf_base;
1063 cmdbuf_endp = cmdbuf_ptr + n; 1174 cmdbuf_endp = cmdbuf_ptr + n;
1064 1175
1065 n = read (pty.pty, cmdbuf_endp, CBUFSIZ - n); 1176 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n);
1066 1177
1067 if (n > 0) 1178 if (r > 0)
1068 { 1179 {
1069 cmdbuf_endp += n; 1180 cmdbuf_endp += r;
1070 return true; 1181 return true;
1071 } 1182 }
1072 else if (n < 0 && errno != EAGAIN) 1183 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1184 {
1185#if LINUX_YIELD_HACK
1186 if (display->is_local)
1187 event_handler.yield_ev.start ();
1188#endif
1189 }
1190 else
1191 {
1192 pty_ev.stop ();
1193
1194 if (!option (Opt_hold))
1073 destroy (); 1195 destroy ();
1074 1196 }
1197
1075 return false; 1198 return false;
1076} 1199}
1077 1200
1078void 1201void
1079rxvt_term::pty_cb (io_watcher &w, short revents) 1202rxvt_term::pty_cb (ev::io &w, int revents)
1080{ 1203{
1081 SET_R (this); 1204 make_current ();
1082 SET_LOCALE (locale);
1083 1205
1084 if (revents & EVENT_READ) 1206 if (revents & ev::READ)
1085 // loop, but don't allow a single term to monopolize us 1207 // loop, but don't allow a single term to monopolize us
1086 while (pty_fill ()) 1208 while (pty_fill ())
1087 if (cmd_parse ()) 1209 if (cmd_parse ())
1088 break; 1210 break;
1089 1211
1090 if (revents & EVENT_WRITE) 1212 if (revents & ev::WRITE)
1091 pty_write (); 1213 pty_write ();
1092} 1214}
1093 1215
1094void 1216void
1095rxvt_term::pointer_unblank () 1217rxvt_term::pointer_unblank ()
1096{ 1218{
1097 XDefineCursor (display->display, TermWin.vt, TermWin_cursor); 1219 XDefineCursor (dpy, vt, TermWin_cursor);
1098 recolour_cursor (); 1220 recolour_cursor ();
1099 1221
1100#ifdef POINTER_BLANK 1222#ifdef POINTER_BLANK
1101 hidden_pointer = 0; 1223 hidden_pointer = 0;
1102 1224
1103 if (options & Opt_pointerBlank) 1225 if (option (Opt_pointerBlank))
1104 pointer_ev.start (NOW + pointerBlankDelay); 1226 pointer_ev.start (pointerBlankDelay);
1105#endif 1227#endif
1106} 1228}
1107 1229
1108#ifdef POINTER_BLANK 1230#ifdef POINTER_BLANK
1109void 1231void
1110rxvt_term::pointer_blank () 1232rxvt_term::pointer_blank ()
1111{ 1233{
1112 if (! (options & Opt_pointerBlank)) 1234 if (!option (Opt_pointerBlank))
1113 return; 1235 return;
1114 1236
1115 XDefineCursor (display->display, TermWin.vt, display->blank_cursor); 1237 XDefineCursor (dpy, vt, display->blank_cursor);
1116 XFlush (display->display); 1238 XFlush (dpy);
1117 1239
1118 hidden_pointer = 1; 1240 hidden_pointer = 1;
1119} 1241}
1120 1242
1121void 1243void
1122rxvt_term::pointer_cb (time_watcher &w) 1244rxvt_term::pointer_cb (ev::timer &w, int revents)
1123{ 1245{
1124 SET_R (this); 1246 make_current ();
1125 SET_LOCALE (locale);
1126 1247
1127 pointer_blank (); 1248 pointer_blank ();
1128} 1249}
1129#endif 1250#endif
1130 1251
1131void 1252void
1132rxvt_term::mouse_report (XButtonEvent &ev) 1253rxvt_term::mouse_report (XButtonEvent &ev)
1133{ 1254{
1134 int button_number, key_state = 0; 1255 int button_number, key_state = 0;
1135 int x, y; 1256 int x, y;
1257 int code = 32;
1136 1258
1137 x = ev.x; 1259 x = Pixel2Col (ev.x);
1138 y = ev.y; 1260 y = Pixel2Row (ev.y);
1139 pixel_position (&x, &y); 1261 if (ev.type == MotionNotify)
1262 {
1263 if (x == mouse_row && y == mouse_col)
1264 return;
1265 mouse_row = x;
1266 mouse_col = y;
1267 code += 32;
1268 }
1140 1269
1141 if (MEvent.button == AnyButton) 1270 if (MEvent.button == AnyButton)
1142 button_number = 3; 1271 button_number = 3;
1143 else 1272 else
1144 { 1273 {
… …
1190 x + 1, 1319 x + 1,
1191 y + 1); 1320 y + 1);
1192#endif 1321#endif
1193 1322
1194 tt_printf ("\033[M%c%c%c", 1323 tt_printf ("\033[M%c%c%c",
1195 (32 + button_number + key_state), 1324 (code + button_number + key_state),
1196 (32 + x + 1), 1325 (32 + x + 1),
1197 (32 + y + 1)); 1326 (32 + y + 1));
1198} 1327}
1199
1200#ifdef USING_W11LIB
1201void
1202rxvt_W11_process_x_event (XEvent *ev)
1203{
1204 rxvt_t *r = rxvt_get_r ();
1205
1206 x_cb (*ev);
1207}
1208#endif
1209 1328
1210/*{{{ process an X event */ 1329/*{{{ process an X event */
1211void 1330void
1212rxvt_term::x_cb (XEvent &ev) 1331rxvt_term::x_cb (XEvent &ev)
1213{ 1332{
1214 dDisp; 1333 make_current ();
1215 1334
1216 SET_R (this); 1335 dLocal (Display *, dpy);
1217 SET_LOCALE (locale);
1218 1336
1219#if defined(CURSOR_BLINK) 1337 if (ev.xany.window == vt
1220 if ((options & Opt_cursorBlink) && ev.type == KeyPress) 1338 && SHOULD_INVOKE (HOOK_X_EVENT)
1221 { 1339 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1222 if (hidden_cursor) 1340 return;
1223 {
1224 hidden_cursor = 0;
1225 want_refresh = 1;
1226 }
1227 1341
1228 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1342 // 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; 1343 Window unused_root, unused_child;
1247 int unused_root_x, unused_root_y; 1344 int unused_root_x, unused_root_y;
1248 unsigned int unused_mask; 1345 unsigned int unused_mask;
1249 1346
1250 switch (ev.type) 1347 switch (ev.type)
1251 { 1348 {
1252 case KeyPress: 1349 case KeyPress:
1253#if ISO_14755 1350 key_press (ev.xkey);
1254 if (!(iso14755buf & ISO_14755_52))
1255#endif
1256 lookup_key (ev.xkey);
1257
1258 break; 1351 break;
1259 1352
1260 case KeyRelease: 1353 case KeyRelease:
1261 { 1354 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; 1355 break;
1329 }
1330 1356
1331 case ButtonPress: 1357 case ButtonPress:
1332 button_press (ev.xbutton); 1358 button_press (ev.xbutton);
1333 break; 1359 break;
1334 1360
… …
1336 button_release (ev.xbutton); 1362 button_release (ev.xbutton);
1337 break; 1363 break;
1338 1364
1339 case ClientMessage: 1365 case ClientMessage:
1340 if (ev.xclient.format == 32 1366 if (ev.xclient.format == 32
1341 && ev.xclient.message_type == xa[XA_WM_PROTOCOLS]) 1367 && !HOOK_INVOKE ((this, HOOK_CLIENT_MESSAGE, DT_XEVENT, &ev, DT_END)))
1342 { 1368 {
1369 if (ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
1370 {
1371 if (!HOOK_INVOKE ((this, HOOK_WM_PROTOCOLS, DT_XEVENT, &ev, DT_END)))
1372 {
1343 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW]) 1373 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1374 {
1375 if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END)))
1344 destroy (); 1376 destroy ();
1377 }
1345#if ENABLE_EWMH 1378#if ENABLE_EWMH
1346 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING]) 1379 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1347 XSendEvent (disp, ev.xclient.window = display->root, 1380 XSendEvent (dpy, ev.xclient.window = display->root,
1348 False, SubstructureRedirectMask | SubstructureNotifyMask, 1381 False, SubstructureRedirectMask | SubstructureNotifyMask,
1349 &ev); 1382 &ev);
1383#endif
1384 }
1385 }
1386#if ENABLE_XEMBED
1387 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1388 {
1389 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1390 focus_in ();
1391 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1392 focus_out ();
1393 }
1350#endif 1394#endif
1351 } 1395 }
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; 1396 break;
1392 1397
1393 /* 1398 /*
1394 * XXX: this is not the _current_ arrangement 1399 * XXX: this is not the _current_ arrangement
1395 * Here's my conclusion: 1400 * Here's my conclusion:
… …
1414 break; 1419 break;
1415 } 1420 }
1416 break; 1421 break;
1417 1422
1418 case FocusIn: 1423 case FocusIn:
1424 if (ev.xfocus.detail != NotifyInferior
1425 && ev.xfocus.detail != NotifyPointer
1426 && ev.xfocus.mode != NotifyGrab)
1419 focus_in (); 1427 focus_in ();
1420 break; 1428 break;
1421 1429
1422 case FocusOut: 1430 case FocusOut:
1431 if (ev.xfocus.detail != NotifyInferior
1432 && ev.xfocus.detail != NotifyPointer
1433 && ev.xfocus.mode != NotifyGrab)
1423 focus_out (); 1434 focus_out ();
1424 break; 1435 break;
1425 1436
1426 case ConfigureNotify: 1437 case ConfigureNotify:
1438 /* fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",
1439 ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,
1440 szHint.width, szHint.height); */
1427 if (ev.xconfigure.window == TermWin.parent[0]) 1441 if (ev.xconfigure.window == parent[0])
1428 { 1442 {
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)); 1443 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1444 ;
1438 1445
1439 if (szHint.width != width || szHint.height != height) 1446 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1440 { 1447 {
1441 seen_resize = 1; 1448 seen_resize = 1;
1442 resize_all_windows (width, height, 1); 1449 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1443 } 1450 }
1444 1451 else
1445#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1452 {
1446 if (options & Opt_transparent) 1453#ifdef HAVE_BG_PIXMAP
1447 check_our_parents (); 1454 if (bgPixmap.window_position_sensitive ())
1455 update_background ();
1448#endif 1456#endif
1457 }
1458 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1449 } 1459 }
1450 break; 1460 break;
1451 1461
1452 case PropertyNotify: 1462 case PropertyNotify:
1463 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
1453 if (ev.xproperty.atom == xa[XA_VT_SELECTION] 1464 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1454 && ev.xproperty.state == PropertyNewValue) 1465 && ev.xproperty.state == PropertyNewValue)
1455 selection_property (ev.xproperty.window, ev.xproperty.atom); 1466 selection_property (ev.xproperty.window, ev.xproperty.atom);
1456 1467
1457 break; 1468 break;
1458 1469
1459 case SelectionClear: 1470 case SelectionClear:
1460 selection_clear (); 1471 selection_clear ();
… …
1467 1478
1468 case SelectionRequest: 1479 case SelectionRequest:
1469 selection_send (ev.xselectionrequest); 1480 selection_send (ev.xselectionrequest);
1470 break; 1481 break;
1471 1482
1483 case MapNotify:
1484 mapped = 1;
1485#ifdef TEXT_BLINK
1486 text_blink_ev.start ();
1487#endif
1488 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1489 break;
1490
1472 case UnmapNotify: 1491 case UnmapNotify:
1473 TermWin.mapped = 0; 1492 mapped = 0;
1474#ifdef TEXT_BLINK 1493#ifdef TEXT_BLINK
1475 text_blink_ev.stop (); 1494 text_blink_ev.stop ();
1476#endif 1495#endif
1496 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1477 break; 1497 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 1498
1492 case GraphicsExpose: 1499 case GraphicsExpose:
1493 case Expose: 1500 case Expose:
1494 if (ev.xany.window == TermWin.vt) 1501 if (ev.xany.window == vt)
1495 { 1502 {
1496 do 1503 do
1504 {
1497 scr_expose (ev.xexpose.x, ev.xexpose.y, 1505 scr_expose (ev.xexpose.x, ev.xexpose.y,
1498 ev.xexpose.width, ev.xexpose.height, False); 1506 ev.xexpose.width, ev.xexpose.height, False);
1507 }
1499 while (XCheckTypedWindowEvent (disp, TermWin.vt, ev.xany.type, &ev)); 1508 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1500 1509
1501 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1510 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1502 1511
1503 while (XCheckTypedWindowEvent (disp, TermWin.vt, ev.xany.type, &ev)) 1512 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1513 {
1504 scr_expose (ev.xexpose.x, ev.xexpose.y, 1514 scr_expose (ev.xexpose.x, ev.xexpose.y,
1505 ev.xexpose.width, ev.xexpose.height, False); 1515 ev.xexpose.width, ev.xexpose.height, False);
1516 }
1506 1517
1507 scr_refresh (refresh_type); 1518 want_refresh = 1;
1508 } 1519 }
1509 else 1520 else
1510 { 1521 {
1511 XEvent unused_event; 1522 XEvent unused_event;
1512 1523
1513 while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event)) 1524 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1514 ; 1525 ;
1515 while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event)) 1526 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1516 ; 1527 ;
1517 1528
1518 if (isScrollbarWindow (ev.xany.window)) 1529 if (isScrollbarWindow (ev.xany.window))
1519 { 1530 {
1520 scrollBar.setIdle (); 1531 scrollBar.setIdle ();
1521 scrollbar_show (0); 1532 scrollbar_show (0);
1522 } 1533 }
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 } 1534 }
1533 break; 1535 break;
1534 1536
1535 case MotionNotify: 1537 case MotionNotify:
1536#ifdef POINTER_BLANK 1538#ifdef POINTER_BLANK
1537 if (hidden_pointer) 1539 if (hidden_pointer)
1538 pointer_unblank (); 1540 pointer_unblank ();
1539#endif 1541#endif
1540#if MENUBAR 1542 if ((priv_modes & PrivMode_MouseBtnEvent && ev.xbutton.state & (Button1Mask|Button2Mask|Button3Mask))
1541 if (isMenuBarWindow (ev.xany.window)) 1543 || priv_modes & PrivMode_MouseAnyEvent)
1542 {
1543 menubar_control (ev.xbutton); 1544 mouse_report (ev.xbutton);
1544 break;
1545 }
1546#endif
1547 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1545 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1548 break; 1546 break;
1549 1547
1550 if (ev.xany.window == TermWin.vt) 1548 if (ev.xany.window == vt)
1551 { 1549 {
1550 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1551 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1552 ; // nop
1552 if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1553 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1553 { 1554 {
1554 while (XCheckTypedWindowEvent (disp, TermWin.vt, MotionNotify, &ev)) 1555 while (XCheckTypedWindowEvent (dpy, vt, MotionNotify, &ev))
1555 ; 1556 ;
1556 1557
1557 XQueryPointer (disp, TermWin.vt, 1558 XQueryPointer (dpy, vt,
1558 &unused_root, &unused_child, 1559 &unused_root, &unused_child,
1559 &unused_root_x, &unused_root_y, 1560 &unused_root_x, &unused_root_y,
1560 &ev.xbutton.x, &ev.xbutton.y, 1561 &ev.xbutton.x, &ev.xbutton.y,
1561 &ev.xbutton.state); 1562 &ev.xbutton.state);
1562#ifdef MOUSE_THRESHOLD 1563#ifdef MOUSE_THRESHOLD
… …
1574#endif 1575#endif
1575 selection_extend (ev.xbutton.x, ev.xbutton.y, 1576 selection_extend (ev.xbutton.x, ev.xbutton.y,
1576 ev.xbutton.state & Button3Mask ? 2 : 0); 1577 ev.xbutton.state & Button3Mask ? 2 : 0);
1577 1578
1578#ifdef SELECTION_SCROLLING 1579#ifdef SELECTION_SCROLLING
1579 if (ev.xbutton.y < TermWin.int_bwidth 1580 if (ev.xbutton.y < int_bwidth
1580 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1)) 1581 || Pixel2Row (ev.xbutton.y) > (nrow-1))
1581 { 1582 {
1582 int dist; 1583 int dist;
1583 1584
1584 /* don't clobber the current delay if we are 1585 /* don't clobber the current delay if we are
1585 * already in the middle of scrolling. 1586 * already in the middle of scrolling.
1586 */ 1587 */
1587 if (!sel_scroll_ev.active) 1588 if (!sel_scroll_ev.is_active ())
1588 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1589 sel_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1589 1590
1590 /* save the event params so we can highlight 1591 /* save the event params so we can highlight
1591 * the selection in the pending-scroll loop 1592 * the selection in the pending-scroll loop
1592 */ 1593 */
1593 selection_save_x = ev.xbutton.x; 1594 selection_save_x = ev.xbutton.x;
1594 selection_save_y = ev.xbutton.y; 1595 selection_save_y = ev.xbutton.y;
1595 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0; 1596 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;
1596 1597
1597 /* calc number of lines to scroll */ 1598 /* calc number of lines to scroll */
1598 if (ev.xbutton.y < TermWin.int_bwidth) 1599 if (ev.xbutton.y < int_bwidth)
1599 { 1600 {
1600 scroll_selection_dir = UP; 1601 scroll_selection_dir = UP;
1601 dist = TermWin.int_bwidth - ev.xbutton.y; 1602 dist = int_bwidth - ev.xbutton.y;
1602 } 1603 }
1603 else 1604 else
1604 { 1605 {
1605 scroll_selection_dir = DN; 1606 scroll_selection_dir = DN;
1606 dist = ev.xbutton.y - (TermWin.int_bwidth + TermWin.height); 1607 dist = ev.xbutton.y - (int_bwidth + height);
1607 } 1608 }
1608 1609
1609 scroll_selection_lines = Pixel2Height (dist) 1610 scroll_selection_lines = Pixel2Height (dist)
1610 / SELECTION_SCROLL_LINE_SPEEDUP 1611 / SELECTION_SCROLL_LINE_SPEEDUP
1611 + 1; 1612 + 1;
1612 MIN_IT (scroll_selection_lines, 1613 min_it (scroll_selection_lines,
1613 SELECTION_SCROLL_MAX_LINES); 1614 SELECTION_SCROLL_MAX_LINES);
1614 } 1615 }
1615 else 1616 else
1616 { 1617 {
1617 /* we are within the text window, so we 1618 /* we are within the text window, so we
1618 * shouldn't be scrolling 1619 * shouldn't be scrolling
1619 */ 1620 */
1620 if (sel_scroll_ev.active)
1621 sel_scroll_ev.stop(); 1621 sel_scroll_ev.stop();
1622 } 1622 }
1623#endif 1623#endif
1624#ifdef MOUSE_THRESHOLD 1624#ifdef MOUSE_THRESHOLD
1625 } 1625 }
1626#endif 1626#endif
1627 } 1627 }
1628 } 1628 }
1629 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1629 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1630 { 1630 {
1631 while (XCheckTypedWindowEvent (disp, scrollBar.win, 1631 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1632 MotionNotify, &ev)) 1632 MotionNotify, &ev))
1633 ; 1633 ;
1634 1634
1635 XQueryPointer (disp, scrollBar.win, 1635 XQueryPointer (dpy, scrollBar.win,
1636 &unused_root, &unused_child, 1636 &unused_root, &unused_child,
1637 &unused_root_x, &unused_root_y, 1637 &unused_root_x, &unused_root_y,
1638 &ev.xbutton.x, &ev.xbutton.y, 1638 &ev.xbutton.x, &ev.xbutton.y,
1639 &unused_mask); 1639 &unused_mask);
1640 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1640 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1641 scrollbar_size ()); 1641 scrollbar_size ());
1642 scr_refresh (refresh_type);
1643 refresh_limit = 0; 1642 want_refresh = 1;
1644 scrollbar_show (1); 1643 scrollbar_show (1);
1645 } 1644 }
1646 break; 1645 break;
1647 } 1646 }
1647
1648#if defined(CURSOR_BLINK)
1649 if (option (Opt_cursorBlink) && ev.type == KeyPress)
1650 {
1651 if (hidden_cursor)
1652 {
1653 hidden_cursor = 0;
1654 want_refresh = 1;
1655 }
1656
1657 cursor_blink_ev.again ();
1658 }
1659#endif
1660
1661#if defined(POINTER_BLANK)
1662 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1663 {
1664 if (ev.type == MotionNotify
1665 || ev.type == ButtonPress
1666 || ev.type == ButtonRelease)
1667 if (hidden_pointer)
1668 pointer_unblank ();
1669
1670 if (ev.type == KeyPress && hidden_pointer == 0)
1671 pointer_blank ();
1672 }
1673#endif
1674
1675 refresh_check ();
1648} 1676}
1649 1677
1650void 1678void
1651rxvt_term::focus_in () 1679rxvt_term::focus_in ()
1652{ 1680{
1653 if (!TermWin.focus) 1681 if (!focus)
1654 { 1682 {
1655 TermWin.focus = 1; 1683 focus = 1;
1656 want_refresh = 1; 1684 want_refresh = 1;
1685
1686 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1687
1657#ifdef USE_XIM 1688#if USE_XIM
1658 if (Input_Context != NULL) 1689 if (Input_Context != NULL)
1659 { 1690 {
1660 IMSetStatusPosition (); 1691 IMSetPosition ();
1661 XSetICFocus (Input_Context); 1692 XSetICFocus (Input_Context);
1662 } 1693 }
1663#endif 1694#endif
1664#ifdef CURSOR_BLINK 1695#if CURSOR_BLINK
1665 if (options & Opt_cursorBlink) 1696 if (option (Opt_cursorBlink))
1666 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1697 cursor_blink_ev.again ();
1667#endif 1698#endif
1668#ifdef OFF_FOCUS_FADING 1699#if OFF_FOCUS_FADING
1669 if (rs[Rs_fade]) 1700 if (rs[Rs_fade])
1670 { 1701 {
1671 pix_colors = pix_colors_focused; 1702 pix_colors = pix_colors_focused;
1672 scr_recolour (); 1703 scr_recolour ();
1673 } 1704 }
1674#endif 1705#endif
1706#if ENABLE_FRILLS
1707 if (option (Opt_urgentOnBell))
1708 {
1709 if (XWMHints *h = XGetWMHints(dpy, parent[0]))
1710 {
1711 h->flags &= ~XUrgencyHint;
1712 XSetWMHints (dpy, parent[0], h);
1713 }
1714 }
1715#endif
1675 } 1716 }
1676} 1717}
1677 1718
1678void 1719void
1679rxvt_term::focus_out () 1720rxvt_term::focus_out ()
1680{ 1721{
1681 if (TermWin.focus) 1722 if (focus)
1682 { 1723 {
1683 TermWin.focus = 0; 1724 focus = 0;
1684 want_refresh = 1; 1725 want_refresh = 1;
1685 1726
1727 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1728
1686#if ENABLE_FRILLS || ISO_14755 1729#if ENABLE_FRILLS || ISO_14755
1730 if (iso14755buf)
1731 {
1687 iso14755buf = 0; 1732 iso14755buf = 0;
1688#endif 1733# if ISO_14755
1689#if ENABLE_OVERLAY
1690 scr_overlay_off (); 1734 scr_overlay_off ();
1691#endif 1735# endif
1736 }
1737#endif
1692#ifdef USE_XIM 1738#if USE_XIM
1693 if (Input_Context != NULL) 1739 if (Input_Context != NULL)
1694 XUnsetICFocus (Input_Context); 1740 XUnsetICFocus (Input_Context);
1695#endif 1741#endif
1696#ifdef CURSOR_BLINK 1742#if CURSOR_BLINK
1697 if (options & Opt_cursorBlink) 1743 if (option (Opt_cursorBlink))
1698 cursor_blink_ev.stop (); 1744 cursor_blink_ev.stop ();
1745
1699 hidden_cursor = 0; 1746 hidden_cursor = 0;
1700#endif 1747#endif
1701#ifdef OFF_FOCUS_FADING 1748#if OFF_FOCUS_FADING
1702 if (rs[Rs_fade]) 1749 if (rs[Rs_fade])
1703 { 1750 {
1704 pix_colors = pix_colors_unfocused; 1751 pix_colors = pix_colors_unfocused;
1705 scr_recolour (); 1752 scr_recolour ();
1706 } 1753 }
1707#endif 1754#endif
1708 } 1755 }
1709} 1756}
1710 1757
1711#if TRANSPARENT 1758void
1759rxvt_term::update_fade_color (unsigned int idx)
1760{
1761#if OFF_FOCUS_FADING
1762 if (rs[Rs_fade])
1763 {
1764 rgba c;
1765 pix_colors [Color_fade].get (c);
1766 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1767 }
1768#endif
1769}
1770
1771#if ENABLE_TRANSPARENCY || ENABLE_PERL
1712void 1772void
1713rxvt_term::rootwin_cb (XEvent &ev) 1773rxvt_term::rootwin_cb (XEvent &ev)
1714{ 1774{
1715 SET_R (this); 1775 make_current ();
1716 SET_LOCALE (locale);
1717 1776
1777 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1778 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1779 return;
1780
1781# if ENABLE_TRANSPARENCY
1718 switch (ev.type) 1782 switch (ev.type)
1719 { 1783 {
1720 case PropertyNotify: 1784 case PropertyNotify:
1721 /* 1785 /*
1722 * if user used some Esetroot compatible prog to set the root bg, 1786 * 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. 1787 * use the property to determine the pixmap. We use it later on.
1724 */ 1788 */
1725 if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID] 1789 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1726 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1790 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1727 return; 1791 {
1728 1792 bgPixmap.set_root_pixmap ();
1729 /* FALLTHROUGH */ 1793 update_background ();
1730 case ReparentNotify: 1794 }
1731 if ((options & Opt_transparent) && check_our_parents () && am_transparent)
1732 want_refresh = want_full_refresh = 1;
1733 break; 1795 break;
1734 } 1796 }
1797# endif
1798
1799 refresh_check ();
1735} 1800}
1736#endif 1801#endif
1737 1802
1738void 1803void
1739rxvt_term::button_press (XButtonEvent &ev) 1804rxvt_term::button_press (XButtonEvent &ev)
1740{ 1805{
1741 int reportmode = 0, clickintime; 1806 int reportmode = 0, clickintime;
1742 1807
1743 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1808 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1809
1744 if (!bypass_keystate) 1810 if (!bypass_keystate)
1745 reportmode = !! (priv_modes & PrivMode_mouse_report); 1811 reportmode = !! (priv_modes & PrivMode_mouse_report);
1746 1812
1747 /* 1813 /*
1748 * VT window processing of button press 1814 * VT window processing of button press
1749 */ 1815 */
1750 if (ev.window == TermWin.vt) 1816 if (ev.window == vt)
1751 { 1817 {
1818 if (HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1819 return;
1820
1752#if ISO_14755 1821#if ISO_14755
1753 // 5.4 1822 // 5.4
1754 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1823 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1755 { 1824 {
1756 iso14755_54 (ev.x, ev.y); 1825 iso14755_54 (ev.x, ev.y);
… …
1768#ifdef MOUSE_REPORT_DOUBLECLICK 1837#ifdef MOUSE_REPORT_DOUBLECLICK
1769 if (ev.button == MEvent.button && clickintime) 1838 if (ev.button == MEvent.button && clickintime)
1770 { 1839 {
1771 /* same button, within alloted time */ 1840 /* same button, within alloted time */
1772 MEvent.clicks++; 1841 MEvent.clicks++;
1842
1773 if (MEvent.clicks > 1) 1843 if (MEvent.clicks > 1)
1774 { 1844 {
1775 /* only report double clicks */ 1845 /* only report double clicks */
1776 MEvent.clicks = 2; 1846 MEvent.clicks = 2;
1777 mouse_report (ev); 1847 mouse_report (ev);
… …
1789 mouse_report (ev); 1859 mouse_report (ev);
1790 } 1860 }
1791#else 1861#else
1792 MEvent.button = ev.button; 1862 MEvent.button = ev.button;
1793 mouse_report (ev); 1863 mouse_report (ev);
1794#endif /* MOUSE_REPORT_DOUBLECLICK */ 1864#endif /* MOUSE_REPORT_DOUBLECLICK */
1795 1865
1796 } 1866 }
1797 else 1867 else
1798 { 1868 {
1799 if (ev.button != MEvent.button) 1869 if (ev.button != MEvent.button)
… …
1809#else 1879#else
1810 selection.rect = false; 1880 selection.rect = false;
1811#endif 1881#endif
1812 1882
1813 /* allow shift+left click to extend selection */ 1883 /* allow shift+left click to extend selection */
1814 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report)) 1884 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1815 { 1885 {
1816 if (MEvent.button == Button1 && clickintime) 1886 if (MEvent.button == Button1 && clickintime)
1817 selection_rotate (ev.x, ev.y); 1887 selection_rotate (ev.x, ev.y);
1818 else 1888 else
1819 selection_extend (ev.x, ev.y, 1); 1889 selection_extend (ev.x, ev.y, 1);
… …
1893 tt_printf ("\033[5~"); 1963 tt_printf ("\033[5~");
1894 break; 1964 break;
1895 } 1965 }
1896 } 1966 }
1897 else 1967 else
1898#endif /* NO_SCROLLBAR_REPORT */ 1968#endif /* NO_SCROLLBAR_REPORT */
1899 1969
1900 { 1970 {
1901 char upordown = 0; 1971 char upordown = 0;
1902 1972
1903 if (scrollBar.style == R_SB_NEXT) 1973 if (scrollBar.style == R_SB_NEXT)
1904 { 1974 {
1905 if (scrollbarnext_upButton (ev.y)) 1975 if (scrollbarnext_upButton (ev.y))
1906 upordown = -1; /* up */ 1976 upordown = -1; /* up */
… …
1912 if (scrollbarrxvt_upButton (ev.y)) 1982 if (scrollbarrxvt_upButton (ev.y))
1913 upordown = -1; /* up */ 1983 upordown = -1; /* up */
1914 else if (scrollbarrxvt_dnButton (ev.y)) 1984 else if (scrollbarrxvt_dnButton (ev.y))
1915 upordown = 1; /* down */ 1985 upordown = 1; /* down */
1916 } 1986 }
1987
1917 if (upordown) 1988 if (upordown)
1918 { 1989 {
1919#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1990#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1991 if (!cont_scroll_ev.is_active ())
1920 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1992 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1921#endif 1993#endif
1922 if (scr_page (upordown < 0 ? UP : DN, 1)) 1994 if (scr_page (upordown < 0 ? UP : DN, 1))
1923 { 1995 {
1924 if (upordown < 0) 1996 if (upordown < 0)
1925 scrollBar.setUp (); 1997 scrollBar.setUp ();
… …
1960 case Button3: 2032 case Button3:
1961 if (scrollBar.style != R_SB_XTERM) 2033 if (scrollBar.style != R_SB_XTERM)
1962 { 2034 {
1963 if (scrollbar_above_slider (ev.y)) 2035 if (scrollbar_above_slider (ev.y))
1964# ifdef RXVT_SCROLL_FULL 2036# ifdef RXVT_SCROLL_FULL
1965 scr_page (UP, TermWin.nrow - 1); 2037 scr_page (UP, nrow - 1);
1966# else 2038# else
1967 scr_page (UP, TermWin.nrow / 4); 2039 scr_page (UP, nrow / 4);
1968# endif 2040# endif
1969 else if (scrollbar_below_slider (ev.y)) 2041 else if (scrollbar_below_slider (ev.y))
1970# ifdef RXVT_SCROLL_FULL 2042# ifdef RXVT_SCROLL_FULL
1971 scr_page (DN, TermWin.nrow - 1); 2043 scr_page (DN, nrow - 1);
1972# else 2044# else
1973 scr_page (DN, TermWin.nrow / 4); 2045 scr_page (DN, nrow / 4);
1974# endif 2046# endif
1975 else 2047 else
1976 scrollBar.setMotion (); 2048 scrollBar.setMotion ();
1977 } 2049 }
1978 else 2050 else
1979 { 2051 {
1980 scr_page ((ev.button == Button1 ? DN : UP), 2052 scr_page ((ev.button == Button1 ? DN : UP),
1981 (TermWin.nrow 2053 (nrow
1982 * scrollbar_position (ev.y) 2054 * scrollbar_position (ev.y)
1983 / scrollbar_size ())); 2055 / scrollbar_size ()));
1984 } 2056 }
1985 2057
1986 break; 2058 break;
1987 } 2059 }
1988 } 2060 }
2061
1989 return; 2062 return;
1990 } 2063 }
1991#if MENUBAR
1992 /*
1993 * Menubar window processing of button press
1994 */
1995 if (isMenuBarWindow (ev.window))
1996 menubar_control (ev);
1997#endif
1998} 2064}
1999 2065
2000void 2066void
2001rxvt_term::button_release (XButtonEvent &ev) 2067rxvt_term::button_release (XButtonEvent &ev)
2002{ 2068{
… …
2008 2074
2009 if (scrollbar_isUpDn ()) 2075 if (scrollbar_isUpDn ())
2010 { 2076 {
2011 scrollBar.setIdle (); 2077 scrollBar.setIdle ();
2012 scrollbar_show (0); 2078 scrollbar_show (0);
2013#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2014 refresh_type &= ~SMOOTH_REFRESH;
2015#endif
2016 } 2079 }
2017 2080
2018#ifdef SELECTION_SCROLLING 2081#ifdef SELECTION_SCROLLING
2019 if (sel_scroll_ev.active)
2020 sel_scroll_ev.stop(); 2082 sel_scroll_ev.stop();
2021#endif 2083#endif
2022 2084
2023 if (ev.window == TermWin.vt) 2085 if (ev.window == vt)
2024 { 2086 {
2087 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2088 return;
2089
2025#if ISO_14755 2090#if ISO_14755
2026 // 5.4 2091 // 5.4
2027 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 2092 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2028 return; 2093 return;
2029#endif 2094#endif
2095
2030 if (reportmode) 2096 if (reportmode)
2031 { 2097 {
2032 /* mouse report from vt window */ 2098 /* mouse report from vt window */
2033 /* don't report release of wheel "buttons" */ 2099 /* don't report release of wheel "buttons" */
2034 if (ev.button >= 4) 2100 if (ev.button >= 4)
… …
2045 mouse_report (ev); 2111 mouse_report (ev);
2046 } 2112 }
2047#else /* MOUSE_REPORT_DOUBLECLICK */ 2113#else /* MOUSE_REPORT_DOUBLECLICK */
2048 MEvent.button = AnyButton; 2114 MEvent.button = AnyButton;
2049 mouse_report (ev); 2115 mouse_report (ev);
2050#endif /* MOUSE_REPORT_DOUBLECLICK */ 2116#endif /* MOUSE_REPORT_DOUBLECLICK */
2051 return; 2117 return;
2052 } 2118 }
2053 2119
2054 /* 2120 /*
2055 * dumb hack to compensate for the failure of click-and-drag 2121 * dumb hack to compensate for the failure of click-and-drag
… …
2064 { 2130 {
2065 case Button1: 2131 case Button1:
2066 case Button3: 2132 case Button3:
2067 selection_make (ev.time); 2133 selection_make (ev.time);
2068 break; 2134 break;
2135
2069 case Button2: 2136 case Button2:
2070 selection_request (ev.time, ev.x, ev.y); 2137 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2138 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2071 break; 2139 break;
2140
2072#ifdef MOUSE_WHEEL 2141#ifdef MOUSE_WHEEL
2073 case Button4: 2142 case Button4:
2074 case Button5: 2143 case Button5:
2075 { 2144 {
2076 int i; 2145 int i;
… …
2078 2147
2079 v = ev.button == Button4 ? UP : DN; 2148 v = ev.button == Button4 ? UP : DN;
2080 2149
2081 if (ev.state & ShiftMask) 2150 if (ev.state & ShiftMask)
2082 i = 1; 2151 i = 1;
2083 else if (options & Opt_mouseWheelScrollPage) 2152 else if (option (Opt_mouseWheelScrollPage))
2084 i = TermWin.nrow - 1; 2153 i = nrow - 1;
2085 else 2154 else
2086 i = 5; 2155 i = 5;
2087 2156
2088# ifdef MOUSE_SLIP_WHEELING 2157# ifdef MOUSE_SLIP_WHEELING
2089 if (ev.state & ControlMask) 2158 if (ev.state & ControlMask)
2090 { 2159 {
2091 mouse_slip_wheel_speed += v ? -1 : 1; 2160 mouse_slip_wheel_speed += v ? -1 : 1;
2092 if (mouse_slip_wheel_speed < -TermWin.nrow) mouse_slip_wheel_speed = -TermWin.nrow; 2161 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; 2162 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2094 2163
2095 if (slip_wheel_ev.at < NOW) 2164 if (!slip_wheel_ev.is_active ())
2096 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; 2165 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2097
2098 slip_wheel_ev.start ();
2099 } 2166 }
2100 else 2167 else
2101 { 2168 {
2102# endif 2169# endif
2103# ifdef JUMP_MOUSE_WHEEL
2104 scr_page (v, i); 2170 scr_page (v, i);
2105 scr_refresh (SMOOTH_REFRESH);
2106 scrollbar_show (1); 2171 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 2172# ifdef MOUSE_SLIP_WHEELING
2116 } 2173 }
2117#endif 2174# endif
2118 } 2175 }
2119 break; 2176 break;
2120#endif 2177#endif
2121 } 2178 }
2122 } 2179 }
2123#ifdef MENUBAR
2124 else if (isMenuBarWindow (ev.window))
2125 menubar_control (ev);
2126#endif
2127} 2180}
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_fg]);
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 2181
2610/*}}} */ 2182/*}}} */
2611 2183
2612bool 2184bool
2613rxvt_term::cmd_parse () 2185rxvt_term::cmd_parse ()
2614{ 2186{
2615 bool flag = false; 2187 bool flag = false;
2616 unicode_t ch = NOCHAR; 2188 wchar_t ch = NOCHAR;
2617 unsigned char *seq_begin; // remember start of esc-sequence here 2189 char *seq_begin; // remember start of esc-sequence here
2618 2190
2619 for (;;) 2191 for (;;)
2620 { 2192 {
2621 if (ch == NOCHAR) 2193 if (ch == NOCHAR)
2622 { 2194 {
2623 seq_begin = cmdbuf_ptr; 2195 seq_begin = cmdbuf_ptr;
2624 ch = next_char (); 2196 ch = next_char ();
2625 }
2626 2197
2627 if (ch == NOCHAR) // TODO: improve 2198 if (ch == NOCHAR)
2628 break; 2199 break;
2200 }
2629 2201
2630 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2202 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)
2631 { 2203 {
2632 if (!seen_input) 2204 if (!seen_input)
2633 { 2205 {
… …
2642 if (seen_resize && cmd_pid) 2214 if (seen_resize && cmd_pid)
2643 kill (-cmd_pid, SIGWINCH); 2215 kill (-cmd_pid, SIGWINCH);
2644 } 2216 }
2645 2217
2646 /* Read a text string from the input buffer */ 2218 /* Read a text string from the input buffer */
2647 unicode_t buf[UBUFSIZ]; 2219 wchar_t buf[UBUFSIZ];
2648 bool refreshnow = false; 2220 bool refreshnow = false;
2649 int nlines = 0; 2221 int nlines = 0;
2650 unicode_t *str = buf; 2222 wchar_t *str = buf;
2651 unicode_t *eol = str + min (TermWin.ncol, UBUFSIZ); 2223 wchar_t *eol = str + min (ncol, UBUFSIZ);
2652 2224
2653 for (;;) 2225 for (;;)
2654 { 2226 {
2655 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2227 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2656 break; 2228 break;
2657 2229
2658 *str++ = ch; 2230 *str++ = ch;
2659 2231
2660 if (ch == C0_LF || str >= eol) 2232 if (ch == C0_LF || str >= eol)
2661 { 2233 {
2234 if (ch == C0_LF)
2662 nlines++; 2235 nlines++;
2236
2663 refresh_count++; 2237 refresh_count++;
2664 2238
2665 if (!(options & Opt_jumpScroll) 2239 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1)
2666 || (refresh_count >= refresh_limit * (TermWin.nrow - 1)))
2667 { 2240 {
2241 refresh_count = 0;
2242
2243 if (!option (Opt_skipScroll) || ev_time () > ev::now () + 1. / 60.)
2244 {
2668 refreshnow = true; 2245 refreshnow = true;
2669 ch = NOCHAR; 2246 ch = NOCHAR;
2670 break; 2247 break;
2248 }
2671 } 2249 }
2672 2250
2673 // scr_add_lines only works for nlines <= TermWin.nrow - 1. 2251 // scr_add_lines only works for nlines <= nrow - 1.
2674 if (nlines >= TermWin.nrow - 1) 2252 if (nlines >= nrow - 1)
2675 { 2253 {
2254 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2255 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2676 scr_add_lines (buf, nlines, str - buf); 2256 scr_add_lines (buf, str - buf, nlines);
2257
2677 nlines = 0; 2258 nlines = 0;
2678 str = buf; 2259 str = buf;
2679 eol = str + min (TermWin.ncol, UBUFSIZ); 2260 eol = str + min (ncol, UBUFSIZ);
2680 } 2261 }
2681 2262
2682 if (str >= eol) 2263 if (str >= eol)
2683 { 2264 {
2684 if (eol >= buf + UBUFSIZ) 2265 if (eol >= buf + UBUFSIZ)
2685 { 2266 {
2686 ch = NOCHAR; 2267 ch = NOCHAR;
2687 break; 2268 break;
2688 } 2269 }
2689 else 2270 else
2690 eol = min (eol + TermWin.ncol, buf + UBUFSIZ); 2271 eol = min (eol + ncol, buf + UBUFSIZ);
2691 } 2272 }
2692 2273
2693 } 2274 }
2694 2275
2695 seq_begin = cmdbuf_ptr; 2276 seq_begin = cmdbuf_ptr;
2696 ch = next_char (); 2277 ch = next_char ();
2697 } 2278 }
2698 2279
2280 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2281 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2699 scr_add_lines (buf, nlines, str - buf); 2282 scr_add_lines (buf, str - buf, nlines);
2700 2283
2701 /* 2284 /*
2702 * If there have been a lot of new lines, then update the screen 2285 * If there have been a lot of new lines, then update the screen
2703 * What the heck I'll cheat and only refresh less than every page-full. 2286 * What the heck we'll cheat and only refresh less than every page-full.
2704 * the number of pages between refreshes is refresh_limit, which 2287 * if skipScroll is enabled.
2705 * is incremented here because we must be doing flat-out scrolling.
2706 */ 2288 */
2707 if (refreshnow) 2289 if (refreshnow)
2708 { 2290 {
2709 if ((options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2710 refresh_limit++;
2711 else
2712 {
2713 flag = true; 2291 flag = true;
2714 scr_refresh (refresh_type); 2292 scr_refresh ();
2715 } 2293 want_refresh = 1;
2716 } 2294 }
2717 2295
2718 } 2296 }
2719 else 2297 else
2720 { 2298 {
… …
2731 2309
2732 ch = NOCHAR; 2310 ch = NOCHAR;
2733 } 2311 }
2734 } 2312 }
2735 2313
2314 refresh_check ();
2315
2736 return flag; 2316 return flag;
2737} 2317}
2738 2318
2739// read the next octet
2740unicode_t
2741rxvt_term::next_octet ()
2742{
2743 return cmdbuf_ptr < cmdbuf_endp
2744 ? *cmdbuf_ptr++
2745 : NOCHAR;
2746}
2747
2748// read the next character 2319// read the next character
2749unicode_t 2320wchar_t
2750rxvt_term::next_char () 2321rxvt_term::next_char () NOTHROW
2751{ 2322{
2752 while (cmdbuf_ptr < cmdbuf_endp) 2323 while (cmdbuf_ptr < cmdbuf_endp)
2753 { 2324 {
2754 // assume 7-bit to be ascii ALWAYS 2325 // assume 7-bit to be ascii ALWAYS
2755 if (*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2326 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
2756 return *cmdbuf_ptr++; 2327 return *cmdbuf_ptr++;
2757 2328
2758 wchar_t wc; 2329 wchar_t wc;
2759 size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2330 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2760 2331
2761 if (len == (size_t)-2) 2332 if (len == (size_t)-2)
2762 { 2333 {
2763 // the mbstate stores incomplete sequences. didn't know this :/ 2334 // the mbstate stores incomplete sequences. didn't know this :/
2764 cmdbuf_ptr = cmdbuf_endp; 2335 cmdbuf_ptr = cmdbuf_endp;
2765 break; 2336 break;
2766 } 2337 }
2767 2338
2768 if (len == (size_t)-1) 2339 if (len == (size_t)-1)
2769 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2340 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2770 2341
2771 // assume wchar == unicode 2342 // assume wchar == unicode
2772 cmdbuf_ptr += len; 2343 cmdbuf_ptr += len;
2773 return wc & UNICODE_MASK; 2344 return wc & UNICODE_MASK;
2774 } 2345 }
2775 2346
2776 return NOCHAR; 2347 return NOCHAR;
2777} 2348}
2349
2350// read the next octet
2351uint32_t
2352rxvt_term::next_octet () NOTHROW
2353{
2354 return cmdbuf_ptr < cmdbuf_endp
2355 ? (unsigned char)*cmdbuf_ptr++
2356 : NOCHAR;
2357}
2358
2359static class out_of_input out_of_input;
2778 2360
2779/* rxvt_cmd_getc () - Return next input character */ 2361/* rxvt_cmd_getc () - Return next input character */
2780/* 2362/*
2781 * Return the next input character after first passing any keyboard input 2363 * Return the next input character after first passing any keyboard input
2782 * to the command. 2364 * to the command.
2783 */ 2365 */
2784unicode_t 2366wchar_t
2785rxvt_term::cmd_getc () 2367rxvt_term::cmd_getc () THROW ((class out_of_input))
2786{ 2368{
2787 unicode_t c = next_char (); 2369 wchar_t c = next_char ();
2788 2370
2789 if (c == NOCHAR) 2371 if (c == NOCHAR)
2790 throw out_of_input; 2372 throw out_of_input;
2791 2373
2792 return c; 2374 return c;
2793} 2375}
2794 2376
2795unicode_t 2377uint32_t
2796rxvt_term::cmd_get8 () 2378rxvt_term::cmd_get8 () THROW ((class out_of_input))
2797{ 2379{
2798 unicode_t c = next_octet (); 2380 uint32_t c = next_octet ();
2799 2381
2800 if (c == NOCHAR) 2382 if (c == NOCHAR)
2801 throw out_of_input; 2383 throw out_of_input;
2802 2384
2803 return c; 2385 return c;
… …
2867 { 2449 {
2868 if ((buf[len++] = cmd_getc ()) == 'i') 2450 if ((buf[len++] = cmd_getc ()) == 'i')
2869 break; /* done = 1 */ 2451 break; /* done = 1 */
2870 } 2452 }
2871 } 2453 }
2872 2454
2873 for (i = 0; i < len; i++) 2455 for (i = 0; i < len; i++)
2874 if (putc (buf[i], fd) == EOF) 2456 if (putc (buf[i], fd) == EOF)
2875 { 2457 {
2876 done = 1; 2458 done = 1;
2877 break; 2459 break;
… …
2879 } 2461 }
2880 } 2462 }
2881 2463
2882 pclose_printer (fd); 2464 pclose_printer (fd);
2883} 2465}
2884#endif /* PRINTPIPE */ 2466#endif /* PRINTPIPE */
2885/*}}} */ 2467/*}}} */
2886 2468
2887/* *INDENT-OFF* */ 2469/* *INDENT-OFF* */
2888enum { 2470enum {
2889 C1_40 = 0x40, 2471 C1_40 = 0x40,
… …
2903 case C0_ESC: 2485 case C0_ESC:
2904 process_escape_seq (); 2486 process_escape_seq ();
2905 break; 2487 break;
2906 case C0_ENQ: /* terminal Status */ 2488 case C0_ENQ: /* terminal Status */
2907 if (rs[Rs_answerbackstring]) 2489 if (rs[Rs_answerbackstring])
2908 tt_write ((const unsigned char *)rs[Rs_answerbackstring], 2490 tt_write (rs [Rs_answerbackstring], strlen (rs [Rs_answerbackstring]));
2909 (unsigned int)strlen (rs[Rs_answerbackstring]));
2910 else 2491 else
2911 tt_write ((unsigned char *)VT100_ANS, 2492 tt_write (VT100_ANS, strlen (VT100_ANS));
2912 (unsigned int)strlen (VT100_ANS));
2913 break; 2493 break;
2914 case C0_BEL: /* bell */ 2494 case C0_BEL: /* bell */
2915 scr_bell (); 2495 scr_bell ();
2916 break; 2496 break;
2917 case C0_BS: /* backspace */ 2497 case C0_BS: /* backspace */
… …
2941 process_dcs_seq (); 2521 process_dcs_seq ();
2942 break; 2522 break;
2943 case 0x9b: /* CSI */ 2523 case 0x9b: /* CSI */
2944 process_csi_seq (); 2524 process_csi_seq ();
2945 break; 2525 break;
2946 case 0x9d: /* CSI */ 2526 case 0x9d: /* OSC */
2947 process_osc_seq (); 2527 process_osc_seq ();
2948 break; 2528 break;
2949#endif 2529#endif
2950 } 2530 }
2951} 2531}
… …
3041 scr_charset_set (2, (unsigned int)cmd_getc ()); 2621 scr_charset_set (2, (unsigned int)cmd_getc ());
3042 break; 2622 break;
3043 case '+': 2623 case '+':
3044 scr_charset_set (3, (unsigned int)cmd_getc ()); 2624 scr_charset_set (3, (unsigned int)cmd_getc ());
3045 break; 2625 break;
3046#if ENABLE_FRILLS 2626#if !ENABLE_MINIMAL
3047 case '6': 2627 case '6':
3048 scr_backindex (); 2628 scr_backindex ();
3049 break; 2629 break;
3050#endif 2630#endif
3051 case '7': 2631 case '7':
3052 scr_cursor (SAVE); 2632 scr_cursor (SAVE);
3053 break; 2633 break;
3054 case '8': 2634 case '8':
3055 scr_cursor (RESTORE); 2635 scr_cursor (RESTORE);
3056 break; 2636 break;
3057#if ENABLE_FRILLS 2637#if !ENABLE_MINIMAL
3058 case '9': 2638 case '9':
3059 scr_forwardindex (); 2639 scr_forwardindex ();
3060 break; 2640 break;
3061#endif 2641#endif
3062 case '=': 2642 case '=':
… …
3072 break; 2652 break;
3073 2653
3074 /* 8.3.87: NEXT LINE */ 2654 /* 8.3.87: NEXT LINE */
3075 case C1_NEL: /* ESC E */ 2655 case C1_NEL: /* ESC E */
3076 { 2656 {
3077 unicode_t nlcr[] = { C0_LF, C0_CR }; 2657 wchar_t nlcr[] = { C0_LF, C0_CR };
3078 scr_add_lines (nlcr, 1, 2); 2658 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1);
3079 } 2659 }
3080 break; 2660 break;
3081 2661
3082 /* kidnapped escape sequence: Should be 8.3.48 */ 2662 /* kidnapped escape sequence: Should be 8.3.48 */
3083 case C1_ESA: /* ESC G */ 2663 case C1_ESA: /* ESC G */
… …
3105 process_dcs_seq (); 2685 process_dcs_seq ();
3106 break; 2686 break;
3107 2687
3108 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2688 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
3109 case C1_SCI: /* ESC Z */ 2689 case C1_SCI: /* ESC Z */
3110 tt_write ((const unsigned char *)ESCZ_ANSWER, 2690 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
3111 (unsigned int) (sizeof (ESCZ_ANSWER) - 1));
3112 break; /* steal obsolete ESC [ c */ 2691 break; /* steal obsolete ESC [ c */
3113 2692
3114 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2693 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */
3115 case C1_CSI: /* ESC [ */ 2694 case C1_CSI: /* ESC [ */
3116 process_csi_seq (); 2695 process_csi_seq ();
… …
3178rxvt_term::process_csi_seq () 2757rxvt_term::process_csi_seq ()
3179{ 2758{
3180 unicode_t ch, priv, i; 2759 unicode_t ch, priv, i;
3181 unsigned int nargs, p; 2760 unsigned int nargs, p;
3182 int n, ndef; 2761 int n, ndef;
3183 int arg[ESC_ARGS]; 2762 int arg[ESC_ARGS] = { };
3184 2763
3185 for (nargs = ESC_ARGS; nargs > 0;) 2764 nargs = 0;
3186 arg[--nargs] = 0;
3187 2765
3188 priv = 0; 2766 priv = 0;
3189 ch = cmd_getc (); 2767 ch = cmd_getc ();
3190 if (ch >= '<' && ch <= '?') 2768 if (ch >= '<' && ch <= '?')
2769 {
3191 { /* '<' '=' '>' '?' */ 2770 /* '<' '=' '>' '?' */
3192 priv = ch; 2771 priv = ch;
3193 ch = cmd_getc (); 2772 ch = cmd_getc ();
3194 } 2773 }
3195 2774
3196 /* read any numerical arguments */ 2775 /* read any numerical arguments */
… …
3225 ndef = get_byte_array_bit (csi_defaults, i); 2804 ndef = get_byte_array_bit (csi_defaults, i);
3226 for (p = 0; p < nargs; p++) 2805 for (p = 0; p < nargs; p++)
3227 if (arg[p] == -1) 2806 if (arg[p] == -1)
3228 arg[p] = ndef; 2807 arg[p] = ndef;
3229 2808
3230#ifdef DEBUG_CMD
3231 fprintf (stderr, "CSI ");
3232 for (p = 0; p < nargs; p++)
3233 fprintf (stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : "");
3234 fprintf (stderr, "%c\n", ch);
3235#endif
3236
3237 /* 2809 /*
3238 * private mode handling 2810 * private mode handling
3239 */ 2811 */
3240 if (priv) 2812 if (priv)
3241 { 2813 {
3242 switch (priv) 2814 switch (priv)
3243 { 2815 {
3244 case '>': 2816 case '>':
3245 if (ch == CSI_DA) /* secondary device attributes */ 2817 if (ch == CSI_DA) /* secondary device attributes */
3246 tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]); 2818 {
2819 // first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt,
2820 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
2821 //
2822 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
2823 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, 94 for urxvt <= 8.3, and 95 for later
2824 // versions.
2825 //
2826 tt_printf ("\033[>%d;95;0c", 'U');
2827 }
3247 break; 2828 break;
3248 case '?': 2829 case '?':
3249 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2830 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3250 process_terminal_mode (ch, priv, nargs, arg); 2831 process_terminal_mode (ch, priv, nargs, arg);
3251 break; 2832 break;
… …
3356 2937
3357 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */ 2938 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */
3358 arg[0] = -arg[0]; 2939 arg[0] = -arg[0];
3359 /* FALLTHROUGH */ 2940 /* FALLTHROUGH */
3360 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 2941 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
3361 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0); 2942 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
3362 break; 2943 break;
3363 2944
3364 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 2945 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
3365 tt_write ((const unsigned char *)VT100_ANS, 2946 tt_write (VT100_ANS, sizeof (VT100_ANS) - 1);
3366 (unsigned int) (sizeof (VT100_ANS) - 1));
3367 break; 2947 break;
3368 2948
3369 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 2949 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
3370 process_sgr_mode (nargs, arg); 2950 process_sgr_mode (nargs, arg);
3371 break; 2951 break;
… …
3378 break; 2958 break;
3379 case 6: /* CPR requested */ 2959 case 6: /* CPR requested */
3380 scr_report_position (); 2960 scr_report_position ();
3381 break; 2961 break;
3382 case 7: /* unofficial extension */ 2962 case 7: /* unofficial extension */
3383 if (options & Opt_insecure) 2963 if (option (Opt_insecure))
3384 tt_printf ("%-.250s\012", rs[Rs_display_name]); 2964 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3385 break; 2965 break;
3386 case 8: /* unofficial extension */ 2966 case 8: /* unofficial extension */
3387 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 2967 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3388 break; 2968 break;
… …
3455 break; 3035 break;
3456 case CSI_75: 3036 case CSI_75:
3457 scr_cursor (RESTORE); 3037 scr_cursor (RESTORE);
3458 break; 3038 break;
3459 3039
3460#if ENABLE_FRILLS 3040#if !ENABLE_MINIMAL
3461 case CSI_74: 3041 case CSI_74:
3462 process_window_ops (arg, nargs); 3042 process_window_ops (arg, nargs);
3463 break; 3043 break;
3464#endif 3044#endif
3465 3045
… …
3472 break; 3052 break;
3473 } 3053 }
3474} 3054}
3475/*}}} */ 3055/*}}} */
3476 3056
3477#if ENABLE_FRILLS 3057#if !ENABLE_MINIMAL
3478/* ARGSUSED */ 3058/* ARGSUSED */
3479void 3059void
3480rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3060rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3481{ 3061{
3482 int x, y; 3062 int x, y;
3483 XWindowAttributes wattr; 3063 XWindowAttributes wattr;
3484 Window wdummy; 3064 Window wdummy;
3485 dDisp; 3065
3066 dLocal (Display *, dpy);
3486 3067
3487 if (nargs == 0) 3068 if (nargs == 0)
3488 return; 3069 return;
3489 3070
3490 switch (args[0]) 3071 switch (args[0])
3491 { 3072 {
3492 /* 3073 /*
3493 * commands 3074 * commands
3494 */ 3075 */
3495 case 1: /* deiconify window */ 3076 case 1: /* deiconify window */
3496 XMapWindow (disp, TermWin.parent[0]); 3077 XMapWindow (dpy, parent[0]);
3497 break; 3078 break;
3498 case 2: /* iconify window */ 3079 case 2: /* iconify window */
3499 XIconifyWindow (disp, TermWin.parent[0], display->screen); 3080 XIconifyWindow (dpy, parent[0], display->screen);
3500 break; 3081 break;
3501 case 3: /* set position (pixels) */ 3082 case 3: /* set position (pixels) */
3502 XMoveWindow (disp, TermWin.parent[0], args[1], args[2]); 3083 XMoveWindow (dpy, parent[0], args[1], args[2]);
3503 break; 3084 break;
3504 case 4: /* set size (pixels) */ 3085 case 4: /* set size (pixels) */
3505 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3086 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3506 break; 3087 break;
3507 case 5: /* raise window */ 3088 case 5: /* raise window */
3508 XRaiseWindow (disp, TermWin.parent[0]); 3089 XRaiseWindow (dpy, parent[0]);
3509 break; 3090 break;
3510 case 6: /* lower window */ 3091 case 6: /* lower window */
3511 XLowerWindow (disp, TermWin.parent[0]); 3092 XLowerWindow (dpy, parent[0]);
3512 break; 3093 break;
3513 case 7: /* refresh window */ 3094 case 7: /* refresh window */
3514 scr_touch (true); 3095 scr_touch (true);
3515 break; 3096 break;
3516 case 8: /* set size (chars) */ 3097 case 8: /* set size (chars) */
3517 set_widthheight ((unsigned int) (args[2] * TermWin.fwidth), 3098 set_widthheight ((unsigned int) (args[2] * fwidth),
3518 (unsigned int) (args[1] * TermWin.fheight)); 3099 (unsigned int) (args[1] * fheight));
3519 break; 3100 break;
3520 3101
3521 //case 9: NYI, TODO, restore maximized window or maximize window 3102 //case 9: NYI, TODO, restore maximized window or maximize window
3522 default: 3103 default:
3523 if (args[0] >= 24) /* set height (chars) */ 3104 if (args[0] >= 24) /* set height (chars) */
3524 set_widthheight ((unsigned int)TermWin.width, 3105 set_widthheight ((unsigned int)width,
3525 (unsigned int) (args[1] * TermWin.fheight)); 3106 (unsigned int) (args[1] * fheight));
3526 break; 3107 break;
3527
3528 3108
3529 /* 3109 /*
3530 * reports - some output format copied from XTerm 3110 * reports - some output format copied from XTerm
3531 */ 3111 */
3532 case 11: /* report window state */ 3112 case 11: /* report window state */
3533 XGetWindowAttributes (disp, TermWin.parent[0], &wattr); 3113 XGetWindowAttributes (dpy, parent[0], &wattr);
3534 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3114 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3535 break; 3115 break;
3536 case 13: /* report window position */ 3116 case 13: /* report window position */
3537 XGetWindowAttributes (disp, TermWin.parent[0], &wattr); 3117 XGetWindowAttributes (dpy, parent[0], &wattr);
3538 XTranslateCoordinates (disp, TermWin.parent[0], wattr.root, 3118 XTranslateCoordinates (dpy, parent[0], wattr.root,
3539 -wattr.border_width, -wattr.border_width, 3119 -wattr.border_width, -wattr.border_width,
3540 &x, &y, &wdummy); 3120 &x, &y, &wdummy);
3541 tt_printf ("\033[3;%d;%dt", x, y); 3121 tt_printf ("\033[3;%d;%dt", x, y);
3542 break; 3122 break;
3543 case 14: /* report window size (pixels) */ 3123 case 14: /* report window size (pixels) */
3544 XGetWindowAttributes (disp, TermWin.parent[0], &wattr); 3124 XGetWindowAttributes (dpy, parent[0], &wattr);
3545 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3125 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3546 break; 3126 break;
3547 case 18: /* report text area size (chars) */ 3127 case 18: /* report text area size (chars) */
3548 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); 3128 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3549 break; 3129 break;
3550 case 19: /* report window size (chars) */ 3130 case 19: /* report window size (chars) */
3551 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol); 3131 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3552 break; 3132 break;
3553 case 20: /* report icon label */ 3133 case 20: /* report icon label */
3554 { 3134 {
3555 char *s; 3135 char *s;
3556 XGetIconName (disp, TermWin.parent[0], &s); 3136 XGetIconName (dpy, parent[0], &s);
3557 tt_printf ("\033]L%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3137 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3558 XFree (s); 3138 XFree (s);
3559 } 3139 }
3560 break; 3140 break;
3561 case 21: /* report window title */ 3141 case 21: /* report window title */
3562 { 3142 {
3563 char *s; 3143 char *s;
3564 XFetchName (disp, TermWin.parent[0], &s); 3144 XFetchName (dpy, parent[0], &s);
3565 tt_printf ("\033]l%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3145 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3566 XFree (s); 3146 XFree (s);
3567 } 3147 }
3568 break; 3148 break;
3569 } 3149 }
3570} 3150}
… …
3573/*----------------------------------------------------------------------*/ 3153/*----------------------------------------------------------------------*/
3574/* 3154/*
3575 * get input up until STRING TERMINATOR (or BEL) 3155 * get input up until STRING TERMINATOR (or BEL)
3576 * ends_how is terminator used. returned input must be free()'d 3156 * ends_how is terminator used. returned input must be free()'d
3577 */ 3157 */
3578unsigned char * 3158char *
3579rxvt_term::get_to_st (unicode_t &ends_how) 3159rxvt_term::get_to_st (unicode_t &ends_how)
3580{ 3160{
3581 unicode_t ch; 3161 unicode_t ch;
3582 bool seen_esc = false; 3162 bool seen_esc = false;
3583 unsigned int n = 0; 3163 unsigned int n = 0;
… …
3597 seen_esc = true; 3177 seen_esc = true;
3598 continue; 3178 continue;
3599 } 3179 }
3600 else if (ch == C0_BEL || ch == CHAR_ST) 3180 else if (ch == C0_BEL || ch == CHAR_ST)
3601 break; 3181 break;
3182 else if (ch == C0_SYN)
3183 ch = cmd_get8 ();
3602 else if (ch < 0x20) 3184 else if (ch < 0x20)
3603 return NULL; /* other control character - exit */ 3185 return NULL; /* other control character - exit */
3604 3186
3605 seen_esc = false; 3187 seen_esc = false;
3606 3188
3607 if (n >= STRING_MAX - 1) 3189 if (n >= STRING_MAX - 1)
3608 // stop at some sane length 3190 // stop at some sane length
3609 return NULL; 3191 return NULL;
3610 3192
3611 if (ch == C0_SYN)
3612 string[n++] = cmd_get8 ();
3613 else
3614 string[n++] = ch; 3193 string[n++] = ch;
3615 } 3194 }
3616 3195
3617 string[n++] = '\0'; 3196 string[n++] = '\0';
3618 3197
3619 ends_how = (ch == 0x5c ? C0_ESC : ch); 3198 ends_how = (ch == 0x5c ? C0_ESC : ch);
3620 3199
3621 return (unsigned char *)rxvt_wcstombs (string); 3200 return rxvt_wcstombs (string);
3622} 3201}
3623 3202
3624/*----------------------------------------------------------------------*/ 3203/*----------------------------------------------------------------------*/
3625/* 3204/*
3626 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3205 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3627 */ 3206 */
3628void 3207void
3629rxvt_term::process_dcs_seq () 3208rxvt_term::process_dcs_seq ()
3630{ 3209{
3631 unsigned char *s; 3210 char *s;
3632 unicode_t eh; 3211 unicode_t eh;
3633 3212
3634 /* 3213 /*
3635 * Not handled yet 3214 * Not handled yet
3636 */ 3215 */
… …
3655 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3234 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3656 arg = arg * 10 + (ch - '0'); 3235 arg = arg * 10 + (ch - '0');
3657 3236
3658 if (ch == ';') 3237 if (ch == ';')
3659 { 3238 {
3660 unsigned char *s = get_to_st (eh); 3239 char *s = get_to_st (eh);
3661 3240
3662 if (s) 3241 if (s)
3663 { 3242 {
3664 process_xterm_seq (arg, (char *)s, eh); 3243 process_xterm_seq (arg, s, eh);
3665 free (s); 3244 free (s);
3666 } 3245 }
3667 } 3246 }
3668} 3247}
3669 3248
3670void 3249void
3671rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp) 3250rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3672{ 3251{
3673 if (str[0] == '?' && !str[1]) 3252 if (str[0] == '?' && !str[1])
3674 { 3253 {
3675 unsigned short r, g, b; 3254 rgba c;
3676 pix_colors_focused[color].get (display, r, g, b); 3255 pix_colors_focused[color].get (c);
3256
3257#if XFT
3258 if (c.a != rgba::MAX_CC)
3259 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp);
3260 else
3261#endif
3677 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp); 3262 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp);
3678 } 3263 }
3679 else 3264 else
3680 set_window_color (color, str); 3265 set_window_color (color, str);
3681} 3266}
3682 3267
3683/* 3268/*
3684 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3269 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3685 */ 3270 */
3686void 3271void
3687rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp) 3272rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3688{ 3273{
3689 int changed = 0;
3690 int color; 3274 int color;
3691 char *buf, *name; 3275 char *buf, *name;
3692 bool query = str[0] == '?' && !str[1]; 3276 bool query = str[0] == '?' && !str[1];
3693 int saveop = op; 3277 int saveop = op;
3694 dDisp; 3278
3279 dLocal (Display *, dpy);
3695 3280
3696 assert (str != NULL); 3281 assert (str != NULL);
3282
3283 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END)))
3284 return;
3285
3697 switch (op) 3286 switch (op)
3698 { 3287 {
3699 case XTerm_name: 3288 case XTerm_name:
3700 set_title (str); 3289 set_title (str);
3701 /* FALLTHROUGH */ 3290 /* FALLTHROUGH */
… …
3715 unsigned long bytes_after; 3304 unsigned long bytes_after;
3716 unsigned char *value = 0; 3305 unsigned char *value = 0;
3717 const char *str = ""; 3306 const char *str = "";
3718 3307
3719 if (prop 3308 if (prop
3720 && XGetWindowProperty (disp, TermWin.parent[0], 3309 && XGetWindowProperty (dpy, parent[0],
3721 prop, 0, 1<<16, 0, AnyPropertyType, 3310 prop, 0, 1<<16, 0, AnyPropertyType,
3722 &actual_type, &actual_format, 3311 &actual_type, &actual_format,
3723 &nitems, &bytes_after, &value) == Success 3312 &nitems, &bytes_after, &value) == Success
3724 && actual_type != None 3313 && actual_type != None
3725 && actual_format == 8) 3314 && actual_format == 8)
3726 str = (const char *)(value); 3315 str = (const char *)(value);
3727 3316
3728 tt_printf ("\033]%d;%s%c", XTerm_property, str, resp); 3317 tt_printf ("\033]%d;%s%c", op, str, resp);
3729 3318
3730 XFree (value); 3319 XFree (value);
3731 } 3320 }
3732 else 3321 else
3733 { 3322 {
… …
3737 { 3326 {
3738 *eq = 0; 3327 *eq = 0;
3739 set_utf8_property (display->atom (str), eq + 1); 3328 set_utf8_property (display->atom (str), eq + 1);
3740 } 3329 }
3741 else 3330 else
3742 XDeleteProperty (disp, TermWin.parent[0], 3331 XDeleteProperty (dpy, parent[0],
3743 display->atom (str)); 3332 display->atom (str));
3744 } 3333 }
3745 break; 3334 break;
3746 3335
3747 case XTerm_Color: 3336 case XTerm_Color:
… …
3749 { 3338 {
3750 if ((name = strchr (buf, ';')) == NULL) 3339 if ((name = strchr (buf, ';')) == NULL)
3751 break; 3340 break;
3752 3341
3753 *name++ = '\0'; 3342 *name++ = '\0';
3754 color = atoi (buf); 3343 color = atoi (buf) + minCOLOR;
3755 3344
3756 if (color < 0 || color >= TOTAL_COLORS) 3345 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
3757 break; 3346 break;
3758 3347
3759 if ((buf = strchr (name, ';')) != NULL) 3348 if ((buf = strchr (name, ';')) != NULL)
3760 *buf++ = '\0'; 3349 *buf++ = '\0';
3761 3350
3762 if (name[0] == '?' && !name[1]) 3351 process_color_seq (op, color, name, resp);
3763 {
3764 unsigned short r, g, b;
3765 pix_colors_focused[color + minCOLOR].get (display, r, g, b);
3766 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3767 }
3768 else
3769 set_window_color (color + minCOLOR, name);
3770 } 3352 }
3771 break; 3353 break;
3772 case XTerm_Color00: 3354 case XTerm_Color00:
3773 process_color_seq (XTerm_Color00, Color_fg, str, resp); 3355 process_color_seq (op, Color_fg, str, resp);
3774 break; 3356 break;
3775 case XTerm_Color01: 3357 case XTerm_Color01:
3776 process_color_seq (XTerm_Color00, Color_bg, str, resp); 3358 process_color_seq (op, Color_bg, str, resp);
3777 break; 3359 break;
3778#ifndef NO_CURSORCOLOR 3360#ifndef NO_CURSORCOLOR
3779 case XTerm_Color_cursor: 3361 case XTerm_Color_cursor:
3780 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); 3362 process_color_seq (op, Color_cursor, str, resp);
3781 break; 3363 break;
3782#endif 3364#endif
3783 case XTerm_Color_pointer_fg: 3365 case XTerm_Color_pointer_fg:
3784 process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp); 3366 process_color_seq (op, Color_pointer_fg, str, resp);
3785 break; 3367 break;
3786 case XTerm_Color_pointer_bg: 3368 case XTerm_Color_pointer_bg:
3787 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); 3369 process_color_seq (op, Color_pointer_bg, str, resp);
3788 break; 3370 break;
3789#ifndef NO_BOLD_UNDERLINE_REVERSE 3371#ifndef NO_BOLD_UNDERLINE_REVERSE
3790 case XTerm_Color_BD:
3791 process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3792 break;
3793 case XTerm_Color_UL:
3794 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3795 break;
3796 case XTerm_Color_RV: 3372 case XTerm_Color_RV:
3797 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3373 process_color_seq (op, Color_RV, str, resp);
3374 break;
3375 case Rxvt_Color_BD:
3376 case URxvt_Color_BD:
3377 process_color_seq (op, Color_BD, str, resp);
3378 break;
3379 case Rxvt_Color_UL:
3380 case URxvt_Color_UL:
3381 process_color_seq (op, Color_UL, str, resp);
3798 break; 3382 break;
3799 case URxvt_Color_IT: 3383 case URxvt_Color_IT:
3800 process_color_seq (URxvt_Color_IT, Color_IT, str, resp); 3384 process_color_seq (op, Color_IT, str, resp);
3801 break; 3385 break;
3802#endif 3386#endif
3803#if TRANSPARENT && TINTING 3387#if ENABLE_TRANSPARENCY
3804 case URxvt_Color_tint: 3388 case URxvt_Color_tint:
3805 process_color_seq (URxvt_Color_tint, Color_tint, str, resp); 3389 process_color_seq (op, Color_tint, str, resp);
3806 check_our_parents (); 3390 {
3807 if (am_transparent) 3391 bool changed = false;
3808 want_full_refresh = want_refresh = 1; 3392 if (ISSET_PIXCOLOR (Color_tint))
3809 break; 3393 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]);
3810#endif 3394 else
3395 changed = bgPixmap.unset_tint ();
3396 if (changed)
3397 update_background ();
3398 }
3811 3399
3400 break;
3401#endif
3402
3403#if BG_IMAGE_FROM_FILE
3812 case XTerm_Pixmap: 3404 case Rxvt_Pixmap:
3813 if (*str != ';') 3405 if (!strcmp (str, "?"))
3814 { 3406 {
3815#if XPM_BACKGROUND 3407 char str[256];
3816 scale_pixmap (""); /* reset to default scaling */ 3408
3817 set_bgPixmap (str); /* change pixmap */ 3409 sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */
3818#endif 3410 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767),
3819 scr_touch (true); 3411 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767));
3412 process_xterm_seq (XTerm_title, str, CHAR_ST);
3820 } 3413 }
3821 while ((str = strchr (str, ';')) != NULL) 3414 else
3822 { 3415 {
3416 int changed = 0;
3417
3418 if (*str != ';')
3419 {
3420 /* reset to default scaling :*/
3421 bgPixmap.unset_geometry ();
3422 if (bgPixmap.set_file (str)) /* change pixmap */
3423 changed++;
3424 str = strchr (str, ';');
3425 if (str == NULL)
3426 bgPixmap.set_defaultGeometry ();
3427 }
3428 while (str)
3429 {
3823 str++; 3430 str++;
3824#if XPM_BACKGROUND 3431 if (bgPixmap.set_geometry (str))
3825 changed += scale_pixmap (str); 3432 changed++;
3826#endif 3433 str = strchr (str, ';');
3434 }
3435 if (changed)
3436 update_background ();
3827 } 3437 }
3828
3829 if (changed)
3830 {
3831#ifdef XPM_BACKGROUND
3832 resize_pixmap ();
3833#endif
3834 scr_touch (true);
3835 }
3836 break; 3438 break;
3439#endif
3837 3440
3838 case XTerm_restoreFG: 3441 case Rxvt_restoreFG:
3839 set_window_color (Color_fg, str); 3442 set_window_color (Color_fg, str);
3840 break; 3443 break;
3841 case XTerm_restoreBG: 3444 case Rxvt_restoreBG:
3842 set_window_color (Color_bg, str); 3445 set_window_color (Color_bg, str);
3843 break; 3446 break;
3844 3447
3845 case XTerm_logfile: 3448 case XTerm_logfile:
3846 // TODO, when secure mode? 3449 // TODO, when secure mode?
3847 break; 3450 break;
3848 3451
3849#ifdef MENUBAR
3850 case URxvt_Menu:
3851 if (options & Opt_insecure)
3852 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3853 break;
3854#endif
3855#if 0 3452#if 0
3856 case XTerm_dumpscreen: /* no error notices */ 3453 case Rxvt_dumpscreen: /* no error notices */
3857 { 3454 {
3858 int fd; 3455 int fd;
3859 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) 3456 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3860 { 3457 {
3861 scr_dump (fd); 3458 scr_dump (fd);
… …
3872 case URxvt_italicFont: 3469 case URxvt_italicFont:
3873 case URxvt_boldItalicFont: 3470 case URxvt_boldItalicFont:
3874#endif 3471#endif
3875 if (query) 3472 if (query)
3876 tt_printf ("\33]%d;%-.250s%c", saveop, 3473 tt_printf ("\33]%d;%-.250s%c", saveop,
3877 (options & Opt_insecure) && TermWin.fontset[op - URxvt_font]->fontdesc 3474 option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3878 ? TermWin.fontset[op - URxvt_font]->fontdesc : "", 3475 ? fontset[op - URxvt_font]->fontdesc : "",
3879 resp); 3476 resp);
3880 else 3477 else
3881 { 3478 {
3882 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3479 const char *&res = rs[Rs_font + (op - URxvt_font)];
3883 3480
… …
3885 allocated.push_back ((void *)res); 3482 allocated.push_back ((void *)res);
3886 set_fonts (); 3483 set_fonts ();
3887 } 3484 }
3888 break; 3485 break;
3889 3486
3890#if ENABLE_FRILLS 3487 case URxvt_version:
3488 if (query)
3489 tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%c",
3490 op,
3491 rs[Rs_name], VERSION[0], VERSION[2],
3492 resp);
3493 break;
3494
3495#if !ENABLE_MINIMAL
3891 case URxvt_locale: 3496 case URxvt_locale:
3892 if (query) 3497 if (query)
3893 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, (options & Opt_insecure) ? locale : "", resp); 3498 tt_printf ("\33]%d;%-.250s%c", op, option (Opt_insecure) ? locale : "", resp);
3894 else 3499 else
3895 { 3500 {
3896 set_locale (str); 3501 set_locale (str);
3897 pty.set_utf8_mode (enc_utf8); 3502 pty->set_utf8_mode (enc_utf8);
3898 init_xlocale (); 3503 init_xlocale ();
3899 } 3504 }
3900 break; 3505 break;
3901 3506
3902 case URxvt_view_up: 3507 case URxvt_view_up:
3903 case URxvt_view_down: 3508 case URxvt_view_down:
3509 {
3904 int lines = atoi (str); 3510 int lines = atoi (str);
3905 3511
3906 if (lines) 3512 if (lines)
3907 scr_page (op == URxvt_view_up ? UP : DN, lines); 3513 scr_page (op == URxvt_view_up ? UP : DN, lines);
3908 else 3514 else
3909 {
3910 scr_erase_savelines (); 3515 scr_erase_savelines ();
3911 } 3516 }
3912 3517
3518 break;
3519#endif
3520
3521#if ENABLE_PERL
3522 case URxvt_perl:
3523 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END)))
3524 ; // no responses yet
3913 break; 3525 break;
3914#endif 3526#endif
3915 } 3527 }
3916} 3528}
3917/*----------------------------------------------------------------------*/ 3529/*----------------------------------------------------------------------*/
… …
3948 return state; 3560 return state;
3949} 3561}
3950 3562
3951/* we're not using priv _yet_ */ 3563/* we're not using priv _yet_ */
3952void 3564void
3953rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg) 3565rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg)
3954{ 3566{
3955 unsigned int i, j; 3567 unsigned int i, j;
3956 int state; 3568 int state;
3957 3569
3958 static const struct 3570 static const struct
3959 { 3571 {
3960 const int argval; 3572 const int argval;
3961 const unsigned long bit; 3573 const unsigned long bit;
3962 }
3963
3964 argtopriv[] = { 3574 } argtopriv[] = {
3965 { 1, PrivMode_aplCUR }, 3575 { 1, PrivMode_aplCUR },
3966 { 2, PrivMode_vt52 }, 3576 { 2, PrivMode_vt52 },
3967 { 3, PrivMode_132 }, 3577 { 3, PrivMode_132 },
3968 { 4, PrivMode_smoothScroll }, 3578 { 4, PrivMode_smoothScroll },
3969 { 5, PrivMode_rVideo }, 3579 { 5, PrivMode_rVideo },
3970 { 6, PrivMode_relOrigin }, 3580 { 6, PrivMode_relOrigin },
3971 { 7, PrivMode_Autowrap }, 3581 { 7, PrivMode_Autowrap },
3972 // 8, bi-directional support mode 3582 // 8, bi-directional support mode
3973 { 9, PrivMode_MouseX10 }, 3583 { 9, PrivMode_MouseX10 },
3974#ifdef menuBar_esc
3975 { menuBar_esc, PrivMode_menuBar },
3976#endif
3977 // 18, 19 printing-related 3584 // 18, 19 printing-related
3978 { 25, PrivMode_VisibleCursor }, 3585 { 25, PrivMode_VisibleCursor },
3979#ifdef scrollBar_esc 3586#ifdef scrollBar_esc
3980 { scrollBar_esc, PrivMode_scrollBar }, 3587 { scrollBar_esc, PrivMode_scrollBar },
3981#endif 3588#endif
… …
3988 { 66, PrivMode_aplKP }, 3595 { 66, PrivMode_aplKP },
3989#ifndef NO_BACKSPACE_KEY 3596#ifndef NO_BACKSPACE_KEY
3990 { 67, PrivMode_BackSpace }, 3597 { 67, PrivMode_BackSpace },
3991#endif 3598#endif
3992 { 1000, PrivMode_MouseX11 }, 3599 { 1000, PrivMode_MouseX11 },
3993 // 1001 Use Hilite Mouse Tracking. NYI, TODO 3600 { 1002, PrivMode_MouseBtnEvent },
3994 // 1002 Use Cell Motion Mouse Tracking. NYI, TODO 3601 { 1003, PrivMode_MouseAnyEvent },
3995 // 1003 Use All Motion Mouse Tracking. NYI, TODO
3996 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3602 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3997 { 1011, PrivMode_Keypress }, // rxvt extension 3603 { 1011, PrivMode_Keypress }, // rxvt extension
3998 // 1035 enable modifiers for alt, numlock NYI 3604 // 1035 enable modifiers for alt, numlock NYI
3999 // 1036 send ESC for meta keys NYI 3605 // 1036 send ESC for meta keys NYI
4000 // 1037 send DEL for keypad delete NYI 3606 // 1037 send DEL for keypad delete NYI
… …
4026 } 3632 }
4027 3633
4028 /* extra handling for values with state unkept */ 3634 /* extra handling for values with state unkept */
4029 switch (arg[i]) 3635 switch (arg[i])
4030 { 3636 {
3637#if ENABLE_STYLES
3638 case 1021:
3639 set_option (Opt_intensityStyles, mode);
3640
3641 scr_touch (true);
3642 break;
3643#endif
4031 case 1048: /* alternative cursor save */ 3644 case 1048: /* alternative cursor save */
4032 case 1049: 3645 case 1049:
4033 if (options & Opt_secondaryScreen) 3646 if (option (Opt_secondaryScreen))
4034 if (mode == 0) 3647 if (mode == 0)
4035 scr_cursor (RESTORE); 3648 scr_cursor (RESTORE);
4036 else if (mode == 1) 3649 else if (mode == 1)
4037 scr_cursor (SAVE); 3650 scr_cursor (SAVE);
4038 break; 3651 break;
… …
4050 */ 3663 */
4051 PrivMode (1, PrivMode_vt52); 3664 PrivMode (1, PrivMode_vt52);
4052 break; 3665 break;
4053 case 3: /* 80/132 */ 3666 case 3: /* 80/132 */
4054 if (priv_modes & PrivMode_132OK) 3667 if (priv_modes & PrivMode_132OK)
4055 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height); 3668 set_widthheight (((state ? 132 : 80) * fwidth), height);
4056 break; 3669 break;
4057 case 4: /* smooth scrolling */ 3670 case 4: /* smooth scrolling */
4058 if (state)
4059 options &= ~Opt_jumpScroll;
4060 else
4061 options |= Opt_jumpScroll; 3671 set_option (Opt_jumpScroll, !state);
4062 break; 3672 break;
4063 case 5: /* reverse video */ 3673 case 5: /* reverse video */
4064 scr_rvideo_mode (state); 3674 scr_rvideo_mode (state);
4065 break; 3675 break;
4066 case 6: /* relative/absolute origins */ 3676 case 6: /* relative/absolute origins */
… …
4070 scr_autowrap (state); 3680 scr_autowrap (state);
4071 break; 3681 break;
4072 /* case 8: - auto repeat, can't do on a per window basis */ 3682 /* case 8: - auto repeat, can't do on a per window basis */
4073 case 9: /* X10 mouse reporting */ 3683 case 9: /* X10 mouse reporting */
4074 if (state) /* orthogonal */ 3684 if (state) /* orthogonal */
4075 priv_modes &= ~PrivMode_MouseX11; 3685 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
4076 break; 3686 break;
4077#ifdef menuBar_esc
4078 case menuBar_esc:
4079#ifdef MENUBAR
4080 map_menuBar (state);
4081#endif
4082 break;
4083#endif
4084#ifdef scrollBar_esc 3687#ifdef scrollBar_esc
4085 case scrollBar_esc: 3688 case scrollBar_esc:
4086 if (scrollbar_mapping (state)) 3689 if (scrollbar_mapping (state))
4087 { 3690 {
4088 resize_all_windows (0, 0, 0); 3691 resize_all_windows (0, 0, 0);
… …
4100 break; 3703 break;
4101 /* case 66: - application key pad */ 3704 /* case 66: - application key pad */
4102 /* case 67: - backspace key */ 3705 /* case 67: - backspace key */
4103 case 1000: /* X11 mouse reporting */ 3706 case 1000: /* X11 mouse reporting */
4104 if (state) /* orthogonal */ 3707 if (state) /* orthogonal */
4105 priv_modes &= ~PrivMode_MouseX10; 3708 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
4106 break; 3709 break;
4107#if 0
4108 case 1001: 3710 case 1002:
4109 break; /* X11 mouse highlighting */ 3711 case 1003:
4110#endif 3712 if (state)
3713 {
3714 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3715 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3716 vt_emask_mouse = PointerMotionMask;
3717 }
3718 else
3719 vt_emask_mouse = NoEventMask;
3720 vt_select_input ();
3721 break;
4111 case 1010: /* scroll to bottom on TTY output inhibit */ 3722 case 1010: /* scroll to bottom on TTY output inhibit */
4112 if (state)
4113 options &= ~Opt_scrollTtyOutput;
4114 else
4115 options |= Opt_scrollTtyOutput; 3723 set_option (Opt_scrollTtyOutput, !state);
4116 break; 3724 break;
4117 case 1011: /* scroll to bottom on key press */ 3725 case 1011: /* scroll to bottom on key press */
4118 if (state)
4119 options |= Opt_scrollTtyKeypress; 3726 set_option (Opt_scrollTtyKeypress, state);
4120 else
4121 options &= ~Opt_scrollTtyKeypress;
4122 break; 3727 break;
4123 case 1047: /* secondary screen w/ clearing last */ 3728 case 1047: /* secondary screen w/ clearing last */
4124 if (options & Opt_secondaryScreen) 3729 if (option (Opt_secondaryScreen))
4125 if (current_screen != PRIMARY) 3730 if (current_screen != PRIMARY)
4126 scr_erase_screen (2); 3731 scr_erase_screen (2);
4127 scr_change_screen (state); 3732 scr_change_screen (state);
4128 break; 3733 break;
4129 case 1049: /* secondary screen w/ clearing first */ 3734 case 1049: /* secondary screen w/ clearing first */
4130 scr_change_screen (state); 3735 scr_change_screen (state);
4131 if (options & Opt_secondaryScreen) 3736 if (option (Opt_secondaryScreen))
4132 if (current_screen != PRIMARY) 3737 if (current_screen != PRIMARY)
4133 scr_erase_screen (2); 3738 scr_erase_screen (2);
4134 break; 3739 break;
4135 default: 3740 default:
4136 break; 3741 break;
… …
4264 scr_color (Color_bg, Color_bg); 3869 scr_color (Color_bg, Color_bg);
4265 break; 3870 break;
4266 3871
4267 //case 50: // not variable spacing 3872 //case 50: // not variable spacing
4268 3873
4269#ifndef NO_BRIGHTCOLOR 3874#if !ENABLE_MINIMAL
4270 case 90: 3875 case 90:
4271 case 91: /* set bright fg color */ 3876 case 91: /* set bright fg color */
4272 case 92: 3877 case 92:
4273 case 93: 3878 case 93:
4274 case 94: 3879 case 94:
… …
4286 case 106: 3891 case 106:
4287 case 107: 3892 case 107:
4288 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg); 3893 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);
4289 break; 3894 break;
4290#endif 3895#endif
4291
4292 } 3896 }
4293 } 3897 }
4294} 3898}
4295/*}}} */ 3899/*}}} */
4296 3900
… …
4299rxvt_term::process_graphics () 3903rxvt_term::process_graphics ()
4300{ 3904{
4301 unicode_t ch, cmd = cmd_getc (); 3905 unicode_t ch, cmd = cmd_getc ();
4302 3906
4303 if (cmd == 'Q') 3907 if (cmd == 'Q')
3908 {
4304 { /* query graphics */ 3909 /* query graphics */
4305 tt_printf ("\033G0\012"); /* no graphics */ 3910 tt_printf ("\033G0\012"); /* no graphics */
4306 return; 3911 return;
4307 } 3912 }
4308 /* swallow other graphics sequences until terminating ':' */ 3913 /* swallow other graphics sequences until terminating ':' */
4309 do 3914 do
… …
4320 */ 3925 */
4321void 3926void
4322rxvt_term::tt_printf (const char *fmt,...) 3927rxvt_term::tt_printf (const char *fmt,...)
4323{ 3928{
4324 va_list arg_ptr; 3929 va_list arg_ptr;
4325 unsigned char buf[256]; 3930 char buf[256];
4326 3931
4327 va_start (arg_ptr, fmt); 3932 va_start (arg_ptr, fmt);
4328 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 3933 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
4329 va_end (arg_ptr); 3934 va_end (arg_ptr);
4330 tt_write (buf, strlen (buf)); 3935 tt_write (buf, strlen (buf));
… …
4335 * or generated by us in response to a query ESC sequence. 3940 * or generated by us in response to a query ESC sequence.
4336 */ 3941 */
4337const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 3942const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4338 3943
4339void 3944void
4340rxvt_term::tt_write (const unsigned char *data, unsigned int len) 3945rxvt_term::tt_write (const char *data, unsigned int len)
4341{ 3946{
3947 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
3948 return;
3949
3950 if (pty->pty < 0)
3951 return;
3952
4342 if (v_buflen == 0) 3953 if (v_buflen == 0)
4343 { 3954 {
4344 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE)); 3955 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
4345 3956
4346 if ((unsigned int)written == len) 3957 if ((unsigned int)written == len)
4347 return; 3958 return;
4348 3959
4349 data += written; 3960 data += written;
4350 len -= written; 3961 len -= written;
4351 } 3962 }
4352 3963
4353 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len); 3964 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
4354 3965
4355 memcpy (v_buffer + v_buflen, data, len); 3966 memcpy (v_buffer + v_buflen, data, len);
4356 v_buflen += len; 3967 v_buflen += len;
4357 3968
4358 pty_ev.set (EVENT_READ | EVENT_WRITE); 3969 pty_ev.set (ev::READ | ev::WRITE);
4359} 3970}
4360 3971
4361void rxvt_term::pty_write () 3972void rxvt_term::pty_write ()
4362{ 3973{
4363 int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE)); 3974 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4364 3975
4365 if (written > 0) 3976 if (written > 0)
4366 { 3977 {
4367 v_buflen -= written; 3978 v_buflen -= written;
4368 3979
4369 if (v_buflen == 0) 3980 if (v_buflen == 0)
4370 { 3981 {
4371 free (v_buffer); 3982 free (v_buffer);
4372 v_buffer = 0; 3983 v_buffer = 0;
4373 v_buflen = 0;
4374 3984
4375 pty_ev.set (EVENT_READ); 3985 pty_ev.set (ev::READ);
4376 return; 3986 return;
4377 } 3987 }
4378 3988
4379 memmove (v_buffer, v_buffer + written, v_buflen); 3989 memmove (v_buffer, v_buffer + written, v_buflen);
4380 } 3990 }
4381 else if (written != -1 || (errno != EAGAIN && errno != EINTR)) 3991 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4382 // original code just ignores this... 3992 pty_ev.set (ev::READ);
4383 destroy ();
4384} 3993}
4385 3994
4386/*----------------------- end-of-file (C source) -----------------------*/ 3995/*----------------------- end-of-file (C source) -----------------------*/
4387 3996

Diff Legend

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