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.95 by pcg, Sun May 9 18:19:49 2004 UTC vs.
Revision 1.190 by root, Mon Jan 17 00:59:23 2005 UTC

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

Diff Legend

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