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

Diff Legend

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