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

Diff Legend

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