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.170 by root, Sun Nov 21 20:19:24 2004 UTC vs.
Revision 1.348 by sasha, Thu Aug 16 21:26:20 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-2004 Marc Lehmann <pcg@goof.com> 30 * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com>
31 * 31 *
32 * This program is free software; you can redistribute it and/or modify 32 * This program is free software; you can redistribute it and/or modify
33 * it under the terms of the GNU General Public License as published by 33 * it under the terms of the GNU General Public License as published by
34 * the Free Software Foundation; either version 2 of the License, or 34 * the Free Software Foundation; either version 2 of the License, or
35 * (at your option) any later version. 35 * (at your option) any later version.
… …
43 * along with this program; if not, write to the Free Software 43 * along with this program; if not, write to the Free Software
44 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 44 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
45 *----------------------------------------------------------------------*/ 45 *----------------------------------------------------------------------*/
46 46
47/*{{{ includes: */ 47/*{{{ includes: */
48#include "../config.h" /* NECESSARY */ 48#include "../config.h"
49#include "rxvt.h" /* NECESSARY */ 49#include "rxvt.h"
50#include "rxvtperl.h"
50#include "version.h" 51#include "version.h"
51#include "command.h" 52#include "command.h"
52 53
53#include <wchar.h> 54#ifdef KEYSYM_RESOURCE
55# include "keyboard.h"
56#endif
57
58#include <csignal>
59
60#if LINUX_YIELD_HACK
61# include <ctime>
62#endif
54 63
55/*----------------------------------------------------------------------*/ 64/*----------------------------------------------------------------------*/
56 65
57#define IS_CONTROL(ch) !((ch) & 0xffffff60UL) 66#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
58
59// exception thrown when the command parser runs out of input data
60class out_of_input { } out_of_input;
61 67
62#if ENABLE_FRILLS || ISO_14755 68#if ENABLE_FRILLS || ISO_14755
63 69
64#define ISO_14755_STARTED 0x80000000UL 70#define ISO_14755_STARTED 0x80000000UL
65#define ISO_14755_51 0x40000000UL // basic (section 5.1) 71#define ISO_14755_51 0x40000000UL // basic (section 5.1)
… …
89 XK_Shift_L, 0x21e7, 95 XK_Shift_L, 0x21e7,
90 XK_Shift_R, 0x21e7, 96 XK_Shift_R, 0x21e7,
91 97
92 XK_Shift_Lock, 0x21eb, 98 XK_Shift_Lock, 0x21eb,
93 XK_ISO_Lock, 0x21eb, 99 XK_ISO_Lock, 0x21eb,
94 XK_ISO_Lock, 0x21eb,
95 XK_Caps_Lock, 0x21ec, 100 XK_Caps_Lock, 0x21ec,
96 XK_Num_Lock, 0x21ed, 101 XK_Num_Lock, 0x21ed,
97 XK_ISO_Level3_Shift, 0x21ee, 102 XK_ISO_Level3_Shift, 0x21ee,
98 XK_ISO_Level3_Lock, 0x21ef, 103 XK_ISO_Level3_Lock, 0x21ef,
99 XK_ISO_Group_Lock, 0x21f0, 104 XK_ISO_Group_Lock, 0x21f0,
… …
113 XK_Escape, 0x238b, 118 XK_Escape, 0x238b,
114 XK_Undo, 0x238c, 119 XK_Undo, 0x238c,
115 XK_Print, 0x2399, 120 XK_Print, 0x2399,
116 121
117 XK_space, 0x2423, 122 XK_space, 0x2423,
123
124#ifdef XK_KP_Begin
125 XK_KP_Prior, 0x21de,
126 XK_KP_Next, 0x21df,
127 XK_KP_Begin, 0x2320,
128 XK_KP_Insert, 0x2380,
129 XK_KP_Delete, 0x2326,
118 XK_KP_Space, 0x2422, 130 XK_KP_Space, 0x2422,
131#endif
119 0, 132 0,
120}; 133};
121 134
122void 135void
123rxvt_term::iso14755_54 (int x, int y) 136rxvt_term::iso14755_54 (int x, int y)
124{ 137{
125 x = Pixel2Col (x); 138 x = Pixel2Col (x);
126 y = Pixel2Row (y); 139 y = Pixel2Row (y);
127 140
128 if (x < 0 || x >= TermWin.ncol 141 if (!IN_RANGE_EXC (x, 0, ncol)
129 || y < 0 || y >= TermWin.nrow) 142 || !IN_RANGE_EXC (y, 0, nrow))
130 return; 143 return;
131 144
132 for (;;) 145 for (;;)
133 { 146 {
134 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];
135 150
136 if (t != NOCHAR || !x) 151 if (t != NOCHAR || !x)
137 { 152 {
138 iso14755_51 (screen.text[y + TermWin.saveLines - TermWin.view_start][x], 153 iso14755_51 (l.t[x], l.r[x], x, y);
139 screen.rend[y + TermWin.saveLines - TermWin.view_start][x]);
140 iso14755buf = ISO_14755_54; 154 iso14755buf = ISO_14755_54;
141 break; 155 break;
142 } 156 }
143 157
144 x--; 158 x--;
145 } 159 }
146
147} 160}
148#endif
149 161
150#if ENABLE_OVERLAY
151void 162void
152rxvt_term::iso14755_51 (unicode_t ch, rend_t r) 163rxvt_term::iso14755_51 (unicode_t ch, rend_t r, int x, int y)
153{ 164{
154 rxvt_fontset *fs = FONTSET (r); 165 rxvt_fontset *fs = FONTSET (r);
155 rxvt_font *f = (*fs)[fs->find_font (ch)]; 166 rxvt_font *f = (*fs)[fs->find_font (ch)];
156 wchar_t *chr, *alloc, ch2; 167 wchar_t *chr, *alloc, ch2, *fname;
157 int len; 168 int len;
158 169
170 fname = rxvt_utf8towcs (f->name);
171
159#if ENABLE_COMBINING 172# if ENABLE_COMBINING
160 if (IS_COMPOSE (ch)) 173 if (IS_COMPOSE (ch))
161 { 174 {
162 len = rxvt_composite.expand (ch, 0); 175 len = rxvt_composite.expand (ch, 0);
163 alloc = chr = new wchar_t[len]; 176 alloc = chr = new wchar_t[len];
164 rxvt_composite.expand (ch, chr); 177 rxvt_composite.expand (ch, chr);
165 } 178 }
166 else 179 else
167#endif 180# endif
168 { 181 {
169 ch2 = ch; 182 ch2 = ch;
170 183
171 alloc = 0; 184 alloc = 0;
172 chr = &ch2; 185 chr = &ch2;
173 len = 1; 186 len = 1;
174 } 187 }
175 188
176 int width = strlen (f->name); 189 char attr[80]; // plenty
177 190
178 scr_overlay_new (0, -1, width < 8+5 ? 8+5 : width, len + 1); 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
201 int width = wcswidth (fname, wcslen (fname));
202
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);
179 213
180 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r)); 214 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));
181 215
182 for (int y = 0; y < len; y++) 216 for (int y = 0; y < len; y++)
183 { 217 {
… …
186 ch = *chr++; 220 ch = *chr++;
187 221
188 sprintf (buf, "%8x", ch); 222 sprintf (buf, "%8x", ch);
189 scr_overlay_set (0, y, buf); 223 scr_overlay_set (0, y, buf);
190 scr_overlay_set (9, y, '='); 224 scr_overlay_set (9, y, '=');
191#if !UNICODE3 225# if !UNICODE3
192 if (ch >= 0x10000) 226 if (ch >= 0x10000)
193 ch = 0xfffd; 227 ch = 0xfffd;
194#endif 228# endif
195 scr_overlay_set (11, y, ch, r); 229 scr_overlay_set (11, y, ch, r);
230
231 if (WCWIDTH (ch) >= 2)
196 scr_overlay_set (12, y, NOCHAR, r); 232 scr_overlay_set (12, y, NOCHAR, r);
197 } 233 }
198 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);
199 scr_overlay_set (0, len, f->name); 241 scr_overlay_set (0, len + 1, fname);
200 242
243 free (fname);
244
201#if ENABLE_COMBINING 245# if ENABLE_COMBINING
202 if (alloc) 246 if (alloc)
203 delete [] alloc; 247 delete [] alloc;
204#endif 248# endif
205} 249}
206#endif 250#endif
207 251
208void 252void
209rxvt_term::commit_iso14755 () 253rxvt_term::commit_iso14755 ()
… …
226 mb[0] = ch[0]; 270 mb[0] = ch[0];
227 len = 1; 271 len = 1;
228 } 272 }
229 273
230 if (len > 0) 274 if (len > 0)
231 tt_write ((unsigned char *)mb, len); 275 tt_write (mb, len);
232 else 276 else
233 scr_bell (); 277 scr_bell ();
234 } 278 }
235 279
236 iso14755buf = 0; 280 iso14755buf = 0;
… …
253 297
254 return -1; 298 return -1;
255} 299}
256#endif 300#endif
257 301
258/*{{{ Convert the keypress event into a string */
259void 302void
260rxvt_term::lookup_key (XKeyEvent &ev) 303rxvt_term::key_press (XKeyEvent &ev)
261{ 304{
262 int ctrl, meta, shft, len; 305 int ctrl, meta, shft, len;
263 unsigned int newlen; 306 unsigned int newlen;
264 KeySym keysym; 307 KeySym keysym;
265#ifdef DEBUG_CMD
266 static int debug_key = 1; /* accessible by a debugger only */
267#endif
268 int valid_keysym; 308 int valid_keysym;
269 unsigned char kbuf[KBUFSZ]; 309 char kbuf[KBUFSZ];
310
311#if ISO_14755
312 if (iso14755buf & ISO_14755_52)
313 return;
314#endif
270 315
271 /* 316 /*
272 * 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
273 * escape sequence to toggle the Keypad. 318 * escape sequence to toggle the Keypad.
274 * 319 *
275 * Always permit `shift' to override the current setting 320 * Always permit `shift' to override the current setting
276 */ 321 */
277 shft = (ev.state & ShiftMask); 322 shft = ev.state & ShiftMask;
278 ctrl = (ev.state & ControlMask); 323 ctrl = ev.state & ControlMask;
279 meta = (ev.state & ModMetaMask); 324 meta = ev.state & ModMetaMask;
280 325
281 if (numlock_state || (ev.state & ModNumLockMask)) 326 if (numlock_state || (ev.state & ModNumLockMask))
282 { 327 {
283 numlock_state = (ev.state & ModNumLockMask); 328 numlock_state = (ev.state & ModNumLockMask);
284 PrivMode ((!numlock_state), PrivMode_aplKP); 329 PrivMode ((!numlock_state), PrivMode_aplKP);
… …
292 Status status_return; 337 Status status_return;
293 338
294#if 0 339#if 0
295#ifdef X_HAVE_UTF8_STRING 340#ifdef X_HAVE_UTF8_STRING
296 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
297 len = Xutf8LookupString (Input_Context, &ev, (char *)kbuf, 342 len = Xutf8LookupString (Input_Context, &ev, kbuf,
298 KBUFSZ, &keysym, &status_return); 343 KBUFSZ, &keysym, &status_return);
299 else 344 else
300#endif 345#endif
301#endif 346#endif
302 { 347 {
… …
304 349
305 // the XOpenIM manpage lies about hardcoding the locale 350 // the XOpenIM manpage lies about hardcoding the locale
306 // at the point of XOpenIM, so temporarily switch locales 351 // at the point of XOpenIM, so temporarily switch locales
307 if (rs[Rs_imLocale]) 352 if (rs[Rs_imLocale])
308 SET_LOCALE (rs[Rs_imLocale]); 353 SET_LOCALE (rs[Rs_imLocale]);
354
309 // assume wchar_t == unicode or better 355 // assume wchar_t == unicode or better
310 len = XwcLookupString (Input_Context, &ev, wkbuf, 356 len = XwcLookupString (Input_Context, &ev, wkbuf,
311 KBUFSZ, &keysym, &status_return); 357 KBUFSZ, &keysym, &status_return);
358
312 if (rs[Rs_imLocale]) 359 if (rs[Rs_imLocale])
313 SET_LOCALE (locale); 360 SET_LOCALE (locale);
314 361
315 if (status_return == XLookupChars 362 if (status_return == XLookupChars
316 || status_return == XLookupBoth) 363 || status_return == XLookupBoth)
… …
337 || status_return == XLookupBoth; 384 || status_return == XLookupBoth;
338 } 385 }
339 else 386 else
340#endif 387#endif
341 { 388 {
342 len = XLookupString (&ev, (char *)kbuf, KBUFSZ, &keysym, &compose); 389 len = XLookupString (&ev, kbuf, KBUFSZ, &keysym, &compose);
343 valid_keysym = keysym != NoSymbol; 390 valid_keysym = keysym != NoSymbol;
344 } 391 }
345 392
346 if (valid_keysym) 393 if (valid_keysym)
347 { 394 {
395#ifdef KEYSYM_RESOURCE
396 if (keyboard->dispatch (this, keysym, ev.state))
397 return;
398#endif
399
348 if (TermWin.saveLines) 400 if (saveLines)
349 { 401 {
350#ifdef UNSHIFTED_SCROLLKEYS 402#ifdef UNSHIFTED_SCROLLKEYS
351 if (!ctrl && !meta) 403 if (!ctrl && !meta)
352#else 404#else
353 if (IS_SCROLL_MOD) 405 if (IS_SCROLL_MOD)
354#endif 406#endif
355 { 407 {
356 int lnsppg; 408 int lnsppg;
357 409
358#ifdef PAGING_CONTEXT_LINES 410#ifdef PAGING_CONTEXT_LINES
359 lnsppg = TermWin.nrow - PAGING_CONTEXT_LINES; 411 lnsppg = nrow - PAGING_CONTEXT_LINES;
360#else 412#else
361 lnsppg = TermWin.nrow * 4 / 5; 413 lnsppg = nrow * 4 / 5;
362#endif 414#endif
363 if (keysym == XK_Prior) 415 if (keysym == XK_Prior)
364 { 416 {
365 scr_page (UP, lnsppg); 417 scr_page (UP, lnsppg);
366 return; 418 return;
… …
394 scr_move_to (0, 1); 446 scr_move_to (0, 1);
395 return; 447 return;
396 } 448 }
397 else if (keysym == XK_End) 449 else if (keysym == XK_End)
398 { 450 {
399 scr_move_to (1, 0); 451 scr_move_to (1, 1);
400 return; 452 return;
401 } 453 }
402 } 454 }
403#endif 455#endif
404 } 456 }
… …
415 { 467 {
416 switch (keysym) 468 switch (keysym)
417 { 469 {
418 /* normal XTerm key bindings */ 470 /* normal XTerm key bindings */
419 case XK_Insert: /* Shift+Insert = paste mouse selection */ 471 case XK_Insert: /* Shift+Insert = paste mouse selection */
420 selection_request (ev.time, 0, 0); 472 selection_request (ev.time);
421 return; 473 return;
422#if TODO 474#if TODO
423 /* rxvt extras */ 475 /* rxvt extras */
424 case XK_KP_Add: /* Shift+KP_Add = bigger font */ 476 case XK_KP_Add: /* Shift+KP_Add = bigger font */
425 change_font (FONT_UP); 477 change_font (FONT_UP);
… …
444 { 496 {
445 commit_iso14755 (); 497 commit_iso14755 ();
446 iso14755buf = ISO_14755_51; 498 iso14755buf = ISO_14755_51;
447# if ISO_14755 499# if ISO_14755
448 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);
449# endif 509# endif
450 return; 510 return;
451 } 511 }
452 else if ((hv = hex_keyval (ev)) >= 0) 512 else if ((hv = hex_keyval (ev)) >= 0)
453 { 513 {
… …
458# endif 518# endif
459 return; 519 return;
460 } 520 }
461 else 521 else
462 { 522 {
463# if ENABLE_OVERLAY 523# if ISO_14755
464 scr_overlay_off (); 524 scr_overlay_off ();
465# endif 525# endif
466 iso14755buf = 0; 526 iso14755buf = 0;
467 } 527 }
468 } 528 }
469 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R)) 529 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R))
470 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))) 530 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R)))
471 if (!(iso14755buf & ISO_14755_STARTED)) 531 if (!(iso14755buf & ISO_14755_STARTED))
472 { 532 {
473 iso14755buf |= ISO_14755_STARTED; 533 iso14755buf |= ISO_14755_STARTED;
474# if ENABLE_OVERLAY 534# if ISO_14755
475 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1); 535 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);
476 scr_overlay_set (0, 0, "ISO 14755 mode"); 536 scr_overlay_set (0, 0, "ISO 14755 mode");
477# endif 537# endif
478 } 538 }
479#endif 539#endif
480 540
481#ifdef PRINTPIPE 541#ifdef PRINTPIPE
482 if (keysym == XK_Print) 542 if (keysym == XK_Print)
483 { 543 {
484 scr_printscreen (ctrl | shft); 544 scr_printscreen (ctrl | shft);
485 return; 545 return;
486 } 546 }
487#endif 547#endif
488 548
489 if (keysym >= 0xFF00 && keysym <= 0xFFFF) 549 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
490 { 550 {
491#ifdef KEYSYM_RESOURCE
492 if (! (shft | ctrl) && Keysym_map[keysym & 0xFF] != NULL)
493 {
494 unsigned int l;
495 const unsigned char *kbuf0;
496
497 kbuf0 = (Keysym_map[keysym & 0xFF]);
498 l = (unsigned int)*kbuf0++;
499
500 /* escape prefix */
501 if (meta
502# ifdef META8_OPTION
503 && meta_char == C0_ESC
504# endif
505 )
506 {
507 const unsigned char ch = C0_ESC;
508 tt_write (&ch, 1);
509 }
510
511 tt_write (kbuf0, l);
512 return;
513 }
514 else
515#endif
516 { 551 {
517 newlen = 1; 552 newlen = 1;
518 switch (keysym) 553 switch (keysym)
519 { 554 {
520#ifndef NO_BACKSPACE_KEY 555#ifndef NO_BACKSPACE_KEY
… …
528 else 563 else
529 strcpy (kbuf, key_backspace); 564 strcpy (kbuf, key_backspace);
530 break; 565 break;
531#endif 566#endif
532#ifndef NO_DELETE_KEY 567#ifndef NO_DELETE_KEY
568# ifdef XK_KP_Prior
569 case XK_KP_Delete:
570 /* allow shift to override */
571 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
572 {
573 strcpy (kbuf, "\033On");
574 break;
575 }
576 /* FALLTHROUGH */
577# endif
533 case XK_Delete: 578 case XK_Delete:
534 strcpy (kbuf, key_delete); 579 strcpy (kbuf, key_delete);
535 break; 580 break;
536#endif 581#endif
537 case XK_Tab: 582 case XK_Tab:
… …
640#ifdef XK_KP_Begin 685#ifdef XK_KP_Begin
641 case XK_KP_Begin: 686 case XK_KP_Begin:
642 strcpy (kbuf, "\033Ou"); 687 strcpy (kbuf, "\033Ou");
643 break; 688 break;
644 689
645 case XK_KP_Insert:
646 strcpy (kbuf, "\033Op");
647 break;
648
649 case XK_KP_Delete:
650 strcpy (kbuf, "\033On");
651 break;
652#endif 690#endif
653 case XK_KP_F1: /* "\033OP" */ 691 case XK_KP_F1: /* "\033OP" */
654 case XK_KP_F2: /* "\033OQ" */ 692 case XK_KP_F2: /* "\033OQ" */
655 case XK_KP_F3: /* "\033OR" */ 693 case XK_KP_F3: /* "\033OR" */
656 case XK_KP_F4: /* "\033OS" */ 694 case XK_KP_F4: /* "\033OS" */
… …
688 break; 726 break;
689 727
690 case XK_Find: 728 case XK_Find:
691 strcpy (kbuf, "\033[1~"); 729 strcpy (kbuf, "\033[1~");
692 break; 730 break;
731
732#ifdef XK_KP_Insert
733 case XK_KP_Insert:
734 /* allow shift to override */
735 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
736 {
737 strcpy (kbuf, "\033Op");
738 break;
739 }
740 /* FALLTHROUGH */
741#endif
693 case XK_Insert: 742 case XK_Insert:
694 strcpy (kbuf, "\033[2~"); 743 strcpy (kbuf, "\033[2~");
695 break; 744 break;
696#ifdef DXK_Remove /* support for DEC remove like key */ 745#ifdef DXK_Remove /* support for DEC remove like key */
697 case DXK_Remove: 746 case DXK_Remove:
… …
787#undef FKEY 836#undef FKEY
788 default: 837 default:
789 newlen = 0; 838 newlen = 0;
790 break; 839 break;
791 } 840 }
841
792 if (newlen) 842 if (newlen)
793 len = strlen (kbuf); 843 len = strlen (kbuf);
794 } 844 }
795 845
796 /* 846 /*
… …
805 else if (ctrl && keysym == XK_minus) 855 else if (ctrl && keysym == XK_minus)
806 { 856 {
807 len = 1; 857 len = 1;
808 kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */ 858 kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */
809 } 859 }
860 else if (keysym == XK_ISO_Left_Tab)
861 {
862 strcpy (kbuf, "\033[Z");
863 len = 3;
864 }
810 else 865 else
811 { 866 {
812#ifdef META8_OPTION 867#ifdef META8_OPTION
813 /* set 8-bit on */ 868 /* set 8-bit on */
814 if (meta && (meta_char == 0x80)) 869 if (meta && (meta_char == 0x80))
815 { 870 {
816 unsigned char *ch; 871 char *ch;
817 872
818 for (ch = kbuf; ch < kbuf + len; ch++) 873 for (ch = kbuf; ch < kbuf + len; ch++)
819 *ch |= 0x80; 874 *ch |= 0x80;
820 875
821 meta = 0; 876 meta = 0;
… …
823#endif 878#endif
824 /* nil */ ; 879 /* nil */ ;
825 } 880 }
826 } 881 }
827 882
883 if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_INT, keysym, DT_STR_LEN, kbuf, len, DT_END)))
884 return;
885
828 if (len <= 0) 886 if (len <= 0)
829 return; /* not mapped */ 887 return; /* not mapped */
830 888
831 if (options & Opt_scrollTtyKeypress) 889 if (option (Opt_scrollTtyKeypress))
832 if (TermWin.view_start) 890 if (view_start)
833 { 891 {
834 TermWin.view_start = 0; 892 view_start = 0;
835 want_refresh = 1; 893 want_refresh = 1;
836 } 894 }
837 895
838 /* 896 /*
839 * these modifications only affect the static keybuffer 897 * these modifications only affect the static keybuffer
… …
854#ifdef META8_OPTION 912#ifdef META8_OPTION
855 && meta_char == C0_ESC 913 && meta_char == C0_ESC
856#endif 914#endif
857 ) 915 )
858 { 916 {
859 const unsigned char ch = C0_ESC; 917 const char ch = C0_ESC;
860 tt_write (&ch, 1); 918 tt_write (&ch, 1);
861 } 919 }
862 920
863#if defined(DEBUG_CMD)
864 /* Display keyboard buffer contents */
865 unsigned char *p;
866 int i;
867
868 fprintf (stderr, "key 0x%04X [%d]: `", (unsigned int)keysym, len);
869 for (i = 0, p = kbuf; i < len; i++, p++)
870 fprintf (stderr, (*p >= ' ' && *p < '\177' ? "%c" : "\\%03o"), *p);
871 fprintf (stderr, "'\n");
872#endif /* DEBUG_CMD */
873 tt_write (kbuf, (unsigned int)len); 921 tt_write (kbuf, (unsigned int)len);
874} 922}
875/*}}} */
876 923
877#if (MENUBAR_MAX) 924void
878/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */ 925rxvt_term::key_release (XKeyEvent &ev)
879/* attempt to `write' count to the input buffer */ 926{
927#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
928 KeySym keysym;
929
930 keysym = XLookupKeysym (&ev, ev.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
931#endif
932
933#if ENABLE_FRILLS || ISO_14755
934 // ISO 14755 support
935 if (iso14755buf)
936 if (iso14755buf & ISO_14755_52)
937 {
938# if ISO_14755
939 scr_overlay_off ();
940# endif
941# if ISO_14755
942 // iso14755 part 5.2 handling: release time
943 // first: controls
944 if ((ev.state & ControlMask)
945 && ((keysym >= 0x40 && keysym <= 0x5f)
946 || (keysym >= 0x61 && keysym <= 0x7f)))
947 {
948 iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
949 commit_iso14755 ();
950
951 return;
952 }
953
954 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
955 if (i[0] == keysym)
956 {
957 iso14755buf = ISO_14755_51 | i[1];
958 commit_iso14755 ();
959
960 return;
961 }
962
963 scr_bell ();
964# endif
965 iso14755buf = 0;
966
967 return;
968 }
969 else if ((ev.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
970 {
971# if ISO_14755
972 scr_overlay_off ();
973# endif
974 if (iso14755buf & ISO_14755_51)
975 commit_iso14755 ();
976#if ISO_14755
977 else if (option (Opt_iso14755_52) && iso14755buf & ISO_14755_STARTED)
978 {
979 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
980
981 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
982 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
983 }
984# endif
985 else
986 iso14755buf = 0;
987 }
988#endif
989
990 if (HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
991 return;
992
993#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
994 if (!(ev.state & ControlMask))
995 slip_wheel_ev.stop ();
996 else if (keysym == XK_Control_L || keysym == XK_Control_R)
997 mouse_slip_wheel_speed = 0;
998#endif
999}
1000
1001#if defined (KEYSYM_RESOURCE)
880unsigned int 1002unsigned int
881rxvt_term::cmd_write (const unsigned char *str, unsigned int count) 1003rxvt_term::cmd_write (const char *str, unsigned int count)
882{ 1004{
883 unsigned int n, s; 1005 unsigned int n, s;
884 1006
885 n = cmdbuf_ptr - cmdbuf_base; 1007 n = cmdbuf_ptr - cmdbuf_base;
886 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp; 1008 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp;
… …
905 1027
906 cmd_parse (); 1028 cmd_parse ();
907 1029
908 return 0; 1030 return 0;
909} 1031}
910#endif /* MENUBAR_MAX */ 1032#endif
911 1033
912void 1034void
913rxvt_term::flush () 1035rxvt_term::flush ()
914{ 1036{
915 flush_ev.stop (); 1037 flush_ev.stop ();
916 1038
917#ifdef TRANSPARENT 1039#ifdef ENABLE_TRANSPARENCY
918 if (want_full_refresh) 1040 if (want_full_refresh)
919 { 1041 {
920 want_full_refresh = 0; 1042 want_full_refresh = 0;
921 scr_clear (); 1043 scr_clear ();
922 scr_touch (false); 1044 scr_touch (false);
923 } 1045 }
924#endif 1046#endif
925 1047
926 if (want_refresh) 1048 if (want_refresh)
927 { 1049 {
1050 if (SHOULD_INVOKE (HOOK_LINE_UPDATE))
1051 {
1052 int row = view_start;
1053 int end_row = row + nrow;
1054
1055 while (row > top_row && ROW (row - 1).is_longer ())
1056 --row;
1057
1058 do
1059 {
1060 int start_row = row;
1061 line_t *l;
1062
1063 do
1064 {
1065 l = &ROW (row++);
1066
1067 if (!(l->f & LINE_FILTERED))
1068 {
1069 // line not filtered, mark it as filtered
1070 l->f |= LINE_FILTERED;
1071 while (l->is_longer ())
1072 {
1073 l = &ROW (row++);
1074 l->f |= LINE_FILTERED;
1075 }
1076
1077 // and filter it
1078 HOOK_INVOKE ((this, HOOK_LINE_UPDATE, DT_INT, start_row, DT_END));
1079
1080 break;
1081 }
1082 }
1083 while (l->is_longer () && row < end_row);
1084 }
1085 while (row < end_row);
1086 }
1087
928 scr_refresh (refresh_type); 1088 scr_refresh ();
929 scrollbar_show (1); 1089 scrollbar_show (1);
930#ifdef USE_XIM 1090#ifdef USE_XIM
931 IMSendSpot (); 1091 IMSendSpot ();
932#endif 1092#endif
933 } 1093 }
… …
936} 1096}
937 1097
938void 1098void
939rxvt_term::check_cb (check_watcher &w) 1099rxvt_term::check_cb (check_watcher &w)
940{ 1100{
941 SET_R (this); 1101 make_current ();
942 SET_LOCALE (locale);
943 1102
944 display->flush (); 1103 display->flush ();
945 1104
946 if (want_refresh && !flush_ev.active) 1105 if (want_refresh && !flush_ev.active)
947 flush_ev.start (NOW + 0.01); 1106 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
948} 1107}
949 1108
950void 1109void
951rxvt_term::flush_cb (time_watcher &w) 1110rxvt_term::flush_cb (time_watcher &w)
952{ 1111{
953 SET_R (this); 1112 make_current ();
954 SET_LOCALE (locale);
955 1113
956 refresh_limit = 1;
957 refresh_count = 0; 1114 refresh_count = 0;
958 flush (); 1115 flush ();
959} 1116}
960 1117
961#ifdef CURSOR_BLINK 1118#ifdef CURSOR_BLINK
… …
963rxvt_term::cursor_blink_cb (time_watcher &w) 1120rxvt_term::cursor_blink_cb (time_watcher &w)
964{ 1121{
965 hidden_cursor = !hidden_cursor; 1122 hidden_cursor = !hidden_cursor;
966 want_refresh = 1; 1123 want_refresh = 1;
967 1124
968 w.start (w.at + BLINK_INTERVAL); 1125 w.start (w.at + CURSOR_BLINK_INTERVAL);
969} 1126}
970#endif 1127#endif
971 1128
972#ifdef TEXT_BLINK 1129#ifdef TEXT_BLINK
973void 1130void
… …
987rxvt_term::cont_scroll_cb (time_watcher &w) 1144rxvt_term::cont_scroll_cb (time_watcher &w)
988{ 1145{
989 if ((scrollbar_isUp() || scrollbar_isDn()) && 1146 if ((scrollbar_isUp() || scrollbar_isDn()) &&
990 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1147 scr_page (scrollbar_isUp() ? UP : DN, 1))
991 { 1148 {
992 refresh_type |= SMOOTH_REFRESH;
993 want_refresh = 1; 1149 want_refresh = 1;
994 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1150 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
995 } 1151 }
996} 1152}
997#endif 1153#endif
… …
1001rxvt_term::sel_scroll_cb (time_watcher &w) 1157rxvt_term::sel_scroll_cb (time_watcher &w)
1002{ 1158{
1003 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1159 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1004 { 1160 {
1005 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1161 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1006 refresh_type |= SMOOTH_REFRESH;
1007 want_refresh = 1; 1162 want_refresh = 1;
1008 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1163 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1009 } 1164 }
1010} 1165}
1011#endif 1166#endif
… …
1016{ 1171{
1017 if (mouse_slip_wheel_speed == 0 1172 if (mouse_slip_wheel_speed == 0
1018 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed) 1173 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1019 : scr_page (UP, mouse_slip_wheel_speed)) 1174 : scr_page (UP, mouse_slip_wheel_speed))
1020 { 1175 {
1021 refresh_type |= SMOOTH_REFRESH; 1176 if (view_start == top_row || view_start == 0)
1177 mouse_slip_wheel_speed = 0;
1178
1022 want_refresh = 1; 1179 want_refresh = 1;
1023 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1180 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1024 } 1181 }
1025} 1182}
1026#endif 1183#endif
1027 1184
1185#if LINUX_YIELD_HACK
1186static struct event_handler
1187{
1188 check_watcher yield_ev;
1189
1190 void yield_cb (check_watcher &w)
1191 {
1192 // this should really be sched_yield(), but the linux guys thought
1193 // that giving a process calling sched_yield () less cpu time than
1194 // ones with high nice levels is a useful thing to do. It surely is is
1195 // allowed by the sus... as is returning ENOSYS.
1196
1197 struct timespec ts = { 0, 0 };
1198 nanosleep (&ts, 0);
1199
1200 w.stop ();
1201 }
1202
1203 event_handler ()
1204 : yield_ev (this, &event_handler::yield_cb)
1205 {
1206 }
1207} event_handler;
1208#endif
1209
1028bool 1210bool
1029rxvt_term::pty_fill () 1211rxvt_term::pty_fill ()
1030{ 1212{
1031 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1213 ssize_t n = cmdbuf_endp - cmdbuf_ptr;
1032 1214
1033 if (CBUFSIZ == n) 1215 if (CBUFSIZ == n)
1034 { 1216 {
1035 rxvt_warn ("pty_fill on full buffer, draining input, continuing.\n"); 1217 rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n");
1036 n = 0; 1218 n = 0;
1037 } 1219 }
1038 1220
1039 memmove (cmdbuf_base, cmdbuf_ptr, n); 1221 memmove (cmdbuf_base, cmdbuf_ptr, n);
1040 cmdbuf_ptr = cmdbuf_base; 1222 cmdbuf_ptr = cmdbuf_base;
1041 cmdbuf_endp = cmdbuf_ptr + n; 1223 cmdbuf_endp = cmdbuf_ptr + n;
1042 1224
1043 n = read (pty.pty, cmdbuf_endp, CBUFSIZ - n); 1225 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n);
1044 1226
1045 if (n > 0) 1227 if (r > 0)
1046 { 1228 {
1047 cmdbuf_endp += n; 1229 cmdbuf_endp += r;
1048 return true; 1230 return true;
1049 } 1231 }
1050 else if (n < 0 && errno != EAGAIN) 1232 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1233 {
1234#if LINUX_YIELD_HACK
1235 if (display->is_local)
1236 event_handler.yield_ev.start ();
1237#endif
1238 }
1239 else
1240 {
1241 pty_ev.stop ();
1242
1243 if (!option (Opt_hold))
1051 destroy (); 1244 destroy ();
1052 1245 }
1246
1053 return false; 1247 return false;
1054} 1248}
1055 1249
1056void 1250void
1057rxvt_term::pty_cb (io_watcher &w, short revents) 1251rxvt_term::pty_cb (io_watcher &w, short revents)
1058{ 1252{
1059 SET_R (this); 1253 make_current ();
1060 SET_LOCALE (locale);
1061 1254
1062 if (revents & EVENT_WRITE)
1063 tt_write (0, 0);
1064 else if (revents & EVENT_READ) 1255 if (revents & EVENT_READ)
1065 // loop, but don't allow a single term to monopolize us 1256 // loop, but don't allow a single term to monopolize us
1066 while (pty_fill ()) 1257 while (pty_fill ())
1067 if (cmd_parse ()) 1258 if (cmd_parse ())
1068 break; 1259 break;
1260
1261 if (revents & EVENT_WRITE)
1262 pty_write ();
1069} 1263}
1070 1264
1071void 1265void
1072rxvt_term::pointer_unblank () 1266rxvt_term::pointer_unblank ()
1073{ 1267{
1074 XDefineCursor (display->display, TermWin.vt, TermWin_cursor); 1268 XDefineCursor (dpy, vt, TermWin_cursor);
1075 recolour_cursor (); 1269 recolour_cursor ();
1076 1270
1077#ifdef POINTER_BLANK 1271#ifdef POINTER_BLANK
1078 hidden_pointer = 0; 1272 hidden_pointer = 0;
1079 1273
1080 if (options & Opt_pointerBlank) 1274 if (option (Opt_pointerBlank))
1081 pointer_ev.start (NOW + pointerBlankDelay); 1275 pointer_ev.start (NOW + pointerBlankDelay);
1082#endif 1276#endif
1083} 1277}
1084 1278
1085#ifdef POINTER_BLANK 1279#ifdef POINTER_BLANK
1086void 1280void
1087rxvt_term::pointer_blank () 1281rxvt_term::pointer_blank ()
1088{ 1282{
1089 if (! (options & Opt_pointerBlank)) 1283 if (!option (Opt_pointerBlank))
1090 return; 1284 return;
1091 1285
1092 XDefineCursor (display->display, TermWin.vt, blank_cursor); 1286 XDefineCursor (dpy, vt, display->blank_cursor);
1093 XFlush (display->display); 1287 XFlush (dpy);
1094 1288
1095 hidden_pointer = 1; 1289 hidden_pointer = 1;
1096} 1290}
1097 1291
1098void 1292void
1099rxvt_term::pointer_cb (time_watcher &w) 1293rxvt_term::pointer_cb (time_watcher &w)
1100{ 1294{
1101 SET_R (this); 1295 make_current ();
1102 SET_LOCALE (locale);
1103 1296
1104 pointer_blank (); 1297 pointer_blank ();
1105} 1298}
1106#endif 1299#endif
1107 1300
… …
1172 (32 + button_number + key_state), 1365 (32 + button_number + key_state),
1173 (32 + x + 1), 1366 (32 + x + 1),
1174 (32 + y + 1)); 1367 (32 + y + 1));
1175} 1368}
1176 1369
1177#ifdef USING_W11LIB
1178void
1179rxvt_W11_process_x_event (XEvent *ev)
1180{
1181 rxvt_t *r = rxvt_get_r ();
1182
1183 x_cb (*ev);
1184}
1185#endif
1186
1187/*{{{ process an X event */ 1370/*{{{ process an X event */
1188void 1371void
1189rxvt_term::x_cb (XEvent &ev) 1372rxvt_term::x_cb (XEvent &ev)
1190{ 1373{
1191 SET_R (this); 1374 make_current ();
1192 SET_LOCALE (locale);
1193 1375
1194#if defined(CURSOR_BLINK) 1376 dLocal (Display *, dpy);
1195 if ((options & Opt_cursorBlink) && ev.type == KeyPress)
1196 {
1197 if (hidden_cursor)
1198 {
1199 hidden_cursor = 0;
1200 want_refresh = 1;
1201 }
1202 1377
1203 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1378 if (ev.xany.window == vt
1204 } 1379 && SHOULD_INVOKE (HOOK_X_EVENT)
1205#endif 1380 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1381 return;
1206 1382
1207#if defined(POINTER_BLANK) 1383 // for XQueryPointer
1208 if ((options & Opt_pointerBlank) && pointerBlankDelay > 0)
1209 {
1210 if (ev.type == MotionNotify
1211 || ev.type == ButtonPress
1212 || ev.type == ButtonRelease)
1213 if (hidden_pointer)
1214 pointer_unblank ();
1215
1216 if (ev.type == KeyPress && hidden_pointer == 0)
1217 pointer_blank ();
1218 }
1219#endif
1220
1221 Window unused_root, unused_child; 1384 Window unused_root, unused_child;
1222 int unused_root_x, unused_root_y; 1385 int unused_root_x, unused_root_y;
1223 unsigned int unused_mask; 1386 unsigned int unused_mask;
1224 1387
1225 switch (ev.type) 1388 switch (ev.type)
1226 { 1389 {
1227 case KeyPress: 1390 case KeyPress:
1228#if ISO_14755 1391 key_press (ev.xkey);
1229 if (!(iso14755buf & ISO_14755_52))
1230#endif
1231 lookup_key (ev.xkey);
1232
1233 break; 1392 break;
1234 1393
1235 case KeyRelease: 1394 case KeyRelease:
1236 { 1395 key_release (ev.xkey);
1237#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755
1238 KeySym ks;
1239
1240 ks = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1241#endif
1242
1243#if ENABLE_FRILLS || ISO_14755
1244 // ISO 14755 support
1245 if (iso14755buf)
1246 if (iso14755buf & ISO_14755_52)
1247 {
1248# if ENABLE_OVERLAY
1249 scr_overlay_off ();
1250# endif
1251# if ISO_14755
1252 // iso14755 part 5.2 handling: release time
1253 // first: controls
1254 if ((ev.xkey.state & ControlMask)
1255 && ((ks >= 0x40 && ks <= 0x5f)
1256 || (ks >= 0x61 && ks <= 0x7f)))
1257 {
1258 iso14755buf = ISO_14755_51 | 0x2400 | (ks & 0x1f);
1259 commit_iso14755 ();
1260 return; // case-break;
1261 }
1262
1263 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1264 if (i[0] == ks)
1265 {
1266 iso14755buf = ISO_14755_51 | i[1];
1267 commit_iso14755 ();
1268 return; // case-break;
1269 }
1270
1271 scr_bell ();
1272# endif
1273 iso14755buf = 0;
1274 break;
1275 }
1276 else if ((ev.xkey.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
1277 {
1278# if ENABLE_OVERLAY
1279 scr_overlay_off ();
1280# endif
1281 if (iso14755buf & ISO_14755_51)
1282 commit_iso14755 ();
1283#if ISO_14755
1284 else if (iso14755buf & ISO_14755_STARTED)
1285 {
1286 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
1287
1288 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
1289 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
1290 }
1291# endif
1292 else
1293 iso14755buf = 0;
1294 }
1295#endif
1296
1297#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1298 if (!(ev.xkey.state & ControlMask))
1299 slip_wheel_ev.stop ();
1300 else if (ks == XK_Control_L || ks == XK_Control_R)
1301 mouse_slip_wheel_speed = 0;
1302#endif
1303 break; 1396 break;
1304 }
1305 1397
1306 case ButtonPress: 1398 case ButtonPress:
1307 button_press (ev.xbutton); 1399 button_press (ev.xbutton);
1308 break; 1400 break;
1309 1401
… …
1311 button_release (ev.xbutton); 1403 button_release (ev.xbutton);
1312 break; 1404 break;
1313 1405
1314 case ClientMessage: 1406 case ClientMessage:
1315 if (ev.xclient.format == 32 1407 if (ev.xclient.format == 32
1316 && (Atom)ev.xclient.data.l[0] == xa[XA_WMDELETEWINDOW]) 1408 && !HOOK_INVOKE ((this, HOOK_CLIENT_MESSAGE, DT_XEVENT, &ev, DT_END)))
1317 destroy ();
1318#ifdef OFFIX_DND
1319 /* OffiX Dnd (drag 'n' drop) protocol */
1320 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1321 && (ev.xclient.data.l[0] == DndFile
1322 || ev.xclient.data.l[0] == DndDir
1323 || ev.xclient.data.l[0] == DndLink))
1324 { 1409 {
1325 /* Get Dnd data */ 1410 if (ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
1326 Atom ActualType; 1411 {
1327 int ActualFormat; 1412 if (!HOOK_INVOKE ((this, HOOK_WM_PROTOCOLS, DT_XEVENT, &ev, DT_END)))
1328 unsigned char *data; 1413 {
1329 unsigned long Size, RemainingBytes; 1414 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1330 1415 {
1331 XGetWindowProperty (display->display, display->root, 1416 if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END)))
1332 xa[XA_DNDSELECTION], 1417 destroy ();
1333 0L, 1000000L, 1418 }
1334 False, AnyPropertyType, 1419#if ENABLE_EWMH
1335 &ActualType, &ActualFormat, 1420 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1336 &Size, &RemainingBytes, 1421 XSendEvent (dpy, ev.xclient.window = display->root,
1422 False, SubstructureRedirectMask | SubstructureNotifyMask,
1337 &data); 1423 &ev);
1338 XChangeProperty (display->display, display->root, 1424#endif
1339 XA_CUT_BUFFER0, XA_STRING, 1425 }
1340 8, PropModeReplace, 1426 }
1341 data, strlen (data)); 1427#if ENABLE_XEMBED
1342 XFree (data); 1428 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1343 selection_paste (display->root, XA_CUT_BUFFER0, True); 1429 {
1344 XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime); 1430 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1431 focus_in ();
1432 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1433 focus_out ();
1434 }
1435#endif
1345 } 1436 }
1346#endif /* OFFIX_DND */
1347 break;
1348
1349 case MappingNotify:
1350 XRefreshKeyboardMapping (&ev.xmapping);
1351 break; 1437 break;
1352 1438
1353 /* 1439 /*
1354 * XXX: this is not the _current_ arrangement 1440 * XXX: this is not the _current_ arrangement
1355 * Here's my conclusion: 1441 * Here's my conclusion:
… …
1374 break; 1460 break;
1375 } 1461 }
1376 break; 1462 break;
1377 1463
1378 case FocusIn: 1464 case FocusIn:
1379 if (!TermWin.focus) 1465 if (ev.xfocus.detail != NotifyInferior
1466 && ev.xfocus.detail != NotifyPointer
1467 && ev.xfocus.mode != NotifyGrab)
1468 focus_in ();
1469 break;
1470
1471 case FocusOut:
1472 if (ev.xfocus.detail != NotifyInferior
1473 && ev.xfocus.detail != NotifyPointer
1474 && ev.xfocus.mode != NotifyGrab)
1475 focus_out ();
1476 break;
1477
1478 case ConfigureNotify:
1479/* fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",
1480 ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,
1481 szHint.width, szHint.height);*/
1482 if (ev.xconfigure.window == parent[0])
1380 { 1483 {
1381 TermWin.focus = 1; 1484 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1382 want_refresh = 1;
1383#ifdef USE_XIM
1384 if (Input_Context != NULL)
1385 { 1485 ;
1386 IMSetStatusPosition ();
1387 XSetICFocus (Input_Context);
1388 }
1389#endif
1390#ifdef CURSOR_BLINK
1391 if (options & Opt_cursorBlink)
1392 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1393#endif
1394#ifdef OFF_FOCUS_FADING
1395 if (rs[Rs_fade])
1396 {
1397 pix_colors = pix_colors_focused;
1398 scr_recolour ();
1399 }
1400#endif
1401 1486
1402 }
1403 break;
1404
1405 case FocusOut:
1406 if (TermWin.focus)
1407 {
1408 TermWin.focus = 0;
1409 want_refresh = 1;
1410
1411#if ENABLE_FRILLS || ISO_14755
1412 iso14755buf = 0;
1413#endif
1414#if ENABLE_OVERLAY
1415 scr_overlay_off ();
1416#endif
1417#ifdef USE_XIM
1418 if (Input_Context != NULL)
1419 XUnsetICFocus (Input_Context);
1420#endif
1421#ifdef CURSOR_BLINK
1422 if (options & Opt_cursorBlink)
1423 cursor_blink_ev.stop ();
1424 hidden_cursor = 0;
1425#endif
1426#ifdef OFF_FOCUS_FADING
1427 if (rs[Rs_fade])
1428 {
1429 pix_colors = pix_colors_unfocused;
1430 scr_recolour ();
1431 }
1432#endif
1433 }
1434 break;
1435
1436 case ConfigureNotify:
1437 if (ev.xconfigure.window == TermWin.parent[0])
1438 {
1439 int height, width;
1440
1441 do
1442 { /* Wrap lots of configures into one */
1443 width = ev.xconfigure.width;
1444 height = ev.xconfigure.height;
1445 D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height));
1446 }
1447 while (XCheckTypedWindowEvent (display->display, ev.xconfigure.window, ConfigureNotify, &ev));
1448
1449 if (szHint.width != width || szHint.height != height) 1487 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1450 { 1488 {
1451 seen_resize = 1; 1489 seen_resize = 1;
1452 resize_all_windows (width, height, 1); 1490 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1453 } 1491 }
1454 1492 else
1455#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1456 if (options & Opt_transparent)
1457 { 1493 {
1458 check_our_parents (); 1494#ifdef ENABLE_TRANSPARENCY
1459 if (am_transparent) 1495 if (option (Opt_transparent))
1460 want_refresh = want_full_refresh = 1; 1496 update_background ();
1497#endif
1461 } 1498 }
1462#endif 1499 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1463 } 1500 }
1464 break; 1501 break;
1465 1502
1466 case PropertyNotify: 1503 case PropertyNotify:
1504 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
1467 if (ev.xproperty.atom == xa[XA_VT_SELECTION] 1505 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1468 && ev.xproperty.state == PropertyNewValue) 1506 && ev.xproperty.state == PropertyNewValue)
1469 selection_property (ev.xproperty.window, ev.xproperty.atom); 1507 selection_property (ev.xproperty.window, ev.xproperty.atom);
1470 1508
1471 break; 1509 break;
1472 1510
1473 case SelectionClear: 1511 case SelectionClear:
1474 selection_clear (); 1512 selection_clear ();
1475 break; 1513 break;
1476 1514
1477 case SelectionNotify: 1515 case SelectionNotify:
1478 if (selection_wait == Sel_normal) 1516 if (selection_wait == Sel_normal)
1479 selection_paste (ev.xselection.requestor, 1517 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1480 ev.xselection.property, True);
1481 break; 1518 break;
1482 1519
1483 case SelectionRequest: 1520 case SelectionRequest:
1484 selection_send (ev.xselectionrequest); 1521 selection_send (ev.xselectionrequest);
1485 break; 1522 break;
1486 1523
1524 case MapNotify:
1525 mapped = 1;
1526#ifdef TEXT_BLINK
1527 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1528#endif
1529 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1530 break;
1531
1487 case UnmapNotify: 1532 case UnmapNotify:
1488 TermWin.mapped = 0; 1533 mapped = 0;
1489#ifdef TEXT_BLINK 1534#ifdef TEXT_BLINK
1490 text_blink_ev.stop (); 1535 text_blink_ev.stop ();
1491#endif 1536#endif
1537 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1492 break; 1538 break;
1493 1539
1494 case MapNotify:
1495 TermWin.mapped = 1;
1496#ifdef TEXT_BLINK
1497 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1498#endif
1499 break;
1500
1501#ifdef TRANSPARENT 1540#ifdef ENABLE_TRANSPARENCY
1502 case ReparentNotify: 1541 case ReparentNotify:
1503 rootwin_cb (ev); 1542 rootwin_cb (ev);
1504 break; 1543 break;
1505#endif /* TRANSPARENT */ 1544#endif /* ENABLE_TRANSPARENCY */
1506 1545
1507 case GraphicsExpose: 1546 case GraphicsExpose:
1508 case Expose: 1547 case Expose:
1509 if (ev.xany.window == TermWin.vt) 1548 if (ev.xany.window == vt)
1510 { 1549 {
1511 do 1550 do
1512 scr_expose (ev.xexpose.x, ev.xexpose.y, 1551 scr_expose (ev.xexpose.x, ev.xexpose.y,
1513 ev.xexpose.width, ev.xexpose.height, False); 1552 ev.xexpose.width, ev.xexpose.height, False);
1514 while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev)); 1553 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1515 1554
1516 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1555 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1517 1556
1518 while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev)) 1557 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1519 scr_expose (ev.xexpose.x, ev.xexpose.y, 1558 scr_expose (ev.xexpose.x, ev.xexpose.y,
1520 ev.xexpose.width, ev.xexpose.height, False); 1559 ev.xexpose.width, ev.xexpose.height, False);
1521 1560
1522 scr_refresh (refresh_type); 1561 want_refresh = 1;
1523 } 1562 }
1524 else 1563 else
1525 { 1564 {
1526 XEvent unused_event; 1565 XEvent unused_event;
1527 1566
1528 while (XCheckTypedWindowEvent (display->display, ev.xany.window, Expose, &unused_event)) 1567 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1529 ; 1568 ;
1530 while (XCheckTypedWindowEvent (display->display, ev.xany.window, GraphicsExpose, &unused_event)) 1569 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1531 ; 1570 ;
1532 1571
1533 if (isScrollbarWindow (ev.xany.window)) 1572 if (isScrollbarWindow (ev.xany.window))
1534 { 1573 {
1535 scrollBar.setIdle (); 1574 scrollBar.setIdle ();
1536 scrollbar_show (0); 1575 scrollbar_show (0);
1537 } 1576 }
1538#ifdef MENUBAR
1539 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1540 menubar_expose ();
1541#endif
1542
1543#ifdef TRANSPARENT
1544 if (am_transparent && ev.xany.window == TermWin.parent[0])
1545 XClearWindow (display->display, ev.xany.window);
1546#endif
1547 } 1577 }
1548 break; 1578 break;
1549 1579
1550 case MotionNotify: 1580 case MotionNotify:
1551#ifdef POINTER_BLANK 1581#ifdef POINTER_BLANK
1552 if (hidden_pointer) 1582 if (hidden_pointer)
1553 pointer_unblank (); 1583 pointer_unblank ();
1554#endif 1584#endif
1555#if MENUBAR
1556 if (isMenuBarWindow (ev.xany.window))
1557 {
1558 menubar_control (ev.xbutton);
1559 break;
1560 }
1561#endif
1562 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1585 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1563 break; 1586 break;
1564 1587
1565 if (ev.xany.window == TermWin.vt) 1588 if (ev.xany.window == vt)
1566 { 1589 {
1590 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1591 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1592 ; // nop
1567 if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1593 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1568 { 1594 {
1569 while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev)) 1595 while (XCheckTypedWindowEvent (dpy, vt, MotionNotify, &ev))
1570 ; 1596 ;
1571 1597
1572 XQueryPointer (display->display, TermWin.vt, 1598 XQueryPointer (dpy, vt,
1573 &unused_root, &unused_child, 1599 &unused_root, &unused_child,
1574 &unused_root_x, &unused_root_y, 1600 &unused_root_x, &unused_root_y,
1575 &ev.xbutton.x, &ev.xbutton.y, 1601 &ev.xbutton.x, &ev.xbutton.y,
1576 &ev.xbutton.state); 1602 &ev.xbutton.state);
1577#ifdef MOUSE_THRESHOLD 1603#ifdef MOUSE_THRESHOLD
… …
1589#endif 1615#endif
1590 selection_extend (ev.xbutton.x, ev.xbutton.y, 1616 selection_extend (ev.xbutton.x, ev.xbutton.y,
1591 ev.xbutton.state & Button3Mask ? 2 : 0); 1617 ev.xbutton.state & Button3Mask ? 2 : 0);
1592 1618
1593#ifdef SELECTION_SCROLLING 1619#ifdef SELECTION_SCROLLING
1594 if (ev.xbutton.y < TermWin.int_bwidth 1620 if (ev.xbutton.y < int_bwidth
1595 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1)) 1621 || Pixel2Row (ev.xbutton.y) > (nrow-1))
1596 { 1622 {
1597 int dist; 1623 int dist;
1598 1624
1599 /* don't clobber the current delay if we are 1625 /* don't clobber the current delay if we are
1600 * already in the middle of scrolling. 1626 * already in the middle of scrolling.
… …
1608 selection_save_x = ev.xbutton.x; 1634 selection_save_x = ev.xbutton.x;
1609 selection_save_y = ev.xbutton.y; 1635 selection_save_y = ev.xbutton.y;
1610 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0; 1636 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;
1611 1637
1612 /* calc number of lines to scroll */ 1638 /* calc number of lines to scroll */
1613 if (ev.xbutton.y < TermWin.int_bwidth) 1639 if (ev.xbutton.y < int_bwidth)
1614 { 1640 {
1615 scroll_selection_dir = UP; 1641 scroll_selection_dir = UP;
1616 dist = TermWin.int_bwidth - ev.xbutton.y; 1642 dist = int_bwidth - ev.xbutton.y;
1617 } 1643 }
1618 else 1644 else
1619 { 1645 {
1620 scroll_selection_dir = DN; 1646 scroll_selection_dir = DN;
1621 dist = ev.xbutton.y - (TermWin.int_bwidth + TermWin.height); 1647 dist = ev.xbutton.y - (int_bwidth + height);
1622 } 1648 }
1623 1649
1624 scroll_selection_lines = Pixel2Height (dist) 1650 scroll_selection_lines = Pixel2Height (dist)
1625 / SELECTION_SCROLL_LINE_SPEEDUP 1651 / SELECTION_SCROLL_LINE_SPEEDUP
1626 + 1; 1652 + 1;
1627 MIN_IT (scroll_selection_lines, 1653 min_it (scroll_selection_lines,
1628 SELECTION_SCROLL_MAX_LINES); 1654 SELECTION_SCROLL_MAX_LINES);
1629 } 1655 }
1630 else 1656 else
1631 { 1657 {
1632 /* we are within the text window, so we 1658 /* we are within the text window, so we
… …
1641#endif 1667#endif
1642 } 1668 }
1643 } 1669 }
1644 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1670 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1645 { 1671 {
1646 while (XCheckTypedWindowEvent (display->display, scrollBar.win, 1672 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1647 MotionNotify, &ev)) 1673 MotionNotify, &ev))
1648 ; 1674 ;
1649 1675
1650 XQueryPointer (display->display, scrollBar.win, 1676 XQueryPointer (dpy, scrollBar.win,
1651 &unused_root, &unused_child, 1677 &unused_root, &unused_child,
1652 &unused_root_x, &unused_root_y, 1678 &unused_root_x, &unused_root_y,
1653 &ev.xbutton.x, &ev.xbutton.y, 1679 &ev.xbutton.x, &ev.xbutton.y,
1654 &unused_mask); 1680 &unused_mask);
1655 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1681 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1656 scrollbar_size ()); 1682 scrollbar_size ());
1657 scr_refresh (refresh_type);
1658 refresh_limit = 0; 1683 want_refresh = 1;
1659 scrollbar_show (1); 1684 scrollbar_show (1);
1660 } 1685 }
1661 break; 1686 break;
1662 } 1687 }
1663}
1664 1688
1665#if TRANSPARENT 1689#if defined(CURSOR_BLINK)
1690 if (option (Opt_cursorBlink) && ev.type == KeyPress)
1691 {
1692 if (hidden_cursor)
1693 {
1694 hidden_cursor = 0;
1695 want_refresh = 1;
1696 }
1697
1698 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1699 }
1700#endif
1701
1702#if defined(POINTER_BLANK)
1703 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1704 {
1705 if (ev.type == MotionNotify
1706 || ev.type == ButtonPress
1707 || ev.type == ButtonRelease)
1708 if (hidden_pointer)
1709 pointer_unblank ();
1710
1711 if (ev.type == KeyPress && hidden_pointer == 0)
1712 pointer_blank ();
1713 }
1714#endif
1715}
1716
1717void
1718rxvt_term::focus_in ()
1719{
1720 if (!focus)
1721 {
1722 focus = 1;
1723 want_refresh = 1;
1724
1725 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1726
1727#if USE_XIM
1728 if (Input_Context != NULL)
1729 {
1730 IMSetPosition ();
1731 XSetICFocus (Input_Context);
1732 }
1733#endif
1734#if CURSOR_BLINK
1735 if (option (Opt_cursorBlink))
1736 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1737#endif
1738#if OFF_FOCUS_FADING
1739 if (rs[Rs_fade])
1740 {
1741 pix_colors = pix_colors_focused;
1742 scr_recolour ();
1743 }
1744#endif
1745#if ENABLE_FRILLS
1746 if (option (Opt_urgentOnBell))
1747 {
1748 XWMHints *h;
1749
1750 h = XGetWMHints(dpy, parent[0]);
1751 if (h != NULL)
1752 {
1753 h->flags &= ~XUrgencyHint;
1754 XSetWMHints(dpy, parent[0], h);
1755 }
1756 }
1757#endif
1758 }
1759}
1760
1761void
1762rxvt_term::focus_out ()
1763{
1764 if (focus)
1765 {
1766 focus = 0;
1767 want_refresh = 1;
1768
1769 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1770
1771#if ENABLE_FRILLS || ISO_14755
1772 if (iso14755buf)
1773 {
1774 iso14755buf = 0;
1775# if ISO_14755
1776 scr_overlay_off ();
1777# endif
1778 }
1779#endif
1780#if USE_XIM
1781 if (Input_Context != NULL)
1782 XUnsetICFocus (Input_Context);
1783#endif
1784#if CURSOR_BLINK
1785 if (option (Opt_cursorBlink))
1786 cursor_blink_ev.stop ();
1787 hidden_cursor = 0;
1788#endif
1789#if OFF_FOCUS_FADING
1790 if (rs[Rs_fade])
1791 {
1792 pix_colors = pix_colors_unfocused;
1793 scr_recolour ();
1794 }
1795#endif
1796 }
1797}
1798
1799void
1800rxvt_term::update_fade_color (unsigned int idx)
1801{
1802#if OFF_FOCUS_FADING
1803 if (rs[Rs_fade])
1804 {
1805 rgba c;
1806 pix_colors [Color_fade].get (c);
1807 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1808 }
1809#endif
1810}
1811
1812#if ENABLE_TRANSPARENCY || ENABLE_PERL
1666void 1813void
1667rxvt_term::rootwin_cb (XEvent &ev) 1814rxvt_term::rootwin_cb (XEvent &ev)
1668{ 1815{
1669 SET_R (this); 1816 make_current ();
1670 SET_LOCALE (locale);
1671 1817
1818 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1819 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1820 return;
1821
1822# if ENABLE_TRANSPARENCY
1672 switch (ev.type) 1823 switch (ev.type)
1673 { 1824 {
1674 case PropertyNotify: 1825 case PropertyNotify:
1675 /* 1826 /*
1676 * if user used some Esetroot compatible prog to set the root bg, 1827 * if user used some Esetroot compatible prog to set the root bg,
1677 * use the property to determine the pixmap. We use it later on. 1828 * use the property to determine the pixmap. We use it later on.
1678 */ 1829 */
1679 if (xa[XA_XROOTPMAPID] == 0)
1680 xa[XA_XROOTPMAPID] = XInternAtom (display->display, "_XROOTPMAP_ID", False);
1681
1682 if (ev.xproperty.atom != xa[XA_XROOTPMAPID]) 1830 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1683 return; 1831 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1684 1832 {
1685 /* FALLTHROUGH */ 1833 bgPixmap.set_root_pixmap ();
1686 case ReparentNotify: 1834 update_background ();
1687 if ((options & Opt_transparent) && check_our_parents () && am_transparent) 1835 }
1688 want_refresh = want_full_refresh = 1;
1689 break; 1836 break;
1690 } 1837 }
1838# endif
1691} 1839}
1692#endif 1840#endif
1693 1841
1694void 1842void
1695rxvt_term::button_press (XButtonEvent &ev) 1843rxvt_term::button_press (XButtonEvent &ev)
1696{ 1844{
1697 int reportmode = 0, clickintime; 1845 int reportmode = 0, clickintime;
1698 1846
1699 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1847 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1848
1700 if (!bypass_keystate) 1849 if (!bypass_keystate)
1701 reportmode = !! (priv_modes & PrivMode_mouse_report); 1850 reportmode = !! (priv_modes & PrivMode_mouse_report);
1702 1851
1703 /* 1852 /*
1704 * VT window processing of button press 1853 * VT window processing of button press
1705 */ 1854 */
1706 if (ev.window == TermWin.vt) 1855 if (ev.window == vt)
1707 { 1856 {
1857 if (HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1858 return;
1859
1708#if ISO_14755 1860#if ISO_14755
1709 // 5.4 1861 // 5.4
1710 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1862 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1711 { 1863 {
1712 iso14755_54 (ev.x, ev.y); 1864 iso14755_54 (ev.x, ev.y);
… …
1724#ifdef MOUSE_REPORT_DOUBLECLICK 1876#ifdef MOUSE_REPORT_DOUBLECLICK
1725 if (ev.button == MEvent.button && clickintime) 1877 if (ev.button == MEvent.button && clickintime)
1726 { 1878 {
1727 /* same button, within alloted time */ 1879 /* same button, within alloted time */
1728 MEvent.clicks++; 1880 MEvent.clicks++;
1881
1729 if (MEvent.clicks > 1) 1882 if (MEvent.clicks > 1)
1730 { 1883 {
1731 /* only report double clicks */ 1884 /* only report double clicks */
1732 MEvent.clicks = 2; 1885 MEvent.clicks = 2;
1733 mouse_report (ev); 1886 mouse_report (ev);
… …
1759 { 1912 {
1760 case Button1: 1913 case Button1:
1761 /* allow meta + click to select rectangular areas */ 1914 /* allow meta + click to select rectangular areas */
1762 /* should be done in screen.C */ 1915 /* should be done in screen.C */
1763#if ENABLE_FRILLS 1916#if ENABLE_FRILLS
1764 selection.rect = !! (ev.state & ModMetaMask); 1917 selection.rect = !!(ev.state & ModMetaMask);
1765#else 1918#else
1766 selection.rect = false; 1919 selection.rect = false;
1767#endif 1920#endif
1768 1921
1769 /* allow shift+left click to extend selection */ 1922 /* allow shift+left click to extend selection */
1770 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report)) 1923 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1771 { 1924 {
1772 if (MEvent.button == Button1 && clickintime) 1925 if (MEvent.button == Button1 && clickintime)
1773 selection_rotate (ev.x, ev.y); 1926 selection_rotate (ev.x, ev.y);
1774 else 1927 else
1775 selection_extend (ev.x, ev.y, 1); 1928 selection_extend (ev.x, ev.y, 1);
… …
1916 case Button3: 2069 case Button3:
1917 if (scrollBar.style != R_SB_XTERM) 2070 if (scrollBar.style != R_SB_XTERM)
1918 { 2071 {
1919 if (scrollbar_above_slider (ev.y)) 2072 if (scrollbar_above_slider (ev.y))
1920# ifdef RXVT_SCROLL_FULL 2073# ifdef RXVT_SCROLL_FULL
1921 scr_page (UP, TermWin.nrow - 1); 2074 scr_page (UP, nrow - 1);
1922# else 2075# else
1923 scr_page (UP, TermWin.nrow / 4); 2076 scr_page (UP, nrow / 4);
1924# endif 2077# endif
1925 else if (scrollbar_below_slider (ev.y)) 2078 else if (scrollbar_below_slider (ev.y))
1926# ifdef RXVT_SCROLL_FULL 2079# ifdef RXVT_SCROLL_FULL
1927 scr_page (DN, TermWin.nrow - 1); 2080 scr_page (DN, nrow - 1);
1928# else 2081# else
1929 scr_page (DN, TermWin.nrow / 4); 2082 scr_page (DN, nrow / 4);
1930# endif 2083# endif
1931 else 2084 else
1932 scrollBar.setMotion (); 2085 scrollBar.setMotion ();
1933 } 2086 }
1934 else 2087 else
1935 { 2088 {
1936 scr_page ((ev.button == Button1 ? DN : UP), 2089 scr_page ((ev.button == Button1 ? DN : UP),
1937 (TermWin.nrow 2090 (nrow
1938 * scrollbar_position (ev.y) 2091 * scrollbar_position (ev.y)
1939 / scrollbar_size ())); 2092 / scrollbar_size ()));
1940 } 2093 }
1941 2094
1942 break; 2095 break;
1943 } 2096 }
1944 } 2097 }
2098
1945 return; 2099 return;
1946 } 2100 }
1947#if MENUBAR
1948 /*
1949 * Menubar window processing of button press
1950 */
1951 if (isMenuBarWindow (ev.window))
1952 menubar_control (ev);
1953#endif
1954} 2101}
1955 2102
1956void 2103void
1957rxvt_term::button_release (XButtonEvent &ev) 2104rxvt_term::button_release (XButtonEvent &ev)
1958{ 2105{
… …
1964 2111
1965 if (scrollbar_isUpDn ()) 2112 if (scrollbar_isUpDn ())
1966 { 2113 {
1967 scrollBar.setIdle (); 2114 scrollBar.setIdle ();
1968 scrollbar_show (0); 2115 scrollbar_show (0);
1969#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1970 refresh_type &= ~SMOOTH_REFRESH;
1971#endif
1972 } 2116 }
1973 2117
1974#ifdef SELECTION_SCROLLING 2118#ifdef SELECTION_SCROLLING
1975 if (sel_scroll_ev.active) 2119 if (sel_scroll_ev.active)
1976 sel_scroll_ev.stop(); 2120 sel_scroll_ev.stop();
1977#endif 2121#endif
1978 2122
1979 if (ev.window == TermWin.vt) 2123 if (ev.window == vt)
1980 { 2124 {
2125 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2126 return;
2127
1981#if ISO_14755 2128#if ISO_14755
1982 // 5.4 2129 // 5.4
1983 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 2130 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1984 return; 2131 return;
1985#endif 2132#endif
2133
1986 if (reportmode) 2134 if (reportmode)
1987 { 2135 {
1988 /* mouse report from vt window */ 2136 /* mouse report from vt window */
1989 /* don't report release of wheel "buttons" */ 2137 /* don't report release of wheel "buttons" */
1990 if (ev.button >= 4) 2138 if (ev.button >= 4)
… …
2020 { 2168 {
2021 case Button1: 2169 case Button1:
2022 case Button3: 2170 case Button3:
2023 selection_make (ev.time); 2171 selection_make (ev.time);
2024 break; 2172 break;
2173
2025 case Button2: 2174 case Button2:
2026 selection_request (ev.time, ev.x, ev.y); 2175 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2176 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2027 break; 2177 break;
2178
2028#ifdef MOUSE_WHEEL 2179#ifdef MOUSE_WHEEL
2029 case Button4: 2180 case Button4:
2030 case Button5: 2181 case Button5:
2031 { 2182 {
2032 int i; 2183 int i;
… …
2034 2185
2035 v = ev.button == Button4 ? UP : DN; 2186 v = ev.button == Button4 ? UP : DN;
2036 2187
2037 if (ev.state & ShiftMask) 2188 if (ev.state & ShiftMask)
2038 i = 1; 2189 i = 1;
2039 else if (options & Opt_mouseWheelScrollPage) 2190 else if (option (Opt_mouseWheelScrollPage))
2040 i = TermWin.nrow - 1; 2191 i = nrow - 1;
2041 else 2192 else
2042 i = 5; 2193 i = 5;
2043 2194
2044# ifdef MOUSE_SLIP_WHEELING 2195# ifdef MOUSE_SLIP_WHEELING
2045 if (ev.state & ControlMask) 2196 if (ev.state & ControlMask)
2046 { 2197 {
2047 mouse_slip_wheel_speed += v ? -1 : 1; 2198 mouse_slip_wheel_speed += v ? -1 : 1;
2048 if (mouse_slip_wheel_speed < -TermWin.nrow) mouse_slip_wheel_speed = -TermWin.nrow; 2199 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2049 if (mouse_slip_wheel_speed > +TermWin.nrow) mouse_slip_wheel_speed = +TermWin.nrow; 2200 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2050 2201
2051 if (slip_wheel_ev.at < NOW) 2202 if (slip_wheel_ev.at < NOW)
2052 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; 2203 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;
2053 2204
2054 slip_wheel_ev.start (); 2205 slip_wheel_ev.start ();
2055 } 2206 }
2056 else 2207 else
2057 { 2208 {
2058# endif 2209# endif
2059# ifdef JUMP_MOUSE_WHEEL
2060 scr_page (v, i); 2210 scr_page (v, i);
2061 scr_refresh (SMOOTH_REFRESH);
2062 scrollbar_show (1); 2211 scrollbar_show (1);
2063# else
2064 while (i--)
2065 {
2066 scr_page (v, 1);
2067 scr_refresh (SMOOTH_REFRESH);
2068 scrollbar_show (1);
2069 }
2070# endif
2071# ifdef MOUSE_SLIP_WHEELING 2212# ifdef MOUSE_SLIP_WHEELING
2072 } 2213 }
2073#endif 2214# endif
2074 } 2215 }
2075 break; 2216 break;
2076#endif 2217#endif
2077 } 2218 }
2078 } 2219 }
2079#ifdef MENUBAR
2080 else if (isMenuBarWindow (ev.window))
2081 menubar_control (ev);
2082#endif
2083} 2220}
2084
2085#ifdef TRANSPARENT
2086#if TINTING
2087/* taken from aterm-0.4.2 */
2088
2089typedef uint32_t RUINT32T;
2090
2091void ShadeXImage(rxvt_display *display, XImage* srcImage, int shade, int rm, int gm, int bm)
2092{
2093 int sh_r, sh_g, sh_b;
2094 RUINT32T mask_r, mask_g, mask_b;
2095 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2096 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2097 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2098 int i;
2099
2100 Visual* visual = display->visual;
2101
2102 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2103
2104 /* for convenience */
2105 mask_r = visual->red_mask;
2106 mask_g = visual->green_mask;
2107 mask_b = visual->blue_mask;
2108
2109 /* boring lookup table pre-initialization */
2110 switch (srcImage->bits_per_pixel) {
2111 case 15:
2112 if ((mask_r != 0x7c00) ||
2113 (mask_g != 0x03e0) ||
2114 (mask_b != 0x001f))
2115 return;
2116 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32));
2117 lookup_r = lookup;
2118 lookup_g = lookup+32;
2119 lookup_b = lookup+32+32;
2120 sh_r = 10;
2121 sh_g = 5;
2122 sh_b = 0;
2123 break;
2124 case 16:
2125 if ((mask_r != 0xf800) ||
2126 (mask_g != 0x07e0) ||
2127 (mask_b != 0x001f))
2128 return;
2129 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32));
2130 lookup_r = lookup;
2131 lookup_g = lookup+32;
2132 lookup_b = lookup+32+64;
2133 sh_r = 11;
2134 sh_g = 5;
2135 sh_b = 0;
2136 break;
2137 case 24:
2138 if ((mask_r != 0xff0000) ||
2139 (mask_g != 0x00ff00) ||
2140 (mask_b != 0x0000ff))
2141 return;
2142 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2143 lookup_r = lookup;
2144 lookup_g = lookup+256;
2145 lookup_b = lookup+256+256;
2146 sh_r = 16;
2147 sh_g = 8;
2148 sh_b = 0;
2149 break;
2150 case 32:
2151 if ((mask_r != 0xff0000) ||
2152 (mask_g != 0x00ff00) ||
2153 (mask_b != 0x0000ff))
2154 return;
2155 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2156 lookup_r = lookup;
2157 lookup_g = lookup+256;
2158 lookup_b = lookup+256+256;
2159 sh_r = 16;
2160 sh_g = 8;
2161 sh_b = 0;
2162 break;
2163 default:
2164 return; /* we do not support this color depth */
2165 }
2166
2167 /* prepare limits for color transformation (each channel is handled separately) */
2168 if (shade < 0) {
2169 shade = -shade;
2170 if (shade < 0) shade = 0;
2171 if (shade > 100) shade = 100;
2172
2173 lower_lim_r = 65535-rm;
2174 lower_lim_g = 65535-gm;
2175 lower_lim_b = 65535-bm;
2176
2177 lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100);
2178 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100);
2179 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100);
2180
2181 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
2182 } else {
2183 if (shade < 0) shade = 0;
2184 if (shade > 100) shade = 100;
2185
2186 lower_lim_r = lower_lim_g = lower_lim_b = 0;
2187
2188 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
2189 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);
2190 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100);
2191 }
2192
2193 /* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */
2194 if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 ))
2195 {
2196 unsigned int tmp;
2197
2198 tmp = lower_lim_r;
2199 lower_lim_r = lower_lim_b;
2200 lower_lim_b = tmp;
2201
2202 tmp = upper_lim_r;
2203 upper_lim_r = upper_lim_b;
2204 upper_lim_b = tmp;
2205 }
2206
2207 /* fill our lookup tables */
2208 for (i = 0; i <= mask_r>>sh_r; i++)
2209 {
2210 RUINT32T tmp;
2211 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r));
2212 tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r);
2213 lookup_r[i] = (tmp/65535)<<sh_r;
2214 }
2215 for (i = 0; i <= mask_g>>sh_g; i++)
2216 {
2217 RUINT32T tmp;
2218 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g));
2219 tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g);
2220 lookup_g[i] = (tmp/65535)<<sh_g;
2221 }
2222 for (i = 0; i <= mask_b>>sh_b; i++)
2223 {
2224 RUINT32T tmp;
2225 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b));
2226 tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b);
2227 lookup_b[i] = (tmp/65535)<<sh_b;
2228 }
2229
2230 /* apply table to input image (replacing colors by newly calculated ones) */
2231 switch (srcImage->bits_per_pixel)
2232 {
2233 case 15:
2234 {
2235 unsigned short *p1, *pf, *p, *pl;
2236 p1 = (unsigned short *) srcImage->data;
2237 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2238 while (p1 < pf)
2239 {
2240 p = p1;
2241 pl = p1 + srcImage->width;
2242 for (; p < pl; p++)
2243 {
2244 *p = lookup_r[(*p & 0x7c00)>>10] |
2245 lookup_g[(*p & 0x03e0)>> 5] |
2246 lookup_b[(*p & 0x001f)];
2247 }
2248 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2249 }
2250 break;
2251 }
2252 case 16:
2253 {
2254 unsigned short *p1, *pf, *p, *pl;
2255 p1 = (unsigned short *) srcImage->data;
2256 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2257 while (p1 < pf)
2258 {
2259 p = p1;
2260 pl = p1 + srcImage->width;
2261 for (; p < pl; p++)
2262 {
2263 *p = lookup_r[(*p & 0xf800)>>11] |
2264 lookup_g[(*p & 0x07e0)>> 5] |
2265 lookup_b[(*p & 0x001f)];
2266 }
2267 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2268 }
2269 break;
2270 }
2271 case 24:
2272 {
2273 unsigned char *p1, *pf, *p, *pl;
2274 p1 = (unsigned char *) srcImage->data;
2275 pf = (unsigned char *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2276 while (p1 < pf)
2277 {
2278 p = p1;
2279 pl = p1 + srcImage->width * 3;
2280 for (; p < pl; p += 3)
2281 {
2282 p[0] = lookup_r[(p[0] & 0xff0000)>>16];
2283 p[1] = lookup_r[(p[1] & 0x00ff00)>> 8];
2284 p[2] = lookup_r[(p[2] & 0x0000ff)];
2285 }
2286 p1 = (unsigned char *) ((char *) p1 + srcImage->bytes_per_line);
2287 }
2288 break;
2289 }
2290 case 32:
2291 {
2292 RUINT32T *p1, *pf, *p, *pl;
2293 p1 = (RUINT32T *) srcImage->data;
2294 pf = (RUINT32T *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2295
2296 while (p1 < pf)
2297 {
2298 p = p1;
2299 pl = p1 + srcImage->width;
2300 for (; p < pl; p++)
2301 {
2302 *p = lookup_r[(*p & 0xff0000)>>16] |
2303 lookup_g[(*p & 0x00ff00)>> 8] |
2304 lookup_b[(*p & 0x0000ff)] |
2305 (*p & ~0xffffff);
2306 }
2307 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
2308 }
2309 break;
2310 }
2311 }
2312
2313 free (lookup);
2314}
2315#endif
2316
2317/*
2318 * Check our parents are still who we think they are.
2319 * Do transparency updates if required
2320 */
2321int
2322rxvt_term::check_our_parents ()
2323{
2324 int i, pchanged, aformat, have_pixmap, rootdepth;
2325 unsigned long nitems, bytes_after;
2326 Atom atype;
2327 unsigned char *prop = NULL;
2328 Window root, oldp, *list;
2329 Pixmap rootpixmap = None;
2330 XWindowAttributes wattr, wrootattr;
2331
2332 pchanged = 0;
2333
2334 if (!(options & Opt_transparent))
2335 return pchanged; /* Don't try any more */
2336
2337 XGetWindowAttributes (display->display, display->root, &wrootattr);
2338 rootdepth = wrootattr.depth;
2339
2340 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);
2341
2342 if (rootdepth != wattr.depth)
2343 {
2344 if (am_transparent)
2345 {
2346 pchanged = 1;
2347 XSetWindowBackground (display->display, TermWin.vt, pix_colors_focused[Color_bg]);
2348 am_transparent = am_pixmap_trans = 0;
2349 }
2350
2351 return pchanged; /* Don't try any more */
2352 }
2353
2354 /* Get all X ops out of the queue so that our information is up-to-date. */
2355 XSync (display->display, False);
2356
2357 /*
2358 * Make the frame window set by the window manager have
2359 * the root background. Some window managers put multiple nested frame
2360 * windows for each client, so we have to take care about that.
2361 */
2362 i = (xa[XA_XROOTPMAPID]
2363 && XGetWindowProperty (display->display, display->root, xa[XA_XROOTPMAPID],
2364 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2365 &nitems, &bytes_after, &prop) == Success);
2366
2367 if (!i || prop == NULL)
2368 i = (xa[XA_XSETROOTID]
2369 && XGetWindowProperty (display->display, display->root, xa[XA_XSETROOTID],
2370 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2371 &nitems, &bytes_after, &prop) == Success);
2372
2373 if (!i || prop == NULL
2374#if TINTING
2375 || !rs[Rs_color + Color_tint]
2376#endif
2377 )
2378 have_pixmap = 0;
2379 else
2380 {
2381 have_pixmap = 1;
2382 rootpixmap = *(Pixmap *)prop;
2383 XFree (prop);
2384 }
2385
2386 if (have_pixmap)
2387 {
2388 /*
2389 * Copy display->root pixmap transparency
2390 */
2391 int sx, sy, nx, ny;
2392 unsigned int nw, nh;
2393 Window cr;
2394 XImage *image;
2395 GC gc;
2396 XGCValues gcvalue;
2397
2398 XTranslateCoordinates (display->display, TermWin.parent[0], display->root,
2399 0, 0, &sx, &sy, &cr);
2400 nw = (unsigned int)szHint.width;
2401 nh = (unsigned int)szHint.height;
2402 nx = ny = 0;
2403
2404 if (sx < 0)
2405 {
2406 nw += sx;
2407 nx = -sx;
2408 sx = 0;
2409 }
2410
2411 if (sy < 0)
2412 {
2413 nh += sy;
2414 ny = -sy;
2415 sy = 0;
2416 }
2417
2418 MIN_IT (nw, (unsigned int) (wrootattr.width - sx));
2419 MIN_IT (nh, (unsigned int) (wrootattr.height - sy));
2420 allowedxerror = -1;
2421 image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2422
2423 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2424 /* XXX: may need a delay here? */
2425 allowedxerror = 0;
2426
2427 if (image == NULL)
2428 {
2429 if (am_transparent && am_pixmap_trans)
2430 {
2431 pchanged = 1;
2432 if (TermWin.pixmap != None)
2433 {
2434 XFreePixmap (display->display, TermWin.pixmap);
2435 TermWin.pixmap = None;
2436 }
2437 }
2438
2439 am_pixmap_trans = 0;
2440 }
2441 else
2442 {
2443 if (TermWin.pixmap != None)
2444 XFreePixmap (display->display, TermWin.pixmap);
2445
2446#if TINTING
2447 if (ISSET_PIXCOLOR (Color_tint))
2448 {
2449 unsigned short rm, gm, bm;
2450 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2451
2452 pix_colors_focused[Color_tint].get (display, rm, gm, bm);
2453
2454 ShadeXImage (display, image, shade, rm, gm, bm);
2455 }
2456#endif
2457
2458 TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt,
2459 szHint.width, szHint.height, image->depth);
2460 gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue);
2461 XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0,
2462 nx, ny, image->width, image->height);
2463 XFreeGC (display->display, gc);
2464 XDestroyImage (image);
2465 XSetWindowBackgroundPixmap (display->display, TermWin.parent[0], TermWin.pixmap);
2466 XClearWindow (display->display, TermWin.parent[0]);
2467
2468 if (!am_transparent || !am_pixmap_trans)
2469 pchanged = 1;
2470
2471 am_transparent = am_pixmap_trans = 1;
2472 }
2473 }
2474
2475 if (!am_pixmap_trans)
2476 {
2477 unsigned int n;
2478 /*
2479 * InheritPixmap transparency
2480 */
2481 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)
2482 {
2483 oldp = TermWin.parent[i];
2484 XQueryTree (display->display, TermWin.parent[i - 1], &root,
2485 &TermWin.parent[i], &list, &n);
2486 XFree (list);
2487
2488 if (TermWin.parent[i] == display->root)
2489 {
2490 if (oldp != None)
2491 pchanged = 1;
2492
2493 break;
2494 }
2495
2496 if (oldp != TermWin.parent[i])
2497 pchanged = 1;
2498 }
2499
2500 n = 0;
2501
2502 if (pchanged)
2503 {
2504 for (; n < (unsigned int)i; n++)
2505 {
2506 XGetWindowAttributes (display->display, TermWin.parent[n], &wattr);
2507 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2508 {
2509 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1;
2510 break;
2511 }
2512 }
2513 }
2514
2515 if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0])))
2516 {
2517 XSetWindowBackground (display->display, TermWin.parent[0], pix_colors_focused[Color_fg]);
2518 XSetWindowBackground (display->display, TermWin.vt, pix_colors_focused[Color_bg]);
2519 am_transparent = 0;
2520 /* XXX: also turn off Opt_transparent? */
2521 }
2522 else
2523 {
2524#if WAIT_FOR_WM
2525 /* wait (an arbitrary period) for the WM to do its thing
2526 * needed for fvwm2.2.2 (and before?) */
2527 sleep (1);
2528#endif
2529 for (n = 0; n < (unsigned int)i; n++)
2530 {
2531 XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], ParentRelative);
2532 XClearWindow (display->display, TermWin.parent[n]);
2533 }
2534
2535 XSetWindowBackgroundPixmap (display->display, TermWin.vt, ParentRelative);
2536 am_transparent = 1;
2537 }
2538
2539 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)
2540 TermWin.parent[i] = None;
2541 }
2542
2543 if (scrollBar.win)
2544 {
2545 XSetWindowBackgroundPixmap (display->display, scrollBar.win, ParentRelative);
2546 scrollBar.setIdle ();
2547 scrollbar_show (0);
2548 }
2549
2550 return pchanged;
2551}
2552#endif
2553 2221
2554/*}}} */ 2222/*}}} */
2555 2223
2556bool 2224bool
2557rxvt_term::cmd_parse () 2225rxvt_term::cmd_parse ()
2558{ 2226{
2559 bool flag = false; 2227 bool flag = false;
2560 unicode_t ch = NOCHAR; 2228 wchar_t ch = NOCHAR;
2561 unsigned char *seq_begin; // remember start of esc-sequence here 2229 char *seq_begin; // remember start of esc-sequence here
2562 2230
2563 for (;;) 2231 for (;;)
2564 { 2232 {
2565 if (ch == NOCHAR) 2233 if (ch == NOCHAR)
2566 { 2234 {
2567 seq_begin = cmdbuf_ptr; 2235 seq_begin = cmdbuf_ptr;
2568 ch = next_char (); 2236 ch = next_char ();
2569 }
2570 2237
2571 if (ch == NOCHAR) // TODO: improve 2238 if (ch == NOCHAR)
2572 break; 2239 break;
2240 }
2573 2241
2574 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2242 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)
2575 { 2243 {
2576 if (!seen_input) 2244 if (!seen_input)
2577 { 2245 {
… …
2581 // some window managers resize the window early, and these programs 2249 // some window managers resize the window early, and these programs
2582 // then sometimes get the size wrong. 2250 // then sometimes get the size wrong.
2583 // unfortunately other programs are even more buggy and dislike 2251 // unfortunately other programs are even more buggy and dislike
2584 // being sent SIGWINCH, so only do it when we were in fact being 2252 // being sent SIGWINCH, so only do it when we were in fact being
2585 // resized. 2253 // resized.
2586 if (seen_resize) 2254 if (seen_resize && cmd_pid)
2587 kill (-cmd_pid, SIGWINCH); 2255 kill (-cmd_pid, SIGWINCH);
2588 } 2256 }
2589 2257
2590 /* Read a text string from the input buffer */ 2258 /* Read a text string from the input buffer */
2591 unicode_t buf[UBUFSIZ]; 2259 wchar_t buf[UBUFSIZ];
2592 bool refreshnow = false; 2260 bool refreshnow = false;
2593 int nlines = 0; 2261 int nlines = 0;
2594 unicode_t *str = buf; 2262 wchar_t *str = buf;
2263 wchar_t *eol = str + min (ncol, UBUFSIZ);
2595 2264
2596 for (;;) 2265 for (;;)
2597 { 2266 {
2598 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2267 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2599 break; 2268 break;
2600 2269
2601 *str++ = ch; 2270 *str++ = ch;
2602 2271
2603 if (ch == C0_LF) 2272 if (ch == C0_LF || str >= eol)
2604 { 2273 {
2274 if (ch == C0_LF)
2605 nlines++; 2275 nlines++;
2276
2606 refresh_count++; 2277 refresh_count++;
2607 2278
2608 if (!(options & Opt_jumpScroll) 2279 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1)
2609 || (refresh_count >= refresh_limit * (TermWin.nrow - 1)))
2610 { 2280 {
2281 refresh_count = 0;
2282
2283 if (!option (Opt_skipScroll) || io_manager::now () > NOW + 1. / 60.)
2284 {
2611 refreshnow = true; 2285 refreshnow = true;
2612 ch = NOCHAR; 2286 ch = NOCHAR;
2613 break; 2287 break;
2288 }
2614 } 2289 }
2615 2290
2616 // scr_add_lines only works for nlines <= TermWin.nrow - 1. 2291 // scr_add_lines only works for nlines <= nrow - 1.
2617 if (nlines >= TermWin.nrow - 1) 2292 if (nlines >= nrow - 1)
2618 { 2293 {
2294 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2295 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2619 scr_add_lines (buf, nlines, str - buf); 2296 scr_add_lines (buf, str - buf, nlines);
2297
2620 nlines = 0; 2298 nlines = 0;
2621 str = buf; 2299 str = buf;
2300 eol = str + min (ncol, UBUFSIZ);
2622 } 2301 }
2623 }
2624 2302
2625 if (str >= buf + UBUFSIZ) 2303 if (str >= eol)
2626 { 2304 {
2305 if (eol >= buf + UBUFSIZ)
2306 {
2627 ch = NOCHAR; 2307 ch = NOCHAR;
2628 break; 2308 break;
2309 }
2310 else
2311 eol = min (eol + ncol, buf + UBUFSIZ);
2312 }
2313
2629 } 2314 }
2630 2315
2631 seq_begin = cmdbuf_ptr; 2316 seq_begin = cmdbuf_ptr;
2632 ch = next_char (); 2317 ch = next_char ();
2633 } 2318 }
2634 2319
2320 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2321 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2635 scr_add_lines (buf, nlines, str - buf); 2322 scr_add_lines (buf, str - buf, nlines);
2636 2323
2637 /* 2324 /*
2638 * If there have been a lot of new lines, then update the screen 2325 * If there have been a lot of new lines, then update the screen
2639 * What the heck I'll cheat and only refresh less than every page-full. 2326 * What the heck we'll cheat and only refresh less than every page-full.
2640 * the number of pages between refreshes is refresh_limit, which 2327 * if skipScroll is enabled.
2641 * is incremented here because we must be doing flat-out scrolling.
2642 */ 2328 */
2643 if (refreshnow) 2329 if (refreshnow)
2644 { 2330 {
2645 if ((options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2646 refresh_limit++;
2647 else
2648 {
2649 flag = true; 2331 flag = true;
2650 scr_refresh (refresh_type); 2332 scr_refresh ();
2651 } 2333 want_refresh = 1;
2652 } 2334 }
2653 2335
2654 } 2336 }
2655 else 2337 else
2656 { 2338 {
… …
2670 } 2352 }
2671 2353
2672 return flag; 2354 return flag;
2673} 2355}
2674 2356
2675// read the next octet
2676unicode_t
2677rxvt_term::next_octet ()
2678{
2679 return cmdbuf_ptr < cmdbuf_endp
2680 ? *cmdbuf_ptr++
2681 : NOCHAR;
2682}
2683
2684// read the next character 2357// read the next character
2685unicode_t 2358wchar_t
2686rxvt_term::next_char () 2359rxvt_term::next_char () NOTHROW
2687{ 2360{
2688 while (cmdbuf_ptr < cmdbuf_endp) 2361 while (cmdbuf_ptr < cmdbuf_endp)
2689 { 2362 {
2690 // assume 7-bit to be ascii ALWAYS 2363 // assume 7-bit to be ascii ALWAYS
2691 if (*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2364 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
2692 return *cmdbuf_ptr++; 2365 return *cmdbuf_ptr++;
2693 2366
2694 wchar_t wc; 2367 wchar_t wc;
2695 size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2368 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2696 2369
2697 if (len == (size_t)-2) 2370 if (len == (size_t)-2)
2698 { 2371 {
2699 // the mbstate stores incomplete sequences. didn't know this :/ 2372 // the mbstate stores incomplete sequences. didn't know this :/
2700 cmdbuf_ptr = cmdbuf_endp; 2373 cmdbuf_ptr = cmdbuf_endp;
2701 break; 2374 break;
2702 } 2375 }
2703 2376
2704 if (len == (size_t)-1) 2377 if (len == (size_t)-1)
2705 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2378 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2706 2379
2707 // assume wchar == unicode 2380 // assume wchar == unicode
2708 cmdbuf_ptr += len; 2381 cmdbuf_ptr += len;
2709 return wc; 2382 return wc & UNICODE_MASK;
2710 } 2383 }
2711 2384
2712 return NOCHAR; 2385 return NOCHAR;
2713} 2386}
2387
2388// read the next octet
2389uint32_t
2390rxvt_term::next_octet () NOTHROW
2391{
2392 return cmdbuf_ptr < cmdbuf_endp
2393 ? (unsigned char)*cmdbuf_ptr++
2394 : NOCHAR;
2395}
2396
2397static class out_of_input out_of_input;
2714 2398
2715/* rxvt_cmd_getc () - Return next input character */ 2399/* rxvt_cmd_getc () - Return next input character */
2716/* 2400/*
2717 * Return the next input character after first passing any keyboard input 2401 * Return the next input character after first passing any keyboard input
2718 * to the command. 2402 * to the command.
2719 */ 2403 */
2720unicode_t 2404wchar_t
2721rxvt_term::cmd_getc () 2405rxvt_term::cmd_getc () THROW ((class out_of_input))
2722{ 2406{
2723 unicode_t c = next_char (); 2407 wchar_t c = next_char ();
2724 2408
2725 if (c == NOCHAR) 2409 if (c == NOCHAR)
2726 throw out_of_input; 2410 throw out_of_input;
2727 2411
2728 return c; 2412 return c;
2729} 2413}
2730 2414
2731unicode_t 2415uint32_t
2732rxvt_term::cmd_get8 () 2416rxvt_term::cmd_get8 () THROW ((class out_of_input))
2733{ 2417{
2734 unicode_t c = next_octet (); 2418 uint32_t c = next_octet ();
2735 2419
2736 if (c == NOCHAR) 2420 if (c == NOCHAR)
2737 throw out_of_input; 2421 throw out_of_input;
2738 2422
2739 return c; 2423 return c;
… …
2803 { 2487 {
2804 if ((buf[len++] = cmd_getc ()) == 'i') 2488 if ((buf[len++] = cmd_getc ()) == 'i')
2805 break; /* done = 1 */ 2489 break; /* done = 1 */
2806 } 2490 }
2807 } 2491 }
2808 2492
2809 for (i = 0; i < len; i++) 2493 for (i = 0; i < len; i++)
2810 if (putc (buf[i], fd) == EOF) 2494 if (putc (buf[i], fd) == EOF)
2811 { 2495 {
2812 done = 1; 2496 done = 1;
2813 break; 2497 break;
… …
2839 case C0_ESC: 2523 case C0_ESC:
2840 process_escape_seq (); 2524 process_escape_seq ();
2841 break; 2525 break;
2842 case C0_ENQ: /* terminal Status */ 2526 case C0_ENQ: /* terminal Status */
2843 if (rs[Rs_answerbackstring]) 2527 if (rs[Rs_answerbackstring])
2844 tt_write ((const unsigned char *)rs[Rs_answerbackstring], 2528 tt_write (rs [Rs_answerbackstring], strlen (rs [Rs_answerbackstring]));
2845 (unsigned int)strlen (rs[Rs_answerbackstring]));
2846 else 2529 else
2847 tt_write ((unsigned char *)VT100_ANS, 2530 tt_write (VT100_ANS, strlen (VT100_ANS));
2848 (unsigned int)strlen (VT100_ANS));
2849 break; 2531 break;
2850 case C0_BEL: /* bell */ 2532 case C0_BEL: /* bell */
2851 scr_bell (); 2533 scr_bell ();
2852 break; 2534 break;
2853 case C0_BS: /* backspace */ 2535 case C0_BS: /* backspace */
… …
2877 process_dcs_seq (); 2559 process_dcs_seq ();
2878 break; 2560 break;
2879 case 0x9b: /* CSI */ 2561 case 0x9b: /* CSI */
2880 process_csi_seq (); 2562 process_csi_seq ();
2881 break; 2563 break;
2882 case 0x9d: /* CSI */ 2564 case 0x9d: /* OSC */
2883 process_osc_seq (); 2565 process_osc_seq ();
2884 break; 2566 break;
2885#endif 2567#endif
2886 } 2568 }
2887} 2569}
… …
2977 scr_charset_set (2, (unsigned int)cmd_getc ()); 2659 scr_charset_set (2, (unsigned int)cmd_getc ());
2978 break; 2660 break;
2979 case '+': 2661 case '+':
2980 scr_charset_set (3, (unsigned int)cmd_getc ()); 2662 scr_charset_set (3, (unsigned int)cmd_getc ());
2981 break; 2663 break;
2982#if ENABLE_FRILLS 2664#if !ENABLE_MINIMAL
2983 case '6': 2665 case '6':
2984 scr_backindex (); 2666 scr_backindex ();
2985 break; 2667 break;
2986#endif 2668#endif
2987 case '7': 2669 case '7':
2988 scr_cursor (SAVE); 2670 scr_cursor (SAVE);
2989 break; 2671 break;
2990 case '8': 2672 case '8':
2991 scr_cursor (RESTORE); 2673 scr_cursor (RESTORE);
2992 break; 2674 break;
2993#if ENABLE_FRILLS 2675#if !ENABLE_MINIMAL
2994 case '9': 2676 case '9':
2995 scr_forwardindex (); 2677 scr_forwardindex ();
2996 break; 2678 break;
2997#endif 2679#endif
2998 case '=': 2680 case '=':
… …
3008 break; 2690 break;
3009 2691
3010 /* 8.3.87: NEXT LINE */ 2692 /* 8.3.87: NEXT LINE */
3011 case C1_NEL: /* ESC E */ 2693 case C1_NEL: /* ESC E */
3012 { 2694 {
3013 unicode_t nlcr[] = { C0_LF, C0_CR }; 2695 wchar_t nlcr[] = { C0_LF, C0_CR };
3014 scr_add_lines (nlcr, 1, 2); 2696 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1);
3015 } 2697 }
3016 break; 2698 break;
3017 2699
3018 /* kidnapped escape sequence: Should be 8.3.48 */ 2700 /* kidnapped escape sequence: Should be 8.3.48 */
3019 case C1_ESA: /* ESC G */ 2701 case C1_ESA: /* ESC G */
… …
3041 process_dcs_seq (); 2723 process_dcs_seq ();
3042 break; 2724 break;
3043 2725
3044 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2726 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
3045 case C1_SCI: /* ESC Z */ 2727 case C1_SCI: /* ESC Z */
3046 tt_write ((const unsigned char *)ESCZ_ANSWER, 2728 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
3047 (unsigned int) (sizeof (ESCZ_ANSWER) - 1));
3048 break; /* steal obsolete ESC [ c */ 2729 break; /* steal obsolete ESC [ c */
3049 2730
3050 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2731 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */
3051 case C1_CSI: /* ESC [ */ 2732 case C1_CSI: /* ESC [ */
3052 process_csi_seq (); 2733 process_csi_seq ();
… …
3116 unicode_t ch, priv, i; 2797 unicode_t ch, priv, i;
3117 unsigned int nargs, p; 2798 unsigned int nargs, p;
3118 int n, ndef; 2799 int n, ndef;
3119 int arg[ESC_ARGS]; 2800 int arg[ESC_ARGS];
3120 2801
3121 for (nargs = ESC_ARGS; nargs > 0;) 2802 memset (arg, 0, sizeof (arg));
3122 arg[--nargs] = 0; 2803 nargs = 0;
3123 2804
3124 priv = 0; 2805 priv = 0;
3125 ch = cmd_getc (); 2806 ch = cmd_getc ();
3126 if (ch >= '<' && ch <= '?') 2807 if (ch >= '<' && ch <= '?')
3127 { /* '<' '=' '>' '?' */ 2808 { /* '<' '=' '>' '?' */
… …
3161 ndef = get_byte_array_bit (csi_defaults, i); 2842 ndef = get_byte_array_bit (csi_defaults, i);
3162 for (p = 0; p < nargs; p++) 2843 for (p = 0; p < nargs; p++)
3163 if (arg[p] == -1) 2844 if (arg[p] == -1)
3164 arg[p] = ndef; 2845 arg[p] = ndef;
3165 2846
3166#ifdef DEBUG_CMD
3167 fprintf (stderr, "CSI ");
3168 for (p = 0; p < nargs; p++)
3169 fprintf (stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : "");
3170 fprintf (stderr, "%c\n", ch);
3171#endif
3172
3173 /* 2847 /*
3174 * private mode handling 2848 * private mode handling
3175 */ 2849 */
3176 if (priv) 2850 if (priv)
3177 { 2851 {
3178 switch (priv) 2852 switch (priv)
3179 { 2853 {
3180 case '>': 2854 case '>':
3181 if (ch == CSI_DA) /* secondary device attributes */ 2855 if (ch == CSI_DA) /* secondary device attributes */
2856 {
2857 // first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt,
2858 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
2859 //
2860 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
2861 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify
2862 // that we do not support xterm mouse reporting (should be 95 when we do).
2863 //
3182 tt_printf ("\033[>%d;%-.8s;0c", 'R', VSTRING); 2864 tt_printf ("\033[>%d;94;0c", 'U');
2865 }
3183 break; 2866 break;
3184 case '?': 2867 case '?':
3185 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2868 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3186 process_terminal_mode (ch, priv, nargs, arg); 2869 process_terminal_mode (ch, priv, nargs, arg);
3187 break; 2870 break;
… …
3292 2975
3293 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */ 2976 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */
3294 arg[0] = -arg[0]; 2977 arg[0] = -arg[0];
3295 /* FALLTHROUGH */ 2978 /* FALLTHROUGH */
3296 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 2979 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
3297 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0); 2980 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
3298 break; 2981 break;
3299 2982
3300 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 2983 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
3301 tt_write ((const unsigned char *)VT100_ANS, 2984 tt_write (VT100_ANS, sizeof (VT100_ANS) - 1);
3302 (unsigned int) (sizeof (VT100_ANS) - 1));
3303 break; 2985 break;
3304 2986
3305 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 2987 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
3306 process_sgr_mode (nargs, arg); 2988 process_sgr_mode (nargs, arg);
3307 break; 2989 break;
… …
3314 break; 2996 break;
3315 case 6: /* CPR requested */ 2997 case 6: /* CPR requested */
3316 scr_report_position (); 2998 scr_report_position ();
3317 break; 2999 break;
3318 case 7: /* unofficial extension */ 3000 case 7: /* unofficial extension */
3319 if (options & Opt_insecure) 3001 if (option (Opt_insecure))
3320 tt_printf ("%-.250s\012", rs[Rs_display_name]); 3002 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3321 break; 3003 break;
3322 case 8: /* unofficial extension */ 3004 case 8: /* unofficial extension */
3323 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3005 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3324 break; 3006 break;
… …
3391 break; 3073 break;
3392 case CSI_75: 3074 case CSI_75:
3393 scr_cursor (RESTORE); 3075 scr_cursor (RESTORE);
3394 break; 3076 break;
3395 3077
3396#if ENABLE_FRILLS 3078#if !ENABLE_MINIMAL
3397 case CSI_74: 3079 case CSI_74:
3398 process_window_ops (arg, nargs); 3080 process_window_ops (arg, nargs);
3399 break; 3081 break;
3400#endif 3082#endif
3401 3083
… …
3408 break; 3090 break;
3409 } 3091 }
3410} 3092}
3411/*}}} */ 3093/*}}} */
3412 3094
3413#if ENABLE_FRILLS 3095#if !ENABLE_MINIMAL
3414/* ARGSUSED */ 3096/* ARGSUSED */
3415void 3097void
3416rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3098rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3417{ 3099{
3418 int x, y; 3100 int x, y;
3419 XWindowAttributes wattr; 3101 XWindowAttributes wattr;
3420 Window wdummy; 3102 Window wdummy;
3103
3104 dLocal (Display *, dpy);
3421 3105
3422 if (nargs == 0) 3106 if (nargs == 0)
3423 return; 3107 return;
3424 3108
3425 switch (args[0]) 3109 switch (args[0])
3426 { 3110 {
3427 /* 3111 /*
3428 * commands 3112 * commands
3429 */ 3113 */
3430 case 1: /* deiconify window */ 3114 case 1: /* deiconify window */
3431 XMapWindow (display->display, TermWin.parent[0]); 3115 XMapWindow (dpy, parent[0]);
3432 break; 3116 break;
3433 case 2: /* iconify window */ 3117 case 2: /* iconify window */
3434 XIconifyWindow (display->display, TermWin.parent[0], 3118 XIconifyWindow (dpy, parent[0], display->screen);
3435 DefaultScreen (display->display));
3436 break; 3119 break;
3437 case 3: /* set position (pixels) */ 3120 case 3: /* set position (pixels) */
3438 XMoveWindow (display->display, TermWin.parent[0], args[1], args[2]); 3121 XMoveWindow (dpy, parent[0], args[1], args[2]);
3439 break; 3122 break;
3440 case 4: /* set size (pixels) */ 3123 case 4: /* set size (pixels) */
3441 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3124 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3442 break; 3125 break;
3443 case 5: /* raise window */ 3126 case 5: /* raise window */
3444 XRaiseWindow (display->display, TermWin.parent[0]); 3127 XRaiseWindow (dpy, parent[0]);
3445 break; 3128 break;
3446 case 6: /* lower window */ 3129 case 6: /* lower window */
3447 XLowerWindow (display->display, TermWin.parent[0]); 3130 XLowerWindow (dpy, parent[0]);
3448 break; 3131 break;
3449 case 7: /* refresh window */ 3132 case 7: /* refresh window */
3450 scr_touch (true); 3133 scr_touch (true);
3451 break; 3134 break;
3452 case 8: /* set size (chars) */ 3135 case 8: /* set size (chars) */
3453 set_widthheight ((unsigned int) (args[2] * TermWin.fwidth), 3136 set_widthheight ((unsigned int) (args[2] * fwidth),
3454 (unsigned int) (args[1] * TermWin.fheight)); 3137 (unsigned int) (args[1] * fheight));
3455 break; 3138 break;
3456 3139
3457 //case 9: NYI, TODO, restore maximized window or maximize window 3140 //case 9: NYI, TODO, restore maximized window or maximize window
3458 default: 3141 default:
3459 if (args[0] >= 24) /* set height (chars) */ 3142 if (args[0] >= 24) /* set height (chars) */
3460 set_widthheight ((unsigned int)TermWin.width, 3143 set_widthheight ((unsigned int)width,
3461 (unsigned int) (args[1] * TermWin.fheight)); 3144 (unsigned int) (args[1] * fheight));
3462 break; 3145 break;
3463
3464 3146
3465 /* 3147 /*
3466 * reports - some output format copied from XTerm 3148 * reports - some output format copied from XTerm
3467 */ 3149 */
3468 case 11: /* report window state */ 3150 case 11: /* report window state */
3469 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3151 XGetWindowAttributes (dpy, parent[0], &wattr);
3470 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3152 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3471 break; 3153 break;
3472 case 13: /* report window position */ 3154 case 13: /* report window position */
3473 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3155 XGetWindowAttributes (dpy, parent[0], &wattr);
3474 XTranslateCoordinates (display->display, TermWin.parent[0], wattr.root, 3156 XTranslateCoordinates (dpy, parent[0], wattr.root,
3475 -wattr.border_width, -wattr.border_width, 3157 -wattr.border_width, -wattr.border_width,
3476 &x, &y, &wdummy); 3158 &x, &y, &wdummy);
3477 tt_printf ("\033[3;%d;%dt", x, y); 3159 tt_printf ("\033[3;%d;%dt", x, y);
3478 break; 3160 break;
3479 case 14: /* report window size (pixels) */ 3161 case 14: /* report window size (pixels) */
3480 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3162 XGetWindowAttributes (dpy, parent[0], &wattr);
3481 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3163 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3482 break; 3164 break;
3483 case 18: /* report text area size (chars) */ 3165 case 18: /* report text area size (chars) */
3484 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); 3166 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3485 break; 3167 break;
3486 case 19: /* report window size (chars) */ 3168 case 19: /* report window size (chars) */
3487 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol); 3169 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3488 break; 3170 break;
3489 case 20: /* report icon label */ 3171 case 20: /* report icon label */
3490 { 3172 {
3491 char *s; 3173 char *s;
3492 XGetIconName (display->display, TermWin.parent[0], &s); 3174 XGetIconName (dpy, parent[0], &s);
3493 tt_printf ("\033]L%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3175 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3494 XFree (s); 3176 XFree (s);
3495 } 3177 }
3496 break; 3178 break;
3497 case 21: /* report window title */ 3179 case 21: /* report window title */
3498 { 3180 {
3499 char *s; 3181 char *s;
3500 XFetchName (display->display, TermWin.parent[0], &s); 3182 XFetchName (dpy, parent[0], &s);
3501 tt_printf ("\033]l%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3183 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3502 XFree (s); 3184 XFree (s);
3503 } 3185 }
3504 break; 3186 break;
3505 } 3187 }
3506} 3188}
… …
3509/*----------------------------------------------------------------------*/ 3191/*----------------------------------------------------------------------*/
3510/* 3192/*
3511 * get input up until STRING TERMINATOR (or BEL) 3193 * get input up until STRING TERMINATOR (or BEL)
3512 * ends_how is terminator used. returned input must be free()'d 3194 * ends_how is terminator used. returned input must be free()'d
3513 */ 3195 */
3514unsigned char * 3196char *
3515rxvt_term::get_to_st (unicode_t &ends_how) 3197rxvt_term::get_to_st (unicode_t &ends_how)
3516{ 3198{
3517 unicode_t seen_esc = 0, ch; 3199 unicode_t ch;
3200 bool seen_esc = false;
3518 unsigned int n = 0; 3201 unsigned int n = 0;
3519 unsigned char *s;
3520 unsigned char string[STRING_MAX]; 3202 wchar_t string[STRING_MAX];
3521 3203
3522 while ((ch = cmd_getc ()) != NOCHAR) 3204 while ((ch = cmd_getc ()) != NOCHAR)
3523 { 3205 {
3524 if (seen_esc) 3206 if (seen_esc)
3525 { 3207 {
… …
3528 else 3210 else
3529 return NULL; 3211 return NULL;
3530 } 3212 }
3531 else if (ch == C0_ESC) 3213 else if (ch == C0_ESC)
3532 { 3214 {
3533 seen_esc = 1; 3215 seen_esc = true;
3534 continue; 3216 continue;
3535 } 3217 }
3536 else if (ch == C0_BEL || ch == CHAR_ST) 3218 else if (ch == C0_BEL || ch == CHAR_ST)
3537 break; 3219 break;
3220 else if (ch == C0_SYN)
3221 ch = cmd_get8 ();
3538 else if (ch < 0x20) 3222 else if (ch < 0x20)
3539 return NULL; /* other control character - exit */ 3223 return NULL; /* other control character - exit */
3540 3224
3541 seen_esc = 0; 3225 seen_esc = false;
3542 3226
3543 if (n >= sizeof (string) - 1) 3227 if (n >= STRING_MAX - 1)
3544 // stop at some sane length 3228 // stop at some sane length
3545 return NULL; 3229 return NULL;
3546 3230
3547 if (ch == C0_SYN)
3548 string[n++] = cmd_get8 ();
3549 else
3550 string[n++] = ch; 3231 string[n++] = ch;
3551 } 3232 }
3552 3233
3553 string[n++] = '\0'; 3234 string[n++] = '\0';
3554 3235
3555 if ((s = (unsigned char *)rxvt_malloc (n)) == NULL)
3556 return NULL;
3557
3558 ends_how = (ch == 0x5c ? C0_ESC : ch); 3236 ends_how = (ch == 0x5c ? C0_ESC : ch);
3559 strncpy (s, string, n); 3237
3560 return s; 3238 return rxvt_wcstombs (string);
3561} 3239}
3562 3240
3563/*----------------------------------------------------------------------*/ 3241/*----------------------------------------------------------------------*/
3564/* 3242/*
3565 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3243 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3566 */ 3244 */
3567void 3245void
3568rxvt_term::process_dcs_seq () 3246rxvt_term::process_dcs_seq ()
3569{ 3247{
3570 unsigned char *s; 3248 char *s;
3571 unicode_t eh; 3249 unicode_t eh;
3572 3250
3573 /* 3251 /*
3574 * Not handled yet 3252 * Not handled yet
3575 */ 3253 */
… …
3594 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3272 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3595 arg = arg * 10 + (ch - '0'); 3273 arg = arg * 10 + (ch - '0');
3596 3274
3597 if (ch == ';') 3275 if (ch == ';')
3598 { 3276 {
3599 unsigned char *s = get_to_st (eh); 3277 char *s = get_to_st (eh);
3600 3278
3601 if (s) 3279 if (s)
3602 { 3280 {
3603 process_xterm_seq (arg, (char *)s, eh); 3281 process_xterm_seq (arg, s, eh);
3604 free (s); 3282 free (s);
3605 } 3283 }
3606 } 3284 }
3607} 3285}
3608 3286
3609void 3287void
3610rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp) 3288rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3611{ 3289{
3612 if (str[0] == '?' && !str[1]) 3290 if (str[0] == '?' && !str[1])
3613 { 3291 {
3614 unsigned short r, g, b; 3292 rgba c;
3615 pix_colors_focused[color].get (display, r, g, b); 3293 pix_colors_focused[color].get (c);
3294
3295#if XFT
3296 if (c.a != rgba::MAX_CC)
3297 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp);
3298 else
3299#endif
3616 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp); 3300 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp);
3617 } 3301 }
3618 else 3302 else
3619 set_window_color (color, str); 3303 set_window_color (color, str);
3620} 3304}
3621 3305
3622/* 3306/*
3623 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3307 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3624 * 0 = change iconName/title
3625 * 1 = change iconName
3626 * 2 = change title
3627 * 4 = change color
3628 * 10 = change fg color
3629 * 11 = change bg color
3630 * 12 = change text color
3631 * 13 = change mouse foreground color
3632 * 17 = change highlight character colour
3633 * 18 = change bold character color
3634 * 19 = change underlined character color
3635 * 46 = change logfile (not implemented)
3636 * 50 = change font
3637 *
3638 * rxvt extensions:
3639 * 20 = bg pixmap
3640 * 39 = change default fg color
3641 * 49 = change default bg color
3642 * 55 = dump scrollback buffer and all of screen
3643 * 701 = change locale
3644 * 702 = find font
3645 * 703 = menu
3646 */ 3308 */
3647void 3309void
3648rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp) 3310rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3649{ 3311{
3650 int changed = 0;
3651 int color; 3312 int color;
3652 char *buf, *name; 3313 char *buf, *name;
3653 bool query = str[0] == '?' && !str[1]; 3314 bool query = str[0] == '?' && !str[1];
3654 int saveop = op; 3315 int saveop = op;
3655 3316
3317 dLocal (Display *, dpy);
3318
3656 assert (str != NULL); 3319 assert (str != NULL);
3320
3321 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END)))
3322 return;
3323
3657 switch (op) 3324 switch (op)
3658 { 3325 {
3659 case XTerm_name: 3326 case XTerm_name:
3660 set_title (str); 3327 set_title (str);
3661 /* FALLTHROUGH */ 3328 /* FALLTHROUGH */
… …
3666 set_title (str); 3333 set_title (str);
3667 break; 3334 break;
3668 case XTerm_property: 3335 case XTerm_property:
3669 if (str[0] == '?') 3336 if (str[0] == '?')
3670 { 3337 {
3671 Atom prop = XInternAtom (display->display, str + 1, True); 3338 Atom prop = display->atom (str + 1);
3672 Atom actual_type; 3339 Atom actual_type;
3673 int actual_format; 3340 int actual_format;
3674 unsigned long nitems; 3341 unsigned long nitems;
3675 unsigned long bytes_after; 3342 unsigned long bytes_after;
3676 unsigned char *value = 0; 3343 unsigned char *value = 0;
3677 const char *str = ""; 3344 const char *str = "";
3678 3345
3679 if (prop 3346 if (prop
3680 && XGetWindowProperty (display->display, TermWin.parent[0], 3347 && XGetWindowProperty (dpy, parent[0],
3681 prop, 0, 1<<16, 0, AnyPropertyType, 3348 prop, 0, 1<<16, 0, AnyPropertyType,
3682 &actual_type, &actual_format, 3349 &actual_type, &actual_format,
3683 &nitems, &bytes_after, &value) == Success 3350 &nitems, &bytes_after, &value) == Success
3684 && actual_type != None 3351 && actual_type != None
3685 && actual_format == 8) 3352 && actual_format == 8)
3686 str = (const char *)(value); 3353 str = (const char *)(value);
3687 3354
3688 tt_printf ("\033]%d;%s%c", XTerm_property, str, resp); 3355 tt_printf ("\033]%d;%s%c", op, str, resp);
3689 3356
3690 XFree (value); 3357 XFree (value);
3691 } 3358 }
3692 else 3359 else
3693 { 3360 {
3694 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3361 char *eq = strchr (str, '='); // constness lost, but verified to be ok
3695 3362
3696 if (eq) 3363 if (eq)
3697 { 3364 {
3698 *eq = 0; 3365 *eq = 0;
3699 XChangeProperty (display->display, TermWin.parent[0], 3366 set_utf8_property (display->atom (str), eq + 1);
3700 display->atom (str), XA_STRING, 8,
3701 PropModeReplace, (unsigned char *)eq + 1,
3702 strlen (eq + 1));
3703 } 3367 }
3704 else 3368 else
3705 XDeleteProperty (display->display, TermWin.parent[0], 3369 XDeleteProperty (dpy, parent[0],
3706 display->atom (str)); 3370 display->atom (str));
3707 } 3371 }
3708 break; 3372 break;
3709 3373
3710 case XTerm_Color: 3374 case XTerm_Color:
… …
3712 { 3376 {
3713 if ((name = strchr (buf, ';')) == NULL) 3377 if ((name = strchr (buf, ';')) == NULL)
3714 break; 3378 break;
3715 3379
3716 *name++ = '\0'; 3380 *name++ = '\0';
3717 color = atoi (buf); 3381 color = atoi (buf) + minCOLOR;
3718 3382
3719 if (color < 0 || color >= TOTAL_COLORS) 3383 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
3720 break; 3384 break;
3721 3385
3722 if ((buf = strchr (name, ';')) != NULL) 3386 if ((buf = strchr (name, ';')) != NULL)
3723 *buf++ = '\0'; 3387 *buf++ = '\0';
3724 3388
3725 if (name[0] == '?' && !name[1]) 3389 process_color_seq (op, color, name, resp);
3726 {
3727 unsigned short r, g, b;
3728 pix_colors_focused[color + minCOLOR].get (display, r, g, b);
3729 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3730 }
3731 else
3732 set_window_color (color + minCOLOR, name);
3733 } 3390 }
3734 break; 3391 break;
3735 case XTerm_Color00: 3392 case XTerm_Color00:
3736 process_color_seq (XTerm_Color00, Color_fg, str, resp); 3393 process_color_seq (op, Color_fg, str, resp);
3737 break; 3394 break;
3738 case XTerm_Color01: 3395 case XTerm_Color01:
3739 process_color_seq (XTerm_Color00, Color_bg, str, resp); 3396 process_color_seq (op, Color_bg, str, resp);
3740 break; 3397 break;
3741#ifndef NO_CURSORCOLOR 3398#ifndef NO_CURSORCOLOR
3742 case XTerm_Color_cursor: 3399 case XTerm_Color_cursor:
3743 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); 3400 process_color_seq (op, Color_cursor, str, resp);
3744 break; 3401 break;
3745#endif 3402#endif
3746 case XTerm_Color_pointer_fg: 3403 case XTerm_Color_pointer_fg:
3747 process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp); 3404 process_color_seq (op, Color_pointer_fg, str, resp);
3748 break; 3405 break;
3749 case XTerm_Color_pointer_bg: 3406 case XTerm_Color_pointer_bg:
3750 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); 3407 process_color_seq (op, Color_pointer_bg, str, resp);
3751 break; 3408 break;
3752#ifndef NO_BOLD_UNDERLINE_REVERSE 3409#ifndef NO_BOLD_UNDERLINE_REVERSE
3753 case XTerm_Color_BD:
3754 process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3755 break;
3756 case XTerm_Color_IT:
3757 process_color_seq (XTerm_Color_IT, Color_IT, str, resp);
3758 break;
3759 case XTerm_Color_UL:
3760 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3761 break;
3762 case XTerm_Color_RV: 3410 case XTerm_Color_RV:
3763 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3411 process_color_seq (op, Color_RV, str, resp);
3764 break; 3412 break;
3413 case Rxvt_Color_BD:
3414 case URxvt_Color_BD:
3415 process_color_seq (op, Color_BD, str, resp);
3416 break;
3417 case Rxvt_Color_UL:
3418 case URxvt_Color_UL:
3419 process_color_seq (op, Color_UL, str, resp);
3420 break;
3421 case URxvt_Color_IT:
3422 process_color_seq (op, Color_IT, str, resp);
3423 break;
3765#endif 3424#endif
3766#if TRANSPARENT && TINTING 3425#if ENABLE_TRANSPARENCY
3767 case XTerm_Color_tint: 3426 case URxvt_Color_tint:
3768 process_color_seq (XTerm_Color_tint, Color_tint, str, resp); 3427 process_color_seq (op, Color_tint, str, resp);
3769 check_our_parents (); 3428 {
3770 if (am_transparent) 3429 bool changed = false;
3771 want_full_refresh = want_refresh = 1; 3430 if (ISSET_PIXCOLOR (Color_tint))
3772 break; 3431 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]);
3773#endif 3432 else
3433 changed = bgPixmap.unset_tint ();
3434 if (changed)
3435 update_background ();
3436 }
3774 3437
3438 break;
3439#endif
3440
3441#if XPM_BACKGROUND
3775 case XTerm_Pixmap: 3442 case Rxvt_Pixmap:
3776 if (*str != ';') 3443 if (!strcmp (str, "?"))
3777 { 3444 {
3778#if XPM_BACKGROUND 3445 char str[256];
3779 scale_pixmap (""); /* reset to default scaling */ 3446
3780 set_bgPixmap (str); /* change pixmap */ 3447 sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */
3781#endif 3448 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767),
3782 scr_touch (true); 3449 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767));
3450 process_xterm_seq (XTerm_title, str, CHAR_ST);
3783 } 3451 }
3784 while ((str = strchr (str, ';')) != NULL) 3452 else
3785 { 3453 {
3454 int changed = 0;
3455
3456 if (*str != ';')
3457 {
3458 /* reset to default scaling :*/
3459 bgPixmap.unset_geometry ();
3460 if (bgPixmap.set_file (str)) /* change pixmap */
3461 changed++;
3462 str = strchr (str, ';');
3463 if (str == NULL)
3464 bgPixmap.set_defaultGeometry ();
3465 }
3466 while (str)
3467 {
3786 str++; 3468 str++;
3787#if XPM_BACKGROUND 3469 if (bgPixmap.set_geometry (str))
3788 changed += scale_pixmap (str); 3470 changed++;
3789#endif 3471 str = strchr (str, ';');
3790 3472 }
3473 if (changed)
3474 update_background ();
3791 } 3475 }
3792 if (changed)
3793 {
3794#ifdef XPM_BACKGROUND
3795 resize_pixmap ();
3796#endif
3797 scr_touch (true);
3798 }
3799 break; 3476 break;
3477#endif
3800 3478
3801 case XTerm_restoreFG: 3479 case Rxvt_restoreFG:
3802 set_window_color (Color_fg, str); 3480 set_window_color (Color_fg, str);
3803 break; 3481 break;
3804 case XTerm_restoreBG: 3482 case Rxvt_restoreBG:
3805 set_window_color (Color_bg, str); 3483 set_window_color (Color_bg, str);
3806 break; 3484 break;
3807 3485
3808 case XTerm_logfile: 3486 case XTerm_logfile:
3809 // TODO, when secure mode? 3487 // TODO, when secure mode?
3810 break; 3488 break;
3811 3489
3490#if 0
3491 case Rxvt_dumpscreen: /* no error notices */
3492 {
3493 int fd;
3494 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3495 {
3496 scr_dump (fd);
3497 close (fd);
3498 }
3499 }
3500 break;
3501#endif
3812 case XTerm_font: 3502 case XTerm_font:
3813 op = URxvt_font; 3503 op = URxvt_font;
3814 case URxvt_font: 3504 case URxvt_font:
3815#if ENABLE_STYLES 3505#if ENABLE_STYLES
3816 case URxvt_boldFont: 3506 case URxvt_boldFont:
3817 case URxvt_italicFont: 3507 case URxvt_italicFont:
3818 case URxvt_boldItalicFont: 3508 case URxvt_boldItalicFont:
3819#endif 3509#endif
3820 if (query) 3510 if (query)
3821 tt_printf ("\33]%d;%-.250s%c", saveop, 3511 tt_printf ("\33]%d;%-.250s%c", saveop,
3822 (options & Opt_insecure) && TermWin.fontset[op - URxvt_font]->fontdesc 3512 option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3823 ? TermWin.fontset[op - URxvt_font]->fontdesc : "", 3513 ? fontset[op - URxvt_font]->fontdesc : "",
3824 resp); 3514 resp);
3825 else 3515 else
3826 { 3516 {
3827 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3517 const char *&res = rs[Rs_font + (op - URxvt_font)];
3828 3518
… …
3830 allocated.push_back ((void *)res); 3520 allocated.push_back ((void *)res);
3831 set_fonts (); 3521 set_fonts ();
3832 } 3522 }
3833 break; 3523 break;
3834 3524
3835#if ENABLE_FRILLS 3525 case URxvt_version:
3836 case XTerm_locale:
3837 if (query) 3526 if (query)
3527 tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%c",
3528 op,
3529 rs[Rs_name], VERSION[0], VERSION[2],
3530 resp);
3531 break;
3532
3533#if !ENABLE_MINIMAL
3534 case URxvt_locale:
3535 if (query)
3838 tt_printf ("\33]%d;%-.250s%c", XTerm_locale, (options & Opt_insecure) ? locale : "", resp); 3536 tt_printf ("\33]%d;%-.250s%c", op, option (Opt_insecure) ? locale : "", resp);
3839 else 3537 else
3840 { 3538 {
3841 set_locale (str); 3539 set_locale (str);
3842# ifdef USE_XIM 3540 pty->set_utf8_mode (enc_utf8);
3843 im_cb (); 3541 init_xlocale ();
3844# endif
3845 } 3542 }
3846 break; 3543 break;
3847#endif
3848 3544
3849#ifdef MENUBAR 3545 case URxvt_view_up:
3850 case XTerm_Menu: 3546 case URxvt_view_down:
3851 if (options & Opt_insecure) 3547 {
3852 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked 3548 int lines = atoi (str);
3549
3550 if (lines)
3551 scr_page (op == URxvt_view_up ? UP : DN, lines);
3552 else
3553 scr_erase_savelines ();
3554 }
3555
3853 break; 3556 break;
3854#endif 3557#endif
3855#if 0 3558
3856 case XTerm_dumpscreen: /* no error notices */ 3559#if ENABLE_PERL
3857 { 3560 case URxvt_perl:
3858 int fd; 3561 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END)))
3859 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) 3562 ; // no responses yet
3860 {
3861 scr_dump (fd);
3862 close (fd);
3863 }
3864 }
3865 break; 3563 break;
3866#endif 3564#endif
3867 } 3565 }
3868} 3566}
3869/*----------------------------------------------------------------------*/ 3567/*----------------------------------------------------------------------*/
… …
3900 return state; 3598 return state;
3901} 3599}
3902 3600
3903/* we're not using priv _yet_ */ 3601/* we're not using priv _yet_ */
3904void 3602void
3905rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg) 3603rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg)
3906{ 3604{
3907 unsigned int i, j; 3605 unsigned int i, j;
3908 int state; 3606 int state;
3909 3607
3910 static const struct 3608 static const struct
3911 { 3609 {
3912 const int argval; 3610 const int argval;
3913 const unsigned long bit; 3611 const unsigned long bit;
3914 }
3915
3916 argtopriv[] = { 3612 } argtopriv[] = {
3917 { 1, PrivMode_aplCUR }, 3613 { 1, PrivMode_aplCUR },
3918 { 2, PrivMode_vt52 }, 3614 { 2, PrivMode_vt52 },
3919 { 3, PrivMode_132 }, 3615 { 3, PrivMode_132 },
3920 { 4, PrivMode_smoothScroll }, 3616 { 4, PrivMode_smoothScroll },
3921 { 5, PrivMode_rVideo }, 3617 { 5, PrivMode_rVideo },
3922 { 6, PrivMode_relOrigin }, 3618 { 6, PrivMode_relOrigin },
3923 { 7, PrivMode_Autowrap }, 3619 { 7, PrivMode_Autowrap },
3924 // 8, bi-directional support mode 3620 // 8, bi-directional support mode
3925 { 9, PrivMode_MouseX10 }, 3621 { 9, PrivMode_MouseX10 },
3926#ifdef menuBar_esc
3927 { menuBar_esc, PrivMode_menuBar },
3928#endif
3929 // 18, 19 printing-related 3622 // 18, 19 printing-related
3930 { 25, PrivMode_VisibleCursor }, 3623 { 25, PrivMode_VisibleCursor },
3931#ifdef scrollBar_esc 3624#ifdef scrollBar_esc
3932 { scrollBar_esc, PrivMode_scrollBar }, 3625 { scrollBar_esc, PrivMode_scrollBar },
3933#endif 3626#endif
… …
3978 } 3671 }
3979 3672
3980 /* extra handling for values with state unkept */ 3673 /* extra handling for values with state unkept */
3981 switch (arg[i]) 3674 switch (arg[i])
3982 { 3675 {
3676#if ENABLE_STYLES
3677 case 1021:
3678 set_option (Opt_intensityStyles, mode);
3679
3680 scr_touch (true);
3681 break;
3682#endif
3983 case 1048: /* alternative cursor save */ 3683 case 1048: /* alternative cursor save */
3984 case 1049: 3684 case 1049:
3985 if (options & Opt_secondaryScreen) 3685 if (option (Opt_secondaryScreen))
3986 if (mode == 0) 3686 if (mode == 0)
3987 scr_cursor (RESTORE); 3687 scr_cursor (RESTORE);
3988 else if (mode == 1) 3688 else if (mode == 1)
3989 scr_cursor (SAVE); 3689 scr_cursor (SAVE);
3990 break; 3690 break;
… …
4002 */ 3702 */
4003 PrivMode (1, PrivMode_vt52); 3703 PrivMode (1, PrivMode_vt52);
4004 break; 3704 break;
4005 case 3: /* 80/132 */ 3705 case 3: /* 80/132 */
4006 if (priv_modes & PrivMode_132OK) 3706 if (priv_modes & PrivMode_132OK)
4007 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height); 3707 set_widthheight (((state ? 132 : 80) * fwidth), height);
4008 break; 3708 break;
4009 case 4: /* smooth scrolling */ 3709 case 4: /* smooth scrolling */
4010 if (state)
4011 options &= ~Opt_jumpScroll;
4012 else
4013 options |= Opt_jumpScroll; 3710 set_option (Opt_jumpScroll, !state);
4014 break; 3711 break;
4015 case 5: /* reverse video */ 3712 case 5: /* reverse video */
4016 scr_rvideo_mode (state); 3713 scr_rvideo_mode (state);
4017 break; 3714 break;
4018 case 6: /* relative/absolute origins */ 3715 case 6: /* relative/absolute origins */
… …
4024 /* case 8: - auto repeat, can't do on a per window basis */ 3721 /* case 8: - auto repeat, can't do on a per window basis */
4025 case 9: /* X10 mouse reporting */ 3722 case 9: /* X10 mouse reporting */
4026 if (state) /* orthogonal */ 3723 if (state) /* orthogonal */
4027 priv_modes &= ~PrivMode_MouseX11; 3724 priv_modes &= ~PrivMode_MouseX11;
4028 break; 3725 break;
4029#ifdef menuBar_esc
4030 case menuBar_esc:
4031#ifdef MENUBAR
4032 map_menuBar (state);
4033#endif
4034 break;
4035#endif
4036#ifdef scrollBar_esc 3726#ifdef scrollBar_esc
4037 case scrollBar_esc: 3727 case scrollBar_esc:
4038 if (scrollbar_mapping (state)) 3728 if (scrollbar_mapping (state))
4039 { 3729 {
4040 resize_all_windows (0, 0, 0); 3730 resize_all_windows (0, 0, 0);
… …
4059#if 0 3749#if 0
4060 case 1001: 3750 case 1001:
4061 break; /* X11 mouse highlighting */ 3751 break; /* X11 mouse highlighting */
4062#endif 3752#endif
4063 case 1010: /* scroll to bottom on TTY output inhibit */ 3753 case 1010: /* scroll to bottom on TTY output inhibit */
4064 if (state)
4065 options &= ~Opt_scrollTtyOutput;
4066 else
4067 options |= Opt_scrollTtyOutput; 3754 set_option (Opt_scrollTtyOutput, !state);
4068 break; 3755 break;
4069 case 1011: /* scroll to bottom on key press */ 3756 case 1011: /* scroll to bottom on key press */
4070 if (state)
4071 options |= Opt_scrollTtyKeypress; 3757 set_option (Opt_scrollTtyKeypress, state);
4072 else
4073 options &= ~Opt_scrollTtyKeypress;
4074 break; 3758 break;
4075 case 1047: /* secondary screen w/ clearing last */ 3759 case 1047: /* secondary screen w/ clearing last */
4076 if (options & Opt_secondaryScreen) 3760 if (option (Opt_secondaryScreen))
4077 if (current_screen != PRIMARY) 3761 if (current_screen != PRIMARY)
4078 scr_erase_screen (2); 3762 scr_erase_screen (2);
4079 scr_change_screen (state); 3763 scr_change_screen (state);
4080 break; 3764 break;
4081 case 1049: /* secondary screen w/ clearing first */ 3765 case 1049: /* secondary screen w/ clearing first */
4082 scr_change_screen (state); 3766 scr_change_screen (state);
4083 if (options & Opt_secondaryScreen) 3767 if (option (Opt_secondaryScreen))
4084 if (current_screen != PRIMARY) 3768 if (current_screen != PRIMARY)
4085 scr_erase_screen (2); 3769 scr_erase_screen (2);
4086 break; 3770 break;
4087 default: 3771 default:
4088 break; 3772 break;
… …
4216 scr_color (Color_bg, Color_bg); 3900 scr_color (Color_bg, Color_bg);
4217 break; 3901 break;
4218 3902
4219 //case 50: // not variable spacing 3903 //case 50: // not variable spacing
4220 3904
4221#ifndef NO_BRIGHTCOLOR 3905#if !ENABLE_MINIMAL
4222 case 90: 3906 case 90:
4223 case 91: /* set bright fg color */ 3907 case 91: /* set bright fg color */
4224 case 92: 3908 case 92:
4225 case 93: 3909 case 93:
4226 case 94: 3910 case 94:
… …
4238 case 106: 3922 case 106:
4239 case 107: 3923 case 107:
4240 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg); 3924 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);
4241 break; 3925 break;
4242#endif 3926#endif
4243
4244 } 3927 }
4245 } 3928 }
4246} 3929}
4247/*}}} */ 3930/*}}} */
4248 3931
… …
4272 */ 3955 */
4273void 3956void
4274rxvt_term::tt_printf (const char *fmt,...) 3957rxvt_term::tt_printf (const char *fmt,...)
4275{ 3958{
4276 va_list arg_ptr; 3959 va_list arg_ptr;
4277 unsigned char buf[256]; 3960 char buf[256];
4278 3961
4279 va_start (arg_ptr, fmt); 3962 va_start (arg_ptr, fmt);
4280 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 3963 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
4281 va_end (arg_ptr); 3964 va_end (arg_ptr);
4282 tt_write (buf, strlen (buf)); 3965 tt_write (buf, strlen (buf));
… …
4284 3967
4285/* ---------------------------------------------------------------------- */ 3968/* ---------------------------------------------------------------------- */
4286/* Write data to the pty as typed by the user, pasted with the mouse, 3969/* Write data to the pty as typed by the user, pasted with the mouse,
4287 * or generated by us in response to a query ESC sequence. 3970 * or generated by us in response to a query ESC sequence.
4288 */ 3971 */
3972const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
3973
4289void 3974void
4290rxvt_term::tt_write (const unsigned char *data, unsigned int len) 3975rxvt_term::tt_write (const char *data, unsigned int len)
4291{ 3976{
4292 const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 3977 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
3978 return;
4293 3979
4294 if (len) 3980 if (pty->pty < 0)
3981 return;
3982
3983 if (v_buflen == 0)
3984 {
3985 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
3986
3987 if ((unsigned int)written == len)
3988 return;
3989
3990 data += written;
3991 len -= written;
4295 { 3992 }
3993
3994 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
3995
3996 memcpy (v_buffer + v_buflen, data, len);
3997 v_buflen += len;
3998
3999 pty_ev.set (EVENT_READ | EVENT_WRITE);
4000}
4001
4002void rxvt_term::pty_write ()
4003{
4004 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4005
4006 if (written > 0)
4007 {
4008 v_buflen -= written;
4009
4296 if (v_buflen == 0) 4010 if (v_buflen == 0)
4297 { 4011 {
4298 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE));
4299
4300 if ((unsigned int)written == len)
4301 return;
4302
4303 data += written;
4304 len -= written;
4305 }
4306
4307
4308 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len);
4309
4310 memcpy (v_buffer + v_buflen, data, len);
4311 v_buflen += len;
4312 }
4313
4314 for (;;)
4315 {
4316 int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4317
4318 if (written > 0)
4319 {
4320 v_buflen -= written;
4321
4322 if (v_buflen == 0)
4323 {
4324 free (v_buffer); 4012 free (v_buffer);
4325 v_buffer = 0; 4013 v_buffer = 0;
4326 v_buflen = 0; 4014 v_buflen = 0;
4327 4015
4328 pty_ev.set (EVENT_READ); 4016 pty_ev.set (EVENT_READ);
4329 return;
4330 }
4331
4332 memmove (v_buffer, v_buffer + written, v_buflen);
4333 }
4334 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4335 // original code just ignores this...
4336 destroy ();
4337 else
4338 {
4339 pty_ev.set (EVENT_READ | EVENT_WRITE);
4340 return; 4017 return;
4341 } 4018 }
4019
4020 memmove (v_buffer, v_buffer + written, v_buflen);
4342 } 4021 }
4022 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4023 pty_ev.set (EVENT_READ);
4343} 4024}
4344 4025
4345/*----------------------- end-of-file (C source) -----------------------*/ 4026/*----------------------- end-of-file (C source) -----------------------*/
4346 4027

Diff Legend

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