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

Diff Legend

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