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

Diff Legend

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