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.228 by root, Mon Jan 2 16:08:34 2006 UTC vs.
Revision 1.538 by sf-exg, Thu Apr 11 08:13:43 2013 UTC

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

Diff Legend

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