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

Diff Legend

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