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

Diff Legend

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