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.472 by sf-exg, Sun Jan 23 12:28:47 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 (bgPixmap.flags & bgPixmap_t::hasChanged)
796 { 981 {
797 want_full_refresh = 0; 982 bgPixmap.flags &= ~bgPixmap_t::hasChanged;
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 (bgPixmap.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 (bgPixmap.set_position (x, y)
1469 || !(bgPixmap.flags & bgPixmap_t::isValid))
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 bgPixmap.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:
1497 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
1376 if (ev.xproperty.atom == xa[XA_VT_SELECTION] 1498 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1377 && ev.xproperty.state == PropertyNewValue) 1499 && ev.xproperty.state == PropertyNewValue)
1378 selection_property (ev.xproperty.window, ev.xproperty.atom); 1500 selection_property (ev.xproperty.window, ev.xproperty.atom);
1379 1501
1380 break; 1502 break;
1381 1503
1382 case SelectionClear: 1504 case SelectionClear:
1383 selection_clear (); 1505 selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]);
1384 break; 1506 break;
1385 1507
1386 case SelectionNotify: 1508 case SelectionNotify:
1387 if (selection_wait == Sel_normal) 1509 if (selection_wait == Sel_normal)
1388 selection_paste (ev.xselection.requestor, 1510 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1389 ev.xselection.property, True);
1390 break; 1511 break;
1391 1512
1392 case SelectionRequest: 1513 case SelectionRequest:
1393 selection_send (ev.xselectionrequest); 1514 selection_send (ev.xselectionrequest);
1394 break; 1515 break;
1395 1516
1517 case MapNotify:
1518#ifdef HAVE_BG_PIXMAP
1519 /* This is needed specifically to fix the case of no window manager or a
1520 * non-reparenting window manager. In those cases we never get first
1521 * ConfigureNotify. Also that speeds startup under normal WM, by taking
1522 * care of multiplicity of ConfigureNotify events arriving while WM does
1523 * reparenting.
1524 * We should not render background immediately, as there could be several
1525 * ConfigureNotify's to follow. Lets take care of all of them in one scoop
1526 * by scheduling background redraw as soon as we can, but giving a short
1527 * bit of time for ConfigureNotifies to arrive.
1528 * We should render background PRIOR to drawing any text, but AFTER all
1529 * of ConfigureNotifys for the best results.
1530 */
1531 if (!(bgPixmap.flags & bgPixmap_t::isValid))
1532 update_background_ev.start (0.025);
1533#endif
1534 mapped = 1;
1535#ifdef TEXT_BLINK
1536 text_blink_ev.start ();
1537#endif
1538 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1539 break;
1540
1396 case UnmapNotify: 1541 case UnmapNotify:
1397 TermWin.mapped = 0; 1542 mapped = 0;
1398#ifdef TEXT_BLINK 1543#ifdef TEXT_BLINK
1399 text_blink_ev.stop (); 1544 text_blink_ev.stop ();
1400#endif 1545#endif
1546 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1401 break; 1547 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 1548
1416 case GraphicsExpose: 1549 case GraphicsExpose:
1417 case Expose: 1550 case Expose:
1418 if (ev.xany.window == TermWin.vt) 1551 if (ev.xany.window == vt)
1419 { 1552 {
1420 do 1553 do
1554 {
1421 scr_expose (ev.xexpose.x, ev.xexpose.y, 1555 scr_expose (ev.xexpose.x, ev.xexpose.y,
1422 ev.xexpose.width, ev.xexpose.height, False); 1556 ev.xexpose.width, ev.xexpose.height, False);
1557 }
1423 while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev)); 1558 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1424 1559
1425 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1560 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1426 1561
1427 while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev)) 1562 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1563 {
1428 scr_expose (ev.xexpose.x, ev.xexpose.y, 1564 scr_expose (ev.xexpose.x, ev.xexpose.y,
1429 ev.xexpose.width, ev.xexpose.height, False); 1565 ev.xexpose.width, ev.xexpose.height, False);
1566 }
1430 1567
1431 scr_refresh (refresh_type); 1568 want_refresh = 1;
1432 } 1569 }
1433 else 1570 else
1434 { 1571 {
1435 XEvent unused_event; 1572 XEvent unused_event;
1436 1573
1437 while (XCheckTypedWindowEvent (display->display, ev.xany.window, Expose, &unused_event)) 1574 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1438 ; 1575 ;
1439 while (XCheckTypedWindowEvent (display->display, ev.xany.window, GraphicsExpose, &unused_event)) 1576 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1440 ; 1577 ;
1441 1578
1442 if (isScrollbarWindow (ev.xany.window)) 1579 if (scrollBar.state && ev.xany.window == scrollBar.win)
1443 { 1580 {
1444 scrollBar.setIdle (); 1581 scrollBar.state = STATE_IDLE;
1445 scrollbar_show (0); 1582 scrollBar.show (0);
1446 } 1583 }
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 } 1584 }
1457 break; 1585 break;
1458 1586
1459 case MotionNotify: 1587 case MotionNotify:
1460#ifdef POINTER_BLANK 1588#ifdef POINTER_BLANK
1461 if (hidden_pointer) 1589 if (hidden_pointer)
1462 pointer_unblank (); 1590 pointer_unblank ();
1463#endif 1591#endif
1464#if MENUBAR 1592 if ((priv_modes & PrivMode_MouseBtnEvent && ev.xbutton.state & (Button1Mask|Button2Mask|Button3Mask))
1465 if (isMenuBarWindow (ev.xany.window)) 1593 || priv_modes & PrivMode_MouseAnyEvent)
1594 mouse_report (ev.xbutton);
1595 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1596 break;
1597
1598 if (ev.xany.window == vt)
1466 { 1599 {
1467 menubar_control (ev.xbutton); 1600 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1468 break; 1601 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1469 } 1602 ; // 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))) 1603 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1477 { 1604 {
1478 while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev)) 1605 while (XCheckTypedWindowEvent (dpy, vt, MotionNotify, &ev))
1479 ; 1606 ;
1480 1607
1481 XQueryPointer (display->display, TermWin.vt, 1608 XQueryPointer (dpy, vt,
1482 &unused_root, &unused_child, 1609 &unused_root, &unused_child,
1483 &unused_root_x, &unused_root_y, 1610 &unused_root_x, &unused_root_y,
1484 & (ev.xbutton.x), & (ev.xbutton.y), 1611 &ev.xbutton.x, &ev.xbutton.y,
1485 &unused_mask); 1612 &ev.xbutton.state);
1486#ifdef MOUSE_THRESHOLD 1613#ifdef MOUSE_THRESHOLD
1487 /* deal with a `jumpy' mouse */ 1614 /* deal with a `jumpy' mouse */
1488 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD) 1615 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD)
1489 { 1616 {
1490#endif 1617#endif
1618#if ISO_14755
1619 // 5.4
1620 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1621 {
1622 iso14755_54 (ev.xbutton.x, ev.xbutton.y);
1623 break;
1624 }
1625#endif
1491 selection_extend ((ev.xbutton.x), (ev.xbutton.y), 1626 selection_extend (ev.xbutton.x, ev.xbutton.y,
1492 (ev.xbutton.state & Button3Mask) ? 2 : 0); 1627 ev.xbutton.state & Button3Mask ? 2 : 0);
1628
1493#ifdef SELECTION_SCROLLING 1629#ifdef SELECTION_SCROLLING
1494 if (ev.xbutton.y < TermWin.int_bwidth 1630 if (ev.xbutton.y < int_bwidth
1495 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1)) 1631 || Pixel2Row (ev.xbutton.y) > (nrow-1))
1496 { 1632 {
1497 int dist; 1633 int dist;
1498 1634
1499 /* don't clobber the current delay if we are 1635 /* don't clobber the current delay if we are
1500 * already in the middle of scrolling. 1636 * already in the middle of scrolling.
1501 */ 1637 */
1502 if (!sel_scroll_ev.active) 1638 if (!sel_scroll_ev.is_active ())
1503 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1639 sel_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1504 1640
1505 /* save the event params so we can highlight 1641 /* save the event params so we can highlight
1506 * the selection in the pending-scroll loop 1642 * the selection in the pending-scroll loop
1507 */ 1643 */
1508 selection_save_x=ev.xbutton.x; 1644 selection_save_x = ev.xbutton.x;
1509 selection_save_y=ev.xbutton.y; 1645 selection_save_y = ev.xbutton.y;
1510 selection_save_state=
1511 (ev.xbutton.state & Button3Mask) ? 2 : 0; 1646 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;
1512 1647
1513 /* calc number of lines to scroll */ 1648 /* calc number of lines to scroll */
1514 if (ev.xbutton.y<TermWin.int_bwidth) 1649 if (ev.xbutton.y < int_bwidth)
1515 { 1650 {
1516 scroll_selection_dir = UP; 1651 scroll_selection_dir = UP;
1517 dist = TermWin.int_bwidth - ev.xbutton.y; 1652 dist = int_bwidth - ev.xbutton.y;
1518 } 1653 }
1519 else 1654 else
1520 { 1655 {
1521 scroll_selection_dir = DN; 1656 scroll_selection_dir = DN;
1522 dist = ev.xbutton.y - 1657 dist = ev.xbutton.y - (int_bwidth + height);
1523 (TermWin.int_bwidth + TermWin.height);
1524 } 1658 }
1659
1525 scroll_selection_lines= (Pixel2Height (dist)/ 1660 scroll_selection_lines = Pixel2Height (dist)
1526 SELECTION_SCROLL_LINE_SPEEDUP)+1; 1661 / SELECTION_SCROLL_LINE_SPEEDUP
1662 + 1;
1527 MIN_IT (scroll_selection_lines, 1663 min_it (scroll_selection_lines,
1528 SELECTION_SCROLL_MAX_LINES); 1664 SELECTION_SCROLL_MAX_LINES);
1529 } 1665 }
1530 else 1666 else
1531 { 1667 {
1532 /* we are within the text window, so we 1668 /* we are within the text window, so we
1533 * shouldn't be scrolling 1669 * shouldn't be scrolling
1534 */ 1670 */
1535 if (sel_scroll_ev.active)
1536 sel_scroll_ev.stop(); 1671 sel_scroll_ev.stop();
1537 } 1672 }
1538#endif 1673#endif
1539#ifdef MOUSE_THRESHOLD 1674#ifdef MOUSE_THRESHOLD
1540
1541 } 1675 }
1542#endif 1676#endif
1543
1544 } 1677 }
1545 } 1678 }
1546 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1679 else if (scrollBar.state == STATE_MOTION && ev.xany.window == scrollBar.win)
1547 { 1680 {
1548 while (XCheckTypedWindowEvent (display->display, scrollBar.win, 1681 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1549 MotionNotify, &ev)) ; 1682 MotionNotify, &ev))
1683 ;
1684
1550 XQueryPointer (display->display, scrollBar.win, 1685 XQueryPointer (dpy, scrollBar.win,
1551 &unused_root, &unused_child, 1686 &unused_root, &unused_child,
1552 &unused_root_x, &unused_root_y, 1687 &unused_root_x, &unused_root_y,
1553 & (ev.xbutton.x), & (ev.xbutton.y), 1688 &ev.xbutton.x, &ev.xbutton.y,
1554 &unused_mask); 1689 &unused_mask);
1555 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1690 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1556 scrollbar_size ()); 1691 scrollBar.size ());
1557 scr_refresh (refresh_type);
1558 refresh_limit = 0; 1692 want_refresh = 1;
1559 scrollbar_show (1); 1693 scrollBar.show (1);
1560 } 1694 }
1561 break; 1695 break;
1562 } 1696 }
1563}
1564 1697
1565#if TRANSPARENT 1698#if defined(CURSOR_BLINK)
1699 if (option (Opt_cursorBlink) && ev.type == KeyPress)
1700 {
1701 if (hidden_cursor)
1702 {
1703 hidden_cursor = 0;
1704 want_refresh = 1;
1705 }
1706
1707 cursor_blink_ev.again ();
1708 }
1709#endif
1710
1711#if defined(POINTER_BLANK)
1712 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1713 {
1714 if (ev.type == MotionNotify
1715 || ev.type == ButtonPress
1716 || ev.type == ButtonRelease)
1717 if (hidden_pointer)
1718 pointer_unblank ();
1719
1720 if (ev.type == KeyPress && hidden_pointer == 0)
1721 pointer_blank ();
1722 }
1723#endif
1724
1725 refresh_check ();
1726}
1727
1728#if ENABLE_FRILLS
1729void
1730rxvt_term::set_urgency (bool enable)
1731{
1732 if (enable == urgency_hint)
1733 return;
1734
1735 if (XWMHints *h = XGetWMHints (dpy, parent[0]))
1736 {
1737 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0);
1738 XSetWMHints (dpy, parent[0], h);
1739 urgency_hint = enable;
1740 }
1741}
1742#endif
1743
1744void
1745rxvt_term::focus_in ()
1746{
1747 if (!focus)
1748 {
1749 focus = 1;
1750 want_refresh = 1;
1751
1752#if USE_XIM
1753 if (Input_Context != NULL)
1754 {
1755 IMSetPosition ();
1756 XSetICFocus (Input_Context);
1757 }
1758#endif
1759#if CURSOR_BLINK
1760 if (option (Opt_cursorBlink))
1761 cursor_blink_ev.again ();
1762#endif
1763#if OFF_FOCUS_FADING
1764 if (rs[Rs_fade])
1765 {
1766 pix_colors = pix_colors_focused;
1767 scr_recolour ();
1768 }
1769#endif
1770#if ENABLE_FRILLS
1771 if (option (Opt_urgentOnBell))
1772 set_urgency (0);
1773#endif
1774
1775 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1776 }
1777}
1778
1779void
1780rxvt_term::focus_out ()
1781{
1782 if (focus)
1783 {
1784 focus = 0;
1785 want_refresh = 1;
1786
1787#if ENABLE_FRILLS
1788 if (option (Opt_urgentOnBell))
1789 set_urgency (0);
1790#endif
1791#if ENABLE_FRILLS || ISO_14755
1792 if (iso14755buf)
1793 {
1794 iso14755buf = 0;
1795# if ISO_14755
1796 scr_overlay_off ();
1797# endif
1798 }
1799#endif
1800#if USE_XIM
1801 if (Input_Context != NULL)
1802 XUnsetICFocus (Input_Context);
1803#endif
1804#if CURSOR_BLINK
1805 if (option (Opt_cursorBlink))
1806 cursor_blink_ev.stop ();
1807
1808 hidden_cursor = 0;
1809#endif
1810#if OFF_FOCUS_FADING
1811 if (rs[Rs_fade])
1812 {
1813 pix_colors = pix_colors_unfocused;
1814 scr_recolour ();
1815 }
1816#endif
1817
1818 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1819 }
1820}
1821
1822void
1823rxvt_term::update_fade_color (unsigned int idx)
1824{
1825#if OFF_FOCUS_FADING
1826 if (rs[Rs_fade])
1827 {
1828 rgba c;
1829 pix_colors [Color_fade].get (c);
1830 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1831 }
1832#endif
1833}
1834
1835#if ENABLE_TRANSPARENCY || ENABLE_PERL
1566void 1836void
1567rxvt_term::rootwin_cb (XEvent &ev) 1837rxvt_term::rootwin_cb (XEvent &ev)
1568{ 1838{
1569 SET_R (this); 1839 make_current ();
1570 SET_LOCALE (locale);
1571 1840
1841 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1842 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1843 return;
1844
1845# if ENABLE_TRANSPARENCY
1572 switch (ev.type) 1846 switch (ev.type)
1573 { 1847 {
1574 case PropertyNotify: 1848 case PropertyNotify:
1575 /* 1849 /*
1576 * if user used some Esetroot compatible prog to set the root bg, 1850 * 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. 1851 * use the property to determine the pixmap. We use it later on.
1578 */ 1852 */
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]) 1853 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1583 return; 1854 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1855 {
1856 bgPixmap.set_root_pixmap ();
1857 update_background ();
1858 }
1584 1859
1585 /* FALLTHROUGH */
1586 case ReparentNotify:
1587 if ((Options & Opt_transparent) && check_our_parents () && am_transparent)
1588 want_refresh = want_full_refresh = 1;
1589 break; 1860 break;
1590 } 1861 }
1862# endif
1863
1864 refresh_check ();
1591} 1865}
1592#endif 1866#endif
1593 1867
1594void 1868void
1595rxvt_term::button_press (XButtonEvent &ev) 1869rxvt_term::button_press (XButtonEvent &ev)
1596{ 1870{
1597 int reportmode = 0, clickintime; 1871 int reportmode = 0, clickintime;
1598 1872
1599 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1873 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1874
1600 if (!bypass_keystate) 1875 if (!bypass_keystate)
1601 reportmode = !! (PrivateModes & PrivMode_mouse_report); 1876 reportmode = !! (priv_modes & PrivMode_mouse_report);
1877
1602 /* 1878 /*
1603 * VT window processing of button press 1879 * VT window processing of button press
1604 */ 1880 */
1605 if (ev.window == TermWin.vt) 1881 if (ev.window == vt)
1606 { 1882 {
1883 if (HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1884 return;
1885
1886#if ISO_14755
1887 // 5.4
1888 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1889 {
1890 iso14755_54 (ev.x, ev.y);
1891 return;
1892 }
1893#endif
1894
1607 clickintime = ev.time - MEvent.time < MULTICLICK_TIME; 1895 clickintime = ev.time - MEvent.time < MULTICLICK_TIME;
1896
1608 if (reportmode) 1897 if (reportmode)
1609 { 1898 {
1610 /* mouse report from vt window */ 1899 /* mouse report from vt window */
1611 /* save the xbutton state (for ButtonRelease) */ 1900 /* save the xbutton state (for ButtonRelease) */
1612 MEvent.state = ev.state; 1901 MEvent.state = ev.state;
1613#ifdef MOUSE_REPORT_DOUBLECLICK 1902#ifdef MOUSE_REPORT_DOUBLECLICK
1614 if (ev.button == MEvent.button && clickintime) 1903 if (ev.button == MEvent.button && clickintime)
1615 { 1904 {
1616 /* same button, within alloted time */ 1905 /* same button, within allowed time */
1617 MEvent.clicks++; 1906 MEvent.clicks++;
1907
1618 if (MEvent.clicks > 1) 1908 if (MEvent.clicks > 1)
1619 { 1909 {
1620 /* only report double clicks */ 1910 /* only report double clicks */
1621 MEvent.clicks = 2; 1911 MEvent.clicks = 2;
1622 mouse_report (ev); 1912 mouse_report (ev);
… …
1634 mouse_report (ev); 1924 mouse_report (ev);
1635 } 1925 }
1636#else 1926#else
1637 MEvent.button = ev.button; 1927 MEvent.button = ev.button;
1638 mouse_report (ev); 1928 mouse_report (ev);
1639#endif /* MOUSE_REPORT_DOUBLECLICK */ 1929#endif /* MOUSE_REPORT_DOUBLECLICK */
1640 1930
1641 } 1931 }
1642 else 1932 else
1643 { 1933 {
1644 if (ev.button != MEvent.button) 1934 if (ev.button != MEvent.button)
1645 MEvent.clicks = 0; 1935 MEvent.clicks = 0;
1936
1646 switch (ev.button) 1937 switch (ev.button)
1647 { 1938 {
1648 case Button1: 1939 case Button1:
1940 /* allow meta + click to select rectangular areas */
1941 /* should be done in screen.C */
1942#if ENABLE_FRILLS
1943 selection.rect = !!(ev.state & ModMetaMask);
1944#else
1945 selection.rect = false;
1946#endif
1947
1649 /* allow shift+left click to extend selection */ 1948 /* allow shift+left click to extend selection */
1650 if (ev.state & ShiftMask && ! (PrivateModes & PrivMode_mouse_report)) 1949 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1651 { 1950 {
1652 if (MEvent.button == Button1 && clickintime) 1951 if (MEvent.button == Button1 && clickintime)
1653 selection_rotate (ev.x, ev.y); 1952 selection_rotate (ev.x, ev.y);
1654 else 1953 else
1655 selection_extend (ev.x, ev.y, 1); 1954 selection_extend (ev.x, ev.y, 1);
… …
1670 case Button3: 1969 case Button3:
1671 if (MEvent.button == Button3 && clickintime) 1970 if (MEvent.button == Button3 && clickintime)
1672 selection_rotate (ev.x, ev.y); 1971 selection_rotate (ev.x, ev.y);
1673 else 1972 else
1674 selection_extend (ev.x, ev.y, 1); 1973 selection_extend (ev.x, ev.y, 1);
1974
1675 MEvent.button = Button3; 1975 MEvent.button = Button3;
1676 break; 1976 break;
1677 } 1977 }
1678 } 1978 }
1979
1679 MEvent.time = ev.time; 1980 MEvent.time = ev.time;
1680 return; 1981 return;
1681 } 1982 }
1682 1983
1683 /* 1984 /*
1684 * Scrollbar window processing of button press 1985 * Scrollbar window processing of button press
1685 */ 1986 */
1686 if (isScrollbarWindow (ev.window)) 1987 if (scrollBar.state && ev.window == scrollBar.win)
1687 { 1988 {
1688 scrollBar.setIdle (); 1989 page_dirn direction = NO_DIR;
1990
1991 if (scrollBar.upButton (ev.y))
1992 direction = UP; /* up */
1993 else if (scrollBar.dnButton (ev.y))
1994 direction = DN; /* down */
1995
1996 scrollBar.state = STATE_IDLE;
1689 /* 1997 /*
1690 * Rxvt-style scrollbar: 1998 * Rxvt-style scrollbar:
1691 * move up if mouse is above slider 1999 * move up if mouse is above slider
1692 * move dn if mouse is below slider 2000 * move dn if mouse is below slider
1693 * 2001 *
… …
1702 /* 2010 /*
1703 * Mouse report disabled scrollbar: 2011 * Mouse report disabled scrollbar:
1704 * arrow buttons - send up/down 2012 * arrow buttons - send up/down
1705 * click on scrollbar - send pageup/down 2013 * click on scrollbar - send pageup/down
1706 */ 2014 */
1707 if ((scrollBar.style == R_SB_NEXT 2015 if (direction == UP)
1708 && scrollbarnext_upButton (ev.y))
1709 || (scrollBar.style == R_SB_RXVT
1710 && scrollbarrxvt_upButton (ev.y)))
1711 tt_printf ("\033[A"); 2016 tt_printf ("\033[A");
1712 else if ((scrollBar.style == R_SB_NEXT 2017 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"); 2018 tt_printf ("\033[B");
1717 else 2019 else
1718 switch (ev.button) 2020 switch (ev.button)
1719 { 2021 {
1720 case Button2: 2022 case Button2:
… …
1727 tt_printf ("\033[5~"); 2029 tt_printf ("\033[5~");
1728 break; 2030 break;
1729 } 2031 }
1730 } 2032 }
1731 else 2033 else
1732#endif /* NO_SCROLLBAR_REPORT */ 2034#endif /* NO_SCROLLBAR_REPORT */
1733
1734 {
1735 char upordown = 0;
1736
1737 if (scrollBar.style == R_SB_NEXT)
1738 { 2035 {
1739 if (scrollbarnext_upButton (ev.y)) 2036 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 { 2037 {
1753#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 2038#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2039 if (!cont_scroll_ev.is_active ())
1754 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 2040 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1755#endif 2041#endif
1756 if (scr_page (upordown < 0 ? UP : DN, 1)) 2042 if (scr_page (direction, 1))
1757 { 2043 {
1758 if (upordown < 0) 2044 if (direction == UP)
1759 scrollBar.setUp (); 2045 scrollBar.state = STATE_UP;
1760 else 2046 else
1761 scrollBar.setDn (); 2047 scrollBar.state = STATE_DOWN;
1762 } 2048 }
1763 } 2049 }
1764 else 2050 else
1765 switch (ev.button) 2051 switch (ev.button)
1766 { 2052 {
1767 case Button2: 2053 case Button2:
1768 switch (scrollbar_align) 2054 switch (scrollBar.align)
1769 { 2055 {
1770 case R_SB_ALIGN_TOP: 2056 case R_SB_ALIGN_TOP:
1771 csrO = 0; 2057 csrO = 0;
1772 break; 2058 break;
1773 case R_SB_ALIGN_CENTRE: 2059 case R_SB_ALIGN_CENTRE:
… …
1779 } 2065 }
1780 2066
1781 if (scrollBar.style == R_SB_XTERM 2067 if (scrollBar.style == R_SB_XTERM
1782 || scrollbar_above_slider (ev.y) 2068 || scrollbar_above_slider (ev.y)
1783 || scrollbar_below_slider (ev.y)) 2069 || scrollbar_below_slider (ev.y))
1784 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ()); 2070 scr_move_to (scrollbar_position (ev.y) - csrO, scrollBar.size ());
1785 2071
1786 scrollBar.setMotion (); 2072 scrollBar.state = STATE_MOTION;
1787 break; 2073 break;
1788 2074
1789 case Button1: 2075 case Button1:
1790 if (scrollbar_align == R_SB_ALIGN_CENTRE) 2076 if (scrollBar.align == R_SB_ALIGN_CENTRE)
1791 csrO = ev.y - scrollBar.top; 2077 csrO = ev.y - scrollBar.top;
1792 /* FALLTHROUGH */ 2078 /* FALLTHROUGH */
1793 2079
1794 case Button3: 2080 case Button3:
1795 if (scrollBar.style != R_SB_XTERM) 2081 if (scrollBar.style != R_SB_XTERM)
1796 { 2082 {
1797 if (scrollbar_above_slider (ev.y)) 2083 if (scrollbar_above_slider (ev.y))
1798# ifdef RXVT_SCROLL_FULL 2084# ifdef RXVT_SCROLL_FULL
1799 scr_page (UP, TermWin.nrow - 1); 2085 scr_page (UP, nrow - 1);
1800# else 2086# else
1801 scr_page (UP, TermWin.nrow / 4); 2087 scr_page (UP, nrow / 4);
1802# endif 2088# endif
1803 else if (scrollbar_below_slider (ev.y)) 2089 else if (scrollbar_below_slider (ev.y))
1804# ifdef RXVT_SCROLL_FULL 2090# ifdef RXVT_SCROLL_FULL
1805 scr_page (DN, TermWin.nrow - 1); 2091 scr_page (DN, nrow - 1);
1806# else 2092# else
1807 scr_page (DN, TermWin.nrow / 4); 2093 scr_page (DN, nrow / 4);
1808# endif 2094# endif
1809 else 2095 else
1810 scrollBar.setMotion (); 2096 scrollBar.state = STATE_MOTION;
1811 } 2097 }
1812 else 2098 else
1813 { 2099 {
1814 scr_page ((ev.button == Button1 ? DN : UP), 2100 scr_page ((ev.button == Button1 ? DN : UP),
1815 (TermWin.nrow 2101 (nrow
1816 * scrollbar_position (ev.y) 2102 * scrollbar_position (ev.y)
1817 / scrollbar_size ())); 2103 / scrollBar.size ()));
1818 } 2104 }
1819 2105
1820 break; 2106 break;
1821 } 2107 }
1822 } 2108 }
2109
1823 return; 2110 return;
1824 } 2111 }
1825#if MENUBAR
1826 /*
1827 * Menubar window processing of button press
1828 */
1829 if (isMenuBarWindow (ev.window))
1830 menubar_control (ev);
1831#endif
1832} 2112}
1833 2113
1834void 2114void
1835rxvt_term::button_release (XButtonEvent &ev) 2115rxvt_term::button_release (XButtonEvent &ev)
1836{ 2116{
1837 int reportmode = 0; 2117 int reportmode = 0;
1838 2118
1839 csrO = 0; /* reset csr Offset */ 2119 csrO = 0; /* reset csr Offset */
1840 if (!bypass_keystate) 2120 if (!bypass_keystate)
1841 reportmode = !! (PrivateModes & PrivMode_mouse_report); 2121 reportmode = !! (priv_modes & PrivMode_mouse_report);
1842 2122
1843 if (scrollbar_isUpDn ()) 2123 if (scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
1844 { 2124 {
1845 scrollBar.setIdle (); 2125 scrollBar.state = STATE_IDLE;
1846 scrollbar_show (0); 2126 scrollBar.show (0);
1847#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1848 refresh_type &= ~SMOOTH_REFRESH;
1849#endif
1850
1851 } 2127 }
2128
1852#ifdef SELECTION_SCROLLING 2129#ifdef SELECTION_SCROLLING
1853 if (sel_scroll_ev.active)
1854 sel_scroll_ev.stop(); 2130 sel_scroll_ev.stop();
1855#endif 2131#endif
2132
1856 if (ev.window == TermWin.vt) 2133 if (ev.window == vt)
1857 { 2134 {
2135 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2136 return;
2137
2138#if ISO_14755
2139 // 5.4
2140 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2141 return;
2142#endif
2143
1858 if (reportmode) 2144 if (reportmode)
1859 { 2145 {
1860 /* mouse report from vt window */ 2146 /* mouse report from vt window */
1861 /* don't report release of wheel "buttons" */ 2147 /* don't report release of wheel "buttons" */
1862 if (ev.button >= 4) 2148 if (ev.button >= 4)
… …
1873 mouse_report (ev); 2159 mouse_report (ev);
1874 } 2160 }
1875#else /* MOUSE_REPORT_DOUBLECLICK */ 2161#else /* MOUSE_REPORT_DOUBLECLICK */
1876 MEvent.button = AnyButton; 2162 MEvent.button = AnyButton;
1877 mouse_report (ev); 2163 mouse_report (ev);
1878#endif /* MOUSE_REPORT_DOUBLECLICK */ 2164#endif /* MOUSE_REPORT_DOUBLECLICK */
1879 return; 2165 return;
1880 } 2166 }
2167
1881 /* 2168 /*
1882 * dumb hack to compensate for the failure of click-and-drag 2169 * dumb hack to compensate for the failure of click-and-drag
1883 * when overriding mouse reporting 2170 * when overriding mouse reporting
1884 */ 2171 */
1885 if (PrivateModes & PrivMode_mouse_report 2172 if (priv_modes & PrivMode_mouse_report
1886 && bypass_keystate 2173 && bypass_keystate
1887 && ev.button == Button1 && MEvent.clicks <= 1) 2174 && ev.button == Button1 && MEvent.clicks <= 1)
1888 selection_extend (ev.x, ev.y, 0); 2175 selection_extend (ev.x, ev.y, 0);
1889 2176
1890 switch (ev.button) 2177 switch (ev.button)
1891 { 2178 {
1892 case Button1: 2179 case Button1:
1893 case Button3: 2180 case Button3:
1894 selection_make (ev.time); 2181 selection_make (ev.time);
1895 break; 2182 break;
2183
1896 case Button2: 2184 case Button2:
1897 selection_request (ev.time, ev.x, ev.y); 2185 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2186 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
1898 break; 2187 break;
2188
1899#ifdef MOUSE_WHEEL 2189#ifdef MOUSE_WHEEL
1900 case Button4: 2190 case Button4:
1901 case Button5: 2191 case Button5:
1902 { 2192 {
1903 int i; 2193 int i;
… …
1905 2195
1906 v = ev.button == Button4 ? UP : DN; 2196 v = ev.button == Button4 ? UP : DN;
1907 2197
1908 if (ev.state & ShiftMask) 2198 if (ev.state & ShiftMask)
1909 i = 1; 2199 i = 1;
1910 else if (Options & Opt_mouseWheelScrollPage) 2200 else if (option (Opt_mouseWheelScrollPage))
1911 i = TermWin.nrow - 1; 2201 i = nrow - 1;
1912 else 2202 else
1913 i = 5; 2203 i = 5;
1914 2204
1915# ifdef MOUSE_SLIP_WHEELING 2205# ifdef MOUSE_SLIP_WHEELING
1916 if (ev.state & ControlMask) 2206 if (ev.state & ControlMask)
1917 { 2207 {
1918 mouse_slip_wheel_speed += v ? -1 : 1; 2208 mouse_slip_wheel_speed += v ? -1 : 1;
1919 if (mouse_slip_wheel_speed < -TermWin.nrow) mouse_slip_wheel_speed = -TermWin.nrow; 2209 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; 2210 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
1921 2211
1922 if (slip_wheel_ev.at < NOW) 2212 if (!slip_wheel_ev.is_active ())
1923 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; 2213 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1924
1925 slip_wheel_ev.start ();
1926 } 2214 }
1927 else 2215 else
2216# endif
1928 { 2217 {
1929# endif
1930# ifdef JUMP_MOUSE_WHEEL
1931 scr_page (v, i); 2218 scr_page (v, i);
1932 scr_refresh (SMOOTH_REFRESH);
1933 scrollbar_show (1); 2219 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 } 2220 }
1944#endif
1945 } 2221 }
1946 break; 2222 break;
1947#endif 2223#endif
1948 } 2224 }
1949 } 2225 }
1950#ifdef MENUBAR
1951 else if (isMenuBarWindow (ev.window))
1952 menubar_control (ev);
1953#endif
1954} 2226}
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 2227
2432/*}}} */ 2228/*}}} */
2433 2229
2434bool 2230void
2435rxvt_term::cmd_parse () 2231rxvt_term::cmd_parse ()
2436{ 2232{
2437 bool flag = false;
2438 unicode_t ch = NOCHAR; 2233 wchar_t ch = NOCHAR;
2439 unsigned char *seq_begin; // remember start of esc-sequence here 2234 char *seq_begin; // remember start of esc-sequence here
2440 2235
2441 for (;;) 2236 for (;;)
2442 { 2237 {
2443 if (ch == NOCHAR) 2238 if (expect_false (ch == NOCHAR))
2444 { 2239 {
2445 seq_begin = cmdbuf_ptr; 2240 seq_begin = cmdbuf_ptr;
2446 ch = next_char (); 2241 ch = next_char ();
2447 }
2448 2242
2449 if (ch == NOCHAR) // TODO: improve 2243 if (ch == NOCHAR)
2450 break; 2244 break;
2245 }
2451 2246
2452 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2247 if (expect_true (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT))
2248 {
2249 if (expect_false (!seen_input))
2453 { 2250 {
2251 seen_input = 1;
2252 // many badly-written programs (e.g. jed) contain a race condition:
2253 // they first read the screensize and then install a SIGWINCH handler.
2254 // some window managers resize the window early, and these programs
2255 // then sometimes get the size wrong.
2256 // unfortunately other programs are even more buggy and dislike
2257 // being sent SIGWINCH, so only do it when we were in fact being
2258 // resized.
2259 if (seen_resize && cmd_pid)
2260 kill (-cmd_pid, SIGWINCH);
2261 }
2262
2454 /* Read a text string from the input buffer */ 2263 /* Read a text string from the input buffer */
2455 unicode_t buf[UBUFSIZ]; 2264 wchar_t buf[UBUFSIZ];
2456 bool refreshnow = false; 2265 bool refreshnow = false;
2457 int nlines = 0; 2266 int nlines = 0;
2458 unicode_t *str = buf; 2267 wchar_t *str = buf;
2268 wchar_t *eol = str + min (ncol, UBUFSIZ);
2459 2269
2460 for (;;) 2270 for (;;)
2461 { 2271 {
2462 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2272 if (expect_false (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)))
2463 break; 2273 break;
2464 2274
2465 *str++ = ch; 2275 *str++ = ch;
2466 2276
2467 if (ch == C0_LF) 2277 if (expect_false (ch == C0_LF || str >= eol))
2468 { 2278 {
2279 if (ch == C0_LF)
2469 nlines++; 2280 nlines++;
2281
2470 refresh_count++; 2282 refresh_count++;
2471 2283
2472 if (!(Options & Opt_jumpScroll) 2284 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1)
2473 || (refresh_count >= refresh_limit * (TermWin.nrow - 1)))
2474 { 2285 {
2286 refresh_count = 0;
2287
2288 if (!option (Opt_skipScroll) || ev_time () > ev::now () + 1. / 60.)
2289 {
2475 refreshnow = true; 2290 refreshnow = true;
2476 ch = NOCHAR; 2291 ch = NOCHAR;
2477 break; 2292 break;
2293 }
2478 } 2294 }
2479 2295
2480 // scr_add_lines only works for nlines <= TermWin.nrow - 1. 2296 // scr_add_lines only works for nlines <= nrow - 1.
2481 if (nlines >= TermWin.nrow - 1) 2297 if (nlines >= nrow - 1)
2482 { 2298 {
2299 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2300 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2483 scr_add_lines (buf, nlines, str - buf); 2301 scr_add_lines (buf, str - buf, nlines);
2302
2484 nlines = 0; 2303 nlines = 0;
2485 str = buf; 2304 str = buf;
2305 eol = str + min (ncol, UBUFSIZ);
2486 } 2306 }
2487 }
2488 2307
2489 if (str >= buf + UBUFSIZ) 2308 if (str >= eol)
2490 { 2309 {
2310 if (eol >= buf + UBUFSIZ)
2311 {
2491 ch = NOCHAR; 2312 ch = NOCHAR;
2492 break; 2313 break;
2314 }
2315 else
2316 eol = min (eol + ncol, buf + UBUFSIZ);
2317 }
2318
2493 } 2319 }
2494 2320
2495 seq_begin = cmdbuf_ptr; 2321 seq_begin = cmdbuf_ptr;
2496 ch = next_char (); 2322 ch = next_char ();
2497 } 2323 }
2498 2324
2325 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2326 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2499 scr_add_lines (buf, nlines, str - buf); 2327 scr_add_lines (buf, str - buf, nlines);
2500 2328
2501 /* 2329 /*
2502 * If there have been a lot of new lines, then update the screen 2330 * 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. 2331 * 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 2332 * if skipScroll is enabled.
2505 * is incremented here because we must be doing flat-out scrolling.
2506 */ 2333 */
2507 if (refreshnow) 2334 if (refreshnow)
2508 { 2335 {
2509 if ((Options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2510 refresh_limit++;
2511 else
2512 {
2513 flag = true;
2514 scr_refresh (refresh_type); 2336 scr_refresh ();
2515 } 2337 want_refresh = 1;
2516 } 2338 }
2517
2518 } 2339 }
2519 else 2340 else
2520 { 2341 {
2521 try 2342 try
2522 { 2343 {
… …
2530 } 2351 }
2531 2352
2532 ch = NOCHAR; 2353 ch = NOCHAR;
2533 } 2354 }
2534 } 2355 }
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} 2356}
2547 2357
2548// read the next character 2358// read the next character
2549unicode_t 2359wchar_t
2550rxvt_term::next_char () 2360rxvt_term::next_char () NOTHROW
2551{ 2361{
2552 while (cmdbuf_ptr < cmdbuf_endp) 2362 while (cmdbuf_ptr < cmdbuf_endp)
2553 { 2363 {
2554 // assume 7-bit to be ascii ALWAYS 2364 // assume 7-bit to be ascii ALWAYS
2555 if (*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2365 if (expect_true ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b))
2556 return *cmdbuf_ptr++; 2366 return *cmdbuf_ptr++;
2557 2367
2558 wchar_t wc; 2368 wchar_t wc;
2559 size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2369 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2560 2370
2561 if (len == (size_t)-2) 2371 if (len == (size_t)-2)
2562 { 2372 {
2563 // the mbstate stores incomplete sequences. didn't know this :/ 2373 // the mbstate stores incomplete sequences. didn't know this :/
2564 cmdbuf_ptr = cmdbuf_endp; 2374 cmdbuf_ptr = cmdbuf_endp;
2565 break; 2375 break;
2566 } 2376 }
2567 2377
2568 if (len == (size_t)-1) 2378 if (len == (size_t)-1)
2379 {
2380 mbstate.reset (); // reset now undefined conversion state
2569 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2381 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2382 }
2570 2383
2571 // assume wchar == unicode 2384 // assume wchar == unicode
2572 cmdbuf_ptr += len; 2385 cmdbuf_ptr += len;
2573 return wc; 2386 return wc & UNICODE_MASK;
2574 } 2387 }
2575 2388
2576 return NOCHAR; 2389 return NOCHAR;
2577} 2390}
2391
2392// read the next octet
2393uint32_t
2394rxvt_term::next_octet () NOTHROW
2395{
2396 return cmdbuf_ptr < cmdbuf_endp
2397 ? (unsigned char)*cmdbuf_ptr++
2398 : NOCHAR;
2399}
2400
2401static class out_of_input out_of_input;
2578 2402
2579/* rxvt_cmd_getc () - Return next input character */ 2403/* rxvt_cmd_getc () - Return next input character */
2580/* 2404/*
2581 * Return the next input character after first passing any keyboard input 2405 * Return the next input character after first passing any keyboard input
2582 * to the command. 2406 * to the command.
2583 */ 2407 */
2584unicode_t 2408wchar_t
2585rxvt_term::cmd_getc () 2409rxvt_term::cmd_getc () THROW ((class out_of_input))
2586{ 2410{
2587 unicode_t c = next_char (); 2411 wchar_t c = next_char ();
2588 2412
2589 if (c == NOCHAR) 2413 if (c == NOCHAR)
2590 throw out_of_input; 2414 throw out_of_input;
2591 2415
2592 return c; 2416 return c;
2593} 2417}
2594 2418
2595unicode_t 2419uint32_t
2596rxvt_term::cmd_get8 () 2420rxvt_term::cmd_get8 () THROW ((class out_of_input))
2597{ 2421{
2598 unicode_t c = next_octet (); 2422 uint32_t c = next_octet ();
2599 2423
2600 if (c == NOCHAR) 2424 if (c == NOCHAR)
2601 throw out_of_input; 2425 throw out_of_input;
2602 2426
2603 return c; 2427 return c;
… …
2607/*----------------------------------------------------------------------*/ 2431/*----------------------------------------------------------------------*/
2608#ifdef PRINTPIPE 2432#ifdef PRINTPIPE
2609FILE * 2433FILE *
2610rxvt_term::popen_printer () 2434rxvt_term::popen_printer ()
2611{ 2435{
2612 FILE *stream = popen (rs[Rs_print_pipe], "w"); 2436 FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");
2613 2437
2614 if (stream == NULL) 2438 if (stream == NULL)
2615 rxvt_warn ("can't open printer pipe, not printing.\n"); 2439 rxvt_warn ("can't open printer pipe, not printing.\n");
2616 2440
2617 return stream; 2441 return stream;
… …
2628 * simulate attached vt100 printer 2452 * simulate attached vt100 printer
2629 */ 2453 */
2630void 2454void
2631rxvt_term::process_print_pipe () 2455rxvt_term::process_print_pipe ()
2632{ 2456{
2633 int done; 2457 FILE *fd = popen_printer ();
2634 FILE *fd;
2635 2458
2636 if ((fd = popen_printer ()) == NULL) 2459 if (!fd)
2637 return; 2460 return;
2638 2461
2639 /* 2462 /*
2640 * Send all input to the printer until either ESC[4i or ESC[?4i 2463 * Send all input to the printer until either ESC[4i or ESC[?4i
2641 * is received. 2464 * is received.
2642 */ 2465 */
2643 for (done = 0; !done;) 2466 for (int done = 0; !done; )
2644 { 2467 {
2645 unsigned char buf[8]; 2468 unsigned char buf[8];
2646 unicode_t ch; 2469 unicode_t ch;
2647 unsigned int i, len; 2470 unsigned int i, len;
2648 2471
… …
2667 { 2490 {
2668 if ((buf[len++] = cmd_getc ()) == 'i') 2491 if ((buf[len++] = cmd_getc ()) == 'i')
2669 break; /* done = 1 */ 2492 break; /* done = 1 */
2670 } 2493 }
2671 } 2494 }
2672 2495
2673 for (i = 0; i < len; i++) 2496 for (i = 0; i < len; i++)
2674 if (putc (buf[i], fd) == EOF) 2497 if (putc (buf[i], fd) == EOF)
2675 { 2498 {
2676 done = 1; 2499 done = 1;
2677 break; 2500 break;
… …
2679 } 2502 }
2680 } 2503 }
2681 2504
2682 pclose_printer (fd); 2505 pclose_printer (fd);
2683} 2506}
2684#endif /* PRINTPIPE */ 2507#endif /* PRINTPIPE */
2685/*}}} */ 2508/*}}} */
2686 2509
2687/* *INDENT-OFF* */ 2510/* *INDENT-OFF* */
2688enum { 2511enum {
2689 C1_40 = 0x40, 2512 C1_40 = 0x40,
… …
2703 case C0_ESC: 2526 case C0_ESC:
2704 process_escape_seq (); 2527 process_escape_seq ();
2705 break; 2528 break;
2706 case C0_ENQ: /* terminal Status */ 2529 case C0_ENQ: /* terminal Status */
2707 if (rs[Rs_answerbackstring]) 2530 if (rs[Rs_answerbackstring])
2708 tt_write ((const unsigned char *)rs[Rs_answerbackstring], 2531 tt_write (rs [Rs_answerbackstring], strlen (rs [Rs_answerbackstring]));
2709 (unsigned int)STRLEN (rs[Rs_answerbackstring]));
2710 else 2532 else
2711 tt_write ((unsigned char *)VT100_ANS, 2533 tt_write (VT100_ANS, strlen (VT100_ANS));
2712 (unsigned int)STRLEN (VT100_ANS));
2713 break; 2534 break;
2714 case C0_BEL: /* bell */ 2535 case C0_BEL: /* bell */
2715 scr_bell (); 2536 scr_bell ();
2716 break; 2537 break;
2717 case C0_BS: /* backspace */ 2538 case C0_BS: /* backspace */
… …
2741 process_dcs_seq (); 2562 process_dcs_seq ();
2742 break; 2563 break;
2743 case 0x9b: /* CSI */ 2564 case 0x9b: /* CSI */
2744 process_csi_seq (); 2565 process_csi_seq ();
2745 break; 2566 break;
2746 case 0x9d: /* CSI */ 2567 case 0x9d: /* OSC */
2747 process_osc_seq (); 2568 process_osc_seq ();
2748 break; 2569 break;
2749#endif 2570#endif
2750 } 2571 }
2751} 2572}
… …
2795 break; 2616 break;
2796 case 'Z': /* identify the terminal type */ 2617 case 'Z': /* identify the terminal type */
2797 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */ 2618 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
2798 break; 2619 break;
2799 case '<': /* turn off VT52 mode */ 2620 case '<': /* turn off VT52 mode */
2800 PrivMode (0, PrivMode_vt52); 2621 set_privmode (PrivMode_vt52, 0);
2801 break; 2622 break;
2802 case 'F': /* use special graphics character set */ 2623 case 'F': /* use special graphics character set */
2803 case 'G': /* use regular character set */ 2624 case 'G': /* use regular character set */
2804 /* unimplemented */ 2625 /* unimplemented */
2805 break; 2626 break;
… …
2816void 2637void
2817rxvt_term::process_escape_seq () 2638rxvt_term::process_escape_seq ()
2818{ 2639{
2819 unicode_t ch = cmd_getc (); 2640 unicode_t ch = cmd_getc ();
2820 2641
2821 if (PrivateModes & PrivMode_vt52) 2642 if (priv_modes & PrivMode_vt52)
2822 { 2643 {
2823 process_escape_vt52 (ch); 2644 process_escape_vt52 (ch);
2824 return; 2645 return;
2825 } 2646 }
2826 2647
… …
2841 scr_charset_set (2, (unsigned int)cmd_getc ()); 2662 scr_charset_set (2, (unsigned int)cmd_getc ());
2842 break; 2663 break;
2843 case '+': 2664 case '+':
2844 scr_charset_set (3, (unsigned int)cmd_getc ()); 2665 scr_charset_set (3, (unsigned int)cmd_getc ());
2845 break; 2666 break;
2846#ifndef NO_FRILLS 2667#if !ENABLE_MINIMAL
2847 case '6': 2668 case '6':
2848 scr_backindex (); 2669 scr_backindex ();
2849 break; 2670 break;
2850#endif 2671#endif
2851 case '7': 2672 case '7':
2852 scr_cursor (SAVE); 2673 scr_cursor (SAVE);
2853 break; 2674 break;
2854 case '8': 2675 case '8':
2855 scr_cursor (RESTORE); 2676 scr_cursor (RESTORE);
2856 break; 2677 break;
2857#ifndef NO_FRILLS 2678#if !ENABLE_MINIMAL
2858 case '9': 2679 case '9':
2859 scr_forwardindex (); 2680 scr_forwardindex ();
2860 break; 2681 break;
2861#endif 2682#endif
2862 case '=': 2683 case '=':
2863 case '>': 2684 case '>':
2864 PrivMode ((ch == '='), PrivMode_aplKP); 2685 set_privmode (PrivMode_aplKP, ch == '=');
2865 break; 2686 break;
2866 2687
2867 case C1_40: 2688 case C1_40:
2868 cmd_getc (); 2689 cmd_getc ();
2869 break; 2690 break;
… …
2872 break; 2693 break;
2873 2694
2874 /* 8.3.87: NEXT LINE */ 2695 /* 8.3.87: NEXT LINE */
2875 case C1_NEL: /* ESC E */ 2696 case C1_NEL: /* ESC E */
2876 { 2697 {
2877 unicode_t nlcr[] = { C0_LF, C0_CR }; 2698 wchar_t nlcr[] = { C0_LF, C0_CR };
2878 scr_add_lines (nlcr, 1, 2); 2699 scr_add_lines (nlcr, ARRAY_LENGTH(nlcr), 1);
2879 } 2700 }
2880 break; 2701 break;
2881 2702
2882 /* kidnapped escape sequence: Should be 8.3.48 */ 2703 /* kidnapped escape sequence: Should be 8.3.48 */
2883 case C1_ESA: /* ESC G */ 2704 case C1_ESA: /* ESC G */
… …
2905 process_dcs_seq (); 2726 process_dcs_seq ();
2906 break; 2727 break;
2907 2728
2908 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2729 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
2909 case C1_SCI: /* ESC Z */ 2730 case C1_SCI: /* ESC Z */
2910 tt_write ((const unsigned char *)ESCZ_ANSWER, 2731 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
2911 (unsigned int) (sizeof (ESCZ_ANSWER) - 1));
2912 break; /* steal obsolete ESC [ c */ 2732 break; /* steal obsolete ESC [ c */
2913 2733
2914 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2734 /* 8.3.16: CONTROL SEQUENCE INTRODUCER (CSI) */
2915 case C1_CSI: /* ESC [ */ 2735 case C1_CSI: /* ESC [ */
2916 process_csi_seq (); 2736 process_csi_seq ();
2917 break; 2737 break;
2918 2738
2919 /* 8.3.90: OPERATING SYSTEM COMMAND */ 2739 /* 8.3.90: OPERATING SYSTEM COMMAND (OSC) */
2920 case C1_OSC: /* ESC ] */ 2740 case C1_OSC: /* ESC ] */
2921 process_osc_seq (); 2741 process_osc_seq ();
2922 break; 2742 break;
2923 2743
2924 /* 8.3.106: RESET TO INITIAL STATE */ 2744 /* 8.3.106: RESET TO INITIAL STATE (RIS) */
2925 case 'c': 2745 case 'c':
2926 mbstate.reset (); 2746 mbstate.reset ();
2927 scr_poweron (); 2747 scr_poweron ();
2928 scrollbar_show (1); 2748 scrollBar.show (1);
2929 break; 2749 break;
2930 2750
2931 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */ 2751 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
2932 case 'n': 2752 case 'n':
2933 scr_charset_choose (2); 2753 scr_charset_choose (2);
… …
2953 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ, 2773 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ,
2954 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 , 2774 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 ,
2955 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F 2775 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F
2956}; 2776};
2957 2777
2958#define make_byte(b7,b6,b5,b4,b3,b2,b1,b0) \ 2778#define make_byte(b0,b1,b2,b3,b4,b5,b6,b7) \
2959 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \ 2779 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \
2960 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0)) 2780 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0))
2961#define get_byte_array_bit(array, bit) \ 2781#define get_byte_array_bit(array, bit) \
2962 (!! ((array)[ (bit) / 8] & (128 >> ((bit) & 7)))) 2782 (!! ((array)[(bit) >> 3] & (1 << ((bit) & 7))))
2963 2783
2964const unsigned char csi_defaults[] = 2784static const unsigned char csi_defaults[] =
2965 { 2785 {
2966 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */ 2786 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */
2967 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */ 2787 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */
2968 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */ 2788 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */
2969 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */ 2789 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */
… …
2978rxvt_term::process_csi_seq () 2798rxvt_term::process_csi_seq ()
2979{ 2799{
2980 unicode_t ch, priv, i; 2800 unicode_t ch, priv, i;
2981 unsigned int nargs, p; 2801 unsigned int nargs, p;
2982 int n, ndef; 2802 int n, ndef;
2983 int arg[ESC_ARGS]; 2803 int arg[ESC_ARGS] = { };
2984 2804
2985 for (nargs = ESC_ARGS; nargs > 0;) 2805 nargs = 0;
2986 arg[--nargs] = 0;
2987 2806
2988 priv = 0; 2807 priv = 0;
2989 ch = cmd_getc (); 2808 ch = cmd_getc ();
2990 if (ch >= '<' && ch <= '?') 2809 if ((ch >= '<' && ch <= '?') || ch == '!')
2810 {
2991 { /* '<' '=' '>' '?' */ 2811 /* '<' '=' '>' '?' '!' */
2992 priv = ch; 2812 priv = ch;
2993 ch = cmd_getc (); 2813 ch = cmd_getc ();
2994 } 2814 }
2995 2815
2996 /* read any numerical arguments */ 2816 /* read any numerical arguments */
… …
3025 ndef = get_byte_array_bit (csi_defaults, i); 2845 ndef = get_byte_array_bit (csi_defaults, i);
3026 for (p = 0; p < nargs; p++) 2846 for (p = 0; p < nargs; p++)
3027 if (arg[p] == -1) 2847 if (arg[p] == -1)
3028 arg[p] = ndef; 2848 arg[p] = ndef;
3029 2849
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 /* 2850 /*
3038 * private mode handling 2851 * private mode handling
3039 */ 2852 */
3040 if (priv) 2853 if (priv)
3041 { 2854 {
3042 switch (priv) 2855 switch (priv)
3043 { 2856 {
3044 case '>': 2857 case '>':
3045 if (ch == CSI_DA) /* secondary device attributes */ 2858 if (ch == CSI_DA) /* secondary device attributes */
2859 {
2860 // first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt,
2861 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
2862 //
2863 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
2864 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, 94 for urxvt <= 8.3, and 95 for later
2865 // versions.
2866 //
3046 tt_printf ("\033[>%d;%-.8s;0c", 'R', VSTRING); 2867 tt_printf ("\033[>%d;95;0c", 'U');
2868 }
3047 break; 2869 break;
2870
3048 case '?': 2871 case '?':
3049 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2872 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3050 process_terminal_mode (ch, priv, nargs, arg); 2873 process_terminal_mode (ch, priv, nargs, arg);
3051 break; 2874 break;
2875
2876 case '!':
2877 if (ch == CSI_70)
2878 {
2879 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */
2880 scr_soft_reset ();
2881
2882 static const int pm_h[] = { 7, 25 };
2883 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1005, 1015, 1049 };
2884
2885 process_terminal_mode ('h', 0, ARRAY_LENGTH(pm_h), pm_h);
2886 process_terminal_mode ('l', 0, ARRAY_LENGTH(pm_l), pm_l);
3052 } 2887 }
2888 break;
2889 }
2890
3053 return; 2891 return;
3054 } 2892 }
3055 2893
3056 switch (ch) 2894 switch (ch)
3057 { 2895 {
… …
3156 2994
3157 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */ 2995 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */
3158 arg[0] = -arg[0]; 2996 arg[0] = -arg[0];
3159 /* FALLTHROUGH */ 2997 /* FALLTHROUGH */
3160 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 2998 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
3161 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0); 2999 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
3162 break; 3000 break;
3163 3001
3164 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 3002 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
3165 tt_write ((const unsigned char *)VT100_ANS, 3003 tt_write (VT100_ANS, sizeof (VT100_ANS) - 1);
3166 (unsigned int) (sizeof (VT100_ANS) - 1));
3167 break; 3004 break;
3168 3005
3169 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 3006 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
3170 process_sgr_mode (nargs, arg); 3007 process_sgr_mode (nargs, arg);
3171 break; 3008 break;
… …
3178 break; 3015 break;
3179 case 6: /* CPR requested */ 3016 case 6: /* CPR requested */
3180 scr_report_position (); 3017 scr_report_position ();
3181 break; 3018 break;
3182 case 7: /* unofficial extension */ 3019 case 7: /* unofficial extension */
3183 if (Options & Opt_insecure) 3020 if (option (Opt_insecure))
3184 tt_printf ("%-.250s\n", rs[Rs_display_name]); 3021 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3185 break; 3022 break;
3186 case 8: /* unofficial extension */ 3023 case 8: /* unofficial extension */
3187 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3024 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3188 break; 3025 break;
3189 } 3026 }
… …
3225 break; 3062 break;
3226 3063
3227 case CSI_RM: /* 8.3.107: RESET MODE */ 3064 case CSI_RM: /* 8.3.107: RESET MODE */
3228 if (arg[0] == 4) 3065 if (arg[0] == 4)
3229 scr_insert_mode (0); 3066 scr_insert_mode (0);
3067 else if (arg[0] == 20)
3068 priv_modes &= ~PrivMode_LFNL;
3230 break; 3069 break;
3231 3070
3232 case CSI_SM: /* 8.3.126: SET MODE */ 3071 case CSI_SM: /* 8.3.126: SET MODE */
3233 if (arg[0] == 4) 3072 if (arg[0] == 4)
3234 scr_insert_mode (1); 3073 scr_insert_mode (1);
3074 else if (arg[0] == 20)
3075 priv_modes |= PrivMode_LFNL;
3235 break; 3076 break;
3236 3077
3237 /* 3078 /*
3238 * PRIVATE USE beyond this point. All CSI_7? sequences here 3079 * PRIVATE USE beyond this point. All CSI_7? sequences here
3239 */ 3080 */
… …
3251 break; 3092 break;
3252 case CSI_75: 3093 case CSI_75:
3253 scr_cursor (RESTORE); 3094 scr_cursor (RESTORE);
3254 break; 3095 break;
3255 3096
3256#ifndef NO_FRILLS 3097#if !ENABLE_MINIMAL
3257 case CSI_74: 3098 case CSI_74:
3258 process_window_ops (arg, nargs); 3099 process_window_ops (arg, nargs);
3259 break; 3100 break;
3260#endif 3101#endif
3261 3102
… …
3268 break; 3109 break;
3269 } 3110 }
3270} 3111}
3271/*}}} */ 3112/*}}} */
3272 3113
3273#ifndef NO_FRILLS 3114#if !ENABLE_MINIMAL
3274/* ARGSUSED */ 3115/* ARGSUSED */
3275void 3116void
3276rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3117rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3277{ 3118{
3278 int x, y; 3119 int x, y;
3279 XWindowAttributes wattr; 3120 XWindowAttributes wattr;
3280 Window wdummy; 3121 Window wdummy;
3122
3123 dLocal (Display *, dpy);
3281 3124
3282 if (nargs == 0) 3125 if (nargs == 0)
3283 return; 3126 return;
3284 3127
3285 switch (args[0]) 3128 switch (args[0])
3286 { 3129 {
3287 /* 3130 /*
3288 * commands 3131 * commands
3289 */ 3132 */
3290 case 1: /* deiconify window */ 3133 case 1: /* deiconify window */
3291 XMapWindow (display->display, TermWin.parent[0]); 3134 XMapWindow (dpy, parent[0]);
3292 break; 3135 break;
3293 case 2: /* iconify window */ 3136 case 2: /* iconify window */
3294 XIconifyWindow (display->display, TermWin.parent[0], 3137 XIconifyWindow (dpy, parent[0], display->screen);
3295 DefaultScreen (display->display));
3296 break; 3138 break;
3297 case 3: /* set position (pixels) */ 3139 case 3: /* set position (pixels) */
3298 XMoveWindow (display->display, TermWin.parent[0], args[1], args[2]); 3140 XMoveWindow (dpy, parent[0], args[1], args[2]);
3299 break; 3141 break;
3300 case 4: /* set size (pixels) */ 3142 case 4: /* set size (pixels) */
3301 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3143 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3302 break; 3144 break;
3303 case 5: /* raise window */ 3145 case 5: /* raise window */
3304 XRaiseWindow (display->display, TermWin.parent[0]); 3146 XRaiseWindow (dpy, parent[0]);
3305 break; 3147 break;
3306 case 6: /* lower window */ 3148 case 6: /* lower window */
3307 XLowerWindow (display->display, TermWin.parent[0]); 3149 XLowerWindow (dpy, parent[0]);
3308 break; 3150 break;
3309 case 7: /* refresh window */ 3151 case 7: /* refresh window */
3310 scr_touch (true); 3152 scr_touch (true);
3311 break; 3153 break;
3312 case 8: /* set size (chars) */ 3154 case 8: /* set size (chars) */
3313 set_widthheight ((unsigned int) (args[2] * TermWin.fwidth), 3155 set_widthheight ((unsigned int) (args[2] * fwidth),
3314 (unsigned int) (args[1] * TermWin.fheight)); 3156 (unsigned int) (args[1] * fheight));
3315 break; 3157 break;
3316 3158
3317 //case 9: NYI, TODO, restore maximized window or maximize window 3159 //case 9: NYI, TODO, restore maximized window or maximize window
3318 default: 3160 default:
3319 if (args[0] >= 24) /* set height (chars) */ 3161 if (args[0] >= 24) /* set height (chars) */
3320 set_widthheight ((unsigned int)TermWin.width, 3162 set_widthheight ((unsigned int)width,
3321 (unsigned int) (args[1] * TermWin.fheight)); 3163 (unsigned int) (args[1] * fheight));
3322 break; 3164 break;
3323
3324 3165
3325 /* 3166 /*
3326 * reports - some output format copied from XTerm 3167 * reports - some output format copied from XTerm
3327 */ 3168 */
3328 case 11: /* report window state */ 3169 case 11: /* report window state */
3329 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3170 XGetWindowAttributes (dpy, parent[0], &wattr);
3330 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3171 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3331 break; 3172 break;
3332 case 13: /* report window position */ 3173 case 13: /* report window position */
3333 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3174 XGetWindowAttributes (dpy, parent[0], &wattr);
3334 XTranslateCoordinates (display->display, TermWin.parent[0], wattr.root, 3175 XTranslateCoordinates (dpy, parent[0], wattr.root,
3335 -wattr.border_width, -wattr.border_width, 3176 -wattr.border_width, -wattr.border_width,
3336 &x, &y, &wdummy); 3177 &x, &y, &wdummy);
3337 tt_printf ("\033[3;%d;%dt", x, y); 3178 tt_printf ("\033[3;%d;%dt", x, y);
3338 break; 3179 break;
3339 case 14: /* report window size (pixels) */ 3180 case 14: /* report window size (pixels) */
3340 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3181 XGetWindowAttributes (dpy, parent[0], &wattr);
3341 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3182 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3342 break; 3183 break;
3343 case 18: /* report text area size (chars) */ 3184 case 18: /* report text area size (chars) */
3344 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); 3185 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3345 break; 3186 break;
3346 case 19: /* report window size (chars) */ 3187 case 19: /* report window size (chars) */
3347 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol); 3188 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3348 break; 3189 break;
3349 case 20: /* report icon label */ 3190 case 20: /* report icon label */
3350 { 3191 {
3351 char *s; 3192 char *s;
3352 XGetIconName (display->display, TermWin.parent[0], &s); 3193 XGetIconName (dpy, parent[0], &s);
3353 tt_printf ("\033]L%-.250s\234", (Options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3194 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3354 XFree (s); 3195 XFree (s);
3355 } 3196 }
3356 break; 3197 break;
3357 case 21: /* report window title */ 3198 case 21: /* report window title */
3358 { 3199 {
3359 char *s; 3200 char *s;
3360 XFetchName (display->display, TermWin.parent[0], &s); 3201 XFetchName (dpy, parent[0], &s);
3361 tt_printf ("\033]l%-.250s\234", (Options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3202 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3362 XFree (s); 3203 XFree (s);
3363 } 3204 }
3364 break; 3205 break;
3365 } 3206 }
3366} 3207}
… …
3369/*----------------------------------------------------------------------*/ 3210/*----------------------------------------------------------------------*/
3370/* 3211/*
3371 * get input up until STRING TERMINATOR (or BEL) 3212 * get input up until STRING TERMINATOR (or BEL)
3372 * ends_how is terminator used. returned input must be free()'d 3213 * ends_how is terminator used. returned input must be free()'d
3373 */ 3214 */
3374unsigned char * 3215char *
3375rxvt_term::get_to_st (unicode_t &ends_how) 3216rxvt_term::get_to_st (unicode_t &ends_how)
3376{ 3217{
3377 unicode_t prev = 0, ch; 3218 unicode_t ch;
3219 bool seen_esc = false;
3378 unsigned int n = 0; 3220 unsigned int n = 0;
3379 unsigned char *s;
3380 unsigned char string[STRING_MAX]; 3221 wchar_t string[STRING_MAX];
3381 3222
3382 while ((ch = cmd_getc ()) != NOCHAR) 3223 while ((ch = cmd_getc ()) != NOCHAR)
3383 { 3224 {
3384 if (prev == C0_ESC) 3225 if (seen_esc)
3385 { 3226 {
3386 if (ch == 0x5c) /* 7bit ST */ 3227 if (ch == 0x5c) /* 7bit ST */
3387 break; 3228 break;
3388 else 3229 else
3389 return NULL; 3230 return NULL;
3390 } 3231 }
3232 else if (ch == C0_ESC)
3233 {
3234 seen_esc = true;
3235 continue;
3236 }
3391 else if (ch == C0_BEL || ch == CHAR_ST) 3237 else if (ch == C0_BEL || ch == CHAR_ST)
3392 break; 3238 break;
3239 else if (ch == C0_SYN)
3240 ch = cmd_get8 ();
3393 else if (ch < 0x20) 3241 else if (ch < 0x20)
3394 return NULL; /* other control character - exit */ 3242 return NULL; /* other control character - exit */
3395 3243
3396 if (n >= sizeof (string) - 1) 3244 seen_esc = false;
3245
3246 if (n >= STRING_MAX - 1)
3397 // stop at some sane length 3247 // stop at some sane length
3398 return NULL; 3248 return NULL;
3399 3249
3400 if (ch == C0_SYN)
3401 {
3402 string[n++] = cmd_get8 ();
3403 prev = 0;
3404 }
3405 else
3406 string[n++] = prev = ch; 3250 string[n++] = ch;
3407 } 3251 }
3408 3252
3409 string[n++] = '\0'; 3253 string[n++] = '\0';
3410 3254
3411 if ((s = (unsigned char *)rxvt_malloc (n)) == NULL)
3412 return NULL;
3413
3414 ends_how = (ch == 0x5c ? C0_ESC : ch); 3255 ends_how = (ch == 0x5c ? C0_ESC : ch);
3415 STRNCPY (s, string, n); 3256
3416 return s; 3257 return rxvt_wcstombs (string);
3417} 3258}
3418 3259
3419/*----------------------------------------------------------------------*/ 3260/*----------------------------------------------------------------------*/
3420/* 3261/*
3421 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3262 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3422 */ 3263 */
3423void 3264void
3424rxvt_term::process_dcs_seq () 3265rxvt_term::process_dcs_seq ()
3425{ 3266{
3426 unsigned char *s;
3427 unicode_t eh;
3428
3429 /* 3267 /*
3430 * Not handled yet 3268 * Not handled yet
3431 */ 3269 */
3270
3271 unicode_t eh;
3432 s = get_to_st (eh); 3272 char *s = get_to_st (eh);
3433 if (s) 3273 if (s)
3434 free (s); 3274 free (s);
3435 3275
3436 return; 3276 return;
3437} 3277}
… …
3441 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)' 3281 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)'
3442 */ 3282 */
3443void 3283void
3444rxvt_term::process_osc_seq () 3284rxvt_term::process_osc_seq ()
3445{ 3285{
3446 unicode_t ch, eh;
3447 int arg; 3286 int arg;
3448 3287
3449 ch = cmd_getc (); 3288 unicode_t ch = cmd_getc ();
3450 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3289 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3451 arg = arg * 10 + (ch - '0'); 3290 arg = arg * 10 + (ch - '0');
3452 3291
3453 if (ch == ';') 3292 if (ch == ';')
3454 { 3293 {
3294 unicode_t eh;
3455 unsigned char *s = get_to_st (eh); 3295 char *s = get_to_st (eh);
3456 3296
3457 if (s) 3297 if (s)
3458 { 3298 {
3459 process_xterm_seq (arg, (char *)s, eh); 3299 process_xterm_seq (arg, s, eh);
3460 free (s); 3300 free (s);
3461 } 3301 }
3462 } 3302 }
3463} 3303}
3464 3304
3465void 3305void
3466rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp) 3306rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3467{ 3307{
3468 if (str[0] == '?' && !str[1]) 3308 if (str[0] == '?' && !str[1])
3469 { 3309 {
3470 unsigned short r, g, b; 3310 rgba c;
3471 PixColorsFocused[color].get (display, r, g, b); 3311 pix_colors_focused[color].get (c);
3312
3313#if XFT
3314 if (c.a != rgba::MAX_CC)
3315 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp);
3316 else
3317#endif
3472 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp); 3318 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp);
3473 } 3319 }
3474 else 3320 else
3475 set_window_color (color, str); 3321 set_window_color (color, str);
3476} 3322}
3477 3323
3478/* 3324/*
3479 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3325 * 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 */ 3326 */
3503void 3327void
3504rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp) 3328rxvt_term::process_xterm_seq (int op, char *str, char resp)
3505{ 3329{
3506 int changed = 0;
3507 int color; 3330 int color;
3508 char *buf, *name; 3331 char *buf, *name;
3509 bool query = str[0] == '?' && !str[1]; 3332 bool query = str[0] == '?' && !str[1];
3333 int saveop = op;
3334
3335 dLocal (Display *, dpy);
3510 3336
3511 assert (str != NULL); 3337 assert (str != NULL);
3338
3339 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END)))
3340 return;
3341
3512 switch (op) 3342 switch (op)
3513 { 3343 {
3514 case XTerm_name: 3344 case XTerm_name:
3515 set_title (str); 3345 set_title (str);
3516 /* FALLTHROUGH */ 3346 /* FALLTHROUGH */
… …
3521 set_title (str); 3351 set_title (str);
3522 break; 3352 break;
3523 case XTerm_property: 3353 case XTerm_property:
3524 if (str[0] == '?') 3354 if (str[0] == '?')
3525 { 3355 {
3526 Atom prop = XInternAtom (display->display, str + 1, True); 3356 Atom prop = display->atom (str + 1);
3527 Atom actual_type; 3357 Atom actual_type;
3528 int actual_format; 3358 int actual_format;
3529 unsigned long nitems; 3359 unsigned long nitems;
3530 unsigned long bytes_after; 3360 unsigned long bytes_after;
3531 unsigned char *value = 0; 3361 unsigned char *value = 0;
3532 const char *str = ""; 3362 const char *str = "";
3533 3363
3534 if (prop 3364 if (prop
3535 && XGetWindowProperty (display->display, TermWin.parent[0], 3365 && XGetWindowProperty (dpy, parent[0],
3536 prop, 0, 1<<16, 0, AnyPropertyType, 3366 prop, 0, 1<<16, 0, AnyPropertyType,
3537 &actual_type, &actual_format, 3367 &actual_type, &actual_format,
3538 &nitems, &bytes_after, &value) == Success 3368 &nitems, &bytes_after, &value) == Success
3539 && actual_type != None 3369 && actual_type != None
3540 && actual_format == 8) 3370 && actual_format == 8)
3541 str = (const char *)(value); 3371 str = (const char *)(value);
3542 3372
3543 tt_printf ("\033]%d;%s%c", XTerm_property, str, resp); 3373 tt_printf ("\033]%d;%s%c", op, str, resp);
3544 3374
3545 XFree (value); 3375 XFree (value);
3546 } 3376 }
3547 else 3377 else
3548 { 3378 {
3549 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3379 char *eq = strchr (str, '=');
3550 3380
3551 if (eq) 3381 if (eq)
3552 { 3382 {
3553 *eq = 0; 3383 *eq = 0;
3554 XChangeProperty (display->display, TermWin.parent[0], 3384 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 } 3385 }
3559 else 3386 else
3560 XDeleteProperty (display->display, TermWin.parent[0], 3387 XDeleteProperty (dpy, parent[0],
3561 display->atom (str)); 3388 display->atom (str));
3562 } 3389 }
3563 break; 3390 break;
3564 3391
3565 case XTerm_Color: 3392 case XTerm_Color:
3566 for (buf = (char *)str; buf && *buf;) 3393 for (buf = (char *)str; buf && *buf;)
3567 { 3394 {
3568 if ((name = STRCHR (buf, ';')) == NULL) 3395 if ((name = strchr (buf, ';')) == NULL)
3569 break; 3396 break;
3570 3397
3571 *name++ = '\0'; 3398 *name++ = '\0';
3572 color = atoi (buf); 3399 color = atoi (buf) + minCOLOR;
3573 3400
3574 if (color < 0 || color >= TOTAL_COLORS) 3401 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
3575 break; 3402 break;
3576 3403
3577 if ((buf = STRCHR (name, ';')) != NULL) 3404 if ((buf = strchr (name, ';')) != NULL)
3578 *buf++ = '\0'; 3405 *buf++ = '\0';
3579 3406
3580 if (name[0] == '?' && !name[1]) 3407 process_color_seq (op, color, name, resp);
3408 }
3409 break;
3410 case Rxvt_restoreFG:
3411 case XTerm_Color00:
3412 process_color_seq (op, Color_fg, str, resp);
3413 break;
3414 case Rxvt_restoreBG:
3415 case XTerm_Color01:
3416 process_color_seq (op, Color_bg, str, resp);
3417 break;
3418#ifndef NO_CURSORCOLOR
3419 case XTerm_Color_cursor:
3420 process_color_seq (op, Color_cursor, str, resp);
3421 break;
3422#endif
3423 case XTerm_Color_pointer_fg:
3424 process_color_seq (op, Color_pointer_fg, str, resp);
3425 break;
3426 case XTerm_Color_pointer_bg:
3427 process_color_seq (op, Color_pointer_bg, str, resp);
3428 break;
3429#ifdef OPTION_HC
3430 case XTerm_Color_HC:
3431 process_color_seq (op, Color_HC, str, resp);
3432 break;
3433 case XTerm_Color_HTC:
3434 process_color_seq (op, Color_HTC, str, resp);
3435 break;
3436#endif
3437#ifndef NO_BOLD_UNDERLINE_REVERSE
3438 case URxvt_Color_BD:
3439 process_color_seq (op, Color_BD, str, resp);
3440 break;
3441 case URxvt_Color_UL:
3442 process_color_seq (op, Color_UL, str, resp);
3443 break;
3444 case URxvt_Color_IT:
3445 process_color_seq (op, Color_IT, str, resp);
3446 break;
3447#endif
3448 case URxvt_Color_border:
3449 process_color_seq (op, Color_border, str, resp);
3450 break;
3451#if ENABLE_TRANSPARENCY
3452 case URxvt_Color_tint:
3453 process_color_seq (op, Color_tint, str, resp);
3454 {
3455 bool changed = false;
3456
3457 if (ISSET_PIXCOLOR (Color_tint))
3458 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]);
3459
3460 if (changed)
3461 update_background ();
3462 }
3463
3464 break;
3465#endif
3466
3467#if BG_IMAGE_FROM_FILE
3468 case Rxvt_Pixmap:
3469 if (!strcmp (str, "?"))
3470 {
3471 char str[256];
3472
3473 sprintf (str, "[%dx%d+%d+%d]",
3474 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767),
3475 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767));
3476 process_xterm_seq (XTerm_title, str, CHAR_ST);
3477 }
3478 else
3479 {
3480 int changed = 0;
3481
3482 if (*str != ';')
3581 { 3483 {
3582 unsigned short r, g, b; 3484 if (bgPixmap.set_file (str)) /* change pixmap */
3583 PixColorsFocused[color + minCOLOR].get (display, r, g, b); 3485 {
3584 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp); 3486 changed++;
3487 str = strchr (str, ';');
3488 if (str == NULL)
3489 bgPixmap.set_defaultGeometry ();
3490 else
3491 bgPixmap.set_geometry (str+1);
3492 }
3585 } 3493 }
3586 else 3494 else
3587 set_window_color (color + minCOLOR, name); 3495 {
3496 str++;
3497 if (bgPixmap.set_geometry (str, true))
3498 changed++;
3499 }
3500
3501 if (changed)
3502 {
3503 if (bgPixmap.window_position_sensitive ())
3504 {
3505 int x, y;
3506 get_window_origin (x, y);
3507 bgPixmap.set_position (x, y);
3508 }
3509 update_background ();
3510 }
3588 } 3511 }
3589 break; 3512 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 3513#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 3514
3652 case XTerm_logfile: 3515 case XTerm_logfile:
3653 // TODO, when secure mode? 3516 // TODO, when secure mode?
3654 break; 3517 break;
3655 3518
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 3519#if 0
3697 case XTerm_dumpscreen: /* no error notices */ 3520 case Rxvt_dumpscreen: /* no error notices */
3698 { 3521 {
3699 int fd; 3522 int fd;
3700 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) 3523 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3701 { 3524 {
3702 scr_dump (fd); 3525 scr_dump (fd);
3703 close (fd); 3526 close (fd);
3704 } 3527 }
3705 } 3528 }
3529 break;
3530#endif
3531 case XTerm_font:
3532 op = URxvt_font;
3533 case URxvt_font:
3534#if ENABLE_STYLES
3535 case URxvt_boldFont:
3536 case URxvt_italicFont:
3537 case URxvt_boldItalicFont:
3538#endif
3539 if (query)
3540 tt_printf ("\33]%d;%-.250s%c", saveop,
3541 option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3542 ? fontset[op - URxvt_font]->fontdesc : "",
3543 resp);
3544 else
3545 {
3546 const char *&res = rs[Rs_font + (op - URxvt_font)];
3547
3548 res = strdup (str);
3549 allocated.push_back ((void *)res);
3550 set_fonts ();
3551 }
3552 break;
3553
3554 case URxvt_version:
3555 if (query)
3556 tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%c",
3557 op,
3558 rs[Rs_name], VERSION[0], VERSION[2],
3559 resp);
3560 break;
3561
3562#if !ENABLE_MINIMAL
3563 case URxvt_locale:
3564 if (query)
3565 tt_printf ("\33]%d;%-.250s%c", op, option (Opt_insecure) ? locale : "", resp);
3566 else
3567 {
3568 set_locale (str);
3569 pty->set_utf8_mode (enc_utf8);
3570 init_xlocale ();
3571 }
3572 break;
3573
3574 case URxvt_view_up:
3575 case URxvt_view_down:
3576 {
3577 int lines = atoi (str);
3578
3579 if (lines)
3580 scr_page (op == URxvt_view_up ? UP : DN, lines);
3581 else
3582 scr_erase_savelines ();
3583 }
3584
3585 break;
3586#endif
3587
3588#if ENABLE_PERL
3589 case URxvt_perl:
3590 HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_STR_LEN, &resp, 1, DT_END));
3706 break; 3591 break;
3707#endif 3592#endif
3708 } 3593 }
3709} 3594}
3710/*----------------------------------------------------------------------*/ 3595/*----------------------------------------------------------------------*/
… …
3724{ 3609{
3725 int state; 3610 int state;
3726 3611
3727 if (mode == 's') 3612 if (mode == 's')
3728 { 3613 {
3729 SavedModes |= (PrivateModes & bit); 3614 SavedModes |= (priv_modes & bit);
3730 return -1; 3615 return -1;
3731 } 3616 }
3732 else 3617 else
3733 { 3618 {
3734 if (mode == 'r') 3619 if (mode == 'r')
3735 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3620 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3736 else 3621 else
3737 state = (mode == 't') ? ! (PrivateModes & bit) : mode; 3622 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3738 PrivMode (state, bit); 3623
3624 set_privmode (bit, state);
3739 } 3625 }
3740 3626
3741 return state; 3627 return state;
3742} 3628}
3743 3629
3744/* we're not using priv _yet_ */ 3630/* we're not using priv _yet_ */
3745void 3631void
3746rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg) 3632rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg)
3747{ 3633{
3748 unsigned int i, j; 3634 unsigned int i, j;
3749 int state; 3635 int state;
3750 3636
3751 static const struct 3637 static const struct
3752 { 3638 {
3753 const int argval; 3639 const int argval;
3754 const unsigned long bit; 3640 const unsigned long bit;
3755 }
3756
3757 argtopriv[] = { 3641 } argtopriv[] = {
3758 { 1, PrivMode_aplCUR }, 3642 { 1, PrivMode_aplCUR }, // DECCKM
3759 { 2, PrivMode_vt52 }, 3643 { 2, PrivMode_vt52 },
3760 { 3, PrivMode_132 }, 3644 { 3, PrivMode_132 }, // DECCOLM
3761 { 4, PrivMode_smoothScroll }, 3645 { 4, PrivMode_smoothScroll }, // DECSCLM
3762 { 5, PrivMode_rVideo }, 3646 { 5, PrivMode_rVideo }, // DECSCNM
3763 { 6, PrivMode_relOrigin }, 3647 { 6, PrivMode_relOrigin }, // DECOM
3764 { 7, PrivMode_Autowrap }, 3648 { 7, PrivMode_Autowrap }, // DECAWM
3649 // 8, auto-repeat keys // DECARM
3765 { 9, PrivMode_MouseX10 }, 3650 { 9, PrivMode_MouseX10 },
3766#ifdef menuBar_esc 3651 // 18 end FF to printer after print screen
3767 { menuBar_esc, PrivMode_menuBar }, 3652 // 19 Print screen prints full screen/scroll region
3768#endif 3653 { 25, PrivMode_VisibleCursor }, // cnorm/cvvis/civis
3769#ifdef scrollBar_esc 3654#ifdef scrollBar_esc
3770 { scrollBar_esc, PrivMode_scrollBar }, 3655 { scrollBar_esc, PrivMode_scrollBar },
3771#endif 3656#endif
3772 // 18, 19 printing-related
3773 { 25, PrivMode_VisibleCursor },
3774 // 30 show scrollbar rxvt. extension
3775 { 35, PrivMode_ShiftKeys }, // rxvt extension 3657 { 35, PrivMode_ShiftKeys }, // rxvt extension
3658 // 38, tektronix mode // DECTEK
3776 { 40, PrivMode_132OK }, 3659 { 40, PrivMode_132OK },
3777 // 41 xterm more fixes NYI 3660 // 41 xterm more fixes NYI
3778 // 45 margin bell NYI 3661 // 45 margin bell NYI
3779 // 46 start logging 3662 // 46 start logging
3780 { 47, PrivMode_Screen }, 3663 { 47, PrivMode_Screen },
3781 { 66, PrivMode_aplKP }, 3664 { 66, PrivMode_aplKP }, // DECPAM/DECPNM
3782#ifndef NO_BACKSPACE_KEY 3665#ifndef NO_BACKSPACE_KEY
3783 { 67, PrivMode_BackSpace }, 3666 { 67, PrivMode_BackSpace }, // DECBKM
3784#endif 3667#endif
3785 { 1000, PrivMode_MouseX11 }, 3668 { 1000, PrivMode_MouseX11 },
3786 // 1001 Use Hilite Mouse Tracking. NYI, TODO 3669 { 1002, PrivMode_MouseBtnEvent },
3787 // 1002 Use Cell Motion Mouse Tracking. NYI, TODO 3670 { 1003, PrivMode_MouseAnyEvent },
3788 // 1003 Use All Motion Mouse Tracking. NYI, TODO 3671#if ENABLE_FRILLS
3672 { 1005, PrivMode_ExtModeMouse },
3673#endif
3789 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3674 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3790 { 1011, PrivMode_Keypress }, // rxvt extension 3675 { 1011, PrivMode_Keypress }, // rxvt extension
3676#if ENABLE_FRILLS
3677 { 1015, PrivMode_ExtMouseRight }, // urxvt extension of 1005
3678#endif
3791 // 1035 enable modifiers for alt, numlock NYI 3679 // 1035 enable modifiers for alt, numlock NYI
3792 // 1036 send ESC for meta keys NYI 3680 // 1036 send ESC for meta keys NYI
3793 // 1037 send DEL for keypad delete NYI 3681 // 1037 send DEL for keypad delete NYI
3794 { 1047, PrivMode_Screen }, 3682 { 1047, PrivMode_Screen },
3795 // 1048 save and restore cursor 3683 // 1048 save and restore cursor, implemented in code
3796 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */ 3684 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
3797 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3685 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3686 { 2004, PrivMode_BracketPaste },
3798 }; 3687 };
3799 3688
3800 if (nargs == 0) 3689 if (nargs == 0)
3801 return; 3690 return;
3802 3691
… …
3809 for (i = 0; i < nargs; i++) 3698 for (i = 0; i < nargs; i++)
3810 { 3699 {
3811 state = -1; 3700 state = -1;
3812 3701
3813 /* basic handling */ 3702 /* basic handling */
3814 for (j = 0; j < (sizeof (argtopriv)/sizeof (argtopriv[0])); j++) 3703 for (j = 0; j < ARRAY_LENGTH(argtopriv); j++)
3815 if (argtopriv[j].argval == arg[i]) 3704 if (argtopriv[j].argval == arg[i])
3816 { 3705 {
3817 state = privcases (mode, argtopriv[j].bit); 3706 state = privcases (mode, argtopriv[j].bit);
3818 break; 3707 break;
3819 } 3708 }
3820 3709
3821 /* extra handling for values with state unkept */ 3710 /* extra handling for values with state unkept */
3822 switch (arg[i]) 3711 switch (arg[i])
3823 { 3712 {
3713#if ENABLE_STYLES
3714 case 1021:
3715 set_option (Opt_intensityStyles, mode);
3716
3717 scr_touch (true);
3718 break;
3719#endif
3824 case 1048: /* alternative cursor save */ 3720 case 1048: /* alternative cursor save */
3825 if (Options & Opt_secondaryScreen) 3721 if (option (Opt_secondaryScreen))
3826 if (mode == 0) 3722 if (mode == 0)
3827 scr_cursor (RESTORE); 3723 scr_cursor (RESTORE);
3828 else if (mode == 1) 3724 else if (mode == 1)
3829 scr_cursor (SAVE); 3725 scr_cursor (SAVE);
3830 break; 3726 break;
… …
3838 case 2: /* VT52 mode */ 3734 case 2: /* VT52 mode */
3839 /* oddball mode. should be set regardless of set/reset 3735 /* oddball mode. should be set regardless of set/reset
3840 * parameter. Return from VT52 mode with an ESC < from 3736 * parameter. Return from VT52 mode with an ESC < from
3841 * within VT52 mode 3737 * within VT52 mode
3842 */ 3738 */
3843 PrivMode (1, PrivMode_vt52); 3739 set_privmode (PrivMode_vt52, 1);
3844 break; 3740 break;
3845 case 3: /* 80/132 */ 3741 case 3: /* 80/132 */
3846 if (PrivateModes & PrivMode_132OK) 3742 if (priv_modes & PrivMode_132OK)
3847 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height); 3743 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
3848 break; 3744 break;
3849 case 4: /* smooth scrolling */ 3745 case 4: /* smooth scrolling */
3850 if (state) 3746 set_option (Opt_jumpScroll, !state);
3851 Options &= ~Opt_jumpScroll;
3852 else
3853 Options |= Opt_jumpScroll;
3854 break; 3747 break;
3855 case 5: /* reverse video */ 3748 case 5: /* reverse video */
3856 scr_rvideo_mode (state); 3749 scr_rvideo_mode (state);
3857 break; 3750 break;
3858 case 6: /* relative/absolute origins */ 3751 case 6: /* relative/absolute origins */
… …
3862 scr_autowrap (state); 3755 scr_autowrap (state);
3863 break; 3756 break;
3864 /* case 8: - auto repeat, can't do on a per window basis */ 3757 /* case 8: - auto repeat, can't do on a per window basis */
3865 case 9: /* X10 mouse reporting */ 3758 case 9: /* X10 mouse reporting */
3866 if (state) /* orthogonal */ 3759 if (state) /* orthogonal */
3867 PrivateModes &= ~PrivMode_MouseX11; 3760 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3868 break; 3761 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 3762#ifdef scrollBar_esc
3877 case scrollBar_esc: 3763 case scrollBar_esc:
3878 if (scrollbar_mapping (state)) 3764 if (scrollBar.map (state))
3879 { 3765 {
3880 resize_all_windows (0, 0, 0); 3766 resize_all_windows (0, 0, 0);
3881 scr_touch (true); 3767 scr_touch (true);
3882 } 3768 }
3883 break; 3769 break;
… …
3892 break; 3778 break;
3893 /* case 66: - application key pad */ 3779 /* case 66: - application key pad */
3894 /* case 67: - backspace key */ 3780 /* case 67: - backspace key */
3895 case 1000: /* X11 mouse reporting */ 3781 case 1000: /* X11 mouse reporting */
3896 if (state) /* orthogonal */ 3782 if (state) /* orthogonal */
3897 PrivateModes &= ~PrivMode_MouseX10; 3783 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3898 break; 3784 break;
3899#if 0
3900 case 1001: 3785 case 1002:
3901 break; /* X11 mouse highlighting */ 3786 case 1003:
3902#endif 3787 if (state)
3788 {
3789 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3790 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3791 mouse_row = mouse_col = 0;
3792 vt_emask_mouse = PointerMotionMask;
3793 }
3794 else
3795 vt_emask_mouse = NoEventMask;
3796
3797 vt_select_input ();
3798 break;
3903 case 1010: /* scroll to bottom on TTY output inhibit */ 3799 case 1010: /* scroll to bottom on TTY output inhibit */
3904 if (state)
3905 Options &= ~Opt_scrollTtyOutput;
3906 else
3907 Options |= Opt_scrollTtyOutput; 3800 set_option (Opt_scrollTtyOutput, !state);
3908 break; 3801 break;
3909 case 1011: /* scroll to bottom on key press */ 3802 case 1011: /* scroll to bottom on key press */
3910 if (state)
3911 Options |= Opt_scrollTtyKeypress; 3803 set_option (Opt_scrollTtyKeypress, state);
3912 else
3913 Options &= ~Opt_scrollTtyKeypress;
3914 break; 3804 break;
3915 case 1047: /* secondary screen w/ clearing last */ 3805 case 1047: /* secondary screen w/ clearing last */
3916 if (Options & Opt_secondaryScreen) 3806 if (option (Opt_secondaryScreen))
3917 if (current_screen != PRIMARY) 3807 if (!state)
3918 scr_erase_screen (2); 3808 scr_erase_screen (2);
3809
3919 scr_change_screen (state); 3810 scr_change_screen (state);
3920 break; 3811 break;
3921 case 1049: /* secondary screen w/ clearing first */ 3812 case 1049: /* secondary screen w/ clearing first */
3813 if (option (Opt_secondaryScreen))
3814 if (state)
3815 scr_cursor (SAVE);
3816
3922 scr_change_screen (state); 3817 scr_change_screen (state);
3818
3923 if (Options & Opt_secondaryScreen) 3819 if (option (Opt_secondaryScreen))
3924 if (current_screen != PRIMARY) 3820 if (state)
3925 scr_erase_screen (2); 3821 scr_erase_screen (2);
3822 else
3823 scr_cursor (RESTORE);
3926 break; 3824 break;
3927 default: 3825 default:
3928 break; 3826 break;
3929 } 3827 }
3930 } 3828 }
… …
3954 rendset = 0, rendstyle = ~RS_None; 3852 rendset = 0, rendstyle = ~RS_None;
3955 break; 3853 break;
3956 case 1: 3854 case 1:
3957 rendset = 1, rendstyle = RS_Bold; 3855 rendset = 1, rendstyle = RS_Bold;
3958 break; 3856 break;
3959 //case 2: // faint or second colour 3857 //case 2: // low intensity
3858 case 3:
3859 rendset = 1, rendstyle = RS_Italic;
3860 break;
3960 case 4: 3861 case 4:
3961 rendset = 1, rendstyle = RS_Uline; 3862 rendset = 1, rendstyle = RS_Uline;
3962 break; 3863 break;
3963 case 5: // slowly blinking 3864 case 5: // slowly blinking
3964 case 6: // rapidly blinking 3865 case 6: // rapidly blinking
… …
3976 //case 11: // scoansi acs on, first alt font 3877 //case 11: // scoansi acs on, first alt font
3977 //case 12: // scoansi acs on, |0x80, second alt font 3878 //case 12: // scoansi acs on, |0x80, second alt font
3978 //... 3879 //...
3979 //case 19: // ninth alt font 3880 //case 19: // ninth alt font
3980 //case 20: // gothic 3881 //case 20: // gothic
3981 case 21: // disable bold, faint 3882 case 21: // disable bold, faint, sometimes doubly underlined (iso 8613)
3982 rendset = 0, rendstyle = RS_Bold; 3883 rendset = 0, rendstyle = RS_Bold;
3983 break; 3884 break;
3984 case 22: 3885 case 22: // normal intensity
3985 rendset = 0, rendstyle = RS_Bold; 3886 rendset = 0, rendstyle = RS_Bold;
3986 break; 3887 break;
3987 //case 23: disable italic 3888 case 23: // disable italic
3889 rendset = 0, rendstyle = RS_Italic;
3890 break;
3988 case 24: 3891 case 24:
3989 rendset = 0, rendstyle = RS_Uline; 3892 rendset = 0, rendstyle = RS_Uline;
3990 break; 3893 break;
3991 case 25: 3894 case 25:
3895 rendset = 0, rendstyle = RS_Blink;
3896 break;
3897 case 26: // variable spacing (iso 8613)
3992 rendset = 0, rendstyle = RS_Blink; 3898 rendset = 0, rendstyle = RS_Blink;
3993 break; 3899 break;
3994 case 27: 3900 case 27:
3995 rendset = 0, rendstyle = RS_RVid; 3901 rendset = 0, rendstyle = RS_RVid;
3996 break; 3902 break;
… …
4014 case 35: 3920 case 35:
4015 case 36: 3921 case 36:
4016 case 37: 3922 case 37:
4017 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg); 3923 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg);
4018 break; 3924 break;
4019#ifdef TTY_256COLOR 3925 case 38: // set fg color, ISO 8613-6
4020 case 38:
4021 if (nargs > i + 2 && arg[i + 1] == 5) 3926 if (nargs > i + 2 && arg[i + 1] == 5)
4022 { 3927 {
4023 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg); 3928 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg);
4024 i += 2; 3929 i += 2;
4025 } 3930 }
4026 break; 3931 break;
4027#endif
4028 case 39: /* default fg */ 3932 case 39: /* default fg */
4029 scr_color (Color_fg, Color_fg); 3933 scr_color (Color_fg, Color_fg);
4030 break; 3934 break;
4031 3935
4032 case 40: 3936 case 40:
… …
4037 case 45: 3941 case 45:
4038 case 46: 3942 case 46:
4039 case 47: 3943 case 47:
4040 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg); 3944 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg);
4041 break; 3945 break;
4042#ifdef TTY_256COLOR 3946 case 48: // set bg color, ISO 8613-6
4043 case 48:
4044 if (nargs > i + 2 && arg[i + 1] == 5) 3947 if (nargs > i + 2 && arg[i + 1] == 5)
4045 { 3948 {
4046 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg); 3949 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg);
4047 i += 2; 3950 i += 2;
4048 } 3951 }
4049 break; 3952 break;
4050#endif
4051 case 49: /* default bg */ 3953 case 49: /* default bg */
4052 scr_color (Color_bg, Color_bg); 3954 scr_color (Color_bg, Color_bg);
4053 break; 3955 break;
4054 3956
4055#ifndef NO_BRIGHTCOLOR 3957 //case 50: // not variable spacing
3958
3959#if !ENABLE_MINIMAL
4056 case 90: 3960 case 90:
4057 case 91: /* set bright fg color */ 3961 case 91: /* set bright fg color */
4058 case 92: 3962 case 92:
4059 case 93: 3963 case 93:
4060 case 94: 3964 case 94:
4061 case 95: 3965 case 95:
4062 case 96: 3966 case 96:
4063 case 97: 3967 case 97:
4064 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), 3968 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), Color_fg);
4065 Color_fg);
4066 break; 3969 break;
4067 case 100: 3970 case 100:
4068 case 101: /* set bright bg color */ 3971 case 101: /* set bright bg color */
4069 case 102: 3972 case 102:
4070 case 103: 3973 case 103:
4071 case 104: 3974 case 104:
4072 case 105: 3975 case 105:
4073 case 106: 3976 case 106:
4074 case 107: 3977 case 107:
4075 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), 3978 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);
4076 Color_bg);
4077 break; 3979 break;
4078#endif 3980#endif
4079
4080 } 3981 }
4081 } 3982 }
4082} 3983}
4083/*}}} */ 3984/*}}} */
4084 3985
… …
4087rxvt_term::process_graphics () 3988rxvt_term::process_graphics ()
4088{ 3989{
4089 unicode_t ch, cmd = cmd_getc (); 3990 unicode_t ch, cmd = cmd_getc ();
4090 3991
4091 if (cmd == 'Q') 3992 if (cmd == 'Q')
3993 {
4092 { /* query graphics */ 3994 /* query graphics */
4093 tt_printf ("\033G0\n"); /* no graphics */ 3995 tt_printf ("\033G0\012"); /* no graphics */
4094 return; 3996 return;
4095 } 3997 }
4096 /* swallow other graphics sequences until terminating ':' */ 3998 /* swallow other graphics sequences until terminating ':' */
4097 do 3999 do
4098 ch = cmd_getc (); 4000 ch = cmd_getc ();
… …
4108 */ 4010 */
4109void 4011void
4110rxvt_term::tt_printf (const char *fmt,...) 4012rxvt_term::tt_printf (const char *fmt,...)
4111{ 4013{
4112 va_list arg_ptr; 4014 va_list arg_ptr;
4113 unsigned char buf[256]; 4015 char buf[256];
4114 4016
4115 va_start (arg_ptr, fmt); 4017 va_start (arg_ptr, fmt);
4116 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4018 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
4117 va_end (arg_ptr); 4019 va_end (arg_ptr);
4118 tt_write (buf, STRLEN (buf)); 4020 tt_write (buf, strlen (buf));
4119} 4021}
4120 4022
4121/* ---------------------------------------------------------------------- */ 4023/* ---------------------------------------------------------------------- */
4122/* Write data to the pty as typed by the user, pasted with the mouse, 4024/* 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. 4025 * or generated by us in response to a query ESC sequence.
4124 */ 4026 */
4125void 4027static 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 4028
4130 if (len) 4029void
4030rxvt_term::tt_write (const char *data, unsigned int len)
4031{
4032 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4033 return;
4034
4035 if (pty->pty < 0)
4036 return;
4037
4038 if (v_buflen == 0)
4039 {
4040 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
4041
4042 if ((unsigned int)written == len)
4043 return;
4044
4045 data += written;
4046 len -= written;
4131 { 4047 }
4048
4049 v_buffer = (char *)rxvt_realloc (v_buffer, v_buflen + len);
4050
4051 memcpy (v_buffer + v_buflen, data, len);
4052 v_buflen += len;
4053
4054 pty_ev.set (ev::READ | ev::WRITE);
4055}
4056
4057void rxvt_term::pty_write ()
4058{
4059 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4060
4061 if (written > 0)
4062 {
4063 v_buflen -= written;
4064
4132 if (v_buflen == 0) 4065 if (v_buflen == 0)
4133 { 4066 {
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); 4067 free (v_buffer);
4161 v_buffer = 0; 4068 v_buffer = 0;
4162 v_buflen = 0;
4163 4069
4164 pty_ev.set (EVENT_READ); 4070 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; 4071 return;
4177 } 4072 }
4073
4074 memmove (v_buffer, v_buffer + written, v_buflen);
4178 } 4075 }
4076 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4077 pty_ev.set (ev::READ);
4179} 4078}
4180 4079
4181/*----------------------- end-of-file (C source) -----------------------*/ 4080/*----------------------- end-of-file (C source) -----------------------*/
4182 4081

Diff Legend

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