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.206 by root, Thu Aug 11 02:05:07 2005 UTC vs.
Revision 1.377 by root, Fri Dec 14 02:22:24 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
956void 1046void
957rxvt_term::check_cb (check_watcher &w) 1047rxvt_term::prepare_cb (ev::prepare &w, int revents)
958{ 1048{
959 SET_R (this); 1049 make_current ();
960 SET_LOCALE (locale);
961 1050
962 display->flush (); 1051 display->flush ();
963 1052
964 if (want_refresh && !flush_ev.active) 1053 if (want_refresh && !flush_ev.is_active ())
965 flush_ev.start (NOW + 0.01); 1054 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally
966} 1055}
967 1056
968void 1057void
969rxvt_term::flush_cb (time_watcher &w) 1058rxvt_term::flush_cb (ev::timer &w, int revents)
970{ 1059{
971 SET_R (this); 1060 make_current ();
972 SET_LOCALE (locale);
973 1061
974 refresh_limit = 1;
975 refresh_count = 0; 1062 refresh_count = 0;
976 flush (); 1063 flush ();
977} 1064}
978 1065
979#ifdef CURSOR_BLINK 1066#ifdef CURSOR_BLINK
980void 1067void
981rxvt_term::cursor_blink_cb (time_watcher &w) 1068rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
982{ 1069{
983 hidden_cursor = !hidden_cursor; 1070 hidden_cursor = !hidden_cursor;
984 want_refresh = 1; 1071 want_refresh = 1;
985
986 w.start (w.at + BLINK_INTERVAL);
987} 1072}
988#endif 1073#endif
989 1074
990#ifdef TEXT_BLINK 1075#ifdef TEXT_BLINK
991void 1076void
992rxvt_term::text_blink_cb (time_watcher &w) 1077rxvt_term::text_blink_cb (ev::timer &w, int revents)
993{ 1078{
994 if (scr_refresh_rend (RS_Blink, RS_Blink)) 1079 if (scr_refresh_rend (RS_Blink, RS_Blink))
995 { 1080 {
996 hidden_text = !hidden_text; 1081 hidden_text = !hidden_text;
997 want_refresh = 1; 1082 want_refresh = 1;
998 w.start (w.at + TEXT_BLINK_INTERVAL);
999 } 1083 }
1084 else
1085 w.stop ();
1000} 1086}
1001#endif 1087#endif
1002 1088
1003#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1089#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1004void 1090void
1005rxvt_term::cont_scroll_cb (time_watcher &w) 1091rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1006{ 1092{
1007 if ((scrollbar_isUp() || scrollbar_isDn()) && 1093 if ((scrollbar_isUp() || scrollbar_isDn()) &&
1008 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1094 scr_page (scrollbar_isUp() ? UP : DN, 1))
1009 {
1010 refresh_type |= SMOOTH_REFRESH;
1011 want_refresh = 1; 1095 want_refresh = 1;
1012 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1096 else
1013 } 1097 w.stop ();
1014} 1098}
1015#endif 1099#endif
1016 1100
1017#ifdef SELECTION_SCROLLING 1101#ifdef SELECTION_SCROLLING
1018void 1102void
1019rxvt_term::sel_scroll_cb (time_watcher &w) 1103rxvt_term::sel_scroll_cb (ev::timer &w, int revents)
1020{ 1104{
1021 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1105 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1022 { 1106 {
1023 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1107 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1024 refresh_type |= SMOOTH_REFRESH;
1025 want_refresh = 1; 1108 want_refresh = 1;
1026 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1027 } 1109 }
1110 else
1111 w.stop ();
1028} 1112}
1029#endif 1113#endif
1030 1114
1031#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1115#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1032void 1116void
1033rxvt_term::slip_wheel_cb (time_watcher &w) 1117rxvt_term::slip_wheel_cb (ev::timer &w, int revents)
1034{ 1118{
1035 if (mouse_slip_wheel_speed == 0 1119 if (mouse_slip_wheel_speed == 0
1036 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed) 1120 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1037 : scr_page (UP, mouse_slip_wheel_speed)) 1121 : scr_page (UP, mouse_slip_wheel_speed))
1038 { 1122 {
1039 if (TermWin.view_start == TermWin.nscrolled || 1123 if (view_start == top_row || view_start == 0)
1040 TermWin.view_start == 0)
1041 mouse_slip_wheel_speed = 0; 1124 mouse_slip_wheel_speed = 0;
1042 1125
1043 refresh_type |= SMOOTH_REFRESH;
1044 want_refresh = 1; 1126 want_refresh = 1;
1045 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1127 }
1128 else
1129 w.stop ();
1130}
1131#endif
1132
1133#if LINUX_YIELD_HACK
1134static struct event_handler
1135{
1136 ev::prepare yield_ev;
1137
1138 void yield_cb (ev::prepare &w, int revents)
1139 {
1140 // this should really be sched_yield(), but the linux guys thought
1141 // that giving a process calling sched_yield () less cpu time than
1142 // ones with high nice levels is a useful thing to do. It surely is is
1143 // allowed by the sus... as is returning ENOSYS.
1144
1145 struct timespec ts = { 0, 0 };
1146 nanosleep (&ts, 0);
1147
1148 w.stop ();
1046 } 1149 }
1047} 1150
1151 event_handler ()
1152 : yield_ev (this, &event_handler::yield_cb)
1153 {
1154 }
1155} event_handler;
1048#endif 1156#endif
1049 1157
1050bool 1158bool
1051rxvt_term::pty_fill () 1159rxvt_term::pty_fill ()
1052{ 1160{
1053 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1161 ssize_t n = cmdbuf_endp - cmdbuf_ptr;
1054 1162
1055 if (CBUFSIZ == n) 1163 if (CBUFSIZ == n)
1056 { 1164 {
1057 rxvt_warn ("pty_fill on full buffer, draining input, continuing.\n"); 1165 rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n");
1058 n = 0; 1166 n = 0;
1059 } 1167 }
1060 1168
1061 memmove (cmdbuf_base, cmdbuf_ptr, n); 1169 memmove (cmdbuf_base, cmdbuf_ptr, n);
1062 cmdbuf_ptr = cmdbuf_base; 1170 cmdbuf_ptr = cmdbuf_base;
1063 cmdbuf_endp = cmdbuf_ptr + n; 1171 cmdbuf_endp = cmdbuf_ptr + n;
1064 1172
1065 n = read (pty.pty, cmdbuf_endp, CBUFSIZ - n); 1173 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n);
1066 1174
1067 if (n > 0) 1175 if (r > 0)
1068 { 1176 {
1069 cmdbuf_endp += n; 1177 cmdbuf_endp += r;
1070 return true; 1178 return true;
1071 } 1179 }
1072 else if (n < 0 && errno != EAGAIN) 1180 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1181 {
1182#if LINUX_YIELD_HACK
1183 if (display->is_local)
1184 event_handler.yield_ev.start ();
1185#endif
1186 }
1187 else
1188 {
1189 pty_ev.stop ();
1190
1191 if (!option (Opt_hold))
1073 destroy (); 1192 destroy ();
1074 1193 }
1194
1075 return false; 1195 return false;
1076} 1196}
1077 1197
1078void 1198void
1079rxvt_term::pty_cb (io_watcher &w, short revents) 1199rxvt_term::pty_cb (ev::io &w, int revents)
1080{ 1200{
1081 SET_R (this); 1201 make_current ();
1082 SET_LOCALE (locale);
1083 1202
1084 if (revents & EVENT_READ) 1203 if (revents & ev::READ)
1085 // loop, but don't allow a single term to monopolize us 1204 // loop, but don't allow a single term to monopolize us
1086 while (pty_fill ()) 1205 while (pty_fill ())
1087 if (cmd_parse ()) 1206 if (cmd_parse ())
1088 break; 1207 break;
1089 1208
1090 if (revents & EVENT_WRITE) 1209 if (revents & ev::WRITE)
1091 pty_write (); 1210 pty_write ();
1092} 1211}
1093 1212
1094void 1213void
1095rxvt_term::pointer_unblank () 1214rxvt_term::pointer_unblank ()
1096{ 1215{
1097 XDefineCursor (display->display, TermWin.vt, TermWin_cursor); 1216 XDefineCursor (dpy, vt, TermWin_cursor);
1098 recolour_cursor (); 1217 recolour_cursor ();
1099 1218
1100#ifdef POINTER_BLANK 1219#ifdef POINTER_BLANK
1101 hidden_pointer = 0; 1220 hidden_pointer = 0;
1102 1221
1103 if (options & Opt_pointerBlank) 1222 if (option (Opt_pointerBlank))
1104 pointer_ev.start (NOW + pointerBlankDelay); 1223 pointer_ev.start (pointerBlankDelay);
1105#endif 1224#endif
1106} 1225}
1107 1226
1108#ifdef POINTER_BLANK 1227#ifdef POINTER_BLANK
1109void 1228void
1110rxvt_term::pointer_blank () 1229rxvt_term::pointer_blank ()
1111{ 1230{
1112 if (! (options & Opt_pointerBlank)) 1231 if (!option (Opt_pointerBlank))
1113 return; 1232 return;
1114 1233
1115 XDefineCursor (display->display, TermWin.vt, display->blank_cursor); 1234 XDefineCursor (dpy, vt, display->blank_cursor);
1116 XFlush (display->display); 1235 XFlush (dpy);
1117 1236
1118 hidden_pointer = 1; 1237 hidden_pointer = 1;
1119} 1238}
1120 1239
1121void 1240void
1122rxvt_term::pointer_cb (time_watcher &w) 1241rxvt_term::pointer_cb (ev::timer &w, int revents)
1123{ 1242{
1124 SET_R (this); 1243 make_current ();
1125 SET_LOCALE (locale);
1126 1244
1127 pointer_blank (); 1245 pointer_blank ();
1128} 1246}
1129#endif 1247#endif
1130 1248
1131void 1249void
1132rxvt_term::mouse_report (XButtonEvent &ev) 1250rxvt_term::mouse_report (XButtonEvent &ev)
1133{ 1251{
1134 int button_number, key_state = 0; 1252 int button_number, key_state = 0;
1135 int x, y; 1253 int x, y;
1254 int code = 32;
1136 1255
1137 x = ev.x; 1256 x = Pixel2Col (ev.x);
1138 y = ev.y; 1257 y = Pixel2Row (ev.y);
1139 pixel_position (&x, &y); 1258 if (ev.type == MotionNotify)
1259 {
1260 if (x == mouse_row && y == mouse_col)
1261 return;
1262 mouse_row = x;
1263 mouse_col = y;
1264 code += 32;
1265 }
1140 1266
1141 if (MEvent.button == AnyButton) 1267 if (MEvent.button == AnyButton)
1142 button_number = 3; 1268 button_number = 3;
1143 else 1269 else
1144 { 1270 {
… …
1190 x + 1, 1316 x + 1,
1191 y + 1); 1317 y + 1);
1192#endif 1318#endif
1193 1319
1194 tt_printf ("\033[M%c%c%c", 1320 tt_printf ("\033[M%c%c%c",
1195 (32 + button_number + key_state), 1321 (code + button_number + key_state),
1196 (32 + x + 1), 1322 (32 + x + 1),
1197 (32 + y + 1)); 1323 (32 + y + 1));
1198} 1324}
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 1325
1210/*{{{ process an X event */ 1326/*{{{ process an X event */
1211void 1327void
1212rxvt_term::x_cb (XEvent &ev) 1328rxvt_term::x_cb (XEvent &ev)
1213{ 1329{
1214 dDisp; 1330 make_current ();
1215 1331
1216 SET_R (this); 1332 dLocal (Display *, dpy);
1217 SET_LOCALE (locale);
1218 1333
1219#if defined(CURSOR_BLINK) 1334 if (ev.xany.window == vt
1220 if ((options & Opt_cursorBlink) && ev.type == KeyPress) 1335 && SHOULD_INVOKE (HOOK_X_EVENT)
1221 { 1336 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1222 if (hidden_cursor) 1337 return;
1223 {
1224 hidden_cursor = 0;
1225 want_refresh = 1;
1226 }
1227 1338
1228 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1339 // 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; 1340 Window unused_root, unused_child;
1247 int unused_root_x, unused_root_y; 1341 int unused_root_x, unused_root_y;
1248 unsigned int unused_mask; 1342 unsigned int unused_mask;
1249 1343
1250 switch (ev.type) 1344 switch (ev.type)
1251 { 1345 {
1252 case KeyPress: 1346 case KeyPress:
1253#if ISO_14755 1347 key_press (ev.xkey);
1254 if (!(iso14755buf & ISO_14755_52))
1255#endif
1256 lookup_key (ev.xkey);
1257
1258 break; 1348 break;
1259 1349
1260 case KeyRelease: 1350 case KeyRelease:
1261 { 1351 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; 1352 break;
1329 }
1330 1353
1331 case ButtonPress: 1354 case ButtonPress:
1332 button_press (ev.xbutton); 1355 button_press (ev.xbutton);
1333 break; 1356 break;
1334 1357
… …
1336 button_release (ev.xbutton); 1359 button_release (ev.xbutton);
1337 break; 1360 break;
1338 1361
1339 case ClientMessage: 1362 case ClientMessage:
1340 if (ev.xclient.format == 32 1363 if (ev.xclient.format == 32
1341 && ev.xclient.message_type == xa[XA_WM_PROTOCOLS]) 1364 && !HOOK_INVOKE ((this, HOOK_CLIENT_MESSAGE, DT_XEVENT, &ev, DT_END)))
1342 { 1365 {
1366 if (ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
1367 {
1368 if (!HOOK_INVOKE ((this, HOOK_WM_PROTOCOLS, DT_XEVENT, &ev, DT_END)))
1369 {
1343 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW]) 1370 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1371 {
1372 if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END)))
1344 destroy (); 1373 destroy ();
1374 }
1345#if ENABLE_EWMH 1375#if ENABLE_EWMH
1346 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING]) 1376 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1347 XSendEvent (disp, ev.xclient.window = display->root, 1377 XSendEvent (dpy, ev.xclient.window = display->root,
1348 False, SubstructureRedirectMask | SubstructureNotifyMask, 1378 False, SubstructureRedirectMask | SubstructureNotifyMask,
1349 &ev); 1379 &ev);
1380#endif
1381 }
1382 }
1383#if ENABLE_XEMBED
1384 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1385 {
1386 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1387 focus_in ();
1388 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1389 focus_out ();
1390 }
1350#endif 1391#endif
1351 } 1392 }
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; 1393 break;
1392 1394
1393 /* 1395 /*
1394 * XXX: this is not the _current_ arrangement 1396 * XXX: this is not the _current_ arrangement
1395 * Here's my conclusion: 1397 * Here's my conclusion:
… …
1414 break; 1416 break;
1415 } 1417 }
1416 break; 1418 break;
1417 1419
1418 case FocusIn: 1420 case FocusIn:
1421 if (ev.xfocus.detail != NotifyInferior
1422 && ev.xfocus.detail != NotifyPointer
1423 && ev.xfocus.mode != NotifyGrab)
1419 focus_in (); 1424 focus_in ();
1420 break; 1425 break;
1421 1426
1422 case FocusOut: 1427 case FocusOut:
1428 if (ev.xfocus.detail != NotifyInferior
1429 && ev.xfocus.detail != NotifyPointer
1430 && ev.xfocus.mode != NotifyGrab)
1423 focus_out (); 1431 focus_out ();
1424 break; 1432 break;
1425 1433
1426 case ConfigureNotify: 1434 case ConfigureNotify:
1435 /* fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",
1436 ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,
1437 szHint.width, szHint.height); */
1427 if (ev.xconfigure.window == TermWin.parent[0]) 1438 if (ev.xconfigure.window == parent[0])
1428 { 1439 {
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)); 1440 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1441 ;
1438 1442
1439 if (szHint.width != width || szHint.height != height) 1443 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1440 { 1444 {
1441 seen_resize = 1; 1445 seen_resize = 1;
1442 resize_all_windows (width, height, 1); 1446 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1443 } 1447 }
1444 1448 else
1445#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1449 {
1446 if (options & Opt_transparent) 1450#ifdef HAVE_BG_PIXMAP
1447 check_our_parents (); 1451 if (bgPixmap.window_position_sensitive ())
1452 update_background ();
1448#endif 1453#endif
1454 }
1455 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1449 } 1456 }
1450 break; 1457 break;
1451 1458
1452 case PropertyNotify: 1459 case PropertyNotify:
1460 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
1453 if (ev.xproperty.atom == xa[XA_VT_SELECTION] 1461 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1454 && ev.xproperty.state == PropertyNewValue) 1462 && ev.xproperty.state == PropertyNewValue)
1455 selection_property (ev.xproperty.window, ev.xproperty.atom); 1463 selection_property (ev.xproperty.window, ev.xproperty.atom);
1456 1464
1457 break; 1465 break;
1458 1466
1459 case SelectionClear: 1467 case SelectionClear:
1460 selection_clear (); 1468 selection_clear ();
… …
1467 1475
1468 case SelectionRequest: 1476 case SelectionRequest:
1469 selection_send (ev.xselectionrequest); 1477 selection_send (ev.xselectionrequest);
1470 break; 1478 break;
1471 1479
1480 case MapNotify:
1481 mapped = 1;
1482#ifdef TEXT_BLINK
1483 text_blink_ev.start ();
1484#endif
1485 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1486 break;
1487
1472 case UnmapNotify: 1488 case UnmapNotify:
1473 TermWin.mapped = 0; 1489 mapped = 0;
1474#ifdef TEXT_BLINK 1490#ifdef TEXT_BLINK
1475 text_blink_ev.stop (); 1491 text_blink_ev.stop ();
1476#endif 1492#endif
1493 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1477 break; 1494 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 1495
1492 case GraphicsExpose: 1496 case GraphicsExpose:
1493 case Expose: 1497 case Expose:
1494 if (ev.xany.window == TermWin.vt) 1498 if (ev.xany.window == vt)
1495 { 1499 {
1496 do 1500 do
1501 {
1497 scr_expose (ev.xexpose.x, ev.xexpose.y, 1502 scr_expose (ev.xexpose.x, ev.xexpose.y,
1498 ev.xexpose.width, ev.xexpose.height, False); 1503 ev.xexpose.width, ev.xexpose.height, False);
1504 }
1499 while (XCheckTypedWindowEvent (disp, TermWin.vt, ev.xany.type, &ev)); 1505 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1500 1506
1501 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1507 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1502 1508
1503 while (XCheckTypedWindowEvent (disp, TermWin.vt, ev.xany.type, &ev)) 1509 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1510 {
1504 scr_expose (ev.xexpose.x, ev.xexpose.y, 1511 scr_expose (ev.xexpose.x, ev.xexpose.y,
1505 ev.xexpose.width, ev.xexpose.height, False); 1512 ev.xexpose.width, ev.xexpose.height, False);
1506 1513 }
1507 scr_refresh (refresh_type); 1514 want_refresh = 1;
1508 } 1515 }
1509 else 1516 else
1510 { 1517 {
1511 XEvent unused_event; 1518 XEvent unused_event;
1512 1519
1513 while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event)) 1520 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1514 ; 1521 ;
1515 while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event)) 1522 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1516 ; 1523 ;
1517 1524
1518 if (isScrollbarWindow (ev.xany.window)) 1525 if (isScrollbarWindow (ev.xany.window))
1519 { 1526 {
1520 scrollBar.setIdle (); 1527 scrollBar.setIdle ();
1521 scrollbar_show (0); 1528 scrollbar_show (0);
1522 } 1529 }
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 } 1530 }
1533 break; 1531 break;
1534 1532
1535 case MotionNotify: 1533 case MotionNotify:
1536#ifdef POINTER_BLANK 1534#ifdef POINTER_BLANK
1537 if (hidden_pointer) 1535 if (hidden_pointer)
1538 pointer_unblank (); 1536 pointer_unblank ();
1539#endif 1537#endif
1540#if MENUBAR 1538 if ((priv_modes & PrivMode_MouseBtnEvent && ev.xbutton.state & (Button1Mask|Button2Mask|Button3Mask))
1541 if (isMenuBarWindow (ev.xany.window)) 1539 || priv_modes & PrivMode_MouseAnyEvent)
1542 {
1543 menubar_control (ev.xbutton); 1540 mouse_report (ev.xbutton);
1544 break;
1545 }
1546#endif
1547 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1541 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1548 break; 1542 break;
1549 1543
1550 if (ev.xany.window == TermWin.vt) 1544 if (ev.xany.window == vt)
1551 { 1545 {
1546 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1547 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1548 ; // nop
1552 if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1549 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1553 { 1550 {
1554 while (XCheckTypedWindowEvent (disp, TermWin.vt, MotionNotify, &ev)) 1551 while (XCheckTypedWindowEvent (dpy, vt, MotionNotify, &ev))
1555 ; 1552 ;
1556 1553
1557 XQueryPointer (disp, TermWin.vt, 1554 XQueryPointer (dpy, vt,
1558 &unused_root, &unused_child, 1555 &unused_root, &unused_child,
1559 &unused_root_x, &unused_root_y, 1556 &unused_root_x, &unused_root_y,
1560 &ev.xbutton.x, &ev.xbutton.y, 1557 &ev.xbutton.x, &ev.xbutton.y,
1561 &ev.xbutton.state); 1558 &ev.xbutton.state);
1562#ifdef MOUSE_THRESHOLD 1559#ifdef MOUSE_THRESHOLD
… …
1574#endif 1571#endif
1575 selection_extend (ev.xbutton.x, ev.xbutton.y, 1572 selection_extend (ev.xbutton.x, ev.xbutton.y,
1576 ev.xbutton.state & Button3Mask ? 2 : 0); 1573 ev.xbutton.state & Button3Mask ? 2 : 0);
1577 1574
1578#ifdef SELECTION_SCROLLING 1575#ifdef SELECTION_SCROLLING
1579 if (ev.xbutton.y < TermWin.int_bwidth 1576 if (ev.xbutton.y < int_bwidth
1580 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1)) 1577 || Pixel2Row (ev.xbutton.y) > (nrow-1))
1581 { 1578 {
1582 int dist; 1579 int dist;
1583 1580
1584 /* don't clobber the current delay if we are 1581 /* don't clobber the current delay if we are
1585 * already in the middle of scrolling. 1582 * already in the middle of scrolling.
1586 */ 1583 */
1587 if (!sel_scroll_ev.active) 1584 if (!sel_scroll_ev.is_active ())
1588 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1585 sel_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1589 1586
1590 /* save the event params so we can highlight 1587 /* save the event params so we can highlight
1591 * the selection in the pending-scroll loop 1588 * the selection in the pending-scroll loop
1592 */ 1589 */
1593 selection_save_x = ev.xbutton.x; 1590 selection_save_x = ev.xbutton.x;
1594 selection_save_y = ev.xbutton.y; 1591 selection_save_y = ev.xbutton.y;
1595 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0; 1592 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;
1596 1593
1597 /* calc number of lines to scroll */ 1594 /* calc number of lines to scroll */
1598 if (ev.xbutton.y < TermWin.int_bwidth) 1595 if (ev.xbutton.y < int_bwidth)
1599 { 1596 {
1600 scroll_selection_dir = UP; 1597 scroll_selection_dir = UP;
1601 dist = TermWin.int_bwidth - ev.xbutton.y; 1598 dist = int_bwidth - ev.xbutton.y;
1602 } 1599 }
1603 else 1600 else
1604 { 1601 {
1605 scroll_selection_dir = DN; 1602 scroll_selection_dir = DN;
1606 dist = ev.xbutton.y - (TermWin.int_bwidth + TermWin.height); 1603 dist = ev.xbutton.y - (int_bwidth + height);
1607 } 1604 }
1608 1605
1609 scroll_selection_lines = Pixel2Height (dist) 1606 scroll_selection_lines = Pixel2Height (dist)
1610 / SELECTION_SCROLL_LINE_SPEEDUP 1607 / SELECTION_SCROLL_LINE_SPEEDUP
1611 + 1; 1608 + 1;
1612 MIN_IT (scroll_selection_lines, 1609 min_it (scroll_selection_lines,
1613 SELECTION_SCROLL_MAX_LINES); 1610 SELECTION_SCROLL_MAX_LINES);
1614 } 1611 }
1615 else 1612 else
1616 { 1613 {
1617 /* we are within the text window, so we 1614 /* we are within the text window, so we
1618 * shouldn't be scrolling 1615 * shouldn't be scrolling
1619 */ 1616 */
1620 if (sel_scroll_ev.active)
1621 sel_scroll_ev.stop(); 1617 sel_scroll_ev.stop();
1622 } 1618 }
1623#endif 1619#endif
1624#ifdef MOUSE_THRESHOLD 1620#ifdef MOUSE_THRESHOLD
1625 } 1621 }
1626#endif 1622#endif
1627 } 1623 }
1628 } 1624 }
1629 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1625 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1630 { 1626 {
1631 while (XCheckTypedWindowEvent (disp, scrollBar.win, 1627 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1632 MotionNotify, &ev)) 1628 MotionNotify, &ev))
1633 ; 1629 ;
1634 1630
1635 XQueryPointer (disp, scrollBar.win, 1631 XQueryPointer (dpy, scrollBar.win,
1636 &unused_root, &unused_child, 1632 &unused_root, &unused_child,
1637 &unused_root_x, &unused_root_y, 1633 &unused_root_x, &unused_root_y,
1638 &ev.xbutton.x, &ev.xbutton.y, 1634 &ev.xbutton.x, &ev.xbutton.y,
1639 &unused_mask); 1635 &unused_mask);
1640 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1636 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1641 scrollbar_size ()); 1637 scrollbar_size ());
1642 scr_refresh (refresh_type);
1643 refresh_limit = 0; 1638 want_refresh = 1;
1644 scrollbar_show (1); 1639 scrollbar_show (1);
1645 } 1640 }
1646 break; 1641 break;
1647 } 1642 }
1643
1644#if defined(CURSOR_BLINK)
1645 if (option (Opt_cursorBlink) && ev.type == KeyPress)
1646 {
1647 if (hidden_cursor)
1648 {
1649 hidden_cursor = 0;
1650 want_refresh = 1;
1651 }
1652
1653 cursor_blink_ev.again ();
1654 }
1655#endif
1656
1657#if defined(POINTER_BLANK)
1658 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1659 {
1660 if (ev.type == MotionNotify
1661 || ev.type == ButtonPress
1662 || ev.type == ButtonRelease)
1663 if (hidden_pointer)
1664 pointer_unblank ();
1665
1666 if (ev.type == KeyPress && hidden_pointer == 0)
1667 pointer_blank ();
1668 }
1669#endif
1648} 1670}
1649 1671
1650void 1672void
1651rxvt_term::focus_in () 1673rxvt_term::focus_in ()
1652{ 1674{
1653 if (!TermWin.focus) 1675 if (!focus)
1654 { 1676 {
1655 TermWin.focus = 1; 1677 focus = 1;
1656 want_refresh = 1; 1678 want_refresh = 1;
1679
1680 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1681
1657#if USE_XIM 1682#if USE_XIM
1658 if (Input_Context != NULL) 1683 if (Input_Context != NULL)
1659 { 1684 {
1660 IMSetStatusPosition (); 1685 IMSetPosition ();
1661 XSetICFocus (Input_Context); 1686 XSetICFocus (Input_Context);
1662 } 1687 }
1663#endif 1688#endif
1664#if CURSOR_BLINK 1689#if CURSOR_BLINK
1665 if (options & Opt_cursorBlink) 1690 if (option (Opt_cursorBlink))
1666 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1691 cursor_blink_ev.again ();
1667#endif 1692#endif
1668#if OFF_FOCUS_FADING 1693#if OFF_FOCUS_FADING
1669 if (rs[Rs_fade]) 1694 if (rs[Rs_fade])
1670 { 1695 {
1671 pix_colors = pix_colors_focused; 1696 pix_colors = pix_colors_focused;
1672 scr_recolour (); 1697 scr_recolour ();
1673 } 1698 }
1674#endif 1699#endif
1700#if ENABLE_FRILLS
1701 if (option (Opt_urgentOnBell))
1702 {
1703 if (XWMHints *h = XGetWMHints(dpy, parent[0]))
1704 {
1705 h->flags &= ~XUrgencyHint;
1706 XSetWMHints (dpy, parent[0], h);
1707 }
1708 }
1709#endif
1675 } 1710 }
1676} 1711}
1677 1712
1678void 1713void
1679rxvt_term::focus_out () 1714rxvt_term::focus_out ()
1680{ 1715{
1681 if (TermWin.focus) 1716 if (focus)
1682 { 1717 {
1683 TermWin.focus = 0; 1718 focus = 0;
1684 want_refresh = 1; 1719 want_refresh = 1;
1685 1720
1721 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1722
1686#if ENABLE_FRILLS || ISO_14755 1723#if ENABLE_FRILLS || ISO_14755
1724 if (iso14755buf)
1725 {
1687 iso14755buf = 0; 1726 iso14755buf = 0;
1688#endif 1727# if ISO_14755
1689#if ENABLE_OVERLAY
1690 scr_overlay_off (); 1728 scr_overlay_off ();
1729# endif
1730 }
1691#endif 1731#endif
1692#if USE_XIM 1732#if USE_XIM
1693 if (Input_Context != NULL) 1733 if (Input_Context != NULL)
1694 XUnsetICFocus (Input_Context); 1734 XUnsetICFocus (Input_Context);
1695#endif 1735#endif
1696#if CURSOR_BLINK 1736#if CURSOR_BLINK
1697 if (options & Opt_cursorBlink) 1737 if (option (Opt_cursorBlink))
1698 cursor_blink_ev.stop (); 1738 cursor_blink_ev.stop ();
1739
1699 hidden_cursor = 0; 1740 hidden_cursor = 0;
1700#endif 1741#endif
1701#if OFF_FOCUS_FADING 1742#if OFF_FOCUS_FADING
1702 if (rs[Rs_fade]) 1743 if (rs[Rs_fade])
1703 { 1744 {
… …
1706 } 1747 }
1707#endif 1748#endif
1708 } 1749 }
1709} 1750}
1710 1751
1711#if TRANSPARENT 1752void
1753rxvt_term::update_fade_color (unsigned int idx)
1754{
1755#if OFF_FOCUS_FADING
1756 if (rs[Rs_fade])
1757 {
1758 rgba c;
1759 pix_colors [Color_fade].get (c);
1760 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1761 }
1762#endif
1763}
1764
1765#if ENABLE_TRANSPARENCY || ENABLE_PERL
1712void 1766void
1713rxvt_term::rootwin_cb (XEvent &ev) 1767rxvt_term::rootwin_cb (XEvent &ev)
1714{ 1768{
1715 SET_R (this); 1769 make_current ();
1716 SET_LOCALE (locale);
1717 1770
1771 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1772 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1773 return;
1774
1775# if ENABLE_TRANSPARENCY
1718 switch (ev.type) 1776 switch (ev.type)
1719 { 1777 {
1720 case PropertyNotify: 1778 case PropertyNotify:
1721 /* 1779 /*
1722 * if user used some Esetroot compatible prog to set the root bg, 1780 * 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. 1781 * use the property to determine the pixmap. We use it later on.
1724 */ 1782 */
1725 if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID] 1783 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1726 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1784 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1727 return; 1785 {
1728 1786 bgPixmap.set_root_pixmap ();
1729 /* FALLTHROUGH */ 1787 update_background ();
1730 case ReparentNotify: 1788 }
1731 if ((options & Opt_transparent) && check_our_parents () && am_transparent)
1732 want_refresh = want_full_refresh = 1;
1733 break; 1789 break;
1734 } 1790 }
1791# endif
1735} 1792}
1736#endif 1793#endif
1737 1794
1738void 1795void
1739rxvt_term::button_press (XButtonEvent &ev) 1796rxvt_term::button_press (XButtonEvent &ev)
1740{ 1797{
1741 int reportmode = 0, clickintime; 1798 int reportmode = 0, clickintime;
1742 1799
1743 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1800 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1801
1744 if (!bypass_keystate) 1802 if (!bypass_keystate)
1745 reportmode = !! (priv_modes & PrivMode_mouse_report); 1803 reportmode = !! (priv_modes & PrivMode_mouse_report);
1746 1804
1747 /* 1805 /*
1748 * VT window processing of button press 1806 * VT window processing of button press
1749 */ 1807 */
1750 if (ev.window == TermWin.vt) 1808 if (ev.window == vt)
1751 { 1809 {
1810 if (HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1811 return;
1812
1752#if ISO_14755 1813#if ISO_14755
1753 // 5.4 1814 // 5.4
1754 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1815 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1755 { 1816 {
1756 iso14755_54 (ev.x, ev.y); 1817 iso14755_54 (ev.x, ev.y);
… …
1768#ifdef MOUSE_REPORT_DOUBLECLICK 1829#ifdef MOUSE_REPORT_DOUBLECLICK
1769 if (ev.button == MEvent.button && clickintime) 1830 if (ev.button == MEvent.button && clickintime)
1770 { 1831 {
1771 /* same button, within alloted time */ 1832 /* same button, within alloted time */
1772 MEvent.clicks++; 1833 MEvent.clicks++;
1834
1773 if (MEvent.clicks > 1) 1835 if (MEvent.clicks > 1)
1774 { 1836 {
1775 /* only report double clicks */ 1837 /* only report double clicks */
1776 MEvent.clicks = 2; 1838 MEvent.clicks = 2;
1777 mouse_report (ev); 1839 mouse_report (ev);
… …
1789 mouse_report (ev); 1851 mouse_report (ev);
1790 } 1852 }
1791#else 1853#else
1792 MEvent.button = ev.button; 1854 MEvent.button = ev.button;
1793 mouse_report (ev); 1855 mouse_report (ev);
1794#endif /* MOUSE_REPORT_DOUBLECLICK */ 1856#endif /* MOUSE_REPORT_DOUBLECLICK */
1795 1857
1796 } 1858 }
1797 else 1859 else
1798 { 1860 {
1799 if (ev.button != MEvent.button) 1861 if (ev.button != MEvent.button)
… …
1809#else 1871#else
1810 selection.rect = false; 1872 selection.rect = false;
1811#endif 1873#endif
1812 1874
1813 /* allow shift+left click to extend selection */ 1875 /* allow shift+left click to extend selection */
1814 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report)) 1876 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1815 { 1877 {
1816 if (MEvent.button == Button1 && clickintime) 1878 if (MEvent.button == Button1 && clickintime)
1817 selection_rotate (ev.x, ev.y); 1879 selection_rotate (ev.x, ev.y);
1818 else 1880 else
1819 selection_extend (ev.x, ev.y, 1); 1881 selection_extend (ev.x, ev.y, 1);
… …
1893 tt_printf ("\033[5~"); 1955 tt_printf ("\033[5~");
1894 break; 1956 break;
1895 } 1957 }
1896 } 1958 }
1897 else 1959 else
1898#endif /* NO_SCROLLBAR_REPORT */ 1960#endif /* NO_SCROLLBAR_REPORT */
1899 1961
1900 { 1962 {
1901 char upordown = 0; 1963 char upordown = 0;
1902 1964
1903 if (scrollBar.style == R_SB_NEXT) 1965 if (scrollBar.style == R_SB_NEXT)
1904 { 1966 {
1905 if (scrollbarnext_upButton (ev.y)) 1967 if (scrollbarnext_upButton (ev.y))
1906 upordown = -1; /* up */ 1968 upordown = -1; /* up */
… …
1912 if (scrollbarrxvt_upButton (ev.y)) 1974 if (scrollbarrxvt_upButton (ev.y))
1913 upordown = -1; /* up */ 1975 upordown = -1; /* up */
1914 else if (scrollbarrxvt_dnButton (ev.y)) 1976 else if (scrollbarrxvt_dnButton (ev.y))
1915 upordown = 1; /* down */ 1977 upordown = 1; /* down */
1916 } 1978 }
1979
1917 if (upordown) 1980 if (upordown)
1918 { 1981 {
1919#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1982#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1983 if (!cont_scroll_ev.is_active ())
1920 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1984 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1921#endif 1985#endif
1922 if (scr_page (upordown < 0 ? UP : DN, 1)) 1986 if (scr_page (upordown < 0 ? UP : DN, 1))
1923 { 1987 {
1924 if (upordown < 0) 1988 if (upordown < 0)
1925 scrollBar.setUp (); 1989 scrollBar.setUp ();
… …
1960 case Button3: 2024 case Button3:
1961 if (scrollBar.style != R_SB_XTERM) 2025 if (scrollBar.style != R_SB_XTERM)
1962 { 2026 {
1963 if (scrollbar_above_slider (ev.y)) 2027 if (scrollbar_above_slider (ev.y))
1964# ifdef RXVT_SCROLL_FULL 2028# ifdef RXVT_SCROLL_FULL
1965 scr_page (UP, TermWin.nrow - 1); 2029 scr_page (UP, nrow - 1);
1966# else 2030# else
1967 scr_page (UP, TermWin.nrow / 4); 2031 scr_page (UP, nrow / 4);
1968# endif 2032# endif
1969 else if (scrollbar_below_slider (ev.y)) 2033 else if (scrollbar_below_slider (ev.y))
1970# ifdef RXVT_SCROLL_FULL 2034# ifdef RXVT_SCROLL_FULL
1971 scr_page (DN, TermWin.nrow - 1); 2035 scr_page (DN, nrow - 1);
1972# else 2036# else
1973 scr_page (DN, TermWin.nrow / 4); 2037 scr_page (DN, nrow / 4);
1974# endif 2038# endif
1975 else 2039 else
1976 scrollBar.setMotion (); 2040 scrollBar.setMotion ();
1977 } 2041 }
1978 else 2042 else
1979 { 2043 {
1980 scr_page ((ev.button == Button1 ? DN : UP), 2044 scr_page ((ev.button == Button1 ? DN : UP),
1981 (TermWin.nrow 2045 (nrow
1982 * scrollbar_position (ev.y) 2046 * scrollbar_position (ev.y)
1983 / scrollbar_size ())); 2047 / scrollbar_size ()));
1984 } 2048 }
1985 2049
1986 break; 2050 break;
1987 } 2051 }
1988 } 2052 }
2053
1989 return; 2054 return;
1990 } 2055 }
1991#if MENUBAR
1992 /*
1993 * Menubar window processing of button press
1994 */
1995 if (isMenuBarWindow (ev.window))
1996 menubar_control (ev);
1997#endif
1998} 2056}
1999 2057
2000void 2058void
2001rxvt_term::button_release (XButtonEvent &ev) 2059rxvt_term::button_release (XButtonEvent &ev)
2002{ 2060{
… …
2008 2066
2009 if (scrollbar_isUpDn ()) 2067 if (scrollbar_isUpDn ())
2010 { 2068 {
2011 scrollBar.setIdle (); 2069 scrollBar.setIdle ();
2012 scrollbar_show (0); 2070 scrollbar_show (0);
2013#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2014 refresh_type &= ~SMOOTH_REFRESH;
2015#endif
2016 } 2071 }
2017 2072
2018#ifdef SELECTION_SCROLLING 2073#ifdef SELECTION_SCROLLING
2019 if (sel_scroll_ev.active)
2020 sel_scroll_ev.stop(); 2074 sel_scroll_ev.stop();
2021#endif 2075#endif
2022 2076
2023 if (ev.window == TermWin.vt) 2077 if (ev.window == vt)
2024 { 2078 {
2079 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2080 return;
2081
2025#if ISO_14755 2082#if ISO_14755
2026 // 5.4 2083 // 5.4
2027 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 2084 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2028 return; 2085 return;
2029#endif 2086#endif
2087
2030 if (reportmode) 2088 if (reportmode)
2031 { 2089 {
2032 /* mouse report from vt window */ 2090 /* mouse report from vt window */
2033 /* don't report release of wheel "buttons" */ 2091 /* don't report release of wheel "buttons" */
2034 if (ev.button >= 4) 2092 if (ev.button >= 4)
… …
2045 mouse_report (ev); 2103 mouse_report (ev);
2046 } 2104 }
2047#else /* MOUSE_REPORT_DOUBLECLICK */ 2105#else /* MOUSE_REPORT_DOUBLECLICK */
2048 MEvent.button = AnyButton; 2106 MEvent.button = AnyButton;
2049 mouse_report (ev); 2107 mouse_report (ev);
2050#endif /* MOUSE_REPORT_DOUBLECLICK */ 2108#endif /* MOUSE_REPORT_DOUBLECLICK */
2051 return; 2109 return;
2052 } 2110 }
2053 2111
2054 /* 2112 /*
2055 * dumb hack to compensate for the failure of click-and-drag 2113 * dumb hack to compensate for the failure of click-and-drag
… …
2064 { 2122 {
2065 case Button1: 2123 case Button1:
2066 case Button3: 2124 case Button3:
2067 selection_make (ev.time); 2125 selection_make (ev.time);
2068 break; 2126 break;
2127
2069 case Button2: 2128 case Button2:
2070 selection_request (ev.time, ev.x, ev.y); 2129 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2130 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2071 break; 2131 break;
2132
2072#ifdef MOUSE_WHEEL 2133#ifdef MOUSE_WHEEL
2073 case Button4: 2134 case Button4:
2074 case Button5: 2135 case Button5:
2075 { 2136 {
2076 int i; 2137 int i;
… …
2078 2139
2079 v = ev.button == Button4 ? UP : DN; 2140 v = ev.button == Button4 ? UP : DN;
2080 2141
2081 if (ev.state & ShiftMask) 2142 if (ev.state & ShiftMask)
2082 i = 1; 2143 i = 1;
2083 else if (options & Opt_mouseWheelScrollPage) 2144 else if (option (Opt_mouseWheelScrollPage))
2084 i = TermWin.nrow - 1; 2145 i = nrow - 1;
2085 else 2146 else
2086 i = 5; 2147 i = 5;
2087 2148
2088# ifdef MOUSE_SLIP_WHEELING 2149# ifdef MOUSE_SLIP_WHEELING
2089 if (ev.state & ControlMask) 2150 if (ev.state & ControlMask)
2090 { 2151 {
2091 mouse_slip_wheel_speed += v ? -1 : 1; 2152 mouse_slip_wheel_speed += v ? -1 : 1;
2092 if (mouse_slip_wheel_speed < -TermWin.nrow) mouse_slip_wheel_speed = -TermWin.nrow; 2153 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; 2154 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2094 2155
2095 if (slip_wheel_ev.at < NOW) 2156 if (!slip_wheel_ev.is_active ())
2096 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; 2157 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2097
2098 slip_wheel_ev.start ();
2099 } 2158 }
2100 else 2159 else
2101 { 2160 {
2102# endif 2161# endif
2103# ifdef JUMP_MOUSE_WHEEL
2104 scr_page (v, i); 2162 scr_page (v, i);
2105 scr_refresh (SMOOTH_REFRESH);
2106 scrollbar_show (1); 2163 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 2164# ifdef MOUSE_SLIP_WHEELING
2116 } 2165 }
2117#endif 2166# endif
2118 } 2167 }
2119 break; 2168 break;
2120#endif 2169#endif
2121 } 2170 }
2122 } 2171 }
2123#ifdef MENUBAR
2124 else if (isMenuBarWindow (ev.window))
2125 menubar_control (ev);
2126#endif
2127} 2172}
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 2173
2610/*}}} */ 2174/*}}} */
2611 2175
2612bool 2176bool
2613rxvt_term::cmd_parse () 2177rxvt_term::cmd_parse ()
2614{ 2178{
2615 bool flag = false; 2179 bool flag = false;
2616 unicode_t ch = NOCHAR; 2180 wchar_t ch = NOCHAR;
2617 unsigned char *seq_begin; // remember start of esc-sequence here 2181 char *seq_begin; // remember start of esc-sequence here
2618 2182
2619 for (;;) 2183 for (;;)
2620 { 2184 {
2621 if (ch == NOCHAR) 2185 if (ch == NOCHAR)
2622 { 2186 {
2623 seq_begin = cmdbuf_ptr; 2187 seq_begin = cmdbuf_ptr;
2624 ch = next_char (); 2188 ch = next_char ();
2625 }
2626 2189
2627 if (ch == NOCHAR) // TODO: improve 2190 if (ch == NOCHAR)
2628 break; 2191 break;
2192 }
2629 2193
2630 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2194 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)
2631 { 2195 {
2632 if (!seen_input) 2196 if (!seen_input)
2633 { 2197 {
… …
2642 if (seen_resize && cmd_pid) 2206 if (seen_resize && cmd_pid)
2643 kill (-cmd_pid, SIGWINCH); 2207 kill (-cmd_pid, SIGWINCH);
2644 } 2208 }
2645 2209
2646 /* Read a text string from the input buffer */ 2210 /* Read a text string from the input buffer */
2647 unicode_t buf[UBUFSIZ]; 2211 wchar_t buf[UBUFSIZ];
2648 bool refreshnow = false; 2212 bool refreshnow = false;
2649 int nlines = 0; 2213 int nlines = 0;
2650 unicode_t *str = buf; 2214 wchar_t *str = buf;
2651 unicode_t *eol = str + min (TermWin.ncol, UBUFSIZ); 2215 wchar_t *eol = str + min (ncol, UBUFSIZ);
2652 2216
2653 for (;;) 2217 for (;;)
2654 { 2218 {
2655 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2219 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2656 break; 2220 break;
… …
2662 if (ch == C0_LF) 2226 if (ch == C0_LF)
2663 nlines++; 2227 nlines++;
2664 2228
2665 refresh_count++; 2229 refresh_count++;
2666 2230
2667 if (!(options & Opt_jumpScroll) 2231 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1)
2668 || (refresh_count >= refresh_limit * (TermWin.nrow - 1)))
2669 { 2232 {
2233 refresh_count = 0;
2234
2235 if (!option (Opt_skipScroll) || ev_time () > ev::now () + 1. / 60.)
2236 {
2670 refreshnow = true; 2237 refreshnow = true;
2671 ch = NOCHAR; 2238 ch = NOCHAR;
2672 break; 2239 break;
2240 }
2673 } 2241 }
2674 2242
2675 // scr_add_lines only works for nlines <= TermWin.nrow - 1. 2243 // scr_add_lines only works for nlines <= nrow - 1.
2676 if (nlines >= TermWin.nrow - 1) 2244 if (nlines >= nrow - 1)
2677 { 2245 {
2246 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2247 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2678 scr_add_lines (buf, nlines, str - buf); 2248 scr_add_lines (buf, str - buf, nlines);
2249
2679 nlines = 0; 2250 nlines = 0;
2680 str = buf; 2251 str = buf;
2681 eol = str + min (TermWin.ncol, UBUFSIZ); 2252 eol = str + min (ncol, UBUFSIZ);
2682 } 2253 }
2683 2254
2684 if (str >= eol) 2255 if (str >= eol)
2685 { 2256 {
2686 if (eol >= buf + UBUFSIZ) 2257 if (eol >= buf + UBUFSIZ)
2687 { 2258 {
2688 ch = NOCHAR; 2259 ch = NOCHAR;
2689 break; 2260 break;
2690 } 2261 }
2691 else 2262 else
2692 eol = min (eol + TermWin.ncol, buf + UBUFSIZ); 2263 eol = min (eol + ncol, buf + UBUFSIZ);
2693 } 2264 }
2694 2265
2695 } 2266 }
2696 2267
2697 seq_begin = cmdbuf_ptr; 2268 seq_begin = cmdbuf_ptr;
2698 ch = next_char (); 2269 ch = next_char ();
2699 } 2270 }
2700 2271
2272 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2273 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2701 scr_add_lines (buf, nlines, str - buf); 2274 scr_add_lines (buf, str - buf, nlines);
2702 2275
2703 /* 2276 /*
2704 * If there have been a lot of new lines, then update the screen 2277 * If there have been a lot of new lines, then update the screen
2705 * What the heck I'll cheat and only refresh less than every page-full. 2278 * What the heck we'll cheat and only refresh less than every page-full.
2706 * the number of pages between refreshes is refresh_limit, which 2279 * if skipScroll is enabled.
2707 * is incremented here because we must be doing flat-out scrolling.
2708 */ 2280 */
2709 if (refreshnow) 2281 if (refreshnow)
2710 { 2282 {
2711 if ((options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2712 refresh_limit++;
2713 else
2714 {
2715 flag = true; 2283 flag = true;
2716 scr_refresh (refresh_type); 2284 scr_refresh ();
2717 } 2285 want_refresh = 1;
2718 } 2286 }
2719 2287
2720 } 2288 }
2721 else 2289 else
2722 { 2290 {
… …
2736 } 2304 }
2737 2305
2738 return flag; 2306 return flag;
2739} 2307}
2740 2308
2741// read the next octet
2742unicode_t
2743rxvt_term::next_octet ()
2744{
2745 return cmdbuf_ptr < cmdbuf_endp
2746 ? *cmdbuf_ptr++
2747 : NOCHAR;
2748}
2749
2750// read the next character 2309// read the next character
2751unicode_t 2310wchar_t
2752rxvt_term::next_char () 2311rxvt_term::next_char () NOTHROW
2753{ 2312{
2754 while (cmdbuf_ptr < cmdbuf_endp) 2313 while (cmdbuf_ptr < cmdbuf_endp)
2755 { 2314 {
2756 // assume 7-bit to be ascii ALWAYS 2315 // assume 7-bit to be ascii ALWAYS
2757 if (*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2316 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
2758 return *cmdbuf_ptr++; 2317 return *cmdbuf_ptr++;
2759 2318
2760 wchar_t wc; 2319 wchar_t wc;
2761 size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2320 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2762 2321
2763 if (len == (size_t)-2) 2322 if (len == (size_t)-2)
2764 { 2323 {
2765 // the mbstate stores incomplete sequences. didn't know this :/ 2324 // the mbstate stores incomplete sequences. didn't know this :/
2766 cmdbuf_ptr = cmdbuf_endp; 2325 cmdbuf_ptr = cmdbuf_endp;
2767 break; 2326 break;
2768 } 2327 }
2769 2328
2770 if (len == (size_t)-1) 2329 if (len == (size_t)-1)
2771 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2330 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2772 2331
2773 // assume wchar == unicode 2332 // assume wchar == unicode
2774 cmdbuf_ptr += len; 2333 cmdbuf_ptr += len;
2775 return wc & UNICODE_MASK; 2334 return wc & UNICODE_MASK;
2776 } 2335 }
2777 2336
2778 return NOCHAR; 2337 return NOCHAR;
2779} 2338}
2339
2340// read the next octet
2341uint32_t
2342rxvt_term::next_octet () NOTHROW
2343{
2344 return cmdbuf_ptr < cmdbuf_endp
2345 ? (unsigned char)*cmdbuf_ptr++
2346 : NOCHAR;
2347}
2348
2349static class out_of_input out_of_input;
2780 2350
2781/* rxvt_cmd_getc () - Return next input character */ 2351/* rxvt_cmd_getc () - Return next input character */
2782/* 2352/*
2783 * Return the next input character after first passing any keyboard input 2353 * Return the next input character after first passing any keyboard input
2784 * to the command. 2354 * to the command.
2785 */ 2355 */
2786unicode_t 2356wchar_t
2787rxvt_term::cmd_getc () 2357rxvt_term::cmd_getc () THROW ((class out_of_input))
2788{ 2358{
2789 unicode_t c = next_char (); 2359 wchar_t c = next_char ();
2790 2360
2791 if (c == NOCHAR) 2361 if (c == NOCHAR)
2792 throw out_of_input; 2362 throw out_of_input;
2793 2363
2794 return c; 2364 return c;
2795} 2365}
2796 2366
2797unicode_t 2367uint32_t
2798rxvt_term::cmd_get8 () 2368rxvt_term::cmd_get8 () THROW ((class out_of_input))
2799{ 2369{
2800 unicode_t c = next_octet (); 2370 uint32_t c = next_octet ();
2801 2371
2802 if (c == NOCHAR) 2372 if (c == NOCHAR)
2803 throw out_of_input; 2373 throw out_of_input;
2804 2374
2805 return c; 2375 return c;
… …
2869 { 2439 {
2870 if ((buf[len++] = cmd_getc ()) == 'i') 2440 if ((buf[len++] = cmd_getc ()) == 'i')
2871 break; /* done = 1 */ 2441 break; /* done = 1 */
2872 } 2442 }
2873 } 2443 }
2874 2444
2875 for (i = 0; i < len; i++) 2445 for (i = 0; i < len; i++)
2876 if (putc (buf[i], fd) == EOF) 2446 if (putc (buf[i], fd) == EOF)
2877 { 2447 {
2878 done = 1; 2448 done = 1;
2879 break; 2449 break;
… …
2881 } 2451 }
2882 } 2452 }
2883 2453
2884 pclose_printer (fd); 2454 pclose_printer (fd);
2885} 2455}
2886#endif /* PRINTPIPE */ 2456#endif /* PRINTPIPE */
2887/*}}} */ 2457/*}}} */
2888 2458
2889/* *INDENT-OFF* */ 2459/* *INDENT-OFF* */
2890enum { 2460enum {
2891 C1_40 = 0x40, 2461 C1_40 = 0x40,
… …
2905 case C0_ESC: 2475 case C0_ESC:
2906 process_escape_seq (); 2476 process_escape_seq ();
2907 break; 2477 break;
2908 case C0_ENQ: /* terminal Status */ 2478 case C0_ENQ: /* terminal Status */
2909 if (rs[Rs_answerbackstring]) 2479 if (rs[Rs_answerbackstring])
2910 tt_write ((const unsigned char *)rs[Rs_answerbackstring], 2480 tt_write (rs [Rs_answerbackstring], strlen (rs [Rs_answerbackstring]));
2911 (unsigned int)strlen (rs[Rs_answerbackstring]));
2912 else 2481 else
2913 tt_write ((unsigned char *)VT100_ANS, 2482 tt_write (VT100_ANS, strlen (VT100_ANS));
2914 (unsigned int)strlen (VT100_ANS));
2915 break; 2483 break;
2916 case C0_BEL: /* bell */ 2484 case C0_BEL: /* bell */
2917 scr_bell (); 2485 scr_bell ();
2918 break; 2486 break;
2919 case C0_BS: /* backspace */ 2487 case C0_BS: /* backspace */
… …
2943 process_dcs_seq (); 2511 process_dcs_seq ();
2944 break; 2512 break;
2945 case 0x9b: /* CSI */ 2513 case 0x9b: /* CSI */
2946 process_csi_seq (); 2514 process_csi_seq ();
2947 break; 2515 break;
2948 case 0x9d: /* CSI */ 2516 case 0x9d: /* OSC */
2949 process_osc_seq (); 2517 process_osc_seq ();
2950 break; 2518 break;
2951#endif 2519#endif
2952 } 2520 }
2953} 2521}
… …
3043 scr_charset_set (2, (unsigned int)cmd_getc ()); 2611 scr_charset_set (2, (unsigned int)cmd_getc ());
3044 break; 2612 break;
3045 case '+': 2613 case '+':
3046 scr_charset_set (3, (unsigned int)cmd_getc ()); 2614 scr_charset_set (3, (unsigned int)cmd_getc ());
3047 break; 2615 break;
3048#if ENABLE_FRILLS 2616#if !ENABLE_MINIMAL
3049 case '6': 2617 case '6':
3050 scr_backindex (); 2618 scr_backindex ();
3051 break; 2619 break;
3052#endif 2620#endif
3053 case '7': 2621 case '7':
3054 scr_cursor (SAVE); 2622 scr_cursor (SAVE);
3055 break; 2623 break;
3056 case '8': 2624 case '8':
3057 scr_cursor (RESTORE); 2625 scr_cursor (RESTORE);
3058 break; 2626 break;
3059#if ENABLE_FRILLS 2627#if !ENABLE_MINIMAL
3060 case '9': 2628 case '9':
3061 scr_forwardindex (); 2629 scr_forwardindex ();
3062 break; 2630 break;
3063#endif 2631#endif
3064 case '=': 2632 case '=':
… …
3074 break; 2642 break;
3075 2643
3076 /* 8.3.87: NEXT LINE */ 2644 /* 8.3.87: NEXT LINE */
3077 case C1_NEL: /* ESC E */ 2645 case C1_NEL: /* ESC E */
3078 { 2646 {
3079 unicode_t nlcr[] = { C0_LF, C0_CR }; 2647 wchar_t nlcr[] = { C0_LF, C0_CR };
3080 scr_add_lines (nlcr, 1, 2); 2648 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1);
3081 } 2649 }
3082 break; 2650 break;
3083 2651
3084 /* kidnapped escape sequence: Should be 8.3.48 */ 2652 /* kidnapped escape sequence: Should be 8.3.48 */
3085 case C1_ESA: /* ESC G */ 2653 case C1_ESA: /* ESC G */
… …
3107 process_dcs_seq (); 2675 process_dcs_seq ();
3108 break; 2676 break;
3109 2677
3110 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2678 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
3111 case C1_SCI: /* ESC Z */ 2679 case C1_SCI: /* ESC Z */
3112 tt_write ((const unsigned char *)ESCZ_ANSWER, 2680 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
3113 (unsigned int) (sizeof (ESCZ_ANSWER) - 1));
3114 break; /* steal obsolete ESC [ c */ 2681 break; /* steal obsolete ESC [ c */
3115 2682
3116 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2683 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */
3117 case C1_CSI: /* ESC [ */ 2684 case C1_CSI: /* ESC [ */
3118 process_csi_seq (); 2685 process_csi_seq ();
… …
3180rxvt_term::process_csi_seq () 2747rxvt_term::process_csi_seq ()
3181{ 2748{
3182 unicode_t ch, priv, i; 2749 unicode_t ch, priv, i;
3183 unsigned int nargs, p; 2750 unsigned int nargs, p;
3184 int n, ndef; 2751 int n, ndef;
3185 int arg[ESC_ARGS]; 2752 int arg[ESC_ARGS] = { };
3186 2753
3187 for (nargs = ESC_ARGS; nargs > 0;) 2754 nargs = 0;
3188 arg[--nargs] = 0;
3189 2755
3190 priv = 0; 2756 priv = 0;
3191 ch = cmd_getc (); 2757 ch = cmd_getc ();
3192 if (ch >= '<' && ch <= '?') 2758 if (ch >= '<' && ch <= '?')
2759 {
3193 { /* '<' '=' '>' '?' */ 2760 /* '<' '=' '>' '?' */
3194 priv = ch; 2761 priv = ch;
3195 ch = cmd_getc (); 2762 ch = cmd_getc ();
3196 } 2763 }
3197 2764
3198 /* read any numerical arguments */ 2765 /* read any numerical arguments */
… …
3227 ndef = get_byte_array_bit (csi_defaults, i); 2794 ndef = get_byte_array_bit (csi_defaults, i);
3228 for (p = 0; p < nargs; p++) 2795 for (p = 0; p < nargs; p++)
3229 if (arg[p] == -1) 2796 if (arg[p] == -1)
3230 arg[p] = ndef; 2797 arg[p] = ndef;
3231 2798
3232#ifdef DEBUG_CMD
3233 fprintf (stderr, "CSI ");
3234 for (p = 0; p < nargs; p++)
3235 fprintf (stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : "");
3236 fprintf (stderr, "%c\n", ch);
3237#endif
3238
3239 /* 2799 /*
3240 * private mode handling 2800 * private mode handling
3241 */ 2801 */
3242 if (priv) 2802 if (priv)
3243 { 2803 {
3244 switch (priv) 2804 switch (priv)
3245 { 2805 {
3246 case '>': 2806 case '>':
3247 if (ch == CSI_DA) /* secondary device attributes */ 2807 if (ch == CSI_DA) /* secondary device attributes */
3248 tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]); 2808 {
2809 // first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt,
2810 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
2811 //
2812 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
2813 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, 94 for urxvt <= 8.3, and 95 for later
2814 // versions.
2815 //
2816 tt_printf ("\033[>%d;95;0c", 'U');
2817 }
3249 break; 2818 break;
3250 case '?': 2819 case '?':
3251 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2820 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3252 process_terminal_mode (ch, priv, nargs, arg); 2821 process_terminal_mode (ch, priv, nargs, arg);
3253 break; 2822 break;
… …
3358 2927
3359 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */ 2928 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */
3360 arg[0] = -arg[0]; 2929 arg[0] = -arg[0];
3361 /* FALLTHROUGH */ 2930 /* FALLTHROUGH */
3362 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 2931 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
3363 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0); 2932 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
3364 break; 2933 break;
3365 2934
3366 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 2935 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
3367 tt_write ((const unsigned char *)VT100_ANS, 2936 tt_write (VT100_ANS, sizeof (VT100_ANS) - 1);
3368 (unsigned int) (sizeof (VT100_ANS) - 1));
3369 break; 2937 break;
3370 2938
3371 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 2939 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
3372 process_sgr_mode (nargs, arg); 2940 process_sgr_mode (nargs, arg);
3373 break; 2941 break;
… …
3380 break; 2948 break;
3381 case 6: /* CPR requested */ 2949 case 6: /* CPR requested */
3382 scr_report_position (); 2950 scr_report_position ();
3383 break; 2951 break;
3384 case 7: /* unofficial extension */ 2952 case 7: /* unofficial extension */
3385 if (options & Opt_insecure) 2953 if (option (Opt_insecure))
3386 tt_printf ("%-.250s\012", rs[Rs_display_name]); 2954 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3387 break; 2955 break;
3388 case 8: /* unofficial extension */ 2956 case 8: /* unofficial extension */
3389 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 2957 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3390 break; 2958 break;
… …
3457 break; 3025 break;
3458 case CSI_75: 3026 case CSI_75:
3459 scr_cursor (RESTORE); 3027 scr_cursor (RESTORE);
3460 break; 3028 break;
3461 3029
3462#if ENABLE_FRILLS 3030#if !ENABLE_MINIMAL
3463 case CSI_74: 3031 case CSI_74:
3464 process_window_ops (arg, nargs); 3032 process_window_ops (arg, nargs);
3465 break; 3033 break;
3466#endif 3034#endif
3467 3035
… …
3474 break; 3042 break;
3475 } 3043 }
3476} 3044}
3477/*}}} */ 3045/*}}} */
3478 3046
3479#if ENABLE_FRILLS 3047#if !ENABLE_MINIMAL
3480/* ARGSUSED */ 3048/* ARGSUSED */
3481void 3049void
3482rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3050rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3483{ 3051{
3484 int x, y; 3052 int x, y;
3485 XWindowAttributes wattr; 3053 XWindowAttributes wattr;
3486 Window wdummy; 3054 Window wdummy;
3487 dDisp; 3055
3056 dLocal (Display *, dpy);
3488 3057
3489 if (nargs == 0) 3058 if (nargs == 0)
3490 return; 3059 return;
3491 3060
3492 switch (args[0]) 3061 switch (args[0])
3493 { 3062 {
3494 /* 3063 /*
3495 * commands 3064 * commands
3496 */ 3065 */
3497 case 1: /* deiconify window */ 3066 case 1: /* deiconify window */
3498 XMapWindow (disp, TermWin.parent[0]); 3067 XMapWindow (dpy, parent[0]);
3499 break; 3068 break;
3500 case 2: /* iconify window */ 3069 case 2: /* iconify window */
3501 XIconifyWindow (disp, TermWin.parent[0], display->screen); 3070 XIconifyWindow (dpy, parent[0], display->screen);
3502 break; 3071 break;
3503 case 3: /* set position (pixels) */ 3072 case 3: /* set position (pixels) */
3504 XMoveWindow (disp, TermWin.parent[0], args[1], args[2]); 3073 XMoveWindow (dpy, parent[0], args[1], args[2]);
3505 break; 3074 break;
3506 case 4: /* set size (pixels) */ 3075 case 4: /* set size (pixels) */
3507 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3076 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3508 break; 3077 break;
3509 case 5: /* raise window */ 3078 case 5: /* raise window */
3510 XRaiseWindow (disp, TermWin.parent[0]); 3079 XRaiseWindow (dpy, parent[0]);
3511 break; 3080 break;
3512 case 6: /* lower window */ 3081 case 6: /* lower window */
3513 XLowerWindow (disp, TermWin.parent[0]); 3082 XLowerWindow (dpy, parent[0]);
3514 break; 3083 break;
3515 case 7: /* refresh window */ 3084 case 7: /* refresh window */
3516 scr_touch (true); 3085 scr_touch (true);
3517 break; 3086 break;
3518 case 8: /* set size (chars) */ 3087 case 8: /* set size (chars) */
3519 set_widthheight ((unsigned int) (args[2] * TermWin.fwidth), 3088 set_widthheight ((unsigned int) (args[2] * fwidth),
3520 (unsigned int) (args[1] * TermWin.fheight)); 3089 (unsigned int) (args[1] * fheight));
3521 break; 3090 break;
3522 3091
3523 //case 9: NYI, TODO, restore maximized window or maximize window 3092 //case 9: NYI, TODO, restore maximized window or maximize window
3524 default: 3093 default:
3525 if (args[0] >= 24) /* set height (chars) */ 3094 if (args[0] >= 24) /* set height (chars) */
3526 set_widthheight ((unsigned int)TermWin.width, 3095 set_widthheight ((unsigned int)width,
3527 (unsigned int) (args[1] * TermWin.fheight)); 3096 (unsigned int) (args[1] * fheight));
3528 break; 3097 break;
3529
3530 3098
3531 /* 3099 /*
3532 * reports - some output format copied from XTerm 3100 * reports - some output format copied from XTerm
3533 */ 3101 */
3534 case 11: /* report window state */ 3102 case 11: /* report window state */
3535 XGetWindowAttributes (disp, TermWin.parent[0], &wattr); 3103 XGetWindowAttributes (dpy, parent[0], &wattr);
3536 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3104 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3537 break; 3105 break;
3538 case 13: /* report window position */ 3106 case 13: /* report window position */
3539 XGetWindowAttributes (disp, TermWin.parent[0], &wattr); 3107 XGetWindowAttributes (dpy, parent[0], &wattr);
3540 XTranslateCoordinates (disp, TermWin.parent[0], wattr.root, 3108 XTranslateCoordinates (dpy, parent[0], wattr.root,
3541 -wattr.border_width, -wattr.border_width, 3109 -wattr.border_width, -wattr.border_width,
3542 &x, &y, &wdummy); 3110 &x, &y, &wdummy);
3543 tt_printf ("\033[3;%d;%dt", x, y); 3111 tt_printf ("\033[3;%d;%dt", x, y);
3544 break; 3112 break;
3545 case 14: /* report window size (pixels) */ 3113 case 14: /* report window size (pixels) */
3546 XGetWindowAttributes (disp, TermWin.parent[0], &wattr); 3114 XGetWindowAttributes (dpy, parent[0], &wattr);
3547 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3115 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3548 break; 3116 break;
3549 case 18: /* report text area size (chars) */ 3117 case 18: /* report text area size (chars) */
3550 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); 3118 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3551 break; 3119 break;
3552 case 19: /* report window size (chars) */ 3120 case 19: /* report window size (chars) */
3553 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol); 3121 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3554 break; 3122 break;
3555 case 20: /* report icon label */ 3123 case 20: /* report icon label */
3556 { 3124 {
3557 char *s; 3125 char *s;
3558 XGetIconName (disp, TermWin.parent[0], &s); 3126 XGetIconName (dpy, parent[0], &s);
3559 tt_printf ("\033]L%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3127 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3560 XFree (s); 3128 XFree (s);
3561 } 3129 }
3562 break; 3130 break;
3563 case 21: /* report window title */ 3131 case 21: /* report window title */
3564 { 3132 {
3565 char *s; 3133 char *s;
3566 XFetchName (disp, TermWin.parent[0], &s); 3134 XFetchName (dpy, parent[0], &s);
3567 tt_printf ("\033]l%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3135 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3568 XFree (s); 3136 XFree (s);
3569 } 3137 }
3570 break; 3138 break;
3571 } 3139 }
3572} 3140}
… …
3575/*----------------------------------------------------------------------*/ 3143/*----------------------------------------------------------------------*/
3576/* 3144/*
3577 * get input up until STRING TERMINATOR (or BEL) 3145 * get input up until STRING TERMINATOR (or BEL)
3578 * ends_how is terminator used. returned input must be free()'d 3146 * ends_how is terminator used. returned input must be free()'d
3579 */ 3147 */
3580unsigned char * 3148char *
3581rxvt_term::get_to_st (unicode_t &ends_how) 3149rxvt_term::get_to_st (unicode_t &ends_how)
3582{ 3150{
3583 unicode_t ch; 3151 unicode_t ch;
3584 bool seen_esc = false; 3152 bool seen_esc = false;
3585 unsigned int n = 0; 3153 unsigned int n = 0;
… …
3599 seen_esc = true; 3167 seen_esc = true;
3600 continue; 3168 continue;
3601 } 3169 }
3602 else if (ch == C0_BEL || ch == CHAR_ST) 3170 else if (ch == C0_BEL || ch == CHAR_ST)
3603 break; 3171 break;
3172 else if (ch == C0_SYN)
3173 ch = cmd_get8 ();
3604 else if (ch < 0x20) 3174 else if (ch < 0x20)
3605 return NULL; /* other control character - exit */ 3175 return NULL; /* other control character - exit */
3606 3176
3607 seen_esc = false; 3177 seen_esc = false;
3608 3178
3609 if (n >= STRING_MAX - 1) 3179 if (n >= STRING_MAX - 1)
3610 // stop at some sane length 3180 // stop at some sane length
3611 return NULL; 3181 return NULL;
3612 3182
3613 if (ch == C0_SYN)
3614 string[n++] = cmd_get8 ();
3615 else
3616 string[n++] = ch; 3183 string[n++] = ch;
3617 } 3184 }
3618 3185
3619 string[n++] = '\0'; 3186 string[n++] = '\0';
3620 3187
3621 ends_how = (ch == 0x5c ? C0_ESC : ch); 3188 ends_how = (ch == 0x5c ? C0_ESC : ch);
3622 3189
3623 return (unsigned char *)rxvt_wcstombs (string); 3190 return rxvt_wcstombs (string);
3624} 3191}
3625 3192
3626/*----------------------------------------------------------------------*/ 3193/*----------------------------------------------------------------------*/
3627/* 3194/*
3628 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3195 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3629 */ 3196 */
3630void 3197void
3631rxvt_term::process_dcs_seq () 3198rxvt_term::process_dcs_seq ()
3632{ 3199{
3633 unsigned char *s; 3200 char *s;
3634 unicode_t eh; 3201 unicode_t eh;
3635 3202
3636 /* 3203 /*
3637 * Not handled yet 3204 * Not handled yet
3638 */ 3205 */
… …
3657 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3224 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3658 arg = arg * 10 + (ch - '0'); 3225 arg = arg * 10 + (ch - '0');
3659 3226
3660 if (ch == ';') 3227 if (ch == ';')
3661 { 3228 {
3662 unsigned char *s = get_to_st (eh); 3229 char *s = get_to_st (eh);
3663 3230
3664 if (s) 3231 if (s)
3665 { 3232 {
3666 process_xterm_seq (arg, (char *)s, eh); 3233 process_xterm_seq (arg, s, eh);
3667 free (s); 3234 free (s);
3668 } 3235 }
3669 } 3236 }
3670} 3237}
3671 3238
3672void 3239void
3673rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp) 3240rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3674{ 3241{
3675 if (str[0] == '?' && !str[1]) 3242 if (str[0] == '?' && !str[1])
3676 { 3243 {
3677 unsigned short r, g, b; 3244 rgba c;
3678 pix_colors_focused[color].get (display, r, g, b); 3245 pix_colors_focused[color].get (c);
3246
3247#if XFT
3248 if (c.a != rgba::MAX_CC)
3249 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp);
3250 else
3251#endif
3679 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp); 3252 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp);
3680 } 3253 }
3681 else 3254 else
3682 set_window_color (color, str); 3255 set_window_color (color, str);
3683} 3256}
3684 3257
3685/* 3258/*
3686 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3259 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3687 */ 3260 */
3688void 3261void
3689rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp) 3262rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3690{ 3263{
3691 int changed = 0;
3692 int color; 3264 int color;
3693 char *buf, *name; 3265 char *buf, *name;
3694 bool query = str[0] == '?' && !str[1]; 3266 bool query = str[0] == '?' && !str[1];
3695 int saveop = op; 3267 int saveop = op;
3696 dDisp; 3268
3269 dLocal (Display *, dpy);
3697 3270
3698 assert (str != NULL); 3271 assert (str != NULL);
3272
3273 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END)))
3274 return;
3275
3699 switch (op) 3276 switch (op)
3700 { 3277 {
3701 case XTerm_name: 3278 case XTerm_name:
3702 set_title (str); 3279 set_title (str);
3703 /* FALLTHROUGH */ 3280 /* FALLTHROUGH */
… …
3717 unsigned long bytes_after; 3294 unsigned long bytes_after;
3718 unsigned char *value = 0; 3295 unsigned char *value = 0;
3719 const char *str = ""; 3296 const char *str = "";
3720 3297
3721 if (prop 3298 if (prop
3722 && XGetWindowProperty (disp, TermWin.parent[0], 3299 && XGetWindowProperty (dpy, parent[0],
3723 prop, 0, 1<<16, 0, AnyPropertyType, 3300 prop, 0, 1<<16, 0, AnyPropertyType,
3724 &actual_type, &actual_format, 3301 &actual_type, &actual_format,
3725 &nitems, &bytes_after, &value) == Success 3302 &nitems, &bytes_after, &value) == Success
3726 && actual_type != None 3303 && actual_type != None
3727 && actual_format == 8) 3304 && actual_format == 8)
3728 str = (const char *)(value); 3305 str = (const char *)(value);
3729 3306
3730 tt_printf ("\033]%d;%s%c", XTerm_property, str, resp); 3307 tt_printf ("\033]%d;%s%c", op, str, resp);
3731 3308
3732 XFree (value); 3309 XFree (value);
3733 } 3310 }
3734 else 3311 else
3735 { 3312 {
… …
3739 { 3316 {
3740 *eq = 0; 3317 *eq = 0;
3741 set_utf8_property (display->atom (str), eq + 1); 3318 set_utf8_property (display->atom (str), eq + 1);
3742 } 3319 }
3743 else 3320 else
3744 XDeleteProperty (disp, TermWin.parent[0], 3321 XDeleteProperty (dpy, parent[0],
3745 display->atom (str)); 3322 display->atom (str));
3746 } 3323 }
3747 break; 3324 break;
3748 3325
3749 case XTerm_Color: 3326 case XTerm_Color:
… …
3751 { 3328 {
3752 if ((name = strchr (buf, ';')) == NULL) 3329 if ((name = strchr (buf, ';')) == NULL)
3753 break; 3330 break;
3754 3331
3755 *name++ = '\0'; 3332 *name++ = '\0';
3756 color = atoi (buf); 3333 color = atoi (buf) + minCOLOR;
3757 3334
3758 if (color < 0 || color >= TOTAL_COLORS) 3335 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
3759 break; 3336 break;
3760 3337
3761 if ((buf = strchr (name, ';')) != NULL) 3338 if ((buf = strchr (name, ';')) != NULL)
3762 *buf++ = '\0'; 3339 *buf++ = '\0';
3763 3340
3764 if (name[0] == '?' && !name[1]) 3341 process_color_seq (op, color, name, resp);
3765 {
3766 unsigned short r, g, b;
3767 pix_colors_focused[color + minCOLOR].get (display, r, g, b);
3768 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3769 }
3770 else
3771 set_window_color (color + minCOLOR, name);
3772 } 3342 }
3773 break; 3343 break;
3774 case XTerm_Color00: 3344 case XTerm_Color00:
3775 process_color_seq (XTerm_Color00, Color_fg, str, resp); 3345 process_color_seq (op, Color_fg, str, resp);
3776 break; 3346 break;
3777 case XTerm_Color01: 3347 case XTerm_Color01:
3778 process_color_seq (XTerm_Color00, Color_bg, str, resp); 3348 process_color_seq (op, Color_bg, str, resp);
3779 break; 3349 break;
3780#ifndef NO_CURSORCOLOR 3350#ifndef NO_CURSORCOLOR
3781 case XTerm_Color_cursor: 3351 case XTerm_Color_cursor:
3782 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); 3352 process_color_seq (op, Color_cursor, str, resp);
3783 break; 3353 break;
3784#endif 3354#endif
3785 case XTerm_Color_pointer_fg: 3355 case XTerm_Color_pointer_fg:
3786 process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp); 3356 process_color_seq (op, Color_pointer_fg, str, resp);
3787 break; 3357 break;
3788 case XTerm_Color_pointer_bg: 3358 case XTerm_Color_pointer_bg:
3789 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); 3359 process_color_seq (op, Color_pointer_bg, str, resp);
3790 break; 3360 break;
3791#ifndef NO_BOLD_UNDERLINE_REVERSE 3361#ifndef NO_BOLD_UNDERLINE_REVERSE
3792 case XTerm_Color_BD:
3793 process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3794 break;
3795 case XTerm_Color_UL:
3796 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3797 break;
3798 case XTerm_Color_RV: 3362 case XTerm_Color_RV:
3799 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3363 process_color_seq (op, Color_RV, str, resp);
3364 break;
3365 case Rxvt_Color_BD:
3366 case URxvt_Color_BD:
3367 process_color_seq (op, Color_BD, str, resp);
3368 break;
3369 case Rxvt_Color_UL:
3370 case URxvt_Color_UL:
3371 process_color_seq (op, Color_UL, str, resp);
3800 break; 3372 break;
3801 case URxvt_Color_IT: 3373 case URxvt_Color_IT:
3802 process_color_seq (URxvt_Color_IT, Color_IT, str, resp); 3374 process_color_seq (op, Color_IT, str, resp);
3803 break; 3375 break;
3804#endif 3376#endif
3805#if TRANSPARENT && TINTING 3377#if ENABLE_TRANSPARENCY
3806 case URxvt_Color_tint: 3378 case URxvt_Color_tint:
3807 process_color_seq (URxvt_Color_tint, Color_tint, str, resp); 3379 process_color_seq (op, Color_tint, str, resp);
3808 check_our_parents (); 3380 {
3809 if (am_transparent) 3381 bool changed = false;
3810 want_full_refresh = want_refresh = 1; 3382 if (ISSET_PIXCOLOR (Color_tint))
3811 break; 3383 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]);
3812#endif 3384 else
3385 changed = bgPixmap.unset_tint ();
3386 if (changed)
3387 update_background ();
3388 }
3813 3389
3390 break;
3391#endif
3392
3393#if BG_IMAGE_FROM_FILE
3814 case XTerm_Pixmap: 3394 case Rxvt_Pixmap:
3815 if (*str != ';') 3395 if (!strcmp (str, "?"))
3816 { 3396 {
3817#if XPM_BACKGROUND 3397 char str[256];
3818 scale_pixmap (""); /* reset to default scaling */ 3398
3819 set_bgPixmap (str); /* change pixmap */ 3399 sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */
3820#endif 3400 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767),
3821 scr_touch (true); 3401 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767));
3402 process_xterm_seq (XTerm_title, str, CHAR_ST);
3822 } 3403 }
3823 while ((str = strchr (str, ';')) != NULL) 3404 else
3824 { 3405 {
3406 int changed = 0;
3407
3408 if (*str != ';')
3409 {
3410 /* reset to default scaling :*/
3411 bgPixmap.unset_geometry ();
3412 if (bgPixmap.set_file (str)) /* change pixmap */
3413 changed++;
3414 str = strchr (str, ';');
3415 if (str == NULL)
3416 bgPixmap.set_defaultGeometry ();
3417 }
3418 while (str)
3419 {
3825 str++; 3420 str++;
3826#if XPM_BACKGROUND 3421 if (bgPixmap.set_geometry (str))
3827 changed += scale_pixmap (str); 3422 changed++;
3828#endif 3423 str = strchr (str, ';');
3424 }
3425 if (changed)
3426 update_background ();
3829 } 3427 }
3830
3831 if (changed)
3832 {
3833#ifdef XPM_BACKGROUND
3834 resize_pixmap ();
3835#endif
3836 scr_touch (true);
3837 }
3838 break; 3428 break;
3429#endif
3839 3430
3840 case XTerm_restoreFG: 3431 case Rxvt_restoreFG:
3841 set_window_color (Color_fg, str); 3432 set_window_color (Color_fg, str);
3842 break; 3433 break;
3843 case XTerm_restoreBG: 3434 case Rxvt_restoreBG:
3844 set_window_color (Color_bg, str); 3435 set_window_color (Color_bg, str);
3845 break; 3436 break;
3846 3437
3847 case XTerm_logfile: 3438 case XTerm_logfile:
3848 // TODO, when secure mode? 3439 // TODO, when secure mode?
3849 break; 3440 break;
3850 3441
3851#ifdef MENUBAR
3852 case URxvt_Menu:
3853 if (options & Opt_insecure)
3854 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3855 break;
3856#endif
3857#if 0 3442#if 0
3858 case XTerm_dumpscreen: /* no error notices */ 3443 case Rxvt_dumpscreen: /* no error notices */
3859 { 3444 {
3860 int fd; 3445 int fd;
3861 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) 3446 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3862 { 3447 {
3863 scr_dump (fd); 3448 scr_dump (fd);
… …
3874 case URxvt_italicFont: 3459 case URxvt_italicFont:
3875 case URxvt_boldItalicFont: 3460 case URxvt_boldItalicFont:
3876#endif 3461#endif
3877 if (query) 3462 if (query)
3878 tt_printf ("\33]%d;%-.250s%c", saveop, 3463 tt_printf ("\33]%d;%-.250s%c", saveop,
3879 (options & Opt_insecure) && TermWin.fontset[op - URxvt_font]->fontdesc 3464 option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3880 ? TermWin.fontset[op - URxvt_font]->fontdesc : "", 3465 ? fontset[op - URxvt_font]->fontdesc : "",
3881 resp); 3466 resp);
3882 else 3467 else
3883 { 3468 {
3884 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3469 const char *&res = rs[Rs_font + (op - URxvt_font)];
3885 3470
… …
3887 allocated.push_back ((void *)res); 3472 allocated.push_back ((void *)res);
3888 set_fonts (); 3473 set_fonts ();
3889 } 3474 }
3890 break; 3475 break;
3891 3476
3892#if ENABLE_FRILLS 3477 case URxvt_version:
3478 if (query)
3479 tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%c",
3480 op,
3481 rs[Rs_name], VERSION[0], VERSION[2],
3482 resp);
3483 break;
3484
3485#if !ENABLE_MINIMAL
3893 case URxvt_locale: 3486 case URxvt_locale:
3894 if (query) 3487 if (query)
3895 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, (options & Opt_insecure) ? locale : "", resp); 3488 tt_printf ("\33]%d;%-.250s%c", op, option (Opt_insecure) ? locale : "", resp);
3896 else 3489 else
3897 { 3490 {
3898 set_locale (str); 3491 set_locale (str);
3899 pty.set_utf8_mode (enc_utf8); 3492 pty->set_utf8_mode (enc_utf8);
3900 init_xlocale (); 3493 init_xlocale ();
3901 } 3494 }
3902 break; 3495 break;
3903 3496
3904 case URxvt_view_up: 3497 case URxvt_view_up:
3905 case URxvt_view_down: 3498 case URxvt_view_down:
3499 {
3906 int lines = atoi (str); 3500 int lines = atoi (str);
3907 3501
3908 if (lines) 3502 if (lines)
3909 scr_page (op == URxvt_view_up ? UP : DN, lines); 3503 scr_page (op == URxvt_view_up ? UP : DN, lines);
3910 else 3504 else
3911 {
3912 scr_erase_savelines (); 3505 scr_erase_savelines ();
3913 } 3506 }
3914 3507
3508 break;
3509#endif
3510
3511#if ENABLE_PERL
3512 case URxvt_perl:
3513 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END)))
3514 ; // no responses yet
3915 break; 3515 break;
3916#endif 3516#endif
3917 } 3517 }
3918} 3518}
3919/*----------------------------------------------------------------------*/ 3519/*----------------------------------------------------------------------*/
… …
3950 return state; 3550 return state;
3951} 3551}
3952 3552
3953/* we're not using priv _yet_ */ 3553/* we're not using priv _yet_ */
3954void 3554void
3955rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg) 3555rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg)
3956{ 3556{
3957 unsigned int i, j; 3557 unsigned int i, j;
3958 int state; 3558 int state;
3959 3559
3960 static const struct 3560 static const struct
3961 { 3561 {
3962 const int argval; 3562 const int argval;
3963 const unsigned long bit; 3563 const unsigned long bit;
3964 }
3965
3966 argtopriv[] = { 3564 } argtopriv[] = {
3967 { 1, PrivMode_aplCUR }, 3565 { 1, PrivMode_aplCUR },
3968 { 2, PrivMode_vt52 }, 3566 { 2, PrivMode_vt52 },
3969 { 3, PrivMode_132 }, 3567 { 3, PrivMode_132 },
3970 { 4, PrivMode_smoothScroll }, 3568 { 4, PrivMode_smoothScroll },
3971 { 5, PrivMode_rVideo }, 3569 { 5, PrivMode_rVideo },
3972 { 6, PrivMode_relOrigin }, 3570 { 6, PrivMode_relOrigin },
3973 { 7, PrivMode_Autowrap }, 3571 { 7, PrivMode_Autowrap },
3974 // 8, bi-directional support mode 3572 // 8, bi-directional support mode
3975 { 9, PrivMode_MouseX10 }, 3573 { 9, PrivMode_MouseX10 },
3976#ifdef menuBar_esc
3977 { menuBar_esc, PrivMode_menuBar },
3978#endif
3979 // 18, 19 printing-related 3574 // 18, 19 printing-related
3980 { 25, PrivMode_VisibleCursor }, 3575 { 25, PrivMode_VisibleCursor },
3981#ifdef scrollBar_esc 3576#ifdef scrollBar_esc
3982 { scrollBar_esc, PrivMode_scrollBar }, 3577 { scrollBar_esc, PrivMode_scrollBar },
3983#endif 3578#endif
… …
3990 { 66, PrivMode_aplKP }, 3585 { 66, PrivMode_aplKP },
3991#ifndef NO_BACKSPACE_KEY 3586#ifndef NO_BACKSPACE_KEY
3992 { 67, PrivMode_BackSpace }, 3587 { 67, PrivMode_BackSpace },
3993#endif 3588#endif
3994 { 1000, PrivMode_MouseX11 }, 3589 { 1000, PrivMode_MouseX11 },
3995 // 1001 Use Hilite Mouse Tracking. NYI, TODO 3590 { 1002, PrivMode_MouseBtnEvent },
3996 // 1002 Use Cell Motion Mouse Tracking. NYI, TODO 3591 { 1003, PrivMode_MouseAnyEvent },
3997 // 1003 Use All Motion Mouse Tracking. NYI, TODO
3998 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3592 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3999 { 1011, PrivMode_Keypress }, // rxvt extension 3593 { 1011, PrivMode_Keypress }, // rxvt extension
4000 // 1035 enable modifiers for alt, numlock NYI 3594 // 1035 enable modifiers for alt, numlock NYI
4001 // 1036 send ESC for meta keys NYI 3595 // 1036 send ESC for meta keys NYI
4002 // 1037 send DEL for keypad delete NYI 3596 // 1037 send DEL for keypad delete NYI
… …
4028 } 3622 }
4029 3623
4030 /* extra handling for values with state unkept */ 3624 /* extra handling for values with state unkept */
4031 switch (arg[i]) 3625 switch (arg[i])
4032 { 3626 {
3627#if ENABLE_STYLES
3628 case 1021:
3629 set_option (Opt_intensityStyles, mode);
3630
3631 scr_touch (true);
3632 break;
3633#endif
4033 case 1048: /* alternative cursor save */ 3634 case 1048: /* alternative cursor save */
4034 case 1049: 3635 case 1049:
4035 if (options & Opt_secondaryScreen) 3636 if (option (Opt_secondaryScreen))
4036 if (mode == 0) 3637 if (mode == 0)
4037 scr_cursor (RESTORE); 3638 scr_cursor (RESTORE);
4038 else if (mode == 1) 3639 else if (mode == 1)
4039 scr_cursor (SAVE); 3640 scr_cursor (SAVE);
4040 break; 3641 break;
… …
4052 */ 3653 */
4053 PrivMode (1, PrivMode_vt52); 3654 PrivMode (1, PrivMode_vt52);
4054 break; 3655 break;
4055 case 3: /* 80/132 */ 3656 case 3: /* 80/132 */
4056 if (priv_modes & PrivMode_132OK) 3657 if (priv_modes & PrivMode_132OK)
4057 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height); 3658 set_widthheight (((state ? 132 : 80) * fwidth), height);
4058 break; 3659 break;
4059 case 4: /* smooth scrolling */ 3660 case 4: /* smooth scrolling */
4060 if (state)
4061 options &= ~Opt_jumpScroll;
4062 else
4063 options |= Opt_jumpScroll; 3661 set_option (Opt_jumpScroll, !state);
4064 break; 3662 break;
4065 case 5: /* reverse video */ 3663 case 5: /* reverse video */
4066 scr_rvideo_mode (state); 3664 scr_rvideo_mode (state);
4067 break; 3665 break;
4068 case 6: /* relative/absolute origins */ 3666 case 6: /* relative/absolute origins */
… …
4072 scr_autowrap (state); 3670 scr_autowrap (state);
4073 break; 3671 break;
4074 /* case 8: - auto repeat, can't do on a per window basis */ 3672 /* case 8: - auto repeat, can't do on a per window basis */
4075 case 9: /* X10 mouse reporting */ 3673 case 9: /* X10 mouse reporting */
4076 if (state) /* orthogonal */ 3674 if (state) /* orthogonal */
4077 priv_modes &= ~PrivMode_MouseX11; 3675 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
4078 break; 3676 break;
4079#ifdef menuBar_esc
4080 case menuBar_esc:
4081#ifdef MENUBAR
4082 map_menuBar (state);
4083#endif
4084 break;
4085#endif
4086#ifdef scrollBar_esc 3677#ifdef scrollBar_esc
4087 case scrollBar_esc: 3678 case scrollBar_esc:
4088 if (scrollbar_mapping (state)) 3679 if (scrollbar_mapping (state))
4089 { 3680 {
4090 resize_all_windows (0, 0, 0); 3681 resize_all_windows (0, 0, 0);
… …
4102 break; 3693 break;
4103 /* case 66: - application key pad */ 3694 /* case 66: - application key pad */
4104 /* case 67: - backspace key */ 3695 /* case 67: - backspace key */
4105 case 1000: /* X11 mouse reporting */ 3696 case 1000: /* X11 mouse reporting */
4106 if (state) /* orthogonal */ 3697 if (state) /* orthogonal */
4107 priv_modes &= ~PrivMode_MouseX10; 3698 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
4108 break; 3699 break;
4109#if 0
4110 case 1001: 3700 case 1002:
4111 break; /* X11 mouse highlighting */ 3701 case 1003:
4112#endif 3702 if (state)
3703 {
3704 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3705 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3706 vt_emask_mouse = PointerMotionMask;
3707 }
3708 else
3709 vt_emask_mouse = NoEventMask;
3710 vt_select_input ();
3711 break;
4113 case 1010: /* scroll to bottom on TTY output inhibit */ 3712 case 1010: /* scroll to bottom on TTY output inhibit */
4114 if (state)
4115 options &= ~Opt_scrollTtyOutput;
4116 else
4117 options |= Opt_scrollTtyOutput; 3713 set_option (Opt_scrollTtyOutput, !state);
4118 break; 3714 break;
4119 case 1011: /* scroll to bottom on key press */ 3715 case 1011: /* scroll to bottom on key press */
4120 if (state)
4121 options |= Opt_scrollTtyKeypress; 3716 set_option (Opt_scrollTtyKeypress, state);
4122 else
4123 options &= ~Opt_scrollTtyKeypress;
4124 break; 3717 break;
4125 case 1047: /* secondary screen w/ clearing last */ 3718 case 1047: /* secondary screen w/ clearing last */
4126 if (options & Opt_secondaryScreen) 3719 if (option (Opt_secondaryScreen))
4127 if (current_screen != PRIMARY) 3720 if (current_screen != PRIMARY)
4128 scr_erase_screen (2); 3721 scr_erase_screen (2);
4129 scr_change_screen (state); 3722 scr_change_screen (state);
4130 break; 3723 break;
4131 case 1049: /* secondary screen w/ clearing first */ 3724 case 1049: /* secondary screen w/ clearing first */
4132 scr_change_screen (state); 3725 scr_change_screen (state);
4133 if (options & Opt_secondaryScreen) 3726 if (option (Opt_secondaryScreen))
4134 if (current_screen != PRIMARY) 3727 if (current_screen != PRIMARY)
4135 scr_erase_screen (2); 3728 scr_erase_screen (2);
4136 break; 3729 break;
4137 default: 3730 default:
4138 break; 3731 break;
… …
4266 scr_color (Color_bg, Color_bg); 3859 scr_color (Color_bg, Color_bg);
4267 break; 3860 break;
4268 3861
4269 //case 50: // not variable spacing 3862 //case 50: // not variable spacing
4270 3863
4271#ifndef NO_BRIGHTCOLOR 3864#if !ENABLE_MINIMAL
4272 case 90: 3865 case 90:
4273 case 91: /* set bright fg color */ 3866 case 91: /* set bright fg color */
4274 case 92: 3867 case 92:
4275 case 93: 3868 case 93:
4276 case 94: 3869 case 94:
… …
4288 case 106: 3881 case 106:
4289 case 107: 3882 case 107:
4290 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg); 3883 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);
4291 break; 3884 break;
4292#endif 3885#endif
4293
4294 } 3886 }
4295 } 3887 }
4296} 3888}
4297/*}}} */ 3889/*}}} */
4298 3890
… …
4301rxvt_term::process_graphics () 3893rxvt_term::process_graphics ()
4302{ 3894{
4303 unicode_t ch, cmd = cmd_getc (); 3895 unicode_t ch, cmd = cmd_getc ();
4304 3896
4305 if (cmd == 'Q') 3897 if (cmd == 'Q')
3898 {
4306 { /* query graphics */ 3899 /* query graphics */
4307 tt_printf ("\033G0\012"); /* no graphics */ 3900 tt_printf ("\033G0\012"); /* no graphics */
4308 return; 3901 return;
4309 } 3902 }
4310 /* swallow other graphics sequences until terminating ':' */ 3903 /* swallow other graphics sequences until terminating ':' */
4311 do 3904 do
… …
4322 */ 3915 */
4323void 3916void
4324rxvt_term::tt_printf (const char *fmt,...) 3917rxvt_term::tt_printf (const char *fmt,...)
4325{ 3918{
4326 va_list arg_ptr; 3919 va_list arg_ptr;
4327 unsigned char buf[256]; 3920 char buf[256];
4328 3921
4329 va_start (arg_ptr, fmt); 3922 va_start (arg_ptr, fmt);
4330 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 3923 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
4331 va_end (arg_ptr); 3924 va_end (arg_ptr);
4332 tt_write (buf, strlen (buf)); 3925 tt_write (buf, strlen (buf));
… …
4337 * or generated by us in response to a query ESC sequence. 3930 * or generated by us in response to a query ESC sequence.
4338 */ 3931 */
4339const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 3932const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4340 3933
4341void 3934void
4342rxvt_term::tt_write (const unsigned char *data, unsigned int len) 3935rxvt_term::tt_write (const char *data, unsigned int len)
4343{ 3936{
3937 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
3938 return;
3939
3940 if (pty->pty < 0)
3941 return;
3942
4344 if (v_buflen == 0) 3943 if (v_buflen == 0)
4345 { 3944 {
4346 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE)); 3945 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
4347 3946
4348 if ((unsigned int)written == len) 3947 if ((unsigned int)written == len)
4349 return; 3948 return;
4350 3949
4351 data += written; 3950 data += written;
4352 len -= written; 3951 len -= written;
4353 } 3952 }
4354 3953
4355 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len); 3954 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
4356 3955
4357 memcpy (v_buffer + v_buflen, data, len); 3956 memcpy (v_buffer + v_buflen, data, len);
4358 v_buflen += len; 3957 v_buflen += len;
4359 3958
4360 pty_ev.set (EVENT_READ | EVENT_WRITE); 3959 pty_ev.set (ev::READ | ev::WRITE);
4361} 3960}
4362 3961
4363void rxvt_term::pty_write () 3962void rxvt_term::pty_write ()
4364{ 3963{
4365 int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE)); 3964 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4366 3965
4367 if (written > 0) 3966 if (written > 0)
4368 { 3967 {
4369 v_buflen -= written; 3968 v_buflen -= written;
4370 3969
4371 if (v_buflen == 0) 3970 if (v_buflen == 0)
4372 { 3971 {
4373 free (v_buffer); 3972 free (v_buffer);
4374 v_buffer = 0; 3973 v_buffer = 0;
4375 v_buflen = 0;
4376 3974
4377 pty_ev.set (EVENT_READ); 3975 pty_ev.set (ev::READ);
4378 return; 3976 return;
4379 } 3977 }
4380 3978
4381 memmove (v_buffer, v_buffer + written, v_buflen); 3979 memmove (v_buffer, v_buffer + written, v_buflen);
4382 } 3980 }
4383 else if (written != -1 || (errno != EAGAIN && errno != EINTR)) 3981 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4384 // original code just ignores this... 3982 pty_ev.set (ev::READ);
4385 destroy ();
4386} 3983}
4387 3984
4388/*----------------------- end-of-file (C source) -----------------------*/ 3985/*----------------------- end-of-file (C source) -----------------------*/
4389 3986

Diff Legend

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