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

Diff Legend

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