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.55 by pcg, Sun Feb 22 20:08:18 2004 UTC vs.
Revision 1.283 by root, Tue Jan 24 19:40:12 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 (display->display, 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 (display->display, vt, display->blank_cursor);
993 XFlush (display->display); 1188 XFlush (display->display);
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
1008void 1202void
1009rxvt_term::mouse_report (const XButtonEvent &ev) 1203rxvt_term::mouse_report (XButtonEvent &ev)
1010{ 1204{
1011 int button_number, key_state = 0; 1205 int button_number, key_state = 0;
1012 int x, y; 1206 int x, y;
1013 1207
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 1270
1080#ifdef USING_W11LIB 1271#ifdef USING_W11LIB
1081void 1272void
1082rxvt_W11_process_x_event (XEvent *ev) 1273rxvt_W11_process_x_event (XEvent *ev)
… …
1089 1280
1090/*{{{ process an X event */ 1281/*{{{ process an X event */
1091void 1282void
1092rxvt_term::x_cb (XEvent &ev) 1283rxvt_term::x_cb (XEvent &ev)
1093{ 1284{
1094 SET_R (this); 1285 make_current ();
1095 SET_LOCALE (locale);
1096 1286
1097#if defined(CURSOR_BLINK) 1287 dDisp;
1098 if ((Options & Opt_cursorBlink) && ev.type == KeyPress)
1099 {
1100 if (hidden_cursor)
1101 {
1102 hidden_cursor = 0;
1103 want_refresh = 1;
1104 }
1105 1288
1106 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1289 if (ev.xany.window == vt
1107 } 1290 && SHOULD_INVOKE (HOOK_X_EVENT)
1108#endif 1291 && 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; 1292 return;
1127#endif
1128 1293
1294 // for XQueryPointer
1129 Window unused_root, unused_child; 1295 Window unused_root, unused_child;
1130 int unused_root_x, unused_root_y; 1296 int unused_root_x, unused_root_y;
1131 unsigned int unused_mask; 1297 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 1298
1182 switch (ev.type) 1299 switch (ev.type)
1183 { 1300 {
1184 case KeyPress: 1301 case KeyPress:
1302#if ISO_14755
1303 if (!(iso14755buf & ISO_14755_52))
1304#endif
1185 lookup_key (ev.xkey); 1305 lookup_key (ev.xkey);
1306
1307 break;
1308
1309 case KeyRelease:
1310 {
1311#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
1312 KeySym keysym;
1313
1314 keysym = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1315#endif
1316
1317#if ENABLE_FRILLS || ISO_14755
1318 // ISO 14755 support
1319 if (iso14755buf)
1320 if (iso14755buf & ISO_14755_52)
1321 {
1322# if ENABLE_OVERLAY
1323 scr_overlay_off ();
1324# endif
1325# if ISO_14755
1326 // iso14755 part 5.2 handling: release time
1327 // first: controls
1328 if ((ev.xkey.state & ControlMask)
1329 && ((keysym >= 0x40 && keysym <= 0x5f)
1330 || (keysym >= 0x61 && keysym <= 0x7f)))
1331 {
1332 iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
1333 commit_iso14755 ();
1334 goto skip_switch;
1335 }
1336
1337 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1338 if (i[0] == keysym)
1339 {
1340 iso14755buf = ISO_14755_51 | i[1];
1341 commit_iso14755 ();
1342 goto skip_switch;
1343 }
1344
1345 scr_bell ();
1346# endif
1347 iso14755buf = 0;
1348 break;
1349 }
1350 else if ((ev.xkey.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
1351 {
1352# if ENABLE_OVERLAY
1353 scr_overlay_off ();
1354# endif
1355 if (iso14755buf & ISO_14755_51)
1356 commit_iso14755 ();
1357#if ISO_14755
1358 else if (iso14755buf & ISO_14755_STARTED)
1359 {
1360 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
1361
1362 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
1363 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
1364 }
1365# endif
1366 else
1367 iso14755buf = 0;
1368 }
1369#endif
1370
1371 if (ev.xany.window == vt
1372 && HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
1186 break; 1373 break;
1187 1374
1188#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1375#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1189 case KeyRelease:
1190 {
1191 if (! (ev.xkey.state & ControlMask)) 1376 if (!(ev.xkey.state & ControlMask))
1377 slip_wheel_ev.stop ();
1378 else if (keysym == XK_Control_L || keysym == XK_Control_R)
1192 mouse_slip_wheel_speed = 0; 1379 mouse_slip_wheel_speed = 0;
1193 else 1380#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; 1381 break;
1202 } 1382 }
1203#endif
1204 1383
1205 case ButtonPress: 1384 case ButtonPress:
1206 button_press (ev.xbutton); 1385 button_press (ev.xbutton);
1207 break; 1386 break;
1208 1387
… …
1210 button_release (ev.xbutton); 1389 button_release (ev.xbutton);
1211 break; 1390 break;
1212 1391
1213 case ClientMessage: 1392 case ClientMessage:
1214 if (ev.xclient.format == 32 1393 if (ev.xclient.format == 32
1215 && (Atom)ev.xclient.data.l[0] == xa[XA_WMDELETEWINDOW]) 1394 && !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 { 1395 {
1224 /* Get Dnd data */ 1396 if (ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
1225 Atom ActualType; 1397 {
1226 int ActualFormat; 1398 if (!HOOK_INVOKE ((this, HOOK_WM_PROTOCOLS, DT_XEVENT, &ev, DT_END)))
1227 unsigned char *data; 1399 {
1228 unsigned long Size, RemainingBytes; 1400 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1229 1401 {
1230 XGetWindowProperty (display->display, display->root, 1402 if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END)))
1231 xa[XA_DNDSELECTION], 1403 destroy ();
1232 0L, 1000000L, 1404 }
1233 False, AnyPropertyType, 1405#if ENABLE_EWMH
1234 &ActualType, &ActualFormat, 1406 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1235 &Size, &RemainingBytes, 1407 XSendEvent (disp, ev.xclient.window = display->root,
1408 False, SubstructureRedirectMask | SubstructureNotifyMask,
1236 &data); 1409 &ev);
1237 XChangeProperty (display->display, display->root, 1410#endif
1238 XA_CUT_BUFFER0, XA_STRING, 1411 }
1239 8, PropModeReplace, 1412 }
1240 data, STRLEN (data)); 1413#if ENABLE_XEMBED
1241 selection_paste (display->root, XA_CUT_BUFFER0, True); 1414 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1242 XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime); 1415 {
1416 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1417 focus_in ();
1418 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1419 focus_out ();
1420 }
1421#endif
1243 } 1422 }
1244#endif /* OFFIX_DND */
1245 break; 1423 break;
1246 1424
1247 case MappingNotify: 1425 case MappingNotify:
1248 XRefreshKeyboardMapping (& (ev.xmapping)); 1426 XRefreshKeyboardMapping (&ev.xmapping);
1249 break; 1427 break;
1250 1428
1251 /* 1429 /*
1252 * XXX: this is not the _current_ arrangement 1430 * XXX: this is not the _current_ arrangement
1253 * Here's my conclusion: 1431 * Here's my conclusion:
… …
1272 break; 1450 break;
1273 } 1451 }
1274 break; 1452 break;
1275 1453
1276 case FocusIn: 1454 case FocusIn:
1277 if (!TermWin.focus) 1455 focus_in ();
1456 break;
1457
1458 case FocusOut:
1459 focus_out ();
1460 break;
1461
1462 case ConfigureNotify:
1463 if (ev.xconfigure.window == parent[0])
1278 { 1464 {
1279 TermWin.focus = 1; 1465 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev))
1280 want_refresh = 1; 1466 ;
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 1467
1468 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1469 {
1470 seen_resize = 1;
1471 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1472 }
1473
1474 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1475
1476#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1477 if (OPTION (Opt_transparent))
1478 check_our_parents ();
1479#endif
1290 } 1480 }
1291 break; 1481 break;
1292 1482
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: 1483 case PropertyNotify:
1312 if (ev.xconfigure.window == TermWin.parent[0]) 1484 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
1313 { 1485 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1314 int height, width; 1486 && ev.xproperty.state == PropertyNewValue)
1487 selection_property (ev.xproperty.window, ev.xproperty.atom);
1315 1488
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; 1489 break;
1346 1490
1347 case SelectionClear: 1491 case SelectionClear:
1348 display->set_selection_owner (0); 1492 selection_clear ();
1349 break; 1493 break;
1350 1494
1351 case SelectionNotify: 1495 case SelectionNotify:
1352 if (selection_wait == Sel_normal) 1496 if (selection_wait == Sel_normal)
1353 selection_paste (ev.xselection.requestor, 1497 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1354 ev.xselection.property, True);
1355 break; 1498 break;
1356 1499
1357 case SelectionRequest: 1500 case SelectionRequest:
1358 selection_send (ev.xselectionrequest); 1501 selection_send (ev.xselectionrequest);
1359 break; 1502 break;
1360 1503
1504 case MapNotify:
1505 mapped = 1;
1506#ifdef TEXT_BLINK
1507 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1508#endif
1509 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1510 break;
1511
1361 case UnmapNotify: 1512 case UnmapNotify:
1362 TermWin.mapped = 0; 1513 mapped = 0;
1363#ifdef TEXT_BLINK 1514#ifdef TEXT_BLINK
1364 text_blink_ev.stop (); 1515 text_blink_ev.stop ();
1365#endif 1516#endif
1366 break; 1517 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; 1518 break;
1374 1519
1375#ifdef TRANSPARENT 1520#ifdef TRANSPARENT
1376 case ReparentNotify: 1521 case ReparentNotify:
1377 rootwin_cb (ev); 1522 rootwin_cb (ev);
1378 break; 1523 break;
1379#endif /* TRANSPARENT */ 1524#endif /* TRANSPARENT */
1380 1525
1381 case GraphicsExpose: 1526 case GraphicsExpose:
1382 case Expose: 1527 case Expose:
1383 if (ev.xany.window == TermWin.vt) 1528 if (ev.xany.window == vt)
1384 { 1529 {
1385#ifdef NO_SLOW_LINK_SUPPORT 1530 do
1386 scr_expose (ev.xexpose.x, ev.xexpose.y, 1531 scr_expose (ev.xexpose.x, ev.xexpose.y,
1387 ev.xexpose.width, ev.xexpose.height, False); 1532 ev.xexpose.width, ev.xexpose.height, False);
1388#else 1533 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev));
1389 // don't understand this, so commented it out 1534
1535 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1536
1537 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev))
1390 scr_expose (ev.xexpose.x, ev.xexpose.y, 1538 scr_expose (ev.xexpose.x, ev.xexpose.y,
1391 ev.xexpose.width, ev.xexpose.height, False); 1539 ev.xexpose.width, ev.xexpose.height, False);
1392 //scr_expose (ev.xexpose.x, 0, 1540
1393 // ev.xexpose.width, TermWin.height, False);
1394#endif
1395 want_refresh = 1; 1541 want_refresh = 1;
1396 } 1542 }
1397 else 1543 else
1398 { 1544 {
1399 XEvent unused_event; 1545 XEvent unused_event;
1400 1546
1401 while (XCheckTypedWindowEvent (display->display, ev.xany.window, 1547 while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event))
1402 Expose, 1548 ;
1403 &unused_event)) ; 1549 while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event))
1404 while (XCheckTypedWindowEvent (display->display, ev.xany.window, 1550 ;
1405 GraphicsExpose, 1551
1406 &unused_event)) ;
1407 if (isScrollbarWindow (ev.xany.window)) 1552 if (isScrollbarWindow (ev.xany.window))
1408 { 1553 {
1409 scrollBar.setIdle (); 1554 scrollBar.setIdle ();
1410 scrollbar_show (0); 1555 scrollbar_show (0);
1411 } 1556 }
1412#ifdef MENUBAR 1557
1413 if (menubar_visible () && isMenuBarWindow (ev.xany.window)) 1558#ifdef TRANSPARENT
1414 menubar_expose (); 1559 if (am_transparent && ev.xany.window == parent[0])
1560 XClearWindow (disp, ev.xany.window);
1415#endif 1561#endif
1416 } 1562 }
1417 break; 1563 break;
1418 1564
1419 case MotionNotify: 1565 case MotionNotify:
1420#ifdef POINTER_BLANK 1566#ifdef POINTER_BLANK
1421 if (hidden_pointer) 1567 if (hidden_pointer)
1422 pointer_unblank (); 1568 pointer_unblank ();
1423#endif 1569#endif
1424#if MENUBAR 1570 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1425 if (isMenuBarWindow (ev.xany.window)) 1571 break;
1572
1573 if (ev.xany.window == vt)
1426 { 1574 {
1427 menubar_control (& (ev.xbutton)); 1575 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1428 break; 1576 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1429 } 1577 ; // 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))) 1578 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1437 { 1579 {
1438 while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev)) 1580 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev))
1439 ; 1581 ;
1440 1582
1441 XQueryPointer (display->display, TermWin.vt, 1583 XQueryPointer (disp, vt,
1442 &unused_root, &unused_child, 1584 &unused_root, &unused_child,
1443 &unused_root_x, &unused_root_y, 1585 &unused_root_x, &unused_root_y,
1444 & (ev.xbutton.x), & (ev.xbutton.y), 1586 &ev.xbutton.x, &ev.xbutton.y,
1445 &unused_mask); 1587 &ev.xbutton.state);
1446#ifdef MOUSE_THRESHOLD 1588#ifdef MOUSE_THRESHOLD
1447 /* deal with a `jumpy' mouse */ 1589 /* deal with a `jumpy' mouse */
1448 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD) 1590 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD)
1449 { 1591 {
1450#endif 1592#endif
1593#if ISO_14755
1594 // 5.4
1595 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1596 {
1597 iso14755_54 (ev.xbutton.x, ev.xbutton.y);
1598 break;
1599 }
1600#endif
1451 selection_extend ((ev.xbutton.x), (ev.xbutton.y), 1601 selection_extend (ev.xbutton.x, ev.xbutton.y,
1452 (ev.xbutton.state & Button3Mask) ? 2 : 0); 1602 ev.xbutton.state & Button3Mask ? 2 : 0);
1603
1453#ifdef SELECTION_SCROLLING 1604#ifdef SELECTION_SCROLLING
1454 if (ev.xbutton.y < TermWin.int_bwidth 1605 if (ev.xbutton.y < int_bwidth
1455 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1)) 1606 || Pixel2Row (ev.xbutton.y) > (nrow-1))
1456 { 1607 {
1457 int dist; 1608 int dist;
1458
1459 pending_scroll_selection=1;
1460 1609
1461 /* don't clobber the current delay if we are 1610 /* don't clobber the current delay if we are
1462 * already in the middle of scrolling. 1611 * already in the middle of scrolling.
1463 */ 1612 */
1464 if (scroll_selection_delay<=0) 1613 if (!sel_scroll_ev.active)
1465 scroll_selection_delay=SCROLLBAR_CONTINUOUS_DELAY; 1614 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY);
1466 1615
1467 /* save the event params so we can highlight 1616 /* save the event params so we can highlight
1468 * the selection in the pending-scroll loop 1617 * the selection in the pending-scroll loop
1469 */ 1618 */
1470 selection_save_x=ev.xbutton.x; 1619 selection_save_x = ev.xbutton.x;
1471 selection_save_y=ev.xbutton.y; 1620 selection_save_y = ev.xbutton.y;
1472 selection_save_state=
1473 (ev.xbutton.state & Button3Mask) ? 2 : 0; 1621 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;
1474 1622
1475 /* calc number of lines to scroll */ 1623 /* calc number of lines to scroll */
1476 if (ev.xbutton.y<TermWin.int_bwidth) 1624 if (ev.xbutton.y < int_bwidth)
1477 { 1625 {
1478 scroll_selection_dir = UP; 1626 scroll_selection_dir = UP;
1479 dist = TermWin.int_bwidth - ev.xbutton.y; 1627 dist = int_bwidth - ev.xbutton.y;
1480 } 1628 }
1481 else 1629 else
1482 { 1630 {
1483 scroll_selection_dir = DN; 1631 scroll_selection_dir = DN;
1484 dist = ev.xbutton.y - 1632 dist = ev.xbutton.y - (int_bwidth + height);
1485 (TermWin.int_bwidth + TermWin.height);
1486 } 1633 }
1634
1487 scroll_selection_lines= (Pixel2Height (dist)/ 1635 scroll_selection_lines = Pixel2Height (dist)
1488 SELECTION_SCROLL_LINE_SPEEDUP)+1; 1636 / SELECTION_SCROLL_LINE_SPEEDUP
1637 + 1;
1489 MIN_IT (scroll_selection_lines, 1638 min_it (scroll_selection_lines,
1490 SELECTION_SCROLL_MAX_LINES); 1639 SELECTION_SCROLL_MAX_LINES);
1491 } 1640 }
1492 else 1641 else
1493 { 1642 {
1494 /* we are within the text window, so we 1643 /* we are within the text window, so we
1495 * shouldn't be scrolling 1644 * shouldn't be scrolling
1496 */ 1645 */
1497 pending_scroll_selection = 0; 1646 if (sel_scroll_ev.active)
1647 sel_scroll_ev.stop();
1498 } 1648 }
1499#endif 1649#endif
1500#ifdef MOUSE_THRESHOLD 1650#ifdef MOUSE_THRESHOLD
1501
1502 } 1651 }
1503#endif 1652#endif
1504
1505 } 1653 }
1506 } 1654 }
1507 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1655 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1508 { 1656 {
1509 while (XCheckTypedWindowEvent (display->display, scrollBar.win, 1657 while (XCheckTypedWindowEvent (disp, scrollBar.win,
1510 MotionNotify, &ev)) ; 1658 MotionNotify, &ev))
1659 ;
1660
1511 XQueryPointer (display->display, scrollBar.win, 1661 XQueryPointer (disp, scrollBar.win,
1512 &unused_root, &unused_child, 1662 &unused_root, &unused_child,
1513 &unused_root_x, &unused_root_y, 1663 &unused_root_x, &unused_root_y,
1514 & (ev.xbutton.x), & (ev.xbutton.y), 1664 &ev.xbutton.x, &ev.xbutton.y,
1515 &unused_mask); 1665 &unused_mask);
1516 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1666 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1517 scrollbar_size ()); 1667 scrollbar_size ());
1518 scr_refresh (refresh_type); 1668 want_refresh = 1;
1519 refresh_limit = 0; 1669 refresh_limit = 0;
1520 scrollbar_show (1); 1670 scrollbar_show (1);
1521 } 1671 }
1522 break; 1672 break;
1523 } 1673 }
1524}
1525 1674
1675skip_switch: ;
1676
1677#if defined(CURSOR_BLINK)
1678 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress)
1679 {
1680 if (hidden_cursor)
1681 {
1682 hidden_cursor = 0;
1683 want_refresh = 1;
1684 }
1685
1686 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1687 }
1688#endif
1689
1690#if defined(POINTER_BLANK)
1691 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
1692 {
1693 if (ev.type == MotionNotify
1694 || ev.type == ButtonPress
1695 || ev.type == ButtonRelease)
1696 if (hidden_pointer)
1697 pointer_unblank ();
1698
1699 if (ev.type == KeyPress && hidden_pointer == 0)
1700 pointer_blank ();
1701 }
1702#endif
1703}
1704
1705void
1706rxvt_term::focus_in ()
1707{
1708 if (!focus)
1709 {
1710 focus = 1;
1711 want_refresh = 1;
1712
1713 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1714
1715#if USE_XIM
1716 if (Input_Context != NULL)
1717 {
1718 IMSetStatusPosition ();
1719 XSetICFocus (Input_Context);
1720 }
1721#endif
1722#if CURSOR_BLINK
1723 if (OPTION (Opt_cursorBlink))
1724 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1725#endif
1726#if OFF_FOCUS_FADING
1727 if (rs[Rs_fade])
1728 {
1729 pix_colors = pix_colors_focused;
1730 scr_recolour ();
1731 }
1732#endif
1733 }
1734}
1735
1736void
1737rxvt_term::focus_out ()
1738{
1739 if (focus)
1740 {
1741 focus = 0;
1742 want_refresh = 1;
1743
1744 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1745
1746#if ENABLE_FRILLS || ISO_14755
1747 if (iso14755buf)
1748 {
1749 iso14755buf = 0;
1750# if ENABLE_OVERLAY
1751 scr_overlay_off ();
1752# endif
1753 }
1754#endif
1755#if USE_XIM
1756 if (Input_Context != NULL)
1757 XUnsetICFocus (Input_Context);
1758#endif
1759#if CURSOR_BLINK
1760 if (OPTION (Opt_cursorBlink))
1761 cursor_blink_ev.stop ();
1762 hidden_cursor = 0;
1763#endif
1764#if OFF_FOCUS_FADING
1765 if (rs[Rs_fade])
1766 {
1767 pix_colors = pix_colors_unfocused;
1768 scr_recolour ();
1769 }
1770#endif
1771 }
1772}
1773
1774#if TRANSPARENT
1526void 1775void
1527rxvt_term::rootwin_cb (XEvent &ev) 1776rxvt_term::rootwin_cb (XEvent &ev)
1528{ 1777{
1529 SET_R (this); 1778 make_current ();
1530 SET_LOCALE (locale);
1531 1779
1532 switch (ev.type) 1780 switch (ev.type)
1533 { 1781 {
1534 case PropertyNotify: 1782 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 /* 1783 /*
1545 * if user used some Esetroot compatible prog to set the root bg, 1784 * 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. 1785 * use the property to determine the pixmap. We use it later on.
1547 */ 1786 */
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]) 1787 if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID]
1788 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID])
1552 return; 1789 return;
1553 }
1554 1790
1555 /* FALLTHROUGH */ 1791 /* FALLTHROUGH */
1556 case ReparentNotify: 1792 case ReparentNotify:
1557 if ((Options & Opt_transparent) && check_our_parents ()) 1793 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)
1558 if (am_transparent)
1559 want_full_refresh = 1; 1794 want_refresh = want_full_refresh = 1;
1560 break; 1795 break;
1561#endif
1562 } 1796 }
1563} 1797}
1798#endif
1564 1799
1565void 1800void
1566rxvt_term::button_press (const XButtonEvent &ev) 1801rxvt_term::button_press (XButtonEvent &ev)
1567{ 1802{
1568 int reportmode = 0, clickintime; 1803 int reportmode = 0, clickintime;
1569 1804
1570 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1805 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1806
1571 if (!bypass_keystate) 1807 if (!bypass_keystate)
1572 reportmode = !! (PrivateModes & PrivMode_mouse_report); 1808 reportmode = !! (priv_modes & PrivMode_mouse_report);
1809
1573 /* 1810 /*
1574 * VT window processing of button press 1811 * VT window processing of button press
1575 */ 1812 */
1576 if (ev.window == TermWin.vt) 1813 if (ev.window == vt)
1577 { 1814 {
1815 if (HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1816 return;
1817
1818#if ISO_14755
1819 // 5.4
1820 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1821 {
1822 iso14755_54 (ev.x, ev.y);
1823 return;
1824 }
1825#endif
1826
1578 clickintime = ev.time - MEvent.time < MULTICLICK_TIME; 1827 clickintime = ev.time - MEvent.time < MULTICLICK_TIME;
1828
1579 if (reportmode) 1829 if (reportmode)
1580 { 1830 {
1581 /* mouse report from vt window */ 1831 /* mouse report from vt window */
1582 /* save the xbutton state (for ButtonRelease) */ 1832 /* save the xbutton state (for ButtonRelease) */
1583 MEvent.state = ev.state; 1833 MEvent.state = ev.state;
1584#ifdef MOUSE_REPORT_DOUBLECLICK 1834#ifdef MOUSE_REPORT_DOUBLECLICK
1585 if (ev.button == MEvent.button && clickintime) 1835 if (ev.button == MEvent.button && clickintime)
1586 { 1836 {
1587 /* same button, within alloted time */ 1837 /* same button, within alloted time */
1588 MEvent.clicks++; 1838 MEvent.clicks++;
1839
1589 if (MEvent.clicks > 1) 1840 if (MEvent.clicks > 1)
1590 { 1841 {
1591 /* only report double clicks */ 1842 /* only report double clicks */
1592 MEvent.clicks = 2; 1843 MEvent.clicks = 2;
1593 mouse_report (ev); 1844 mouse_report (ev);
… …
1612 } 1863 }
1613 else 1864 else
1614 { 1865 {
1615 if (ev.button != MEvent.button) 1866 if (ev.button != MEvent.button)
1616 MEvent.clicks = 0; 1867 MEvent.clicks = 0;
1868
1617 switch (ev.button) 1869 switch (ev.button)
1618 { 1870 {
1619 case Button1: 1871 case Button1:
1872 /* allow meta + click to select rectangular areas */
1873 /* should be done in screen.C */
1874#if ENABLE_FRILLS
1875 selection.rect = !!(ev.state & ModMetaMask);
1876#else
1877 selection.rect = false;
1878#endif
1879
1620 /* allow shift+left click to extend selection */ 1880 /* allow shift+left click to extend selection */
1621 if (ev.state & ShiftMask && ! (PrivateModes & PrivMode_mouse_report)) 1881 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1622 { 1882 {
1623 if (MEvent.button == Button1 && clickintime) 1883 if (MEvent.button == Button1 && clickintime)
1624 selection_rotate (ev.x, ev.y); 1884 selection_rotate (ev.x, ev.y);
1625 else 1885 else
1626 selection_extend (ev.x, ev.y, 1); 1886 selection_extend (ev.x, ev.y, 1);
… …
1641 case Button3: 1901 case Button3:
1642 if (MEvent.button == Button3 && clickintime) 1902 if (MEvent.button == Button3 && clickintime)
1643 selection_rotate (ev.x, ev.y); 1903 selection_rotate (ev.x, ev.y);
1644 else 1904 else
1645 selection_extend (ev.x, ev.y, 1); 1905 selection_extend (ev.x, ev.y, 1);
1906
1646 MEvent.button = Button3; 1907 MEvent.button = Button3;
1647 break; 1908 break;
1648 } 1909 }
1649 } 1910 }
1911
1650 MEvent.time = ev.time; 1912 MEvent.time = ev.time;
1651 return; 1913 return;
1652 } 1914 }
1653 1915
1654 /* 1916 /*
… …
1720 upordown = 1; /* down */ 1982 upordown = 1; /* down */
1721 } 1983 }
1722 if (upordown) 1984 if (upordown)
1723 { 1985 {
1724#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1986#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1725 scroll_arrow_delay = SCROLLBAR_INITIAL_DELAY; 1987 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY);
1726#endif 1988#endif
1727 if (scr_page (upordown < 0 ? UP : DN, 1)) 1989 if (scr_page (upordown < 0 ? UP : DN, 1))
1728 { 1990 {
1729 if (upordown < 0) 1991 if (upordown < 0)
1730 scrollBar.setUp (); 1992 scrollBar.setUp ();
… …
1746 break; 2008 break;
1747 case R_SB_ALIGN_BOTTOM: 2009 case R_SB_ALIGN_BOTTOM:
1748 csrO = scrollBar.bot - scrollBar.top; 2010 csrO = scrollBar.bot - scrollBar.top;
1749 break; 2011 break;
1750 } 2012 }
2013
1751 if (scrollBar.style == R_SB_XTERM 2014 if (scrollBar.style == R_SB_XTERM
1752 || scrollbar_above_slider (ev.y) 2015 || scrollbar_above_slider (ev.y)
1753 || scrollbar_below_slider (ev.y)) 2016 || scrollbar_below_slider (ev.y))
1754 scr_move_to ( scrollbar_position (ev.y) - csrO, 2017 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ());
1755 scrollbar_size ()); 2018
1756 scrollBar.setMotion (); 2019 scrollBar.setMotion ();
1757 break; 2020 break;
1758 2021
1759 case Button1: 2022 case Button1:
1760 if (scrollbar_align == R_SB_ALIGN_CENTRE) 2023 if (scrollbar_align == R_SB_ALIGN_CENTRE)
… …
1764 case Button3: 2027 case Button3:
1765 if (scrollBar.style != R_SB_XTERM) 2028 if (scrollBar.style != R_SB_XTERM)
1766 { 2029 {
1767 if (scrollbar_above_slider (ev.y)) 2030 if (scrollbar_above_slider (ev.y))
1768# ifdef RXVT_SCROLL_FULL 2031# ifdef RXVT_SCROLL_FULL
1769 scr_page (UP, TermWin.nrow - 1); 2032 scr_page (UP, nrow - 1);
1770# else 2033# else
1771 scr_page (UP, TermWin.nrow / 4); 2034 scr_page (UP, nrow / 4);
1772# endif 2035# endif
1773 else if (scrollbar_below_slider (ev.y)) 2036 else if (scrollbar_below_slider (ev.y))
1774# ifdef RXVT_SCROLL_FULL 2037# ifdef RXVT_SCROLL_FULL
1775 scr_page (DN, TermWin.nrow - 1); 2038 scr_page (DN, nrow - 1);
1776# else 2039# else
1777 scr_page (DN, TermWin.nrow / 4); 2040 scr_page (DN, nrow / 4);
1778# endif 2041# endif
1779 else 2042 else
1780 scrollBar.setMotion (); 2043 scrollBar.setMotion ();
1781 } 2044 }
1782 else 2045 else
1783 { 2046 {
1784 scr_page ((ev.button == Button1 ? DN : UP), 2047 scr_page ((ev.button == Button1 ? DN : UP),
1785 (TermWin.nrow 2048 (nrow
1786 * scrollbar_position (ev.y) 2049 * scrollbar_position (ev.y)
1787 / scrollbar_size ())); 2050 / scrollbar_size ()));
1788 } 2051 }
2052
1789 break; 2053 break;
1790 } 2054 }
1791 } 2055 }
2056
1792 return; 2057 return;
1793 } 2058 }
1794#if MENUBAR
1795 /*
1796 * Menubar window processing of button press
1797 */
1798 if (isMenuBarWindow (ev.window))
1799 menubar_control (ev);
1800#endif
1801} 2059}
1802 2060
1803void 2061void
1804rxvt_term::button_release (const XButtonEvent &ev) 2062rxvt_term::button_release (XButtonEvent &ev)
1805{ 2063{
1806 int reportmode = 0; 2064 int reportmode = 0;
1807 2065
1808 csrO = 0; /* reset csr Offset */ 2066 csrO = 0; /* reset csr Offset */
1809 if (!bypass_keystate) 2067 if (!bypass_keystate)
1810 reportmode = !! (PrivateModes & PrivMode_mouse_report); 2068 reportmode = !! (priv_modes & PrivMode_mouse_report);
1811 2069
1812 if (scrollbar_isUpDn ()) 2070 if (scrollbar_isUpDn ())
1813 { 2071 {
1814 scrollBar.setIdle (); 2072 scrollBar.setIdle ();
1815 scrollbar_show (0); 2073 scrollbar_show (0);
1816#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1817 refresh_type &= ~SMOOTH_REFRESH;
1818#endif
1819
1820 } 2074 }
2075
1821#ifdef SELECTION_SCROLLING 2076#ifdef SELECTION_SCROLLING
1822 pending_scroll_selection=0; 2077 if (sel_scroll_ev.active)
2078 sel_scroll_ev.stop();
1823#endif 2079#endif
2080
1824 if (ev.window == TermWin.vt) 2081 if (ev.window == vt)
1825 { 2082 {
2083 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2084 return;
2085
2086#if ISO_14755
2087 // 5.4
2088 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2089 return;
2090#endif
2091
1826 if (reportmode) 2092 if (reportmode)
1827 { 2093 {
1828 /* mouse report from vt window */ 2094 /* mouse report from vt window */
1829 /* don't report release of wheel "buttons" */ 2095 /* don't report release of wheel "buttons" */
1830 if (ev.button >= 4) 2096 if (ev.button >= 4)
… …
1844 MEvent.button = AnyButton; 2110 MEvent.button = AnyButton;
1845 mouse_report (ev); 2111 mouse_report (ev);
1846#endif /* MOUSE_REPORT_DOUBLECLICK */ 2112#endif /* MOUSE_REPORT_DOUBLECLICK */
1847 return; 2113 return;
1848 } 2114 }
2115
1849 /* 2116 /*
1850 * dumb hack to compensate for the failure of click-and-drag 2117 * dumb hack to compensate for the failure of click-and-drag
1851 * when overriding mouse reporting 2118 * when overriding mouse reporting
1852 */ 2119 */
1853 if (PrivateModes & PrivMode_mouse_report 2120 if (priv_modes & PrivMode_mouse_report
1854 && bypass_keystate 2121 && bypass_keystate
1855 && ev.button == Button1 && MEvent.clicks <= 1) 2122 && ev.button == Button1 && MEvent.clicks <= 1)
1856 selection_extend (ev.x, ev.y, 0); 2123 selection_extend (ev.x, ev.y, 0);
1857 2124
1858 switch (ev.button) 2125 switch (ev.button)
1859 { 2126 {
1860 case Button1: 2127 case Button1:
1861 case Button3: 2128 case Button3:
1862 selection_make (ev.time); 2129 selection_make (ev.time);
1863 break; 2130 break;
2131
1864 case Button2: 2132 case Button2:
1865 selection_request (ev.time, ev.x, ev.y); 2133 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2134 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Primary : Sel_Primary);
1866 break; 2135 break;
2136
1867#ifdef MOUSE_WHEEL 2137#ifdef MOUSE_WHEEL
1868 case Button4: 2138 case Button4:
1869 case Button5: 2139 case Button5:
1870 { 2140 {
1871 int i; 2141 int i;
1872 page_dirn v; 2142 page_dirn v;
1873 2143
1874 v = (ev.button == Button4) ? UP : DN; 2144 v = ev.button == Button4 ? UP : DN;
2145
1875 if (ev.state & ShiftMask) 2146 if (ev.state & ShiftMask)
1876 i = 1; 2147 i = 1;
1877 else if ((Options & Opt_mouseWheelScrollPage)) 2148 else if (OPTION (Opt_mouseWheelScrollPage))
1878 i = TermWin.nrow - 1; 2149 i = nrow - 1;
1879 else 2150 else
1880 i = 5; 2151 i = 5;
2152
1881# ifdef MOUSE_SLIP_WHEELING 2153# ifdef MOUSE_SLIP_WHEELING
1882 if (ev.state & ControlMask) 2154 if (ev.state & ControlMask)
1883 { 2155 {
1884 mouse_slip_wheel_speed += (v ? -1 : 1); 2156 mouse_slip_wheel_speed += v ? -1 : 1;
2157 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2158 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2159
2160 if (slip_wheel_ev.at < NOW)
1885 mouse_slip_wheel_delay = SCROLLBAR_CONTINUOUS_DELAY; 2161 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;
2162
2163 slip_wheel_ev.start ();
2164 }
2165 else
2166 {
2167# endif
2168 scr_page (v, i);
2169 scrollbar_show (1);
2170# ifdef MOUSE_SLIP_WHEELING
1886 } 2171 }
1887# endif 2172# 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 } 2173 }
1902 break; 2174 break;
1903#endif 2175#endif
1904
1905 } 2176 }
1906 } 2177 }
1907#ifdef MENUBAR
1908 else if (isMenuBarWindow (ev.window))
1909 menubar_control (ev);
1910#endif
1911} 2178}
1912
1913 2179
1914#ifdef TRANSPARENT 2180#ifdef TRANSPARENT
2181#if TINTING
2182/* taken from aterm-0.4.2 */
2183
2184typedef uint32_t RUINT32T;
2185
2186void ShadeXImage(rxvt_display *display, XImage* srcImage, int shade, int rm, int gm, int bm)
2187{
2188 int sh_r, sh_g, sh_b;
2189 RUINT32T mask_r, mask_g, mask_b;
2190 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2191 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2192 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2193 int i;
2194
2195 Visual *visual = display->visual;
2196
2197 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2198
2199 /* for convenience */
2200 mask_r = visual->red_mask;
2201 mask_g = visual->green_mask;
2202 mask_b = visual->blue_mask;
2203
2204 /* boring lookup table pre-initialization */
2205 switch (srcImage->bits_per_pixel) {
2206 case 15:
2207 if ((mask_r != 0x7c00) ||
2208 (mask_g != 0x03e0) ||
2209 (mask_b != 0x001f))
2210 return;
2211 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32));
2212 lookup_r = lookup;
2213 lookup_g = lookup+32;
2214 lookup_b = lookup+32+32;
2215 sh_r = 10;
2216 sh_g = 5;
2217 sh_b = 0;
2218 break;
2219 case 16:
2220 if ((mask_r != 0xf800) ||
2221 (mask_g != 0x07e0) ||
2222 (mask_b != 0x001f))
2223 return;
2224 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32));
2225 lookup_r = lookup;
2226 lookup_g = lookup+32;
2227 lookup_b = lookup+32+64;
2228 sh_r = 11;
2229 sh_g = 5;
2230 sh_b = 0;
2231 break;
2232 case 24:
2233 if ((mask_r != 0xff0000) ||
2234 (mask_g != 0x00ff00) ||
2235 (mask_b != 0x0000ff))
2236 return;
2237 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2238 lookup_r = lookup;
2239 lookup_g = lookup+256;
2240 lookup_b = lookup+256+256;
2241 sh_r = 16;
2242 sh_g = 8;
2243 sh_b = 0;
2244 break;
2245 case 32:
2246 if ((mask_r != 0xff0000) ||
2247 (mask_g != 0x00ff00) ||
2248 (mask_b != 0x0000ff))
2249 return;
2250 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2251 lookup_r = lookup;
2252 lookup_g = lookup+256;
2253 lookup_b = lookup+256+256;
2254 sh_r = 16;
2255 sh_g = 8;
2256 sh_b = 0;
2257 break;
2258 default:
2259 return; /* we do not support this color depth */
2260 }
2261
2262 /* prepare limits for color transformation (each channel is handled separately) */
2263 if (shade < 0) {
2264 shade = -shade;
2265 if (shade < 0) shade = 0;
2266 if (shade > 100) shade = 100;
2267
2268 lower_lim_r = 65535-rm;
2269 lower_lim_g = 65535-gm;
2270 lower_lim_b = 65535-bm;
2271
2272 lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100);
2273 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100);
2274 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100);
2275
2276 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
2277 } else {
2278 if (shade < 0) shade = 0;
2279 if (shade > 100) shade = 100;
2280
2281 lower_lim_r = lower_lim_g = lower_lim_b = 0;
2282
2283 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
2284 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);
2285 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100);
2286 }
2287
2288 /* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */
2289 if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 ))
2290 {
2291 unsigned int tmp;
2292
2293 tmp = lower_lim_r;
2294 lower_lim_r = lower_lim_b;
2295 lower_lim_b = tmp;
2296
2297 tmp = upper_lim_r;
2298 upper_lim_r = upper_lim_b;
2299 upper_lim_b = tmp;
2300 }
2301
2302 /* fill our lookup tables */
2303 for (i = 0; i <= mask_r>>sh_r; i++)
2304 {
2305 RUINT32T tmp;
2306 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r));
2307 tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r);
2308 lookup_r[i] = (tmp/65535)<<sh_r;
2309 }
2310 for (i = 0; i <= mask_g>>sh_g; i++)
2311 {
2312 RUINT32T tmp;
2313 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g));
2314 tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g);
2315 lookup_g[i] = (tmp/65535)<<sh_g;
2316 }
2317 for (i = 0; i <= mask_b>>sh_b; i++)
2318 {
2319 RUINT32T tmp;
2320 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b));
2321 tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b);
2322 lookup_b[i] = (tmp/65535)<<sh_b;
2323 }
2324
2325 /* apply table to input image (replacing colors by newly calculated ones) */
2326 switch (srcImage->bits_per_pixel)
2327 {
2328 case 15:
2329 {
2330 unsigned short *p1, *pf, *p, *pl;
2331 p1 = (unsigned short *) srcImage->data;
2332 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2333 while (p1 < pf)
2334 {
2335 p = p1;
2336 pl = p1 + srcImage->width;
2337 for (; p < pl; p++)
2338 {
2339 *p = lookup_r[(*p & 0x7c00)>>10] |
2340 lookup_g[(*p & 0x03e0)>> 5] |
2341 lookup_b[(*p & 0x001f)];
2342 }
2343 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2344 }
2345 break;
2346 }
2347 case 16:
2348 {
2349 unsigned short *p1, *pf, *p, *pl;
2350 p1 = (unsigned short *) srcImage->data;
2351 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2352 while (p1 < pf)
2353 {
2354 p = p1;
2355 pl = p1 + srcImage->width;
2356 for (; p < pl; p++)
2357 {
2358 *p = lookup_r[(*p & 0xf800)>>11] |
2359 lookup_g[(*p & 0x07e0)>> 5] |
2360 lookup_b[(*p & 0x001f)];
2361 }
2362 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2363 }
2364 break;
2365 }
2366 case 24:
2367 {
2368 unsigned char *p1, *pf, *p, *pl;
2369 p1 = (unsigned char *) srcImage->data;
2370 pf = (unsigned char *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2371 while (p1 < pf)
2372 {
2373 p = p1;
2374 pl = p1 + srcImage->width * 3;
2375 for (; p < pl; p += 3)
2376 {
2377 p[0] = lookup_r[(p[0] & 0xff0000)>>16];
2378 p[1] = lookup_r[(p[1] & 0x00ff00)>> 8];
2379 p[2] = lookup_r[(p[2] & 0x0000ff)];
2380 }
2381 p1 = (unsigned char *) ((char *) p1 + srcImage->bytes_per_line);
2382 }
2383 break;
2384 }
2385 case 32:
2386 {
2387 RUINT32T *p1, *pf, *p, *pl;
2388 p1 = (RUINT32T *) srcImage->data;
2389 pf = (RUINT32T *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2390
2391 while (p1 < pf)
2392 {
2393 p = p1;
2394 pl = p1 + srcImage->width;
2395 for (; p < pl; p++)
2396 {
2397 *p = lookup_r[(*p & 0xff0000)>>16] |
2398 lookup_g[(*p & 0x00ff00)>> 8] |
2399 lookup_b[(*p & 0x0000ff)] |
2400 (*p & ~0xffffff);
2401 }
2402 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
2403 }
2404 break;
2405 }
2406 }
2407
2408 free (lookup);
2409}
2410#endif
2411
1915/* 2412/*
1916 * Check our parents are still who we think they are. 2413 * Check our parents are still who we think they are.
1917 * Do transparency updates if required 2414 * Do transparency updates if required
1918 */ 2415 */
1919int 2416int
1920rxvt_term::check_our_parents () 2417rxvt_term::check_our_parents ()
1921{ 2418{
1922 int i, pchanged, aformat, have_pixmap, rootdepth; 2419 int i, pchanged, aformat, have_pixmap, rootdepth;
1923 unsigned long nitems, bytes_after; 2420 unsigned long nitems, bytes_after;
1924 Atom atype; 2421 Atom atype;
1925 unsigned char *prop = NULL; 2422 unsigned char *prop = NULL;
1926 Window root, oldp, *list; 2423 Window root, oldp, *list;
1927 Pixmap rootpixmap = None; 2424 Pixmap rootpixmap = None;
1928 XWindowAttributes wattr, wrootattr; 2425 XWindowAttributes wattr, wrootattr;
2426 dDisp;
1929 2427
1930 pchanged = 0; 2428 pchanged = 0;
1931 2429
1932 if (! (Options & Opt_transparent)) 2430 if (!OPTION (Opt_transparent))
1933 return pchanged; /* Don't try any more */ 2431 return pchanged; /* Don't try any more */
1934 2432
1935 XGetWindowAttributes (display->display, display->root, &wrootattr); 2433 XGetWindowAttributes (disp, display->root, &wrootattr);
1936 rootdepth = wrootattr.depth; 2434 rootdepth = wrootattr.depth;
1937 2435
1938 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 2436 XGetWindowAttributes (disp, parent[0], &wattr);
2437
1939 if (rootdepth != wattr.depth) 2438 if (rootdepth != wattr.depth)
1940 { 2439 {
1941 if (am_transparent) 2440 if (am_transparent)
1942 { 2441 {
1943 pchanged = 1; 2442 pchanged = 1;
1944 XSetWindowBackground (display->display, TermWin.vt, 2443 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
1945 PixColors[Color_bg]);
1946 am_transparent = am_pixmap_trans = 0; 2444 am_transparent = am_pixmap_trans = 0;
1947 } 2445 }
2446
1948 return pchanged; /* Don't try any more */ 2447 return pchanged; /* Don't try any more */
1949 } 2448 }
1950 2449
1951 /* Get all X ops out of the queue so that our information is up-to-date. */ 2450 /* Get all X ops out of the queue so that our information is up-to-date. */
1952 XSync (display->display, False); 2451 XSync (disp, False);
1953 2452
1954 /* 2453 /*
1955 * Make the frame window set by the window manager have 2454 * Make the frame window set by the window manager have
1956 * the root background. Some window managers put multiple nested frame 2455 * the root background. Some window managers put multiple nested frame
1957 * windows for each client, so we have to take care about that. 2456 * windows for each client, so we have to take care about that.
1958 */ 2457 */
1959 i = (xa[XA_XROOTPMAPID] != 0 2458 i = (xa[XA_XROOTPMAP_ID]
1960 && (XGetWindowProperty (display->display, display->root, xa[XA_XROOTPMAPID], 2459 && XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID],
1961 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2460 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1962 &nitems, &bytes_after, &prop) == Success)); 2461 &nitems, &bytes_after, &prop) == Success);
2462
1963 if (!i || prop == NULL) 2463 if (!i || prop == NULL)
2464 i = (xa[XA_ESETROOT_PMAP_ID]
2465 && XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID],
2466 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2467 &nitems, &bytes_after, &prop) == Success);
2468
2469 if (!i || prop == NULL
2470#if TINTING
2471 || !rs[Rs_color + Color_tint]
2472#endif
2473 )
1964 have_pixmap = 0; 2474 have_pixmap = 0;
1965 else 2475 else
1966 { 2476 {
1967 have_pixmap = 1; 2477 have_pixmap = 1;
1968 rootpixmap = * ((Pixmap *)prop); 2478 rootpixmap = *(Pixmap *)prop;
1969 XFree (prop); 2479 XFree (prop);
1970 } 2480 }
2481
1971 if (have_pixmap) 2482 if (have_pixmap)
1972 { 2483 {
1973 /* 2484 /*
1974 * Copy display->root pixmap transparency 2485 * Copy display->root pixmap transparency
1975 */ 2486 */
1976 int sx, sy, nx, ny; 2487 int sx, sy, nx, ny;
1977 unsigned int nw, nh; 2488 unsigned int nw, nh;
1978 Window cr; 2489 Window cr;
1979 XImage *image; 2490 XImage *image;
1980 GC gc; 2491 GC gc;
1981 XGCValues gcvalue; 2492 XGCValues gcvalue;
1982 2493
1983 XTranslateCoordinates (display->display, TermWin.parent[0], display->root, 2494 XTranslateCoordinates (disp, parent[0], display->root,
1984 0, 0, &sx, &sy, &cr); 2495 0, 0, &sx, &sy, &cr);
1985 nw = (unsigned int)szHint.width; 2496 nw = (unsigned int)szHint.width;
1986 nh = (unsigned int)szHint.height; 2497 nh = (unsigned int)szHint.height;
1987 nx = ny = 0; 2498 nx = ny = 0;
2499
1988 if (sx < 0) 2500 if (sx < 0)
1989 { 2501 {
1990 nw += sx; 2502 nw += sx;
1991 nx = -sx; 2503 nx = -sx;
1992 sx = 0; 2504 sx = 0;
1993 } 2505 }
2506
1994 if (sy < 0) 2507 if (sy < 0)
1995 { 2508 {
1996 nh += sy; 2509 nh += sy;
1997 ny = -sy; 2510 ny = -sy;
1998 sy = 0; 2511 sy = 0;
1999 } 2512 }
2513
2000 MIN_IT (nw, (unsigned int) (wrootattr.width - sx)); 2514 min_it (nw, (unsigned int) (wrootattr.width - sx));
2001 MIN_IT (nh, (unsigned int) (wrootattr.height - sy)); 2515 min_it (nh, (unsigned int) (wrootattr.height - sy));
2516
2517 XSync (disp, False);
2002 allowedxerror = -1; 2518 allowedxerror = -1;
2003 image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes, 2519 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2004 ZPixmap); 2520
2005 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 2521 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2006 /* XXX: may need a delay here? */ 2522 /* XXX: may need a delay here? */
2007 allowedxerror = 0; 2523 allowedxerror = 0;
2524
2008 if (image == NULL) 2525 if (image == NULL)
2009 { 2526 {
2010 if (am_transparent && am_pixmap_trans) 2527 if (am_transparent && am_pixmap_trans)
2011 { 2528 {
2012 pchanged = 1; 2529 pchanged = 1;
2013 if (TermWin.pixmap != None) 2530 if (pixmap != None)
2014 { 2531 {
2015 XFreePixmap (display->display, TermWin.pixmap); 2532 XFreePixmap (disp, pixmap);
2016 TermWin.pixmap = None; 2533 pixmap = None;
2017 } 2534 }
2018 } 2535 }
2536
2019 am_pixmap_trans = 0; 2537 am_pixmap_trans = 0;
2020 } 2538 }
2021 else 2539 else
2022 { 2540 {
2023 if (TermWin.pixmap != None) 2541 if (pixmap != None)
2024 XFreePixmap (display->display, TermWin.pixmap); 2542 XFreePixmap (disp, pixmap);
2543
2544#if TINTING
2545 if (ISSET_PIXCOLOR (Color_tint))
2546 {
2547 unsigned short rm, gm, bm;
2548 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2549
2550 pix_colors_focused[Color_tint].get (display, rm, gm, bm);
2551
2552 ShadeXImage (display, image, shade, rm, gm, bm);
2553 }
2554#endif
2555
2025 TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt, 2556 pixmap = XCreatePixmap (disp, vt,
2026 (unsigned int)szHint.width,
2027 (unsigned int)szHint.height, 2557 szHint.width, szHint.height, image->depth);
2028 (unsigned int)image->depth);
2029 gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue); 2558 gc = XCreateGC (disp, vt, 0UL, &gcvalue);
2030 XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0, 2559 XPutImage (disp, pixmap, gc, image, 0, 0,
2031 nx, ny, (unsigned int)image->width,
2032 (unsigned int)image->height); 2560 nx, ny, image->width, image->height);
2033 XFreeGC (display->display, gc); 2561 XFreeGC (disp, gc);
2034 XDestroyImage (image); 2562 XDestroyImage (image);
2035 XSetWindowBackgroundPixmap (display->display, TermWin.vt, 2563 XSetWindowBackgroundPixmap (disp, parent[0], pixmap);
2036 TermWin.pixmap); 2564 XClearWindow (disp, parent[0]);
2565
2037 if (!am_transparent || !am_pixmap_trans) 2566 if (!am_transparent || !am_pixmap_trans)
2038 pchanged = 1; 2567 pchanged = 1;
2568
2039 am_transparent = am_pixmap_trans = 1; 2569 am_transparent = am_pixmap_trans = 1;
2040 } 2570 }
2041 } 2571 }
2572
2042 if (!am_pixmap_trans) 2573 if (am_pixmap_trans)
2574 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2575 else
2043 { 2576 {
2044 unsigned int n; 2577 unsigned int n;
2045 /* 2578 /*
2046 * InheritPixmap transparency 2579 * InheritPixmap transparency
2047 */ 2580 */
2048 D_X ((stderr, "InheritPixmap Seeking to %08lx", display->root));
2049 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); 2581 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2050 i++)
2051 { 2582 {
2052 oldp = TermWin.parent[i]; 2583 oldp = parent[i];
2053 XQueryTree (display->display, TermWin.parent[i - 1], &root, 2584 XQueryTree (disp, parent[i - 1], &root,
2054 &TermWin.parent[i], &list, &n); 2585 &parent[i], &list, &n);
2055 XFree (list); 2586 XFree (list);
2056 D_X ((stderr, "InheritPixmap Parent[%d] = %08lx", i, TermWin.parent[i])); 2587
2057 if (TermWin.parent[i] == display->root) 2588 if (parent[i] == display->root)
2058 { 2589 {
2059 if (oldp != None) 2590 if (oldp != None)
2060 pchanged = 1; 2591 pchanged = 1;
2592
2061 break; 2593 break;
2062 } 2594 }
2595
2063 if (oldp != TermWin.parent[i]) 2596 if (oldp != parent[i])
2064 pchanged = 1; 2597 pchanged = 1;
2065 } 2598 }
2599
2066 n = 0; 2600 n = 0;
2601
2067 if (pchanged) 2602 if (pchanged)
2068 { 2603 {
2069 for (; n < (unsigned int)i; n++) 2604 for (; n < (unsigned int)i; n++)
2070 { 2605 {
2071 XGetWindowAttributes (display->display, TermWin.parent[n], &wattr); 2606 XGetWindowAttributes (disp, 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) 2607 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2074 { 2608 {
2075 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1; 2609 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2076 break; 2610 break;
2077 } 2611 }
2078 } 2612 }
2079 } 2613 }
2080 if (n > (int) (sizeof (TermWin.parent) 2614
2081 / sizeof (TermWin.parent[0]))) 2615 if (n > (int) (sizeof (parent) / sizeof (parent[0])))
2082 { 2616 {
2083 D_X ((stderr, "InheritPixmap Turning off")); 2617 XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]);
2084 XSetWindowBackground (display->display, TermWin.parent[0], 2618 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2085 PixColors[Color_fg]);
2086 XSetWindowBackground (display->display, TermWin.vt,
2087 PixColors[Color_bg]);
2088 am_transparent = 0; 2619 am_transparent = 0;
2089 /* XXX: also turn off Opt_transparent? */ 2620 /* XXX: also turn off Opt_transparent? */
2090 } 2621 }
2091 else 2622 else
2092 { 2623 {
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++) 2624 for (n = 0; n < (unsigned int)i; n++)
2106 XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], 2625 {
2107 ParentRelative); 2626 XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative);
2108 XSetWindowBackgroundPixmap (display->display, TermWin.vt, 2627 XClearWindow (disp, parent[n]);
2109 ParentRelative); 2628 }
2629
2630 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2110 am_transparent = 1; 2631 am_transparent = 1;
2111 } 2632 }
2633
2112 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2634 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2113 TermWin.parent[i] = None; 2635 parent[i] = None;
2636 }
2637
2638 if (scrollBar.win)
2114 } 2639 {
2640 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);
2641 scrollBar.setIdle ();
2642 scrollbar_show (0);
2643 }
2644
2645 if (am_transparent)
2646 {
2647 want_refresh = want_full_refresh = 1;
2648 if (am_pixmap_trans)
2649 flush ();
2650 }
2651
2115 return pchanged; 2652 return pchanged;
2116} 2653}
2117#endif 2654#endif
2118 2655
2119/*}}} */ 2656/*}}} */
2657
2658bool
2659rxvt_term::cmd_parse ()
2660{
2661 bool flag = false;
2662 wchar_t ch = NOCHAR;
2663 char *seq_begin; // remember start of esc-sequence here
2664
2665 for (;;)
2666 {
2667 if (ch == NOCHAR)
2668 {
2669 seq_begin = cmdbuf_ptr;
2670 ch = next_char ();
2671
2672 if (ch == NOCHAR)
2673 break;
2674 }
2675
2676 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)
2677 {
2678 if (!seen_input)
2679 {
2680 seen_input = 1;
2681 // many badly-written programs (e.g. jed) contain a race condition:
2682 // they first read the screensize and then install a SIGWINCH handler.
2683 // some window managers resize the window early, and these programs
2684 // then sometimes get the size wrong.
2685 // unfortunately other programs are even more buggy and dislike
2686 // being sent SIGWINCH, so only do it when we were in fact being
2687 // resized.
2688 if (seen_resize && cmd_pid)
2689 kill (-cmd_pid, SIGWINCH);
2690 }
2691
2692 /* Read a text string from the input buffer */
2693 wchar_t buf[UBUFSIZ];
2694 bool refreshnow = false;
2695 int nlines = 0;
2696 wchar_t *str = buf;
2697 wchar_t *eol = str + min (ncol, UBUFSIZ);
2698
2699 for (;;)
2700 {
2701 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2702 break;
2703
2704 *str++ = ch;
2705
2706 if (ch == C0_LF || str >= eol)
2707 {
2708 if (ch == C0_LF)
2709 nlines++;
2710
2711 refresh_count++;
2712
2713 if (!OPTION (Opt_jumpScroll)
2714 || (refresh_count >= refresh_limit * (nrow - 1)))
2715 {
2716 refreshnow = true;
2717 refresh_count = 0;
2718 ch = NOCHAR;
2719 break;
2720 }
2721
2722 // scr_add_lines only works for nlines <= nrow - 1.
2723 if (nlines >= nrow - 1)
2724 {
2725 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2726 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2727 scr_add_lines (buf, str - buf, nlines);
2728
2729 nlines = 0;
2730 str = buf;
2731 eol = str + min (ncol, UBUFSIZ);
2732 }
2733
2734 if (str >= eol)
2735 {
2736 if (eol >= buf + UBUFSIZ)
2737 {
2738 ch = NOCHAR;
2739 break;
2740 }
2741 else
2742 eol = min (eol + ncol, buf + UBUFSIZ);
2743 }
2744
2745 }
2746
2747 seq_begin = cmdbuf_ptr;
2748 ch = next_char ();
2749 }
2750
2751 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2752 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2753 scr_add_lines (buf, str - buf, nlines);
2754
2755 /*
2756 * If there have been a lot of new lines, then update the screen
2757 * What the heck I'll cheat and only refresh less than every page-full.
2758 * the number of pages between refreshes is refresh_limit, which
2759 * is incremented here because we must be doing flat-out scrolling.
2760 */
2761 if (refreshnow)
2762 {
2763 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2764 refresh_limit++;
2765 else
2766 {
2767 flag = true;
2768 scr_refresh ();
2769 want_refresh = 1;
2770 }
2771 }
2772
2773 }
2774 else
2775 {
2776 try
2777 {
2778 process_nonprinting (ch);
2779 }
2780 catch (const class out_of_input &o)
2781 {
2782 // we ran out of input, retry later
2783 cmdbuf_ptr = seq_begin;
2784 break;
2785 }
2786
2787 ch = NOCHAR;
2788 }
2789 }
2790
2791 return flag;
2792}
2793
2794// read the next character
2795wchar_t
2796rxvt_term::next_char () NOTHROW
2797{
2798 while (cmdbuf_ptr < cmdbuf_endp)
2799 {
2800 // assume 7-bit to be ascii ALWAYS
2801 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
2802 return *cmdbuf_ptr++;
2803
2804 wchar_t wc;
2805 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2806
2807 if (len == (size_t)-2)
2808 {
2809 // the mbstate stores incomplete sequences. didn't know this :/
2810 cmdbuf_ptr = cmdbuf_endp;
2811 break;
2812 }
2813
2814 if (len == (size_t)-1)
2815 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2816
2817 // assume wchar == unicode
2818 cmdbuf_ptr += len;
2819 return wc & UNICODE_MASK;
2820 }
2821
2822 return NOCHAR;
2823}
2824
2825// read the next octet
2826uint32_t
2827rxvt_term::next_octet () NOTHROW
2828{
2829 return cmdbuf_ptr < cmdbuf_endp
2830 ? (unsigned char)*cmdbuf_ptr++
2831 : NOCHAR;
2832}
2833
2834static class out_of_input out_of_input;
2835
2836/* rxvt_cmd_getc () - Return next input character */
2837/*
2838 * Return the next input character after first passing any keyboard input
2839 * to the command.
2840 */
2841wchar_t
2842rxvt_term::cmd_getc () THROW ((class out_of_input))
2843{
2844 wchar_t c = next_char ();
2845
2846 if (c == NOCHAR)
2847 throw out_of_input;
2848
2849 return c;
2850}
2851
2852uint32_t
2853rxvt_term::cmd_get8 () THROW ((class out_of_input))
2854{
2855 uint32_t c = next_octet ();
2856
2857 if (c == NOCHAR)
2858 throw out_of_input;
2859
2860 return c;
2861}
2120 2862
2121/*{{{ print pipe */ 2863/*{{{ print pipe */
2122/*----------------------------------------------------------------------*/ 2864/*----------------------------------------------------------------------*/
2123#ifdef PRINTPIPE 2865#ifdef PRINTPIPE
2124FILE * 2866FILE *
2125rxvt_term::popen_printer () 2867rxvt_term::popen_printer ()
2126{ 2868{
2127 FILE *stream = popen (rs[Rs_print_pipe], "w"); 2869 FILE *stream = popen (rs[Rs_print_pipe], "w");
2128 2870
2129 if (stream == NULL) 2871 if (stream == NULL)
2130 rxvt_print_error ("can't open printer pipe"); 2872 rxvt_warn ("can't open printer pipe, not printing.\n");
2873
2131 return stream; 2874 return stream;
2132} 2875}
2133 2876
2134int 2877int
2135rxvt_term::pclose_printer (FILE *stream) 2878rxvt_term::pclose_printer (FILE *stream)
2136{ 2879{
2137 fflush (stream); 2880 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); 2881 return pclose (stream);
2144# endif
2145} 2882}
2146 2883
2147/* 2884/*
2148 * simulate attached vt100 printer 2885 * simulate attached vt100 printer
2149 */ 2886 */
2150void 2887void
2151rxvt_term::process_print_pipe () 2888rxvt_term::process_print_pipe ()
2152{ 2889{
2153 int done; 2890 int done;
2154 FILE *fd; 2891 FILE *fd;
2155 2892
2156 if ((fd = popen_printer ()) == NULL) 2893 if ((fd = popen_printer ()) == NULL)
2157 return; 2894 return;
2158 2895
2159 /* 2896 /*
2160 * Send all input to the printer until either ESC[4i or ESC[?4i 2897 * Send all input to the printer until either ESC[4i or ESC[?4i
2161 * is received. 2898 * is received.
2162 */ 2899 */
2163 for (done = 0; !done;) 2900 for (done = 0; !done;)
2164 { 2901 {
2165 unsigned char buf[8]; 2902 unsigned char buf[8];
2166 unsigned char ch; 2903 unicode_t ch;
2167 unsigned int i, len; 2904 unsigned int i, len;
2168 2905
2169 if ((ch = cmd_getc ()) != C0_ESC) 2906 if ((ch = cmd_getc ()) != C0_ESC)
2170 { 2907 {
2171 if (putc (ch, fd) == EOF) 2908 if (putc (ch, fd) == EOF)
2172 break; /* done = 1 */ 2909 break; /* done = 1 */
… …
2187 { 2924 {
2188 if ((buf[len++] = cmd_getc ()) == 'i') 2925 if ((buf[len++] = cmd_getc ()) == 'i')
2189 break; /* done = 1 */ 2926 break; /* done = 1 */
2190 } 2927 }
2191 } 2928 }
2929
2192 for (i = 0; i < len; i++) 2930 for (i = 0; i < len; i++)
2193 if (putc (buf[i], fd) == EOF) 2931 if (putc (buf[i], fd) == EOF)
2194 { 2932 {
2195 done = 1; 2933 done = 1;
2196 break; 2934 break;
2197 } 2935 }
2198 } 2936 }
2199 } 2937 }
2938
2200 pclose_printer (fd); 2939 pclose_printer (fd);
2201} 2940}
2202#endif /* PRINTPIPE */ 2941#endif /* PRINTPIPE */
2203/*}}} */ 2942/*}}} */
2204 2943
2205/* *INDENT-OFF* */ 2944/* *INDENT-OFF* */
2206enum { 2945enum {
2207 C1_40 = 0x40, 2946 C1_40 = 0x40,
2208 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA, 2947 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, 2948 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, 2949 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 2950 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC,
2212}; 2951};
2213/* *INDENT-ON* */ 2952/* *INDENT-ON* */
2214 2953
2215/*{{{ process non-printing single characters */ 2954/*{{{ process non-printing single characters */
2216void 2955void
2217rxvt_term::process_nonprinting (unsigned char ch) 2956rxvt_term::process_nonprinting (unicode_t ch)
2218{ 2957{
2219 switch (ch) 2958 switch (ch)
2220 { 2959 {
2960 case C0_ESC:
2961 process_escape_seq ();
2962 break;
2221 case C0_ENQ: /* terminal Status */ 2963 case C0_ENQ: /* terminal Status */
2222 if (rs[Rs_answerbackstring]) 2964 if (rs[Rs_answerbackstring])
2223 tt_write ( 2965 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 2966 else
2227 tt_write ((unsigned char *)VT100_ANS, 2967 tt_write (VT100_ANS, strlen (VT100_ANS));
2228 (unsigned int)STRLEN (VT100_ANS));
2229 break; 2968 break;
2230 case C0_BEL: /* bell */ 2969 case C0_BEL: /* bell */
2231 scr_bell (); 2970 scr_bell ();
2232 break; 2971 break;
2233 case C0_BS: /* backspace */ 2972 case C0_BS: /* backspace */
… …
2248 scr_charset_choose (1); 2987 scr_charset_choose (1);
2249 break; 2988 break;
2250 case C0_SI: /* shift in - acs */ 2989 case C0_SI: /* shift in - acs */
2251 scr_charset_choose (0); 2990 scr_charset_choose (0);
2252 break; 2991 break;
2992
2993#ifdef EIGHT_BIT_CONTROLS
2994 // 8-bit controls
2995 case 0x90: /* DCS */
2996 process_dcs_seq ();
2997 break;
2998 case 0x9b: /* CSI */
2999 process_csi_seq ();
3000 break;
3001 case 0x9d: /* CSI */
3002 process_osc_seq ();
3003 break;
3004#endif
2253 } 3005 }
2254} 3006}
2255/*}}} */ 3007/*}}} */
2256 3008
2257 3009
2258/*{{{ process VT52 escape sequences */ 3010/*{{{ process VT52 escape sequences */
2259void 3011void
2260rxvt_term::process_escape_vt52 (unsigned char ch) 3012rxvt_term::process_escape_vt52 (unicode_t ch)
2261{ 3013{
2262 int row, col; 3014 int row, col;
2263 3015
2264 switch (ch) 3016 switch (ch)
2265 { 3017 {
… …
2317 3069
2318/*{{{ process escape sequences */ 3070/*{{{ process escape sequences */
2319void 3071void
2320rxvt_term::process_escape_seq () 3072rxvt_term::process_escape_seq ()
2321{ 3073{
2322 unsigned char ch = cmd_getc (); 3074 unicode_t ch = cmd_getc ();
2323 3075
2324 if (PrivateModes & PrivMode_vt52) 3076 if (priv_modes & PrivMode_vt52)
2325 { 3077 {
2326 process_escape_vt52 (ch); 3078 process_escape_vt52 (ch);
2327 return; 3079 return;
2328 } 3080 }
2329 3081
… …
2344 scr_charset_set (2, (unsigned int)cmd_getc ()); 3096 scr_charset_set (2, (unsigned int)cmd_getc ());
2345 break; 3097 break;
2346 case '+': 3098 case '+':
2347 scr_charset_set (3, (unsigned int)cmd_getc ()); 3099 scr_charset_set (3, (unsigned int)cmd_getc ());
2348 break; 3100 break;
2349#ifdef MULTICHAR_SET 3101#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': 3102 case '6':
2356 scr_backindex (); 3103 scr_backindex ();
2357 break; 3104 break;
2358#endif 3105#endif
2359 case '7': 3106 case '7':
2360 scr_cursor (SAVE); 3107 scr_cursor (SAVE);
2361 break; 3108 break;
2362 case '8': 3109 case '8':
2363 scr_cursor (RESTORE); 3110 scr_cursor (RESTORE);
2364 break; 3111 break;
2365#ifndef NO_FRILLS 3112#if ENABLE_FRILLS
2366 case '9': 3113 case '9':
2367 scr_forwardindex (); 3114 scr_forwardindex ();
2368 break; 3115 break;
2369#endif 3116#endif
2370 case '=': 3117 case '=':
… …
2380 break; 3127 break;
2381 3128
2382 /* 8.3.87: NEXT LINE */ 3129 /* 8.3.87: NEXT LINE */
2383 case C1_NEL: /* ESC E */ 3130 case C1_NEL: /* ESC E */
2384 { 3131 {
2385 uint32_t nlcr[] = { '\n', '\r' }; 3132 wchar_t nlcr[] = { C0_LF, C0_CR };
2386 scr_add_lines (nlcr, 1, 2); 3133 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1);
2387 } 3134 }
2388 break; 3135 break;
2389 3136
2390 /* kidnapped escape sequence: Should be 8.3.48 */ 3137 /* kidnapped escape sequence: Should be 8.3.48 */
2391 case C1_ESA: /* ESC G */ 3138 case C1_ESA: /* ESC G */
… …
2401 case C1_RI: /* ESC M */ 3148 case C1_RI: /* ESC M */
2402 scr_index (DN); 3149 scr_index (DN);
2403 break; 3150 break;
2404 3151
2405 /* 8.3.142: SINGLE-SHIFT TWO */ 3152 /* 8.3.142: SINGLE-SHIFT TWO */
2406 /*case C1_SS2: scr_single_shift (2); break; */ 3153 /*case C1_SS2: scr_single_shift (2); break; */
2407 3154
2408 /* 8.3.143: SINGLE-SHIFT THREE */ 3155 /* 8.3.143: SINGLE-SHIFT THREE */
2409 /*case C1_SS3: scr_single_shift (3); break; */ 3156 /*case C1_SS3: scr_single_shift (3); break; */
2410 3157
2411 /* 8.3.27: DEVICE CONTROL STRING */ 3158 /* 8.3.27: DEVICE CONTROL STRING */
2412 case C1_DCS: /* ESC P */ 3159 case C1_DCS: /* ESC P */
2413 process_dcs_seq (); 3160 process_dcs_seq ();
2414 break; 3161 break;
2415 3162
2416 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 3163 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
2417 case C1_SCI: /* ESC Z */ 3164 case C1_SCI: /* ESC Z */
2418 tt_write ((const unsigned char *)ESCZ_ANSWER, 3165 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
2419 (unsigned int) (sizeof (ESCZ_ANSWER) - 1));
2420 break; /* steal obsolete ESC [ c */ 3166 break; /* steal obsolete ESC [ c */
2421 3167
2422 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 3168 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */
2423 case C1_CSI: /* ESC [ */ 3169 case C1_CSI: /* ESC [ */
2424 process_csi_seq (); 3170 process_csi_seq ();
… …
2429 process_osc_seq (); 3175 process_osc_seq ();
2430 break; 3176 break;
2431 3177
2432 /* 8.3.106: RESET TO INITIAL STATE */ 3178 /* 8.3.106: RESET TO INITIAL STATE */
2433 case 'c': 3179 case 'c':
3180 mbstate.reset ();
2434 scr_poweron (); 3181 scr_poweron ();
2435 scrollbar_show (1); 3182 scrollbar_show (1);
2436 break; 3183 break;
2437 3184
2438 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */ 3185 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
… …
2450 3197
2451/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */ 3198/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */
2452/* *INDENT-OFF* */ 3199/* *INDENT-OFF* */
2453enum { 3200enum {
2454 CSI_ICH = 0x40, 3201 CSI_ICH = 0x40,
2455 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA, 3202 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 , 3203 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, 3204 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, 3205 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, 3206 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, 3207 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, */ 3222 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, [, \, ], ^, _, */ 3223 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, */ 3224 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, */ 3225 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, */ 3226 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, {, |, }, ~, */ 3227 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */
2481 }; 3228 };
2482/* *INDENT-ON* */ 3229/* *INDENT-ON* */
2483 3230
2484void 3231void
2485rxvt_term::process_csi_seq () 3232rxvt_term::process_csi_seq ()
2486{ 3233{
2487 unsigned char ch, priv, i; 3234 unicode_t ch, priv, i;
2488 unsigned int nargs, p; 3235 unsigned int nargs, p;
2489 int n, ndef; 3236 int n, ndef;
2490 int arg[ESC_ARGS]; 3237 int arg[ESC_ARGS];
2491 3238
2492 for (nargs = ESC_ARGS; nargs > 0;) 3239 for (nargs = ESC_ARGS; nargs > 0;)
2493 arg[--nargs] = 0; 3240 arg[--nargs] = 0;
2494 3241
2495 priv = 0; 3242 priv = 0;
… …
2497 if (ch >= '<' && ch <= '?') 3244 if (ch >= '<' && ch <= '?')
2498 { /* '<' '=' '>' '?' */ 3245 { /* '<' '=' '>' '?' */
2499 priv = ch; 3246 priv = ch;
2500 ch = cmd_getc (); 3247 ch = cmd_getc ();
2501 } 3248 }
3249
2502 /* read any numerical arguments */ 3250 /* read any numerical arguments */
2503 for (n = -1; ch < CSI_ICH; ) 3251 for (n = -1; ch < CSI_ICH; )
2504 { 3252 {
2505 if (isdigit (ch)) 3253 if (isdigit (ch))
2506 { 3254 {
… …
2513 { 3261 {
2514 if (nargs < ESC_ARGS) 3262 if (nargs < ESC_ARGS)
2515 arg[nargs++] = n; 3263 arg[nargs++] = n;
2516 n = -1; 3264 n = -1;
2517 } 3265 }
2518 else if (ch == '\b') 3266 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); 3267 process_nonprinting (ch);
2530 } 3268
2531 ch = cmd_getc (); 3269 ch = cmd_getc ();
2532 } 3270 }
2533 3271
2534 if (ch > CSI_7F) 3272 if (ch > CSI_7F)
2535 return; 3273 return;
… …
2541 ndef = get_byte_array_bit (csi_defaults, i); 3279 ndef = get_byte_array_bit (csi_defaults, i);
2542 for (p = 0; p < nargs; p++) 3280 for (p = 0; p < nargs; p++)
2543 if (arg[p] == -1) 3281 if (arg[p] == -1)
2544 arg[p] = ndef; 3282 arg[p] = ndef;
2545 3283
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 /* 3284 /*
2554 * private mode handling 3285 * private mode handling
2555 */ 3286 */
2556 if (priv) 3287 if (priv)
2557 { 3288 {
2558 switch (priv) 3289 switch (priv)
2559 { 3290 {
2560 case '>': 3291 case '>':
2561 if (ch == CSI_DA) /* secondary device attributes */ 3292 if (ch == CSI_DA) /* secondary device attributes */
2562 tt_printf ("\033[>%d;%-.8s;0c", 'R', VSTRING); 3293 {
3294 // first parameter is normally 0 for vt100, 1 for some newer vtxxx, 'R' for rxvt,
3295 // 'U' for rxvt-unicode <= 7.2, and Mm85 (e.g. 7385 for 7.3) for later versions.
3296 //
3297 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
3298 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify
3299 // that we do not support xterm mouse reporting (should be 95 when we do).
3300 //
3301 tt_printf ("\033[>%c%c85;94;0c", VERSION[0], VERSION[1]);
3302 }
2563 break; 3303 break;
2564 case '?': 3304 case '?':
2565 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 3305 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2566 process_terminal_mode (ch, priv, nargs, arg); 3306 process_terminal_mode (ch, priv, nargs, arg);
2567 break; 3307 break;
… …
2672 3412
2673 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */ 3413 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */
2674 arg[0] = -arg[0]; 3414 arg[0] = -arg[0];
2675 /* FALLTHROUGH */ 3415 /* FALLTHROUGH */
2676 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 3416 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
2677 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0); 3417 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
2678 break; 3418 break;
2679 3419
2680 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 3420 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
2681 tt_write ((const unsigned char *)VT100_ANS, 3421 tt_write (VT100_ANS, sizeof (VT100_ANS) - 1);
2682 (unsigned int) (sizeof (VT100_ANS) - 1));
2683 break; 3422 break;
2684 3423
2685 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 3424 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
2686 process_sgr_mode (nargs, arg); 3425 process_sgr_mode (nargs, arg);
2687 break; 3426 break;
… …
2693 tt_printf ("\033[0n"); 3432 tt_printf ("\033[0n");
2694 break; 3433 break;
2695 case 6: /* CPR requested */ 3434 case 6: /* CPR requested */
2696 scr_report_position (); 3435 scr_report_position ();
2697 break; 3436 break;
2698#if defined (ENABLE_DISPLAY_ANSWER)
2699 case 7: /* unofficial extension */ 3437 case 7: /* unofficial extension */
3438 if (OPTION (Opt_insecure))
2700 tt_printf ("%-.250s\n", rs[Rs_display_name]); 3439 tt_printf ("%-.250s\012", rs[Rs_display_name]);
2701 break; 3440 break;
2702#endif
2703 case 8: /* unofficial extension */ 3441 case 8: /* unofficial extension */
2704 xterm_seq (XTerm_title, APL_NAME "-" VERSION, CHAR_ST); 3442 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
2705 break; 3443 break;
2706 } 3444 }
2707 break; 3445 break;
2708 3446
2709 case CSI_TBC: /* 8.3.155: (0) TABULATION CLEAR */ 3447 case CSI_TBC: /* 8.3.155: (0) TABULATION CLEAR */
… …
2742 break; 3480 break;
2743 3481
2744 case CSI_RM: /* 8.3.107: RESET MODE */ 3482 case CSI_RM: /* 8.3.107: RESET MODE */
2745 if (arg[0] == 4) 3483 if (arg[0] == 4)
2746 scr_insert_mode (0); 3484 scr_insert_mode (0);
3485 else if (arg[0] == 20)
3486 priv_modes &= ~PrivMode_LFNL;
2747 break; 3487 break;
2748 3488
2749 case CSI_SM: /* 8.3.126: SET MODE */ 3489 case CSI_SM: /* 8.3.126: SET MODE */
2750 if (arg[0] == 4) 3490 if (arg[0] == 4)
2751 scr_insert_mode (1); 3491 scr_insert_mode (1);
3492 else if (arg[0] == 20)
3493 priv_modes |= PrivMode_LFNL;
2752 break; 3494 break;
2753 3495
2754 /* 3496 /*
2755 * PRIVATE USE beyond this point. All CSI_7? sequences here 3497 * PRIVATE USE beyond this point. All CSI_7? sequences here
2756 */ 3498 */
… …
2768 break; 3510 break;
2769 case CSI_75: 3511 case CSI_75:
2770 scr_cursor (RESTORE); 3512 scr_cursor (RESTORE);
2771 break; 3513 break;
2772 3514
2773#ifndef NO_FRILLS 3515#if ENABLE_FRILLS
2774 case CSI_74: 3516 case CSI_74:
2775 process_window_ops (arg, nargs); 3517 process_window_ops (arg, nargs);
2776 break; 3518 break;
2777#endif 3519#endif
2778 3520
2779 case CSI_78: /* DECREQTPARM */ 3521 case CSI_78: /* DECREQTPARM */
2780 if (arg[0] == 0 || arg[0] == 1) 3522 if (arg[0] == 0 || arg[0] == 1)
2781 tt_printf ("\033[%d;1;1;128;128;1;0x", arg[0] + 2); 3523 tt_printf ("\033[%d;1;1;128;128;1;0x", arg[0] + 2);
2782 /* FALLTHROUGH */ 3524 break;
2783 3525
2784 default: 3526 default:
2785 break; 3527 break;
2786 } 3528 }
2787} 3529}
2788/*}}} */ 3530/*}}} */
2789 3531
2790#ifndef NO_FRILLS 3532#if ENABLE_FRILLS
2791/* ARGSUSED */ 3533/* ARGSUSED */
2792void 3534void
2793rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3535rxvt_term::process_window_ops (const int *args, unsigned int nargs)
2794{ 3536{
2795 int x, y; 3537 int x, y;
2796#if 0
2797 char *s;
2798#endif
2799 XWindowAttributes wattr; 3538 XWindowAttributes wattr;
2800 Window wdummy; 3539 Window wdummy;
3540 dDisp;
2801 3541
2802 if (nargs == 0) 3542 if (nargs == 0)
2803 return; 3543 return;
3544
2804 switch (args[0]) 3545 switch (args[0])
2805 { 3546 {
2806 /* 3547 /*
2807 * commands 3548 * commands
2808 */ 3549 */
2809 case 1: /* deiconify window */ 3550 case 1: /* deiconify window */
2810 XMapWindow (display->display, TermWin.parent[0]); 3551 XMapWindow (disp, parent[0]);
2811 break; 3552 break;
2812 case 2: /* iconify window */ 3553 case 2: /* iconify window */
2813 XIconifyWindow (display->display, TermWin.parent[0], 3554 XIconifyWindow (disp, parent[0], display->screen);
2814 DefaultScreen (display->display));
2815 break; 3555 break;
2816 case 3: /* set position (pixels) */ 3556 case 3: /* set position (pixels) */
2817 XMoveWindow (display->display, TermWin.parent[0], args[1], args[2]); 3557 XMoveWindow (disp, parent[0], args[1], args[2]);
2818 break; 3558 break;
2819 case 4: /* set size (pixels) */ 3559 case 4: /* set size (pixels) */
2820 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3560 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
2821 break; 3561 break;
2822 case 5: /* raise window */ 3562 case 5: /* raise window */
2823 XRaiseWindow (display->display, TermWin.parent[0]); 3563 XRaiseWindow (disp, parent[0]);
2824 break; 3564 break;
2825 case 6: /* lower window */ 3565 case 6: /* lower window */
2826 XLowerWindow (display->display, TermWin.parent[0]); 3566 XLowerWindow (disp, parent[0]);
2827 break; 3567 break;
2828 case 7: /* refresh window */ 3568 case 7: /* refresh window */
2829 scr_touch (true); 3569 scr_touch (true);
2830 break; 3570 break;
2831 case 8: /* set size (chars) */ 3571 case 8: /* set size (chars) */
2832 set_widthheight ((unsigned int) (args[2] * TermWin.fwidth), 3572 set_widthheight ((unsigned int) (args[2] * fwidth),
2833 (unsigned int) (args[1] * TermWin.fheight)); 3573 (unsigned int) (args[1] * fheight));
2834 break; 3574 break;
3575
3576 //case 9: NYI, TODO, restore maximized window or maximize window
2835 default: 3577 default:
2836 if (args[0] >= 24) /* set height (chars) */ 3578 if (args[0] >= 24) /* set height (chars) */
2837 set_widthheight ((unsigned int)TermWin.width, 3579 set_widthheight ((unsigned int)width,
2838 (unsigned int) (args[1] * TermWin.fheight)); 3580 (unsigned int) (args[1] * fheight));
2839 break; 3581 break;
3582
3583
2840 /* 3584 /*
2841 * reports - some output format copied from XTerm 3585 * reports - some output format copied from XTerm
2842 */ 3586 */
2843 case 11: /* report window state */ 3587 case 11: /* report window state */
2844 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3588 XGetWindowAttributes (disp, parent[0], &wattr);
2845 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3589 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
2846 break; 3590 break;
2847 case 13: /* report window position */ 3591 case 13: /* report window position */
2848 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3592 XGetWindowAttributes (disp, parent[0], &wattr);
2849 XTranslateCoordinates (display->display, TermWin.parent[0], wattr.root, 3593 XTranslateCoordinates (disp, parent[0], wattr.root,
2850 -wattr.border_width, -wattr.border_width, 3594 -wattr.border_width, -wattr.border_width,
2851 &x, &y, &wdummy); 3595 &x, &y, &wdummy);
2852 tt_printf ("\033[3;%d;%dt", x, y); 3596 tt_printf ("\033[3;%d;%dt", x, y);
2853 break; 3597 break;
2854 case 14: /* report window size (pixels) */ 3598 case 14: /* report window size (pixels) */
2855 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3599 XGetWindowAttributes (disp, parent[0], &wattr);
2856 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3600 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
2857 break; 3601 break;
3602 case 18: /* report text area size (chars) */
3603 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3604 break;
2858 case 18: /* report window size (chars) */ 3605 case 19: /* report window size (chars) */
2859 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); 3606 tt_printf ("\033[9;%d;%dt", nrow, ncol);
2860 break; 3607 break;
2861#if 0 /* XXX: currently disabled due to security concerns */
2862 case 20: /* report icon label */ 3608 case 20: /* report icon label */
3609 {
3610 char *s;
2863 XGetIconName (display->display, TermWin.parent[0], &s); 3611 XGetIconName (disp, parent[0], &s);
2864 tt_printf ("\033]L%-.200s\234", s ? s : ""); /* 8bit ST */ 3612 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3613 XFree (s);
3614 }
2865 break; 3615 break;
2866 case 21: /* report window title */ 3616 case 21: /* report window title */
3617 {
3618 char *s;
2867 XFetchName (display->display, TermWin.parent[0], &s); 3619 XFetchName (disp, parent[0], &s);
2868 tt_printf ("\033]l%-.200s\234", s ? s : ""); /* 8bit ST */ 3620 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3621 XFree (s);
3622 }
2869 break; 3623 break;
2870#endif
2871
2872 } 3624 }
2873} 3625}
2874#endif 3626#endif
2875 3627
2876/*----------------------------------------------------------------------*/ 3628/*----------------------------------------------------------------------*/
2877/* 3629/*
2878 * get input up until STRING TERMINATOR (or BEL) 3630 * get input up until STRING TERMINATOR (or BEL)
2879 * ends_how is terminator used. returned input must be free ()d 3631 * ends_how is terminator used. returned input must be free()'d
2880 */ 3632 */
2881unsigned char * 3633char *
2882rxvt_term::get_to_st (unsigned char *ends_how) 3634rxvt_term::get_to_st (unicode_t &ends_how)
2883{ 3635{
2884 int seen_esc = 0; /* seen escape? */ 3636 unicode_t ch;
3637 bool seen_esc = false;
2885 unsigned int n = 0; 3638 unsigned int n = 0;
2886 unsigned char *s; 3639 wchar_t string[STRING_MAX];
2887 unsigned char ch, string[STRING_MAX];
2888 3640
2889 for (; (ch = cmd_getc ());) 3641 while ((ch = cmd_getc ()) != NOCHAR)
2890 { 3642 {
2891 if (ch == C0_BEL 3643 if (seen_esc)
2892 || ch == CHAR_ST 3644 {
2893 || (ch == 0x5c && seen_esc)) /* 7bit ST */ 3645 if (ch == 0x5c) /* 7bit ST */
2894 break; 3646 break;
3647 else
3648 return NULL;
3649 }
2895 if (ch == C0_ESC) 3650 else if (ch == C0_ESC)
2896 { 3651 {
2897 seen_esc = 1; 3652 seen_esc = true;
2898 continue; 3653 continue;
2899 } 3654 }
2900 else if (ch == '\t') 3655 else if (ch == C0_BEL || ch == CHAR_ST)
2901 ch = ' '; /* translate '\t' to space */ 3656 break;
2902 else if (ch < 0x08 || (ch > 0x0d && ch < 0x20)) 3657 else if (ch < 0x20)
2903 return NULL; /* other control character - exit */ 3658 return NULL; /* other control character - exit */
2904 if (n < sizeof (string) - 1) 3659
3660 seen_esc = false;
3661
3662 if (n >= STRING_MAX - 1)
3663 // stop at some sane length
3664 return NULL;
3665
3666 if (ch == C0_SYN)
3667 string[n++] = cmd_get8 ();
3668 else
2905 string[n++] = ch; 3669 string[n++] = ch;
2906 seen_esc = 0;
2907 } 3670 }
3671
2908 string[n++] = '\0'; 3672 string[n++] = '\0';
2909 if ((s = (unsigned char *)rxvt_malloc (n)) == NULL) 3673
2910 return NULL;
2911 *ends_how = (ch == 0x5c ? C0_ESC : ch); 3674 ends_how = (ch == 0x5c ? C0_ESC : ch);
2912 STRNCPY (s, string, n); 3675
2913 return s; 3676 return rxvt_wcstombs (string);
2914} 3677}
2915 3678
2916/*----------------------------------------------------------------------*/ 3679/*----------------------------------------------------------------------*/
2917/* 3680/*
2918 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3681 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
2919 */ 3682 */
2920void 3683void
2921rxvt_term::process_dcs_seq () 3684rxvt_term::process_dcs_seq ()
2922{ 3685{
2923 unsigned char eh, *s; 3686 char *s;
3687 unicode_t eh;
3688
2924 /* 3689 /*
2925 * Not handled yet 3690 * Not handled yet
2926 */ 3691 */
2927 s = get_to_st (&eh); 3692 s = get_to_st (eh);
2928 if (s) 3693 if (s)
2929 free (s); 3694 free (s);
3695
2930 return; 3696 return;
2931} 3697}
2932 3698
2933/*----------------------------------------------------------------------*/ 3699/*----------------------------------------------------------------------*/
2934/* 3700/*
2935 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)' 3701 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)'
2936 */ 3702 */
2937void 3703void
2938rxvt_term::process_osc_seq () 3704rxvt_term::process_osc_seq ()
2939{ 3705{
2940 unsigned char ch, eh, *s; 3706 unicode_t ch, eh;
2941 int arg; 3707 int arg;
2942 3708
2943 ch = cmd_getc (); 3709 ch = cmd_getc ();
2944 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3710 for (arg = 0; isdigit (ch); ch = cmd_getc ())
2945 arg = arg * 10 + (ch - '0'); 3711 arg = arg * 10 + (ch - '0');
2946 3712
2947 if (ch == ';') 3713 if (ch == ';')
2948 { 3714 {
2949 s = get_to_st (&eh); 3715 char *s = get_to_st (eh);
3716
2950 if (s) 3717 if (s)
2951 { 3718 {
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); 3719 process_xterm_seq (arg, s, eh);
2964 free (s); 3720 free (s);
2965 } 3721 }
2966 } 3722 }
2967} 3723}
3724
3725void
3726rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3727{
3728 if (str[0] == '?' && !str[1])
3729 {
3730 unsigned short r, g, b;
3731 pix_colors_focused[color].get (display, r, g, b);
3732 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp);
3733 }
3734 else
3735 set_window_color (color, str);
3736}
3737
2968/* 3738/*
2969 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3739 * 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 */ 3740 */
2990void 3741void
2991rxvt_term::xterm_seq (int op, const char *str, unsigned char resp __attribute__ ((unused))) 3742rxvt_term::process_xterm_seq (int op, const char *str, char resp)
2992{ 3743{
2993 int changed = 0; 3744 int color;
2994 int color;
2995 char *buf, *name; 3745 char *buf, *name;
3746 bool query = str[0] == '?' && !str[1];
3747 int saveop = op;
3748 dDisp;
2996 3749
2997 assert (str != NULL); 3750 assert (str != NULL);
2998 switch (op) 3751 switch (op)
2999 { 3752 {
3000 case XTerm_name: 3753 case XTerm_name:
3001 set_title (str); 3754 set_title (str);
3002 /* FALLTHROUGH */ 3755 /* FALLTHROUGH */
3003 case XTerm_iconName: 3756 case XTerm_iconName:
3004 set_iconName (str); 3757 set_icon_name (str);
3005 break; 3758 break;
3006 case XTerm_title: 3759 case XTerm_title:
3007 set_title (str); 3760 set_title (str);
3008 break; 3761 break;
3762 case XTerm_property:
3763 if (str[0] == '?')
3764 {
3765 Atom prop = display->atom (str + 1);
3766 Atom actual_type;
3767 int actual_format;
3768 unsigned long nitems;
3769 unsigned long bytes_after;
3770 unsigned char *value = 0;
3771 const char *str = "";
3772
3773 if (prop
3774 && XGetWindowProperty (disp, parent[0],
3775 prop, 0, 1<<16, 0, AnyPropertyType,
3776 &actual_type, &actual_format,
3777 &nitems, &bytes_after, &value) == Success
3778 && actual_type != None
3779 && actual_format == 8)
3780 str = (const char *)(value);
3781
3782 tt_printf ("\033]%d;%s%c", XTerm_property, str, resp);
3783
3784 XFree (value);
3785 }
3786 else
3787 {
3788 char *eq = strchr (str, '='); // constness lost, but verified to be ok
3789
3790 if (eq)
3791 {
3792 *eq = 0;
3793 set_utf8_property (display->atom (str), eq + 1);
3794 }
3795 else
3796 XDeleteProperty (disp, parent[0],
3797 display->atom (str));
3798 }
3799 break;
3800
3009 case XTerm_Color: 3801 case XTerm_Color:
3010 for (buf = (char *)str; buf && *buf;) 3802 for (buf = (char *)str; buf && *buf;)
3011 { 3803 {
3012 if ((name = STRCHR (buf, ';')) == NULL) 3804 if ((name = strchr (buf, ';')) == NULL)
3013 break; 3805 break;
3806
3014 *name++ = '\0'; 3807 *name++ = '\0';
3015 color = atoi (buf); 3808 color = atoi (buf) + minCOLOR;
3016 if (color < 0 || color >= TOTAL_COLORS) 3809
3810 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
3017 break; 3811 break;
3812
3018 if ((buf = STRCHR (name, ';')) != NULL) 3813 if ((buf = strchr (name, ';')) != NULL)
3019 *buf++ = '\0'; 3814 *buf++ = '\0';
3815
3816 if (name[0] == '?' && !name[1])
3817 {
3818 unsigned short r, g, b;
3819 pix_colors_focused[color].get (display, r, g, b);
3820 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3821 }
3822 else
3020 set_window_color (color + minCOLOR, name); 3823 set_window_color (color, name);
3021 } 3824 }
3825 break;
3826 case XTerm_Color00:
3827 process_color_seq (XTerm_Color00, Color_fg, str, resp);
3828 break;
3829 case XTerm_Color01:
3830 process_color_seq (XTerm_Color01, Color_bg, str, resp);
3022 break; 3831 break;
3023#ifndef NO_CURSORCOLOR 3832#ifndef NO_CURSORCOLOR
3024 case XTerm_Color_cursor: 3833 case XTerm_Color_cursor:
3025 set_window_color (Color_cursor, str); 3834 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp);
3026 break; 3835 break;
3027#endif 3836#endif
3028 case XTerm_Color_pointer: 3837 case XTerm_Color_pointer_fg:
3029 set_window_color (Color_pointer, str); 3838 process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp);
3839 break;
3840 case XTerm_Color_pointer_bg:
3841 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp);
3030 break; 3842 break;
3031#ifndef NO_BOLD_UNDERLINE_REVERSE 3843#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: 3844 case XTerm_Color_RV:
3039 set_window_color (Color_RV, str); 3845 process_color_seq (XTerm_Color_RV, Color_RV, str, resp);
3040 break; 3846 break;
3847 case Rxvt_Color_BD:
3848 case URxvt_Color_BD:
3849 process_color_seq (op, Color_BD, str, resp);
3850 break;
3851 case Rxvt_Color_UL:
3852 case URxvt_Color_UL:
3853 process_color_seq (op, Color_UL, str, resp);
3854 break;
3855 case URxvt_Color_IT:
3856 process_color_seq (URxvt_Color_IT, Color_IT, str, resp);
3857 break;
3041#endif 3858#endif
3859#if TRANSPARENT && TINTING
3860 case URxvt_Color_tint:
3861 process_color_seq (URxvt_Color_tint, Color_tint, str, resp);
3862 check_our_parents ();
3863 if (am_transparent)
3864 want_full_refresh = want_refresh = 1;
3865 break;
3866#endif
3042 3867
3043 case XTerm_Menu: 3868 case Rxvt_Pixmap:
3044 /* 3869 {
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 != ';') 3870 if (*str != ';')
3051 { 3871 {
3052#if XPM_BACKGROUND 3872#if XPM_BACKGROUND
3053 scale_pixmap (""); /* reset to default scaling */ 3873 scale_pixmap (""); /* reset to default scaling */
3054 set_bgPixmap (str); /* change pixmap */ 3874 set_bgPixmap (str); /* change pixmap */
3055#endif
3056 scr_touch (true); 3875 scr_touch (true);
3876#endif
3057 } 3877 }
3878
3879 int changed = 0;
3880
3058 while ((str = STRCHR (str, ';')) != NULL) 3881 while ((str = strchr (str, ';')) != NULL)
3059 { 3882 {
3060 str++; 3883 str++;
3061#if XPM_BACKGROUND 3884#if XPM_BACKGROUND
3062 changed += scale_pixmap (str); 3885 changed += scale_pixmap (str);
3063#endif 3886#endif
3064
3065 } 3887 }
3888
3066 if (changed) 3889 if (changed)
3067 { 3890 {
3068#ifdef XPM_BACKGROUND 3891#ifdef XPM_BACKGROUND
3069 resize_pixmap (); 3892 resize_pixmap ();
3070#endif
3071 scr_touch (true); 3893 scr_touch (true);
3894#endif
3072 } 3895 }
3896 }
3073 break; 3897 break;
3074 3898
3075 case XTerm_restoreFG: 3899 case Rxvt_restoreFG:
3076 set_window_color (Color_fg, str); 3900 set_window_color (Color_fg, str);
3077 break; 3901 break;
3078 case XTerm_restoreBG: 3902 case Rxvt_restoreBG:
3079 set_window_color (Color_bg, str); 3903 set_window_color (Color_bg, str);
3080 break; 3904 break;
3905
3081 case XTerm_logfile: 3906 case XTerm_logfile:
3907 // TODO, when secure mode?
3082 break; 3908 break;
3083 case XTerm_font: 3909
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 3910#if 0
3096 case XTerm_dumpscreen: /* no error notices */ 3911 case Rxvt_dumpscreen: /* no error notices */
3097 { 3912 {
3098 int fd; 3913 int fd;
3099 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) 3914 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3100 { 3915 {
3101 scr_dump (fd); 3916 scr_dump (fd);
3102 close (fd); 3917 close (fd);
3103 } 3918 }
3104 } 3919 }
3105 break; 3920 break;
3106#endif 3921#endif
3922 case XTerm_font:
3923 op = URxvt_font;
3924 case URxvt_font:
3925#if ENABLE_STYLES
3926 case URxvt_boldFont:
3927 case URxvt_italicFont:
3928 case URxvt_boldItalicFont:
3929#endif
3930 if (query)
3931 tt_printf ("\33]%d;%-.250s%c", saveop,
3932 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3933 ? fontset[op - URxvt_font]->fontdesc : "",
3934 resp);
3935 else
3936 {
3937 const char *&res = rs[Rs_font + (op - URxvt_font)];
3107 3938
3939 res = strdup (str);
3940 allocated.push_back ((void *)res);
3941 set_fonts ();
3942 }
3943 break;
3944
3945#if ENABLE_FRILLS
3946 case URxvt_locale:
3947 if (query)
3948 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp);
3949 else
3950 {
3951 set_locale (str);
3952 pty->set_utf8_mode (enc_utf8);
3953 init_xlocale ();
3954 }
3955 break;
3956
3957 case URxvt_view_up:
3958 case URxvt_view_down:
3959 {
3960 int lines = atoi (str);
3961
3962 if (lines)
3963 scr_page (op == URxvt_view_up ? UP : DN, lines);
3964 else
3965 scr_erase_savelines ();
3966 }
3967
3968 break;
3969#endif
3970
3971#if ENABLE_PERL
3972 case URxvt_perl:
3973 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STR, str, DT_END)))
3974 ; // no responses yet
3975 break;
3976#endif
3108 } 3977 }
3109} 3978}
3110/*----------------------------------------------------------------------*/ 3979/*----------------------------------------------------------------------*/
3111 3980
3112/*{{{ process DEC private mode sequences `ESC [ ? Ps mode' */ 3981/*{{{ process DEC private mode sequences `ESC [ ? Ps mode' */
… …
3120 * so no need for fancy checking 3989 * so no need for fancy checking
3121 */ 3990 */
3122int 3991int
3123rxvt_term::privcases (int mode, unsigned long bit) 3992rxvt_term::privcases (int mode, unsigned long bit)
3124{ 3993{
3125 int state; 3994 int state;
3126 3995
3127 if (mode == 's') 3996 if (mode == 's')
3128 { 3997 {
3129 SavedModes |= (PrivateModes & bit); 3998 SavedModes |= (priv_modes & bit);
3130 return -1; 3999 return -1;
3131 } 4000 }
3132 else 4001 else
3133 { 4002 {
3134 if (mode == 'r') 4003 if (mode == 'r')
3135 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 4004 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3136 else 4005 else
3137 state = (mode == 't') ? ! (PrivateModes & bit) : mode; 4006 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3138 PrivMode (state, bit); 4007 PrivMode (state, bit);
3139 } 4008 }
4009
3140 return state; 4010 return state;
3141} 4011}
3142 4012
3143/* we're not using priv _yet_ */ 4013/* we're not using priv _yet_ */
3144void 4014void
3145rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg) 4015rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg)
3146{ 4016{
3147 unsigned int i, j; 4017 unsigned int i, j;
3148 int state; 4018 int state;
4019
3149 static const struct 4020 static const struct
3150 { 4021 {
3151 const int argval; 4022 const int argval;
3152 const unsigned long bit; 4023 const unsigned long bit;
3153 } 4024 }
4025
3154 argtopriv[] = { 4026 argtopriv[] = {
3155 { 1, PrivMode_aplCUR }, 4027 { 1, PrivMode_aplCUR },
3156 { 2, PrivMode_vt52 }, 4028 { 2, PrivMode_vt52 },
3157 { 3, PrivMode_132 }, 4029 { 3, PrivMode_132 },
3158 { 4, PrivMode_smoothScroll }, 4030 { 4, PrivMode_smoothScroll },
3159 { 5, PrivMode_rVideo }, 4031 { 5, PrivMode_rVideo },
3160 { 6, PrivMode_relOrigin }, 4032 { 6, PrivMode_relOrigin },
3161 { 7, PrivMode_Autowrap }, 4033 { 7, PrivMode_Autowrap },
4034 // 8, bi-directional support mode
3162 { 9, PrivMode_MouseX10 }, 4035 { 9, PrivMode_MouseX10 },
3163#ifdef menuBar_esc 4036 // 18, 19 printing-related
3164 { menuBar_esc, PrivMode_menuBar }, 4037 { 25, PrivMode_VisibleCursor },
3165#endif
3166#ifdef scrollBar_esc 4038#ifdef scrollBar_esc
3167 { scrollBar_esc, PrivMode_scrollBar }, 4039 { scrollBar_esc, PrivMode_scrollBar },
3168#endif 4040#endif
3169 { 25, PrivMode_VisibleCursor },
3170 { 35, PrivMode_ShiftKeys }, 4041 { 35, PrivMode_ShiftKeys }, // rxvt extension
3171 { 40, PrivMode_132OK }, 4042 { 40, PrivMode_132OK },
4043 // 41 xterm more fixes NYI
4044 // 45 margin bell NYI
4045 // 46 start logging
3172 { 47, PrivMode_Screen }, 4046 { 47, PrivMode_Screen },
3173 { 66, PrivMode_aplKP }, 4047 { 66, PrivMode_aplKP },
3174#ifndef NO_BACKSPACE_KEY 4048#ifndef NO_BACKSPACE_KEY
3175 { 67, PrivMode_BackSpace }, 4049 { 67, PrivMode_BackSpace },
3176#endif 4050#endif
3177 { 1000, PrivMode_MouseX11 }, 4051 { 1000, PrivMode_MouseX11 },
4052 // 1001 Use Hilite Mouse Tracking. NYI, TODO
4053 // 1002 Use Cell Motion Mouse Tracking. NYI, TODO
4054 // 1003 Use All Motion Mouse Tracking. NYI, TODO
3178 { 1010, PrivMode_TtyOutputInh }, 4055 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3179 { 1011, PrivMode_Keypress }, 4056 { 1011, PrivMode_Keypress }, // rxvt extension
4057 // 1035 enable modifiers for alt, numlock NYI
4058 // 1036 send ESC for meta keys NYI
4059 // 1037 send DEL for keypad delete NYI
3180 { 1047, PrivMode_Screen }, 4060 { 1047, PrivMode_Screen },
4061 // 1048 save and restore cursor
3181 { 1049, PrivMode_Screen }, /* xterm extension, not fully implemented */ 4062 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
4063 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3182 }; 4064 };
3183 4065
3184 if (nargs == 0) 4066 if (nargs == 0)
3185 return; 4067 return;
3186 4068
… …
3201 state = privcases (mode, argtopriv[j].bit); 4083 state = privcases (mode, argtopriv[j].bit);
3202 break; 4084 break;
3203 } 4085 }
3204 4086
3205 /* extra handling for values with state unkept */ 4087 /* extra handling for values with state unkept */
3206 if (state == -1)
3207 switch (arg[i]) 4088 switch (arg[i])
3208 { 4089 {
4090#if ENABLE_STYLES
4091 case 1021:
4092 set_option (Opt_intensityStyles, mode);
4093
4094 scr_touch (true);
4095 break;
4096#endif
3209 case 1048: /* alternative cursor save */ 4097 case 1048: /* alternative cursor save */
4098 case 1049:
4099 if (OPTION (Opt_secondaryScreen))
3210 if (mode == 0) 4100 if (mode == 0)
3211 scr_cursor (RESTORE); 4101 scr_cursor (RESTORE);
3212 else if (mode == 1) 4102 else if (mode == 1)
3213 scr_cursor (SAVE); 4103 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; 4104 break;
4105 }
4106
4107 if (state >= 0)
4108 /* extra handling for values with valid 0 or 1 state */
4109 switch (arg[i])
4110 {
4111 /* case 1: - application cursor keys */
4112 case 2: /* VT52 mode */
4113 /* oddball mode. should be set regardless of set/reset
4114 * parameter. Return from VT52 mode with an ESC < from
4115 * within VT52 mode
4116 */
4117 PrivMode (1, PrivMode_vt52);
4118 break;
3230 case 3: /* 80/132 */ 4119 case 3: /* 80/132 */
3231 if (PrivateModes & PrivMode_132OK) 4120 if (priv_modes & PrivMode_132OK)
3232 set_widthheight ( (unsigned int) ((state ? 132 : 80) * TermWin.fwidth), 4121 set_widthheight (((state ? 132 : 80) * fwidth), height);
3233 (unsigned int)TermWin.height);
3234 break; 4122 break;
3235 case 4: /* smooth scrolling */ 4123 case 4: /* smooth scrolling */
3236 if (state)
3237 Options &= ~Opt_jumpScroll;
3238 else
3239 Options |= Opt_jumpScroll; 4124 set_option (Opt_jumpScroll, !state);
3240 break; 4125 break;
3241 case 5: /* reverse video */ 4126 case 5: /* reverse video */
3242 scr_rvideo_mode (state); 4127 scr_rvideo_mode (state);
3243 break; 4128 break;
3244 case 6: /* relative/absolute origins */ 4129 case 6: /* relative/absolute origins */
3245 scr_relative_origin (state); 4130 scr_relative_origin (state);
3246 break; 4131 break;
3247 case 7: /* autowrap */ 4132 case 7: /* autowrap */
3248 scr_autowrap (state); 4133 scr_autowrap (state);
3249 break; 4134 break;
3250 /* case 8: - auto repeat, can't do on a per window basis */ 4135 /* case 8: - auto repeat, can't do on a per window basis */
3251 case 9: /* X10 mouse reporting */ 4136 case 9: /* X10 mouse reporting */
3252 if (state) /* orthogonal */ 4137 if (state) /* orthogonal */
3253 PrivateModes &= ~ (PrivMode_MouseX11); 4138 priv_modes &= ~PrivMode_MouseX11;
3254 break; 4139 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 4140#ifdef scrollBar_esc
3263 case scrollBar_esc: 4141 case scrollBar_esc:
3264 if (scrollbar_mapping (state)) 4142 if (scrollbar_mapping (state))
3265 { 4143 {
3266 resize_all_windows (0, 0, 0); 4144 resize_all_windows (0, 0, 0);
3267 scr_touch (true); 4145 scr_touch (true);
3268 } 4146 }
3269 break; 4147 break;
3270#endif 4148#endif
3271 case 25: /* visible/invisible cursor */ 4149 case 25: /* visible/invisible cursor */
3272 scr_cursor_visible (state); 4150 scr_cursor_visible (state);
3273 break; 4151 break;
3274 /* case 35: - shift keys */ 4152 /* case 35: - shift keys */
3275 /* case 40: - 80 <--> 132 mode */ 4153 /* case 40: - 80 <--> 132 mode */
3276 case 47: /* secondary screen */ 4154 case 47: /* secondary screen */
3277 scr_change_screen (state); 4155 scr_change_screen (state);
3278 break; 4156 break;
3279 /* case 66: - application key pad */ 4157 /* case 66: - application key pad */
3280 /* case 67: - backspace key */ 4158 /* case 67: - backspace key */
3281 case 1000: /* X11 mouse reporting */ 4159 case 1000: /* X11 mouse reporting */
3282 if (state) /* orthogonal */ 4160 if (state) /* orthogonal */
3283 PrivateModes &= ~ (PrivMode_MouseX10); 4161 priv_modes &= ~PrivMode_MouseX10;
3284 break; 4162 break;
3285#if 0 4163#if 0
3286 case 1001: 4164 case 1001:
3287 break; /* X11 mouse highlighting */ 4165 break; /* X11 mouse highlighting */
3288#endif 4166#endif
3289 case 1010: /* scroll to bottom on TTY output inhibit */ 4167 case 1010: /* scroll to bottom on TTY output inhibit */
3290 if (state)
3291 Options &= ~Opt_scrollTtyOutput;
3292 else
3293 Options |= Opt_scrollTtyOutput; 4168 set_option (Opt_scrollTtyOutput, !state);
3294 break; 4169 break;
3295 case 1011: /* scroll to bottom on key press */ 4170 case 1011: /* scroll to bottom on key press */
3296 if (state)
3297 Options |= Opt_scrollTtyKeypress; 4171 set_option (Opt_scrollTtyKeypress, state);
3298 else
3299 Options &= ~Opt_scrollTtyKeypress;
3300 break; 4172 break;
3301 case 1047: /* secondary screen w/ clearing */ 4173 case 1047: /* secondary screen w/ clearing last */
3302 case 1049: /* better secondary screen w/ clearing, but not fully implemented */ 4174 if (OPTION (Opt_secondaryScreen))
3303 if (current_screen != PRIMARY) 4175 if (current_screen != PRIMARY)
3304 scr_erase_screen (2); 4176 scr_erase_screen (2);
3305 scr_change_screen (state); 4177 scr_change_screen (state);
3306 /* FALLTHROUGH */
3307 default:
3308 break; 4178 break;
4179 case 1049: /* secondary screen w/ clearing first */
4180 scr_change_screen (state);
4181 if (OPTION (Opt_secondaryScreen))
4182 if (current_screen != PRIMARY)
4183 scr_erase_screen (2);
4184 break;
4185 default:
4186 break;
3309 } 4187 }
3310 } 4188 }
3311} 4189}
3312/*}}} */ 4190/*}}} */
3313 4191
3314/*{{{ process sgr sequences */ 4192/*{{{ process sgr sequences */
3315void 4193void
3316rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg) 4194rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg)
3317{ 4195{
3318 unsigned int i; 4196 unsigned int i;
3319 short rendset; 4197 short rendset;
3320 int rendstyle; 4198 int rendstyle;
3321 4199
3322 if (nargs == 0) 4200 if (nargs == 0)
3323 { 4201 {
3324 scr_rendition (0, ~RS_None); 4202 scr_rendition (0, ~RS_None);
3325 return; 4203 return;
3326 } 4204 }
4205
3327 for (i = 0; i < nargs; i++) 4206 for (i = 0; i < nargs; i++)
3328 { 4207 {
3329 rendset = -1; 4208 rendset = -1;
3330 switch (arg[i]) 4209 switch (arg[i])
3331 { 4210 {
… …
3333 rendset = 0, rendstyle = ~RS_None; 4212 rendset = 0, rendstyle = ~RS_None;
3334 break; 4213 break;
3335 case 1: 4214 case 1:
3336 rendset = 1, rendstyle = RS_Bold; 4215 rendset = 1, rendstyle = RS_Bold;
3337 break; 4216 break;
4217 //case 2: // low intensity
4218 case 3:
4219 rendset = 1, rendstyle = RS_Italic;
4220 break;
3338 case 4: 4221 case 4:
3339 rendset = 1, rendstyle = RS_Uline; 4222 rendset = 1, rendstyle = RS_Uline;
3340 break; 4223 break;
3341 case 5: 4224 case 5: // slowly blinking
4225 case 6: // rapidly blinking
3342 rendset = 1, rendstyle = RS_Blink; 4226 rendset = 1, rendstyle = RS_Blink;
3343 break; 4227 break;
4228 //case 6: // scoansi light background
3344 case 7: 4229 case 7:
3345 rendset = 1, rendstyle = RS_RVid; 4230 rendset = 1, rendstyle = RS_RVid;
3346 break; 4231 break;
3347 case 22: 4232 case 8:
4233 // invisible. NYI
4234 break;
4235 //case 9: // crossed out
4236 //case 10: // scoansi acs off, primary font
4237 //case 11: // scoansi acs on, first alt font
4238 //case 12: // scoansi acs on, |0x80, second alt font
4239 //...
4240 //case 19: // ninth alt font
4241 //case 20: // gothic
4242 case 21: // disable bold, faint, sometimes doubly underlined (iso 8613)
3348 rendset = 0, rendstyle = RS_Bold; 4243 rendset = 0, rendstyle = RS_Bold;
4244 break;
4245 case 22: // normal intensity
4246 rendset = 0, rendstyle = RS_Bold;
4247 break;
4248 case 23: // disable italic
4249 rendset = 0, rendstyle = RS_Italic;
3349 break; 4250 break;
3350 case 24: 4251 case 24:
3351 rendset = 0, rendstyle = RS_Uline; 4252 rendset = 0, rendstyle = RS_Uline;
3352 break; 4253 break;
3353 case 25: 4254 case 25:
3354 rendset = 0, rendstyle = RS_Blink; 4255 rendset = 0, rendstyle = RS_Blink;
3355 break; 4256 break;
4257 case 26: // variable spacing (iso 8613)
4258 rendset = 0, rendstyle = RS_Blink;
4259 break;
3356 case 27: 4260 case 27:
3357 rendset = 0, rendstyle = RS_RVid; 4261 rendset = 0, rendstyle = RS_RVid;
3358 break; 4262 break;
4263 //case 28: // visible. NYI
4264 //case 29: // not crossed-out
3359 } 4265 }
4266
3360 if (rendset != -1) 4267 if (rendset != -1)
3361 { 4268 {
3362 scr_rendition (rendset, rendstyle); 4269 scr_rendition (rendset, rendstyle);
3363 continue; /* for (;i;) */ 4270 continue; /* for (;i;) */
3364 } 4271 }
… …
3371 case 33: 4278 case 33:
3372 case 34: 4279 case 34:
3373 case 35: 4280 case 35:
3374 case 36: 4281 case 36:
3375 case 37: 4282 case 37:
3376 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), 4283 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg);
3377 Color_fg);
3378 break; 4284 break;
3379#ifdef TTY_256COLOR 4285 case 38: // set fg color, ISO 8613-6
3380 case 38:
3381 if (nargs > i + 2 && arg[i + 1] == 5) 4286 if (nargs > i + 2 && arg[i + 1] == 5)
3382 { 4287 {
3383 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), 4288 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg);
3384 Color_fg);
3385 i += 2; 4289 i += 2;
3386 } 4290 }
3387 break; 4291 break;
3388#endif
3389 case 39: /* default fg */ 4292 case 39: /* default fg */
3390 scr_color (Color_fg, Color_fg); 4293 scr_color (Color_fg, Color_fg);
3391 break; 4294 break;
3392 4295
3393 case 40: 4296 case 40:
… …
3396 case 43: 4299 case 43:
3397 case 44: 4300 case 44:
3398 case 45: 4301 case 45:
3399 case 46: 4302 case 46:
3400 case 47: 4303 case 47:
3401 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), 4304 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg);
3402 Color_bg);
3403 break; 4305 break;
3404#ifdef TTY_256COLOR 4306 case 48: // set bg color, ISO 8613-6
3405 case 48:
3406 if (nargs > i + 2 && arg[i + 1] == 5) 4307 if (nargs > i + 2 && arg[i + 1] == 5)
3407 { 4308 {
3408 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), 4309 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg);
3409 Color_bg);
3410 i += 2; 4310 i += 2;
3411 } 4311 }
3412 break; 4312 break;
3413#endif
3414 case 49: /* default bg */ 4313 case 49: /* default bg */
3415 scr_color (Color_bg, Color_bg); 4314 scr_color (Color_bg, Color_bg);
3416 break; 4315 break;
3417 4316
3418#ifndef NO_BRIGHTCOLOR 4317 //case 50: // not variable spacing
4318
4319#if ENABLE_FRILLS
3419 case 90: 4320 case 90:
3420 case 91: /* set bright fg color */ 4321 case 91: /* set bright fg color */
3421 case 92: 4322 case 92:
3422 case 93: 4323 case 93:
3423 case 94: 4324 case 94:
3424 case 95: 4325 case 95:
3425 case 96: 4326 case 96:
3426 case 97: 4327 case 97:
3427 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), 4328 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), Color_fg);
3428 Color_fg);
3429 break; 4329 break;
3430 case 100: 4330 case 100:
3431 case 101: /* set bright bg color */ 4331 case 101: /* set bright bg color */
3432 case 102: 4332 case 102:
3433 case 103: 4333 case 103:
3434 case 104: 4334 case 104:
3435 case 105: 4335 case 105:
3436 case 106: 4336 case 106:
3437 case 107: 4337 case 107:
3438 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), 4338 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);
3439 Color_bg);
3440 break; 4339 break;
3441#endif 4340#endif
3442
3443 } 4341 }
3444 } 4342 }
3445} 4343}
3446/*}}} */ 4344/*}}} */
3447 4345
3448/*{{{ process Rob Nation's own graphics mode sequences */ 4346/*{{{ (do not) process Rob Nation's own graphics mode sequences */
3449void 4347void
3450rxvt_term::process_graphics () 4348rxvt_term::process_graphics ()
3451{ 4349{
3452 unsigned char ch, cmd = cmd_getc (); 4350 unicode_t ch, cmd = cmd_getc ();
3453 4351
3454 if (cmd == 'Q') 4352 if (cmd == 'Q')
3455 { /* query graphics */ 4353 { /* query graphics */
3456 tt_printf ("\033G0\n"); /* no graphics */ 4354 tt_printf ("\033G0\012"); /* no graphics */
3457 return; 4355 return;
3458 } 4356 }
3459 /* swallow other graphics sequences until terminating ':' */ 4357 /* swallow other graphics sequences until terminating ':' */
3460 do 4358 do
3461 ch = cmd_getc (); 4359 ch = cmd_getc ();
… …
3471 */ 4369 */
3472void 4370void
3473rxvt_term::tt_printf (const char *fmt,...) 4371rxvt_term::tt_printf (const char *fmt,...)
3474{ 4372{
3475 va_list arg_ptr; 4373 va_list arg_ptr;
3476 unsigned char buf[256]; 4374 char buf[256];
3477 4375
3478 va_start (arg_ptr, fmt); 4376 va_start (arg_ptr, fmt);
3479 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4377 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
3480 va_end (arg_ptr); 4378 va_end (arg_ptr);
3481 tt_write (buf, STRLEN (buf)); 4379 tt_write (buf, strlen (buf));
3482} 4380}
3483 4381
3484/* ---------------------------------------------------------------------- */ 4382/* ---------------------------------------------------------------------- */
3485/* Write data to the pty as typed by the user, pasted with the mouse, 4383/* 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. 4384 * or generated by us in response to a query ESC sequence.
3487 */ 4385 */
4386const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4387
3488void 4388void
3489rxvt_term::tt_write (const unsigned char *data, unsigned int len) 4389rxvt_term::tt_write (const char *data, unsigned int len)
3490{ 4390{
3491 enum { MAX_PTY_WRITE = 255 }; // minimum MAX_INPUT 4391 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4392 return;
3492 4393
3493 if (len) 4394 if (pty->pty < 0)
4395 return;
4396
4397 if (v_buflen == 0)
4398 {
4399 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
4400
4401 if ((unsigned int)written == len)
4402 return;
4403
4404 data += written;
4405 len -= written;
3494 { 4406 }
4407
4408 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
4409
4410 memcpy (v_buffer + v_buflen, data, len);
4411 v_buflen += len;
4412
4413 pty_ev.set (EVENT_READ | EVENT_WRITE);
4414}
4415
4416void rxvt_term::pty_write ()
4417{
4418 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4419
4420 if (written > 0)
4421 {
4422 v_buflen -= written;
4423
3495 if (v_buflen == 0) 4424 if (v_buflen == 0)
3496 { 4425 {
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); 4426 free (v_buffer);
3524 v_buffer = 0; 4427 v_buffer = 0;
3525 v_buflen = 0; 4428 v_buflen = 0;
3526 4429
3527 pty_ev.set (EVENT_READ); 4430 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; 4431 return;
3540 } 4432 }
4433
4434 memmove (v_buffer, v_buffer + written, v_buflen);
3541 } 4435 }
4436 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4437 pty_ev.set (EVENT_READ);
3542} 4438}
3543 4439
3544/*----------------------- end-of-file (C source) -----------------------*/ 4440/*----------------------- end-of-file (C source) -----------------------*/
3545 4441

Diff Legend

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