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

Diff Legend

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