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

Diff Legend

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