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.176 by root, Mon Dec 13 01:29:03 2004 UTC

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

Diff Legend

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