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.202 by root, Sat Mar 12 23:35:14 2005 UTC vs.
Revision 1.516 by root, Tue Jun 5 14:46:54 2012 UTC

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

Diff Legend

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