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.56 by pcg, Tue Feb 24 00:02:44 2004 UTC vs.
Revision 1.288 by root, Sat Jan 28 20:33:31 2006 UTC

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

Diff Legend

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