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

Diff Legend

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