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

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.53 by pcg, Sun Feb 22 12:34:53 2004 UTC vs.
Revision 1.364 by ayin, Mon Nov 12 14:53:13 2007 UTC

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

Diff Legend

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