ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/command.C
(Generate patch)

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.51 by pcg, Sun Feb 22 08:28:36 2004 UTC vs.
Revision 1.352 by ayin, Sun Sep 9 10:35:00 2007 UTC

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

Diff Legend

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