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.220 by root, Sat Dec 31 18:19:06 2005 UTC vs.
Revision 1.544 by sf-exg, Sat Apr 26 14:55:58 2014 UTC

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

Diff Legend

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