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.55 by pcg, Sun Feb 22 20:08:18 2004 UTC vs.
Revision 1.192 by root, Fri Feb 4 11:41:23 2005 UTC

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

Diff Legend

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