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

Diff Legend

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