ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/command.C
(Generate patch)

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.200 by root, Sun Feb 20 19:45:30 2005 UTC vs.
Revision 1.423 by root, Tue Nov 4 22:44:09 2008 UTC

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

Diff Legend

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