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.199 by root, Sun Feb 20 02:00:43 2005 UTC vs.
Revision 1.516 by root, Tue Jun 5 14:46:54 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
1390 && !HOOK_INVOKE ((this, HOOK_CLIENT_MESSAGE, DT_XEVENT, &ev, DT_END)))
1391 {
1335 && ev.xclient.message_type == xa[XA_WM_PROTOCOLS] 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 {
1336 && ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW]) 1396 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1337 destroy (); 1397 {
1398 if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END)))
1399 destroy ();
1400 }
1401#if ENABLE_EWMH
1402 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1403 XSendEvent (dpy, ev.xclient.window = display->root,
1404 False, SubstructureRedirectMask | SubstructureNotifyMask,
1405 &ev);
1406#endif
1407 }
1408 }
1338#if ENABLE_XEMBED 1409#if ENABLE_XEMBED
1339 else if (ev.xclient.format == 32
1340 && ev.xclient.message_type == xa[XA_XEMBED]) 1410 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1341 { 1411 {
1342 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN) 1412 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1343 focus_in (); 1413 focus_in ();
1344 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT) 1414 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1345 focus_out (); 1415 focus_out ();
1416 }
1417#endif
1346 } 1418 }
1347#endif
1348#ifdef OFFIX_DND
1349 /* OffiX Dnd (drag 'n' drop) protocol */
1350 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1351 && (ev.xclient.data.l[0] == DndFile
1352 || ev.xclient.data.l[0] == DndDir
1353 || ev.xclient.data.l[0] == DndLink))
1354 {
1355 /* Get Dnd data */
1356 Atom ActualType;
1357 int ActualFormat;
1358 unsigned char *data;
1359 unsigned long Size, RemainingBytes;
1360
1361 XGetWindowProperty (disp, display->root,
1362 xa[XA_DNDSELECTION],
1363 0L, 1000000L,
1364 False, AnyPropertyType,
1365 &ActualType, &ActualFormat,
1366 &Size, &RemainingBytes,
1367 &data);
1368 set_string_property (XA_CUT_BUFFER0, data);
1369 XFree (data);
1370 selection_paste (display->root, XA_CUT_BUFFER0, true);
1371 XSetInputFocus (disp, display->root, RevertToNone, CurrentTime);
1372 }
1373#endif /* OFFIX_DND */
1374 break;
1375
1376 case MappingNotify:
1377 XRefreshKeyboardMapping (&ev.xmapping);
1378 break; 1419 break;
1379 1420
1380 /* 1421 /*
1381 * XXX: this is not the _current_ arrangement 1422 * XXX: this is not the _current_ arrangement
1382 * Here's my conclusion: 1423 * Here's my conclusion:
… …
1401 break; 1442 break;
1402 } 1443 }
1403 break; 1444 break;
1404 1445
1405 case FocusIn: 1446 case FocusIn:
1447 if (ev.xfocus.detail != NotifyInferior
1448 && ev.xfocus.detail != NotifyPointer
1449 && ev.xfocus.mode != NotifyGrab)
1406 focus_in (); 1450 focus_in ();
1407 break; 1451 break;
1408 1452
1409 case FocusOut: 1453 case FocusOut:
1454 if (ev.xfocus.detail != NotifyInferior
1455 && ev.xfocus.detail != NotifyPointer
1456 && ev.xfocus.mode != NotifyGrab)
1410 focus_out (); 1457 focus_out ();
1411 break; 1458 break;
1412 1459
1413 case ConfigureNotify: 1460 case ConfigureNotify:
1414 if (ev.xconfigure.window == TermWin.parent[0]) 1461 if (ev.xconfigure.window == parent)
1415 { 1462 {
1416 int height, width; 1463 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1417
1418 do 1464 ;
1419 { /* 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 {
1420 width = ev.xconfigure.width; 1481 x = ev.xconfigure.x;
1421 height = ev.xconfigure.height; 1482 y = ev.xconfigure.y;
1422 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;
1423 } 1497 }
1424 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev));
1425 1498
1426 if (szHint.width != width || szHint.height != height) 1499 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1427 { 1500 {
1428 seen_resize = 1; 1501 seen_resize = 1;
1429 resize_all_windows (width, height, 1); 1502 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1430 } 1503 }
1431 1504 else
1432#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1505 {
1433 if (options & Opt_transparent) 1506#ifdef HAVE_BG_PIXMAP
1434 check_our_parents (); 1507 if (moved)
1508 update_background ();
1435#endif 1509#endif
1510 }
1511
1512 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1436 } 1513 }
1437 break; 1514 break;
1438 1515
1439 case PropertyNotify: 1516 case PropertyNotify:
1440 if (ev.xproperty.atom == xa[XA_VT_SELECTION] 1517 HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END));
1441 && ev.xproperty.state == PropertyNewValue)
1442 selection_property (ev.xproperty.window, ev.xproperty.atom);
1443
1444 break; 1518 break;
1445 1519
1446 case SelectionClear: 1520 case SelectionClear:
1447 selection_clear (); 1521 selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]);
1448 break;
1449
1450 case SelectionNotify:
1451 if (selection_wait == Sel_normal)
1452 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1453 break; 1522 break;
1454 1523
1455 case SelectionRequest: 1524 case SelectionRequest:
1456 selection_send (ev.xselectionrequest); 1525 selection_send (ev.xselectionrequest);
1457 break; 1526 break;
1458 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
1459 case UnmapNotify: 1552 case UnmapNotify:
1460 TermWin.mapped = 0; 1553 mapped = 0;
1461#ifdef TEXT_BLINK 1554#ifdef TEXT_BLINK
1462 text_blink_ev.stop (); 1555 text_blink_ev.stop ();
1463#endif 1556#endif
1557 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1464 break; 1558 break;
1465
1466 case MapNotify:
1467 TermWin.mapped = 1;
1468#ifdef TEXT_BLINK
1469 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1470#endif
1471 break;
1472
1473#ifdef TRANSPARENT
1474 case ReparentNotify:
1475 rootwin_cb (ev);
1476 break;
1477#endif /* TRANSPARENT */
1478 1559
1479 case GraphicsExpose: 1560 case GraphicsExpose:
1480 case Expose: 1561 case Expose:
1481 if (ev.xany.window == TermWin.vt) 1562 if (ev.xany.window == vt)
1482 { 1563 {
1483 do 1564 do
1565 {
1484 scr_expose (ev.xexpose.x, ev.xexpose.y, 1566 scr_expose (ev.xexpose.x, ev.xexpose.y,
1485 ev.xexpose.width, ev.xexpose.height, False); 1567 ev.xexpose.width, ev.xexpose.height, false);
1568 }
1486 while (XCheckTypedWindowEvent (disp, TermWin.vt, ev.xany.type, &ev)); 1569 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1487 1570
1488 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1571 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1489 1572
1490 while (XCheckTypedWindowEvent (disp, TermWin.vt, ev.xany.type, &ev)) 1573 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1574 {
1491 scr_expose (ev.xexpose.x, ev.xexpose.y, 1575 scr_expose (ev.xexpose.x, ev.xexpose.y,
1492 ev.xexpose.width, ev.xexpose.height, False); 1576 ev.xexpose.width, ev.xexpose.height, false);
1577 }
1493 1578
1494 scr_refresh (refresh_type); 1579 want_refresh = 1;
1495 } 1580 }
1496 else 1581 else
1497 { 1582 {
1498 XEvent unused_event; 1583 XEvent unused_event;
1499 1584
1500 while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event)) 1585 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1501 ; 1586 ;
1502 while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event)) 1587 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1503 ; 1588 ;
1504 1589
1505 if (isScrollbarWindow (ev.xany.window)) 1590 if (scrollBar.state && ev.xany.window == scrollBar.win)
1506 { 1591 {
1507 scrollBar.setIdle (); 1592 scrollBar.state = SB_STATE_IDLE;
1508 scrollbar_show (0); 1593 scrollBar.show (0);
1509 } 1594 }
1510#ifdef MENUBAR
1511 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1512 menubar_expose ();
1513#endif
1514
1515#ifdef TRANSPARENT
1516 if (am_transparent && ev.xany.window == TermWin.parent[0])
1517 XClearWindow (disp, ev.xany.window);
1518#endif
1519 } 1595 }
1520 break; 1596 break;
1521 1597
1522 case MotionNotify: 1598 case MotionNotify:
1523#ifdef POINTER_BLANK 1599#ifdef POINTER_BLANK
1524 if (hidden_pointer) 1600 if (hidden_pointer)
1525 pointer_unblank (); 1601 pointer_unblank ();
1526#endif 1602#endif
1527#if MENUBAR 1603 if ((priv_modes & PrivMode_MouseBtnEvent && ev.xbutton.state & (Button1Mask|Button2Mask|Button3Mask))
1528 if (isMenuBarWindow (ev.xany.window)) 1604 || priv_modes & PrivMode_MouseAnyEvent)
1529 {
1530 menubar_control (ev.xbutton); 1605 mouse_report (ev.xbutton);
1531 break;
1532 }
1533#endif
1534 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1606 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1535 break; 1607 break;
1536 1608
1537 if (ev.xany.window == TermWin.vt) 1609 if (ev.xany.window == vt)
1538 { 1610 {
1611 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1612 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1613 ; // nop
1539 if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1614 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1540 { 1615 {
1541 while (XCheckTypedWindowEvent (disp, TermWin.vt, MotionNotify, &ev)) 1616 while (XCheckTypedWindowEvent (dpy, vt, MotionNotify, &ev))
1542 ; 1617 ;
1543 1618
1544 XQueryPointer (disp, TermWin.vt, 1619 XQueryPointer (dpy, vt,
1545 &unused_root, &unused_child, 1620 &unused_root, &unused_child,
1546 &unused_root_x, &unused_root_y, 1621 &unused_root_x, &unused_root_y,
1547 &ev.xbutton.x, &ev.xbutton.y, 1622 &ev.xbutton.x, &ev.xbutton.y,
1548 &ev.xbutton.state); 1623 &ev.xbutton.state);
1549#ifdef MOUSE_THRESHOLD 1624#ifdef MOUSE_THRESHOLD
… …
1561#endif 1636#endif
1562 selection_extend (ev.xbutton.x, ev.xbutton.y, 1637 selection_extend (ev.xbutton.x, ev.xbutton.y,
1563 ev.xbutton.state & Button3Mask ? 2 : 0); 1638 ev.xbutton.state & Button3Mask ? 2 : 0);
1564 1639
1565#ifdef SELECTION_SCROLLING 1640#ifdef SELECTION_SCROLLING
1566 if (ev.xbutton.y < TermWin.int_bwidth 1641 if (ev.xbutton.y < int_bwidth
1567 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1)) 1642 || Pixel2Row (ev.xbutton.y) > (nrow-1))
1568 { 1643 {
1569 int dist; 1644 int dist;
1570 1645
1571 /* don't clobber the current delay if we are 1646 /* don't clobber the current delay if we are
1572 * already in the middle of scrolling. 1647 * already in the middle of scrolling.
1573 */ 1648 */
1574 if (!sel_scroll_ev.active) 1649 if (!sel_scroll_ev.is_active ())
1575 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1650 sel_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1576 1651
1577 /* save the event params so we can highlight 1652 /* save the event params so we can highlight
1578 * the selection in the pending-scroll loop 1653 * the selection in the pending-scroll loop
1579 */ 1654 */
1580 selection_save_x = ev.xbutton.x; 1655 selection_save_x = ev.xbutton.x;
1581 selection_save_y = ev.xbutton.y; 1656 selection_save_y = ev.xbutton.y;
1582 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0; 1657 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;
1583 1658
1584 /* calc number of lines to scroll */ 1659 /* calc number of lines to scroll */
1585 if (ev.xbutton.y < TermWin.int_bwidth) 1660 if (ev.xbutton.y < int_bwidth)
1586 { 1661 {
1587 scroll_selection_dir = UP; 1662 scroll_selection_dir = UP;
1588 dist = TermWin.int_bwidth - ev.xbutton.y; 1663 dist = int_bwidth - ev.xbutton.y;
1589 } 1664 }
1590 else 1665 else
1591 { 1666 {
1592 scroll_selection_dir = DN; 1667 scroll_selection_dir = DN;
1593 dist = ev.xbutton.y - (TermWin.int_bwidth + TermWin.height); 1668 dist = ev.xbutton.y - (int_bwidth + vt_height);
1594 } 1669 }
1595 1670
1596 scroll_selection_lines = Pixel2Height (dist) 1671 scroll_selection_lines = Pixel2Height (dist)
1597 / SELECTION_SCROLL_LINE_SPEEDUP 1672 / SELECTION_SCROLL_LINE_SPEEDUP
1598 + 1; 1673 + 1;
1599 MIN_IT (scroll_selection_lines, 1674 min_it (scroll_selection_lines,
1600 SELECTION_SCROLL_MAX_LINES); 1675 SELECTION_SCROLL_MAX_LINES);
1601 } 1676 }
1602 else 1677 else
1603 { 1678 {
1604 /* we are within the text window, so we 1679 /* we are within the text window, so we
1605 * shouldn't be scrolling 1680 * shouldn't be scrolling
1606 */ 1681 */
1607 if (sel_scroll_ev.active)
1608 sel_scroll_ev.stop(); 1682 sel_scroll_ev.stop();
1609 } 1683 }
1610#endif 1684#endif
1611#ifdef MOUSE_THRESHOLD 1685#ifdef MOUSE_THRESHOLD
1612 } 1686 }
1613#endif 1687#endif
1614 } 1688 }
1615 } 1689 }
1616 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1690 else if (scrollBar.state == SB_STATE_MOTION && ev.xany.window == scrollBar.win)
1617 { 1691 {
1618 while (XCheckTypedWindowEvent (disp, scrollBar.win, 1692 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1619 MotionNotify, &ev)) 1693 MotionNotify, &ev))
1620 ; 1694 ;
1621 1695
1622 XQueryPointer (disp, scrollBar.win, 1696 XQueryPointer (dpy, scrollBar.win,
1623 &unused_root, &unused_child, 1697 &unused_root, &unused_child,
1624 &unused_root_x, &unused_root_y, 1698 &unused_root_x, &unused_root_y,
1625 &ev.xbutton.x, &ev.xbutton.y, 1699 &ev.xbutton.x, &ev.xbutton.y,
1626 &unused_mask); 1700 &unused_mask);
1627 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1701 scr_move_to (scrollBar.position (ev.xbutton.y) - csrO,
1628 scrollbar_size ()); 1702 scrollBar.size ());
1629 scr_refresh (refresh_type);
1630 refresh_limit = 0; 1703 want_refresh = 1;
1631 scrollbar_show (1); 1704 scrollBar.show (1);
1632 } 1705 }
1633 break; 1706 break;
1634 } 1707 }
1635}
1636 1708
1637void 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
1638rxvt_term::focus_in () 1749rxvt_term::focus_in ()
1639{ 1750{
1640 if (!TermWin.focus) 1751 if (!focus)
1641 { 1752 {
1642 TermWin.focus = 1; 1753 focus = 1;
1643 want_refresh = 1; 1754 want_refresh = 1;
1755
1644#ifdef USE_XIM 1756#if USE_XIM
1645 if (Input_Context != NULL) 1757 if (Input_Context != NULL)
1646 { 1758 {
1647 IMSetStatusPosition (); 1759 im_set_position ();
1648 XSetICFocus (Input_Context); 1760 XSetICFocus (Input_Context);
1649 } 1761 }
1650#endif 1762#endif
1651#ifdef CURSOR_BLINK 1763#if CURSOR_BLINK
1652 if (options & Opt_cursorBlink) 1764 if (option (Opt_cursorBlink))
1653 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1765 cursor_blink_ev.again ();
1654#endif 1766#endif
1655#ifdef OFF_FOCUS_FADING 1767#if OFF_FOCUS_FADING
1656 if (rs[Rs_fade]) 1768 if (rs[Rs_fade])
1657 { 1769 {
1658 pix_colors = pix_colors_focused; 1770 pix_colors = pix_colors_focused;
1659 scr_recolour (); 1771 scr_recolour ();
1660 } 1772 }
1661#endif 1773#endif
1662 } 1774#if ENABLE_FRILLS
1663} 1775 if (option (Opt_urgentOnBell))
1776 set_urgency (0);
1777#endif
1664 1778
1665void 1779 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1780 }
1781}
1782
1783void ecb_cold
1666rxvt_term::focus_out () 1784rxvt_term::focus_out ()
1667{ 1785{
1668 if (TermWin.focus) 1786 if (focus)
1669 { 1787 {
1670 TermWin.focus = 0; 1788 focus = 0;
1671 want_refresh = 1; 1789 want_refresh = 1;
1672 1790
1791#if ENABLE_FRILLS
1792 if (option (Opt_urgentOnBell))
1793 set_urgency (0);
1794#endif
1673#if ENABLE_FRILLS || ISO_14755 1795#if ENABLE_FRILLS || ISO_14755
1796 if (iso14755buf)
1797 {
1674 iso14755buf = 0; 1798 iso14755buf = 0;
1675#endif 1799# if ISO_14755
1676#if ENABLE_OVERLAY
1677 scr_overlay_off (); 1800 scr_overlay_off ();
1678#endif 1801# endif
1802 }
1803#endif
1679#ifdef USE_XIM 1804#if USE_XIM
1680 if (Input_Context != NULL) 1805 if (Input_Context != NULL)
1681 XUnsetICFocus (Input_Context); 1806 XUnsetICFocus (Input_Context);
1682#endif 1807#endif
1683#ifdef CURSOR_BLINK 1808#if CURSOR_BLINK
1684 if (options & Opt_cursorBlink) 1809 if (option (Opt_cursorBlink))
1685 cursor_blink_ev.stop (); 1810 cursor_blink_ev.stop ();
1811
1686 hidden_cursor = 0; 1812 hidden_cursor = 0;
1687#endif 1813#endif
1688#ifdef OFF_FOCUS_FADING 1814#if OFF_FOCUS_FADING
1689 if (rs[Rs_fade]) 1815 if (rs[Rs_fade])
1690 { 1816 {
1691 pix_colors = pix_colors_unfocused; 1817 pix_colors = pix_colors_unfocused;
1692 scr_recolour (); 1818 scr_recolour ();
1693 } 1819 }
1694#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])
1695 } 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
1696} 1837}
1697 1838
1698#if TRANSPARENT 1839#if ENABLE_TRANSPARENCY || ENABLE_PERL
1699void 1840void ecb_hot
1700rxvt_term::rootwin_cb (XEvent &ev) 1841rxvt_term::rootwin_cb (XEvent &ev)
1701{ 1842{
1702 SET_R (this); 1843 make_current ();
1703 SET_LOCALE (locale); 1844
1845 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1846 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1847 return;
1704 1848
1705 switch (ev.type) 1849 switch (ev.type)
1706 { 1850 {
1707 case PropertyNotify: 1851 case PropertyNotify:
1708 /* 1852 /*
1709 * if user used some Esetroot compatible prog to set the root bg, 1853 * if user used some Esetroot compatible prog to set the root bg,
1710 * use the property to determine the pixmap. We use it later on. 1854 * use the property to determine the pixmap. We use it later on.
1711 */ 1855 */
1712 if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID] 1856 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1713 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1857 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1714 return; 1858 {
1859# if ENABLE_TRANSPARENCY
1860 bg_set_root_pixmap ();
1861 update_background ();
1862#endif
1863#if ENABLE_PERL
1864 HOOK_INVOKE ((this, HOOK_ROOTPMAP_CHANGE, DT_END));
1865#endif
1866 }
1715 1867
1716 /* FALLTHROUGH */
1717 case ReparentNotify:
1718 if ((options & Opt_transparent) && check_our_parents () && am_transparent)
1719 want_refresh = want_full_refresh = 1;
1720 break; 1868 break;
1721 } 1869 }
1870
1871 refresh_check ();
1722} 1872}
1723#endif 1873#endif
1724 1874
1725void 1875void
1726rxvt_term::button_press (XButtonEvent &ev) 1876rxvt_term::button_press (XButtonEvent &ev)
1727{ 1877{
1728 int reportmode = 0, clickintime; 1878 int reportmode = 0, clickintime;
1729 1879
1730 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1880 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1881
1731 if (!bypass_keystate) 1882 if (!bypass_keystate)
1732 reportmode = !! (priv_modes & PrivMode_mouse_report); 1883 reportmode = !! (priv_modes & PrivMode_mouse_report);
1733 1884
1734 /* 1885 /*
1735 * VT window processing of button press 1886 * VT window processing of button press
1736 */ 1887 */
1737 if (ev.window == TermWin.vt) 1888 if (ev.window == vt)
1738 { 1889 {
1890 if (HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1891 return;
1892
1739#if ISO_14755 1893#if ISO_14755
1740 // 5.4 1894 // 5.4
1741 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1895 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1742 { 1896 {
1743 iso14755_54 (ev.x, ev.y); 1897 iso14755_54 (ev.x, ev.y);
… …
1753 /* save the xbutton state (for ButtonRelease) */ 1907 /* save the xbutton state (for ButtonRelease) */
1754 MEvent.state = ev.state; 1908 MEvent.state = ev.state;
1755#ifdef MOUSE_REPORT_DOUBLECLICK 1909#ifdef MOUSE_REPORT_DOUBLECLICK
1756 if (ev.button == MEvent.button && clickintime) 1910 if (ev.button == MEvent.button && clickintime)
1757 { 1911 {
1758 /* same button, within alloted time */ 1912 /* same button, within allowed time */
1759 MEvent.clicks++; 1913 MEvent.clicks++;
1914
1760 if (MEvent.clicks > 1) 1915 if (MEvent.clicks > 1)
1761 { 1916 {
1762 /* only report double clicks */ 1917 /* only report double clicks */
1763 MEvent.clicks = 2; 1918 MEvent.clicks = 2;
1764 mouse_report (ev); 1919 mouse_report (ev);
… …
1776 mouse_report (ev); 1931 mouse_report (ev);
1777 } 1932 }
1778#else 1933#else
1779 MEvent.button = ev.button; 1934 MEvent.button = ev.button;
1780 mouse_report (ev); 1935 mouse_report (ev);
1781#endif /* MOUSE_REPORT_DOUBLECLICK */ 1936#endif /* MOUSE_REPORT_DOUBLECLICK */
1782 1937
1783 } 1938 }
1784 else 1939 else
1785 { 1940 {
1786 if (ev.button != MEvent.button) 1941 if (ev.button != MEvent.button)
… …
1796#else 1951#else
1797 selection.rect = false; 1952 selection.rect = false;
1798#endif 1953#endif
1799 1954
1800 /* allow shift+left click to extend selection */ 1955 /* allow shift+left click to extend selection */
1801 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report)) 1956 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1802 { 1957 {
1803 if (MEvent.button == Button1 && clickintime) 1958 if (MEvent.button == Button1 && clickintime)
1804 selection_rotate (ev.x, ev.y); 1959 selection_rotate (ev.x, ev.y);
1805 else 1960 else
1806 selection_extend (ev.x, ev.y, 1); 1961 selection_extend (ev.x, ev.y, 1);
… …
1834 } 1989 }
1835 1990
1836 /* 1991 /*
1837 * Scrollbar window processing of button press 1992 * Scrollbar window processing of button press
1838 */ 1993 */
1839 if (isScrollbarWindow (ev.window)) 1994 if (scrollBar.state && ev.window == scrollBar.win)
1840 { 1995 {
1841 scrollBar.setIdle (); 1996 page_dirn direction = NO_DIR;
1997
1998 if (scrollBar.upButton (ev.y))
1999 direction = UP; /* up */
2000 else if (scrollBar.dnButton (ev.y))
2001 direction = DN; /* down */
2002
2003 scrollBar.state = SB_STATE_IDLE;
1842 /* 2004 /*
1843 * Rxvt-style scrollbar: 2005 * Rxvt-style scrollbar:
1844 * move up if mouse is above slider 2006 * move up if mouse is above slider
1845 * move dn if mouse is below slider 2007 * move dn if mouse is below slider
1846 * 2008 *
… …
1855 /* 2017 /*
1856 * Mouse report disabled scrollbar: 2018 * Mouse report disabled scrollbar:
1857 * arrow buttons - send up/down 2019 * arrow buttons - send up/down
1858 * click on scrollbar - send pageup/down 2020 * click on scrollbar - send pageup/down
1859 */ 2021 */
1860 if ((scrollBar.style == R_SB_NEXT 2022 if (direction == UP)
1861 && scrollbarnext_upButton (ev.y))
1862 || (scrollBar.style == R_SB_RXVT
1863 && scrollbarrxvt_upButton (ev.y)))
1864 tt_printf ("\033[A"); 2023 tt_printf ("\033[A");
1865 else if ((scrollBar.style == R_SB_NEXT 2024 else if (direction == DN)
1866 && scrollbarnext_dnButton (ev.y))
1867 || (scrollBar.style == R_SB_RXVT
1868 && scrollbarrxvt_dnButton (ev.y)))
1869 tt_printf ("\033[B"); 2025 tt_printf ("\033[B");
1870 else 2026 else
1871 switch (ev.button) 2027 switch (ev.button)
1872 { 2028 {
1873 case Button2: 2029 case Button2:
… …
1880 tt_printf ("\033[5~"); 2036 tt_printf ("\033[5~");
1881 break; 2037 break;
1882 } 2038 }
1883 } 2039 }
1884 else 2040 else
1885#endif /* NO_SCROLLBAR_REPORT */ 2041#endif /* NO_SCROLLBAR_REPORT */
1886
1887 {
1888 char upordown = 0;
1889
1890 if (scrollBar.style == R_SB_NEXT)
1891 { 2042 {
1892 if (scrollbarnext_upButton (ev.y)) 2043 if (direction != NO_DIR)
1893 upordown = -1; /* up */
1894 else if (scrollbarnext_dnButton (ev.y))
1895 upordown = 1; /* down */
1896 }
1897 else if (scrollBar.style == R_SB_RXVT)
1898 {
1899 if (scrollbarrxvt_upButton (ev.y))
1900 upordown = -1; /* up */
1901 else if (scrollbarrxvt_dnButton (ev.y))
1902 upordown = 1; /* down */
1903 }
1904 if (upordown)
1905 { 2044 {
1906#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 2045#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2046 if (!cont_scroll_ev.is_active ())
1907 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 2047 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1908#endif 2048#endif
1909 if (scr_page (upordown < 0 ? UP : DN, 1)) 2049 if (scr_page (direction, 1))
1910 { 2050 {
1911 if (upordown < 0) 2051 if (direction == UP)
1912 scrollBar.setUp (); 2052 scrollBar.state = SB_STATE_UP;
1913 else 2053 else
1914 scrollBar.setDn (); 2054 scrollBar.state = SB_STATE_DOWN;
1915 } 2055 }
1916 } 2056 }
1917 else 2057 else
1918 switch (ev.button) 2058 switch (ev.button)
1919 { 2059 {
1920 case Button2: 2060 case Button2:
1921 switch (scrollbar_align) 2061 switch (scrollBar.align)
1922 { 2062 {
1923 case R_SB_ALIGN_TOP: 2063 case SB_ALIGN_TOP:
1924 csrO = 0; 2064 csrO = 0;
1925 break; 2065 break;
1926 case R_SB_ALIGN_CENTRE: 2066 case SB_ALIGN_CENTRE:
1927 csrO = (scrollBar.bot - scrollBar.top) / 2; 2067 csrO = (scrollBar.bot - scrollBar.top) / 2;
1928 break; 2068 break;
1929 case R_SB_ALIGN_BOTTOM: 2069 case SB_ALIGN_BOTTOM:
1930 csrO = scrollBar.bot - scrollBar.top; 2070 csrO = scrollBar.bot - scrollBar.top;
1931 break; 2071 break;
1932 } 2072 }
1933 2073
1934 if (scrollBar.style == R_SB_XTERM 2074 if (scrollBar.style == SB_STYLE_XTERM
1935 || scrollbar_above_slider (ev.y) 2075 || scrollBar.above_slider (ev.y)
1936 || scrollbar_below_slider (ev.y)) 2076 || scrollBar.below_slider (ev.y))
1937 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ()); 2077 scr_move_to (scrollBar.position (ev.y) - csrO, scrollBar.size ());
1938 2078
1939 scrollBar.setMotion (); 2079 scrollBar.state = SB_STATE_MOTION;
1940 break; 2080 break;
1941 2081
1942 case Button1: 2082 case Button1:
1943 if (scrollbar_align == R_SB_ALIGN_CENTRE) 2083 if (scrollBar.align == SB_ALIGN_CENTRE)
1944 csrO = ev.y - scrollBar.top; 2084 csrO = ev.y - scrollBar.top;
1945 /* FALLTHROUGH */ 2085 /* FALLTHROUGH */
1946 2086
1947 case Button3: 2087 case Button3:
1948 if (scrollBar.style != R_SB_XTERM) 2088 if (scrollBar.style != SB_STYLE_XTERM)
1949 { 2089 {
1950 if (scrollbar_above_slider (ev.y)) 2090 if (scrollBar.above_slider (ev.y))
1951# ifdef RXVT_SCROLL_FULL 2091# ifdef RXVT_SCROLL_FULL
1952 scr_page (UP, TermWin.nrow - 1); 2092 scr_page (UP, nrow - 1);
1953# else 2093# else
1954 scr_page (UP, TermWin.nrow / 4); 2094 scr_page (UP, nrow / 4);
1955# endif 2095# endif
1956 else if (scrollbar_below_slider (ev.y)) 2096 else if (scrollBar.below_slider (ev.y))
1957# ifdef RXVT_SCROLL_FULL 2097# ifdef RXVT_SCROLL_FULL
1958 scr_page (DN, TermWin.nrow - 1); 2098 scr_page (DN, nrow - 1);
1959# else 2099# else
1960 scr_page (DN, TermWin.nrow / 4); 2100 scr_page (DN, nrow / 4);
1961# endif 2101# endif
1962 else 2102 else
1963 scrollBar.setMotion (); 2103 scrollBar.state = SB_STATE_MOTION;
1964 } 2104 }
1965 else 2105 else
1966 { 2106 {
1967 scr_page ((ev.button == Button1 ? DN : UP), 2107 scr_page ((ev.button == Button1 ? DN : UP),
1968 (TermWin.nrow 2108 (nrow
1969 * scrollbar_position (ev.y) 2109 * scrollBar.position (ev.y)
1970 / scrollbar_size ())); 2110 / scrollBar.size ()));
1971 } 2111 }
1972 2112
1973 break; 2113 break;
1974 } 2114 }
1975 } 2115 }
2116
1976 return; 2117 return;
1977 } 2118 }
1978#if MENUBAR
1979 /*
1980 * Menubar window processing of button press
1981 */
1982 if (isMenuBarWindow (ev.window))
1983 menubar_control (ev);
1984#endif
1985} 2119}
1986 2120
1987void 2121void
1988rxvt_term::button_release (XButtonEvent &ev) 2122rxvt_term::button_release (XButtonEvent &ev)
1989{ 2123{
… …
1991 2125
1992 csrO = 0; /* reset csr Offset */ 2126 csrO = 0; /* reset csr Offset */
1993 if (!bypass_keystate) 2127 if (!bypass_keystate)
1994 reportmode = !! (priv_modes & PrivMode_mouse_report); 2128 reportmode = !! (priv_modes & PrivMode_mouse_report);
1995 2129
1996 if (scrollbar_isUpDn ()) 2130 if (scrollBar.state == SB_STATE_UP || scrollBar.state == SB_STATE_DOWN)
1997 { 2131 {
1998 scrollBar.setIdle (); 2132 scrollBar.state = SB_STATE_IDLE;
1999 scrollbar_show (0); 2133 scrollBar.show (0);
2000#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2001 refresh_type &= ~SMOOTH_REFRESH;
2002#endif
2003 } 2134 }
2004 2135
2005#ifdef SELECTION_SCROLLING 2136#ifdef SELECTION_SCROLLING
2006 if (sel_scroll_ev.active)
2007 sel_scroll_ev.stop(); 2137 sel_scroll_ev.stop();
2008#endif 2138#endif
2009 2139
2010 if (ev.window == TermWin.vt) 2140 if (ev.window == vt)
2011 { 2141 {
2142 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2143 return;
2144
2012#if ISO_14755 2145#if ISO_14755
2013 // 5.4 2146 // 5.4
2014 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 2147 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2015 return; 2148 return;
2016#endif 2149#endif
2150
2017 if (reportmode) 2151 if (reportmode)
2018 { 2152 {
2019 /* mouse report from vt window */ 2153 /* mouse report from vt window */
2020 /* don't report release of wheel "buttons" */ 2154 /* don't report release of wheel "buttons" */
2021 if (ev.button >= 4) 2155 if (ev.button >= 4)
… …
2032 mouse_report (ev); 2166 mouse_report (ev);
2033 } 2167 }
2034#else /* MOUSE_REPORT_DOUBLECLICK */ 2168#else /* MOUSE_REPORT_DOUBLECLICK */
2035 MEvent.button = AnyButton; 2169 MEvent.button = AnyButton;
2036 mouse_report (ev); 2170 mouse_report (ev);
2037#endif /* MOUSE_REPORT_DOUBLECLICK */ 2171#endif /* MOUSE_REPORT_DOUBLECLICK */
2038 return; 2172 return;
2039 } 2173 }
2040 2174
2041 /* 2175 /*
2042 * dumb hack to compensate for the failure of click-and-drag 2176 * dumb hack to compensate for the failure of click-and-drag
… …
2051 { 2185 {
2052 case Button1: 2186 case Button1:
2053 case Button3: 2187 case Button3:
2054 selection_make (ev.time); 2188 selection_make (ev.time);
2055 break; 2189 break;
2190
2056 case Button2: 2191 case Button2:
2057 selection_request (ev.time, ev.x, ev.y); 2192 if (IN_RANGE_EXC (ev.x, 0, vt_width) && IN_RANGE_EXC (ev.y, 0, vt_height)) // inside window?
2193 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2058 break; 2194 break;
2195
2059#ifdef MOUSE_WHEEL 2196#ifdef MOUSE_WHEEL
2060 case Button4: 2197 case Button4:
2061 case Button5: 2198 case Button5:
2062 { 2199 {
2063 int i; 2200 int i;
… …
2065 2202
2066 v = ev.button == Button4 ? UP : DN; 2203 v = ev.button == Button4 ? UP : DN;
2067 2204
2068 if (ev.state & ShiftMask) 2205 if (ev.state & ShiftMask)
2069 i = 1; 2206 i = 1;
2070 else if (options & Opt_mouseWheelScrollPage) 2207 else if (option (Opt_mouseWheelScrollPage))
2071 i = TermWin.nrow - 1; 2208 i = nrow - 1;
2072 else 2209 else
2073 i = 5; 2210 i = 5;
2074 2211
2075# ifdef MOUSE_SLIP_WHEELING 2212# ifdef MOUSE_SLIP_WHEELING
2076 if (ev.state & ControlMask) 2213 if (ev.state & ControlMask)
2077 { 2214 {
2078 mouse_slip_wheel_speed += v ? -1 : 1; 2215 mouse_slip_wheel_speed += v ? -1 : 1;
2079 if (mouse_slip_wheel_speed < -TermWin.nrow) mouse_slip_wheel_speed = -TermWin.nrow; 2216 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2080 if (mouse_slip_wheel_speed > +TermWin.nrow) mouse_slip_wheel_speed = +TermWin.nrow; 2217 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2081 2218
2082 if (slip_wheel_ev.at < NOW) 2219 if (!slip_wheel_ev.is_active ())
2083 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; 2220 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2084
2085 slip_wheel_ev.start ();
2086 } 2221 }
2087 else 2222 else
2223# endif
2088 { 2224 {
2089# endif
2090# ifdef JUMP_MOUSE_WHEEL
2091 scr_page (v, i); 2225 scr_page (v, i);
2092 scr_refresh (SMOOTH_REFRESH);
2093 scrollbar_show (1); 2226 scrollBar.show (1);
2094# else
2095 while (i--)
2096 {
2097 scr_page (v, 1);
2098 scr_refresh (SMOOTH_REFRESH);
2099 scrollbar_show (1);
2100 }
2101# endif
2102# ifdef MOUSE_SLIP_WHEELING
2103 } 2227 }
2104#endif
2105 } 2228 }
2106 break; 2229 break;
2107#endif 2230#endif
2108 } 2231 }
2109 } 2232 }
2110#ifdef MENUBAR
2111 else if (isMenuBarWindow (ev.window))
2112 menubar_control (ev);
2113#endif
2114} 2233}
2115
2116#ifdef TRANSPARENT
2117#if TINTING
2118/* taken from aterm-0.4.2 */
2119
2120typedef uint32_t RUINT32T;
2121
2122void ShadeXImage(rxvt_display *display, XImage* srcImage, int shade, int rm, int gm, int bm)
2123{
2124 int sh_r, sh_g, sh_b;
2125 RUINT32T mask_r, mask_g, mask_b;
2126 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2127 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2128 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2129 int i;
2130
2131 Visual *visual = display->visual;
2132
2133 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2134
2135 /* for convenience */
2136 mask_r = visual->red_mask;
2137 mask_g = visual->green_mask;
2138 mask_b = visual->blue_mask;
2139
2140 /* boring lookup table pre-initialization */
2141 switch (srcImage->bits_per_pixel) {
2142 case 15:
2143 if ((mask_r != 0x7c00) ||
2144 (mask_g != 0x03e0) ||
2145 (mask_b != 0x001f))
2146 return;
2147 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32));
2148 lookup_r = lookup;
2149 lookup_g = lookup+32;
2150 lookup_b = lookup+32+32;
2151 sh_r = 10;
2152 sh_g = 5;
2153 sh_b = 0;
2154 break;
2155 case 16:
2156 if ((mask_r != 0xf800) ||
2157 (mask_g != 0x07e0) ||
2158 (mask_b != 0x001f))
2159 return;
2160 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32));
2161 lookup_r = lookup;
2162 lookup_g = lookup+32;
2163 lookup_b = lookup+32+64;
2164 sh_r = 11;
2165 sh_g = 5;
2166 sh_b = 0;
2167 break;
2168 case 24:
2169 if ((mask_r != 0xff0000) ||
2170 (mask_g != 0x00ff00) ||
2171 (mask_b != 0x0000ff))
2172 return;
2173 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2174 lookup_r = lookup;
2175 lookup_g = lookup+256;
2176 lookup_b = lookup+256+256;
2177 sh_r = 16;
2178 sh_g = 8;
2179 sh_b = 0;
2180 break;
2181 case 32:
2182 if ((mask_r != 0xff0000) ||
2183 (mask_g != 0x00ff00) ||
2184 (mask_b != 0x0000ff))
2185 return;
2186 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2187 lookup_r = lookup;
2188 lookup_g = lookup+256;
2189 lookup_b = lookup+256+256;
2190 sh_r = 16;
2191 sh_g = 8;
2192 sh_b = 0;
2193 break;
2194 default:
2195 return; /* we do not support this color depth */
2196 }
2197
2198 /* prepare limits for color transformation (each channel is handled separately) */
2199 if (shade < 0) {
2200 shade = -shade;
2201 if (shade < 0) shade = 0;
2202 if (shade > 100) shade = 100;
2203
2204 lower_lim_r = 65535-rm;
2205 lower_lim_g = 65535-gm;
2206 lower_lim_b = 65535-bm;
2207
2208 lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100);
2209 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100);
2210 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100);
2211
2212 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
2213 } else {
2214 if (shade < 0) shade = 0;
2215 if (shade > 100) shade = 100;
2216
2217 lower_lim_r = lower_lim_g = lower_lim_b = 0;
2218
2219 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
2220 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);
2221 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100);
2222 }
2223
2224 /* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */
2225 if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 ))
2226 {
2227 unsigned int tmp;
2228
2229 tmp = lower_lim_r;
2230 lower_lim_r = lower_lim_b;
2231 lower_lim_b = tmp;
2232
2233 tmp = upper_lim_r;
2234 upper_lim_r = upper_lim_b;
2235 upper_lim_b = tmp;
2236 }
2237
2238 /* fill our lookup tables */
2239 for (i = 0; i <= mask_r>>sh_r; i++)
2240 {
2241 RUINT32T tmp;
2242 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r));
2243 tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r);
2244 lookup_r[i] = (tmp/65535)<<sh_r;
2245 }
2246 for (i = 0; i <= mask_g>>sh_g; i++)
2247 {
2248 RUINT32T tmp;
2249 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g));
2250 tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g);
2251 lookup_g[i] = (tmp/65535)<<sh_g;
2252 }
2253 for (i = 0; i <= mask_b>>sh_b; i++)
2254 {
2255 RUINT32T tmp;
2256 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b));
2257 tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b);
2258 lookup_b[i] = (tmp/65535)<<sh_b;
2259 }
2260
2261 /* apply table to input image (replacing colors by newly calculated ones) */
2262 switch (srcImage->bits_per_pixel)
2263 {
2264 case 15:
2265 {
2266 unsigned short *p1, *pf, *p, *pl;
2267 p1 = (unsigned short *) srcImage->data;
2268 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2269 while (p1 < pf)
2270 {
2271 p = p1;
2272 pl = p1 + srcImage->width;
2273 for (; p < pl; p++)
2274 {
2275 *p = lookup_r[(*p & 0x7c00)>>10] |
2276 lookup_g[(*p & 0x03e0)>> 5] |
2277 lookup_b[(*p & 0x001f)];
2278 }
2279 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2280 }
2281 break;
2282 }
2283 case 16:
2284 {
2285 unsigned short *p1, *pf, *p, *pl;
2286 p1 = (unsigned short *) srcImage->data;
2287 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2288 while (p1 < pf)
2289 {
2290 p = p1;
2291 pl = p1 + srcImage->width;
2292 for (; p < pl; p++)
2293 {
2294 *p = lookup_r[(*p & 0xf800)>>11] |
2295 lookup_g[(*p & 0x07e0)>> 5] |
2296 lookup_b[(*p & 0x001f)];
2297 }
2298 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2299 }
2300 break;
2301 }
2302 case 24:
2303 {
2304 unsigned char *p1, *pf, *p, *pl;
2305 p1 = (unsigned char *) srcImage->data;
2306 pf = (unsigned char *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2307 while (p1 < pf)
2308 {
2309 p = p1;
2310 pl = p1 + srcImage->width * 3;
2311 for (; p < pl; p += 3)
2312 {
2313 p[0] = lookup_r[(p[0] & 0xff0000)>>16];
2314 p[1] = lookup_r[(p[1] & 0x00ff00)>> 8];
2315 p[2] = lookup_r[(p[2] & 0x0000ff)];
2316 }
2317 p1 = (unsigned char *) ((char *) p1 + srcImage->bytes_per_line);
2318 }
2319 break;
2320 }
2321 case 32:
2322 {
2323 RUINT32T *p1, *pf, *p, *pl;
2324 p1 = (RUINT32T *) srcImage->data;
2325 pf = (RUINT32T *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2326
2327 while (p1 < pf)
2328 {
2329 p = p1;
2330 pl = p1 + srcImage->width;
2331 for (; p < pl; p++)
2332 {
2333 *p = lookup_r[(*p & 0xff0000)>>16] |
2334 lookup_g[(*p & 0x00ff00)>> 8] |
2335 lookup_b[(*p & 0x0000ff)] |
2336 (*p & ~0xffffff);
2337 }
2338 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
2339 }
2340 break;
2341 }
2342 }
2343
2344 free (lookup);
2345}
2346#endif
2347
2348/*
2349 * Check our parents are still who we think they are.
2350 * Do transparency updates if required
2351 */
2352int
2353rxvt_term::check_our_parents ()
2354{
2355 int i, pchanged, aformat, have_pixmap, rootdepth;
2356 unsigned long nitems, bytes_after;
2357 Atom atype;
2358 unsigned char *prop = NULL;
2359 Window root, oldp, *list;
2360 Pixmap rootpixmap = None;
2361 XWindowAttributes wattr, wrootattr;
2362 dDisp;
2363
2364 pchanged = 0;
2365
2366 if (!(options & Opt_transparent))
2367 return pchanged; /* Don't try any more */
2368
2369 XGetWindowAttributes (disp, display->root, &wrootattr);
2370 rootdepth = wrootattr.depth;
2371
2372 XGetWindowAttributes (disp, TermWin.parent[0], &wattr);
2373
2374 if (rootdepth != wattr.depth)
2375 {
2376 if (am_transparent)
2377 {
2378 pchanged = 1;
2379 XSetWindowBackground (disp, TermWin.vt, pix_colors_focused[Color_bg]);
2380 am_transparent = am_pixmap_trans = 0;
2381 }
2382
2383 return pchanged; /* Don't try any more */
2384 }
2385
2386 /* Get all X ops out of the queue so that our information is up-to-date. */
2387 XSync (disp, False);
2388
2389 /*
2390 * Make the frame window set by the window manager have
2391 * the root background. Some window managers put multiple nested frame
2392 * windows for each client, so we have to take care about that.
2393 */
2394 i = (xa[XA_XROOTPMAP_ID]
2395 && XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID],
2396 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2397 &nitems, &bytes_after, &prop) == Success);
2398
2399 if (!i || prop == NULL)
2400 i = (xa[XA_ESETROOT_PMAP_ID]
2401 && XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID],
2402 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2403 &nitems, &bytes_after, &prop) == Success);
2404
2405 if (!i || prop == NULL
2406#if TINTING
2407 || !rs[Rs_color + Color_tint]
2408#endif
2409 )
2410 have_pixmap = 0;
2411 else
2412 {
2413 have_pixmap = 1;
2414 rootpixmap = *(Pixmap *)prop;
2415 XFree (prop);
2416 }
2417
2418 if (have_pixmap)
2419 {
2420 /*
2421 * Copy display->root pixmap transparency
2422 */
2423 int sx, sy, nx, ny;
2424 unsigned int nw, nh;
2425 Window cr;
2426 XImage *image;
2427 GC gc;
2428 XGCValues gcvalue;
2429
2430 XTranslateCoordinates (disp, TermWin.parent[0], display->root,
2431 0, 0, &sx, &sy, &cr);
2432 nw = (unsigned int)szHint.width;
2433 nh = (unsigned int)szHint.height;
2434 nx = ny = 0;
2435
2436 if (sx < 0)
2437 {
2438 nw += sx;
2439 nx = -sx;
2440 sx = 0;
2441 }
2442
2443 if (sy < 0)
2444 {
2445 nh += sy;
2446 ny = -sy;
2447 sy = 0;
2448 }
2449
2450 MIN_IT (nw, (unsigned int) (wrootattr.width - sx));
2451 MIN_IT (nh, (unsigned int) (wrootattr.height - sy));
2452
2453 XSync (disp, False);
2454 allowedxerror = -1;
2455 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2456
2457 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2458 /* XXX: may need a delay here? */
2459 allowedxerror = 0;
2460
2461 if (image == NULL)
2462 {
2463 if (am_transparent && am_pixmap_trans)
2464 {
2465 pchanged = 1;
2466 if (TermWin.pixmap != None)
2467 {
2468 XFreePixmap (disp, TermWin.pixmap);
2469 TermWin.pixmap = None;
2470 }
2471 }
2472
2473 am_pixmap_trans = 0;
2474 }
2475 else
2476 {
2477 if (TermWin.pixmap != None)
2478 XFreePixmap (disp, TermWin.pixmap);
2479
2480#if TINTING
2481 if (ISSET_PIXCOLOR (Color_tint))
2482 {
2483 unsigned short rm, gm, bm;
2484 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2485
2486 pix_colors_focused[Color_tint].get (display, rm, gm, bm);
2487
2488 ShadeXImage (display, image, shade, rm, gm, bm);
2489 }
2490#endif
2491
2492 TermWin.pixmap = XCreatePixmap (disp, TermWin.vt,
2493 szHint.width, szHint.height, image->depth);
2494 gc = XCreateGC (disp, TermWin.vt, 0UL, &gcvalue);
2495 XPutImage (disp, TermWin.pixmap, gc, image, 0, 0,
2496 nx, ny, image->width, image->height);
2497 XFreeGC (disp, gc);
2498 XDestroyImage (image);
2499 XSetWindowBackgroundPixmap (disp, TermWin.parent[0], TermWin.pixmap);
2500 XClearWindow (disp, TermWin.parent[0]);
2501
2502 if (!am_transparent || !am_pixmap_trans)
2503 pchanged = 1;
2504
2505 am_transparent = am_pixmap_trans = 1;
2506 }
2507 }
2508
2509 if (am_pixmap_trans)
2510 XSetWindowBackgroundPixmap (disp, TermWin.vt, ParentRelative);
2511 else
2512 {
2513 unsigned int n;
2514 /*
2515 * InheritPixmap transparency
2516 */
2517 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)
2518 {
2519 oldp = TermWin.parent[i];
2520 XQueryTree (disp, TermWin.parent[i - 1], &root,
2521 &TermWin.parent[i], &list, &n);
2522 XFree (list);
2523
2524 if (TermWin.parent[i] == display->root)
2525 {
2526 if (oldp != None)
2527 pchanged = 1;
2528
2529 break;
2530 }
2531
2532 if (oldp != TermWin.parent[i])
2533 pchanged = 1;
2534 }
2535
2536 n = 0;
2537
2538 if (pchanged)
2539 {
2540 for (; n < (unsigned int)i; n++)
2541 {
2542 XGetWindowAttributes (disp, TermWin.parent[n], &wattr);
2543 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2544 {
2545 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1;
2546 break;
2547 }
2548 }
2549 }
2550
2551 if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0])))
2552 {
2553 XSetWindowBackground (disp, TermWin.parent[0], pix_colors_focused[Color_fg]);
2554 XSetWindowBackground (disp, TermWin.vt, pix_colors_focused[Color_bg]);
2555 am_transparent = 0;
2556 /* XXX: also turn off Opt_transparent? */
2557 }
2558 else
2559 {
2560#if WAIT_FOR_WM
2561 /* wait (an arbitrary period) for the WM to do its thing
2562 * needed for fvwm2.2.2 (and before?) */
2563 sleep (1);
2564#endif
2565 for (n = 0; n < (unsigned int)i; n++)
2566 {
2567 XSetWindowBackgroundPixmap (disp, TermWin.parent[n], ParentRelative);
2568 XClearWindow (disp, TermWin.parent[n]);
2569 }
2570
2571 XSetWindowBackgroundPixmap (disp, TermWin.vt, ParentRelative);
2572 am_transparent = 1;
2573 }
2574
2575 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)
2576 TermWin.parent[i] = None;
2577 }
2578
2579 if (scrollBar.win)
2580 {
2581 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);
2582 scrollBar.setIdle ();
2583 scrollbar_show (0);
2584 }
2585
2586 if (am_transparent)
2587 {
2588 want_refresh = want_full_refresh = 1;
2589 if (am_pixmap_trans)
2590 flush ();
2591 }
2592
2593 return pchanged;
2594}
2595#endif
2596 2234
2597/*}}} */ 2235/*}}} */
2598 2236
2599bool 2237void ecb_hot
2600rxvt_term::cmd_parse () 2238rxvt_term::cmd_parse ()
2601{ 2239{
2602 bool flag = false;
2603 unicode_t ch = NOCHAR; 2240 wchar_t ch = NOCHAR;
2604 unsigned char *seq_begin; // remember start of esc-sequence here 2241 char *seq_begin; // remember start of esc-sequence here
2605 2242
2606 for (;;) 2243 for (;;)
2607 { 2244 {
2608 if (ch == NOCHAR) 2245 if (ecb_unlikely (ch == NOCHAR))
2609 { 2246 {
2610 seq_begin = cmdbuf_ptr; 2247 seq_begin = cmdbuf_ptr;
2611 ch = next_char (); 2248 ch = next_char ();
2612 }
2613 2249
2614 if (ch == NOCHAR) // TODO: improve 2250 if (ch == NOCHAR)
2615 break; 2251 break;
2252 }
2616 2253
2617 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2254 if (ecb_likely (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT))
2618 { 2255 {
2619 if (!seen_input) 2256 if (ecb_unlikely (!seen_input))
2620 { 2257 {
2621 seen_input = 1; 2258 seen_input = 1;
2622 // many badly-written programs (e.g. jed) contain a race condition: 2259 // many badly-written programs (e.g. jed) contain a race condition:
2623 // they first read the screensize and then install a SIGWINCH handler. 2260 // they first read the screensize and then install a SIGWINCH handler.
2624 // some window managers resize the window early, and these programs 2261 // some window managers resize the window early, and these programs
… …
2629 if (seen_resize && cmd_pid) 2266 if (seen_resize && cmd_pid)
2630 kill (-cmd_pid, SIGWINCH); 2267 kill (-cmd_pid, SIGWINCH);
2631 } 2268 }
2632 2269
2633 /* Read a text string from the input buffer */ 2270 /* Read a text string from the input buffer */
2634 unicode_t buf[UBUFSIZ]; 2271 wchar_t buf[UBUFSIZ];
2635 bool refreshnow = false; 2272 bool refreshnow = false;
2636 int nlines = 0; 2273 int nlines = 0;
2637 unicode_t *str = buf; 2274 wchar_t *str = buf;
2275 wchar_t *eol = str + min (ncol, UBUFSIZ);
2638 2276
2639 for (;;) 2277 for (;;)
2640 { 2278 {
2641 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2279 if (ecb_unlikely (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)))
2642 break; 2280 break;
2643 2281
2644 *str++ = ch; 2282 *str++ = ch;
2645 2283
2646 if (ch == C0_LF) 2284 if (ecb_unlikely (ch == C0_LF || str >= eol))
2647 { 2285 {
2286 if (ch == C0_LF)
2648 nlines++; 2287 nlines++;
2288
2649 refresh_count++; 2289 refresh_count++;
2650 2290
2651 if (!(options & Opt_jumpScroll) 2291 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1)
2652 || (refresh_count >= refresh_limit * (TermWin.nrow - 1)))
2653 { 2292 {
2293 refresh_count = 0;
2294
2295 if (!option (Opt_skipScroll) || ev_time () > ev::now () + 1. / 60.)
2296 {
2654 refreshnow = true; 2297 refreshnow = true;
2655 ch = NOCHAR; 2298 ch = NOCHAR;
2656 break; 2299 break;
2300 }
2657 } 2301 }
2658 2302
2659 // scr_add_lines only works for nlines <= TermWin.nrow - 1. 2303 // scr_add_lines only works for nlines <= nrow - 1.
2660 if (nlines >= TermWin.nrow - 1) 2304 if (nlines >= nrow - 1)
2661 { 2305 {
2306 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2307 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2662 scr_add_lines (buf, nlines, str - buf); 2308 scr_add_lines (buf, str - buf, nlines);
2309
2663 nlines = 0; 2310 nlines = 0;
2664 str = buf; 2311 str = buf;
2312 eol = str + min (ncol, UBUFSIZ);
2665 } 2313 }
2666 }
2667 2314
2668 if (str >= buf + UBUFSIZ) 2315 if (str >= eol)
2669 { 2316 {
2317 if (eol >= buf + UBUFSIZ)
2318 {
2670 ch = NOCHAR; 2319 ch = NOCHAR;
2671 break; 2320 break;
2321 }
2322 else
2323 eol = min (eol + ncol, buf + UBUFSIZ);
2324 }
2325
2672 } 2326 }
2673 2327
2674 seq_begin = cmdbuf_ptr; 2328 seq_begin = cmdbuf_ptr;
2675 ch = next_char (); 2329 ch = next_char ();
2676 } 2330 }
2677 2331
2332 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2333 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2678 scr_add_lines (buf, nlines, str - buf); 2334 scr_add_lines (buf, str - buf, nlines);
2679 2335
2680 /* 2336 /*
2681 * If there have been a lot of new lines, then update the screen 2337 * If there have been a lot of new lines, then update the screen
2682 * What the heck I'll cheat and only refresh less than every page-full. 2338 * What the heck we'll cheat and only refresh less than every page-full.
2683 * the number of pages between refreshes is refresh_limit, which 2339 * if skipScroll is enabled.
2684 * is incremented here because we must be doing flat-out scrolling.
2685 */ 2340 */
2686 if (refreshnow) 2341 if (refreshnow)
2687 { 2342 {
2688 if ((options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2689 refresh_limit++;
2690 else
2691 {
2692 flag = true;
2693 scr_refresh (refresh_type); 2343 scr_refresh ();
2694 } 2344 want_refresh = 1;
2695 } 2345 }
2696
2697 } 2346 }
2698 else 2347 else
2699 { 2348 {
2700 try 2349 try
2701 { 2350 {
… …
2709 } 2358 }
2710 2359
2711 ch = NOCHAR; 2360 ch = NOCHAR;
2712 } 2361 }
2713 } 2362 }
2714
2715 return flag;
2716}
2717
2718// read the next octet
2719unicode_t
2720rxvt_term::next_octet ()
2721{
2722 return cmdbuf_ptr < cmdbuf_endp
2723 ? *cmdbuf_ptr++
2724 : NOCHAR;
2725} 2363}
2726 2364
2727// read the next character 2365// read the next character
2728unicode_t 2366wchar_t ecb_hot
2729rxvt_term::next_char () 2367rxvt_term::next_char () NOTHROW
2730{ 2368{
2731 while (cmdbuf_ptr < cmdbuf_endp) 2369 while (cmdbuf_ptr < cmdbuf_endp)
2732 { 2370 {
2733 // assume 7-bit to be ascii ALWAYS 2371 // assume 7-bit to be ascii ALWAYS
2734 if (*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2372 if (ecb_likely ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b))
2735 return *cmdbuf_ptr++; 2373 return *cmdbuf_ptr++;
2736 2374
2737 wchar_t wc; 2375 wchar_t wc;
2738 size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2376 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2739 2377
2740 if (len == (size_t)-2) 2378 if (len == (size_t)-2)
2741 { 2379 {
2742 // the mbstate stores incomplete sequences. didn't know this :/ 2380 // the mbstate stores incomplete sequences. didn't know this :/
2743 cmdbuf_ptr = cmdbuf_endp; 2381 cmdbuf_ptr = cmdbuf_endp;
2744 break; 2382 break;
2745 } 2383 }
2746 2384
2747 if (len == (size_t)-1) 2385 if (len == (size_t)-1)
2386 {
2387 mbstate.reset (); // reset now undefined conversion state
2748 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2388 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2389 }
2749 2390
2750 // assume wchar == unicode 2391 // assume wchar == unicode
2751 cmdbuf_ptr += len; 2392 cmdbuf_ptr += len;
2752 return wc & UNICODE_MASK; 2393 return wc & UNICODE_MASK;
2753 } 2394 }
2754 2395
2755 return NOCHAR; 2396 return NOCHAR;
2756} 2397}
2757 2398
2758/* rxvt_cmd_getc () - Return next input character */ 2399// read the next octet
2759/* 2400uint32_t ecb_hot
2760 * Return the next input character after first passing any keyboard input 2401rxvt_term::next_octet () NOTHROW
2761 * to the command.
2762 */
2763unicode_t
2764rxvt_term::cmd_getc ()
2765{ 2402{
2403 return cmdbuf_ptr < cmdbuf_endp
2404 ? (unsigned char)*cmdbuf_ptr++
2405 : NOCHAR;
2406}
2407
2408static class out_of_input out_of_input;
2409
2410wchar_t ecb_hot
2411rxvt_term::cmd_getc () THROW ((class out_of_input))
2412{
2766 unicode_t c = next_char (); 2413 wchar_t c = next_char ();
2767 2414
2768 if (c == NOCHAR) 2415 if (c == NOCHAR)
2769 throw out_of_input; 2416 throw out_of_input;
2770 2417
2771 return c; 2418 return c;
2772} 2419}
2773 2420
2774unicode_t 2421uint32_t ecb_hot
2775rxvt_term::cmd_get8 () 2422rxvt_term::cmd_get8 () THROW ((class out_of_input))
2776{ 2423{
2777 unicode_t c = next_octet (); 2424 uint32_t c = next_octet ();
2778 2425
2779 if (c == NOCHAR) 2426 if (c == NOCHAR)
2780 throw out_of_input; 2427 throw out_of_input;
2781 2428
2782 return c; 2429 return c;
2783} 2430}
2784 2431
2785/*{{{ print pipe */ 2432/*{{{ print pipe */
2786/*----------------------------------------------------------------------*/ 2433/*----------------------------------------------------------------------*/
2787#ifdef PRINTPIPE 2434#ifdef PRINTPIPE
2788FILE * 2435FILE * ecb_cold
2789rxvt_term::popen_printer () 2436rxvt_term::popen_printer ()
2790{ 2437{
2791 FILE *stream = popen (rs[Rs_print_pipe], "w"); 2438 FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");
2792 2439
2793 if (stream == NULL) 2440 if (stream == NULL)
2794 rxvt_warn ("can't open printer pipe, not printing.\n"); 2441 rxvt_warn ("can't open printer pipe, not printing.\n");
2795 2442
2796 return stream; 2443 return stream;
2797} 2444}
2798 2445
2799int 2446int ecb_cold
2800rxvt_term::pclose_printer (FILE *stream) 2447rxvt_term::pclose_printer (FILE *stream)
2801{ 2448{
2802 fflush (stream); 2449 fflush (stream);
2803 return pclose (stream); 2450 return pclose (stream);
2804} 2451}
2805 2452
2806/* 2453/*
2807 * simulate attached vt100 printer 2454 * simulate attached vt100 printer
2808 */ 2455 */
2809void 2456void ecb_cold
2810rxvt_term::process_print_pipe () 2457rxvt_term::process_print_pipe ()
2811{ 2458{
2812 int done; 2459 FILE *fd = popen_printer ();
2813 FILE *fd;
2814 2460
2815 if ((fd = popen_printer ()) == NULL) 2461 if (!fd)
2816 return; 2462 return;
2817 2463
2818 /* 2464 /*
2819 * Send all input to the printer until either ESC[4i or ESC[?4i 2465 * Send all input to the printer until either ESC[4i or ESC[?4i
2820 * is received. 2466 * is received.
2821 */ 2467 */
2822 for (done = 0; !done;) 2468 for (int done = 0; !done; )
2823 { 2469 {
2824 unsigned char buf[8]; 2470 unsigned char buf[8];
2825 unicode_t ch; 2471 unicode_t ch;
2826 unsigned int i, len; 2472 unsigned int i, len;
2827 2473
… …
2846 { 2492 {
2847 if ((buf[len++] = cmd_getc ()) == 'i') 2493 if ((buf[len++] = cmd_getc ()) == 'i')
2848 break; /* done = 1 */ 2494 break; /* done = 1 */
2849 } 2495 }
2850 } 2496 }
2851 2497
2852 for (i = 0; i < len; i++) 2498 for (i = 0; i < len; i++)
2853 if (putc (buf[i], fd) == EOF) 2499 if (putc (buf[i], fd) == EOF)
2854 { 2500 {
2855 done = 1; 2501 done = 1;
2856 break; 2502 break;
… …
2858 } 2504 }
2859 } 2505 }
2860 2506
2861 pclose_printer (fd); 2507 pclose_printer (fd);
2862} 2508}
2863#endif /* PRINTPIPE */ 2509#endif /* PRINTPIPE */
2864/*}}} */ 2510/*}}} */
2865 2511
2866/* *INDENT-OFF* */
2867enum { 2512enum {
2868 C1_40 = 0x40, 2513 C1_40 = 0x40,
2869 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA, 2514 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA,
2870 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3, 2515 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3,
2871 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA, 2516 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA,
2872 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC, 2517 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC,
2873}; 2518};
2874/* *INDENT-ON* */
2875 2519
2876/*{{{ process non-printing single characters */ 2520/*{{{ process non-printing single characters */
2877void 2521void ecb_hot
2878rxvt_term::process_nonprinting (unicode_t ch) 2522rxvt_term::process_nonprinting (unicode_t ch)
2879{ 2523{
2880 switch (ch) 2524 switch (ch)
2881 { 2525 {
2882 case C0_ESC: 2526 case C0_ESC:
2883 process_escape_seq (); 2527 process_escape_seq ();
2884 break; 2528 break;
2885 case C0_ENQ: /* terminal Status */ 2529 case C0_ENQ: /* terminal Status */
2886 if (rs[Rs_answerbackstring]) 2530 if (rs[Rs_answerbackstring])
2887 tt_write ((const unsigned char *)rs[Rs_answerbackstring], 2531 tt_write (rs [Rs_answerbackstring], strlen (rs [Rs_answerbackstring]));
2888 (unsigned int)strlen (rs[Rs_answerbackstring]));
2889 else 2532 else
2890 tt_write ((unsigned char *)VT100_ANS, 2533 tt_write (VT100_ANS, strlen (VT100_ANS));
2891 (unsigned int)strlen (VT100_ANS));
2892 break; 2534 break;
2893 case C0_BEL: /* bell */ 2535 case C0_BEL: /* bell */
2894 scr_bell (); 2536 scr_bell ();
2895 break; 2537 break;
2896 case C0_BS: /* backspace */ 2538 case C0_BS: /* backspace */
… …
2920 process_dcs_seq (); 2562 process_dcs_seq ();
2921 break; 2563 break;
2922 case 0x9b: /* CSI */ 2564 case 0x9b: /* CSI */
2923 process_csi_seq (); 2565 process_csi_seq ();
2924 break; 2566 break;
2925 case 0x9d: /* CSI */ 2567 case 0x9d: /* OSC */
2926 process_osc_seq (); 2568 process_osc_seq ();
2927 break; 2569 break;
2928#endif 2570#endif
2929 } 2571 }
2930} 2572}
2931/*}}} */ 2573/*}}} */
2932 2574
2933 2575
2934/*{{{ process VT52 escape sequences */ 2576/*{{{ process VT52 escape sequences */
2935void 2577void ecb_cold
2936rxvt_term::process_escape_vt52 (unicode_t ch) 2578rxvt_term::process_escape_vt52 (unicode_t ch)
2937{ 2579{
2938 int row, col; 2580 int row, col;
2939 2581
2940 switch (ch) 2582 switch (ch)
… …
2974 break; 2616 break;
2975 case 'Z': /* identify the terminal type */ 2617 case 'Z': /* identify the terminal type */
2976 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */ 2618 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
2977 break; 2619 break;
2978 case '<': /* turn off VT52 mode */ 2620 case '<': /* turn off VT52 mode */
2979 PrivMode (0, PrivMode_vt52); 2621 priv_modes &= ~PrivMode_vt52;
2980 break; 2622 break;
2981 case 'F': /* use special graphics character set */ 2623 case 'F': /* use special graphics character set */
2982 case 'G': /* use regular character set */ 2624 case 'G': /* use regular character set */
2983 /* unimplemented */ 2625 /* unimplemented */
2984 break; 2626 break;
… …
2990} 2632}
2991/*}}} */ 2633/*}}} */
2992 2634
2993 2635
2994/*{{{ process escape sequences */ 2636/*{{{ process escape sequences */
2995void 2637void ecb_hot
2996rxvt_term::process_escape_seq () 2638rxvt_term::process_escape_seq ()
2997{ 2639{
2998 unicode_t ch = cmd_getc (); 2640 unicode_t ch = cmd_getc ();
2999 2641
3000 if (priv_modes & PrivMode_vt52) 2642 if (priv_modes & PrivMode_vt52)
… …
3003 return; 2645 return;
3004 } 2646 }
3005 2647
3006 switch (ch) 2648 switch (ch)
3007 { 2649 {
3008 /* case 1: do_tek_mode (); break; */
3009 case '#': 2650 case '#':
3010 if (cmd_getc () == '8') 2651 if (cmd_getc () == '8')
3011 scr_E (); 2652 scr_E ();
3012 break; 2653 break;
3013 case '(': 2654 case '(':
… …
3020 scr_charset_set (2, (unsigned int)cmd_getc ()); 2661 scr_charset_set (2, (unsigned int)cmd_getc ());
3021 break; 2662 break;
3022 case '+': 2663 case '+':
3023 scr_charset_set (3, (unsigned int)cmd_getc ()); 2664 scr_charset_set (3, (unsigned int)cmd_getc ());
3024 break; 2665 break;
3025#if ENABLE_FRILLS 2666#if !ENABLE_MINIMAL
3026 case '6': 2667 case '6':
3027 scr_backindex (); 2668 scr_backindex ();
3028 break; 2669 break;
3029#endif 2670#endif
3030 case '7': 2671 case '7':
3031 scr_cursor (SAVE); 2672 scr_cursor (SAVE);
3032 break; 2673 break;
3033 case '8': 2674 case '8':
3034 scr_cursor (RESTORE); 2675 scr_cursor (RESTORE);
3035 break; 2676 break;
3036#if ENABLE_FRILLS 2677#if !ENABLE_MINIMAL
3037 case '9': 2678 case '9':
3038 scr_forwardindex (); 2679 scr_forwardindex ();
3039 break; 2680 break;
3040#endif 2681#endif
2682 // DECPAM/DECPNM
3041 case '=': 2683 case '=':
2684 priv_modes |= PrivMode_aplKP;
2685 break;
3042 case '>': 2686 case '>':
3043 PrivMode ((ch == '='), PrivMode_aplKP); 2687 priv_modes &= ~PrivMode_aplKP;
3044 break; 2688 break;
3045 2689
3046 case C1_40: 2690 case C1_40:
3047 cmd_getc (); 2691 cmd_getc ();
3048 break; 2692 break;
… …
3051 break; 2695 break;
3052 2696
3053 /* 8.3.87: NEXT LINE */ 2697 /* 8.3.87: NEXT LINE */
3054 case C1_NEL: /* ESC E */ 2698 case C1_NEL: /* ESC E */
3055 { 2699 {
3056 unicode_t nlcr[] = { C0_LF, C0_CR }; 2700 wchar_t nlcr[] = { C0_LF, C0_CR };
3057 scr_add_lines (nlcr, 1, 2); 2701 scr_add_lines (nlcr, ecb_array_length (nlcr), 1);
3058 } 2702 }
3059 break; 2703 break;
3060 2704
3061 /* kidnapped escape sequence: Should be 8.3.48 */ 2705 /* kidnapped escape sequence: Should be 8.3.48 */
3062 case C1_ESA: /* ESC G */ 2706 case C1_ESA: /* ESC G */
3063 process_graphics (); 2707 // used by original rxvt for rob nations own graphics mode
2708 if (cmd_getc () == 'Q')
2709 tt_printf ("\033G0\012"); /* query graphics - no graphics */
3064 break; 2710 break;
3065 2711
3066 /* 8.3.63: CHARACTER TABULATION SET */ 2712 /* 8.3.63: CHARACTER TABULATION SET */
3067 case C1_HTS: /* ESC H */ 2713 case C1_HTS: /* ESC H */
3068 scr_set_tab (1); 2714 scr_set_tab (1);
… …
3072 case C1_RI: /* ESC M */ 2718 case C1_RI: /* ESC M */
3073 scr_index (DN); 2719 scr_index (DN);
3074 break; 2720 break;
3075 2721
3076 /* 8.3.142: SINGLE-SHIFT TWO */ 2722 /* 8.3.142: SINGLE-SHIFT TWO */
3077 /*case C1_SS2: scr_single_shift (2); break; */ 2723 /* case C1_SS2: break; */
3078 2724
3079 /* 8.3.143: SINGLE-SHIFT THREE */ 2725 /* 8.3.143: SINGLE-SHIFT THREE */
3080 /*case C1_SS3: scr_single_shift (3); break; */ 2726 /* case C1_SS3: break; */
3081 2727
3082 /* 8.3.27: DEVICE CONTROL STRING */ 2728 /* 8.3.27: DEVICE CONTROL STRING */
3083 case C1_DCS: /* ESC P */ 2729 case C1_DCS: /* ESC P */
3084 process_dcs_seq (); 2730 process_dcs_seq ();
3085 break; 2731 break;
3086 2732
3087 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2733 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
3088 case C1_SCI: /* ESC Z */ 2734 case C1_SCI: /* ESC Z */
3089 tt_write ((const unsigned char *)ESCZ_ANSWER, 2735 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
3090 (unsigned int) (sizeof (ESCZ_ANSWER) - 1));
3091 break; /* steal obsolete ESC [ c */ 2736 break; /* steal obsolete ESC [ c */
3092 2737
3093 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2738 /* 8.3.16: CONTROL SEQUENCE INTRODUCER (CSI) */
3094 case C1_CSI: /* ESC [ */ 2739 case C1_CSI: /* ESC [ */
3095 process_csi_seq (); 2740 process_csi_seq ();
3096 break; 2741 break;
3097 2742
3098 /* 8.3.90: OPERATING SYSTEM COMMAND */ 2743 /* 8.3.90: OPERATING SYSTEM COMMAND (OSC) */
3099 case C1_OSC: /* ESC ] */ 2744 case C1_OSC: /* ESC ] */
3100 process_osc_seq (); 2745 process_osc_seq ();
3101 break; 2746 break;
3102 2747
3103 /* 8.3.106: RESET TO INITIAL STATE */ 2748 /* 8.3.106: RESET TO INITIAL STATE (RIS) */
3104 case 'c': 2749 case 'c':
3105 mbstate.reset (); 2750 mbstate.reset ();
3106 scr_poweron (); 2751 scr_poweron ();
3107 scrollbar_show (1); 2752 scrollBar.show (1);
3108 break; 2753 break;
3109 2754
3110 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */ 2755 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
3111 case 'n': 2756 case 'n':
3112 scr_charset_choose (2); 2757 scr_charset_choose (2);
… …
3119 } 2764 }
3120} 2765}
3121/*}}} */ 2766/*}}} */
3122 2767
3123/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */ 2768/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */
3124/* *INDENT-OFF* */
3125enum { 2769enum {
3126 CSI_ICH = 0x40, 2770 CSI_ICH = 0x40,
3127 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA, 2771 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA,
3128 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA , 2772 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA ,
3129 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC, 2773 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC,
… …
3132 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ, 2776 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ,
3133 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 , 2777 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 ,
3134 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F 2778 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F
3135}; 2779};
3136 2780
3137#define make_byte(b7,b6,b5,b4,b3,b2,b1,b0) \ 2781#define make_byte(b0,b1,b2,b3,b4,b5,b6,b7) \
3138 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \ 2782 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \
3139 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0)) 2783 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0))
3140#define get_byte_array_bit(array, bit) \ 2784#define get_byte_array_bit(array, bit) \
3141 (!! ((array)[ (bit) / 8] & (128 >> ((bit) & 7)))) 2785 (!! ((array)[(bit) >> 3] & (1 << ((bit) & 7))))
3142 2786
3143const unsigned char csi_defaults[] = 2787static const unsigned char csi_defaults[] =
3144 { 2788 {
3145 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */ 2789 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */
3146 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */ 2790 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */
3147 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */ 2791 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */
3148 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */ 2792 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */
3149 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */ 2793 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */
3150 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */ 2794 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */
3151 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */ 2795 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */
3152 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */ 2796 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */
3153 }; 2797 };
3154/* *INDENT-ON* */
3155 2798
3156void 2799void ecb_hot
3157rxvt_term::process_csi_seq () 2800rxvt_term::process_csi_seq ()
3158{ 2801{
3159 unicode_t ch, priv, i; 2802 unicode_t ch, priv, i;
3160 unsigned int nargs, p; 2803 unsigned int nargs, p;
3161 int n, ndef; 2804 int n, ndef;
3162 int arg[ESC_ARGS]; 2805 int arg[ESC_ARGS] = { };
3163 2806
3164 for (nargs = ESC_ARGS; nargs > 0;) 2807 nargs = 0;
3165 arg[--nargs] = 0;
3166 2808
3167 priv = 0; 2809 priv = 0;
3168 ch = cmd_getc (); 2810 ch = cmd_getc ();
3169 if (ch >= '<' && ch <= '?') 2811 if ((ch >= '<' && ch <= '?') || ch == '!')
2812 {
3170 { /* '<' '=' '>' '?' */ 2813 /* '<' '=' '>' '?' '!' */
3171 priv = ch; 2814 priv = ch;
3172 ch = cmd_getc (); 2815 ch = cmd_getc ();
3173 } 2816 }
3174 2817
3175 /* read any numerical arguments */ 2818 /* read any numerical arguments */
… …
3204 ndef = get_byte_array_bit (csi_defaults, i); 2847 ndef = get_byte_array_bit (csi_defaults, i);
3205 for (p = 0; p < nargs; p++) 2848 for (p = 0; p < nargs; p++)
3206 if (arg[p] == -1) 2849 if (arg[p] == -1)
3207 arg[p] = ndef; 2850 arg[p] = ndef;
3208 2851
3209#ifdef DEBUG_CMD
3210 fprintf (stderr, "CSI ");
3211 for (p = 0; p < nargs; p++)
3212 fprintf (stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : "");
3213 fprintf (stderr, "%c\n", ch);
3214#endif
3215
3216 /* 2852 /*
3217 * private mode handling 2853 * private mode handling
3218 */ 2854 */
3219 if (priv) 2855 if (priv)
3220 { 2856 {
3221 switch (priv) 2857 switch (priv)
3222 { 2858 {
3223 case '>': 2859 case '>':
3224 if (ch == CSI_DA) /* secondary device attributes */ 2860 if (ch == CSI_DA) /* secondary device attributes */
3225 tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]); 2861 {
2862 // first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt,
2863 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
2864 //
2865 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
2866 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, 94 for urxvt <= 8.3, and 95 for later
2867 // versions.
2868 //
2869 tt_printf ("\033[>%d;95;0c", 'U');
2870 }
3226 break; 2871 break;
2872
3227 case '?': 2873 case '?':
3228 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2874 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3229 process_terminal_mode (ch, priv, nargs, arg); 2875 process_terminal_mode (ch, priv, nargs, arg);
3230 break; 2876 break;
2877
2878 case '!':
2879 if (ch == CSI_70)
2880 {
2881 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */
2882 scr_soft_reset ();
2883
2884 static const int pm_h[] = { 7, 25 };
2885 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1005, 1015, 1049 };
2886
2887 process_terminal_mode ('h', 0, ecb_array_length (pm_h), pm_h);
2888 process_terminal_mode ('l', 0, ecb_array_length (pm_l), pm_l);
3231 } 2889 }
2890 break;
2891 }
2892
3232 return; 2893 return;
3233 } 2894 }
3234 2895
3235 switch (ch) 2896 switch (ch)
3236 { 2897 {
… …
3250 } 2911 }
3251 break; 2912 break;
3252#endif 2913#endif
3253 2914
3254 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */ 2915 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */
3255 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */ 2916 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */
3256 arg[0] = -arg[0]; 2917 arg[0] = -arg[0];
3257 /* FALLTHROUGH */ 2918 /* FALLTHROUGH */
3258 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */ 2919 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */
3259 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */ 2920 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */
3260 scr_gotorc (arg[0], 0, RELATIVE); 2921 scr_gotorc (arg[0], 0, RELATIVE);
3261 break; 2922 break;
3262 2923
3263 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */ 2924 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */
3264 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */ 2925 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */
… …
3335 2996
3336 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */ 2997 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */
3337 arg[0] = -arg[0]; 2998 arg[0] = -arg[0];
3338 /* FALLTHROUGH */ 2999 /* FALLTHROUGH */
3339 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 3000 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
3340 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0); 3001 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
3341 break; 3002 break;
3342 3003
3343 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 3004 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
3344 tt_write ((const unsigned char *)VT100_ANS, 3005 tt_write (VT100_ANS, sizeof (VT100_ANS) - 1);
3345 (unsigned int) (sizeof (VT100_ANS) - 1));
3346 break; 3006 break;
3347 3007
3348 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 3008 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
3349 process_sgr_mode (nargs, arg); 3009 process_sgr_mode (nargs, arg);
3350 break; 3010 break;
… …
3357 break; 3017 break;
3358 case 6: /* CPR requested */ 3018 case 6: /* CPR requested */
3359 scr_report_position (); 3019 scr_report_position ();
3360 break; 3020 break;
3361 case 7: /* unofficial extension */ 3021 case 7: /* unofficial extension */
3362 if (options & Opt_insecure) 3022 if (option (Opt_insecure))
3363 tt_printf ("%-.250s\012", rs[Rs_display_name]); 3023 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3364 break; 3024 break;
3365 case 8: /* unofficial extension */ 3025 case 8: /* unofficial extension */
3366 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3026 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3367 break; 3027 break;
… …
3434 break; 3094 break;
3435 case CSI_75: 3095 case CSI_75:
3436 scr_cursor (RESTORE); 3096 scr_cursor (RESTORE);
3437 break; 3097 break;
3438 3098
3439#if ENABLE_FRILLS 3099#if !ENABLE_MINIMAL
3440 case CSI_74: 3100 case CSI_74:
3441 process_window_ops (arg, nargs); 3101 process_window_ops (arg, nargs);
3442 break; 3102 break;
3443#endif 3103#endif
3444 3104
… …
3451 break; 3111 break;
3452 } 3112 }
3453} 3113}
3454/*}}} */ 3114/*}}} */
3455 3115
3456#if ENABLE_FRILLS 3116#if !ENABLE_MINIMAL
3457/* ARGSUSED */
3458void 3117void
3459rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3118rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3460{ 3119{
3461 int x, y; 3120 int x, y;
3462 XWindowAttributes wattr; 3121 XWindowAttributes wattr;
3463 Window wdummy; 3122 Window wdummy;
3464 dDisp; 3123
3124 dLocal (Display *, dpy);
3465 3125
3466 if (nargs == 0) 3126 if (nargs == 0)
3467 return; 3127 return;
3468 3128
3469 switch (args[0]) 3129 switch (args[0])
3470 { 3130 {
3471 /* 3131 /*
3472 * commands 3132 * commands
3473 */ 3133 */
3474 case 1: /* deiconify window */ 3134 case 1: /* deiconify window */
3475 XMapWindow (disp, TermWin.parent[0]); 3135 XMapWindow (dpy, parent);
3476 break; 3136 break;
3477 case 2: /* iconify window */ 3137 case 2: /* iconify window */
3478 XIconifyWindow (disp, TermWin.parent[0], display->screen); 3138 XIconifyWindow (dpy, parent, display->screen);
3479 break; 3139 break;
3480 case 3: /* set position (pixels) */ 3140 case 3: /* set position (pixels) */
3481 XMoveWindow (disp, TermWin.parent[0], args[1], args[2]); 3141 XMoveWindow (dpy, parent, args[1], args[2]);
3482 break; 3142 break;
3483 case 4: /* set size (pixels) */ 3143 case 4: /* set size (pixels) */
3484 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3144 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3485 break; 3145 break;
3486 case 5: /* raise window */ 3146 case 5: /* raise window */
3487 XRaiseWindow (disp, TermWin.parent[0]); 3147 XRaiseWindow (dpy, parent);
3488 break; 3148 break;
3489 case 6: /* lower window */ 3149 case 6: /* lower window */
3490 XLowerWindow (disp, TermWin.parent[0]); 3150 XLowerWindow (dpy, parent);
3491 break; 3151 break;
3492 case 7: /* refresh window */ 3152 case 7: /* refresh window */
3493 scr_touch (true); 3153 scr_touch (true);
3494 break; 3154 break;
3495 case 8: /* set size (chars) */ 3155 case 8: /* set size (chars) */
3496 set_widthheight ((unsigned int) (args[2] * TermWin.fwidth), 3156 set_widthheight ((unsigned int) (args[2] * fwidth),
3497 (unsigned int) (args[1] * TermWin.fheight)); 3157 (unsigned int) (args[1] * fheight));
3498 break; 3158 break;
3499 3159
3500 //case 9: NYI, TODO, restore maximized window or maximize window 3160 //case 9: NYI, TODO, restore maximized window or maximize window
3501 default: 3161 default:
3502 if (args[0] >= 24) /* set height (chars) */ 3162 if (args[0] >= 24) /* set height (chars) */
3503 set_widthheight ((unsigned int)TermWin.width, 3163 set_widthheight ((unsigned int)vt_width,
3504 (unsigned int) (args[1] * TermWin.fheight)); 3164 (unsigned int) (args[1] * fheight));
3505 break; 3165 break;
3506
3507 3166
3508 /* 3167 /*
3509 * reports - some output format copied from XTerm 3168 * reports - some output format copied from XTerm
3510 */ 3169 */
3511 case 11: /* report window state */ 3170 case 11: /* report window state */
3512 XGetWindowAttributes (disp, TermWin.parent[0], &wattr); 3171 XGetWindowAttributes (dpy, parent, &wattr);
3513 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3172 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3514 break; 3173 break;
3515 case 13: /* report window position */ 3174 case 13: /* report window position */
3516 XGetWindowAttributes (disp, TermWin.parent[0], &wattr); 3175 XGetWindowAttributes (dpy, parent, &wattr);
3517 XTranslateCoordinates (disp, TermWin.parent[0], wattr.root, 3176 XTranslateCoordinates (dpy, parent, wattr.root,
3518 -wattr.border_width, -wattr.border_width, 3177 -wattr.border_width, -wattr.border_width,
3519 &x, &y, &wdummy); 3178 &x, &y, &wdummy);
3520 tt_printf ("\033[3;%d;%dt", x, y); 3179 tt_printf ("\033[3;%d;%dt", x, y);
3521 break; 3180 break;
3522 case 14: /* report window size (pixels) */ 3181 case 14: /* report window size (pixels) */
3523 XGetWindowAttributes (disp, TermWin.parent[0], &wattr); 3182 XGetWindowAttributes (dpy, parent, &wattr);
3524 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3183 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3525 break; 3184 break;
3526 case 18: /* report text area size (chars) */ 3185 case 18: /* report text area size (chars) */
3527 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); 3186 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3528 break; 3187 break;
3529 case 19: /* report window size (chars) */ 3188 case 19: /* report window size (chars) */
3530 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol); 3189 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3531 break; 3190 break;
3532 case 20: /* report icon label */ 3191 case 20: /* report icon label */
3533 { 3192 {
3534 char *s; 3193 char *s;
3535 XGetIconName (disp, TermWin.parent[0], &s); 3194 XGetIconName (dpy, parent, &s);
3536 tt_printf ("\033]L%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3195 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3537 XFree (s); 3196 XFree (s);
3538 } 3197 }
3539 break; 3198 break;
3540 case 21: /* report window title */ 3199 case 21: /* report window title */
3541 { 3200 {
3542 char *s; 3201 char *s;
3543 XFetchName (disp, TermWin.parent[0], &s); 3202 XFetchName (dpy, parent, &s);
3544 tt_printf ("\033]l%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3203 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3545 XFree (s); 3204 XFree (s);
3546 } 3205 }
3547 break; 3206 break;
3548 } 3207 }
3549} 3208}
… …
3552/*----------------------------------------------------------------------*/ 3211/*----------------------------------------------------------------------*/
3553/* 3212/*
3554 * get input up until STRING TERMINATOR (or BEL) 3213 * get input up until STRING TERMINATOR (or BEL)
3555 * ends_how is terminator used. returned input must be free()'d 3214 * ends_how is terminator used. returned input must be free()'d
3556 */ 3215 */
3557unsigned char * 3216char *
3558rxvt_term::get_to_st (unicode_t &ends_how) 3217rxvt_term::get_to_st (unicode_t &ends_how)
3559{ 3218{
3560 unicode_t ch; 3219 unicode_t ch;
3561 bool seen_esc = false; 3220 bool seen_esc = false;
3562 unsigned int n = 0; 3221 unsigned int n = 0;
… …
3576 seen_esc = true; 3235 seen_esc = true;
3577 continue; 3236 continue;
3578 } 3237 }
3579 else if (ch == C0_BEL || ch == CHAR_ST) 3238 else if (ch == C0_BEL || ch == CHAR_ST)
3580 break; 3239 break;
3240 else if (ch == C0_SYN)
3241 ch = cmd_get8 ();
3581 else if (ch < 0x20) 3242 else if (ch < 0x20)
3582 return NULL; /* other control character - exit */ 3243 return NULL; /* other control character - exit */
3583 3244
3584 seen_esc = false; 3245 seen_esc = false;
3585 3246
3586 if (n >= sizeof (string) - 1) 3247 if (n >= STRING_MAX - 1)
3587 // stop at some sane length 3248 // stop at some sane length
3588 return NULL; 3249 return NULL;
3589 3250
3590 if (ch == C0_SYN)
3591 string[n++] = cmd_get8 ();
3592 else
3593 string[n++] = ch; 3251 string[n++] = ch;
3594 } 3252 }
3595 3253
3596 string[n++] = '\0'; 3254 string[n++] = '\0';
3597 3255
3598 ends_how = (ch == 0x5c ? C0_ESC : ch); 3256 ends_how = (ch == 0x5c ? C0_ESC : ch);
3599 3257
3600 return (unsigned char *)rxvt_wcstombs (string); 3258 return rxvt_wcstombs (string);
3601} 3259}
3602 3260
3603/*----------------------------------------------------------------------*/ 3261/*----------------------------------------------------------------------*/
3604/* 3262/*
3605 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3263 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3606 */ 3264 */
3607void 3265void
3608rxvt_term::process_dcs_seq () 3266rxvt_term::process_dcs_seq ()
3609{ 3267{
3610 unsigned char *s;
3611 unicode_t eh;
3612
3613 /* 3268 /*
3614 * Not handled yet 3269 * Not handled yet
3615 */ 3270 */
3271
3272 unicode_t eh;
3616 s = get_to_st (eh); 3273 char *s = get_to_st (eh);
3617 if (s) 3274 if (s)
3618 free (s); 3275 free (s);
3619 3276
3620 return; 3277 return;
3621} 3278}
… …
3625 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)' 3282 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)'
3626 */ 3283 */
3627void 3284void
3628rxvt_term::process_osc_seq () 3285rxvt_term::process_osc_seq ()
3629{ 3286{
3630 unicode_t ch, eh;
3631 int arg; 3287 int arg;
3632 3288
3633 ch = cmd_getc (); 3289 unicode_t ch = cmd_getc ();
3634 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3290 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3635 arg = arg * 10 + (ch - '0'); 3291 arg = arg * 10 + (ch - '0');
3636 3292
3637 if (ch == ';') 3293 if (ch == ';')
3638 { 3294 {
3295 unicode_t eh;
3639 unsigned char *s = get_to_st (eh); 3296 char *s = get_to_st (eh);
3640 3297
3641 if (s) 3298 if (s)
3642 { 3299 {
3643 process_xterm_seq (arg, (char *)s, eh); 3300 process_xterm_seq (arg, s, eh);
3644 free (s); 3301 free (s);
3645 } 3302 }
3646 } 3303 }
3647} 3304}
3648 3305
3649void 3306void
3650rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp) 3307rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3651{ 3308{
3652 if (str[0] == '?' && !str[1]) 3309 if (str[0] == '?' && !str[1])
3653 { 3310 {
3654 unsigned short r, g, b; 3311 rgba c;
3655 pix_colors_focused[color].get (display, r, g, b); 3312 pix_colors_focused[color].get (c);
3313
3314#if XFT
3315 if (c.a != rgba::MAX_CC)
3316 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp);
3317 else
3318#endif
3656 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp); 3319 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp);
3657 } 3320 }
3658 else 3321 else
3659 set_window_color (color, str); 3322 set_window_color (color, str);
3660} 3323}
3661 3324
3662/* 3325/*
3663 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3326 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3664 * 0 = change iconName/title
3665 * 1 = change iconName
3666 * 2 = change title
3667 * 4 = change color
3668 * 10 = change fg color
3669 * 11 = change bg color
3670 * 12 = change text color
3671 * 13 = change mouse foreground color
3672 * 17 = change highlight character colour
3673 * 18 = change bold character color
3674 * 19 = change underlined character color
3675 * 46 = change logfile (not implemented)
3676 * 50 = change font
3677 *
3678 * rxvt extensions:
3679 * 20 = bg pixmap
3680 * 39 = change default fg color
3681 * 49 = change default bg color
3682 * 55 = dump scrollback buffer and all of screen
3683 * 701 = change locale
3684 * 702 = find font
3685 * 703 = menu
3686 */ 3327 */
3687void 3328void
3688rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp) 3329rxvt_term::process_xterm_seq (int op, char *str, char resp)
3689{ 3330{
3690 int changed = 0;
3691 int color; 3331 int color;
3692 char *buf, *name; 3332 char *buf, *name;
3693 bool query = str[0] == '?' && !str[1]; 3333 bool query = str[0] == '?' && !str[1];
3694 int saveop = op; 3334 int saveop = op;
3695 dDisp; 3335
3336 dLocal (Display *, dpy);
3696 3337
3697 assert (str != NULL); 3338 assert (str != NULL);
3339
3340 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END)))
3341 return;
3342
3698 switch (op) 3343 switch (op)
3699 { 3344 {
3700 case XTerm_name: 3345 case XTerm_name:
3701 set_title (str); 3346 set_title (str);
3702 /* FALLTHROUGH */ 3347 /* FALLTHROUGH */
… …
3716 unsigned long bytes_after; 3361 unsigned long bytes_after;
3717 unsigned char *value = 0; 3362 unsigned char *value = 0;
3718 const char *str = ""; 3363 const char *str = "";
3719 3364
3720 if (prop 3365 if (prop
3721 && XGetWindowProperty (disp, TermWin.parent[0], 3366 && XGetWindowProperty (dpy, parent,
3722 prop, 0, 1<<16, 0, AnyPropertyType, 3367 prop, 0, 1<<16, 0, AnyPropertyType,
3723 &actual_type, &actual_format, 3368 &actual_type, &actual_format,
3724 &nitems, &bytes_after, &value) == Success 3369 &nitems, &bytes_after, &value) == Success
3725 && actual_type != None 3370 && actual_type != None
3726 && actual_format == 8) 3371 && actual_format == 8)
3727 str = (const char *)(value); 3372 str = (const char *)(value);
3728 3373
3729 tt_printf ("\033]%d;%s%c", XTerm_property, str, resp); 3374 tt_printf ("\033]%d;%s%c", op, str, resp);
3730 3375
3731 XFree (value); 3376 XFree (value);
3732 } 3377 }
3733 else 3378 else
3734 { 3379 {
3735 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3380 char *eq = strchr (str, '=');
3736 3381
3737 if (eq) 3382 if (eq)
3738 { 3383 {
3739 *eq = 0; 3384 *eq = 0;
3740 set_utf8_property (display->atom (str), eq + 1); 3385 set_utf8_property (display->atom (str), eq + 1);
3741 } 3386 }
3742 else 3387 else
3743 XDeleteProperty (disp, TermWin.parent[0], 3388 XDeleteProperty (dpy, parent,
3744 display->atom (str)); 3389 display->atom (str));
3745 } 3390 }
3746 break; 3391 break;
3747 3392
3748 case XTerm_Color: 3393 case XTerm_Color:
… …
3750 { 3395 {
3751 if ((name = strchr (buf, ';')) == NULL) 3396 if ((name = strchr (buf, ';')) == NULL)
3752 break; 3397 break;
3753 3398
3754 *name++ = '\0'; 3399 *name++ = '\0';
3755 color = atoi (buf); 3400 color = atoi (buf) + minCOLOR;
3756 3401
3757 if (color < 0 || color >= TOTAL_COLORS) 3402 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
3758 break; 3403 break;
3759 3404
3760 if ((buf = strchr (name, ';')) != NULL) 3405 if ((buf = strchr (name, ';')) != NULL)
3761 *buf++ = '\0'; 3406 *buf++ = '\0';
3762 3407
3763 if (name[0] == '?' && !name[1]) 3408 process_color_seq (op, color, name, resp);
3409 }
3410 break;
3411 case Rxvt_restoreFG:
3412 case XTerm_Color00:
3413 process_color_seq (op, Color_fg, str, resp);
3414 break;
3415 case Rxvt_restoreBG:
3416 case XTerm_Color01:
3417 process_color_seq (op, Color_bg, str, resp);
3418 break;
3419#ifndef NO_CURSORCOLOR
3420 case XTerm_Color_cursor:
3421 process_color_seq (op, Color_cursor, str, resp);
3422 break;
3423#endif
3424 case XTerm_Color_pointer_fg:
3425 process_color_seq (op, Color_pointer_fg, str, resp);
3426 break;
3427 case XTerm_Color_pointer_bg:
3428 process_color_seq (op, Color_pointer_bg, str, resp);
3429 break;
3430#ifdef OPTION_HC
3431 case XTerm_Color_HC:
3432 process_color_seq (op, Color_HC, str, resp);
3433 break;
3434 case XTerm_Color_HTC:
3435 process_color_seq (op, Color_HTC, str, resp);
3436 break;
3437#endif
3438#ifndef NO_BOLD_UNDERLINE_REVERSE
3439 case URxvt_Color_BD:
3440 process_color_seq (op, Color_BD, str, resp);
3441 break;
3442 case URxvt_Color_UL:
3443 process_color_seq (op, Color_UL, str, resp);
3444 break;
3445 case URxvt_Color_IT:
3446 process_color_seq (op, Color_IT, str, resp);
3447 break;
3448#endif
3449 case URxvt_Color_border:
3450 process_color_seq (op, Color_border, str, resp);
3451 break;
3452#if ENABLE_TRANSPARENCY
3453 case URxvt_Color_tint:
3454 process_color_seq (op, Color_tint, str, resp);
3455 {
3456 bool changed = false;
3457
3458 if (ISSET_PIXCOLOR (Color_tint))
3459 changed = root_effects.set_tint (pix_colors_focused [Color_tint]);
3460
3461 if (changed)
3462 update_background ();
3463 }
3464
3465 break;
3466#endif
3467
3468#if BG_IMAGE_FROM_FILE
3469 case Rxvt_Pixmap:
3470 if (!strcmp (str, "?"))
3471 {
3472 char str[256];
3473 int h_scale = 0, v_scale = 0;
3474 int h_align = 0, v_align = 0;
3475 if (image_vec.size () > 0)
3764 { 3476 {
3765 unsigned short r, g, b; 3477 h_scale = image_vec[0].h_scale;
3766 pix_colors_focused[color + minCOLOR].get (display, r, g, b); 3478 v_scale = image_vec[0].v_scale;
3767 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp); 3479 h_align = image_vec[0].h_align;
3480 v_align = image_vec[0].v_align;
3481 }
3482
3483 sprintf (str, "[%dx%d+%d+%d]",
3484 h_scale, v_scale,
3485 h_align, v_align);
3486 process_xterm_seq (XTerm_title, str, CHAR_ST);
3487 }
3488 else
3489 {
3490 bool changed = false;
3491
3492 if (*str != ';')
3493 {
3494 if (image_vec.size () > 0)
3495 changed = image_vec[0].set_file_geometry (str);
3496 else
3497 {
3498 rxvt_image *image = new_image ();
3499 if (!image->set_file_geometry (str))
3500 image_vec.pop_back ();
3501 else
3502 changed = true;
3503 }
3768 } 3504 }
3769 else 3505 else
3770 set_window_color (color + minCOLOR, name); 3506 {
3507 str++;
3508 if (image_vec.size () > 0)
3509 changed = image_vec[0].set_geometry (str, true);
3510 }
3511
3512 if (changed)
3513 {
3514 if (bg_window_position_sensitive ())
3515 {
3516 int x, y;
3517 get_window_origin (x, y);
3518 bg_set_position (x, y);
3519 }
3520 update_background ();
3521 }
3771 } 3522 }
3772 break; 3523 break;
3773 case XTerm_Color00:
3774 process_color_seq (XTerm_Color00, Color_fg, str, resp);
3775 break;
3776 case XTerm_Color01:
3777 process_color_seq (XTerm_Color00, Color_bg, str, resp);
3778 break;
3779#ifndef NO_CURSORCOLOR
3780 case XTerm_Color_cursor:
3781 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp);
3782 break;
3783#endif 3524#endif
3784 case XTerm_Color_pointer_fg:
3785 process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp);
3786 break;
3787 case XTerm_Color_pointer_bg:
3788 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp);
3789 break;
3790#ifndef NO_BOLD_UNDERLINE_REVERSE
3791 case XTerm_Color_BD:
3792 process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3793 break;
3794 case XTerm_Color_IT:
3795 process_color_seq (XTerm_Color_IT, Color_IT, str, resp);
3796 break;
3797 case XTerm_Color_UL:
3798 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3799 break;
3800 case XTerm_Color_RV:
3801 process_color_seq (XTerm_Color_RV, Color_RV, str, resp);
3802 break;
3803#endif
3804#if TRANSPARENT && TINTING
3805 case XTerm_Color_tint:
3806 process_color_seq (XTerm_Color_tint, Color_tint, str, resp);
3807 check_our_parents ();
3808 if (am_transparent)
3809 want_full_refresh = want_refresh = 1;
3810 break;
3811#endif
3812
3813 case XTerm_Pixmap:
3814 if (*str != ';')
3815 {
3816#if XPM_BACKGROUND
3817 scale_pixmap (""); /* reset to default scaling */
3818 set_bgPixmap (str); /* change pixmap */
3819#endif
3820 scr_touch (true);
3821 }
3822 while ((str = strchr (str, ';')) != NULL)
3823 {
3824 str++;
3825#if XPM_BACKGROUND
3826 changed += scale_pixmap (str);
3827#endif
3828 }
3829
3830 if (changed)
3831 {
3832#ifdef XPM_BACKGROUND
3833 resize_pixmap ();
3834#endif
3835 scr_touch (true);
3836 }
3837 break;
3838
3839 case XTerm_restoreFG:
3840 set_window_color (Color_fg, str);
3841 break;
3842 case XTerm_restoreBG:
3843 set_window_color (Color_bg, str);
3844 break;
3845 3525
3846 case XTerm_logfile: 3526 case XTerm_logfile:
3847 // TODO, when secure mode? 3527 // TODO, when secure mode?
3848 break; 3528 break;
3849 3529
3530#if 0
3531 case Rxvt_dumpscreen: /* no error notices */
3532 {
3533 int fd;
3534 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3535 {
3536 scr_dump (fd);
3537 close (fd);
3538 }
3539 }
3540 break;
3541#endif
3850 case XTerm_font: 3542 case XTerm_font:
3851 op = URxvt_font; 3543 op = URxvt_font;
3852 case URxvt_font: 3544 case URxvt_font:
3853#if ENABLE_STYLES 3545#if ENABLE_STYLES
3854 case URxvt_boldFont: 3546 case URxvt_boldFont:
3855 case URxvt_italicFont: 3547 case URxvt_italicFont:
3856 case URxvt_boldItalicFont: 3548 case URxvt_boldItalicFont:
3857#endif 3549#endif
3858 if (query) 3550 if (query)
3859 tt_printf ("\33]%d;%-.250s%c", saveop, 3551 tt_printf ("\33]%d;%-.250s%c", saveop,
3860 (options & Opt_insecure) && TermWin.fontset[op - URxvt_font]->fontdesc 3552 option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3861 ? TermWin.fontset[op - URxvt_font]->fontdesc : "", 3553 ? fontset[op - URxvt_font]->fontdesc : "",
3862 resp); 3554 resp);
3863 else 3555 else
3864 { 3556 {
3865 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3557 const char *&res = rs[Rs_font + (op - URxvt_font)];
3866 3558
… …
3868 allocated.push_back ((void *)res); 3560 allocated.push_back ((void *)res);
3869 set_fonts (); 3561 set_fonts ();
3870 } 3562 }
3871 break; 3563 break;
3872 3564
3873#if ENABLE_FRILLS 3565 case URxvt_version:
3874 case XTerm_locale:
3875 if (query) 3566 if (query)
3567 tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%c",
3568 op,
3569 rs[Rs_name], VERSION[0], VERSION[2],
3570 resp);
3571 break;
3572
3573#if !ENABLE_MINIMAL
3574 case URxvt_locale:
3575 if (query)
3876 tt_printf ("\33]%d;%-.250s%c", XTerm_locale, (options & Opt_insecure) ? locale : "", resp); 3576 tt_printf ("\33]%d;%-.250s%c", op, option (Opt_insecure) ? locale : "", resp);
3877 else 3577 else
3878 { 3578 {
3879 set_locale (str); 3579 set_locale (str);
3880 pty.set_utf8_mode (enc_utf8); 3580 pty->set_utf8_mode (enc_utf8);
3881 init_xlocale (); 3581 init_xlocale ();
3882 } 3582 }
3883 break; 3583 break;
3884#endif
3885 3584
3886#ifdef MENUBAR 3585 case URxvt_view_up:
3887 case XTerm_Menu: 3586 case URxvt_view_down:
3888 if (options & Opt_insecure) 3587 {
3889 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked 3588 int lines = atoi (str);
3589
3590 if (lines)
3591 scr_page (op == URxvt_view_up ? UP : DN, lines);
3592 else
3593 scr_erase_savelines ();
3594 }
3595
3890 break; 3596 break;
3891#endif 3597#endif
3892#if 0 3598
3893 case XTerm_dumpscreen: /* no error notices */ 3599#if ENABLE_PERL
3894 { 3600 case URxvt_perl:
3895 int fd; 3601 HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_STR_LEN, &resp, 1, DT_END));
3896 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3897 {
3898 scr_dump (fd);
3899 close (fd);
3900 }
3901 }
3902 break; 3602 break;
3903#endif 3603#endif
3904 } 3604 }
3905} 3605}
3906/*----------------------------------------------------------------------*/ 3606/*----------------------------------------------------------------------*/
… …
3913 * 's' = save 3613 * 's' = save
3914 * 'r' = restore 3614 * 'r' = restore
3915 * 't' = toggle 3615 * 't' = toggle
3916 * so no need for fancy checking 3616 * so no need for fancy checking
3917 */ 3617 */
3918int 3618int ecb_cold
3919rxvt_term::privcases (int mode, unsigned long bit) 3619rxvt_term::privcases (int mode, unsigned long bit)
3920{ 3620{
3921 int state; 3621 int state;
3922 3622
3923 if (mode == 's') 3623 if (mode == 's')
3924 { 3624 {
3925 SavedModes |= (priv_modes & bit); 3625 if (priv_modes & bit)
3626 SavedModes |= bit;
3627 else
3628 SavedModes &= ~bit;
3926 return -1; 3629 return -1;
3927 } 3630 }
3928 else 3631 else
3929 { 3632 {
3930 if (mode == 'r') 3633 if (mode == 'r')
3931 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3634 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3932 else 3635 else
3933 state = (mode == 't') ? ! (priv_modes & bit) : mode; 3636 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3934 PrivMode (state, bit); 3637
3638 if (state)
3639 priv_modes |= bit;
3640 else
3641 priv_modes &= ~bit;
3935 } 3642 }
3936 3643
3937 return state; 3644 return state;
3938} 3645}
3939 3646
3940/* we're not using priv _yet_ */ 3647/* we're not using priv _yet_ */
3941void 3648void
3942rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg) 3649rxvt_term::process_terminal_mode (int mode, int priv ecb_unused, unsigned int nargs, const int *arg)
3943{ 3650{
3944 unsigned int i, j; 3651 unsigned int i, j;
3945 int state; 3652 int state;
3946 3653
3947 static const struct 3654 static const struct
3948 { 3655 {
3949 const int argval; 3656 const int argval;
3950 const unsigned long bit; 3657 const unsigned long bit;
3951 }
3952
3953 argtopriv[] = { 3658 } argtopriv[] = {
3954 { 1, PrivMode_aplCUR }, 3659 { 1, PrivMode_aplCUR }, // DECCKM
3955 { 2, PrivMode_vt52 }, 3660 { 2, PrivMode_vt52 }, // DECANM
3956 { 3, PrivMode_132 }, 3661 { 3, PrivMode_132 }, // DECCOLM
3957 { 4, PrivMode_smoothScroll }, 3662 { 4, PrivMode_smoothScroll }, // DECSCLM
3958 { 5, PrivMode_rVideo }, 3663 { 5, PrivMode_rVideo }, // DECSCNM
3959 { 6, PrivMode_relOrigin }, 3664 { 6, PrivMode_relOrigin }, // DECOM
3960 { 7, PrivMode_Autowrap }, 3665 { 7, PrivMode_Autowrap }, // DECAWM
3961 // 8, bi-directional support mode 3666 // 8, auto-repeat keys // DECARM
3962 { 9, PrivMode_MouseX10 }, 3667 { 9, PrivMode_MouseX10 },
3963#ifdef menuBar_esc 3668 // 18 end FF to printer after print screen
3964 { menuBar_esc, PrivMode_menuBar }, 3669 // 19 Print screen prints full screen/scroll region
3965#endif
3966 // 18, 19 printing-related
3967 { 25, PrivMode_VisibleCursor }, 3670 { 25, PrivMode_VisibleCursor }, // DECTCEM cnorm/cvvis/civis
3968#ifdef scrollBar_esc 3671#ifdef scrollBar_esc
3969 { scrollBar_esc, PrivMode_scrollBar }, 3672 { scrollBar_esc, PrivMode_scrollBar },
3970#endif 3673#endif
3971 { 35, PrivMode_ShiftKeys }, // rxvt extension 3674 { 35, PrivMode_ShiftKeys }, // rxvt extension
3675 // 38, tektronix mode // DECTEK
3972 { 40, PrivMode_132OK }, 3676 { 40, PrivMode_132OK },
3973 // 41 xterm more fixes NYI 3677 // 41 xterm more fixes NYI
3974 // 45 margin bell NYI 3678 // 45 margin bell NYI
3975 // 46 start logging 3679 // 46 start logging
3976 { 47, PrivMode_Screen }, 3680 { 47, PrivMode_Screen },
3977 { 66, PrivMode_aplKP }, 3681 { 66, PrivMode_aplKP }, // DECNKM
3978#ifndef NO_BACKSPACE_KEY 3682#ifndef NO_BACKSPACE_KEY
3979 { 67, PrivMode_BackSpace }, 3683 { 67, PrivMode_BackSpace }, // DECBKM
3980#endif 3684#endif
3981 { 1000, PrivMode_MouseX11 }, 3685 { 1000, PrivMode_MouseX11 },
3982 // 1001 Use Hilite Mouse Tracking. NYI, TODO 3686 { 1002, PrivMode_MouseBtnEvent },
3983 // 1002 Use Cell Motion Mouse Tracking. NYI, TODO 3687 { 1003, PrivMode_MouseAnyEvent },
3984 // 1003 Use All Motion Mouse Tracking. NYI, TODO 3688#if ENABLE_FRILLS
3689 { 1005, PrivMode_ExtModeMouse },
3690#endif
3985 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3691 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3986 { 1011, PrivMode_Keypress }, // rxvt extension 3692 { 1011, PrivMode_Keypress }, // rxvt extension
3693#if ENABLE_FRILLS
3694 { 1015, PrivMode_ExtMouseRight }, // urxvt extension of 1005
3695#endif
3987 // 1035 enable modifiers for alt, numlock NYI 3696 // 1035 enable modifiers for alt, numlock NYI
3988 // 1036 send ESC for meta keys NYI 3697 // 1036 send ESC for meta keys NYI
3989 // 1037 send DEL for keypad delete NYI 3698 // 1037 send DEL for keypad delete NYI
3990 { 1047, PrivMode_Screen }, 3699 { 1047, PrivMode_Screen },
3991 // 1048 save and restore cursor 3700 // 1048 save and restore cursor, implemented in code
3992 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */ 3701 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
3993 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3702 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3703 { 2004, PrivMode_BracketPaste },
3994 }; 3704 };
3995 3705
3996 if (nargs == 0) 3706 if (nargs == 0)
3997 return; 3707 return;
3998 3708
… …
4005 for (i = 0; i < nargs; i++) 3715 for (i = 0; i < nargs; i++)
4006 { 3716 {
4007 state = -1; 3717 state = -1;
4008 3718
4009 /* basic handling */ 3719 /* basic handling */
4010 for (j = 0; j < (sizeof (argtopriv)/sizeof (argtopriv[0])); j++) 3720 for (j = 0; j < ecb_array_length (argtopriv); j++)
4011 if (argtopriv[j].argval == arg[i]) 3721 if (argtopriv[j].argval == arg[i])
4012 { 3722 {
4013 state = privcases (mode, argtopriv[j].bit); 3723 state = privcases (mode, argtopriv[j].bit);
4014 break; 3724 break;
4015 } 3725 }
4016 3726
4017 /* extra handling for values with state unkept */ 3727 /* extra handling for values with state unkept */
4018 switch (arg[i]) 3728 switch (arg[i])
4019 { 3729 {
3730#if ENABLE_STYLES
3731 case 1021:
3732 set_option (Opt_intensityStyles, mode);
3733
3734 scr_touch (true);
3735 break;
3736#endif
4020 case 1048: /* alternative cursor save */ 3737 case 1048: /* alternative cursor save */
4021 case 1049:
4022 if (options & Opt_secondaryScreen) 3738 if (option (Opt_secondaryScreen))
4023 if (mode == 0) 3739 if (mode == 0)
4024 scr_cursor (RESTORE); 3740 scr_cursor (RESTORE);
4025 else if (mode == 1) 3741 else if (mode == 1)
4026 scr_cursor (SAVE); 3742 scr_cursor (SAVE);
4027 break; 3743 break;
… …
4035 case 2: /* VT52 mode */ 3751 case 2: /* VT52 mode */
4036 /* oddball mode. should be set regardless of set/reset 3752 /* oddball mode. should be set regardless of set/reset
4037 * parameter. Return from VT52 mode with an ESC < from 3753 * parameter. Return from VT52 mode with an ESC < from
4038 * within VT52 mode 3754 * within VT52 mode
4039 */ 3755 */
4040 PrivMode (1, PrivMode_vt52); 3756 priv_modes |= PrivMode_vt52;
4041 break; 3757 break;
4042 case 3: /* 80/132 */ 3758 case 3: /* 80/132 */
4043 if (priv_modes & PrivMode_132OK) 3759 if (priv_modes & PrivMode_132OK)
4044 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height); 3760 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
4045 break; 3761 break;
4046 case 4: /* smooth scrolling */ 3762 case 4: /* smooth scrolling */
4047 if (state)
4048 options &= ~Opt_jumpScroll;
4049 else
4050 options |= Opt_jumpScroll; 3763 set_option (Opt_jumpScroll, !state);
4051 break; 3764 break;
4052 case 5: /* reverse video */ 3765 case 5: /* reverse video */
4053 scr_rvideo_mode (state); 3766 scr_rvideo_mode (state);
4054 break; 3767 break;
4055 case 6: /* relative/absolute origins */ 3768 case 6: /* relative/absolute origins */
… …
4059 scr_autowrap (state); 3772 scr_autowrap (state);
4060 break; 3773 break;
4061 /* case 8: - auto repeat, can't do on a per window basis */ 3774 /* case 8: - auto repeat, can't do on a per window basis */
4062 case 9: /* X10 mouse reporting */ 3775 case 9: /* X10 mouse reporting */
4063 if (state) /* orthogonal */ 3776 if (state) /* orthogonal */
4064 priv_modes &= ~PrivMode_MouseX11; 3777 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
4065 break; 3778 break;
4066#ifdef menuBar_esc
4067 case menuBar_esc:
4068#ifdef MENUBAR
4069 map_menuBar (state);
4070#endif
4071 break;
4072#endif
4073#ifdef scrollBar_esc 3779#ifdef scrollBar_esc
4074 case scrollBar_esc: 3780 case scrollBar_esc:
4075 if (scrollbar_mapping (state)) 3781 scrollBar.map (state);
4076 {
4077 resize_all_windows (0, 0, 0); 3782 resize_all_windows (0, 0, 0);
4078 scr_touch (true); 3783 scr_touch (true);
4079 }
4080 break; 3784 break;
4081#endif 3785#endif
4082 case 25: /* visible/invisible cursor */ 3786 case 25: /* visible/invisible cursor */
4083 scr_cursor_visible (state); 3787 scr_cursor_visible (state);
4084 break; 3788 break;
… …
4089 break; 3793 break;
4090 /* case 66: - application key pad */ 3794 /* case 66: - application key pad */
4091 /* case 67: - backspace key */ 3795 /* case 67: - backspace key */
4092 case 1000: /* X11 mouse reporting */ 3796 case 1000: /* X11 mouse reporting */
4093 if (state) /* orthogonal */ 3797 if (state) /* orthogonal */
4094 priv_modes &= ~PrivMode_MouseX10; 3798 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
4095 break; 3799 break;
4096#if 0
4097 case 1001: 3800 case 1002:
4098 break; /* X11 mouse highlighting */ 3801 case 1003:
4099#endif 3802 if (state)
3803 {
3804 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3805 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3806 mouse_row = mouse_col = 0;
3807 vt_emask_mouse = PointerMotionMask;
3808 }
3809 else
3810 vt_emask_mouse = NoEventMask;
3811
3812 vt_select_input ();
3813 break;
4100 case 1010: /* scroll to bottom on TTY output inhibit */ 3814 case 1010: /* scroll to bottom on TTY output inhibit */
4101 if (state)
4102 options &= ~Opt_scrollTtyOutput;
4103 else
4104 options |= Opt_scrollTtyOutput; 3815 set_option (Opt_scrollTtyOutput, !state);
4105 break; 3816 break;
4106 case 1011: /* scroll to bottom on key press */ 3817 case 1011: /* scroll to bottom on key press */
4107 if (state)
4108 options |= Opt_scrollTtyKeypress; 3818 set_option (Opt_scrollTtyKeypress, state);
4109 else
4110 options &= ~Opt_scrollTtyKeypress;
4111 break; 3819 break;
4112 case 1047: /* secondary screen w/ clearing last */ 3820 case 1047: /* secondary screen w/ clearing last */
4113 if (options & Opt_secondaryScreen) 3821 if (option (Opt_secondaryScreen))
4114 if (current_screen != PRIMARY) 3822 if (!state)
4115 scr_erase_screen (2); 3823 scr_erase_screen (2);
3824
4116 scr_change_screen (state); 3825 scr_change_screen (state);
4117 break; 3826 break;
4118 case 1049: /* secondary screen w/ clearing first */ 3827 case 1049: /* secondary screen w/ clearing first */
3828 if (option (Opt_secondaryScreen))
3829 if (state)
3830 scr_cursor (SAVE);
3831
4119 scr_change_screen (state); 3832 scr_change_screen (state);
3833
4120 if (options & Opt_secondaryScreen) 3834 if (option (Opt_secondaryScreen))
4121 if (current_screen != PRIMARY) 3835 if (state)
4122 scr_erase_screen (2); 3836 scr_erase_screen (2);
3837 else
3838 scr_cursor (RESTORE);
4123 break; 3839 break;
4124 default: 3840 default:
4125 break; 3841 break;
4126 } 3842 }
4127 } 3843 }
4128} 3844}
4129/*}}} */ 3845/*}}} */
4130 3846
4131/*{{{ process sgr sequences */ 3847/*{{{ process sgr sequences */
4132void 3848void ecb_hot
4133rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg) 3849rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg)
4134{ 3850{
4135 unsigned int i; 3851 unsigned int i;
4136 short rendset; 3852 short rendset;
4137 int rendstyle; 3853 int rendstyle;
… …
4253 scr_color (Color_bg, Color_bg); 3969 scr_color (Color_bg, Color_bg);
4254 break; 3970 break;
4255 3971
4256 //case 50: // not variable spacing 3972 //case 50: // not variable spacing
4257 3973
4258#ifndef NO_BRIGHTCOLOR 3974#if !ENABLE_MINIMAL
4259 case 90: 3975 case 90:
4260 case 91: /* set bright fg color */ 3976 case 91: /* set bright fg color */
4261 case 92: 3977 case 92:
4262 case 93: 3978 case 93:
4263 case 94: 3979 case 94:
… …
4275 case 106: 3991 case 106:
4276 case 107: 3992 case 107:
4277 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg); 3993 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);
4278 break; 3994 break;
4279#endif 3995#endif
4280
4281 } 3996 }
4282 } 3997 }
4283}
4284/*}}} */
4285
4286/*{{{ (do not) process Rob Nation's own graphics mode sequences */
4287void
4288rxvt_term::process_graphics ()
4289{
4290 unicode_t ch, cmd = cmd_getc ();
4291
4292 if (cmd == 'Q')
4293 { /* query graphics */
4294 tt_printf ("\033G0\012"); /* no graphics */
4295 return;
4296 }
4297 /* swallow other graphics sequences until terminating ':' */
4298 do
4299 ch = cmd_getc ();
4300 while (ch != ':');
4301} 3998}
4302/*}}} */ 3999/*}}} */
4303 4000
4304/* ------------------------------------------------------------------------- */ 4001/* ------------------------------------------------------------------------- */
4305 4002
… …
4309 */ 4006 */
4310void 4007void
4311rxvt_term::tt_printf (const char *fmt,...) 4008rxvt_term::tt_printf (const char *fmt,...)
4312{ 4009{
4313 va_list arg_ptr; 4010 va_list arg_ptr;
4314 unsigned char buf[256]; 4011 char buf[256];
4315 4012
4316 va_start (arg_ptr, fmt); 4013 va_start (arg_ptr, fmt);
4317 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4014 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
4318 va_end (arg_ptr); 4015 va_end (arg_ptr);
4319 tt_write (buf, strlen (buf)); 4016 tt_write (buf, strlen (buf));
… …
4321 4018
4322/* ---------------------------------------------------------------------- */ 4019/* ---------------------------------------------------------------------- */
4323/* Write data to the pty as typed by the user, pasted with the mouse, 4020/* Write data to the pty as typed by the user, pasted with the mouse,
4324 * or generated by us in response to a query ESC sequence. 4021 * or generated by us in response to a query ESC sequence.
4325 */ 4022 */
4326const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 4023static const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4327 4024
4328void 4025void
4329rxvt_term::tt_write (const unsigned char *data, unsigned int len) 4026rxvt_term::tt_write (const char *data, unsigned int len)
4330{ 4027{
4028 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4029 return;
4030
4031 if (pty->pty < 0)
4032 return;
4033
4331 if (v_buflen == 0) 4034 if (v_buflen == 0)
4332 { 4035 {
4333 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE)); 4036 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
4334 4037
4038 max_it (written, 0);
4039
4335 if ((unsigned int)written == len) 4040 if (written == len)
4336 return; 4041 return;
4337 4042
4338 data += written; 4043 data += written;
4339 len -= written; 4044 len -= written;
4340 } 4045 }
4341 4046
4342 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len); 4047 v_buffer = (char *)rxvt_realloc (v_buffer, v_buflen + len);
4343 4048
4344 memcpy (v_buffer + v_buflen, data, len); 4049 memcpy (v_buffer + v_buflen, data, len);
4345 v_buflen += len; 4050 v_buflen += len;
4346 4051
4347 pty_ev.set (EVENT_READ | EVENT_WRITE); 4052 pty_ev.set (ev::READ | ev::WRITE);
4348} 4053}
4349 4054
4350void rxvt_term::pty_write () 4055void rxvt_term::pty_write ()
4351{ 4056{
4352 int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE)); 4057 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4353 4058
4354 if (written > 0) 4059 if (written > 0)
4355 { 4060 {
4356 v_buflen -= written; 4061 v_buflen -= written;
4357 4062
4358 if (v_buflen == 0) 4063 if (v_buflen == 0)
4359 { 4064 {
4360 free (v_buffer); 4065 free (v_buffer);
4361 v_buffer = 0; 4066 v_buffer = 0;
4362 v_buflen = 0;
4363 4067
4364 pty_ev.set (EVENT_READ); 4068 pty_ev.set (ev::READ);
4365 return; 4069 return;
4366 } 4070 }
4367 4071
4368 memmove (v_buffer, v_buffer + written, v_buflen); 4072 memmove (v_buffer, v_buffer + written, v_buflen);
4369 } 4073 }
4370 else if (written != -1 || (errno != EAGAIN && errno != EINTR)) 4074 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4371 // original code just ignores this... 4075 pty_ev.set (ev::READ);
4372 destroy ();
4373} 4076}
4374 4077
4375/*----------------------- end-of-file (C source) -----------------------*/ 4078/*----------------------- end-of-file (C source) -----------------------*/
4376 4079

Diff Legend

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