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

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.51 by pcg, Sun Feb 22 08:28:36 2004 UTC vs.
Revision 1.376 by root, Fri Dec 14 02:08:18 2007 UTC

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

Diff Legend

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