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.93 by pcg, Thu Apr 8 20:31:45 2004 UTC vs.
Revision 1.221 by root, Sat Dec 31 18:27:57 2005 UTC

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

Diff Legend

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