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

Diff Legend

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