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

Diff Legend

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