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

Diff Legend

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