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

Diff Legend

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