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

Diff Legend

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