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

Diff Legend

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