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.193 by root, Sun Feb 13 08:56:27 2005 UTC

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

Diff Legend

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