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.196 by root, Thu Feb 17 12:23:39 2005 UTC vs.
Revision 1.414 by ayin, Tue Feb 19 10:47:03 2008 UTC

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

Diff Legend

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