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

Diff Legend

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