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

Diff Legend

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