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

Diff Legend

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