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

Diff Legend

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