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

Diff Legend

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