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.107 by root, Sat Jul 31 00:01:12 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
… …
768 1039
769 memmove (cmdbuf_base, cmdbuf_ptr, n); 1040 memmove (cmdbuf_base, cmdbuf_ptr, n);
770 cmdbuf_ptr = cmdbuf_base; 1041 cmdbuf_ptr = cmdbuf_base;
771 cmdbuf_endp = cmdbuf_ptr + n; 1042 cmdbuf_endp = cmdbuf_ptr + n;
772 1043
773 n = read (cmd_fd, cmdbuf_endp, CBUFSIZ - n); 1044 n = read (pty.pty, cmdbuf_endp, CBUFSIZ - n);
774 1045
775 if (n > 0) 1046 if (n > 0)
776 { 1047 {
777 cmdbuf_endp += n; 1048 cmdbuf_endp += n;
778 return true; 1049 return true;
… …
805 recolour_cursor (); 1076 recolour_cursor ();
806 1077
807#ifdef POINTER_BLANK 1078#ifdef POINTER_BLANK
808 hidden_pointer = 0; 1079 hidden_pointer = 0;
809 1080
810 if (Options & Opt_pointerBlank) 1081 if (options & Opt_pointerBlank)
811 pointer_ev.start (NOW + pointerBlankDelay); 1082 pointer_ev.start (NOW + pointerBlankDelay);
812#endif 1083#endif
813} 1084}
814 1085
815#ifdef POINTER_BLANK 1086#ifdef POINTER_BLANK
816void 1087void
817rxvt_term::pointer_blank () 1088rxvt_term::pointer_blank ()
818{ 1089{
819 if (! (Options & Opt_pointerBlank)) 1090 if (! (options & Opt_pointerBlank))
820 return; 1091 return;
821 1092
822 XDefineCursor (display->display, TermWin.vt, blank_cursor); 1093 XDefineCursor (display->display, TermWin.vt, blank_cursor);
823 XFlush (display->display); 1094 XFlush (display->display);
824 1095
… …
844 x = ev.x; 1115 x = ev.x;
845 y = ev.y; 1116 y = ev.y;
846 pixel_position (&x, &y); 1117 pixel_position (&x, &y);
847 1118
848 if (MEvent.button == AnyButton) 1119 if (MEvent.button == AnyButton)
849 {
850 button_number = 3; 1120 button_number = 3;
851 }
852 else 1121 else
853 { 1122 {
854 button_number = MEvent.button - Button1; 1123 button_number = MEvent.button - Button1;
855 /* add 0x3D for wheel events, like xterm does */ 1124 /* add 0x3D for wheel events, like xterm does */
856 if (button_number >= 3) 1125 if (button_number >= 3)
857 button_number += (64 - 3); 1126 button_number += (64 - 3);
858 } 1127 }
859 1128
860 if (PrivateModes & PrivMode_MouseX10) 1129 if (priv_modes & PrivMode_MouseX10)
861 { 1130 {
862 /* 1131 /*
863 * do not report ButtonRelease 1132 * do not report ButtonRelease
864 * no state info allowed 1133 * no state info allowed
865 */ 1134 */
… …
880 + ((MEvent.state & ModMetaMask) ? 8 : 0) 1149 + ((MEvent.state & ModMetaMask) ? 8 : 0)
881 + ((MEvent.state & ControlMask) ? 16 : 0); 1150 + ((MEvent.state & ControlMask) ? 16 : 0);
882#ifdef MOUSE_REPORT_DOUBLECLICK 1151#ifdef MOUSE_REPORT_DOUBLECLICK
883 key_state += ((MEvent.clicks > 1) ? 32 : 0); 1152 key_state += ((MEvent.clicks > 1) ? 32 : 0);
884#endif 1153#endif
885
886 } 1154 }
887 1155
888#ifdef DEBUG_MOUSEREPORT 1156#if DEBUG_MOUSEREPORT
889 fprintf (stderr, "Mouse ["); 1157 fprintf (stderr, "Mouse [");
890 if (key_state & 16) 1158 if (key_state & 16)
891 fputc ('C', stderr); 1159 fputc ('C', stderr);
892 if (key_state & 4) 1160 if (key_state & 4)
893 fputc ('S', stderr); 1161 fputc ('S', stderr);
… …
897 fputc ('2', stderr); 1165 fputc ('2', stderr);
898 fprintf (stderr, "]: <%d>, %d/%d\n", 1166 fprintf (stderr, "]: <%d>, %d/%d\n",
899 button_number, 1167 button_number,
900 x + 1, 1168 x + 1,
901 y + 1); 1169 y + 1);
902#else 1170#endif
1171
903 tt_printf ("\033[M%c%c%c", 1172 tt_printf ("\033[M%c%c%c",
904 (32 + button_number + key_state), 1173 (32 + button_number + key_state),
905 (32 + x + 1), 1174 (32 + x + 1),
906 (32 + y + 1)); 1175 (32 + y + 1));
907#endif
908} 1176}
909 1177
910#ifdef USING_W11LIB 1178#ifdef USING_W11LIB
911void 1179void
912rxvt_W11_process_x_event (XEvent *ev) 1180rxvt_W11_process_x_event (XEvent *ev)
… …
923{ 1191{
924 SET_R (this); 1192 SET_R (this);
925 SET_LOCALE (locale); 1193 SET_LOCALE (locale);
926 1194
927#if defined(CURSOR_BLINK) 1195#if defined(CURSOR_BLINK)
928 if ((Options & Opt_cursorBlink) && ev.type == KeyPress) 1196 if ((options & Opt_cursorBlink) && ev.type == KeyPress)
929 { 1197 {
930 if (hidden_cursor) 1198 if (hidden_cursor)
931 { 1199 {
932 hidden_cursor = 0; 1200 hidden_cursor = 0;
933 want_refresh = 1; 1201 want_refresh = 1;
… …
936 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1204 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
937 } 1205 }
938#endif 1206#endif
939 1207
940#if defined(POINTER_BLANK) 1208#if defined(POINTER_BLANK)
941 if ((Options & Opt_pointerBlank) && pointerBlankDelay > 0) 1209 if ((options & Opt_pointerBlank) && pointerBlankDelay > 0)
942 { 1210 {
943 if (ev.type == MotionNotify 1211 if (ev.type == MotionNotify
944 || ev.type == ButtonPress 1212 || ev.type == ButtonPress
945 || ev.type == ButtonRelease) 1213 || ev.type == ButtonRelease)
946 if (hidden_pointer) 1214 if (hidden_pointer)
… …
949 if (ev.type == KeyPress && hidden_pointer == 0) 1217 if (ev.type == KeyPress && hidden_pointer == 0)
950 pointer_blank (); 1218 pointer_blank ();
951 } 1219 }
952#endif 1220#endif
953 1221
954#ifdef USE_XIM
955 if (XFilterEvent (&ev, None))
956 return;
957#endif
958
959 Window unused_root, unused_child; 1222 Window unused_root, unused_child;
960 int unused_root_x, unused_root_y; 1223 int unused_root_x, unused_root_y;
961 unsigned int unused_mask; 1224 unsigned int unused_mask;
962
963#ifdef DEBUG_X
964 const char *const eventnames[] =
965 { /* mason - this matches my system */
966 "",
967 "",
968 "KeyPress",
969 "KeyRelease",
970 "ButtonPress",
971 "ButtonRelease",
972 "MotionNotify",
973 "EnterNotify",
974 "LeaveNotify",
975 "FocusIn",
976 "FocusOut",
977 "KeymapNotify",
978 "Expose",
979 "GraphicsExpose",
980 "NoExpose",
981 "VisibilityNotify",
982 "CreateNotify",
983 "DestroyNotify",
984 "UnmapNotify",
985 "MapNotify",
986 "MapRequest",
987 "ReparentNotify",
988 "ConfigureNotify",
989 "ConfigureRequest",
990 "GravityNotify",
991 "ResizeRequest",
992 "CirculateNotify",
993 "CirculateRequest",
994 "PropertyNotify",
995 "SelectionClear",
996 "SelectionRequest",
997 "SelectionNotify",
998 "ColormapNotify",
999 "ClientMessage",
1000 "MappingNotify"
1001 };
1002#endif
1003
1004#ifdef DEBUG_X
1005 struct timeval tp;
1006 struct tm *ltt;
1007 (void)gettimeofday (&tp, NULL);
1008 ltt = localtime (& (tp.tv_sec));
1009 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));
1010#endif
1011 1225
1012 switch (ev.type) 1226 switch (ev.type)
1013 { 1227 {
1014 case KeyPress: 1228 case KeyPress:
1229#if ISO_14755
1230 if (!(iso14755buf & ISO_14755_52))
1231#endif
1015 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;
1016 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
1017 1297
1018#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1298#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1019 case KeyRelease:
1020 {
1021 if (!(ev.xkey.state & ControlMask)) 1299 if (!(ev.xkey.state & ControlMask))
1022 slip_wheel_ev.stop (); 1300 slip_wheel_ev.stop ();
1023 else
1024 {
1025 KeySym ks;
1026
1027 ks = XKeycodeToKeysym (display->display, ev.xkey.keycode, 0);
1028 if (ks == XK_Control_L || ks == XK_Control_R) 1301 else if (ks == XK_Control_L || ks == XK_Control_R)
1029 mouse_slip_wheel_speed = 0; 1302 mouse_slip_wheel_speed = 0;
1030 } 1303#endif
1031 break; 1304 break;
1032 } 1305 }
1033#endif
1034 1306
1035 case ButtonPress: 1307 case ButtonPress:
1036 button_press (ev.xbutton); 1308 button_press (ev.xbutton);
1037 break; 1309 break;
1038 1310
… …
1062 0L, 1000000L, 1334 0L, 1000000L,
1063 False, AnyPropertyType, 1335 False, AnyPropertyType,
1064 &ActualType, &ActualFormat, 1336 &ActualType, &ActualFormat,
1065 &Size, &RemainingBytes, 1337 &Size, &RemainingBytes,
1066 &data); 1338 &data);
1067 XChangeProperty (display->display, display->root, 1339 set_string_property (XA_CUT_BUFFER0, data);
1068 XA_CUT_BUFFER0, XA_STRING,
1069 8, PropModeReplace,
1070 data, STRLEN (data));
1071 XFree (data); 1340 XFree (data);
1072 selection_paste (display->root, XA_CUT_BUFFER0, True); 1341 selection_paste (display->root, XA_CUT_BUFFER0, true);
1073 XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime); 1342 XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime);
1074 } 1343 }
1075#endif /* OFFIX_DND */ 1344#endif /* OFFIX_DND */
1076 break; 1345 break;
1077 1346
1078 case MappingNotify: 1347 case MappingNotify:
1079 XRefreshKeyboardMapping (& (ev.xmapping)); 1348 XRefreshKeyboardMapping (&ev.xmapping);
1080 break; 1349 break;
1081 1350
1082 /* 1351 /*
1083 * XXX: this is not the _current_ arrangement 1352 * XXX: this is not the _current_ arrangement
1084 * Here's my conclusion: 1353 * Here's my conclusion:
… …
1109 { 1378 {
1110 TermWin.focus = 1; 1379 TermWin.focus = 1;
1111 want_refresh = 1; 1380 want_refresh = 1;
1112#ifdef USE_XIM 1381#ifdef USE_XIM
1113 if (Input_Context != NULL) 1382 if (Input_Context != NULL)
1383 {
1384 IMSetStatusPosition ();
1114 XSetICFocus (Input_Context); 1385 XSetICFocus (Input_Context);
1386 }
1115#endif 1387#endif
1116#ifdef CURSOR_BLINK 1388#ifdef CURSOR_BLINK
1117 if (Options & Opt_cursorBlink) 1389 if (options & Opt_cursorBlink)
1118 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1390 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1119#endif 1391#endif
1120#ifdef OFF_FOCUS_FADING 1392#ifdef OFF_FOCUS_FADING
1121 if (rs[Rs_fade]) 1393 if (rs[Rs_fade])
1122 { 1394 {
1123 PixColors = PixColorsFocused; 1395 pix_colors = pix_colors_focused;
1124 set_colorfgbg ();
1125 scr_clear (); 1396 scr_recolour ();
1126 scr_touch (true);
1127 } 1397 }
1128#endif 1398#endif
1129 1399
1130 } 1400 }
1131 break; 1401 break;
… …
1133 case FocusOut: 1403 case FocusOut:
1134 if (TermWin.focus) 1404 if (TermWin.focus)
1135 { 1405 {
1136 TermWin.focus = 0; 1406 TermWin.focus = 0;
1137 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
1138#ifdef USE_XIM 1415#ifdef USE_XIM
1139 if (Input_Context != NULL) 1416 if (Input_Context != NULL)
1140 XUnsetICFocus (Input_Context); 1417 XUnsetICFocus (Input_Context);
1141#endif 1418#endif
1142#ifdef CURSOR_BLINK 1419#ifdef CURSOR_BLINK
1143 if (Options & Opt_cursorBlink) 1420 if (options & Opt_cursorBlink)
1144 cursor_blink_ev.stop (); 1421 cursor_blink_ev.stop ();
1145 hidden_cursor = 0; 1422 hidden_cursor = 0;
1146#endif 1423#endif
1147#ifdef OFF_FOCUS_FADING 1424#ifdef OFF_FOCUS_FADING
1148 if (rs[Rs_fade]) 1425 if (rs[Rs_fade])
1149 { 1426 {
1150 PixColors = PixColorsUnFocused; 1427 pix_colors = pix_colors_unfocused;
1151 set_colorfgbg ();
1152 scr_clear (); 1428 scr_recolour ();
1153 scr_touch (true);
1154 } 1429 }
1155#endif 1430#endif
1156
1157 } 1431 }
1158 break; 1432 break;
1159 1433
1160 case ConfigureNotify: 1434 case ConfigureNotify:
1161 if (ev.xconfigure.window == TermWin.parent[0]) 1435 if (ev.xconfigure.window == TermWin.parent[0])
… …
1170 } 1444 }
1171 while (XCheckTypedWindowEvent (display->display, ev.xconfigure.window, ConfigureNotify, &ev)); 1445 while (XCheckTypedWindowEvent (display->display, ev.xconfigure.window, ConfigureNotify, &ev));
1172 1446
1173 if (szHint.width != width || szHint.height != height) 1447 if (szHint.width != width || szHint.height != height)
1174 { 1448 {
1175 D_SIZE ((stderr, "Size: Resizing from: %4d x %4d", szHint.width, szHint.height)); 1449 seen_resize = 1;
1176 resize_all_windows (width, height, 1); 1450 resize_all_windows (width, height, 1);
1177 } 1451 }
1178#ifdef DEBUG_SIZE 1452
1179 else
1180 {
1181 D_SIZE ((stderr, "Size: Not resizing"));
1182 }
1183#endif
1184#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1453#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1185 if (Options & Opt_transparent) 1454 if (options & Opt_transparent)
1186 {
1187 check_our_parents (); 1455 check_our_parents ();
1188 if (am_transparent)
1189 want_full_refresh = 1;
1190 }
1191#endif 1456#endif
1192 } 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
1193 break; 1465 break;
1194 1466
1195 case SelectionClear: 1467 case SelectionClear:
1196 selection_clear (); 1468 selection_clear ();
1197 break; 1469 break;
1198 1470
1199 case SelectionNotify: 1471 case SelectionNotify:
1200 if (selection_wait == Sel_normal) 1472 if (selection_wait == Sel_normal)
1201 selection_paste (ev.xselection.requestor, 1473 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1202 ev.xselection.property, True);
1203 break; 1474 break;
1204 1475
1205 case SelectionRequest: 1476 case SelectionRequest:
1206 selection_send (ev.xselectionrequest); 1477 selection_send (ev.xselectionrequest);
1207 break; 1478 break;
… …
1228 1499
1229 case GraphicsExpose: 1500 case GraphicsExpose:
1230 case Expose: 1501 case Expose:
1231 if (ev.xany.window == TermWin.vt) 1502 if (ev.xany.window == TermWin.vt)
1232 { 1503 {
1233#ifdef NO_SLOW_LINK_SUPPORT 1504 do
1234 scr_expose (ev.xexpose.x, ev.xexpose.y, 1505 scr_expose (ev.xexpose.x, ev.xexpose.y,
1235 ev.xexpose.width, ev.xexpose.height, False); 1506 ev.xexpose.width, ev.xexpose.height, False);
1236#else 1507 while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev));
1237 // 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))
1238 scr_expose (ev.xexpose.x, ev.xexpose.y, 1512 scr_expose (ev.xexpose.x, ev.xexpose.y,
1239 ev.xexpose.width, ev.xexpose.height, False); 1513 ev.xexpose.width, ev.xexpose.height, False);
1240 //scr_expose (ev.xexpose.x, 0, 1514
1241 // ev.xexpose.width, TermWin.height, False); 1515 scr_refresh (refresh_type);
1242#endif
1243 want_refresh = 1;
1244 } 1516 }
1245 else 1517 else
1246 { 1518 {
1247 XEvent unused_event; 1519 XEvent unused_event;
1248 1520
… …
1258 } 1530 }
1259#ifdef MENUBAR 1531#ifdef MENUBAR
1260 if (menubar_visible () && isMenuBarWindow (ev.xany.window)) 1532 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1261 menubar_expose (); 1533 menubar_expose ();
1262#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
1263 } 1540 }
1264 break; 1541 break;
1265 1542
1266 case MotionNotify: 1543 case MotionNotify:
1267#ifdef POINTER_BLANK 1544#ifdef POINTER_BLANK
… …
1273 { 1550 {
1274 menubar_control (ev.xbutton); 1551 menubar_control (ev.xbutton);
1275 break; 1552 break;
1276 } 1553 }
1277#endif 1554#endif
1278 if ((PrivateModes & PrivMode_mouse_report) && ! (bypass_keystate)) 1555 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1279 break; 1556 break;
1280 1557
1281 if (ev.xany.window == TermWin.vt) 1558 if (ev.xany.window == TermWin.vt)
1282 { 1559 {
1283 if ((ev.xbutton.state & (Button1Mask | Button3Mask))) 1560 if (ev.xbutton.state & (Button1Mask | Button3Mask))
1284 { 1561 {
1285 while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev)) 1562 while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev))
1286 ; 1563 ;
1287 1564
1288 XQueryPointer (display->display, TermWin.vt, 1565 XQueryPointer (display->display, TermWin.vt,
1289 &unused_root, &unused_child, 1566 &unused_root, &unused_child,
1290 &unused_root_x, &unused_root_y, 1567 &unused_root_x, &unused_root_y,
1291 & (ev.xbutton.x), & (ev.xbutton.y), 1568 &ev.xbutton.x, &ev.xbutton.y,
1292 &unused_mask); 1569 &ev.xbutton.state);
1293#ifdef MOUSE_THRESHOLD 1570#ifdef MOUSE_THRESHOLD
1294 /* deal with a `jumpy' mouse */ 1571 /* deal with a `jumpy' mouse */
1295 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD) 1572 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD)
1296 { 1573 {
1297#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
1298 selection_extend ((ev.xbutton.x), (ev.xbutton.y), 1583 selection_extend (ev.xbutton.x, ev.xbutton.y,
1299 (ev.xbutton.state & Button3Mask) ? 2 : 0); 1584 ev.xbutton.state & Button3Mask ? 2 : 0);
1585
1300#ifdef SELECTION_SCROLLING 1586#ifdef SELECTION_SCROLLING
1301 if (ev.xbutton.y < TermWin.int_bwidth 1587 if (ev.xbutton.y < TermWin.int_bwidth
1302 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1)) 1588 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1))
1303 { 1589 {
1304 int dist; 1590 int dist;
… …
1310 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1596 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY);
1311 1597
1312 /* save the event params so we can highlight 1598 /* save the event params so we can highlight
1313 * the selection in the pending-scroll loop 1599 * the selection in the pending-scroll loop
1314 */ 1600 */
1315 selection_save_x=ev.xbutton.x; 1601 selection_save_x = ev.xbutton.x;
1316 selection_save_y=ev.xbutton.y; 1602 selection_save_y = ev.xbutton.y;
1317 selection_save_state=
1318 (ev.xbutton.state & Button3Mask) ? 2 : 0; 1603 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;
1319 1604
1320 /* calc number of lines to scroll */ 1605 /* calc number of lines to scroll */
1321 if (ev.xbutton.y<TermWin.int_bwidth) 1606 if (ev.xbutton.y < TermWin.int_bwidth)
1322 { 1607 {
1323 scroll_selection_dir = UP; 1608 scroll_selection_dir = UP;
1324 dist = TermWin.int_bwidth - ev.xbutton.y; 1609 dist = TermWin.int_bwidth - ev.xbutton.y;
1325 } 1610 }
1326 else 1611 else
1327 { 1612 {
1328 scroll_selection_dir = DN; 1613 scroll_selection_dir = DN;
1329 dist = ev.xbutton.y -
1330 (TermWin.int_bwidth + TermWin.height); 1614 dist = ev.xbutton.y - (TermWin.int_bwidth + TermWin.height);
1331 } 1615 }
1616
1332 scroll_selection_lines= (Pixel2Height (dist)/ 1617 scroll_selection_lines = Pixel2Height (dist)
1333 SELECTION_SCROLL_LINE_SPEEDUP)+1; 1618 / SELECTION_SCROLL_LINE_SPEEDUP
1619 + 1;
1334 MIN_IT (scroll_selection_lines, 1620 MIN_IT (scroll_selection_lines,
1335 SELECTION_SCROLL_MAX_LINES); 1621 SELECTION_SCROLL_MAX_LINES);
1336 } 1622 }
1337 else 1623 else
1338 { 1624 {
1339 /* we are within the text window, so we 1625 /* we are within the text window, so we
1340 * shouldn't be scrolling 1626 * shouldn't be scrolling
… …
1342 if (sel_scroll_ev.active) 1628 if (sel_scroll_ev.active)
1343 sel_scroll_ev.stop(); 1629 sel_scroll_ev.stop();
1344 } 1630 }
1345#endif 1631#endif
1346#ifdef MOUSE_THRESHOLD 1632#ifdef MOUSE_THRESHOLD
1347
1348 } 1633 }
1349#endif 1634#endif
1350
1351 } 1635 }
1352 } 1636 }
1353 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1637 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1354 { 1638 {
1355 while (XCheckTypedWindowEvent (display->display, scrollBar.win, 1639 while (XCheckTypedWindowEvent (display->display, scrollBar.win,
1356 MotionNotify, &ev)) ; 1640 MotionNotify, &ev))
1641 ;
1642
1357 XQueryPointer (display->display, scrollBar.win, 1643 XQueryPointer (display->display, scrollBar.win,
1358 &unused_root, &unused_child, 1644 &unused_root, &unused_child,
1359 &unused_root_x, &unused_root_y, 1645 &unused_root_x, &unused_root_y,
1360 & (ev.xbutton.x), & (ev.xbutton.y), 1646 &ev.xbutton.x, &ev.xbutton.y,
1361 &unused_mask); 1647 &unused_mask);
1362 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1648 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1363 scrollbar_size ()); 1649 scrollbar_size ());
1364 scr_refresh (refresh_type); 1650 scr_refresh (refresh_type);
1365 refresh_limit = 0; 1651 refresh_limit = 0;
… …
1367 } 1653 }
1368 break; 1654 break;
1369 } 1655 }
1370} 1656}
1371 1657
1658#if TRANSPARENT
1372void 1659void
1373rxvt_term::rootwin_cb (XEvent &ev) 1660rxvt_term::rootwin_cb (XEvent &ev)
1374{ 1661{
1375 SET_R (this); 1662 SET_R (this);
1376 SET_LOCALE (locale); 1663 SET_LOCALE (locale);
1377 1664
1378 switch (ev.type) 1665 switch (ev.type)
1379 { 1666 {
1380 case PropertyNotify: 1667 case PropertyNotify:
1381 if (ev.xproperty.atom == xa[XA_VT_SELECTION])
1382 {
1383 if (ev.xproperty.state == PropertyNewValue)
1384 selection_property (ev.xproperty.window, ev.xproperty.atom);
1385 break;
1386 }
1387#ifdef TRANSPARENT
1388 else
1389 {
1390 /* 1668 /*
1391 * 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,
1392 * 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.
1393 */ 1671 */
1394 if (xa[XA_XROOTPMAPID] == 0) 1672 if (xa[XA_XROOTPMAPID] == 0)
1395 xa[XA_XROOTPMAPID] = XInternAtom (display->display, "_XROOTPMAP_ID", False); 1673 xa[XA_XROOTPMAPID] = XInternAtom (display->display, "_XROOTPMAP_ID", False);
1396 1674
1397 if (ev.xproperty.atom != xa[XA_XROOTPMAPID]) 1675 if (ev.xproperty.atom != xa[XA_XROOTPMAPID])
1398 return; 1676 return;
1399 }
1400 1677
1401 /* FALLTHROUGH */ 1678 /* FALLTHROUGH */
1402 case ReparentNotify: 1679 case ReparentNotify:
1403 if ((Options & Opt_transparent) && check_our_parents () && am_transparent) 1680 if ((options & Opt_transparent) && check_our_parents () && am_transparent)
1404 want_full_refresh = 1; 1681 want_refresh = want_full_refresh = 1;
1405 break; 1682 break;
1406#endif
1407 } 1683 }
1408} 1684}
1685#endif
1409 1686
1410void 1687void
1411rxvt_term::button_press (XButtonEvent &ev) 1688rxvt_term::button_press (XButtonEvent &ev)
1412{ 1689{
1413 int reportmode = 0, clickintime; 1690 int reportmode = 0, clickintime;
1414 1691
1415 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1692 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1416 if (!bypass_keystate) 1693 if (!bypass_keystate)
1417 reportmode = !! (PrivateModes & PrivMode_mouse_report); 1694 reportmode = !! (priv_modes & PrivMode_mouse_report);
1695
1418 /* 1696 /*
1419 * VT window processing of button press 1697 * VT window processing of button press
1420 */ 1698 */
1421 if (ev.window == TermWin.vt) 1699 if (ev.window == TermWin.vt)
1422 { 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
1423 clickintime = ev.time - MEvent.time < MULTICLICK_TIME; 1710 clickintime = ev.time - MEvent.time < MULTICLICK_TIME;
1711
1424 if (reportmode) 1712 if (reportmode)
1425 { 1713 {
1426 /* mouse report from vt window */ 1714 /* mouse report from vt window */
1427 /* save the xbutton state (for ButtonRelease) */ 1715 /* save the xbutton state (for ButtonRelease) */
1428 MEvent.state = ev.state; 1716 MEvent.state = ev.state;
… …
1457 } 1745 }
1458 else 1746 else
1459 { 1747 {
1460 if (ev.button != MEvent.button) 1748 if (ev.button != MEvent.button)
1461 MEvent.clicks = 0; 1749 MEvent.clicks = 0;
1750
1462 switch (ev.button) 1751 switch (ev.button)
1463 { 1752 {
1464 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
1465 /* allow shift+left click to extend selection */ 1762 /* allow shift+left click to extend selection */
1466 if (ev.state & ShiftMask && ! (PrivateModes & PrivMode_mouse_report)) 1763 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report))
1467 { 1764 {
1468 if (MEvent.button == Button1 && clickintime) 1765 if (MEvent.button == Button1 && clickintime)
1469 selection_rotate (ev.x, ev.y); 1766 selection_rotate (ev.x, ev.y);
1470 else 1767 else
1471 selection_extend (ev.x, ev.y, 1); 1768 selection_extend (ev.x, ev.y, 1);
… …
1486 case Button3: 1783 case Button3:
1487 if (MEvent.button == Button3 && clickintime) 1784 if (MEvent.button == Button3 && clickintime)
1488 selection_rotate (ev.x, ev.y); 1785 selection_rotate (ev.x, ev.y);
1489 else 1786 else
1490 selection_extend (ev.x, ev.y, 1); 1787 selection_extend (ev.x, ev.y, 1);
1788
1491 MEvent.button = Button3; 1789 MEvent.button = Button3;
1492 break; 1790 break;
1493 } 1791 }
1494 } 1792 }
1793
1495 MEvent.time = ev.time; 1794 MEvent.time = ev.time;
1496 return; 1795 return;
1497 } 1796 }
1498 1797
1499 /* 1798 /*
… …
1591 break; 1890 break;
1592 case R_SB_ALIGN_BOTTOM: 1891 case R_SB_ALIGN_BOTTOM:
1593 csrO = scrollBar.bot - scrollBar.top; 1892 csrO = scrollBar.bot - scrollBar.top;
1594 break; 1893 break;
1595 } 1894 }
1895
1596 if (scrollBar.style == R_SB_XTERM 1896 if (scrollBar.style == R_SB_XTERM
1597 || scrollbar_above_slider (ev.y) 1897 || scrollbar_above_slider (ev.y)
1598 || scrollbar_below_slider (ev.y)) 1898 || scrollbar_below_slider (ev.y))
1599 scr_move_to ( scrollbar_position (ev.y) - csrO, 1899 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ());
1600 scrollbar_size ()); 1900
1601 scrollBar.setMotion (); 1901 scrollBar.setMotion ();
1602 break; 1902 break;
1603 1903
1604 case Button1: 1904 case Button1:
1605 if (scrollbar_align == R_SB_ALIGN_CENTRE) 1905 if (scrollbar_align == R_SB_ALIGN_CENTRE)
… …
1629 scr_page ((ev.button == Button1 ? DN : UP), 1929 scr_page ((ev.button == Button1 ? DN : UP),
1630 (TermWin.nrow 1930 (TermWin.nrow
1631 * scrollbar_position (ev.y) 1931 * scrollbar_position (ev.y)
1632 / scrollbar_size ())); 1932 / scrollbar_size ()));
1633 } 1933 }
1934
1634 break; 1935 break;
1635 } 1936 }
1636 } 1937 }
1637 return; 1938 return;
1638 } 1939 }
… …
1650{ 1951{
1651 int reportmode = 0; 1952 int reportmode = 0;
1652 1953
1653 csrO = 0; /* reset csr Offset */ 1954 csrO = 0; /* reset csr Offset */
1654 if (!bypass_keystate) 1955 if (!bypass_keystate)
1655 reportmode = !! (PrivateModes & PrivMode_mouse_report); 1956 reportmode = !! (priv_modes & PrivMode_mouse_report);
1656 1957
1657 if (scrollbar_isUpDn ()) 1958 if (scrollbar_isUpDn ())
1658 { 1959 {
1659 scrollBar.setIdle (); 1960 scrollBar.setIdle ();
1660 scrollbar_show (0); 1961 scrollbar_show (0);
1661#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1962#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1662 refresh_type &= ~SMOOTH_REFRESH; 1963 refresh_type &= ~SMOOTH_REFRESH;
1663#endif 1964#endif
1664
1665 } 1965 }
1966
1666#ifdef SELECTION_SCROLLING 1967#ifdef SELECTION_SCROLLING
1667 if (sel_scroll_ev.active) 1968 if (sel_scroll_ev.active)
1668 sel_scroll_ev.stop(); 1969 sel_scroll_ev.stop();
1669#endif 1970#endif
1971
1670 if (ev.window == TermWin.vt) 1972 if (ev.window == TermWin.vt)
1671 { 1973 {
1974#if ISO_14755
1975 // 5.4
1976 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1977 return;
1978#endif
1672 if (reportmode) 1979 if (reportmode)
1673 { 1980 {
1674 /* mouse report from vt window */ 1981 /* mouse report from vt window */
1675 /* don't report release of wheel "buttons" */ 1982 /* don't report release of wheel "buttons" */
1676 if (ev.button >= 4) 1983 if (ev.button >= 4)
… …
1690 MEvent.button = AnyButton; 1997 MEvent.button = AnyButton;
1691 mouse_report (ev); 1998 mouse_report (ev);
1692#endif /* MOUSE_REPORT_DOUBLECLICK */ 1999#endif /* MOUSE_REPORT_DOUBLECLICK */
1693 return; 2000 return;
1694 } 2001 }
2002
1695 /* 2003 /*
1696 * dumb hack to compensate for the failure of click-and-drag 2004 * dumb hack to compensate for the failure of click-and-drag
1697 * when overriding mouse reporting 2005 * when overriding mouse reporting
1698 */ 2006 */
1699 if (PrivateModes & PrivMode_mouse_report 2007 if (priv_modes & PrivMode_mouse_report
1700 && bypass_keystate 2008 && bypass_keystate
1701 && ev.button == Button1 && MEvent.clicks <= 1) 2009 && ev.button == Button1 && MEvent.clicks <= 1)
1702 selection_extend (ev.x, ev.y, 0); 2010 selection_extend (ev.x, ev.y, 0);
1703 2011
1704 switch (ev.button) 2012 switch (ev.button)
… …
1719 2027
1720 v = ev.button == Button4 ? UP : DN; 2028 v = ev.button == Button4 ? UP : DN;
1721 2029
1722 if (ev.state & ShiftMask) 2030 if (ev.state & ShiftMask)
1723 i = 1; 2031 i = 1;
1724 else if (Options & Opt_mouseWheelScrollPage) 2032 else if (options & Opt_mouseWheelScrollPage)
1725 i = TermWin.nrow - 1; 2033 i = TermWin.nrow - 1;
1726 else 2034 else
1727 i = 5; 2035 i = 5;
1728 2036
1729# ifdef MOUSE_SLIP_WHEELING 2037# ifdef MOUSE_SLIP_WHEELING
… …
1767#endif 2075#endif
1768} 2076}
1769 2077
1770#ifdef TRANSPARENT 2078#ifdef TRANSPARENT
1771#if TINTING 2079#if TINTING
1772/* shading taken from eterm-0.9.2 */ 2080/* taken from aterm-0.4.2 */
1773/* RGB 15 */
1774 2081
1775static void 2082typedef uint32_t RUINT32T;
1776shade_ximage_15(void *data, int bpl, int w, int h, int rm, int gm, int bm)
1777{
1778 unsigned char *ptr;
1779 int x, y;
1780 2083
1781 ptr = (unsigned char *)data + (w * sizeof(uint16_t)); 2084void ShadeXImage(rxvt_display *display, XImage* srcImage, int shade, int rm, int gm, int bm)
1782 if ((rm <= 256) && (gm <= 256) && (bm <= 256)) { 2085{
1783 /* No saturation */ 2086 int sh_r, sh_g, sh_b;
1784 for (y = h; --y >= 0;) { 2087 RUINT32T mask_r, mask_g, mask_b;
1785 for (x = -w; x < 0; x++) { 2088 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
1786 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;
1787 2092
1788 b = ((uint16_t *) ptr)[x]; 2093 Visual* visual = display->visual;
1789 r = (b & 0x7c00) * rm; 2094
1790 g = (b & 0x3e0) * gm; 2095 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
1791 b = (b & 0x1f) * bm; 2096
1792 ((uint16_t *) ptr)[x] = ((r >> 8) & 0x7c00) 2097 /* for convenience */
1793 | ((g >> 8) & 0x3e0) 2098 mask_r = visual->red_mask;
1794 | ((b >> 8) & 0x1f); 2099 mask_g = visual->green_mask;
1795 } 2100 mask_b = visual->blue_mask;
1796 ptr += bpl; 2101
1797 } 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;
1798 } else { 2175 } else {
1799 for (y = h; --y >= 0;) { 2176 if (shade < 0) shade = 0;
1800 for (x = -w; x < 0; x++) { 2177 if (shade > 100) shade = 100;
1801 int r, g, b;
1802 2178
1803 b = ((uint16_t *) ptr)[x]; 2179 lower_lim_r = lower_lim_g = lower_lim_b = 0;
1804 r = (b & 0x7c00) * rm; 2180
1805 g = (b & 0x3e0) * gm; 2181 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
1806 b = (b & 0x1f) * bm; 2182 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);
1807 r |= (!(r >> 15) - 1); 2183 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100);
1808 g |= (!(g >> 10) - 1); 2184 }
1809 b |= (!(b >> 5) - 1); 2185
1810 ((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 */
1811 | ((g >> 8) & 0x3e0) 2187 if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 ))
1812 | ((b >> 8) & 0x1f); 2188 {
1813 } 2189 unsigned int tmp;
1814 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++)
1815 } 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);
1816 } 2242 }
1817} 2243 break;
1818 2244 }
1819/* RGB 16 */ 2245 case 16:
1820static void 2246 {
1821shade_ximage_16(void *data, int bpl, int w, int h, int rm, int gm, int bm) 2247 unsigned short *p1, *pf, *p, *pl;
1822{ 2248 p1 = (unsigned short *) srcImage->data;
1823 unsigned char *ptr; 2249 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
1824 int x, y; 2250 while (p1 < pf)
1825 2251 {
1826 ptr = (unsigned char *)data + (w * sizeof(uint16_t)); 2252 p = p1;
1827 if ((rm <= 256) && (gm <= 256) && (bm <= 256)) { 2253 pl = p1 + srcImage->width;
1828 /* No saturation */ 2254 for (; p < pl; p++)
1829 for (y = h; --y >= 0;) {
1830 for (x = -w; x < 0; x++) {
1831 int r, g, b;
1832
1833 b = ((uint16_t *) ptr)[x];
1834 r = (b & 0xf800) * rm;
1835 g = (b & 0x7e0) * gm;
1836 b = (b & 0x1f) * bm;
1837 ((uint16_t *) ptr)[x] = ((r >> 8) & 0xf800)
1838 | ((g >> 8) & 0x7e0)
1839 | ((b >> 8) & 0x1f);
1840 }
1841 ptr += bpl;
1842 } 2255 {
1843 } else { 2256 *p = lookup_r[(*p & 0xf800)>>11] |
1844 for (y = h; --y >= 0;) { 2257 lookup_g[(*p & 0x07e0)>> 5] |
1845 for (x = -w; x < 0; x++) { 2258 lookup_b[(*p & 0x001f)];
1846 int r, g, b;
1847
1848 b = ((uint16_t *) ptr)[x];
1849 r = (b & 0xf800) * rm;
1850 g = (b & 0x7e0) * gm;
1851 b = (b & 0x1f) * bm;
1852 r |= (!(r >> 16) - 1);
1853 g |= (!(g >> 11) - 1);
1854 b |= (!(b >> 5) - 1);
1855 ((uint16_t *) ptr)[x] = ((r >> 8) & 0xf800)
1856 | ((g >> 8) & 0x7e0)
1857 | ((b >> 8) & 0x1f);
1858 } 2259 }
1859 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)
1860 } 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);
1861 } 2280 }
1862} 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);
1863 2288
1864/* RGB 24 */ 2289 while (p1 < pf)
1865static void 2290 {
1866shade_ximage_24(void *data, int bpl, int w, int h, int rm, int gm, int bm) 2291 p = p1;
1867{ 2292 pl = p1 + srcImage->width;
1868 unsigned char *ptr; 2293 for (; p < pl; p++)
1869 int x, y;
1870
1871 ptr = (unsigned char *)data + (w * 3);
1872 if ((rm <= 256) && (gm <= 256) && (bm <= 256)) {
1873 /* No saturation */
1874 for (y = h; --y >= 0;) {
1875 for (x = -(w * 3); x < 0; x += 3) {
1876 int r, g, b;
1877
1878 if (byteorder.big_endian()) {
1879 r = (ptr[x + 0] * rm) >> 8;
1880 g = (ptr[x + 1] * gm) >> 8;
1881 b = (ptr[x + 2] * bm) >> 8;
1882 ptr[x + 0] = r;
1883 ptr[x + 1] = g;
1884 ptr[x + 2] = b;
1885 } else {
1886 r = (ptr[x + 2] * rm) >> 8;
1887 g = (ptr[x + 1] * gm) >> 8;
1888 b = (ptr[x + 0] * bm) >> 8;
1889 ptr[x + 2] = r;
1890 ptr[x + 1] = g;
1891 ptr[x + 0] = b;
1892 }
1893 }
1894 ptr += bpl;
1895 } 2294 {
1896 } else { 2295 *p = lookup_r[(*p & 0xff0000)>>16] |
1897 for (y = h; --y >= 0;) { 2296 lookup_g[(*p & 0x00ff00)>> 8] |
1898 for (x = -(w * 3); x < 0; x += 3) { 2297 lookup_b[(*p & 0x0000ff)] |
1899 int r, g, b; 2298 (*p & ~0xffffff);
1900
1901 if (byteorder.big_endian()) {
1902 r = (ptr[x + 0] * rm) >> 8;
1903 g = (ptr[x + 1] * gm) >> 8;
1904 b = (ptr[x + 2] * bm) >> 8;
1905
1906 r |= (!(r >> 8) - 1);
1907 g |= (!(g >> 8) - 1);
1908 b |= (!(b >> 8) - 1);
1909
1910 ptr[x + 0] = r;
1911 ptr[x + 1] = g;
1912 ptr[x + 2] = b;
1913 } else {
1914 r = (ptr[x + 2] * rm) >> 8;
1915 g = (ptr[x + 1] * gm) >> 8;
1916 b = (ptr[x + 0] * bm) >> 8;
1917
1918 r |= (!(r >> 8) - 1);
1919 g |= (!(g >> 8) - 1);
1920 b |= (!(b >> 8) - 1);
1921
1922 ptr[x + 2] = r;
1923 ptr[x + 1] = g;
1924 ptr[x + 0] = b;
1925 }
1926 } 2299 }
1927 ptr += bpl; 2300 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
1928 } 2301 }
2302 break;
2303 }
1929 } 2304 }
1930}
1931 2305
1932/* RGB 32 */ 2306 free (lookup);
1933static void
1934shade_ximage_32(void *data, int bpl, int w, int h, int rm, int gm, int bm)
1935{
1936 unsigned char *ptr;
1937 int x, y;
1938
1939 ptr = (unsigned char *)data + (w * 4);
1940 if ((rm <= 256) && (gm <= 256) && (bm <= 256)) {
1941 /* No saturation */
1942 for (y = h; --y >= 0;) {
1943 if (byteorder.big_endian()) {
1944 for (x = -(w * 4); x < 0; x += 4) {
1945 int r, g, b;
1946
1947 r = (ptr[x + 1] * rm) >> 8;
1948 g = (ptr[x + 2] * gm) >> 8;
1949 b = (ptr[x + 3] * bm) >> 8;
1950 ptr[x + 1] = r;
1951 ptr[x + 2] = g;
1952 ptr[x + 3] = b;
1953 }
1954 } else {
1955 for (x = -(w * 4); x < 0; x += 4) {
1956 int r, g, b;
1957
1958 r = (ptr[x + 2] * rm) >> 8;
1959 g = (ptr[x + 1] * gm) >> 8;
1960 b = (ptr[x + 0] * bm) >> 8;
1961 ptr[x + 2] = r;
1962 ptr[x + 1] = g;
1963 ptr[x + 0] = b;
1964 }
1965 }
1966 ptr += bpl;
1967 }
1968 } else {
1969 for (y = h; --y >= 0;) {
1970 for (x = -(w * 4); x < 0; x += 4) {
1971 int r, g, b;
1972
1973 if (byteorder.big_endian()) {
1974 r = (ptr[x + 1] * rm) >> 8;
1975 g = (ptr[x + 2] * gm) >> 8;
1976 b = (ptr[x + 3] * bm) >> 8;
1977
1978 r |= (!(r >> 8) - 1);
1979 g |= (!(g >> 8) - 1);
1980 b |= (!(b >> 8) - 1);
1981
1982 ptr[x + 1] = r;
1983 ptr[x + 2] = g;
1984 ptr[x + 3] = b;
1985 } else {
1986 r = (ptr[x + 2] * rm) >> 8;
1987 g = (ptr[x + 1] * gm) >> 8;
1988 b = (ptr[x + 0] * bm) >> 8;
1989
1990 r |= (!(r >> 8) - 1);
1991 g |= (!(g >> 8) - 1);
1992 b |= (!(b >> 8) - 1);
1993
1994 ptr[x + 2] = r;
1995 ptr[x + 1] = g;
1996 ptr[x + 0] = b;
1997 }
1998 }
1999 ptr += bpl;
2000 }
2001 }
2002} 2307}
2003
2004#endif 2308#endif
2005 2309
2006/* 2310/*
2007 * Check our parents are still who we think they are. 2311 * Check our parents are still who we think they are.
2008 * Do transparency updates if required 2312 * Do transparency updates if required
… …
2018 Pixmap rootpixmap = None; 2322 Pixmap rootpixmap = None;
2019 XWindowAttributes wattr, wrootattr; 2323 XWindowAttributes wattr, wrootattr;
2020 2324
2021 pchanged = 0; 2325 pchanged = 0;
2022 2326
2023 if (!(Options & Opt_transparent)) 2327 if (!(options & Opt_transparent))
2024 return pchanged; /* Don't try any more */ 2328 return pchanged; /* Don't try any more */
2025 2329
2026 XGetWindowAttributes (display->display, display->root, &wrootattr); 2330 XGetWindowAttributes (display->display, display->root, &wrootattr);
2027 rootdepth = wrootattr.depth; 2331 rootdepth = wrootattr.depth;
2028 2332
… …
2031 if (rootdepth != wattr.depth) 2335 if (rootdepth != wattr.depth)
2032 { 2336 {
2033 if (am_transparent) 2337 if (am_transparent)
2034 { 2338 {
2035 pchanged = 1; 2339 pchanged = 1;
2036 XSetWindowBackground (display->display, TermWin.vt, PixColorsFocused[Color_bg]); 2340 XSetWindowBackground (display->display, TermWin.vt, pix_colors_focused[Color_bg]);
2037 am_transparent = am_pixmap_trans = 0; 2341 am_transparent = am_pixmap_trans = 0;
2038 } 2342 }
2039 2343
2040 return pchanged; /* Don't try any more */ 2344 return pchanged; /* Don't try any more */
2041 } 2345 }
… …
2057 i = (xa[XA_XSETROOTID] 2361 i = (xa[XA_XSETROOTID]
2058 && XGetWindowProperty (display->display, display->root, xa[XA_XSETROOTID], 2362 && XGetWindowProperty (display->display, display->root, xa[XA_XSETROOTID],
2059 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2363 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2060 &nitems, &bytes_after, &prop) == Success); 2364 &nitems, &bytes_after, &prop) == Success);
2061 2365
2062 if (!i || prop == NULL || !rs[Rs_color + Color_tint]) 2366 if (!i || prop == NULL
2367#if TINTING
2368 || !rs[Rs_color + Color_tint]
2369#endif
2370 )
2063 have_pixmap = 0; 2371 have_pixmap = 0;
2064 else 2372 else
2065 { 2373 {
2066 have_pixmap = 1; 2374 have_pixmap = 1;
2067 rootpixmap = *(Pixmap *)prop; 2375 rootpixmap = *(Pixmap *)prop;
… …
2078 Window cr; 2386 Window cr;
2079 XImage *image; 2387 XImage *image;
2080 GC gc; 2388 GC gc;
2081 XGCValues gcvalue; 2389 XGCValues gcvalue;
2082 2390
2083 XTranslateCoordinates (display->display, TermWin.vt, display->root, 2391 XTranslateCoordinates (display->display, TermWin.parent[0], display->root,
2084 0, 0, &sx, &sy, &cr); 2392 0, 0, &sx, &sy, &cr);
2085 nw = (unsigned int)szHint.width; 2393 nw = (unsigned int)szHint.width;
2086 nh = (unsigned int)szHint.height; 2394 nh = (unsigned int)szHint.height;
2087 nx = ny = 0; 2395 nx = ny = 0;
2088 2396
… …
2100 sy = 0; 2408 sy = 0;
2101 } 2409 }
2102 2410
2103 MIN_IT (nw, (unsigned int) (wrootattr.width - sx)); 2411 MIN_IT (nw, (unsigned int) (wrootattr.width - sx));
2104 MIN_IT (nh, (unsigned int) (wrootattr.height - sy)); 2412 MIN_IT (nh, (unsigned int) (wrootattr.height - sy));
2413
2414 XSync (display->display, False);
2105 allowedxerror = -1; 2415 allowedxerror = -1;
2106 image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap); 2416 image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2107 2417
2108 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 2418 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2109 /* XXX: may need a delay here? */ 2419 /* XXX: may need a delay here? */
… …
2130 2440
2131#if TINTING 2441#if TINTING
2132 if (ISSET_PIXCOLOR (Color_tint)) 2442 if (ISSET_PIXCOLOR (Color_tint))
2133 { 2443 {
2134 unsigned short rm, gm, bm; 2444 unsigned short rm, gm, bm;
2135 if (rs[Rs_shade]) 2445 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2136 PixColorsFocused[Color_tint].fade (display, atoi (rs[Rs_shade])).get (display, rm, gm, bm); 2446
2137 else
2138 PixColorsFocused[Color_tint].get (display, rm, gm, bm); 2447 pix_colors_focused[Color_tint].get (display, rm, gm, bm);
2139 2448
2140 rm >>= 8; gm >>= 8; bm >>= 8; // not 100% correct, but... 2449 ShadeXImage (display, image, shade, rm, gm, bm);
2141
2142 /* Determine bitshift and bitmask values */
2143 switch (image->bits_per_pixel)
2144 {
2145 case 15: shade_ximage_15 (image->data, image->bytes_per_line, image->width, image->height, rm, gm, bm); break;
2146 case 16: shade_ximage_16 (image->data, image->bytes_per_line, image->width, image->height, rm, gm, bm); break;
2147 case 24: shade_ximage_24 (image->data, image->bytes_per_line, image->width, image->height, rm, gm, bm); break;
2148 case 32: shade_ximage_32 (image->data, image->bytes_per_line, image->width, image->height, rm, gm, bm); break;
2149 }
2150 } 2450 }
2151#endif 2451#endif
2152 2452
2153 TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt, 2453 TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt,
2154 szHint.width, szHint.height, image->depth); 2454 szHint.width, szHint.height, image->depth);
2155 gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue); 2455 gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue);
2156 XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0, 2456 XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0,
2157 nx, ny, image->width, image->height); 2457 nx, ny, image->width, image->height);
2158 XFreeGC (display->display, gc); 2458 XFreeGC (display->display, gc);
2159 XDestroyImage (image); 2459 XDestroyImage (image);
2160 XSetWindowBackgroundPixmap (display->display, TermWin.vt, TermWin.pixmap); 2460 XSetWindowBackgroundPixmap (display->display, TermWin.parent[0], TermWin.pixmap);
2461 XClearWindow (display->display, TermWin.parent[0]);
2161 2462
2162 if (!am_transparent || !am_pixmap_trans) 2463 if (!am_transparent || !am_pixmap_trans)
2163 pchanged = 1; 2464 pchanged = 1;
2164 2465
2165 am_transparent = am_pixmap_trans = 1; 2466 am_transparent = am_pixmap_trans = 1;
2166 } 2467 }
2167 } 2468 }
2168 2469
2169 if (!am_pixmap_trans) 2470 if (am_pixmap_trans)
2471 XSetWindowBackgroundPixmap (display->display, TermWin.vt, ParentRelative);
2472 else
2170 { 2473 {
2171 unsigned int n; 2474 unsigned int n;
2172 /* 2475 /*
2173 * InheritPixmap transparency 2476 * InheritPixmap transparency
2174 */ 2477 */
2175 D_X ((stderr, "InheritPixmap Seeking to %08lx", display->root));
2176 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2478 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)
2177 { 2479 {
2178 oldp = TermWin.parent[i]; 2480 oldp = TermWin.parent[i];
2179 XQueryTree (display->display, TermWin.parent[i - 1], &root, 2481 XQueryTree (display->display, TermWin.parent[i - 1], &root,
2180 &TermWin.parent[i], &list, &n); 2482 &TermWin.parent[i], &list, &n);
2181 XFree (list); 2483 XFree (list);
2182 D_X ((stderr, "InheritPixmap Parent[%d] = %08lx", i, TermWin.parent[i]));
2183 2484
2184 if (TermWin.parent[i] == display->root) 2485 if (TermWin.parent[i] == display->root)
2185 { 2486 {
2186 if (oldp != None) 2487 if (oldp != None)
2187 pchanged = 1; 2488 pchanged = 1;
… …
2198 if (pchanged) 2499 if (pchanged)
2199 { 2500 {
2200 for (; n < (unsigned int)i; n++) 2501 for (; n < (unsigned int)i; n++)
2201 { 2502 {
2202 XGetWindowAttributes (display->display, TermWin.parent[n], &wattr); 2503 XGetWindowAttributes (display->display, TermWin.parent[n], &wattr);
2203 D_X ((stderr, "InheritPixmap Checking Parent[%d]: %s", n, (wattr.depth == rootdepth && wattr.class != InputOnly) ? "OK" : "FAIL"));
2204 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) 2504 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2205 { 2505 {
2206 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1; 2506 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1;
2207 break; 2507 break;
2208 } 2508 }
2209 } 2509 }
2210 } 2510 }
2211 2511
2212 if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0]))) 2512 if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0])))
2213 { 2513 {
2214 D_X ((stderr, "InheritPixmap Turning off")); /* Mikachu? */
2215 XSetWindowBackground (display->display, TermWin.parent[0], PixColorsFocused[Color_fg]); 2514 XSetWindowBackground (display->display, TermWin.parent[0], pix_colors_focused[Color_fg]);
2216 XSetWindowBackground (display->display, TermWin.vt, PixColorsFocused[Color_bg]); 2515 XSetWindowBackground (display->display, TermWin.vt, pix_colors_focused[Color_bg]);
2217 am_transparent = 0; 2516 am_transparent = 0;
2218 /* XXX: also turn off Opt_transparent? */ 2517 /* XXX: also turn off Opt_transparent? */
2219 } 2518 }
2220 else 2519 else
2221 { 2520 {
2222#if WAIT_FOR_WM 2521#if WAIT_FOR_WM
2223 /* wait (an arbitrary period) for the WM to do its thing 2522 /* wait (an arbitrary period) for the WM to do its thing
2224 * needed for fvwm2.2.2 (and before?) */ 2523 * needed for fvwm2.2.2 (and before?) */
2225 sleep (1); 2524 sleep (1);
2226#endif 2525#endif
2227 D_X ((stderr, "InheritPixmap Turning on (%d parents)", i - 1));
2228 for (n = 0; n < (unsigned int)i; n++) 2526 for (n = 0; n < (unsigned int)i; n++)
2527 {
2229 XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], ParentRelative); 2528 XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], ParentRelative);
2529 XClearWindow (display->display, TermWin.parent[n]);
2530 }
2230 2531
2231 XSetWindowBackgroundPixmap (display->display, TermWin.vt, ParentRelative); 2532 XSetWindowBackgroundPixmap (display->display, TermWin.vt, ParentRelative);
2232 am_transparent = 1; 2533 am_transparent = 1;
2233 } 2534 }
2234 2535
2235 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2536 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)
2236 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 ();
2237 } 2552 }
2238 2553
2239 return pchanged; 2554 return pchanged;
2240} 2555}
2241#endif 2556#endif
… …
2260 if (ch == NOCHAR) // TODO: improve 2575 if (ch == NOCHAR) // TODO: improve
2261 break; 2576 break;
2262 2577
2263 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)
2264 { 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
2265 /* Read a text string from the input buffer */ 2594 /* Read a text string from the input buffer */
2266 unicode_t buf[UBUFSIZ]; 2595 unicode_t buf[UBUFSIZ];
2267 bool refreshnow = false; 2596 bool refreshnow = false;
2268 int nlines = 0; 2597 int nlines = 0;
2269 unicode_t *str = buf; 2598 unicode_t *str = buf;
2270 2599
2271 *str++ = ch;
2272
2273 for (;;) 2600 for (;;)
2274 { 2601 {
2275 seq_begin = cmdbuf_ptr;
2276 ch = next_char ();
2277
2278 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))
2279 break; 2603 break;
2280 2604
2281 *str++ = ch; 2605 *str++ = ch;
2282 2606
2283 if (ch == C0_LF) 2607 if (ch == C0_LF)
2284 { 2608 {
2285 nlines++; 2609 nlines++;
2286 refresh_count++; 2610 refresh_count++;
2287 2611
2288 if (! (Options & Opt_jumpScroll) 2612 if (!(options & Opt_jumpScroll)
2289 || (refresh_count >= (refresh_limit * (TermWin.nrow - 1)))) 2613 || (refresh_count >= refresh_limit * (TermWin.nrow - 1)))
2290 { 2614 {
2291 refreshnow = true; 2615 refreshnow = true;
2292 flag = true;
2293 ch = NOCHAR; 2616 ch = NOCHAR;
2294 break; 2617 break;
2295 } 2618 }
2296 2619
2297 // scr_add_lines only works for nlines < TermWin.nrow - 1. 2620 // scr_add_lines only works for nlines <= TermWin.nrow - 1.
2298 if (nlines >= TermWin.nrow - 1) 2621 if (nlines >= TermWin.nrow - 1)
2299 { 2622 {
2300 scr_add_lines (buf, nlines, str - buf); 2623 scr_add_lines (buf, nlines, str - buf);
2301 nlines = 0; 2624 nlines = 0;
2302 str = buf; 2625 str = buf;
… …
2306 if (str >= buf + UBUFSIZ) 2629 if (str >= buf + UBUFSIZ)
2307 { 2630 {
2308 ch = NOCHAR; 2631 ch = NOCHAR;
2309 break; 2632 break;
2310 } 2633 }
2634
2635 seq_begin = cmdbuf_ptr;
2636 ch = next_char ();
2311 } 2637 }
2312 2638
2313 scr_add_lines (buf, nlines, str - buf); 2639 scr_add_lines (buf, nlines, str - buf);
2314 2640
2315 /* 2641 /*
2316 * 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
2317 * 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.
2318 * the number of pages between refreshes is refresh_limit, which 2644 * the number of pages between refreshes is refresh_limit, which
2319 * is incremented here because we must be doing flat-out scrolling. 2645 * is incremented here because we must be doing flat-out scrolling.
2320 *
2321 * refreshing should be correct for small scrolls, because of the
2322 * time-out
2323 */ 2646 */
2324 if (refreshnow) 2647 if (refreshnow)
2325 { 2648 {
2326 if ((Options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 2649 if ((options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2327 refresh_limit++; 2650 refresh_limit++;
2328 else 2651 else
2652 {
2653 flag = true;
2329 scr_refresh (refresh_type); 2654 scr_refresh (refresh_type);
2655 }
2330 } 2656 }
2331 2657
2332 } 2658 }
2333 else 2659 else
2334 { 2660 {
… …
2518 process_escape_seq (); 2844 process_escape_seq ();
2519 break; 2845 break;
2520 case C0_ENQ: /* terminal Status */ 2846 case C0_ENQ: /* terminal Status */
2521 if (rs[Rs_answerbackstring]) 2847 if (rs[Rs_answerbackstring])
2522 tt_write ((const unsigned char *)rs[Rs_answerbackstring], 2848 tt_write ((const unsigned char *)rs[Rs_answerbackstring],
2523 (unsigned int)STRLEN (rs[Rs_answerbackstring])); 2849 (unsigned int)strlen (rs[Rs_answerbackstring]));
2524 else 2850 else
2525 tt_write ((unsigned char *)VT100_ANS, 2851 tt_write ((unsigned char *)VT100_ANS,
2526 (unsigned int)STRLEN (VT100_ANS)); 2852 (unsigned int)strlen (VT100_ANS));
2527 break; 2853 break;
2528 case C0_BEL: /* bell */ 2854 case C0_BEL: /* bell */
2529 scr_bell (); 2855 scr_bell ();
2530 break; 2856 break;
2531 case C0_BS: /* backspace */ 2857 case C0_BS: /* backspace */
… …
2630void 2956void
2631rxvt_term::process_escape_seq () 2957rxvt_term::process_escape_seq ()
2632{ 2958{
2633 unicode_t ch = cmd_getc (); 2959 unicode_t ch = cmd_getc ();
2634 2960
2635 if (PrivateModes & PrivMode_vt52) 2961 if (priv_modes & PrivMode_vt52)
2636 { 2962 {
2637 process_escape_vt52 (ch); 2963 process_escape_vt52 (ch);
2638 return; 2964 return;
2639 } 2965 }
2640 2966
… …
2655 scr_charset_set (2, (unsigned int)cmd_getc ()); 2981 scr_charset_set (2, (unsigned int)cmd_getc ());
2656 break; 2982 break;
2657 case '+': 2983 case '+':
2658 scr_charset_set (3, (unsigned int)cmd_getc ()); 2984 scr_charset_set (3, (unsigned int)cmd_getc ());
2659 break; 2985 break;
2660#ifndef NO_FRILLS 2986#if ENABLE_FRILLS
2661 case '6': 2987 case '6':
2662 scr_backindex (); 2988 scr_backindex ();
2663 break; 2989 break;
2664#endif 2990#endif
2665 case '7': 2991 case '7':
2666 scr_cursor (SAVE); 2992 scr_cursor (SAVE);
2667 break; 2993 break;
2668 case '8': 2994 case '8':
2669 scr_cursor (RESTORE); 2995 scr_cursor (RESTORE);
2670 break; 2996 break;
2671#ifndef NO_FRILLS 2997#if ENABLE_FRILLS
2672 case '9': 2998 case '9':
2673 scr_forwardindex (); 2999 scr_forwardindex ();
2674 break; 3000 break;
2675#endif 3001#endif
2676 case '=': 3002 case '=':
… …
2975 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0); 3301 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0);
2976 break; 3302 break;
2977 3303
2978 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 3304 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
2979 tt_write ((const unsigned char *)VT100_ANS, 3305 tt_write ((const unsigned char *)VT100_ANS,
2980 (unsigned int) (sizeof (VT100_ANS) - 1)); 3306 (unsigned int) (sizeof (VT100_ANS) - 1));
2981 break; 3307 break;
2982 3308
2983 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 3309 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
2984 process_sgr_mode (nargs, arg); 3310 process_sgr_mode (nargs, arg);
2985 break; 3311 break;
… …
2992 break; 3318 break;
2993 case 6: /* CPR requested */ 3319 case 6: /* CPR requested */
2994 scr_report_position (); 3320 scr_report_position ();
2995 break; 3321 break;
2996 case 7: /* unofficial extension */ 3322 case 7: /* unofficial extension */
2997 if (Options & Opt_insecure) 3323 if (options & Opt_insecure)
2998 tt_printf ("%-.250s\n", rs[Rs_display_name]); 3324 tt_printf ("%-.250s\012", rs[Rs_display_name]);
2999 break; 3325 break;
3000 case 8: /* unofficial extension */ 3326 case 8: /* unofficial extension */
3001 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3327 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3002 break; 3328 break;
3003 } 3329 }
… …
3039 break; 3365 break;
3040 3366
3041 case CSI_RM: /* 8.3.107: RESET MODE */ 3367 case CSI_RM: /* 8.3.107: RESET MODE */
3042 if (arg[0] == 4) 3368 if (arg[0] == 4)
3043 scr_insert_mode (0); 3369 scr_insert_mode (0);
3370 else if (arg[0] == 20)
3371 priv_modes &= ~PrivMode_LFNL;
3044 break; 3372 break;
3045 3373
3046 case CSI_SM: /* 8.3.126: SET MODE */ 3374 case CSI_SM: /* 8.3.126: SET MODE */
3047 if (arg[0] == 4) 3375 if (arg[0] == 4)
3048 scr_insert_mode (1); 3376 scr_insert_mode (1);
3377 else if (arg[0] == 20)
3378 priv_modes |= PrivMode_LFNL;
3049 break; 3379 break;
3050 3380
3051 /* 3381 /*
3052 * PRIVATE USE beyond this point. All CSI_7? sequences here 3382 * PRIVATE USE beyond this point. All CSI_7? sequences here
3053 */ 3383 */
… …
3065 break; 3395 break;
3066 case CSI_75: 3396 case CSI_75:
3067 scr_cursor (RESTORE); 3397 scr_cursor (RESTORE);
3068 break; 3398 break;
3069 3399
3070#ifndef NO_FRILLS 3400#if ENABLE_FRILLS
3071 case CSI_74: 3401 case CSI_74:
3072 process_window_ops (arg, nargs); 3402 process_window_ops (arg, nargs);
3073 break; 3403 break;
3074#endif 3404#endif
3075 3405
… …
3082 break; 3412 break;
3083 } 3413 }
3084} 3414}
3085/*}}} */ 3415/*}}} */
3086 3416
3087#ifndef NO_FRILLS 3417#if ENABLE_FRILLS
3088/* ARGSUSED */ 3418/* ARGSUSED */
3089void 3419void
3090rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3420rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3091{ 3421{
3092 int x, y; 3422 int x, y;
… …
3159 break; 3489 break;
3160 case 19: /* report window size (chars) */ 3490 case 19: /* report window size (chars) */
3161 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol); 3491 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol);
3162 break; 3492 break;
3163 case 20: /* report icon label */ 3493 case 20: /* report icon label */
3164 if (Options & Opt_insecure)
3165 { 3494 {
3166 char *s; 3495 char *s;
3167 XGetIconName (display->display, TermWin.parent[0], &s); 3496 XGetIconName (display->display, TermWin.parent[0], &s);
3168 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);
3169 } 3499 }
3170 break; 3500 break;
3171 case 21: /* report window title */ 3501 case 21: /* report window title */
3172 if (Options & Opt_insecure)
3173 { 3502 {
3174 char *s; 3503 char *s;
3175 XFetchName (display->display, TermWin.parent[0], &s); 3504 XFetchName (display->display, TermWin.parent[0], &s);
3176 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);
3177 } 3507 }
3178 break; 3508 break;
3179 } 3509 }
3180} 3510}
3181#endif 3511#endif
3182 3512
… …
3186 * ends_how is terminator used. returned input must be free()'d 3516 * ends_how is terminator used. returned input must be free()'d
3187 */ 3517 */
3188unsigned char * 3518unsigned char *
3189rxvt_term::get_to_st (unicode_t &ends_how) 3519rxvt_term::get_to_st (unicode_t &ends_how)
3190{ 3520{
3191 unicode_t prev = 0, ch; 3521 unicode_t ch;
3522 bool seen_esc = false;
3192 unsigned int n = 0; 3523 unsigned int n = 0;
3193 unsigned char *s;
3194 unsigned char string[STRING_MAX]; 3524 wchar_t string[STRING_MAX];
3195 3525
3196 while ((ch = cmd_getc ()) != NOCHAR) 3526 while ((ch = cmd_getc ()) != NOCHAR)
3197 { 3527 {
3198 if (prev == C0_ESC) 3528 if (seen_esc)
3199 { 3529 {
3200 if (ch == 0x5c) /* 7bit ST */ 3530 if (ch == 0x5c) /* 7bit ST */
3201 break; 3531 break;
3202 else 3532 else
3203 return NULL; 3533 return NULL;
3204 } 3534 }
3535 else if (ch == C0_ESC)
3536 {
3537 seen_esc = true;
3538 continue;
3539 }
3205 else if (ch == C0_BEL || ch == CHAR_ST) 3540 else if (ch == C0_BEL || ch == CHAR_ST)
3206 break; 3541 break;
3207 else if (ch < 0x20) 3542 else if (ch < 0x20)
3208 return NULL; /* other control character - exit */ 3543 return NULL; /* other control character - exit */
3544
3545 seen_esc = false;
3209 3546
3210 if (n >= sizeof (string) - 1) 3547 if (n >= sizeof (string) - 1)
3211 // stop at some sane length 3548 // stop at some sane length
3212 return NULL; 3549 return NULL;
3213 3550
3214 if (ch == C0_SYN) 3551 if (ch == C0_SYN)
3215 {
3216 string[n++] = cmd_get8 (); 3552 string[n++] = cmd_get8 ();
3217 prev = 0;
3218 }
3219 else 3553 else
3220 string[n++] = prev = ch; 3554 string[n++] = ch;
3221 } 3555 }
3222 3556
3223 string[n++] = '\0'; 3557 string[n++] = '\0';
3224 3558
3225 if ((s = (unsigned char *)rxvt_malloc (n)) == NULL)
3226 return NULL;
3227
3228 ends_how = (ch == 0x5c ? C0_ESC : ch); 3559 ends_how = (ch == 0x5c ? C0_ESC : ch);
3229 STRNCPY (s, string, n); 3560
3230 return s; 3561 return (unsigned char *)rxvt_wcstombs (string);
3231} 3562}
3232 3563
3233/*----------------------------------------------------------------------*/ 3564/*----------------------------------------------------------------------*/
3234/* 3565/*
3235 * 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)'
… …
3279void 3610void
3280rxvt_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)
3281{ 3612{
3282 if (str[0] == '?' && !str[1]) 3613 if (str[0] == '?' && !str[1])
3283 { 3614 {
3284 if (Options & Opt_insecure)
3285 {
3286 unsigned short r, g, b; 3615 unsigned short r, g, b;
3287 PixColorsFocused[color].get (display, r, g, b); 3616 pix_colors_focused[color].get (display, r, g, b);
3288 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);
3289 }
3290 } 3618 }
3291 else 3619 else
3292 set_window_color (color, str); 3620 set_window_color (color, str);
3293} 3621}
3294 3622
… …
3322{ 3650{
3323 int changed = 0; 3651 int changed = 0;
3324 int color; 3652 int color;
3325 char *buf, *name; 3653 char *buf, *name;
3326 bool query = str[0] == '?' && !str[1]; 3654 bool query = str[0] == '?' && !str[1];
3655 int saveop = op;
3327 3656
3328 assert (str != NULL); 3657 assert (str != NULL);
3329 switch (op) 3658 switch (op)
3330 { 3659 {
3331 case XTerm_name: 3660 case XTerm_name:
… …
3338 set_title (str); 3667 set_title (str);
3339 break; 3668 break;
3340 case XTerm_property: 3669 case XTerm_property:
3341 if (str[0] == '?') 3670 if (str[0] == '?')
3342 { 3671 {
3343 Atom prop = XInternAtom (display->display, str + 1, True); 3672 Atom prop = display->atom (str + 1);
3344 Atom actual_type; 3673 Atom actual_type;
3345 int actual_format; 3674 int actual_format;
3346 unsigned long nitems; 3675 unsigned long nitems;
3347 unsigned long bytes_after; 3676 unsigned long bytes_after;
3348 unsigned char *value = 0; 3677 unsigned char *value = 0;
… …
3366 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3695 char *eq = strchr (str, '='); // constness lost, but verified to be ok
3367 3696
3368 if (eq) 3697 if (eq)
3369 { 3698 {
3370 *eq = 0; 3699 *eq = 0;
3371 XChangeProperty (display->display, TermWin.parent[0], 3700 set_utf8_property (display->atom (str), eq + 1);
3372 display->atom (str), XA_STRING, 8,
3373 PropModeReplace, (unsigned char *)eq + 1,
3374 strlen (eq + 1));
3375 } 3701 }
3376 else 3702 else
3377 XDeleteProperty (display->display, TermWin.parent[0], 3703 XDeleteProperty (display->display, TermWin.parent[0],
3378 display->atom (str)); 3704 display->atom (str));
3379 } 3705 }
3380 break; 3706 break;
3381 3707
3382 case XTerm_Color: 3708 case XTerm_Color:
3383 for (buf = (char *)str; buf && *buf;) 3709 for (buf = (char *)str; buf && *buf;)
3384 { 3710 {
3385 if ((name = STRCHR (buf, ';')) == NULL) 3711 if ((name = strchr (buf, ';')) == NULL)
3386 break; 3712 break;
3387 3713
3388 *name++ = '\0'; 3714 *name++ = '\0';
3389 color = atoi (buf); 3715 color = atoi (buf);
3390 3716
3391 if (color < 0 || color >= TOTAL_COLORS) 3717 if (color < 0 || color >= TOTAL_COLORS)
3392 break; 3718 break;
3393 3719
3394 if ((buf = STRCHR (name, ';')) != NULL) 3720 if ((buf = strchr (name, ';')) != NULL)
3395 *buf++ = '\0'; 3721 *buf++ = '\0';
3396 3722
3397 if (name[0] == '?' && !name[1]) 3723 if (name[0] == '?' && !name[1])
3398 { 3724 {
3399 if (Options & Opt_insecure)
3400 {
3401 unsigned short r, g, b; 3725 unsigned short r, g, b;
3402 PixColorsFocused[color + minCOLOR].get (display, r, g, b); 3726 pix_colors_focused[color + minCOLOR].get (display, r, g, b);
3403 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);
3404 }
3405 } 3728 }
3406 else 3729 else
3407 set_window_color (color + minCOLOR, name); 3730 set_window_color (color + minCOLOR, name);
3408 } 3731 }
3409 break; 3732 break;
… …
3426 break; 3749 break;
3427#ifndef NO_BOLD_UNDERLINE_REVERSE 3750#ifndef NO_BOLD_UNDERLINE_REVERSE
3428 case XTerm_Color_BD: 3751 case XTerm_Color_BD:
3429 process_color_seq (XTerm_Color_BD, Color_BD, str, resp); 3752 process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3430 break; 3753 break;
3754 case XTerm_Color_IT:
3755 process_color_seq (XTerm_Color_IT, Color_IT, str, resp);
3756 break;
3431 case XTerm_Color_UL: 3757 case XTerm_Color_UL:
3432 process_color_seq (XTerm_Color_UL, Color_UL, str, resp); 3758 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3433 break; 3759 break;
3434 case XTerm_Color_RV: 3760 case XTerm_Color_RV:
3435 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;
3436 break; 3770 break;
3437#endif 3771#endif
3438 3772
3439 case XTerm_Pixmap: 3773 case XTerm_Pixmap:
3440 if (*str != ';') 3774 if (*str != ';')
… …
3443 scale_pixmap (""); /* reset to default scaling */ 3777 scale_pixmap (""); /* reset to default scaling */
3444 set_bgPixmap (str); /* change pixmap */ 3778 set_bgPixmap (str); /* change pixmap */
3445#endif 3779#endif
3446 scr_touch (true); 3780 scr_touch (true);
3447 } 3781 }
3448 while ((str = STRCHR (str, ';')) != NULL) 3782 while ((str = strchr (str, ';')) != NULL)
3449 { 3783 {
3450 str++; 3784 str++;
3451#if XPM_BACKGROUND 3785#if XPM_BACKGROUND
3452 changed += scale_pixmap (str); 3786 changed += scale_pixmap (str);
3453#endif 3787#endif
… …
3472 case XTerm_logfile: 3806 case XTerm_logfile:
3473 // TODO, when secure mode? 3807 // TODO, when secure mode?
3474 break; 3808 break;
3475 3809
3476 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
3477 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
3478 { 3824 {
3479 if (Options & Opt_insecure) 3825 const char *&res = rs[Rs_font + (op - URxvt_font)];
3480 tt_printf ("\33]%d;%-.250s%c", XTerm_font, 3826
3481 TermWin.fontset->fontdesc 3827 res = strdup (str);
3482 ? TermWin.fontset->fontdesc 3828 allocated.push_back ((void *)res);
3483 : "", 3829 set_fonts ();
3484 resp);
3485 } 3830 }
3486 else
3487 change_font (str);
3488 break; 3831 break;
3489 3832
3490#ifndef NO_FRILLS 3833#if ENABLE_FRILLS
3491 case XTerm_locale: 3834 case XTerm_locale:
3492 if (query) 3835 if (query)
3493 {
3494 if (Options & Opt_insecure)
3495 tt_printf ("\33]%d;%-.250s%c", XTerm_locale, locale, resp); 3836 tt_printf ("\33]%d;%-.250s%c", XTerm_locale, (options & Opt_insecure) ? locale : "", resp);
3496 }
3497 else 3837 else
3498 { 3838 {
3499 set_locale (str); 3839 set_locale (str);
3500# ifdef USE_XIM 3840# ifdef USE_XIM
3501 im_cb (); 3841 im_cb ();
3502# endif 3842# endif
3503 } 3843 }
3504 break; 3844 break;
3505
3506 case XTerm_findfont:
3507 if (Options & Opt_insecure)
3508 {
3509 int fid = TermWin.fontset->find_font (atoi (str));
3510 tt_printf ("\33]%d;%d;%-.250s%c", XTerm_findfont,
3511 fid, (*TermWin.fontset)[fid]->name, resp);
3512 }
3513 break;
3514#endif 3845#endif
3515 3846
3516#ifdef MENUBAR 3847#ifdef MENUBAR
3517 case XTerm_Menu: 3848 case XTerm_Menu:
3518 if (Options & Opt_insecure) 3849 if (options & Opt_insecure)
3519 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked 3850 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3520 break; 3851 break;
3521#endif 3852#endif
3522#if 0 3853#if 0
3523 case XTerm_dumpscreen: /* no error notices */ 3854 case XTerm_dumpscreen: /* no error notices */
… …
3550{ 3881{
3551 int state; 3882 int state;
3552 3883
3553 if (mode == 's') 3884 if (mode == 's')
3554 { 3885 {
3555 SavedModes |= (PrivateModes & bit); 3886 SavedModes |= (priv_modes & bit);
3556 return -1; 3887 return -1;
3557 } 3888 }
3558 else 3889 else
3559 { 3890 {
3560 if (mode == 'r') 3891 if (mode == 'r')
3561 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3892 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3562 else 3893 else
3563 state = (mode == 't') ? ! (PrivateModes & bit) : mode; 3894 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3564 PrivMode (state, bit); 3895 PrivMode (state, bit);
3565 } 3896 }
3566 3897
3567 return state; 3898 return state;
3568} 3899}
… …
3586 { 3, PrivMode_132 }, 3917 { 3, PrivMode_132 },
3587 { 4, PrivMode_smoothScroll }, 3918 { 4, PrivMode_smoothScroll },
3588 { 5, PrivMode_rVideo }, 3919 { 5, PrivMode_rVideo },
3589 { 6, PrivMode_relOrigin }, 3920 { 6, PrivMode_relOrigin },
3590 { 7, PrivMode_Autowrap }, 3921 { 7, PrivMode_Autowrap },
3922 // 8, bi-directional support mode
3591 { 9, PrivMode_MouseX10 }, 3923 { 9, PrivMode_MouseX10 },
3592#ifdef menuBar_esc 3924#ifdef menuBar_esc
3593 { menuBar_esc, PrivMode_menuBar }, 3925 { menuBar_esc, PrivMode_menuBar },
3594#endif 3926#endif
3927 // 18, 19 printing-related
3928 { 25, PrivMode_VisibleCursor },
3595#ifdef scrollBar_esc 3929#ifdef scrollBar_esc
3596 { scrollBar_esc, PrivMode_scrollBar }, 3930 { scrollBar_esc, PrivMode_scrollBar },
3597#endif 3931#endif
3598 // 18, 19 printing-related
3599 { 25, PrivMode_VisibleCursor },
3600 // 30 show scrollbar rxvt. extension
3601 { 35, PrivMode_ShiftKeys }, // rxvt extension 3932 { 35, PrivMode_ShiftKeys }, // rxvt extension
3602 { 40, PrivMode_132OK }, 3933 { 40, PrivMode_132OK },
3603 // 41 xterm more fixes NYI 3934 // 41 xterm more fixes NYI
3604 // 45 margin bell NYI 3935 // 45 margin bell NYI
3605 // 46 start logging 3936 // 46 start logging
… …
3646 3977
3647 /* extra handling for values with state unkept */ 3978 /* extra handling for values with state unkept */
3648 switch (arg[i]) 3979 switch (arg[i])
3649 { 3980 {
3650 case 1048: /* alternative cursor save */ 3981 case 1048: /* alternative cursor save */
3982 case 1049:
3651 if (Options & Opt_secondaryScreen) 3983 if (options & Opt_secondaryScreen)
3652 if (mode == 0) 3984 if (mode == 0)
3653 scr_cursor (RESTORE); 3985 scr_cursor (RESTORE);
3654 else if (mode == 1) 3986 else if (mode == 1)
3655 scr_cursor (SAVE); 3987 scr_cursor (SAVE);
3656 break; 3988 break;
… …
3667 * within VT52 mode 3999 * within VT52 mode
3668 */ 4000 */
3669 PrivMode (1, PrivMode_vt52); 4001 PrivMode (1, PrivMode_vt52);
3670 break; 4002 break;
3671 case 3: /* 80/132 */ 4003 case 3: /* 80/132 */
3672 if (PrivateModes & PrivMode_132OK) 4004 if (priv_modes & PrivMode_132OK)
3673 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height); 4005 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height);
3674 break; 4006 break;
3675 case 4: /* smooth scrolling */ 4007 case 4: /* smooth scrolling */
3676 if (state) 4008 if (state)
3677 Options &= ~Opt_jumpScroll; 4009 options &= ~Opt_jumpScroll;
3678 else 4010 else
3679 Options |= Opt_jumpScroll; 4011 options |= Opt_jumpScroll;
3680 break; 4012 break;
3681 case 5: /* reverse video */ 4013 case 5: /* reverse video */
3682 scr_rvideo_mode (state); 4014 scr_rvideo_mode (state);
3683 break; 4015 break;
3684 case 6: /* relative/absolute origins */ 4016 case 6: /* relative/absolute origins */
… …
3688 scr_autowrap (state); 4020 scr_autowrap (state);
3689 break; 4021 break;
3690 /* 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 */
3691 case 9: /* X10 mouse reporting */ 4023 case 9: /* X10 mouse reporting */
3692 if (state) /* orthogonal */ 4024 if (state) /* orthogonal */
3693 PrivateModes &= ~PrivMode_MouseX11; 4025 priv_modes &= ~PrivMode_MouseX11;
3694 break; 4026 break;
3695#ifdef menuBar_esc 4027#ifdef menuBar_esc
3696 case menuBar_esc: 4028 case menuBar_esc:
3697#ifdef MENUBAR 4029#ifdef MENUBAR
3698 map_menuBar (state); 4030 map_menuBar (state);
… …
3718 break; 4050 break;
3719 /* case 66: - application key pad */ 4051 /* case 66: - application key pad */
3720 /* case 67: - backspace key */ 4052 /* case 67: - backspace key */
3721 case 1000: /* X11 mouse reporting */ 4053 case 1000: /* X11 mouse reporting */
3722 if (state) /* orthogonal */ 4054 if (state) /* orthogonal */
3723 PrivateModes &= ~PrivMode_MouseX10; 4055 priv_modes &= ~PrivMode_MouseX10;
3724 break; 4056 break;
3725#if 0 4057#if 0
3726 case 1001: 4058 case 1001:
3727 break; /* X11 mouse highlighting */ 4059 break; /* X11 mouse highlighting */
3728#endif 4060#endif
3729 case 1010: /* scroll to bottom on TTY output inhibit */ 4061 case 1010: /* scroll to bottom on TTY output inhibit */
3730 if (state) 4062 if (state)
3731 Options &= ~Opt_scrollTtyOutput; 4063 options &= ~Opt_scrollTtyOutput;
3732 else 4064 else
3733 Options |= Opt_scrollTtyOutput; 4065 options |= Opt_scrollTtyOutput;
3734 break; 4066 break;
3735 case 1011: /* scroll to bottom on key press */ 4067 case 1011: /* scroll to bottom on key press */
3736 if (state) 4068 if (state)
3737 Options |= Opt_scrollTtyKeypress; 4069 options |= Opt_scrollTtyKeypress;
3738 else 4070 else
3739 Options &= ~Opt_scrollTtyKeypress; 4071 options &= ~Opt_scrollTtyKeypress;
3740 break; 4072 break;
3741 case 1047: /* secondary screen w/ clearing last */ 4073 case 1047: /* secondary screen w/ clearing last */
3742 if (Options & Opt_secondaryScreen) 4074 if (options & Opt_secondaryScreen)
3743 if (current_screen != PRIMARY) 4075 if (current_screen != PRIMARY)
3744 scr_erase_screen (2); 4076 scr_erase_screen (2);
3745 scr_change_screen (state); 4077 scr_change_screen (state);
3746 break; 4078 break;
3747 case 1049: /* secondary screen w/ clearing first */ 4079 case 1049: /* secondary screen w/ clearing first */
3748 scr_change_screen (state); 4080 scr_change_screen (state);
3749 if (Options & Opt_secondaryScreen) 4081 if (options & Opt_secondaryScreen)
3750 if (current_screen != PRIMARY) 4082 if (current_screen != PRIMARY)
3751 scr_erase_screen (2); 4083 scr_erase_screen (2);
3752 break; 4084 break;
3753 default: 4085 default:
3754 break; 4086 break;
… …
3780 rendset = 0, rendstyle = ~RS_None; 4112 rendset = 0, rendstyle = ~RS_None;
3781 break; 4113 break;
3782 case 1: 4114 case 1:
3783 rendset = 1, rendstyle = RS_Bold; 4115 rendset = 1, rendstyle = RS_Bold;
3784 break; 4116 break;
3785 //case 2: // faint or second colour 4117 //case 2: // low intensity
4118 case 3:
4119 rendset = 1, rendstyle = RS_Italic;
4120 break;
3786 case 4: 4121 case 4:
3787 rendset = 1, rendstyle = RS_Uline; 4122 rendset = 1, rendstyle = RS_Uline;
3788 break; 4123 break;
3789 case 5: // slowly blinking 4124 case 5: // slowly blinking
3790 case 6: // rapidly blinking 4125 case 6: // rapidly blinking
… …
3802 //case 11: // scoansi acs on, first alt font 4137 //case 11: // scoansi acs on, first alt font
3803 //case 12: // scoansi acs on, |0x80, second alt font 4138 //case 12: // scoansi acs on, |0x80, second alt font
3804 //... 4139 //...
3805 //case 19: // ninth alt font 4140 //case 19: // ninth alt font
3806 //case 20: // gothic 4141 //case 20: // gothic
3807 case 21: // disable bold, faint 4142 case 21: // disable bold, faint, sometimes doubly underlined (iso 8613)
3808 rendset = 0, rendstyle = RS_Bold; 4143 rendset = 0, rendstyle = RS_Bold;
3809 break; 4144 break;
3810 case 22: 4145 case 22: // normal intensity
3811 rendset = 0, rendstyle = RS_Bold; 4146 rendset = 0, rendstyle = RS_Bold;
3812 break; 4147 break;
3813 //case 23: disable italic 4148 case 23: // disable italic
4149 rendset = 0, rendstyle = RS_Italic;
4150 break;
3814 case 24: 4151 case 24:
3815 rendset = 0, rendstyle = RS_Uline; 4152 rendset = 0, rendstyle = RS_Uline;
3816 break; 4153 break;
3817 case 25: 4154 case 25:
4155 rendset = 0, rendstyle = RS_Blink;
4156 break;
4157 case 26: // variable spacing (iso 8613)
3818 rendset = 0, rendstyle = RS_Blink; 4158 rendset = 0, rendstyle = RS_Blink;
3819 break; 4159 break;
3820 case 27: 4160 case 27:
3821 rendset = 0, rendstyle = RS_RVid; 4161 rendset = 0, rendstyle = RS_RVid;
3822 break; 4162 break;
… …
3840 case 35: 4180 case 35:
3841 case 36: 4181 case 36:
3842 case 37: 4182 case 37:
3843 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg); 4183 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg);
3844 break; 4184 break;
3845#ifdef TTY_256COLOR 4185 case 38: // set fg color, ISO 8613-6
3846 case 38:
3847 if (nargs > i + 2 && arg[i + 1] == 5) 4186 if (nargs > i + 2 && arg[i + 1] == 5)
3848 { 4187 {
3849 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg); 4188 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg);
3850 i += 2; 4189 i += 2;
3851 } 4190 }
3852 break; 4191 break;
3853#endif
3854 case 39: /* default fg */ 4192 case 39: /* default fg */
3855 scr_color (Color_fg, Color_fg); 4193 scr_color (Color_fg, Color_fg);
3856 break; 4194 break;
3857 4195
3858 case 40: 4196 case 40:
… …
3863 case 45: 4201 case 45:
3864 case 46: 4202 case 46:
3865 case 47: 4203 case 47:
3866 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg); 4204 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg);
3867 break; 4205 break;
3868#ifdef TTY_256COLOR 4206 case 48: // set bg color, ISO 8613-6
3869 case 48:
3870 if (nargs > i + 2 && arg[i + 1] == 5) 4207 if (nargs > i + 2 && arg[i + 1] == 5)
3871 { 4208 {
3872 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg); 4209 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg);
3873 i += 2; 4210 i += 2;
3874 } 4211 }
3875 break; 4212 break;
3876#endif
3877 case 49: /* default bg */ 4213 case 49: /* default bg */
3878 scr_color (Color_bg, Color_bg); 4214 scr_color (Color_bg, Color_bg);
3879 break; 4215 break;
4216
4217 //case 50: // not variable spacing
3880 4218
3881#ifndef NO_BRIGHTCOLOR 4219#ifndef NO_BRIGHTCOLOR
3882 case 90: 4220 case 90:
3883 case 91: /* set bright fg color */ 4221 case 91: /* set bright fg color */
3884 case 92: 4222 case 92:
3885 case 93: 4223 case 93:
3886 case 94: 4224 case 94:
3887 case 95: 4225 case 95:
3888 case 96: 4226 case 96:
3889 case 97: 4227 case 97:
3890 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), 4228 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), Color_fg);
3891 Color_fg);
3892 break; 4229 break;
3893 case 100: 4230 case 100:
3894 case 101: /* set bright bg color */ 4231 case 101: /* set bright bg color */
3895 case 102: 4232 case 102:
3896 case 103: 4233 case 103:
3897 case 104: 4234 case 104:
3898 case 105: 4235 case 105:
3899 case 106: 4236 case 106:
3900 case 107: 4237 case 107:
3901 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), 4238 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);
3902 Color_bg);
3903 break; 4239 break;
3904#endif 4240#endif
3905 4241
3906 } 4242 }
3907 } 4243 }
… …
3914{ 4250{
3915 unicode_t ch, cmd = cmd_getc (); 4251 unicode_t ch, cmd = cmd_getc ();
3916 4252
3917 if (cmd == 'Q') 4253 if (cmd == 'Q')
3918 { /* query graphics */ 4254 { /* query graphics */
3919 tt_printf ("\033G0\n"); /* no graphics */ 4255 tt_printf ("\033G0\012"); /* no graphics */
3920 return; 4256 return;
3921 } 4257 }
3922 /* swallow other graphics sequences until terminating ':' */ 4258 /* swallow other graphics sequences until terminating ':' */
3923 do 4259 do
3924 ch = cmd_getc (); 4260 ch = cmd_getc ();
… …
3939 unsigned char buf[256]; 4275 unsigned char buf[256];
3940 4276
3941 va_start (arg_ptr, fmt); 4277 va_start (arg_ptr, fmt);
3942 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4278 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
3943 va_end (arg_ptr); 4279 va_end (arg_ptr);
3944 tt_write (buf, STRLEN (buf)); 4280 tt_write (buf, strlen (buf));
3945} 4281}
3946 4282
3947/* ---------------------------------------------------------------------- */ 4283/* ---------------------------------------------------------------------- */
3948/* 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,
3949 * or generated by us in response to a query ESC sequence. 4285 * or generated by us in response to a query ESC sequence.
3950 */ 4286 */
3951void 4287void
3952rxvt_term::tt_write (const unsigned char *data, unsigned int len) 4288rxvt_term::tt_write (const unsigned char *data, unsigned int len)
3953{ 4289{
3954 enum { MAX_PTY_WRITE = 255 }; // minimum MAX_INPUT 4290 const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
3955 4291
3956 if (len) 4292 if (len)
3957 { 4293 {
3958 if (v_buflen == 0) 4294 if (v_buflen == 0)
3959 { 4295 {
3960 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));
3961 4297
3962 if ((unsigned int)written == len) 4298 if ((unsigned int)written == len)
3963 return; 4299 return;
3964 4300
3965 data += written; 4301 data += written;
… …
3973 v_buflen += len; 4309 v_buflen += len;
3974 } 4310 }
3975 4311
3976 for (;;) 4312 for (;;)
3977 { 4313 {
3978 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));
3979 4315
3980 if (written > 0) 4316 if (written > 0)
3981 { 4317 {
3982 v_buflen -= written; 4318 v_buflen -= written;
3983 4319

Diff Legend

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