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

Diff Legend

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