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

Diff Legend

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