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.211 by root, Tue Dec 20 22:27:49 2005 UTC vs.
Revision 1.543 by sf-exg, Sat Apr 26 14:07:36 2014 UTC

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

Diff Legend

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