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

Diff Legend

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