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.34 by pcg, Sat Jan 31 00:20:21 2004 UTC vs.
Revision 1.52 by pcg, Sun Feb 22 10:37:54 2004 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*--------------------------------*-C-*---------------------------------*
2 * File: command.c 2 * File: command.c
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * $Id: command.C,v 1.34 2004/01/31 00:20:21 pcg Exp $
5 * 4 *
6 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
7 * 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>
8 * - original version 7 * - original version
9 * Copyright (c) 1994 Robert Nation <nation@rocket.sanders.lockheed.com> 8 * Copyright (c) 1994 Robert Nation <nation@rocket.sanders.lockheed.com>
… …
26 * - extensive modifications 25 * - extensive modifications
27 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org> 26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org>
28 * Copyright (c) 2001 Marius Gedminas 27 * Copyright (c) 2001 Marius Gedminas
29 * - Ctrl/Mod4+Tab works like Meta+Tab (options) 28 * - Ctrl/Mod4+Tab works like Meta+Tab (options)
30 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org> 29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org>
30 * Copyright (c) 2003-2004 Marc Lehmann <pcg@goof.com>
31 * 31 *
32 * This program is free software; you can redistribute it and/or modify 32 * This program is free software; you can redistribute it and/or modify
33 * it under the terms of the GNU General Public License as published by 33 * it under the terms of the GNU General Public License as published by
34 * the Free Software Foundation; either version 2 of the License, or 34 * the Free Software Foundation; either version 2 of the License, or
35 * (at your option) any later version. 35 * (at your option) any later version.
… …
54 54
55/*----------------------------------------------------------------------*/ 55/*----------------------------------------------------------------------*/
56 56
57/*{{{ Convert the keypress event into a string */ 57/*{{{ Convert the keypress event into a string */
58void 58void
59rxvt_term::lookup_key (XKeyEvent *ev) 59rxvt_term::lookup_key (XKeyEvent &ev)
60{ 60{
61 int ctrl, meta, shft, len; 61 int ctrl, meta, shft, len;
62 unsigned int newlen; 62 unsigned int newlen;
63 KeySym keysym; 63 KeySym keysym;
64#ifdef DEBUG_CMD 64#ifdef DEBUG_CMD
65 static int debug_key = 1; /* accessible by a debugger only */ 65 static int debug_key = 1; /* accessible by a debugger only */
66#endif 66#endif
67 int valid_keysym; 67 int valid_keysym;
68 unsigned char kbuf[KBUFSZ]; 68 unsigned char kbuf[KBUFSZ];
69 69
70/* 70 /*
71 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an 71 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an
72 * escape sequence to toggle the Keypad. 72 * escape sequence to toggle the Keypad.
73 * 73 *
74 * Always permit `shift' to override the current setting 74 * Always permit `shift' to override the current setting
75 */ 75 */
76 shft = (ev->state & ShiftMask); 76 shft = (ev.state & ShiftMask);
77 ctrl = (ev->state & ControlMask); 77 ctrl = (ev.state & ControlMask);
78 meta = (ev->state & ModMetaMask); 78 meta = (ev.state & ModMetaMask);
79 79
80 if (numlock_state || (ev->state & ModNumLockMask)) 80 if (numlock_state || (ev.state & ModNumLockMask))
81 { 81 {
82 numlock_state = (ev->state & ModNumLockMask); 82 numlock_state = (ev.state & ModNumLockMask);
83 PrivMode((!numlock_state), PrivMode_aplKP); 83 PrivMode ((!numlock_state), PrivMode_aplKP);
84 } 84 }
85 85
86 kbuf[0] = 0; 86 kbuf[0] = 0;
87 87
88#ifdef USE_XIM 88#ifdef USE_XIM
89 if (Input_Context) 89 if (Input_Context)
90 { 90 {
91 Status status_return; 91 Status status_return;
92 92
93#ifdef X_HAVE_UTF8_STRING 93#ifdef X_HAVE_UTF8_STRING
94 if (enc_utf8 && 0) 94 if (enc_utf8 && 0) // currently disabled, doesn't seem to work, nor is useful
95 len = Xutf8LookupString (Input_Context, ev, (char *)kbuf, 95 len = Xutf8LookupString (Input_Context, &ev, (char *)kbuf,
96 KBUFSZ, &keysym, &status_return); 96 KBUFSZ, &keysym, &status_return);
97 else 97 else
98#endif 98#endif
99 { 99 {
100 wchar_t wkbuf[KBUFSZ + 1]; 100 wchar_t wkbuf[KBUFSZ + 1];
101 101
102 // the XOpenIM manpage lies about hardcoding the locale 102 // the XOpenIM manpage lies about hardcoding the locale
103 // at the point of XOpenIM, so temporarily switch locales 103 // at the point of XOpenIM, so temporarily switch locales
104 if (rs[Rs_imLocale]) 104 if (rs[Rs_imLocale])
105 SET_LOCALE (rs[Rs_imLocale]); 105 SET_LOCALE (rs[Rs_imLocale]);
106 // assume wchar_t == unicode or better 106 // assume wchar_t == unicode or better
107 len = XwcLookupString (Input_Context, ev, wkbuf, 107 len = XwcLookupString (Input_Context, &ev, wkbuf,
108 KBUFSZ, &keysym, &status_return); 108 KBUFSZ, &keysym, &status_return);
109 if (rs[Rs_imLocale]) 109 if (rs[Rs_imLocale])
110 SET_LOCALE (locale); 110 SET_LOCALE (locale);
111 111
112 if (status_return == XLookupChars 112 if (status_return == XLookupChars
113 || status_return == XLookupBoth) 113 || status_return == XLookupBoth)
114 { 114 {
115 wkbuf[len] = 0; 115 wkbuf[len] = 0;
116 len = wcstombs ((char *)kbuf, wkbuf, KBUFSZ); 116 len = wcstombs ((char *)kbuf, wkbuf, KBUFSZ);
117 if (len < 0) 117 if (len < 0)
118 len = 0; 118 len = 0;
119 } 119 }
120 else 120 else
121 len = 0; 121 len = 0;
122 } 122 }
123 123
124 valid_keysym = status_return == XLookupKeySym 124 valid_keysym = status_return == XLookupKeySym
125 || status_return == XLookupBoth; 125 || status_return == XLookupBoth;
126 } 126 }
127 else 127 else
128#endif 128#endif
129 { 129 {
130 len = XLookupString (ev, (char *)kbuf, KBUFSZ, &keysym, &compose); 130 len = XLookupString (&ev, (char *)kbuf, KBUFSZ, &keysym, &compose);
131 valid_keysym = !len; 131 valid_keysym = keysym != NoSymbol;
132 } 132 }
133 133
134 if (valid_keysym) 134 if (valid_keysym)
135 { 135 {
136/* for some backwards compatibility */ 136 /* for some backwards compatibility */
137#if defined(HOTKEY_CTRL) || defined(HOTKEY_META) 137#if defined(HOTKEY_CTRL) || defined(HOTKEY_META)
138# ifdef HOTKEY_CTRL 138# ifdef HOTKEY_CTRL
139 if (ctrl) 139 if (ctrl)
140# else 140# else
141 if (meta) 141 if (meta)
142# endif 142# endif
143 { 143 {
144 if (keysym == ks_bigfont) 144 if (keysym == ks_bigfont)
145 { 145 {
146 change_font (0, FONT_UP); 146 change_font (FONT_UP);
147 return; 147 return;
148 } 148 }
149 else if (keysym == ks_smallfont) 149 else if (keysym == ks_smallfont)
150 { 150 {
151 change_font (0, FONT_DN); 151 change_font (FONT_DN);
152 return; 152 return;
153 }
153 } 154 }
154 }
155#endif 155#endif
156 156
157 if (TermWin.saveLines) { 157 if (TermWin.saveLines)
158 {
158#ifdef UNSHIFTED_SCROLLKEYS 159#ifdef UNSHIFTED_SCROLLKEYS
159 if (!ctrl && !meta) { 160 if (!ctrl && !meta)
161 {
160#else 162#else
161 if (IS_SCROLL_MOD) { 163 if (IS_SCROLL_MOD)
164 {
162#endif 165#endif
163 int lnsppg; 166 int lnsppg;
164 167
165#ifdef PAGING_CONTEXT_LINES 168#ifdef PAGING_CONTEXT_LINES
166 lnsppg = TermWin.nrow - PAGING_CONTEXT_LINES; 169 lnsppg = TermWin.nrow - PAGING_CONTEXT_LINES;
167#else 170#else
168 lnsppg = TermWin.nrow * 4 / 5; 171 lnsppg = TermWin.nrow * 4 / 5;
169#endif 172#endif
170 if (keysym == XK_Prior) { 173 if (keysym == XK_Prior)
174 {
171 scr_page (UP, lnsppg); 175 scr_page (UP, lnsppg);
172 return; 176 return;
177 }
173 } else if (keysym == XK_Next) { 178 else if (keysym == XK_Next)
179 {
174 scr_page (DN, lnsppg); 180 scr_page (DN, lnsppg);
175 return; 181 return;
176 } 182 }
177 } 183 }
178#ifdef SCROLL_ON_UPDOWN_KEYS 184#ifdef SCROLL_ON_UPDOWN_KEYS
179 if (IS_SCROLL_MOD) { 185 if (IS_SCROLL_MOD)
180 if (keysym == XK_Up) { 186 {
181 scr_page (UP, 1); 187 if (keysym == XK_Up)
182 return; 188 {
189 scr_page (UP, 1);
190 return;
191 }
183 } else if (keysym == XK_Down) { 192 else if (keysym == XK_Down)
184 scr_page (DN, 1); 193 {
185 return; 194 scr_page (DN, 1);
186 } 195 return;
187 } 196 }
197 }
188#endif 198#endif
189#ifdef SCROLL_ON_HOMEEND_KEYS 199#ifdef SCROLL_ON_HOMEEND_KEYS
190 if (IS_SCROLL_MOD) { 200 if (IS_SCROLL_MOD)
191 if (keysym == XK_Home) { 201 {
192 scr_move_to (0, 1); 202 if (keysym == XK_Home)
193 return; 203 {
204 scr_move_to (0, 1);
205 return;
206 }
194 } else if (keysym == XK_End) { 207 else if (keysym == XK_End)
195 scr_move_to (1, 0); 208 {
196 return; 209 scr_move_to (1, 0);
197 } 210 return;
198 } 211 }
212 }
199#endif 213#endif
200 } 214 }
201 215
202 if (shft) { 216 if (shft)
217 {
203 /* Shift + F1 - F10 generates F11 - F20 */ 218 /* Shift + F1 - F10 generates F11 - F20 */
204 if (keysym >= XK_F1 && keysym <= XK_F10) { 219 if (keysym >= XK_F1 && keysym <= XK_F10)
220 {
205 keysym += (XK_F11 - XK_F1); 221 keysym += (XK_F11 - XK_F1);
206 shft = 0; /* turn off Shift */ 222 shft = 0; /* turn off Shift */
223 }
207 } else if (!ctrl && !meta && (PrivateModes & PrivMode_ShiftKeys)) { 224 else if (!ctrl && !meta && (PrivateModes & PrivMode_ShiftKeys))
208 switch (keysym) { 225 {
209 /* normal XTerm key bindings */ 226 switch (keysym)
227 {
228 /* normal XTerm key bindings */
210 case XK_Insert: /* Shift+Insert = paste mouse selection */ 229 case XK_Insert: /* Shift+Insert = paste mouse selection */
211 selection_request (ev->time, 0, 0); 230 selection_request (ev.time, 0, 0);
212 return; 231 return;
213 /* rxvt extras */ 232 /* rxvt extras */
214 case XK_KP_Add: /* Shift+KP_Add = bigger font */ 233 case XK_KP_Add: /* Shift+KP_Add = bigger font */
215 change_font (0, FONT_UP); 234 change_font (FONT_UP);
216 return; 235 return;
217 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */ 236 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */
218 change_font (0, FONT_DN); 237 change_font (FONT_DN);
219 return; 238 return;
220 } 239 }
221 } 240 }
222 } 241 }
223#ifdef PRINTPIPE 242#ifdef PRINTPIPE
224 if (keysym == XK_Print) { 243 if (keysym == XK_Print)
244 {
225 scr_printscreen (ctrl | shft); 245 scr_printscreen (ctrl | shft);
226 return; 246 return;
227 } 247 }
228#endif 248#endif
229#ifdef GREEK_SUPPORT
230 if (keysym == ks_greekmodeswith) {
231 greek_mode = !greek_mode;
232 if (greek_mode) {
233 xterm_seq (XTerm_title,
234 (greek_getmode() == GREEK_ELOT928
235 ? "[Greek: iso]" : "[Greek: ibm]"), CHAR_ST);
236 greek_reset();
237 } else
238 xterm_seq (XTerm_title, APL_NAME "-" VERSION, CHAR_ST);
239 return;
240 }
241#endif
242 249
243 if (keysym >= 0xFF00 && keysym <= 0xFFFF) { 250 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
251 {
244#ifdef KEYSYM_RESOURCE 252#ifdef KEYSYM_RESOURCE
245 if (!(shft | ctrl) && Keysym_map[keysym & 0xFF] != NULL) { 253 if (! (shft | ctrl) && Keysym_map[keysym & 0xFF] != NULL)
246 unsigned int l; 254 {
255 unsigned int l;
247 const unsigned char *kbuf0; 256 const unsigned char *kbuf0;
248 const unsigned char ch = C0_ESC; 257 const unsigned char ch = C0_ESC;
249 258
250 kbuf0 = (Keysym_map[keysym & 0xFF]); 259 kbuf0 = (Keysym_map[keysym & 0xFF]);
251 l = (unsigned int)*kbuf0++; 260 l = (unsigned int)*kbuf0++;
252 261
253 /* escape prefix */ 262 /* escape prefix */
254 if (meta) 263 if (meta)
255# ifdef META8_OPTION 264# ifdef META8_OPTION
256 if (meta_char == C0_ESC) 265 if (meta_char == C0_ESC)
257# endif 266# endif
258 tt_write (&ch, 1); 267 tt_write (&ch, 1);
259 tt_write (kbuf0, l); 268 tt_write (kbuf0, l);
260 return; 269 return;
261 } else 270 }
271 else
262#endif 272#endif
263 { 273 {
264 newlen = 1; 274 newlen = 1;
265 switch (keysym) { 275 switch (keysym)
276 {
266#ifndef NO_BACKSPACE_KEY 277#ifndef NO_BACKSPACE_KEY
267 case XK_BackSpace: 278 case XK_BackSpace:
268 if (PrivateModes & PrivMode_HaveBackSpace) { 279 if (PrivateModes & PrivMode_HaveBackSpace)
280 {
269 kbuf[0] = (!!(PrivateModes & PrivMode_BackSpace) 281 kbuf[0] = (!! (PrivateModes & PrivMode_BackSpace)
270 ^ !!ctrl) ? '\b' : '\177'; 282 ^ !!ctrl) ? '\b' : '\177';
271 kbuf[1] = '\0'; 283 kbuf[1] = '\0';
272 } else 284 }
273 STRCPY(kbuf, key_backspace); 285 else
286 STRCPY (kbuf, key_backspace);
274# ifdef MULTICHAR_SET 287# ifdef MULTICHAR_SET
275 if ((Options & Opt_mc_hack) && screen.cur.col > 0) { 288 if ((Options & Opt_mc_hack) && screen.cur.col > 0)
276 int col, row; 289 {
290 int col, row;
277 291
278 newlen = STRLEN(kbuf); 292 newlen = STRLEN (kbuf);
279 col = screen.cur.col - 1; 293 col = screen.cur.col - 1;
280 row = screen.cur.row + TermWin.saveLines; 294 row = screen.cur.row + TermWin.saveLines;
281 if (IS_MULTI2(screen.rend[row][col])) 295 if (IS_MULTI2 (screen.rend[row][col]))
282 MEMMOVE(kbuf + newlen, kbuf, newlen + 1); 296 MEMMOVE (kbuf + newlen, kbuf, newlen + 1);
283 } 297 }
284# endif 298# endif
285 break; 299 break;
286#endif 300#endif
287#ifndef NO_DELETE_KEY 301#ifndef NO_DELETE_KEY
288 case XK_Delete: 302 case XK_Delete:
289 STRCPY(kbuf, key_delete); 303 STRCPY (kbuf, key_delete);
290# ifdef MULTICHAR_SET 304# ifdef MULTICHAR_SET
291 if (Options & Opt_mc_hack) { 305 if (Options & Opt_mc_hack)
292 int col, row; 306 {
293 307 int col, row;
294 newlen = STRLEN(kbuf); 308
295 col = screen.cur.col; 309 newlen = STRLEN (kbuf);
310 col = screen.cur.col;
296 row = screen.cur.row + TermWin.saveLines; 311 row = screen.cur.row + TermWin.saveLines;
297 if (IS_MULTI1(screen.rend[row][col])) 312 if (IS_MULTI1 (screen.rend[row][col]))
298 MEMMOVE(kbuf + newlen, kbuf, newlen + 1); 313 MEMMOVE (kbuf + newlen, kbuf, newlen + 1);
299 } 314 }
300# endif 315# endif
301 break; 316 break;
302#endif 317#endif
303 case XK_Tab: 318 case XK_Tab:
304 if (shft) 319 if (shft)
305 STRCPY(kbuf, "\033[Z"); 320 STRCPY (kbuf, "\033[Z");
306 else { 321 else
322 {
307#ifdef CTRL_TAB_MAKES_META 323#ifdef CTRL_TAB_MAKES_META
308 if (ctrl) 324 if (ctrl)
309 meta = 1; 325 meta = 1;
310#endif 326#endif
311#ifdef MOD4_TAB_MAKES_META 327#ifdef MOD4_TAB_MAKES_META
312 if (ev->state & Mod4Mask) 328 if (ev.state & Mod4Mask)
313 meta = 1; 329 meta = 1;
314#endif 330#endif
315 newlen = 0; 331 newlen = 0;
316 } 332 }
317 break; 333 break;
318
319 334
320#ifdef XK_KP_Left 335#ifdef XK_KP_Left
321 case XK_KP_Up: /* \033Ox or standard */ 336 case XK_KP_Up: /* \033Ox or standard */
322 case XK_KP_Down: /* \033Or or standard */ 337 case XK_KP_Down: /* \033Or or standard */
323 case XK_KP_Right: /* \033Ov or standard */ 338 case XK_KP_Right: /* \033Ov or standard */
324 case XK_KP_Left: /* \033Ot or standard */ 339 case XK_KP_Left: /* \033Ot or standard */
325 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) { 340 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft)
326 STRCPY(kbuf, "\033OZ"); 341 {
327 kbuf[2] = ("txvr"[keysym - XK_KP_Left]); 342 STRCPY (kbuf, "\033OZ");
328 break; 343 kbuf[2] = "txvr"[keysym - XK_KP_Left];
329 } else 344 break;
345 }
346 else
330 /* translate to std. cursor key */ 347 /* translate to std. cursor key */
331 keysym = XK_Left + (keysym - XK_KP_Left); 348 keysym = XK_Left + (keysym - XK_KP_Left);
332 /* FALLTHROUGH */ 349 /* FALLTHROUGH */
333#endif 350#endif
334 case XK_Up: /* "\033[A" */ 351 case XK_Up: /* "\033[A" */
335 case XK_Down: /* "\033[B" */ 352 case XK_Down: /* "\033[B" */
336 case XK_Right: /* "\033[C" */ 353 case XK_Right: /* "\033[C" */
337 case XK_Left: /* "\033[D" */ 354 case XK_Left: /* "\033[D" */
338 STRCPY(kbuf, "\033[Z"); 355 STRCPY (kbuf, "\033[Z");
339 kbuf[2] = ("DACB"[keysym - XK_Left]); 356 kbuf[2] = "DACB"[keysym - XK_Left];
340 /* do Shift first */ 357 /* do Shift first */
341 if (shft) 358 if (shft)
342 kbuf[2] = ("dacb"[keysym - XK_Left]); 359 kbuf[2] = "dacb"[keysym - XK_Left];
343 else if (ctrl) { 360 else if (ctrl)
344 kbuf[1] = 'O'; 361 {
345 kbuf[2] = ("dacb"[keysym - XK_Left]); 362 kbuf[1] = 'O';
363 kbuf[2] = "dacb"[keysym - XK_Left];
364 }
346 } else if (PrivateModes & PrivMode_aplCUR) 365 else if (PrivateModes & PrivMode_aplCUR)
347 kbuf[1] = 'O'; 366 kbuf[1] = 'O';
348#ifdef MULTICHAR_SET 367#ifdef MULTICHAR_SET
349 //TODO: ?? 368 //TODO: ??
350 if (Options & Opt_mc_hack) { 369 if (Options & Opt_mc_hack)
351 int col, row, m; 370 {
371 int col, row, m;
352 372
353 col = screen.cur.col; 373 col = screen.cur.col;
354 row = screen.cur.row + TermWin.saveLines; 374 row = screen.cur.row + TermWin.saveLines;
355 m = 0; 375 m = 0;
356 if (keysym == XK_Right 376 if (keysym == XK_Right
357 && IS_MULTI1(screen.rend[row][col])) 377 && IS_MULTI1 (screen.rend[row][col]))
358 m = 1; 378 m = 1;
359 else if (keysym == XK_Left) { 379 else if (keysym == XK_Left)
360 if (col > 0) { 380 {
361 if (IS_MULTI2(screen.rend[row][col - 1])) 381 if (col > 0)
362 m = 1; 382 {
363 } else if (screen.cur.row > 0) { 383 if (IS_MULTI2 (screen.rend[row][col - 1]))
364 col = screen.tlen[--row]; 384 m = 1;
365 if (col == -1) 385 }
366 col = TermWin.ncol - 1; 386 else if (screen.cur.row > 0)
367 else 387 {
368 col--; 388 col = screen.tlen[--row];
369 if (col > 0 389 if (col == -1)
370 && IS_MULTI2(screen.rend[row][col])) 390 col = TermWin.ncol - 1;
371 m = 1; 391 else
372 } 392 col--;
373 } 393 if (col > 0
374 if (m) 394 && IS_MULTI2 (screen.rend[row][col]))
375 MEMMOVE(kbuf + 3, kbuf, 3 + 1); 395 m = 1;
376 } 396 }
397 }
398 if (m)
399 MEMMOVE (kbuf + 3, kbuf, 3 + 1);
400 }
377#endif 401#endif
378 break; 402 break;
379 403
380#ifndef UNSHIFTED_SCROLLKEYS 404#ifndef UNSHIFTED_SCROLLKEYS
381# ifdef XK_KP_Prior 405# ifdef XK_KP_Prior
382 case XK_KP_Prior: 406 case XK_KP_Prior:
383 /* allow shift to override */ 407 /* allow shift to override */
384 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) { 408 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft)
385 STRCPY(kbuf, "\033Oy"); 409 {
386 break; 410 STRCPY (kbuf, "\033Oy");
387 } 411 break;
388 /* FALLTHROUGH */ 412 }
413 /* FALLTHROUGH */
389# endif 414# endif
390 case XK_Prior: 415 case XK_Prior:
391 STRCPY(kbuf, "\033[5~"); 416 STRCPY (kbuf, "\033[5~");
392 break; 417 break;
393# ifdef XK_KP_Next 418# ifdef XK_KP_Next
394 case XK_KP_Next: 419 case XK_KP_Next:
395 /* allow shift to override */ 420 /* allow shift to override */
396 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) { 421 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft)
397 STRCPY(kbuf, "\033Os"); 422 {
398 break; 423 STRCPY (kbuf, "\033Os");
399 } 424 break;
400 /* FALLTHROUGH */ 425 }
426 /* FALLTHROUGH */
401# endif 427# endif
402 case XK_Next: 428 case XK_Next:
403 STRCPY(kbuf, "\033[6~"); 429 STRCPY (kbuf, "\033[6~");
404 break; 430 break;
405#endif 431#endif
406 case XK_KP_Enter: 432 case XK_KP_Enter:
407 /* allow shift to override */ 433 /* allow shift to override */
408 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) { 434 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft)
409 STRCPY(kbuf, "\033OM"); 435 {
410 } else { 436 STRCPY (kbuf, "\033OM");
411 kbuf[0] = '\r'; 437 }
412 kbuf[1] = '\0'; 438 else
413 } 439 {
414 break; 440 kbuf[0] = '\r';
441 kbuf[1] = '\0';
442 }
443 break;
415 444
416#ifdef XK_KP_Begin 445#ifdef XK_KP_Begin
417 case XK_KP_Begin: 446 case XK_KP_Begin:
418 STRCPY(kbuf, "\033Ou"); 447 STRCPY (kbuf, "\033Ou");
419 break; 448 break;
420 449
421 case XK_KP_Insert: 450 case XK_KP_Insert:
422 STRCPY(kbuf, "\033Op"); 451 STRCPY (kbuf, "\033Op");
423 break; 452 break;
424 453
425 case XK_KP_Delete: 454 case XK_KP_Delete:
426 STRCPY(kbuf, "\033On"); 455 STRCPY (kbuf, "\033On");
427 break; 456 break;
428#endif 457#endif
429 case XK_KP_F1: /* "\033OP" */ 458 case XK_KP_F1: /* "\033OP" */
430 case XK_KP_F2: /* "\033OQ" */ 459 case XK_KP_F2: /* "\033OQ" */
431 case XK_KP_F3: /* "\033OR" */ 460 case XK_KP_F3: /* "\033OR" */
432 case XK_KP_F4: /* "\033OS" */ 461 case XK_KP_F4: /* "\033OS" */
433 STRCPY(kbuf, "\033OP"); 462 STRCPY (kbuf, "\033OP");
434 kbuf[2] += (keysym - XK_KP_F1); 463 kbuf[2] += (keysym - XK_KP_F1);
435 break; 464 break;
436 465
437 case XK_KP_Multiply: /* "\033Oj" : "*" */ 466 case XK_KP_Multiply: /* "\033Oj" : "*" */
438 case XK_KP_Add: /* "\033Ok" : "+" */ 467 case XK_KP_Add: /* "\033Ok" : "+" */
439 case XK_KP_Separator: /* "\033Ol" : "," */ 468 case XK_KP_Separator: /* "\033Ol" : "," */
440 case XK_KP_Subtract: /* "\033Om" : "-" */ 469 case XK_KP_Subtract: /* "\033Om" : "-" */
441 case XK_KP_Decimal: /* "\033On" : "." */ 470 case XK_KP_Decimal: /* "\033On" : "." */
442 case XK_KP_Divide: /* "\033Oo" : "/" */ 471 case XK_KP_Divide: /* "\033Oo" : "/" */
443 case XK_KP_0: /* "\033Op" : "0" */ 472 case XK_KP_0: /* "\033Op" : "0" */
444 case XK_KP_1: /* "\033Oq" : "1" */ 473 case XK_KP_1: /* "\033Oq" : "1" */
445 case XK_KP_2: /* "\033Or" : "2" */ 474 case XK_KP_2: /* "\033Or" : "2" */
446 case XK_KP_3: /* "\033Os" : "3" */ 475 case XK_KP_3: /* "\033Os" : "3" */
447 case XK_KP_4: /* "\033Ot" : "4" */ 476 case XK_KP_4: /* "\033Ot" : "4" */
448 case XK_KP_5: /* "\033Ou" : "5" */ 477 case XK_KP_5: /* "\033Ou" : "5" */
449 case XK_KP_6: /* "\033Ov" : "6" */ 478 case XK_KP_6: /* "\033Ov" : "6" */
450 case XK_KP_7: /* "\033Ow" : "7" */ 479 case XK_KP_7: /* "\033Ow" : "7" */
451 case XK_KP_8: /* "\033Ox" : "8" */ 480 case XK_KP_8: /* "\033Ox" : "8" */
452 case XK_KP_9: /* "\033Oy" : "9" */ 481 case XK_KP_9: /* "\033Oy" : "9" */
453 /* allow shift to override */ 482 /* allow shift to override */
454 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) { 483 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft)
455 STRCPY(kbuf, "\033Oj"); 484 {
456 kbuf[2] += (keysym - XK_KP_Multiply); 485 STRCPY (kbuf, "\033Oj");
457 } else { 486 kbuf[2] += (keysym - XK_KP_Multiply);
487 }
488 else
489 {
458 kbuf[0] = ('*' + (keysym - XK_KP_Multiply)); 490 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
459 kbuf[1] = '\0'; 491 kbuf[1] = '\0';
460 } 492 }
461 break; 493 break;
462 494
463 case XK_Find: 495 case XK_Find:
464 STRCPY(kbuf, "\033[1~"); 496 STRCPY (kbuf, "\033[1~");
465 break; 497 break;
466 case XK_Insert: 498 case XK_Insert:
467 STRCPY(kbuf, "\033[2~"); 499 STRCPY (kbuf, "\033[2~");
468 break; 500 break;
469#ifdef DXK_Remove /* support for DEC remove like key */ 501#ifdef DXK_Remove /* support for DEC remove like key */
470 case DXK_Remove: 502 case DXK_Remove:
471 /* FALLTHROUGH */ 503 /* FALLTHROUGH */
472#endif 504#endif
473 case XK_Execute: 505 case XK_Execute:
474 STRCPY(kbuf, "\033[3~"); 506 STRCPY (kbuf, "\033[3~");
475 break; 507 break;
476 case XK_Select: 508 case XK_Select:
477 STRCPY(kbuf, "\033[4~"); 509 STRCPY (kbuf, "\033[4~");
478 break; 510 break;
479#ifdef XK_KP_End 511#ifdef XK_KP_End
480 case XK_KP_End: 512 case XK_KP_End:
481 /* allow shift to override */ 513 /* allow shift to override */
482 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) { 514 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft)
483 STRCPY(kbuf, "\033Oq"); 515 {
484 break; 516 STRCPY (kbuf, "\033Oq");
485 } 517 break;
486 /* FALLTHROUGH */ 518 }
519 /* FALLTHROUGH */
487#endif 520#endif
488 case XK_End: 521 case XK_End:
489 STRCPY(kbuf, KS_END); 522 STRCPY (kbuf, KS_END);
490 break; 523 break;
491#ifdef XK_KP_Home 524#ifdef XK_KP_Home
492 case XK_KP_Home: 525 case XK_KP_Home:
493 /* allow shift to override */ 526 /* allow shift to override */
494 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) { 527 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft)
495 STRCPY(kbuf, "\033Ow"); 528 {
496 break; 529 STRCPY (kbuf, "\033Ow");
497 } 530 break;
498 /* FALLTHROUGH */ 531 }
532 /* FALLTHROUGH */
499#endif 533#endif
500 case XK_Home: 534 case XK_Home:
501 STRCPY(kbuf, KS_HOME); 535 STRCPY (kbuf, KS_HOME);
502 break; 536 break;
503 537
504#define FKEY(n, fkey) \ 538#define FKEY(n, fkey) \
505 sprintf((char *)kbuf,"\033[%2d~", (int)((n) + (keysym - fkey))) 539 sprintf ((char *)kbuf,"\033[%2d~", (int) ((n) + (keysym - fkey)))
506 540
507 case XK_F1: /* "\033[11~" */ 541 case XK_F1: /* "\033[11~" */
508 case XK_F2: /* "\033[12~" */ 542 case XK_F2: /* "\033[12~" */
509 case XK_F3: /* "\033[13~" */ 543 case XK_F3: /* "\033[13~" */
510 case XK_F4: /* "\033[14~" */ 544 case XK_F4: /* "\033[14~" */
511 case XK_F5: /* "\033[15~" */ 545 case XK_F5: /* "\033[15~" */
512 FKEY(11, XK_F1); 546 FKEY (11, XK_F1);
513 break; 547 break;
514 case XK_F6: /* "\033[17~" */ 548 case XK_F6: /* "\033[17~" */
515 case XK_F7: /* "\033[18~" */ 549 case XK_F7: /* "\033[18~" */
516 case XK_F8: /* "\033[19~" */ 550 case XK_F8: /* "\033[19~" */
517 case XK_F9: /* "\033[20~" */ 551 case XK_F9: /* "\033[20~" */
518 case XK_F10: /* "\033[21~" */ 552 case XK_F10: /* "\033[21~" */
519 FKEY(17, XK_F6); 553 FKEY (17, XK_F6);
520 break; 554 break;
521 case XK_F11: /* "\033[23~" */ 555 case XK_F11: /* "\033[23~" */
522 case XK_F12: /* "\033[24~" */ 556 case XK_F12: /* "\033[24~" */
523 case XK_F13: /* "\033[25~" */ 557 case XK_F13: /* "\033[25~" */
524 case XK_F14: /* "\033[26~" */ 558 case XK_F14: /* "\033[26~" */
525 FKEY(23, XK_F11); 559 FKEY (23, XK_F11);
526 break; 560 break;
527 case XK_F15: /* "\033[28~" */ 561 case XK_F15: /* "\033[28~" */
528 case XK_F16: /* "\033[29~" */ 562 case XK_F16: /* "\033[29~" */
529 FKEY(28, XK_F15); 563 FKEY (28, XK_F15);
530 break; 564 break;
531 case XK_Help: /* "\033[28~" */ 565 case XK_Help: /* "\033[28~" */
532 FKEY(28, XK_Help); 566 FKEY (28, XK_Help);
533 break; 567 break;
534 case XK_Menu: /* "\033[29~" */ 568 case XK_Menu: /* "\033[29~" */
535 FKEY(29, XK_Menu); 569 FKEY (29, XK_Menu);
536 break; 570 break;
537 case XK_F17: /* "\033[31~" */ 571 case XK_F17: /* "\033[31~" */
538 case XK_F18: /* "\033[32~" */ 572 case XK_F18: /* "\033[32~" */
539 case XK_F19: /* "\033[33~" */ 573 case XK_F19: /* "\033[33~" */
540 case XK_F20: /* "\033[34~" */ 574 case XK_F20: /* "\033[34~" */
541 case XK_F21: /* "\033[35~" */ 575 case XK_F21: /* "\033[35~" */
542 case XK_F22: /* "\033[36~" */ 576 case XK_F22: /* "\033[36~" */
543 case XK_F23: /* "\033[37~" */ 577 case XK_F23: /* "\033[37~" */
544 case XK_F24: /* "\033[38~" */ 578 case XK_F24: /* "\033[38~" */
545 case XK_F25: /* "\033[39~" */ 579 case XK_F25: /* "\033[39~" */
546 case XK_F26: /* "\033[40~" */ 580 case XK_F26: /* "\033[40~" */
547 case XK_F27: /* "\033[41~" */ 581 case XK_F27: /* "\033[41~" */
548 case XK_F28: /* "\033[42~" */ 582 case XK_F28: /* "\033[42~" */
549 case XK_F29: /* "\033[43~" */ 583 case XK_F29: /* "\033[43~" */
550 case XK_F30: /* "\033[44~" */ 584 case XK_F30: /* "\033[44~" */
551 case XK_F31: /* "\033[45~" */ 585 case XK_F31: /* "\033[45~" */
552 case XK_F32: /* "\033[46~" */ 586 case XK_F32: /* "\033[46~" */
553 case XK_F33: /* "\033[47~" */ 587 case XK_F33: /* "\033[47~" */
554 case XK_F34: /* "\033[48~" */ 588 case XK_F34: /* "\033[48~" */
555 case XK_F35: /* "\033[49~" */ 589 case XK_F35: /* "\033[49~" */
556 FKEY(31, XK_F17); 590 FKEY (31, XK_F17);
557 break; 591 break;
558#undef FKEY 592#undef FKEY
559 default: 593 default:
560 newlen = 0; 594 newlen = 0;
561 break; 595 break;
562 } 596 }
563 if (newlen) 597 if (newlen)
564 len = STRLEN(kbuf); 598 len = STRLEN (kbuf);
565 } 599 }
566 /* 600 /*
567 * Pass meta for all function keys, if 'meta' option set 601 * Pass meta for all function keys, if 'meta' option set
568 */ 602 */
569#ifdef META8_OPTION 603#ifdef META8_OPTION
570 if (meta && (meta_char == 0x80) && len > 0) 604 if (meta && (meta_char == 0x80) && len > 0)
571 kbuf[len - 1] |= 0x80; 605 kbuf[len - 1] |= 0x80;
572#endif 606#endif
607
608 }
573 } else if (ctrl && keysym == XK_minus) { 609 else if (ctrl && keysym == XK_minus)
610 {
574 len = 1; 611 len = 1;
575 kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */ 612 kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */
576 } else { 613 }
614 else
615 {
577#ifdef META8_OPTION 616#ifdef META8_OPTION
578 /* set 8-bit on */ 617 /* set 8-bit on */
579 if (meta && (meta_char == 0x80)) { 618 if (meta && (meta_char == 0x80))
580 unsigned char *ch; 619 {
620 unsigned char *ch;
581 621
582 for (ch = kbuf; ch < kbuf + len; ch++) 622 for (ch = kbuf; ch < kbuf + len; ch++)
583 *ch |= 0x80; 623 *ch |= 0x80;
584 meta = 0; 624 meta = 0;
625 }
626#endif
627 /* nil */ ;
628 }
585 } 629 }
586#endif 630
587#ifdef GREEK_SUPPORT 631 if (len <= 0)
588 if (greek_mode) 632 return; /* not mapped */
589 len = greek_xlat(kbuf, len); 633
590#endif 634 if (Options & Opt_scrollTtyKeypress)
591 /* nil */ ; 635 if (TermWin.view_start)
592 } 636 {
637 TermWin.view_start = 0;
638 want_refresh = 1;
593 } 639 }
594 640
595 if (len <= 0) 641 /*
596 return; /* not mapped */
597
598 if (Options & Opt_scrollTtyKeypress)
599 if (TermWin.view_start) {
600 TermWin.view_start = 0;
601 want_refresh = 1;
602 }
603
604/*
605 * these modifications only affect the static keybuffer 642 * these modifications only affect the static keybuffer
606 * pass Shift/Control indicators for function keys ending with `~' 643 * pass Shift/Control indicators for function keys ending with `~'
607 * 644 *
608 * eg, 645 * eg,
609 * Prior = "ESC[5~" 646 * Prior = "ESC[5~"
610 * Shift+Prior = "ESC[5$" 647 * Shift+Prior = "ESC[5$"
611 * Ctrl+Prior = "ESC[5^" 648 * Ctrl+Prior = "ESC[5^"
612 * Ctrl+Shift+Prior = "ESC[5@" 649 * Ctrl+Shift+Prior = "ESC[5@"
613 * Meta adds an Escape prefix (with META8_OPTION, if meta == <escape>). 650 * Meta adds an Escape prefix (with META8_OPTION, if meta == <escape>).
614 */ 651 */
615 if (kbuf[0] == C0_ESC && kbuf[1] == '[' && kbuf[len - 1] == '~') 652 if (kbuf[0] == C0_ESC && kbuf[1] == '[' && kbuf[len - 1] == '~')
616 kbuf[len - 1] = (shft ? (ctrl ? '@' : '$') : (ctrl ? '^' : '~')); 653 kbuf[len - 1] = (shft ? (ctrl ? '@' : '$') : (ctrl ? '^' : '~'));
617 654
618/* escape prefix */ 655 /* escape prefix */
619 if (meta 656 if (meta
620#ifdef META8_OPTION 657#ifdef META8_OPTION
621 && (meta_char == C0_ESC) 658 && (meta_char == C0_ESC)
622#endif 659#endif
623 ) { 660 )
661 {
624 const unsigned char ch = C0_ESC; 662 const unsigned char ch = C0_ESC;
625 663
626 tt_write(&ch, 1); 664 tt_write (&ch, 1);
627 } 665 }
628#ifdef DEBUG_CMD 666#ifdef DEBUG_CMD
667 if (debug_key)
629 if (debug_key) { /* Display keyboard buffer contents */ 668 { /* Display keyboard buffer contents */
630 char *p; 669 char *p;
631 int i; 670 int i;
632 671
633 fprintf(stderr, "key 0x%04X [%d]: `", (unsigned int)keysym, len); 672 fprintf (stderr, "key 0x%04X [%d]: `", (unsigned int)keysym, len);
634 for (i = 0, p = kbuf; i < len; i++, p++) 673 for (i = 0, p = kbuf; i < len; i++, p++)
635 fprintf(stderr, (*p >= ' ' && *p < '\177' ? "%c" : "\\%03o"), *p); 674 fprintf (stderr, (*p >= ' ' && *p < '\177' ? "%c" : "\\%03o"), *p);
636 fprintf(stderr, "'\n"); 675 fprintf (stderr, "'\n");
637 } 676 }
638#endif /* DEBUG_CMD */ 677#endif /* DEBUG_CMD */
639 tt_write (kbuf, (unsigned int)len); 678 tt_write (kbuf, (unsigned int)len);
640} 679}
641/*}}} */ 680/*}}} */
642 681
643#if (MENUBAR_MAX) 682#if (MENUBAR_MAX)
644/*{{{ rxvt_cmd_write(), rxvt_cmd_getc() */ 683/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */
645/* attempt to `write' count to the input buffer */ 684/* attempt to `write' count to the input buffer */
646unsigned int 685unsigned int
647rxvt_term::cmd_write (const unsigned char *str, unsigned int count) 686rxvt_term::cmd_write (const unsigned char *str, unsigned int count)
648{ 687{
649 unsigned int n, s; 688 unsigned int n, s;
650 689
651 n = cmdbuf_ptr - cmdbuf_base; 690 n = cmdbuf_ptr - cmdbuf_base;
652 s = cmdbuf_base + BUFSIZ - 1 - cmdbuf_endp; 691 s = cmdbuf_base + BUFSIZ - 1 - cmdbuf_endp;
653 if (n > 0 && s < count) { 692 if (n > 0 && s < count)
693 {
654 MEMMOVE(cmdbuf_base, cmdbuf_ptr, 694 MEMMOVE (cmdbuf_base, cmdbuf_ptr,
655 (unsigned int)(cmdbuf_endp - cmdbuf_ptr)); 695 (unsigned int) (cmdbuf_endp - cmdbuf_ptr));
656 cmdbuf_ptr = cmdbuf_base; 696 cmdbuf_ptr = cmdbuf_base;
657 cmdbuf_endp -= n; 697 cmdbuf_endp -= n;
658 s += n; 698 s += n;
659 } 699 }
660 if (count > s) { 700 if (count > s)
701 {
661 rxvt_print_error("data loss: cmd_write too large"); 702 rxvt_print_error ("data loss: cmd_write too large");
662 count = s; 703 count = s;
663 } 704 }
664 for (; count--;) 705 for (; count--;)
665 *cmdbuf_endp++ = *str++; 706 *cmdbuf_endp++ = *str++;
666 return 0; 707 return 0;
667} 708}
668#endif /* MENUBAR_MAX */ 709#endif /* MENUBAR_MAX */
669 710
670void 711void
671rxvt_term::flush () 712rxvt_term::flush ()
… …
685 scr_refresh (refresh_type); 726 scr_refresh (refresh_type);
686 scrollbar_show (1); 727 scrollbar_show (1);
687#ifdef USE_XIM 728#ifdef USE_XIM
688 IMSendSpot (); 729 IMSendSpot ();
689#endif 730#endif
690 }
691 731
692 XFlush (Xdisplay); 732 }
733
734 display->flush ();
693} 735}
694 736
695void 737void
696rxvt_term::check_cb (check_watcher &w) 738rxvt_term::check_cb (check_watcher &w)
697{ 739{
698 SET_R (this); 740 SET_R (this);
699 SET_LOCALE (locale); 741 SET_LOCALE (locale);
700 742
701 flush (); 743 flush ();
702}
703
704void
705rxvt_term::process_x_events ()
706{
707 do
708 {
709 XEvent xev;
710
711 XNextEvent (Xdisplay, &xev);
712
713#if defined(CURSOR_BLINK)
714 if ((Options & Opt_cursorBlink) && xev.type == KeyPress)
715 {
716 if (hidden_cursor)
717 {
718 hidden_cursor = 0;
719 want_refresh = 1;
720 }
721
722 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
723 }
724#endif
725
726#if defined(POINTER_BLANK)
727 if ((Options & Opt_pointerBlank) && pointerBlankDelay > 0)
728 {
729 if (xev.type == MotionNotify
730 || xev.type == ButtonPress
731 || xev.type == ButtonRelease)
732 if (hidden_pointer)
733 pointer_unblank ();
734
735 if (xev.type == KeyPress && hidden_pointer == 0)
736 pointer_blank ();
737 }
738#endif
739
740#ifdef USE_XIM
741 if (!XFilterEvent (&xev, xev.xany.window))
742#endif
743 process_x_event (&xev);
744 }
745 while (XPending (Xdisplay));
746} 744}
747 745
748#ifdef CURSOR_BLINK 746#ifdef CURSOR_BLINK
749void 747void
750rxvt_term::cursor_blink_cb (time_watcher &w) 748rxvt_term::cursor_blink_cb (time_watcher &w)
… …
767 w.start (w.at + TEXT_BLINK_INTERVAL); 765 w.start (w.at + TEXT_BLINK_INTERVAL);
768 } 766 }
769} 767}
770#endif 768#endif
771 769
772void
773rxvt_term::x_cb (io_watcher &w, short revents)
774{
775 SET_R (this);
776 SET_LOCALE (locale);
777
778 process_x_events ();
779}
780
781bool 770bool
782rxvt_term::pty_fill () 771rxvt_term::pty_fill ()
783{ 772{
784 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 773 ssize_t n = cmdbuf_endp - cmdbuf_ptr;
785 774
786 memmove (cmdbuf_base, cmdbuf_ptr, n); 775 memmove (cmdbuf_base, cmdbuf_ptr, n);
787 cmdbuf_ptr = cmdbuf_base; 776 cmdbuf_ptr = cmdbuf_base;
788 cmdbuf_endp = cmdbuf_ptr + n; 777 cmdbuf_endp = cmdbuf_ptr + n;
789 778
790 n = read (cmd_fd, cmdbuf_endp, BUFSIZ - n); 779 n = read (cmd_fd, cmdbuf_endp, BUFSIZ - n);
791 780
792 if (n > 0) 781 if (n > 0)
793 { 782 {
794 cmdbuf_endp += n; 783 cmdbuf_endp += n;
… …
856 if (ch == '\n') 845 if (ch == '\n')
857 { 846 {
858 nlines++; 847 nlines++;
859 refresh_count++; 848 refresh_count++;
860 849
861 if (!(Options & Opt_jumpScroll) 850 if (! (Options & Opt_jumpScroll)
862 || (refresh_count >= (refresh_limit * (TermWin.nrow - 1)))) 851 || (refresh_count >= (refresh_limit * (TermWin.nrow - 1))))
863 { 852 {
864 refreshnow = true; 853 refreshnow = true;
865 flag = false; 854 flag = false;
866 ch = NOCHAR; 855 ch = NOCHAR;
867 break; 856 break;
857 }
858
859 // scr_add_lines only works for nlines < TermWin.nrow - 1.
860 if (nlines >= TermWin.nrow - 1)
861 {
862 scr_add_lines (buf, nlines, str - buf);
863 nlines = 0;
864 str = buf;
868 } 865 }
869 } 866 }
870 867
871 if (str >= buf + BUFSIZ) 868 if (str >= buf + BUFSIZ)
872 { 869 {
… …
904 process_nonprinting (ch); 901 process_nonprinting (ch);
905 break; 902 break;
906 case C0_ESC: /* escape char */ 903 case C0_ESC: /* escape char */
907 process_escape_seq (); 904 process_escape_seq ();
908 break; 905 break;
909 /*case 0x9b: */ /* CSI */ 906 /*case 0x9b: */ /* CSI */
910 /* process_csi_seq (); */ 907 /* process_csi_seq (); */
911 } 908 }
912 909
913 ch = NOCHAR; 910 ch = NOCHAR;
914 } 911 }
915 } 912 }
… …
926 { 923 {
927 if (*cmdbuf_ptr < 0x80) // assume < 0x80 to be ascii ALWAYS (all shift-states etc.) uh-oh 924 if (*cmdbuf_ptr < 0x80) // assume < 0x80 to be ascii ALWAYS (all shift-states etc.) uh-oh
928 return *cmdbuf_ptr++; 925 return *cmdbuf_ptr++;
929 926
930 wchar_t wc; 927 wchar_t wc;
931 size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, &mbstate.mbs); 928 size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
932 929
933 if (len == (size_t)-2) 930 if (len == (size_t)-2)
934 return NOCHAR; 931 return NOCHAR;
935 932
936 if (len == (size_t)-1) 933 if (len == (size_t)-1)
… …
942 } 939 }
943 940
944 return NOCHAR; 941 return NOCHAR;
945} 942}
946 943
947/* rxvt_cmd_getc() - Return next input character */ 944/* rxvt_cmd_getc () - Return next input character */
948/* 945/*
949 * Return the next input character after first passing any keyboard input 946 * Return the next input character after first passing any keyboard input
950 * to the command. 947 * to the command.
951 */ 948 */
952uint32_t 949uint32_t
… …
962 // would be preferred. either setjmp/longjmp or better design. 959 // would be preferred. either setjmp/longjmp or better design.
963 fcntl (cmd_fd, F_SETFL, 0); 960 fcntl (cmd_fd, F_SETFL, 0);
964 pty_fill (); 961 pty_fill ();
965 fcntl (cmd_fd, F_SETFL, O_NONBLOCK); 962 fcntl (cmd_fd, F_SETFL, O_NONBLOCK);
966 } 963 }
967
968#if 0
969#define TIMEOUT_USEC 5000
970 fd_set readfds;
971 int quick_timeout, select_res;
972 int want_motion_time, want_keypress_time;
973 struct timeval value;
974#if defined(POINTER_BLANK) || defined(CURSOR_BLINK)
975 struct timeval tp;
976#endif
977
978 for (;;) {
979 /* loop until we can return something */
980
981 if (v_bufstr < v_bufptr) /* output any pending chars */
982 tt_write(NULL, 0);
983
984#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
985 if (mouse_slip_wheel_speed) {
986 quick_timeout = 1;
987 if (!mouse_slip_wheel_delay--
988 && scr_page (mouse_slip_wheel_speed > 0 ? UP : DN,
989 abs(mouse_slip_wheel_speed))) {
990 mouse_slip_wheel_delay = SCROLLBAR_CONTINUOUS_DELAY;
991 refresh_type |= SMOOTH_REFRESH;
992 want_refresh = 1;
993 }
994 }
995#endif /* MOUSE_WHEEL && MOUSE_SLIP_WHEELING */
996#ifdef SELECTION_SCROLLING
997 if (pending_scroll_selection) {
998 quick_timeout = 1;
999 if (!scroll_selection_delay--
1000 && scr_page (scroll_selection_dir,
1001 scroll_selection_lines)) {
1002 selection_extend (selection_save_x,
1003 selection_save_y, selection_save_state);
1004 scroll_selection_delay = SCROLLBAR_CONTINUOUS_DELAY;
1005 refresh_type |= SMOOTH_REFRESH;
1006 want_refresh = 1;
1007 }
1008 }
1009#endif
1010#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1011 if (scrollbar_isUp() || scrollbar_isDn()) {
1012 quick_timeout = 1;
1013 if (!scroll_arrow_delay--
1014 && scr_page (scrollbar_isUp() ? UP : DN, 1)) {
1015 scroll_arrow_delay = SCROLLBAR_CONTINUOUS_DELAY;
1016 refresh_type |= SMOOTH_REFRESH;
1017 want_refresh = 1;
1018 }
1019 }
1020#endif /* NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING */
1021
1022#ifdef TRANSPARENT
1023 quick_timeout |= want_full_refresh;
1024#endif
1025#endif
1026} 964}
1027 965
1028#ifdef POINTER_BLANK 966#ifdef POINTER_BLANK
1029void 967void
1030rxvt_term::pointer_unblank () 968rxvt_term::pointer_unblank ()
1031{ 969{
1032 XDefineCursor (Xdisplay, TermWin.vt, TermWin_cursor); 970 XDefineCursor (display->display, TermWin.vt, TermWin_cursor);
1033 recolour_cursor (); 971 recolour_cursor ();
1034 972
1035 hidden_pointer = 0; 973 hidden_pointer = 0;
1036 974
1037 if (Options & Opt_pointerBlank) 975 if (Options & Opt_pointerBlank)
… …
1039} 977}
1040 978
1041void 979void
1042rxvt_term::pointer_blank () 980rxvt_term::pointer_blank ()
1043{ 981{
1044 if (!(Options & Opt_pointerBlank)) 982 if (! (Options & Opt_pointerBlank))
1045 return; 983 return;
1046 984
1047 XDefineCursor (Xdisplay, TermWin.vt, blank_cursor); 985 XDefineCursor (display->display, TermWin.vt, blank_cursor);
1048 XFlush (Xdisplay); 986 XFlush (display->display);
1049 987
1050 hidden_pointer = 1; 988 hidden_pointer = 1;
1051} 989}
1052 990
1053void 991void
… …
1059 pointer_blank (); 997 pointer_blank ();
1060} 998}
1061#endif 999#endif
1062 1000
1063void 1001void
1064rxvt_term::mouse_report (const XButtonEvent *ev) 1002rxvt_term::mouse_report (const XButtonEvent &ev)
1065{ 1003{
1066 int button_number, key_state = 0; 1004 int button_number, key_state = 0;
1067 int x, y; 1005 int x, y;
1068 1006
1069 x = ev->x; 1007 x = ev.x;
1070 y = ev->y; 1008 y = ev.y;
1071 pixel_position (&x, &y); 1009 pixel_position (&x, &y);
1072 1010
1073 if (MEvent.button == AnyButton) { 1011 if (MEvent.button == AnyButton)
1012 {
1074 button_number = 3; 1013 button_number = 3;
1075 } else { 1014 }
1015 else
1016 {
1076 button_number = MEvent.button - Button1; 1017 button_number = MEvent.button - Button1;
1077 /* add 0x3D for wheel events, like xterm does */ 1018 /* add 0x3D for wheel events, like xterm does */
1078 if (button_number >= 3) 1019 if (button_number >= 3)
1079 button_number += (64 - 3); 1020 button_number += (64 - 3);
1080 } 1021 }
1081 1022
1082 if (PrivateModes & PrivMode_MouseX10) { 1023 if (PrivateModes & PrivMode_MouseX10)
1024 {
1083 /* 1025 /*
1084 * do not report ButtonRelease 1026 * do not report ButtonRelease
1085 * no state info allowed 1027 * no state info allowed
1086 */ 1028 */
1087 key_state = 0; 1029 key_state = 0;
1088 if (button_number == 3) 1030 if (button_number == 3)
1089 return; 1031 return;
1090 } else { 1032 }
1033 else
1034 {
1091 /* XTerm mouse reporting needs these values: 1035 /* XTerm mouse reporting needs these values:
1092 * 4 = Shift 1036 * 4 = Shift
1093 * 8 = Meta 1037 * 8 = Meta
1094 * 16 = Control 1038 * 16 = Control
1095 * plus will add in our own Double-Click reporting 1039 * plus will add in our own Double-Click reporting
1096 * 32 = Double Click 1040 * 32 = Double Click
1097 */ 1041 */
1098 key_state = ((MEvent.state & ShiftMask) ? 4 : 0) 1042 key_state = ((MEvent.state & ShiftMask) ? 4 : 0)
1099 + ((MEvent.state & ModMetaMask) ? 8 : 0) 1043 + ((MEvent.state & ModMetaMask) ? 8 : 0)
1100 + ((MEvent.state & ControlMask) ? 16 : 0); 1044 + ((MEvent.state & ControlMask) ? 16 : 0);
1101#ifdef MOUSE_REPORT_DOUBLECLICK 1045#ifdef MOUSE_REPORT_DOUBLECLICK
1102 key_state += ((MEvent.clicks > 1) ? 32 : 0); 1046 key_state += ((MEvent.clicks > 1) ? 32 : 0);
1103#endif 1047#endif
1048
1104 } 1049 }
1105 1050
1106#ifdef DEBUG_MOUSEREPORT 1051#ifdef DEBUG_MOUSEREPORT
1107 fprintf(stderr, "Mouse ["); 1052 fprintf (stderr, "Mouse [");
1108 if (key_state & 16) 1053 if (key_state & 16)
1109 fputc('C', stderr); 1054 fputc ('C', stderr);
1110 if (key_state & 4) 1055 if (key_state & 4)
1111 fputc('S', stderr); 1056 fputc ('S', stderr);
1112 if (key_state & 8) 1057 if (key_state & 8)
1113 fputc('A', stderr); 1058 fputc ('A', stderr);
1114 if (key_state & 32) 1059 if (key_state & 32)
1115 fputc('2', stderr); 1060 fputc ('2', stderr);
1116 fprintf(stderr, "]: <%d>, %d/%d\n", 1061 fprintf (stderr, "]: <%d>, %d/%d\n",
1117 button_number, 1062 button_number,
1118 x + 1, 1063 x + 1,
1119 y + 1); 1064 y + 1);
1120#else 1065#else
1121 tt_printf("\033[M%c%c%c", 1066 tt_printf ("\033[M%c%c%c",
1122 (32 + button_number + key_state), 1067 (32 + button_number + key_state),
1123 (32 + x + 1), 1068 (32 + x + 1),
1124 (32 + y + 1)); 1069 (32 + y + 1));
1125#endif 1070#endif
1126} 1071}
1127 1072
1128#ifdef USING_W11LIB 1073#ifdef USING_W11LIB
1129void 1074void
1130rxvt_W11_process_x_event(XEvent *ev) 1075rxvt_W11_process_x_event (XEvent *ev)
1131{ 1076{
1132 rxvt_t *r = rxvt_get_r(); 1077 rxvt_t *r = rxvt_get_r ();
1133 1078
1134 process_x_event (ev); 1079 x_cb (*ev);
1135} 1080}
1136#endif 1081#endif
1137 1082
1138/*{{{ process an X event */ 1083/*{{{ process an X event */
1139void 1084void
1140rxvt_term::process_x_event (XEvent *ev) 1085rxvt_term::x_cb (XEvent &ev)
1141{ 1086{
1087 SET_R (this);
1088 SET_LOCALE (locale);
1089
1090#if defined(CURSOR_BLINK)
1091 if ((Options & Opt_cursorBlink) && ev.type == KeyPress)
1092 {
1093 if (hidden_cursor)
1094 {
1095 hidden_cursor = 0;
1096 want_refresh = 1;
1097 }
1098
1099 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1100 }
1101#endif
1102
1103#if defined(POINTER_BLANK)
1104 if ((Options & Opt_pointerBlank) && pointerBlankDelay > 0)
1105 {
1106 if (ev.type == MotionNotify
1107 || ev.type == ButtonPress
1108 || ev.type == ButtonRelease)
1109 if (hidden_pointer)
1110 pointer_unblank ();
1111
1112 if (ev.type == KeyPress && hidden_pointer == 0)
1113 pointer_blank ();
1114 }
1115#endif
1116
1117#ifdef USE_XIM
1118 if (XFilterEvent (&ev, None))
1119 return;
1120#endif
1121
1142 Window unused_root, unused_child; 1122 Window unused_root, unused_child;
1143 int unused_root_x, unused_root_y; 1123 int unused_root_x, unused_root_y;
1144 unsigned int unused_mask; 1124 unsigned int unused_mask;
1145 1125
1146#ifdef DEBUG_X 1126#ifdef DEBUG_X
1147 const char *const eventnames[] = 1127 const char *const eventnames[] =
1148 { /* mason - this matches my system */ 1128 { /* mason - this matches my system */
1149 "", 1129 "",
1150 "", 1130 "",
1151 "KeyPress", 1131 "KeyPress",
1152 "KeyRelease", 1132 "KeyRelease",
1153 "ButtonPress", 1133 "ButtonPress",
1154 "ButtonRelease", 1134 "ButtonRelease",
1155 "MotionNotify", 1135 "MotionNotify",
1156 "EnterNotify", 1136 "EnterNotify",
1157 "LeaveNotify", 1137 "LeaveNotify",
1158 "FocusIn", 1138 "FocusIn",
1159 "FocusOut", 1139 "FocusOut",
1160 "KeymapNotify", 1140 "KeymapNotify",
1161 "Expose", 1141 "Expose",
1162 "GraphicsExpose", 1142 "GraphicsExpose",
1163 "NoExpose", 1143 "NoExpose",
1164 "VisibilityNotify", 1144 "VisibilityNotify",
1165 "CreateNotify", 1145 "CreateNotify",
1166 "DestroyNotify", 1146 "DestroyNotify",
1167 "UnmapNotify", 1147 "UnmapNotify",
1168 "MapNotify", 1148 "MapNotify",
1169 "MapRequest", 1149 "MapRequest",
1170 "ReparentNotify", 1150 "ReparentNotify",
1171 "ConfigureNotify", 1151 "ConfigureNotify",
1172 "ConfigureRequest", 1152 "ConfigureRequest",
1173 "GravityNotify", 1153 "GravityNotify",
1174 "ResizeRequest", 1154 "ResizeRequest",
1175 "CirculateNotify", 1155 "CirculateNotify",
1176 "CirculateRequest", 1156 "CirculateRequest",
1177 "PropertyNotify", 1157 "PropertyNotify",
1178 "SelectionClear", 1158 "SelectionClear",
1179 "SelectionRequest", 1159 "SelectionRequest",
1180 "SelectionNotify", 1160 "SelectionNotify",
1181 "ColormapNotify", 1161 "ColormapNotify",
1182 "ClientMessage", 1162 "ClientMessage",
1183 "MappingNotify" 1163 "MappingNotify"
1184 }; 1164 };
1185#endif 1165#endif
1186 1166
1187#ifdef DEBUG_X 1167#ifdef DEBUG_X
1188 struct timeval tp; 1168 struct timeval tp;
1189 struct tm *ltt; 1169 struct tm *ltt;
1190 (void)gettimeofday(&tp, NULL); 1170 (void)gettimeofday (&tp, NULL);
1191 ltt = localtime(&(tp.tv_sec)); 1171 ltt = localtime (& (tp.tv_sec));
1192 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)); 1172 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));
1193#endif 1173#endif
1194 1174
1195 switch (ev->type) { 1175 switch (ev.type)
1176 {
1196 case KeyPress: 1177 case KeyPress:
1197 lookup_key ((XKeyEvent *)ev); 1178 lookup_key (ev.xkey);
1198 break; 1179 break;
1199 1180
1200#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1181#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1201 case KeyRelease: 1182 case KeyRelease:
1202 { 1183 {
1203 if (!(ev->xkey.state & ControlMask)) 1184 if (! (ev.xkey.state & ControlMask))
1204 mouse_slip_wheel_speed = 0;
1205 else {
1206 KeySym ks;
1207
1208 ks = XKeycodeToKeysym(Xdisplay, ev->xkey.keycode, 0);
1209 if (ks == XK_Control_L || ks == XK_Control_R)
1210 mouse_slip_wheel_speed = 0; 1185 mouse_slip_wheel_speed = 0;
1211 } 1186 else
1212 break; 1187 {
1213 } 1188 KeySym ks;
1214#endif
1215 1189
1190 ks = XKeycodeToKeysym (display->display, ev.xkey.keycode, 0);
1191 if (ks == XK_Control_L || ks == XK_Control_R)
1192 mouse_slip_wheel_speed = 0;
1193 }
1194 break;
1195 }
1196#endif
1197
1216 case ButtonPress: 1198 case ButtonPress:
1217 button_press ((XButtonEvent *)ev); 1199 button_press (ev.xbutton);
1218 break; 1200 break;
1219 1201
1220 case ButtonRelease: 1202 case ButtonRelease:
1221 button_release ((XButtonEvent *)ev); 1203 button_release (ev.xbutton);
1222 break; 1204 break;
1223 1205
1224 case ClientMessage: 1206 case ClientMessage:
1225 if (ev->xclient.format == 32 1207 if (ev.xclient.format == 32
1226 && (Atom)ev->xclient.data.l[0] == xa[XA_WMDELETEWINDOW]) 1208 && (Atom)ev.xclient.data.l[0] == xa[XA_WMDELETEWINDOW])
1227 destroy (); 1209 destroy ();
1228#ifdef OFFIX_DND 1210#ifdef OFFIX_DND
1229 /* OffiX Dnd (drag 'n' drop) protocol */ 1211 /* OffiX Dnd (drag 'n' drop) protocol */
1230 else if (ev->xclient.message_type == xa[XA_DNDPROTOCOL] 1212 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1231 && (ev->xclient.data.l[0] == DndFile 1213 && (ev.xclient.data.l[0] == DndFile
1232 || ev->xclient.data.l[0] == DndDir 1214 || ev.xclient.data.l[0] == DndDir
1233 || ev->xclient.data.l[0] == DndLink)) { 1215 || ev.xclient.data.l[0] == DndLink))
1234 /* Get Dnd data */ 1216 {
1217 /* Get Dnd data */
1235 Atom ActualType; 1218 Atom ActualType;
1236 int ActualFormat; 1219 int ActualFormat;
1237 unsigned char *data; 1220 unsigned char *data;
1238 unsigned long Size, RemainingBytes; 1221 unsigned long Size, RemainingBytes;
1239 1222
1240 XGetWindowProperty(Xdisplay, Xroot, 1223 XGetWindowProperty (display->display, display->root,
1241 xa[XA_DNDSELECTION], 1224 xa[XA_DNDSELECTION],
1242 0L, 1000000L, 1225 0L, 1000000L,
1243 False, AnyPropertyType, 1226 False, AnyPropertyType,
1244 &ActualType, &ActualFormat, 1227 &ActualType, &ActualFormat,
1245 &Size, &RemainingBytes, 1228 &Size, &RemainingBytes,
1246 &data); 1229 &data);
1247 XChangeProperty(Xdisplay, Xroot, 1230 XChangeProperty (display->display, display->root,
1248 XA_CUT_BUFFER0, XA_STRING, 1231 XA_CUT_BUFFER0, XA_STRING,
1249 8, PropModeReplace, 1232 8, PropModeReplace,
1250 data, STRLEN(data)); 1233 data, STRLEN (data));
1251 selection_paste (Xroot, XA_CUT_BUFFER0, True); 1234 selection_paste (display->root, XA_CUT_BUFFER0, True);
1252 XSetInputFocus(Xdisplay, Xroot, RevertToNone, CurrentTime); 1235 XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime);
1253 } 1236 }
1254#endif /* OFFIX_DND */ 1237#endif /* OFFIX_DND */
1255 break; 1238 break;
1256 1239
1257 case MappingNotify: 1240 case MappingNotify:
1258 XRefreshKeyboardMapping(&(ev->xmapping)); 1241 XRefreshKeyboardMapping (& (ev.xmapping));
1259 break; 1242 break;
1260 1243
1261 /* 1244 /*
1262 * XXX: this is not the _current_ arrangement 1245 * XXX: this is not the _current_ arrangement
1263 * Here's my conclusion: 1246 * Here's my conclusion:
1264 * If the window is completely unobscured, use bitblt's 1247 * If the window is completely unobscured, use bitblt's
1265 * to scroll. Even then, they're only used when doing partial 1248 * to scroll. Even then, they're only used when doing partial
1266 * screen scrolling. When partially obscured, we have to fill 1249 * screen scrolling. When partially obscured, we have to fill
1267 * in the GraphicsExpose parts, which means that after each refresh, 1250 * in the GraphicsExpose parts, which means that after each refresh,
1268 * we need to wait for the graphics expose or Noexpose events, 1251 * we need to wait for the graphics expose or Noexpose events,
1269 * which ought to make things real slow! 1252 * which ought to make things real slow!
1270 */ 1253 */
1271 case VisibilityNotify: 1254 case VisibilityNotify:
1272 switch (ev->xvisibility.state) 1255 switch (ev.xvisibility.state)
1273 { 1256 {
1274 case VisibilityUnobscured: 1257 case VisibilityUnobscured:
1275 refresh_type = FAST_REFRESH; 1258 refresh_type = FAST_REFRESH;
1276 break; 1259 break;
1277 case VisibilityPartiallyObscured: 1260 case VisibilityPartiallyObscured:
… …
1279 break; 1262 break;
1280 default: 1263 default:
1281 refresh_type = NO_REFRESH; 1264 refresh_type = NO_REFRESH;
1282 break; 1265 break;
1283 } 1266 }
1284 break; 1267 break;
1285 1268
1286 case FocusIn: 1269 case FocusIn:
1287 if (!TermWin.focus) { 1270 if (!TermWin.focus)
1271 {
1288 TermWin.focus = 1; 1272 TermWin.focus = 1;
1289 want_refresh = 1; 1273 want_refresh = 1;
1290#ifdef USE_XIM 1274#ifdef USE_XIM
1291 if (Input_Context != NULL) 1275 if (Input_Context != NULL)
1292 XSetICFocus(Input_Context); 1276 XSetICFocus (Input_Context);
1293#endif 1277#endif
1294#ifdef CURSOR_BLINK 1278#ifdef CURSOR_BLINK
1295 if (Options & Opt_cursorBlink) 1279 if (Options & Opt_cursorBlink)
1296 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1280 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1297#endif 1281#endif
1298 }
1299 break;
1300 1282
1283 }
1284 break;
1285
1301 case FocusOut: 1286 case FocusOut:
1302 if (TermWin.focus) { 1287 if (TermWin.focus)
1288 {
1303 TermWin.focus = 0; 1289 TermWin.focus = 0;
1304 want_refresh = 1; 1290 want_refresh = 1;
1305#ifdef USE_XIM 1291#ifdef USE_XIM
1306 if (Input_Context != NULL) 1292 if (Input_Context != NULL)
1307 XUnsetICFocus(Input_Context); 1293 XUnsetICFocus (Input_Context);
1308#endif 1294#endif
1309#ifdef CURSOR_BLINK 1295#ifdef CURSOR_BLINK
1310 if (Options & Opt_cursorBlink) 1296 if (Options & Opt_cursorBlink)
1311 cursor_blink_ev.stop (); 1297 cursor_blink_ev.stop ();
1312 hidden_cursor = 0; 1298 hidden_cursor = 0;
1313#endif 1299#endif
1314 }
1315 break;
1316 1300
1301 }
1302 break;
1303
1317 case ConfigureNotify: 1304 case ConfigureNotify:
1318 if (ev->xconfigure.window == TermWin.parent[0]) { 1305 if (ev.xconfigure.window == TermWin.parent[0])
1319 int height, width; 1306 {
1307 int height, width;
1320 1308
1309 do
1321 do { /* Wrap lots of configures into one */ 1310 { /* Wrap lots of configures into one */
1322 width = ev->xconfigure.width; 1311 width = ev.xconfigure.width;
1323 height = ev->xconfigure.height; 1312 height = ev.xconfigure.height;
1324 D_SIZE((stderr, "Size: ConfigureNotify: %4d x %4d", width, height)); 1313 D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height));
1325 } while (XCheckTypedWindowEvent(Xdisplay, ev->xconfigure.window, 1314 }
1326 ConfigureNotify, ev)); 1315 while (XCheckTypedWindowEvent (display->display, ev.xconfigure.window, ConfigureNotify, &ev));
1316
1327 if (szHint.width != width || szHint.height != height) { 1317 if (szHint.width != width || szHint.height != height)
1318 {
1328 D_SIZE((stderr, "Size: Resizing from: %4d x %4d", szHint.width, szHint.height)); 1319 D_SIZE ((stderr, "Size: Resizing from: %4d x %4d", szHint.width, szHint.height));
1329 resize_all_windows (width, height, 1); 1320 resize_all_windows (width, height, 1);
1330 } 1321 }
1331#ifdef DEBUG_SIZE 1322#ifdef DEBUG_SIZE
1332 else { 1323 else
1324 {
1333 D_SIZE((stderr, "Size: Not resizing")); 1325 D_SIZE ((stderr, "Size: Not resizing"));
1334 } 1326 }
1335#endif 1327#endif
1336#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1328#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1337 if (Options & Opt_transparent) { 1329 if (Options & Opt_transparent)
1338 check_our_parents (); 1330 {
1339 if (am_transparent) 1331 check_our_parents ();
1332 if (am_transparent)
1340 want_full_refresh = 1; 1333 want_full_refresh = 1;
1341 } 1334 }
1342#endif 1335#endif
1343 }
1344 break;
1345 1336
1337 }
1338 break;
1339
1346 case SelectionClear: 1340 case SelectionClear:
1347 selection_clear (); 1341 display->set_selection_owner (0);
1348 break; 1342 break;
1349 1343
1350 case SelectionNotify: 1344 case SelectionNotify:
1351 if (selection_wait == Sel_normal) 1345 if (selection_wait == Sel_normal)
1352 selection_paste (ev->xselection.requestor, 1346 selection_paste (ev.xselection.requestor,
1353 ev->xselection.property, True); 1347 ev.xselection.property, True);
1354 break; 1348 break;
1355 1349
1356 case SelectionRequest: 1350 case SelectionRequest:
1357 selection_send (&(ev->xselectionrequest)); 1351 selection_send (ev.xselectionrequest);
1358 break; 1352 break;
1359 1353
1360 case UnmapNotify: 1354 case UnmapNotify:
1361 TermWin.mapped = 0; 1355 TermWin.mapped = 0;
1362#ifdef TEXT_BLINK 1356#ifdef TEXT_BLINK
1363 text_blink_ev.stop (); 1357 text_blink_ev.stop ();
1364#endif 1358#endif
1365 break; 1359 break;
1366 1360
1367 case MapNotify: 1361 case MapNotify:
1368 TermWin.mapped = 1; 1362 TermWin.mapped = 1;
1369#ifdef TEXT_BLINK 1363#ifdef TEXT_BLINK
1370 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 1364 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1371#endif 1365#endif
1372 break;
1373
1374 case PropertyNotify:
1375 if (ev->xproperty.atom == xa[XA_VT_SELECTION]) {
1376 if (ev->xproperty.state == PropertyNewValue)
1377 selection_property (ev->xproperty.window,
1378 ev->xproperty.atom);
1379 break; 1366 break;
1380 } 1367
1381#ifdef TRANSPARENT 1368#ifdef TRANSPARENT
1382 /*
1383 * if user used some Esetroot compatible prog to set the root bg,
1384 * use the property to determine the pixmap. We use it later on.
1385 */
1386 if (xa[XA_XROOTPMAPID] == 0)
1387 xa[XA_XROOTPMAPID] = XInternAtom(Xdisplay,
1388 "_XROOTPMAP_ID", False);
1389 if (ev->xproperty.atom != xa[XA_XROOTPMAPID])
1390 break;
1391 /* FALLTHROUGH */
1392 case ReparentNotify: 1369 case ReparentNotify:
1393 if ((Options & Opt_transparent) && check_our_parents ()) { 1370 rootwin_cb (ev);
1394 if (am_transparent) 1371 break;
1395 want_full_refresh = 1;
1396 }
1397#endif /* TRANSPARENT */ 1372#endif /* TRANSPARENT */
1398 break;
1399 1373
1400 case GraphicsExpose: 1374 case GraphicsExpose:
1401 case Expose: 1375 case Expose:
1402 if (ev->xany.window == TermWin.vt) { 1376 if (ev.xany.window == TermWin.vt)
1377 {
1403#ifdef NO_SLOW_LINK_SUPPORT 1378#ifdef NO_SLOW_LINK_SUPPORT
1404 scr_expose (ev->xexpose.x, ev->xexpose.y, 1379 scr_expose (ev.xexpose.x, ev.xexpose.y,
1405 ev->xexpose.width, ev->xexpose.height, False); 1380 ev.xexpose.width, ev.xexpose.height, False);
1406#else 1381#else
1407 // don't understand this, so commented it out 1382 // don't understand this, so commented it out
1408 scr_expose (ev->xexpose.x, ev->xexpose.y, 1383 scr_expose (ev.xexpose.x, ev.xexpose.y,
1409 ev->xexpose.width, ev->xexpose.height, False); 1384 ev.xexpose.width, ev.xexpose.height, False);
1410 //scr_expose (ev->xexpose.x, 0, 1385 //scr_expose (ev.xexpose.x, 0,
1411 // ev->xexpose.width, TermWin.height, False); 1386 // ev.xexpose.width, TermWin.height, False);
1412#endif 1387#endif
1413 want_refresh = 1; 1388 want_refresh = 1;
1414 } else { 1389 }
1415 XEvent unused_xevent; 1390 else
1391 {
1392 XEvent unused_event;
1416 1393
1417 while (XCheckTypedWindowEvent(Xdisplay, ev->xany.window, 1394 while (XCheckTypedWindowEvent (display->display, ev.xany.window,
1418 Expose, 1395 Expose,
1419 &unused_xevent)) ; 1396 &unused_event)) ;
1420 while (XCheckTypedWindowEvent(Xdisplay, ev->xany.window, 1397 while (XCheckTypedWindowEvent (display->display, ev.xany.window,
1421 GraphicsExpose, 1398 GraphicsExpose,
1422 &unused_xevent)) ; 1399 &unused_event)) ;
1423 if (isScrollbarWindow(ev->xany.window)) { 1400 if (isScrollbarWindow (ev.xany.window))
1424 scrollBar.setIdle(); 1401 {
1425 scrollbar_show (0); 1402 scrollBar.setIdle ();
1426 } 1403 scrollbar_show (0);
1404 }
1427#ifdef MENUBAR 1405#ifdef MENUBAR
1428 if (menubar_visible () && isMenuBarWindow(ev->xany.window)) 1406 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1429 menubar_expose (); 1407 menubar_expose ();
1430#endif 1408#endif
1431#ifdef RXVT_GRAPHICS 1409 }
1432 Gr_expose (ev->xany.window); 1410 break;
1433#endif
1434 }
1435 break;
1436 1411
1437 case MotionNotify: 1412 case MotionNotify:
1438#ifdef POINTER_BLANK 1413#ifdef POINTER_BLANK
1439 if (hidden_pointer) 1414 if (hidden_pointer)
1440 pointer_unblank (); 1415 pointer_unblank ();
1441#endif 1416#endif
1442#if MENUBAR 1417#if MENUBAR
1443 if (isMenuBarWindow(ev->xany.window)) { 1418 if (isMenuBarWindow (ev.xany.window))
1419 {
1444 menubar_control (&(ev->xbutton)); 1420 menubar_control (& (ev.xbutton));
1445 break; 1421 break;
1446 } 1422 }
1447#endif 1423#endif
1448 if ((PrivateModes & PrivMode_mouse_report) && !(bypass_keystate)) 1424 if ((PrivateModes & PrivMode_mouse_report) && ! (bypass_keystate))
1449 break; 1425 break;
1450 1426
1451 if (ev->xany.window == TermWin.vt) { 1427 if (ev.xany.window == TermWin.vt)
1428 {
1452 if ((ev->xbutton.state & (Button1Mask | Button3Mask))) { 1429 if ((ev.xbutton.state & (Button1Mask | Button3Mask)))
1453 while (XCheckTypedWindowEvent(Xdisplay, TermWin.vt, 1430 {
1454 MotionNotify, ev)) ; 1431 while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev))
1455 XQueryPointer(Xdisplay, TermWin.vt, 1432 ;
1456 &unused_root, &unused_child, 1433
1457 &unused_root_x, &unused_root_y, 1434 XQueryPointer (display->display, TermWin.vt,
1458 &(ev->xbutton.x), &(ev->xbutton.y), 1435 &unused_root, &unused_child,
1459 &unused_mask); 1436 &unused_root_x, &unused_root_y,
1437 & (ev.xbutton.x), & (ev.xbutton.y),
1438 &unused_mask);
1460#ifdef MOUSE_THRESHOLD 1439#ifdef MOUSE_THRESHOLD
1461 /* deal with a `jumpy' mouse */ 1440 /* deal with a `jumpy' mouse */
1462 if ((ev->xmotion.time - MEvent.time) > MOUSE_THRESHOLD) { 1441 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD)
1442 {
1463#endif 1443#endif
1464 selection_extend ((ev->xbutton.x), (ev->xbutton.y), 1444 selection_extend ((ev.xbutton.x), (ev.xbutton.y),
1465 (ev->xbutton.state & Button3Mask) ? 2 : 0); 1445 (ev.xbutton.state & Button3Mask) ? 2 : 0);
1466#ifdef SELECTION_SCROLLING 1446#ifdef SELECTION_SCROLLING
1467 if (ev->xbutton.y < TermWin.int_bwidth 1447 if (ev.xbutton.y < TermWin.int_bwidth
1468 || Pixel2Row(ev->xbutton.y) > (TermWin.nrow-1)) { 1448 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1))
1469 int dist;
1470
1471 pending_scroll_selection=1;
1472
1473 /* don't clobber the current delay if we are
1474 * already in the middle of scrolling.
1475 */
1476 if (scroll_selection_delay<=0)
1477 scroll_selection_delay=SCROLLBAR_CONTINUOUS_DELAY;
1478
1479 /* save the event params so we can highlight
1480 * the selection in the pending-scroll loop
1481 */
1482 selection_save_x=ev->xbutton.x;
1483 selection_save_y=ev->xbutton.y;
1484 selection_save_state=
1485 (ev->xbutton.state & Button3Mask) ? 2 : 0;
1486
1487 /* calc number of lines to scroll */
1488 if (ev->xbutton.y<TermWin.int_bwidth) {
1489 scroll_selection_dir = UP;
1490 dist = TermWin.int_bwidth - ev->xbutton.y;
1491 }
1492 else {
1493 scroll_selection_dir = DN;
1494 dist = ev->xbutton.y -
1495 (TermWin.int_bwidth + TermWin.height);
1496 }
1497 scroll_selection_lines=(Pixel2Height(dist)/
1498 SELECTION_SCROLL_LINE_SPEEDUP)+1;
1499 MIN_IT(scroll_selection_lines,
1500 SELECTION_SCROLL_MAX_LINES);
1501 }
1502 else {
1503 /* we are within the text window, so we
1504 * shouldn't be scrolling
1505 */
1506 pending_scroll_selection = 0;
1507 }
1508#endif
1509#ifdef MOUSE_THRESHOLD
1510 }
1511#endif
1512 }
1513 } else if (isScrollbarWindow(ev->xany.window) && scrollbar_isMotion()) {
1514 while (XCheckTypedWindowEvent(Xdisplay, scrollBar.win,
1515 MotionNotify, ev)) ;
1516 XQueryPointer(Xdisplay, scrollBar.win,
1517 &unused_root, &unused_child,
1518 &unused_root_x, &unused_root_y,
1519 &(ev->xbutton.x), &(ev->xbutton.y),
1520 &unused_mask);
1521 scr_move_to (scrollbar_position(ev->xbutton.y) - csrO,
1522 scrollbar_size());
1523 scr_refresh (refresh_type);
1524 refresh_limit = 0;
1525 scrollbar_show (1);
1526 }
1527 break;
1528 }
1529}
1530
1531void
1532rxvt_term::button_press (XButtonEvent *ev)
1533{
1534 int reportmode = 0, clickintime;
1535
1536 bypass_keystate = ev->state & (ModMetaMask | ShiftMask);
1537 if (!bypass_keystate)
1538 reportmode = !!(PrivateModes & PrivMode_mouse_report);
1539/*
1540 * VT window processing of button press
1541 */
1542 if (ev->window == TermWin.vt)
1543 {
1544#if RXVT_GRAPHICS
1545 if (ev->subwindow != None)
1546 rxvt_Gr_ButtonPress (ev->x, ev->y);
1547 else
1548#endif
1549 {
1550 clickintime = ev->time - MEvent.time < MULTICLICK_TIME;
1551 if (reportmode)
1552 {
1553 /* mouse report from vt window */
1554 /* save the xbutton state (for ButtonRelease) */
1555 MEvent.state = ev->state;
1556#ifdef MOUSE_REPORT_DOUBLECLICK
1557 if (ev->button == MEvent.button && clickintime)
1558 {
1559 /* same button, within alloted time */
1560 MEvent.clicks++;
1561 if (MEvent.clicks > 1)
1562 { 1449 {
1563 /* only report double clicks */ 1450 int dist;
1564 MEvent.clicks = 2;
1565 mouse_report (ev);
1566 1451
1567 /* don't report the release */ 1452 pending_scroll_selection=1;
1568 MEvent.clicks = 0; 1453
1569 MEvent.button = AnyButton; 1454 /* don't clobber the current delay if we are
1570 } 1455 * already in the middle of scrolling.
1571 }
1572 else
1573 { 1456 */
1574 /* different button, or time expired */ 1457 if (scroll_selection_delay<=0)
1575 MEvent.clicks = 1; 1458 scroll_selection_delay=SCROLLBAR_CONTINUOUS_DELAY;
1576 MEvent.button = ev->button; 1459
1577 mouse_report (ev); 1460 /* save the event params so we can highlight
1578 } 1461 * the selection in the pending-scroll loop
1579#else
1580 MEvent.button = ev->button;
1581 mouse_report (ev);
1582#endif /* MOUSE_REPORT_DOUBLECLICK */
1583 }
1584 else
1585 {
1586 if (ev->button != MEvent.button)
1587 MEvent.clicks = 0;
1588 switch (ev->button)
1589 { 1462 */
1590 case Button1: 1463 selection_save_x=ev.xbutton.x;
1591 /* allow shift+left click to extend selection */ 1464 selection_save_y=ev.xbutton.y;
1592 if (ev->state & ShiftMask && !(PrivateModes & PrivMode_mouse_report)) 1465 selection_save_state=
1466 (ev.xbutton.state & Button3Mask) ? 2 : 0;
1467
1468 /* calc number of lines to scroll */
1469 if (ev.xbutton.y<TermWin.int_bwidth)
1593 { 1470 {
1594 if (MEvent.button == Button1 && clickintime) 1471 scroll_selection_dir = UP;
1595 selection_rotate (ev->x, ev->y); 1472 dist = TermWin.int_bwidth - ev.xbutton.y;
1596 else
1597 selection_extend (ev->x, ev->y, 1);
1598 } 1473 }
1599 else 1474 else
1600 { 1475 {
1601 if (MEvent.button == Button1 && clickintime) 1476 scroll_selection_dir = DN;
1602 MEvent.clicks++; 1477 dist = ev.xbutton.y -
1603 else 1478 (TermWin.int_bwidth + TermWin.height);
1604 MEvent.clicks = 1;
1605
1606 selection_click (MEvent.clicks, ev->x, ev->y);
1607 } 1479 }
1480 scroll_selection_lines= (Pixel2Height (dist)/
1481 SELECTION_SCROLL_LINE_SPEEDUP)+1;
1482 MIN_IT (scroll_selection_lines,
1483 SELECTION_SCROLL_MAX_LINES);
1484 }
1485 else
1486 {
1487 /* we are within the text window, so we
1488 * shouldn't be scrolling
1489 */
1490 pending_scroll_selection = 0;
1491 }
1492#endif
1493#ifdef MOUSE_THRESHOLD
1608 1494
1495 }
1496#endif
1497
1498 }
1499 }
1500 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1501 {
1502 while (XCheckTypedWindowEvent (display->display, scrollBar.win,
1503 MotionNotify, &ev)) ;
1504 XQueryPointer (display->display, scrollBar.win,
1505 &unused_root, &unused_child,
1506 &unused_root_x, &unused_root_y,
1507 & (ev.xbutton.x), & (ev.xbutton.y),
1508 &unused_mask);
1509 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1510 scrollbar_size ());
1511 scr_refresh (refresh_type);
1512 refresh_limit = 0;
1513 scrollbar_show (1);
1514 }
1515 break;
1516 }
1517}
1518
1519void
1520rxvt_term::rootwin_cb (XEvent &ev)
1521{
1522 SET_R (this);
1523 SET_LOCALE (locale);
1524
1525 switch (ev.type)
1526 {
1527 case PropertyNotify:
1528 if (ev.xproperty.atom == xa[XA_VT_SELECTION])
1529 {
1530 if (ev.xproperty.state == PropertyNewValue)
1531 selection_property (ev.xproperty.window, ev.xproperty.atom);
1532 break;
1533 }
1534#ifdef TRANSPARENT
1535 else
1536 {
1537 /*
1538 * if user used some Esetroot compatible prog to set the root bg,
1539 * use the property to determine the pixmap. We use it later on.
1540 */
1541 if (xa[XA_XROOTPMAPID] == 0)
1542 xa[XA_XROOTPMAPID] = XInternAtom (display->display, "_XROOTPMAP_ID", False);
1543
1544 if (ev.xproperty.atom != xa[XA_XROOTPMAPID])
1545 return;
1546 }
1547
1548 /* FALLTHROUGH */
1549 case ReparentNotify:
1550 if ((Options & Opt_transparent) && check_our_parents ())
1551 if (am_transparent)
1552 want_full_refresh = 1;
1553 break;
1554#endif
1555 }
1556}
1557
1558void
1559rxvt_term::button_press (const XButtonEvent &ev)
1560{
1561 int reportmode = 0, clickintime;
1562
1563 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1564 if (!bypass_keystate)
1565 reportmode = !! (PrivateModes & PrivMode_mouse_report);
1566 /*
1567 * VT window processing of button press
1568 */
1569 if (ev.window == TermWin.vt)
1570 {
1571 clickintime = ev.time - MEvent.time < MULTICLICK_TIME;
1572 if (reportmode)
1573 {
1574 /* mouse report from vt window */
1575 /* save the xbutton state (for ButtonRelease) */
1576 MEvent.state = ev.state;
1577#ifdef MOUSE_REPORT_DOUBLECLICK
1578 if (ev.button == MEvent.button && clickintime)
1579 {
1580 /* same button, within alloted time */
1581 MEvent.clicks++;
1582 if (MEvent.clicks > 1)
1583 {
1584 /* only report double clicks */
1585 MEvent.clicks = 2;
1586 mouse_report (ev);
1587
1588 /* don't report the release */
1589 MEvent.clicks = 0;
1590 MEvent.button = AnyButton;
1591 }
1592 }
1593 else
1594 {
1595 /* different button, or time expired */
1596 MEvent.clicks = 1;
1597 MEvent.button = ev.button;
1598 mouse_report (ev);
1599 }
1600#else
1601 MEvent.button = ev.button;
1602 mouse_report (ev);
1603#endif /* MOUSE_REPORT_DOUBLECLICK */
1604
1605 }
1606 else
1607 {
1608 if (ev.button != MEvent.button)
1609 MEvent.clicks = 0;
1610 switch (ev.button)
1611 {
1612 case Button1:
1613 /* allow shift+left click to extend selection */
1614 if (ev.state & ShiftMask && ! (PrivateModes & PrivMode_mouse_report))
1615 {
1616 if (MEvent.button == Button1 && clickintime)
1617 selection_rotate (ev.x, ev.y);
1618 else
1619 selection_extend (ev.x, ev.y, 1);
1620 }
1621 else
1622 {
1623 if (MEvent.button == Button1 && clickintime)
1624 MEvent.clicks++;
1625 else
1626 MEvent.clicks = 1;
1627
1628 selection_click (MEvent.clicks, ev.x, ev.y);
1629 }
1630
1609 MEvent.button = Button1; 1631 MEvent.button = Button1;
1632 break;
1633
1634 case Button3:
1635 if (MEvent.button == Button3 && clickintime)
1636 selection_rotate (ev.x, ev.y);
1637 else
1638 selection_extend (ev.x, ev.y, 1);
1639 MEvent.button = Button3;
1640 break;
1641 }
1642 }
1643 MEvent.time = ev.time;
1644 return;
1645 }
1646
1647 /*
1648 * Scrollbar window processing of button press
1649 */
1650 if (isScrollbarWindow (ev.window))
1651 {
1652 scrollBar.setIdle ();
1653 /*
1654 * Rxvt-style scrollbar:
1655 * move up if mouse is above slider
1656 * move dn if mouse is below slider
1657 *
1658 * XTerm-style scrollbar:
1659 * Move display proportional to pointer location
1660 * pointer near top -> scroll one line
1661 * pointer near bot -> scroll full page
1662 */
1663#ifndef NO_SCROLLBAR_REPORT
1664 if (reportmode)
1665 {
1666 /*
1667 * Mouse report disabled scrollbar:
1668 * arrow buttons - send up/down
1669 * click on scrollbar - send pageup/down
1670 */
1671 if ((scrollBar.style == R_SB_NEXT
1672 && scrollbarnext_upButton (ev.y))
1673 || (scrollBar.style == R_SB_RXVT
1674 && scrollbarrxvt_upButton (ev.y)))
1675 tt_printf ("\033[A");
1676 else if ((scrollBar.style == R_SB_NEXT
1677 && scrollbarnext_dnButton (ev.y))
1678 || (scrollBar.style == R_SB_RXVT
1679 && scrollbarrxvt_dnButton (ev.y)))
1680 tt_printf ("\033[B");
1681 else
1682 switch (ev.button)
1683 {
1684 case Button2:
1685 tt_printf ("\014");
1686 break;
1687 case Button1:
1688 tt_printf ("\033[6~");
1689 break;
1690 case Button3:
1691 tt_printf ("\033[5~");
1692 break;
1693 }
1694 }
1695 else
1696#endif /* NO_SCROLLBAR_REPORT */
1697
1698 {
1699 char upordown = 0;
1700
1701 if (scrollBar.style == R_SB_NEXT)
1702 {
1703 if (scrollbarnext_upButton (ev.y))
1704 upordown = -1; /* up */
1705 else if (scrollbarnext_dnButton (ev.y))
1706 upordown = 1; /* down */
1707 }
1708 else if (scrollBar.style == R_SB_RXVT)
1709 {
1710 if (scrollbarrxvt_upButton (ev.y))
1711 upordown = -1; /* up */
1712 else if (scrollbarrxvt_dnButton (ev.y))
1713 upordown = 1; /* down */
1714 }
1715 if (upordown)
1716 {
1717#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1718 scroll_arrow_delay = SCROLLBAR_INITIAL_DELAY;
1719#endif
1720 if (scr_page (upordown < 0 ? UP : DN, 1))
1721 {
1722 if (upordown < 0)
1723 scrollBar.setUp ();
1724 else
1725 scrollBar.setDn ();
1726 }
1727 }
1728 else
1729 switch (ev.button)
1730 {
1731 case Button2:
1732 switch (scrollbar_align)
1733 {
1734 case R_SB_ALIGN_TOP:
1735 csrO = 0;
1610 break; 1736 break;
1611 1737 case R_SB_ALIGN_CENTRE:
1612 case Button3: 1738 csrO = (scrollBar.bot - scrollBar.top) / 2;
1613 if (MEvent.button == Button3 && clickintime)
1614 selection_rotate (ev->x, ev->y);
1615 else
1616 selection_extend (ev->x, ev->y, 1);
1617 MEvent.button = Button3;
1618 break; 1739 break;
1740 case R_SB_ALIGN_BOTTOM:
1741 csrO = scrollBar.bot - scrollBar.top;
1742 break;
1743 }
1744 if (scrollBar.style == R_SB_XTERM
1745 || scrollbar_above_slider (ev.y)
1746 || scrollbar_below_slider (ev.y))
1747 scr_move_to ( scrollbar_position (ev.y) - csrO,
1748 scrollbar_size ());
1749 scrollBar.setMotion ();
1750 break;
1751
1752 case Button1:
1753 if (scrollbar_align == R_SB_ALIGN_CENTRE)
1754 csrO = ev.y - scrollBar.top;
1755 /* FALLTHROUGH */
1756
1757 case Button3:
1758 if (scrollBar.style != R_SB_XTERM)
1759 {
1760 if (scrollbar_above_slider (ev.y))
1761# ifdef RXVT_SCROLL_FULL
1762 scr_page (UP, TermWin.nrow - 1);
1763# else
1764 scr_page (UP, TermWin.nrow / 4);
1765# endif
1766 else if (scrollbar_below_slider (ev.y))
1767# ifdef RXVT_SCROLL_FULL
1768 scr_page (DN, TermWin.nrow - 1);
1769# else
1770 scr_page (DN, TermWin.nrow / 4);
1771# endif
1772 else
1773 scrollBar.setMotion ();
1774 }
1775 else
1776 {
1777 scr_page ((ev.button == Button1 ? DN : UP),
1778 (TermWin.nrow
1779 * scrollbar_position (ev.y)
1780 / scrollbar_size ()));
1781 }
1782 break;
1783 }
1619 } 1784 }
1620 }
1621 MEvent.time = ev->time;
1622 return; 1785 return;
1623 }
1624 }
1625
1626/*
1627 * Scrollbar window processing of button press
1628 */
1629 if (isScrollbarWindow(ev->window))
1630 {
1631 scrollBar.setIdle ();
1632 /*
1633 * Rxvt-style scrollbar:
1634 * move up if mouse is above slider
1635 * move dn if mouse is below slider
1636 *
1637 * XTerm-style scrollbar:
1638 * Move display proportional to pointer location
1639 * pointer near top -> scroll one line
1640 * pointer near bot -> scroll full page
1641 */
1642#ifndef NO_SCROLLBAR_REPORT
1643 if (reportmode) {
1644 /*
1645 * Mouse report disabled scrollbar:
1646 * arrow buttons - send up/down
1647 * click on scrollbar - send pageup/down
1648 */
1649 if ((scrollBar.style == R_SB_NEXT
1650 && scrollbarnext_upButton(ev->y))
1651 || (scrollBar.style == R_SB_RXVT
1652 && scrollbarrxvt_upButton(ev->y)))
1653 tt_printf("\033[A");
1654 else if ((scrollBar.style == R_SB_NEXT
1655 && scrollbarnext_dnButton(ev->y))
1656 || (scrollBar.style == R_SB_RXVT
1657 && scrollbarrxvt_dnButton(ev->y)))
1658 tt_printf("\033[B");
1659 else
1660 switch (ev->button) {
1661 case Button2:
1662 tt_printf("\014");
1663 break;
1664 case Button1:
1665 tt_printf("\033[6~");
1666 break;
1667 case Button3:
1668 tt_printf("\033[5~");
1669 break;
1670 }
1671 }
1672 else
1673#endif /* NO_SCROLLBAR_REPORT */
1674 {
1675 char upordown = 0;
1676
1677 if (scrollBar.style == R_SB_NEXT) {
1678 if (scrollbarnext_upButton(ev->y))
1679 upordown = -1; /* up */
1680 else if (scrollbarnext_dnButton(ev->y))
1681 upordown = 1; /* down */
1682 } else if (scrollBar.style == R_SB_RXVT) {
1683 if (scrollbarrxvt_upButton(ev->y))
1684 upordown = -1; /* up */
1685 else if (scrollbarrxvt_dnButton(ev->y))
1686 upordown = 1; /* down */
1687 } 1786 }
1688 if (upordown) { 1787#if MENUBAR
1788 /*
1789 * Menubar window processing of button press
1790 */
1791 if (isMenuBarWindow (ev.window))
1792 menubar_control (ev);
1793#endif
1794}
1795
1796void
1797rxvt_term::button_release (const XButtonEvent &ev)
1798{
1799 int reportmode = 0;
1800
1801 csrO = 0; /* reset csr Offset */
1802 if (!bypass_keystate)
1803 reportmode = !! (PrivateModes & PrivMode_mouse_report);
1804
1805 if (scrollbar_isUpDn ())
1806 {
1807 scrollBar.setIdle ();
1808 scrollbar_show (0);
1689#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1809#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1690 scroll_arrow_delay = SCROLLBAR_INITIAL_DELAY; 1810 refresh_type &= ~SMOOTH_REFRESH;
1691#endif
1692 if (scr_page (upordown < 0 ? UP : DN, 1)) {
1693 if (upordown < 0)
1694 scrollBar.setUp ();
1695 else
1696 scrollBar.setDn ();
1697 }
1698 } else
1699 switch (ev->button) {
1700 case Button2:
1701 switch (scrollbar_align) {
1702 case R_SB_ALIGN_TOP:
1703 csrO = 0;
1704 break;
1705 case R_SB_ALIGN_CENTRE:
1706 csrO = (scrollBar.bot - scrollBar.top) / 2;
1707 break;
1708 case R_SB_ALIGN_BOTTOM:
1709 csrO = scrollBar.bot - scrollBar.top;
1710 break;
1711 }
1712 if (scrollBar.style == R_SB_XTERM
1713 || scrollbar_above_slider(ev->y)
1714 || scrollbar_below_slider(ev->y))
1715 scr_move_to ( scrollbar_position(ev->y) - csrO,
1716 scrollbar_size());
1717 scrollBar.setMotion ();
1718 break;
1719
1720 case Button1:
1721 if (scrollbar_align == R_SB_ALIGN_CENTRE)
1722 csrO = ev->y - scrollBar.top;
1723 /* FALLTHROUGH */
1724
1725 case Button3:
1726 if (scrollBar.style != R_SB_XTERM) {
1727 if (scrollbar_above_slider(ev->y))
1728# ifdef RXVT_SCROLL_FULL
1729 scr_page (UP, TermWin.nrow - 1);
1730# else
1731 scr_page (UP, TermWin.nrow / 4);
1732# endif 1811#endif
1733 else if (scrollbar_below_slider(ev->y))
1734# ifdef RXVT_SCROLL_FULL
1735 scr_page (DN, TermWin.nrow - 1);
1736# else
1737 scr_page (DN, TermWin.nrow / 4);
1738# endif
1739 else
1740 scrollBar.setMotion ();
1741 } else {
1742 scr_page ((ev->button == Button1 ? DN : UP),
1743 (TermWin.nrow
1744 * scrollbar_position(ev->y)
1745 / scrollbar_size()));
1746 }
1747 break;
1748 }
1749 }
1750 return;
1751 }
1752#if MENUBAR
1753 /*
1754 * Menubar window processing of button press
1755 */
1756 if (isMenuBarWindow(ev->window))
1757 menubar_control (ev);
1758#endif
1759}
1760 1812
1761void
1762rxvt_term::button_release (XButtonEvent *ev)
1763{
1764 int reportmode = 0;
1765
1766 csrO = 0; /* reset csr Offset */
1767 if (!bypass_keystate)
1768 reportmode = !!(PrivateModes & PrivMode_mouse_report);
1769
1770 if (scrollbar_isUpDn()) {
1771 scrollBar.setIdle ();
1772 scrollbar_show (0);
1773#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1774 refresh_type &= ~SMOOTH_REFRESH;
1775#endif
1776 } 1813 }
1777#ifdef SELECTION_SCROLLING 1814#ifdef SELECTION_SCROLLING
1778 pending_scroll_selection=0; 1815 pending_scroll_selection=0;
1779#endif 1816#endif
1780 if (ev->window == TermWin.vt) 1817 if (ev.window == TermWin.vt)
1781 { 1818 {
1782#ifdef RXVT_GRAPHICS
1783 if (ev->subwindow != None)
1784 rxvt_Gr_ButtonRelease(ev->x, ev->y);
1785 else
1786#endif
1787 {
1788 if (reportmode) 1819 if (reportmode)
1789 { 1820 {
1790 /* mouse report from vt window */ 1821 /* mouse report from vt window */
1791 /* don't report release of wheel "buttons" */ 1822 /* don't report release of wheel "buttons" */
1792 if (ev->button >= 4) 1823 if (ev.button >= 4)
1793 return; 1824 return;
1794#ifdef MOUSE_REPORT_DOUBLECLICK 1825#ifdef MOUSE_REPORT_DOUBLECLICK
1795 /* only report the release of 'slow' single clicks */ 1826 /* only report the release of 'slow' single clicks */
1796 if (MEvent.button != AnyButton 1827 if (MEvent.button != AnyButton
1797 && (ev->button != MEvent.button 1828 && (ev.button != MEvent.button
1798 || (ev->time - MEvent.time 1829 || (ev.time - MEvent.time
1799 > MULTICLICK_TIME / 2))) 1830 > MULTICLICK_TIME / 2)))
1800 { 1831 {
1801 MEvent.clicks = 0; 1832 MEvent.clicks = 0;
1802 MEvent.button = AnyButton; 1833 MEvent.button = AnyButton;
1803 mouse_report (ev); 1834 mouse_report (ev);
1804 } 1835 }
1805#else /* MOUSE_REPORT_DOUBLECLICK */ 1836#else /* MOUSE_REPORT_DOUBLECLICK */
1806 MEvent.button = AnyButton; 1837 MEvent.button = AnyButton;
1807 mouse_report (ev); 1838 mouse_report (ev);
1808#endif /* MOUSE_REPORT_DOUBLECLICK */ 1839#endif /* MOUSE_REPORT_DOUBLECLICK */
1809 return; 1840 return;
1810 } 1841 }
1811 /* 1842 /*
1812 * dumb hack to compensate for the failure of click-and-drag 1843 * dumb hack to compensate for the failure of click-and-drag
1813 * when overriding mouse reporting 1844 * when overriding mouse reporting
1814 */ 1845 */
1815 if (PrivateModes & PrivMode_mouse_report 1846 if (PrivateModes & PrivMode_mouse_report
1816 && bypass_keystate 1847 && bypass_keystate
1817 && ev->button == Button1 && MEvent.clicks <= 1) 1848 && ev.button == Button1 && MEvent.clicks <= 1)
1818 selection_extend (ev->x, ev->y, 0); 1849 selection_extend (ev.x, ev.y, 0);
1819 1850
1820 switch (ev->button) { 1851 switch (ev.button)
1852 {
1821 case Button1: 1853 case Button1:
1822 case Button3: 1854 case Button3:
1823 selection_make (ev->time); 1855 selection_make (ev.time);
1824 break; 1856 break;
1825 case Button2: 1857 case Button2:
1826 selection_request (ev->time, ev->x, ev->y); 1858 selection_request (ev.time, ev.x, ev.y);
1827 break; 1859 break;
1828#ifdef MOUSE_WHEEL 1860#ifdef MOUSE_WHEEL
1829 case Button4: 1861 case Button4:
1830 case Button5: 1862 case Button5:
1831 { 1863 {
1832 int i; 1864 int i;
1833 page_dirn v; 1865 page_dirn v;
1834 1866
1835 v = (ev->button == Button4) ? UP : DN; 1867 v = (ev.button == Button4) ? UP : DN;
1836 if (ev->state & ShiftMask) 1868 if (ev.state & ShiftMask)
1837 i = 1; 1869 i = 1;
1838 else if ((Options & Opt_mouseWheelScrollPage)) 1870 else if ((Options & Opt_mouseWheelScrollPage))
1839 i = TermWin.nrow - 1; 1871 i = TermWin.nrow - 1;
1840 else 1872 else
1841 i = 5; 1873 i = 5;
1842# ifdef MOUSE_SLIP_WHEELING 1874# ifdef MOUSE_SLIP_WHEELING
1843 if (ev->state & ControlMask) 1875 if (ev.state & ControlMask)
1844 { 1876 {
1845 mouse_slip_wheel_speed += (v ? -1 : 1); 1877 mouse_slip_wheel_speed += (v ? -1 : 1);
1846 mouse_slip_wheel_delay = SCROLLBAR_CONTINUOUS_DELAY; 1878 mouse_slip_wheel_delay = SCROLLBAR_CONTINUOUS_DELAY;
1847 } 1879 }
1848# endif 1880# endif
1849# ifdef JUMP_MOUSE_WHEEL 1881# ifdef JUMP_MOUSE_WHEEL
1850 scr_page (v, i); 1882 scr_page (v, i);
1851 scr_refresh (SMOOTH_REFRESH); 1883 scr_refresh (SMOOTH_REFRESH);
1852 scrollbar_show (1); 1884 scrollbar_show (1);
1853# else 1885# else
1854 while (i--) 1886 while (i--)
1855 { 1887 {
1856 scr_page (v, 1); 1888 scr_page (v, 1);
1857 scr_refresh (SMOOTH_REFRESH); 1889 scr_refresh (SMOOTH_REFRESH);
1858 scrollbar_show (1); 1890 scrollbar_show (1);
1859 } 1891 }
1860# endif 1892# endif
1861 } 1893
1862 break; 1894 }
1895 break;
1863#endif 1896#endif
1864 } 1897
1865 }
1866 } 1898 }
1899 }
1867#ifdef MENUBAR 1900#ifdef MENUBAR
1868 else if (isMenuBarWindow(ev->window)) 1901 else if (isMenuBarWindow (ev.window))
1869 menubar_control (ev); 1902 menubar_control (ev);
1870#endif 1903#endif
1871} 1904}
1872 1905
1873 1906
1874#ifdef TRANSPARENT 1907#ifdef TRANSPARENT
… …
1877 * Do transparency updates if required 1910 * Do transparency updates if required
1878 */ 1911 */
1879int 1912int
1880rxvt_term::check_our_parents () 1913rxvt_term::check_our_parents ()
1881{ 1914{
1882 int i, pchanged, aformat, have_pixmap, rootdepth; 1915 int i, pchanged, aformat, have_pixmap, rootdepth;
1883 unsigned long nitems, bytes_after; 1916 unsigned long nitems, bytes_after;
1884 Atom atype; 1917 Atom atype;
1885 unsigned char *prop = NULL; 1918 unsigned char *prop = NULL;
1886 Window root, oldp, *list; 1919 Window root, oldp, *list;
1887 Pixmap rootpixmap = None; 1920 Pixmap rootpixmap = None;
1888 XWindowAttributes wattr, wrootattr; 1921 XWindowAttributes wattr, wrootattr;
1889 1922
1890 pchanged = 0; 1923 pchanged = 0;
1891 1924
1892 if (!(Options & Opt_transparent)) 1925 if (! (Options & Opt_transparent))
1893 return pchanged; /* Don't try any more */ 1926 return pchanged; /* Don't try any more */
1894 1927
1895 XGetWindowAttributes(Xdisplay, Xroot, &wrootattr); 1928 XGetWindowAttributes (display->display, display->root, &wrootattr);
1896 rootdepth = wrootattr.depth; 1929 rootdepth = wrootattr.depth;
1897 1930
1898 XGetWindowAttributes(Xdisplay, TermWin.parent[0], &wattr); 1931 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);
1899 if (rootdepth != wattr.depth) { 1932 if (rootdepth != wattr.depth)
1933 {
1900 if (am_transparent) { 1934 if (am_transparent)
1935 {
1901 pchanged = 1; 1936 pchanged = 1;
1902 XSetWindowBackground(Xdisplay, TermWin.vt, 1937 XSetWindowBackground (display->display, TermWin.vt,
1903 PixColors[Color_bg]); 1938 PixColors[Color_bg]);
1904 am_transparent = am_pixmap_trans = 0; 1939 am_transparent = am_pixmap_trans = 0;
1905 } 1940 }
1906 return pchanged; /* Don't try any more */ 1941 return pchanged; /* Don't try any more */
1907 } 1942 }
1908 1943
1909/* Get all X ops out of the queue so that our information is up-to-date. */ 1944 /* Get all X ops out of the queue so that our information is up-to-date. */
1910 XSync(Xdisplay, False); 1945 XSync (display->display, False);
1911 1946
1912/* 1947 /*
1913 * Make the frame window set by the window manager have 1948 * Make the frame window set by the window manager have
1914 * the root background. Some window managers put multiple nested frame 1949 * the root background. Some window managers put multiple nested frame
1915 * windows for each client, so we have to take care about that. 1950 * windows for each client, so we have to take care about that.
1916 */ 1951 */
1917 i = (xa[XA_XROOTPMAPID] != 0 1952 i = (xa[XA_XROOTPMAPID] != 0
1918 && (XGetWindowProperty(Xdisplay, Xroot, xa[XA_XROOTPMAPID], 1953 && (XGetWindowProperty (display->display, display->root, xa[XA_XROOTPMAPID],
1919 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 1954 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1920 &nitems, &bytes_after, &prop) == Success)); 1955 &nitems, &bytes_after, &prop) == Success));
1921 if (!i || prop == NULL) 1956 if (!i || prop == NULL)
1922 have_pixmap = 0; 1957 have_pixmap = 0;
1923 else { 1958 else
1959 {
1924 have_pixmap = 1; 1960 have_pixmap = 1;
1925 rootpixmap = *((Pixmap *)prop); 1961 rootpixmap = * ((Pixmap *)prop);
1926 XFree(prop); 1962 XFree (prop);
1927 } 1963 }
1928 if (have_pixmap) { 1964 if (have_pixmap)
1929/* 1965 {
1966 /*
1930 * Copy Xroot pixmap transparency 1967 * Copy display->root pixmap transparency
1931 */ 1968 */
1932 int sx, sy, nx, ny; 1969 int sx, sy, nx, ny;
1933 unsigned int nw, nh; 1970 unsigned int nw, nh;
1934 Window cr; 1971 Window cr;
1935 XImage *image; 1972 XImage *image;
1936 GC gc; 1973 GC gc;
1937 XGCValues gcvalue; 1974 XGCValues gcvalue;
1938 1975
1939 XTranslateCoordinates(Xdisplay, TermWin.parent[0], Xroot, 1976 XTranslateCoordinates (display->display, TermWin.parent[0], display->root,
1940 0, 0, &sx, &sy, &cr); 1977 0, 0, &sx, &sy, &cr);
1941 nw = (unsigned int)szHint.width; 1978 nw = (unsigned int)szHint.width;
1942 nh = (unsigned int)szHint.height; 1979 nh = (unsigned int)szHint.height;
1943 nx = ny = 0; 1980 nx = ny = 0;
1944 if (sx < 0) { 1981 if (sx < 0)
1982 {
1945 nw += sx; 1983 nw += sx;
1946 nx = -sx; 1984 nx = -sx;
1947 sx = 0; 1985 sx = 0;
1948 } 1986 }
1949 if (sy < 0) { 1987 if (sy < 0)
1988 {
1950 nh += sy; 1989 nh += sy;
1951 ny = -sy; 1990 ny = -sy;
1952 sy = 0; 1991 sy = 0;
1953 } 1992 }
1954 MIN_IT(nw, (unsigned int)(wrootattr.width - sx)); 1993 MIN_IT (nw, (unsigned int) (wrootattr.width - sx));
1955 MIN_IT(nh, (unsigned int)(wrootattr.height - sy)); 1994 MIN_IT (nh, (unsigned int) (wrootattr.height - sy));
1956 allowedxerror = -1; 1995 allowedxerror = -1;
1957 image = XGetImage(Xdisplay, rootpixmap, sx, sy, nw, nh, AllPlanes, 1996 image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes,
1958 ZPixmap); 1997 ZPixmap);
1959 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 1998 /* XXX: handle BadMatch - usually because we're outside the pixmap */
1960 /* XXX: may need a delay here? */ 1999 /* XXX: may need a delay here? */
1961 allowedxerror = 0; 2000 allowedxerror = 0;
1962 if (image == NULL) { 2001 if (image == NULL)
2002 {
1963 if (am_transparent && am_pixmap_trans) { 2003 if (am_transparent && am_pixmap_trans)
1964 pchanged = 1; 2004 {
2005 pchanged = 1;
1965 if (TermWin.pixmap != None) { 2006 if (TermWin.pixmap != None)
2007 {
1966 XFreePixmap(Xdisplay, TermWin.pixmap); 2008 XFreePixmap (display->display, TermWin.pixmap);
1967 TermWin.pixmap = None; 2009 TermWin.pixmap = None;
1968 } 2010 }
1969 } 2011 }
1970 am_pixmap_trans = 0; 2012 am_pixmap_trans = 0;
1971 } else { 2013 }
2014 else
2015 {
1972 if (TermWin.pixmap != None) 2016 if (TermWin.pixmap != None)
1973 XFreePixmap(Xdisplay, TermWin.pixmap); 2017 XFreePixmap (display->display, TermWin.pixmap);
1974 TermWin.pixmap = XCreatePixmap(Xdisplay, TermWin.vt, 2018 TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt,
1975 (unsigned int)szHint.width, 2019 (unsigned int)szHint.width,
1976 (unsigned int)szHint.height, 2020 (unsigned int)szHint.height,
1977 (unsigned int)image->depth); 2021 (unsigned int)image->depth);
1978 gc = XCreateGC(Xdisplay, TermWin.vt, 0UL, &gcvalue); 2022 gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue);
1979 XPutImage(Xdisplay, TermWin.pixmap, gc, image, 0, 0, 2023 XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0,
1980 nx, ny, (unsigned int)image->width, 2024 nx, ny, (unsigned int)image->width,
1981 (unsigned int)image->height); 2025 (unsigned int)image->height);
1982 XFreeGC(Xdisplay, gc); 2026 XFreeGC (display->display, gc);
1983 XDestroyImage(image); 2027 XDestroyImage (image);
1984 XSetWindowBackgroundPixmap(Xdisplay, TermWin.vt, 2028 XSetWindowBackgroundPixmap (display->display, TermWin.vt,
1985 TermWin.pixmap); 2029 TermWin.pixmap);
1986 if (!am_transparent || !am_pixmap_trans) 2030 if (!am_transparent || !am_pixmap_trans)
1987 pchanged = 1; 2031 pchanged = 1;
1988 am_transparent = am_pixmap_trans = 1; 2032 am_transparent = am_pixmap_trans = 1;
1989 } 2033 }
1990 } 2034 }
1991 if (!am_pixmap_trans) { 2035 if (!am_pixmap_trans)
2036 {
1992 unsigned int n; 2037 unsigned int n;
1993/* 2038 /*
1994 * InheritPixmap transparency 2039 * InheritPixmap transparency
1995 */ 2040 */
1996 D_X((stderr, "InheritPixmap Seeking to %08lx", Xroot)); 2041 D_X ((stderr, "InheritPixmap Seeking to %08lx", display->root));
1997 for (i = 1; i < (int)(sizeof(TermWin.parent) / sizeof(Window)); 2042 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window));
1998 i++) { 2043 i++)
2044 {
1999 oldp = TermWin.parent[i]; 2045 oldp = TermWin.parent[i];
2000 XQueryTree(Xdisplay, TermWin.parent[i - 1], &root, 2046 XQueryTree (display->display, TermWin.parent[i - 1], &root,
2001 &TermWin.parent[i], &list, &n); 2047 &TermWin.parent[i], &list, &n);
2002 XFree(list); 2048 XFree (list);
2003 D_X((stderr, "InheritPixmap Parent[%d] = %08lx", i, TermWin.parent[i])); 2049 D_X ((stderr, "InheritPixmap Parent[%d] = %08lx", i, TermWin.parent[i]));
2004 if (TermWin.parent[i] == Xroot) { 2050 if (TermWin.parent[i] == display->root)
2005 if (oldp != None) 2051 {
2006 pchanged = 1; 2052 if (oldp != None)
2007 break; 2053 pchanged = 1;
2008 } 2054 break;
2055 }
2009 if (oldp != TermWin.parent[i]) 2056 if (oldp != TermWin.parent[i])
2010 pchanged = 1; 2057 pchanged = 1;
2011 } 2058 }
2012 n = 0; 2059 n = 0;
2013 if (pchanged) { 2060 if (pchanged)
2061 {
2014 for (; n < (unsigned int)i; n++) { 2062 for (; n < (unsigned int)i; n++)
2063 {
2015 XGetWindowAttributes(Xdisplay, TermWin.parent[n], &wattr); 2064 XGetWindowAttributes (display->display, TermWin.parent[n], &wattr);
2016 D_X((stderr, "InheritPixmap Checking Parent[%d]: %s", n, (wattr.depth == rootdepth && wattr.class != InputOnly) ? "OK" : "FAIL")); 2065 D_X ((stderr, "InheritPixmap Checking Parent[%d]: %s", n, (wattr.depth == rootdepth && wattr.class != InputOnly) ? "OK" : "FAIL"));
2017 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) { 2066 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2067 {
2018 n = (int)(sizeof(TermWin.parent) / sizeof(Window)) + 1; 2068 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1;
2019 break; 2069 break;
2020 } 2070 }
2021 } 2071 }
2022 } 2072 }
2023 if (n > (int)(sizeof(TermWin.parent) 2073 if (n > (int) (sizeof (TermWin.parent)
2024 / sizeof(TermWin.parent[0]))) { 2074 / sizeof (TermWin.parent[0])))
2075 {
2025 D_X((stderr, "InheritPixmap Turning off")); 2076 D_X ((stderr, "InheritPixmap Turning off"));
2026 XSetWindowBackground(Xdisplay, TermWin.parent[0], 2077 XSetWindowBackground (display->display, TermWin.parent[0],
2027 PixColors[Color_fg]); 2078 PixColors[Color_fg]);
2028 XSetWindowBackground(Xdisplay, TermWin.vt, 2079 XSetWindowBackground (display->display, TermWin.vt,
2029 PixColors[Color_bg]); 2080 PixColors[Color_bg]);
2030 am_transparent = 0; 2081 am_transparent = 0;
2031 /* XXX: also turn off Opt_transparent? */ 2082 /* XXX: also turn off Opt_transparent? */
2032 } else { 2083 }
2084 else
2085 {
2033 /* wait (an arbitrary period) for the WM to do its thing 2086 /* wait (an arbitrary period) for the WM to do its thing
2034 * needed for fvwm2.2.2 (and before?) */ 2087 * needed for fvwm2.2.2 (and before?) */
2035# ifdef HAVE_NANOSLEEP 2088# ifdef HAVE_NANOSLEEP
2036 struct timespec rqt; 2089 struct timespec rqt;
2037 2090
2038 rqt.tv_sec = 1; 2091 rqt.tv_sec = 1;
2039 rqt.tv_nsec = 0; 2092 rqt.tv_nsec = 0;
2040 nanosleep(&rqt, NULL); 2093 nanosleep (&rqt, NULL);
2041# else 2094# else
2042 sleep(1); 2095 sleep (1);
2043# endif 2096# endif
2044 D_X((stderr, "InheritPixmap Turning on (%d parents)", i - 1)); 2097 D_X ((stderr, "InheritPixmap Turning on (%d parents)", i - 1));
2045 for (n = 0; n < (unsigned int)i; n++) 2098 for (n = 0; n < (unsigned int)i; n++)
2046 XSetWindowBackgroundPixmap(Xdisplay, TermWin.parent[n], 2099 XSetWindowBackgroundPixmap (display->display, TermWin.parent[n],
2047 ParentRelative); 2100 ParentRelative);
2048 XSetWindowBackgroundPixmap(Xdisplay, TermWin.vt, 2101 XSetWindowBackgroundPixmap (display->display, TermWin.vt,
2049 ParentRelative); 2102 ParentRelative);
2050 am_transparent = 1; 2103 am_transparent = 1;
2051 } 2104 }
2052 for (; i < (int)(sizeof(TermWin.parent) / sizeof(Window)); i++) 2105 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)
2053 TermWin.parent[i] = None; 2106 TermWin.parent[i] = None;
2054 } 2107 }
2055 return pchanged; 2108 return pchanged;
2056} 2109}
2057#endif 2110#endif
2058 2111
2059/*}}} */ 2112/*}}} */
2060 2113
… …
2062/*----------------------------------------------------------------------*/ 2115/*----------------------------------------------------------------------*/
2063#ifdef PRINTPIPE 2116#ifdef PRINTPIPE
2064FILE * 2117FILE *
2065rxvt_term::popen_printer () 2118rxvt_term::popen_printer ()
2066{ 2119{
2067 FILE *stream = popen(rs[Rs_print_pipe], "w"); 2120 FILE *stream = popen (rs[Rs_print_pipe], "w");
2068 2121
2069 if (stream == NULL) 2122 if (stream == NULL)
2070 rxvt_print_error("can't open printer pipe"); 2123 rxvt_print_error ("can't open printer pipe");
2071 return stream; 2124 return stream;
2072} 2125}
2073 2126
2074int 2127int
2075rxvt_term::pclose_printer (FILE *stream) 2128rxvt_term::pclose_printer (FILE *stream)
2076{ 2129{
2077 fflush (stream); 2130 fflush (stream);
2078/* pclose() reported not to work on SunOS 4.1.3 */ 2131 /* pclose () reported not to work on SunOS 4.1.3 */
2079# if defined (__sun__) /* TODO: RESOLVE THIS */ 2132# if defined (__sun__) /* TODO: RESOLVE THIS */
2080/* pclose works provided SIGCHLD handler uses waitpid */ 2133 /* pclose works provided SIGCHLD handler uses waitpid */
2081 return pclose (stream); /* return fclose (stream); */ 2134 return pclose (stream); /* return fclose (stream); */
2082# else 2135# else
2083 return pclose (stream); 2136 return pclose (stream);
2084# endif 2137# endif
2085} 2138}
… …
2088 * simulate attached vt100 printer 2141 * simulate attached vt100 printer
2089 */ 2142 */
2090void 2143void
2091rxvt_term::process_print_pipe () 2144rxvt_term::process_print_pipe ()
2092{ 2145{
2093 int done; 2146 int done;
2094 FILE *fd; 2147 FILE *fd;
2095 2148
2096 if ((fd = popen_printer ()) == NULL) 2149 if ((fd = popen_printer ()) == NULL)
2097 return; 2150 return;
2098 2151
2099/* 2152 /*
2100 * Send all input to the printer until either ESC[4i or ESC[?4i 2153 * Send all input to the printer until either ESC[4i or ESC[?4i
2101 * is received. 2154 * is received.
2102 */ 2155 */
2103 for (done = 0; !done;) { 2156 for (done = 0; !done;)
2157 {
2104 unsigned char buf[8]; 2158 unsigned char buf[8];
2105 unsigned char ch; 2159 unsigned char ch;
2106 unsigned int i, len; 2160 unsigned int i, len;
2107 2161
2108 if ((ch = cmd_getc ()) != C0_ESC) { 2162 if ((ch = cmd_getc ()) != C0_ESC)
2163 {
2109 if (putc(ch, fd) == EOF) 2164 if (putc (ch, fd) == EOF)
2110 break; /* done = 1 */ 2165 break; /* done = 1 */
2111 } else { 2166 }
2167 else
2168 {
2112 len = 0; 2169 len = 0;
2113 buf[len++] = ch; 2170 buf[len++] = ch;
2114 2171
2115 if ((buf[len++] = cmd_getc ()) == '[') { 2172 if ((buf[len++] = cmd_getc ()) == '[')
2173 {
2116 if ((ch = cmd_getc ()) == '?') { 2174 if ((ch = cmd_getc ()) == '?')
2117 buf[len++] = '?'; 2175 {
2118 ch = cmd_getc (); 2176 buf[len++] = '?';
2119 } 2177 ch = cmd_getc ();
2178 }
2120 if ((buf[len++] = ch) == '4') { 2179 if ((buf[len++] = ch) == '4')
2180 {
2121 if ((buf[len++] = cmd_getc ()) == 'i') 2181 if ((buf[len++] = cmd_getc ()) == 'i')
2122 break; /* done = 1 */ 2182 break; /* done = 1 */
2123 } 2183 }
2184 }
2185 for (i = 0; i < len; i++)
2186 if (putc (buf[i], fd) == EOF)
2187 {
2188 done = 1;
2189 break;
2190 }
2191 }
2124 } 2192 }
2125 for (i = 0; i < len; i++)
2126 if (putc(buf[i], fd) == EOF) {
2127 done = 1;
2128 break;
2129 }
2130 }
2131 }
2132 pclose_printer (fd); 2193 pclose_printer (fd);
2133} 2194}
2134#endif /* PRINTPIPE */ 2195#endif /* PRINTPIPE */
2135/*}}} */ 2196/*}}} */
2136 2197
2137/* *INDENT-OFF* */ 2198/* *INDENT-OFF* */
2138enum { 2199enum {
2139 C1_40 = 0x40, 2200 C1_40 = 0x40,
2140 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA, 2201 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA,
2141 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3, 2202 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3,
2142 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA, 2203 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA,
2143 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC 2204 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC
2144}; 2205};
2145/* *INDENT-ON* */ 2206/* *INDENT-ON* */
2146 2207
2147/*{{{ process non-printing single characters */ 2208/*{{{ process non-printing single characters */
2148void 2209void
2149rxvt_term::process_nonprinting (unsigned char ch) 2210rxvt_term::process_nonprinting (unsigned char ch)
2150{ 2211{
2151 switch (ch) { 2212 switch (ch)
2213 {
2152 case C0_ENQ: /* terminal Status */ 2214 case C0_ENQ: /* terminal Status */
2153 if (rs[Rs_answerbackstring]) 2215 if (rs[Rs_answerbackstring])
2154 tt_write( 2216 tt_write (
2155 (const unsigned char *)rs[Rs_answerbackstring], 2217 (const unsigned char *)rs[Rs_answerbackstring],
2156 (unsigned int)STRLEN(rs[Rs_answerbackstring])); 2218 (unsigned int)STRLEN (rs[Rs_answerbackstring]));
2157 else 2219 else
2158 tt_write((unsigned char *)VT100_ANS, 2220 tt_write ((unsigned char *)VT100_ANS,
2159 (unsigned int)STRLEN(VT100_ANS)); 2221 (unsigned int)STRLEN (VT100_ANS));
2160 break; 2222 break;
2161 case C0_BEL: /* bell */ 2223 case C0_BEL: /* bell */
2162 scr_bell (); 2224 scr_bell ();
2163 break; 2225 break;
2164 case C0_BS: /* backspace */ 2226 case C0_BS: /* backspace */
2165 scr_backspace (); 2227 scr_backspace ();
2166 break; 2228 break;
2167 case C0_HT: /* tab */ 2229 case C0_HT: /* tab */
2168 scr_tab (1); 2230 scr_tab (1);
2169 break; 2231 break;
2170 case C0_CR: /* carriage return */ 2232 case C0_CR: /* carriage return */
2171 scr_gotorc (0, 0, R_RELATIVE); 2233 scr_gotorc (0, 0, R_RELATIVE);
2172 break; 2234 break;
2173 case C0_VT: /* vertical tab, form feed */ 2235 case C0_VT: /* vertical tab, form feed */
2174 case C0_FF: 2236 case C0_FF:
2175 case C0_LF: /* line feed */ 2237 case C0_LF: /* line feed */
2176 scr_index (UP); 2238 scr_index (UP);
2177 break; 2239 break;
2178 case C0_SO: /* shift out - acs */ 2240 case C0_SO: /* shift out - acs */
2179 scr_charset_choose (1); 2241 scr_charset_choose (1);
2180 break; 2242 break;
2181 case C0_SI: /* shift in - acs */ 2243 case C0_SI: /* shift in - acs */
2182 scr_charset_choose (0); 2244 scr_charset_choose (0);
2183 break; 2245 break;
2184 } 2246 }
2185} 2247}
2186/*}}} */ 2248/*}}} */
2187 2249
2188 2250
2189/*{{{ process VT52 escape sequences */ 2251/*{{{ process VT52 escape sequences */
2190void 2252void
2191rxvt_term::process_escape_vt52 (unsigned char ch) 2253rxvt_term::process_escape_vt52 (unsigned char ch)
2192{ 2254{
2193 int row, col; 2255 int row, col;
2256
2257 switch (ch)
2194 2258 {
2195 switch (ch) {
2196 case 'A': /* cursor up */ 2259 case 'A': /* cursor up */
2197 scr_gotorc (-1, 0, R_RELATIVE | C_RELATIVE); 2260 scr_gotorc (-1, 0, R_RELATIVE | C_RELATIVE);
2198 break; 2261 break;
2199 case 'B': /* cursor down */ 2262 case 'B': /* cursor down */
2200 scr_gotorc (1, 0, R_RELATIVE | C_RELATIVE); 2263 scr_gotorc (1, 0, R_RELATIVE | C_RELATIVE);
2201 break; 2264 break;
2202 case 'C': /* cursor right */ 2265 case 'C': /* cursor right */
2203 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); 2266 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
2204 break; 2267 break;
2205 case 'D': /* cursor left */ 2268 case 'D': /* cursor left */
2206 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE); 2269 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE);
2207 break; 2270 break;
2208 case 'H': /* cursor home */ 2271 case 'H': /* cursor home */
2209 scr_gotorc (0, 0, 0); 2272 scr_gotorc (0, 0, 0);
2210 break; 2273 break;
2211 case 'I': /* cursor up and scroll down if needed */ 2274 case 'I': /* cursor up and scroll down if needed */
2212 scr_index (DN); 2275 scr_index (DN);
2213 break; 2276 break;
2214 case 'J': /* erase to end of screen */ 2277 case 'J': /* erase to end of screen */
2215 scr_erase_screen (0); 2278 scr_erase_screen (0);
2216 break; 2279 break;
2217 case 'K': /* erase to end of line */ 2280 case 'K': /* erase to end of line */
2218 scr_erase_line (0); 2281 scr_erase_line (0);
2219 break; 2282 break;
2220 case 'Y': /* move to specified row and col */ 2283 case 'Y': /* move to specified row and col */
2221 /* full command is 'ESC Y row col' where row and col 2284 /* full command is 'ESC Y row col' where row and col
2222 * are encoded by adding 32 and sending the ascii 2285 * are encoded by adding 32 and sending the ascii
2223 * character. eg. SPACE = 0, '+' = 13, '0' = 18, 2286 * character. eg. SPACE = 0, '+' = 13, '0' = 18,
2224 * etc. */ 2287 * etc. */
2225 row = cmd_getc () - ' '; 2288 row = cmd_getc () - ' ';
2226 col = cmd_getc () - ' '; 2289 col = cmd_getc () - ' ';
2227 scr_gotorc (row, col, 0); 2290 scr_gotorc (row, col, 0);
2228 break; 2291 break;
2229 case 'Z': /* identify the terminal type */ 2292 case 'Z': /* identify the terminal type */
2230 tt_printf("\033/Z"); /* I am a VT100 emulating a VT52 */ 2293 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
2231 break; 2294 break;
2232 case '<': /* turn off VT52 mode */ 2295 case '<': /* turn off VT52 mode */
2233 PrivMode(0, PrivMode_vt52); 2296 PrivMode (0, PrivMode_vt52);
2234 break; 2297 break;
2235 case 'F': /* use special graphics character set */ 2298 case 'F': /* use special graphics character set */
2236 case 'G': /* use regular character set */ 2299 case 'G': /* use regular character set */
2237 /* unimplemented */ 2300 /* unimplemented */
2238 break; 2301 break;
2239 case '=': /* use alternate keypad mode */ 2302 case '=': /* use alternate keypad mode */
2240 case '>': /* use regular keypad mode */ 2303 case '>': /* use regular keypad mode */
2241 /* unimplemented */ 2304 /* unimplemented */
2242 break; 2305 break;
2243 } 2306 }
2244} 2307}
2245/*}}} */ 2308/*}}} */
2246 2309
2247 2310
2248/*{{{ process escape sequences */ 2311/*{{{ process escape sequences */
2249void 2312void
2250rxvt_term::process_escape_seq () 2313rxvt_term::process_escape_seq ()
2251{ 2314{
2252 unsigned char ch = cmd_getc (); 2315 unsigned char ch = cmd_getc ();
2253 2316
2254 if (PrivateModes & PrivMode_vt52) { 2317 if (PrivateModes & PrivMode_vt52)
2255 process_escape_vt52 (ch);
2256 return;
2257 }
2258 2318 {
2319 process_escape_vt52 (ch);
2320 return;
2321 }
2322
2259 switch (ch) { 2323 switch (ch)
2324 {
2260 /* case 1: do_tek_mode (); break; */ 2325 /* case 1: do_tek_mode (); break; */
2261 case '#': 2326 case '#':
2262 if (cmd_getc () == '8') 2327 if (cmd_getc () == '8')
2263 scr_E (); 2328 scr_E ();
2264 break; 2329 break;
2265 case '(': 2330 case '(':
2266 scr_charset_set (0, (unsigned int)cmd_getc ()); 2331 scr_charset_set (0, (unsigned int)cmd_getc ());
2267 break; 2332 break;
2268 case ')': 2333 case ')':
2269 scr_charset_set (1, (unsigned int)cmd_getc ()); 2334 scr_charset_set (1, (unsigned int)cmd_getc ());
2270 break; 2335 break;
2271 case '*': 2336 case '*':
2272 scr_charset_set (2, (unsigned int)cmd_getc ()); 2337 scr_charset_set (2, (unsigned int)cmd_getc ());
2273 break; 2338 break;
2274 case '+': 2339 case '+':
2275 scr_charset_set (3, (unsigned int)cmd_getc ()); 2340 scr_charset_set (3, (unsigned int)cmd_getc ());
2276 break; 2341 break;
2277#ifdef MULTICHAR_SET 2342#ifdef MULTICHAR_SET
2278 case '$': 2343 case '$':
2279 scr_charset_set (-2, (unsigned int)cmd_getc ()); 2344 scr_charset_set (-2, (unsigned int)cmd_getc ());
2280 break; 2345 break;
2281#endif 2346#endif
2282#ifndef NO_FRILLS 2347#ifndef NO_FRILLS
2283 case '6': 2348 case '6':
2284 scr_backindex (); 2349 scr_backindex ();
2285 break; 2350 break;
2286#endif 2351#endif
2287 case '7': 2352 case '7':
2288 scr_cursor (SAVE); 2353 scr_cursor (SAVE);
2289 break; 2354 break;
2290 case '8': 2355 case '8':
2291 scr_cursor (RESTORE); 2356 scr_cursor (RESTORE);
2292 break; 2357 break;
2293#ifndef NO_FRILLS 2358#ifndef NO_FRILLS
2294 case '9': 2359 case '9':
2295 scr_forwardindex (); 2360 scr_forwardindex ();
2296 break; 2361 break;
2297#endif 2362#endif
2298 case '=': 2363 case '=':
2299 case '>': 2364 case '>':
2300 PrivMode((ch == '='), PrivMode_aplKP); 2365 PrivMode ((ch == '='), PrivMode_aplKP);
2301 break; 2366 break;
2302 2367
2303 case C1_40: 2368 case C1_40:
2304 cmd_getc (); 2369 cmd_getc ();
2305 break; 2370 break;
2306 case C1_44: 2371 case C1_44:
2307 scr_index (UP); 2372 scr_index (UP);
2308 break; 2373 break;
2309 2374
2310 /* 8.3.87: NEXT LINE */ 2375 /* 8.3.87: NEXT LINE */
2311 case C1_NEL: /* ESC E */ 2376 case C1_NEL: /* ESC E */
2312 { 2377 {
2313 uint32_t nlcr[] = { '\n', '\r' }; 2378 uint32_t nlcr[] = { '\n', '\r' };
2314 scr_add_lines (nlcr, 1, 2); 2379 scr_add_lines (nlcr, 1, 2);
2315 } 2380 }
2316 break; 2381 break;
2317 2382
2318 /* kidnapped escape sequence: Should be 8.3.48 */ 2383 /* kidnapped escape sequence: Should be 8.3.48 */
2319 case C1_ESA: /* ESC G */ 2384 case C1_ESA: /* ESC G */
2320 process_graphics (); 2385 process_graphics ();
2321 break; 2386 break;
2322 2387
2323 /* 8.3.63: CHARACTER TABULATION SET */ 2388 /* 8.3.63: CHARACTER TABULATION SET */
2324 case C1_HTS: /* ESC H */ 2389 case C1_HTS: /* ESC H */
2325 scr_set_tab (1); 2390 scr_set_tab (1);
2326 break; 2391 break;
2327 2392
2328 /* 8.3.105: REVERSE LINE FEED */ 2393 /* 8.3.105: REVERSE LINE FEED */
2329 case C1_RI: /* ESC M */ 2394 case C1_RI: /* ESC M */
2330 scr_index (DN); 2395 scr_index (DN);
2331 break; 2396 break;
2332 2397
2333 /* 8.3.142: SINGLE-SHIFT TWO */ 2398 /* 8.3.142: SINGLE-SHIFT TWO */
2334 /*case C1_SS2: scr_single_shift (2); break; */ 2399 /*case C1_SS2: scr_single_shift (2); break; */
2335 2400
2336 /* 8.3.143: SINGLE-SHIFT THREE */ 2401 /* 8.3.143: SINGLE-SHIFT THREE */
2337 /*case C1_SS3: scr_single_shift (3); break; */ 2402 /*case C1_SS3: scr_single_shift (3); break; */
2338 2403
2339 /* 8.3.27: DEVICE CONTROL STRING */ 2404 /* 8.3.27: DEVICE CONTROL STRING */
2340 case C1_DCS: /* ESC P */ 2405 case C1_DCS: /* ESC P */
2341 process_dcs_seq (); 2406 process_dcs_seq ();
2342 break; 2407 break;
2343 2408
2344 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2409 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
2345 case C1_SCI: /* ESC Z */ 2410 case C1_SCI: /* ESC Z */
2346 tt_write((const unsigned char *)ESCZ_ANSWER, 2411 tt_write ((const unsigned char *)ESCZ_ANSWER,
2347 (unsigned int)(sizeof(ESCZ_ANSWER) - 1)); 2412 (unsigned int) (sizeof (ESCZ_ANSWER) - 1));
2348 break; /* steal obsolete ESC [ c */ 2413 break; /* steal obsolete ESC [ c */
2349 2414
2350 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2415 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */
2351 case C1_CSI: /* ESC [ */ 2416 case C1_CSI: /* ESC [ */
2352 process_csi_seq (); 2417 process_csi_seq ();
2353 break; 2418 break;
2354 2419
2355 /* 8.3.90: OPERATING SYSTEM COMMAND */ 2420 /* 8.3.90: OPERATING SYSTEM COMMAND */
2356 case C1_OSC: /* ESC ] */ 2421 case C1_OSC: /* ESC ] */
2357 process_osc_seq (); 2422 process_osc_seq ();
2358 break; 2423 break;
2359 2424
2360 /* 8.3.106: RESET TO INITIAL STATE */ 2425 /* 8.3.106: RESET TO INITIAL STATE */
2361 case 'c': 2426 case 'c':
2362 scr_poweron (); 2427 scr_poweron ();
2363 scrollbar_show (1); 2428 scrollbar_show (1);
2364 break; 2429 break;
2365 2430
2366 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */ 2431 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
2367 case 'n': 2432 case 'n':
2368 scr_charset_choose (2); 2433 scr_charset_choose (2);
2369 break; 2434 break;
2370 2435
2371 /* 8.3.81: LOCKING-SHIFT THREE (see ISO2022) */ 2436 /* 8.3.81: LOCKING-SHIFT THREE (see ISO2022) */
2372 case 'o': 2437 case 'o':
2373 scr_charset_choose (3); 2438 scr_charset_choose (3);
2374 break; 2439 break;
2375 } 2440 }
2376} 2441}
2377/*}}} */ 2442/*}}} */
2378 2443
2379/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */ 2444/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */
2380/* *INDENT-OFF* */ 2445/* *INDENT-OFF* */
2381enum { 2446enum {
2382 CSI_ICH = 0x40, 2447 CSI_ICH = 0x40,
2383 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA, 2448 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA,
2384 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA , 2449 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA ,
2385 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC, 2450 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC,
2386 CSI_ECH, CSI_CVT, CSI_CBT, CSI_SRS, CSI_PTX, CSI_SDS, CSI_SIMD, CSI_5F, 2451 CSI_ECH, CSI_CVT, CSI_CBT, CSI_SRS, CSI_PTX, CSI_SDS, CSI_SIMD, CSI_5F,
2387 CSI_HPA, CSI_HPR, CSI_REP, CSI_DA , CSI_VPA, CSI_VPR, CSI_HVP, CSI_TBC, 2452 CSI_HPA, CSI_HPR, CSI_REP, CSI_DA , CSI_VPA, CSI_VPR, CSI_HVP, CSI_TBC,
2388 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ, 2453 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ,
2389 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 , 2454 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 ,
2390 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F 2455 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F
2391}; 2456};
2392 2457
2393#define make_byte(b7,b6,b5,b4,b3,b2,b1,b0) \ 2458#define make_byte(b7,b6,b5,b4,b3,b2,b1,b0) \
2394 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \ 2459 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \
2395 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0)) 2460 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0))
2396#define get_byte_array_bit(array, bit) \ 2461#define get_byte_array_bit(array, bit) \
2397 (!!((array)[(bit) / 8] & (128 >> ((bit) & 7)))) 2462 (!! ((array)[ (bit) / 8] & (128 >> ((bit) & 7))))
2398 2463
2399const unsigned char csi_defaults[] = { 2464const unsigned char csi_defaults[] =
2465 {
2400 make_byte(1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */ 2466 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */
2401 make_byte(1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */ 2467 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */
2402 make_byte(1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */ 2468 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */
2403 make_byte(1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */ 2469 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */
2404 make_byte(1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */ 2470 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */
2405 make_byte(0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */ 2471 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */
2406 make_byte(0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */ 2472 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */
2407 make_byte(0,0,0,0,0,0,0,0) /* x, y, z, {, |, }, ~, */ 2473 make_byte (0,0,0,0,0,0,0,0) /* x, y, z, {, |, }, ~, */
2408}; 2474 };
2409/* *INDENT-ON* */ 2475/* *INDENT-ON* */
2410 2476
2411void 2477void
2412rxvt_term::process_csi_seq () 2478rxvt_term::process_csi_seq ()
2413{ 2479{
2414 unsigned char ch, priv, i; 2480 unsigned char ch, priv, i;
2415 unsigned int nargs, p; 2481 unsigned int nargs, p;
2416 int n, ndef; 2482 int n, ndef;
2417 int arg[ESC_ARGS]; 2483 int arg[ESC_ARGS];
2418 2484
2419 for (nargs = ESC_ARGS; nargs > 0;) 2485 for (nargs = ESC_ARGS; nargs > 0;)
2420 arg[--nargs] = 0; 2486 arg[--nargs] = 0;
2421 2487
2422 priv = 0; 2488 priv = 0;
2489 ch = cmd_getc ();
2490 if (ch >= '<' && ch <= '?')
2491 { /* '<' '=' '>' '?' */
2492 priv = ch;
2423 ch = cmd_getc (); 2493 ch = cmd_getc ();
2424 if (ch >= '<' && ch <= '?') { /* '<' '=' '>' '?' */
2425 priv = ch;
2426 ch = cmd_getc ();
2427 } 2494 }
2428/* read any numerical arguments */ 2495 /* read any numerical arguments */
2429 for (n = -1; ch < CSI_ICH; ) { 2496 for (n = -1; ch < CSI_ICH; )
2497 {
2430 if (isdigit(ch)) { 2498 if (isdigit (ch))
2499 {
2431 if (n < 0) 2500 if (n < 0)
2432 n = ch - '0'; 2501 n = ch - '0';
2433 else 2502 else
2434 n = n * 10 + ch - '0'; 2503 n = n * 10 + ch - '0';
2504 }
2435 } else if (ch == ';') { 2505 else if (ch == ';')
2506 {
2436 if (nargs < ESC_ARGS) 2507 if (nargs < ESC_ARGS)
2437 arg[nargs++] = n; 2508 arg[nargs++] = n;
2438 n = -1; 2509 n = -1;
2510 }
2439 } else if (ch == '\b') { 2511 else if (ch == '\b')
2512 {
2440 scr_backspace (); 2513 scr_backspace ();
2514 }
2441 } else if (ch == C0_ESC) { 2515 else if (ch == C0_ESC)
2516 {
2442 process_escape_seq (); 2517 process_escape_seq ();
2518 return;
2519 }
2520 else if (ch < ' ')
2521 {
2522 process_nonprinting (ch);
2523 }
2524 ch = cmd_getc ();
2525 }
2526
2527 if (ch > CSI_7F)
2443 return; 2528 return;
2444 } else if (ch < ' ') {
2445 process_nonprinting (ch);
2446 }
2447 ch = cmd_getc ();
2448 }
2449 2529
2450 if (ch > CSI_7F)
2451 return;
2452
2453 if (nargs < ESC_ARGS) 2530 if (nargs < ESC_ARGS)
2454 arg[nargs++] = n; 2531 arg[nargs++] = n;
2455 2532
2456 i = ch - CSI_ICH; 2533 i = ch - CSI_ICH;
2457 ndef = get_byte_array_bit(csi_defaults, i); 2534 ndef = get_byte_array_bit (csi_defaults, i);
2458 for (p = 0; p < nargs; p++) 2535 for (p = 0; p < nargs; p++)
2459 if (arg[p] == -1) 2536 if (arg[p] == -1)
2460 arg[p] = ndef; 2537 arg[p] = ndef;
2461 2538
2462#ifdef DEBUG_CMD 2539#ifdef DEBUG_CMD
2463 fprintf(stderr, "CSI "); 2540 fprintf (stderr, "CSI ");
2464 for (p = 0; p < nargs; p++) 2541 for (p = 0; p < nargs; p++)
2465 fprintf(stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : ""); 2542 fprintf (stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : "");
2466 fprintf(stderr, "%c\n", ch); 2543 fprintf (stderr, "%c\n", ch);
2467#endif 2544#endif
2468 2545
2469/* 2546 /*
2470 * private mode handling 2547 * private mode handling
2471 */ 2548 */
2472 if (priv) { 2549 if (priv)
2473 switch (priv) { 2550 {
2474 case '>': 2551 switch (priv)
2552 {
2553 case '>':
2475 if (ch == CSI_DA) /* secondary device attributes */ 2554 if (ch == CSI_DA) /* secondary device attributes */
2476 tt_printf("\033[>%d;%-.8s;0c", 'R', VSTRING); 2555 tt_printf ("\033[>%d;%-.8s;0c", 'R', VSTRING);
2477 break; 2556 break;
2478 case '?': 2557 case '?':
2479 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2558 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2480 process_terminal_mode (ch, priv, nargs, arg); 2559 process_terminal_mode (ch, priv, nargs, arg);
2481 break; 2560 break;
2482 } 2561 }
2483 return; 2562 return;
2484 } 2563 }
2485 2564
2486 switch (ch) { 2565 switch (ch)
2487/* 2566 {
2567 /*
2488 * ISO/IEC 6429:1992(E) CSI sequences (defaults in parentheses) 2568 * ISO/IEC 6429:1992 (E) CSI sequences (defaults in parentheses)
2489 */ 2569 */
2490#ifdef PRINTPIPE 2570#ifdef PRINTPIPE
2491 case CSI_MC: /* 8.3.83: (0) MEDIA COPY */ 2571 case CSI_MC: /* 8.3.83: (0) MEDIA COPY */
2492 switch (arg[0]) { 2572 switch (arg[0])
2573 {
2493 case 0: /* initiate transfer to primary aux device */ 2574 case 0: /* initiate transfer to primary aux device */
2494 scr_printscreen (0); 2575 scr_printscreen (0);
2495 break; 2576 break;
2496 case 5: /* start relay to primary aux device */ 2577 case 5: /* start relay to primary aux device */
2497 process_print_pipe (); 2578 process_print_pipe ();
2579 break;
2580 }
2498 break; 2581 break;
2499 }
2500 break;
2501#endif 2582#endif
2502 2583
2503 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */ 2584 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */
2504 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */ 2585 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */
2505 arg[0] = -arg[0]; 2586 arg[0] = -arg[0];
2506 /* FALLTHROUGH */ 2587 /* FALLTHROUGH */
2507 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */ 2588 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */
2508 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */ 2589 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */
2509 scr_gotorc (arg[0], 0, RELATIVE); 2590 scr_gotorc (arg[0], 0, RELATIVE);
2510 break; 2591 break;
2511 2592
2512 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */ 2593 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */
2513 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */ 2594 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */
2514#ifdef ISO6429 2595#ifdef ISO6429
2515 arg[0] = -arg[0]; 2596 arg[0] = -arg[0];
2516#else /* emulate common DEC VTs */ 2597#else /* emulate common DEC VTs */
2517 arg[0] = arg[0] ? -arg[0] : -1; 2598 arg[0] = arg[0] ? -arg[0] : -1;
2518#endif 2599#endif
2519 /* FALLTHROUGH */ 2600 /* FALLTHROUGH */
2520 case CSI_CUF: /* 8.3.20: (1) CURSOR RIGHT */ 2601 case CSI_CUF: /* 8.3.20: (1) CURSOR RIGHT */
2521 case CSI_HPR: /* 8.3.60: (1) CHARACTER POSITION FORWARD */ 2602 case CSI_HPR: /* 8.3.60: (1) CHARACTER POSITION FORWARD */
2522#ifdef ISO6429 2603#ifdef ISO6429
2523 scr_gotorc (0, arg[0], RELATIVE); 2604 scr_gotorc (0, arg[0], RELATIVE);
2524#else /* emulate common DEC VTs */ 2605#else /* emulate common DEC VTs */
2525 scr_gotorc (0, arg[0] ? arg[0] : 1, RELATIVE); 2606 scr_gotorc (0, arg[0] ? arg[0] : 1, RELATIVE);
2526#endif 2607#endif
2527 break; 2608 break;
2528 2609
2529 case CSI_CPL: /* 8.3.13: (1) CURSOR PRECEDING LINE */ 2610 case CSI_CPL: /* 8.3.13: (1) CURSOR PRECEDING LINE */
2530 arg[0] = -arg[0]; 2611 arg[0] = -arg[0];
2531 /* FALLTHROUGH */ 2612 /* FALLTHROUGH */
2532 case CSI_CNL: /* 8.3.12: (1) CURSOR NEXT LINE */ 2613 case CSI_CNL: /* 8.3.12: (1) CURSOR NEXT LINE */
2533 scr_gotorc (arg[0], 0, R_RELATIVE); 2614 scr_gotorc (arg[0], 0, R_RELATIVE);
2534 break; 2615 break;
2535 2616
2536 case CSI_CHA: /* 8.3.9: (1) CURSOR CHARACTER ABSOLUTE */ 2617 case CSI_CHA: /* 8.3.9: (1) CURSOR CHARACTER ABSOLUTE */
2537 case CSI_HPA: /* 8.3.58: (1) CURSOR POSITION ABSOLUTE */ 2618 case CSI_HPA: /* 8.3.58: (1) CURSOR POSITION ABSOLUTE */
2538 scr_gotorc (0, arg[0] - 1, R_RELATIVE); 2619 scr_gotorc (0, arg[0] - 1, R_RELATIVE);
2539 break; 2620 break;
2540 2621
2541 case CSI_VPA: /* 8.3.159: (1) LINE POSITION ABSOLUTE */ 2622 case CSI_VPA: /* 8.3.159: (1) LINE POSITION ABSOLUTE */
2542 scr_gotorc (arg[0] - 1, 0, C_RELATIVE); 2623 scr_gotorc (arg[0] - 1, 0, C_RELATIVE);
2543 break; 2624 break;
2544 2625
2545 case CSI_CUP: /* 8.3.21: (1,1) CURSOR POSITION */ 2626 case CSI_CUP: /* 8.3.21: (1,1) CURSOR POSITION */
2546 case CSI_HVP: /* 8.3.64: (1,1) CHARACTER AND LINE POSITION */ 2627 case CSI_HVP: /* 8.3.64: (1,1) CHARACTER AND LINE POSITION */
2547 scr_gotorc (arg[0] - 1, nargs < 2 ? 0 : (arg[1] - 1), 0); 2628 scr_gotorc (arg[0] - 1, nargs < 2 ? 0 : (arg[1] - 1), 0);
2548 break; 2629 break;
2549 2630
2550 case CSI_CBT: /* 8.3.7: (1) CURSOR BACKWARD TABULATION */ 2631 case CSI_CBT: /* 8.3.7: (1) CURSOR BACKWARD TABULATION */
2551 arg[0] = -arg[0]; 2632 arg[0] = -arg[0];
2552 /* FALLTHROUGH */ 2633 /* FALLTHROUGH */
2553 case CSI_CHT: /* 8.3.10: (1) CURSOR FORWARD TABULATION */ 2634 case CSI_CHT: /* 8.3.10: (1) CURSOR FORWARD TABULATION */
2554 scr_tab (arg[0]); 2635 scr_tab (arg[0]);
2555 break; 2636 break;
2556 2637
2557 case CSI_ED: /* 8.3.40: (0) ERASE IN PAGE */ 2638 case CSI_ED: /* 8.3.40: (0) ERASE IN PAGE */
2558 scr_erase_screen (arg[0]); 2639 scr_erase_screen (arg[0]);
2559 break; 2640 break;
2560 2641
2561 case CSI_EL: /* 8.3.42: (0) ERASE IN LINE */ 2642 case CSI_EL: /* 8.3.42: (0) ERASE IN LINE */
2562 scr_erase_line (arg[0]); 2643 scr_erase_line (arg[0]);
2563 break; 2644 break;
2564 2645
2565 case CSI_ICH: /* 8.3.65: (1) INSERT CHARACTER */ 2646 case CSI_ICH: /* 8.3.65: (1) INSERT CHARACTER */
2566 scr_insdel_chars (arg[0], INSERT); 2647 scr_insdel_chars (arg[0], INSERT);
2567 break; 2648 break;
2568 2649
2569 case CSI_IL: /* 8.3.68: (1) INSERT LINE */ 2650 case CSI_IL: /* 8.3.68: (1) INSERT LINE */
2570 scr_insdel_lines (arg[0], INSERT); 2651 scr_insdel_lines (arg[0], INSERT);
2571 break; 2652 break;
2572 2653
2573 case CSI_DL: /* 8.3.33: (1) DELETE LINE */ 2654 case CSI_DL: /* 8.3.33: (1) DELETE LINE */
2574 scr_insdel_lines (arg[0], DELETE); 2655 scr_insdel_lines (arg[0], DELETE);
2575 break; 2656 break;
2576 2657
2577 case CSI_ECH: /* 8.3.39: (1) ERASE CHARACTER */ 2658 case CSI_ECH: /* 8.3.39: (1) ERASE CHARACTER */
2578 scr_insdel_chars (arg[0], ERASE); 2659 scr_insdel_chars (arg[0], ERASE);
2579 break; 2660 break;
2580 2661
2581 case CSI_DCH: /* 8.3.26: (1) DELETE CHARACTER */ 2662 case CSI_DCH: /* 8.3.26: (1) DELETE CHARACTER */
2582 scr_insdel_chars (arg[0], DELETE); 2663 scr_insdel_chars (arg[0], DELETE);
2583 break; 2664 break;
2584 2665
2585 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */ 2666 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */
2586 arg[0] = -arg[0]; 2667 arg[0] = -arg[0];
2587 /* FALLTHROUGH */ 2668 /* FALLTHROUGH */
2588 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 2669 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
2589 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0); 2670 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0);
2590 break; 2671 break;
2591 2672
2592 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 2673 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
2593 tt_write((const unsigned char *)VT100_ANS, 2674 tt_write ((const unsigned char *)VT100_ANS,
2594 (unsigned int)(sizeof(VT100_ANS) - 1)); 2675 (unsigned int) (sizeof (VT100_ANS) - 1));
2595 break; 2676 break;
2596 2677
2597 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 2678 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
2598 process_sgr_mode (nargs, arg); 2679 process_sgr_mode (nargs, arg);
2599 break; 2680 break;
2600 2681
2601 case CSI_DSR: /* 8.3.36: (0) DEVICE STATUS REPORT */ 2682 case CSI_DSR: /* 8.3.36: (0) DEVICE STATUS REPORT */
2602 switch (arg[0]) { 2683 switch (arg[0])
2684 {
2603 case 5: /* DSR requested */ 2685 case 5: /* DSR requested */
2604 tt_printf("\033[0n"); 2686 tt_printf ("\033[0n");
2605 break; 2687 break;
2606 case 6: /* CPR requested */ 2688 case 6: /* CPR requested */
2607 scr_report_position (); 2689 scr_report_position ();
2608 break; 2690 break;
2609#if defined (ENABLE_DISPLAY_ANSWER) 2691#if defined (ENABLE_DISPLAY_ANSWER)
2610 case 7: /* unofficial extension */ 2692 case 7: /* unofficial extension */
2611 tt_printf("%-.250s\n", rs[Rs_display_name]); 2693 tt_printf ("%-.250s\n", rs[Rs_display_name]);
2612 break; 2694 break;
2613#endif 2695#endif
2614 case 8: /* unofficial extension */ 2696 case 8: /* unofficial extension */
2615 xterm_seq (XTerm_title, APL_NAME "-" VERSION, CHAR_ST); 2697 xterm_seq (XTerm_title, APL_NAME "-" VERSION, CHAR_ST);
2698 break;
2699 }
2616 break; 2700 break;
2617 }
2618 break;
2619 2701
2620 case CSI_TBC: /* 8.3.155: (0) TABULATION CLEAR */ 2702 case CSI_TBC: /* 8.3.155: (0) TABULATION CLEAR */
2621 switch (arg[0]) { 2703 switch (arg[0])
2704 {
2622 case 0: /* char tab stop cleared at active position */ 2705 case 0: /* char tab stop cleared at active position */
2623 scr_set_tab (0); 2706 scr_set_tab (0);
2624 break; 2707 break;
2625 /* case 1: */ /* line tab stop cleared in active line */ 2708 /* case 1: */ /* line tab stop cleared in active line */
2626 /* case 2: */ /* char tab stops cleared in active line */ 2709 /* case 2: */ /* char tab stops cleared in active line */
2627 case 3: /* all char tab stops are cleared */ 2710 case 3: /* all char tab stops are cleared */
2628 /* case 4: */ /* all line tab stops are cleared */ 2711 /* case 4: */ /* all line tab stops are cleared */
2629 case 5: /* all tab stops are cleared */ 2712 case 5: /* all tab stops are cleared */
2630 scr_set_tab (-1); 2713 scr_set_tab (-1);
2714 break;
2715 }
2631 break; 2716 break;
2632 }
2633 break;
2634 2717
2635 case CSI_CTC: /* 8.3.17: (0) CURSOR TABULATION CONTROL */ 2718 case CSI_CTC: /* 8.3.17: (0) CURSOR TABULATION CONTROL */
2636 switch (arg[0]) { 2719 switch (arg[0])
2720 {
2637 case 0: /* char tab stop set at active position */ 2721 case 0: /* char tab stop set at active position */
2638 scr_set_tab (1); 2722 scr_set_tab (1);
2639 break; /* = ESC H */ 2723 break; /* = ESC H */
2640 /* case 1: */ /* line tab stop set at active line */ 2724 /* case 1: */ /* line tab stop set at active line */
2641 case 2: /* char tab stop cleared at active position */ 2725 case 2: /* char tab stop cleared at active position */
2642 scr_set_tab (0); 2726 scr_set_tab (0);
2643 break; /* = ESC [ 0 g */ 2727 break; /* = ESC [ 0 g */
2644 /* case 3: */ /* line tab stop cleared at active line */ 2728 /* case 3: */ /* line tab stop cleared at active line */
2645 /* case 4: */ /* char tab stops cleared at active line */ 2729 /* case 4: */ /* char tab stops cleared at active line */
2646 case 5: /* all char tab stops are cleared */ 2730 case 5: /* all char tab stops are cleared */
2647 scr_set_tab (-1); 2731 scr_set_tab (-1);
2648 break; /* = ESC [ 3 g */ 2732 break; /* = ESC [ 3 g */
2649 /* case 6: */ /* all line tab stops are cleared */ 2733 /* case 6: */ /* all line tab stops are cleared */
2650 } 2734 }
2651 break; 2735 break;
2652 2736
2653 case CSI_RM: /* 8.3.107: RESET MODE */ 2737 case CSI_RM: /* 8.3.107: RESET MODE */
2654 if (arg[0] == 4) 2738 if (arg[0] == 4)
2655 scr_insert_mode (0); 2739 scr_insert_mode (0);
2656 break; 2740 break;
2657 2741
2658 case CSI_SM: /* 8.3.126: SET MODE */ 2742 case CSI_SM: /* 8.3.126: SET MODE */
2659 if (arg[0] == 4) 2743 if (arg[0] == 4)
2660 scr_insert_mode (1); 2744 scr_insert_mode (1);
2661 break; 2745 break;
2662 2746
2663/* 2747 /*
2664 * PRIVATE USE beyond this point. All CSI_7? sequences here 2748 * PRIVATE USE beyond this point. All CSI_7? sequences here
2665 */ 2749 */
2666 case CSI_72: /* DECSTBM: set top and bottom margins */ 2750 case CSI_72: /* DECSTBM: set top and bottom margins */
2667 if (nargs == 1) 2751 if (nargs == 1)
2668 scr_scroll_region (arg[0] - 1, MAX_ROWS - 1); 2752 scr_scroll_region (arg[0] - 1, MAX_ROWS - 1);
2669 else if (nargs == 0 || arg[0] >= arg[1]) 2753 else if (nargs == 0 || arg[0] >= arg[1])
2670 scr_scroll_region (0, MAX_ROWS - 1); 2754 scr_scroll_region (0, MAX_ROWS - 1);
2671 else 2755 else
2672 scr_scroll_region (arg[0] - 1, arg[1] - 1); 2756 scr_scroll_region (arg[0] - 1, arg[1] - 1);
2673 break; 2757 break;
2674 2758
2675 case CSI_73: 2759 case CSI_73:
2676 scr_cursor (SAVE); 2760 scr_cursor (SAVE);
2677 break; 2761 break;
2678 case CSI_75: 2762 case CSI_75:
2679 scr_cursor (RESTORE); 2763 scr_cursor (RESTORE);
2680 break; 2764 break;
2681 2765
2682#ifndef NO_FRILLS 2766#ifndef NO_FRILLS
2683 case CSI_74: 2767 case CSI_74:
2684 process_window_ops (arg, nargs); 2768 process_window_ops (arg, nargs);
2685 break; 2769 break;
2686#endif 2770#endif
2687 2771
2688 case CSI_78: /* DECREQTPARM */ 2772 case CSI_78: /* DECREQTPARM */
2689 if (arg[0] == 0 || arg[0] == 1) 2773 if (arg[0] == 0 || arg[0] == 1)
2690 tt_printf("\033[%d;1;1;128;128;1;0x", arg[0] + 2); 2774 tt_printf ("\033[%d;1;1;128;128;1;0x", arg[0] + 2);
2691 /* FALLTHROUGH */ 2775 /* FALLTHROUGH */
2692 2776
2693 default: 2777 default:
2694 break; 2778 break;
2695 } 2779 }
2696} 2780}
2697/*}}} */ 2781/*}}} */
2698 2782
2699#ifndef NO_FRILLS 2783#ifndef NO_FRILLS
2700/* ARGSUSED */ 2784/* ARGSUSED */
2701void 2785void
2702rxvt_term::process_window_ops (const int *args, unsigned int nargs) 2786rxvt_term::process_window_ops (const int *args, unsigned int nargs)
2703{ 2787{
2704 int x, y; 2788 int x, y;
2705#if 0 2789#if 0
2706 char *s; 2790 char *s;
2707#endif 2791#endif
2708 XWindowAttributes wattr; 2792 XWindowAttributes wattr;
2709 Window wdummy; 2793 Window wdummy;
2710 2794
2711 if (nargs == 0) 2795 if (nargs == 0)
2712 return; 2796 return;
2713 switch (args[0]) { 2797 switch (args[0])
2798 {
2714 /* 2799 /*
2715 * commands 2800 * commands
2716 */ 2801 */
2717 case 1: /* deiconify window */ 2802 case 1: /* deiconify window */
2718 XMapWindow(Xdisplay, TermWin.parent[0]); 2803 XMapWindow (display->display, TermWin.parent[0]);
2719 break; 2804 break;
2720 case 2: /* iconify window */ 2805 case 2: /* iconify window */
2721 XIconifyWindow(Xdisplay, TermWin.parent[0], 2806 XIconifyWindow (display->display, TermWin.parent[0],
2722 DefaultScreen(Xdisplay)); 2807 DefaultScreen (display->display));
2723 break; 2808 break;
2724 case 3: /* set position (pixels) */ 2809 case 3: /* set position (pixels) */
2725 XMoveWindow(Xdisplay, TermWin.parent[0], args[1], args[2]); 2810 XMoveWindow (display->display, TermWin.parent[0], args[1], args[2]);
2726 break; 2811 break;
2727 case 4: /* set size (pixels) */ 2812 case 4: /* set size (pixels) */
2728 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 2813 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
2729 break; 2814 break;
2730 case 5: /* raise window */ 2815 case 5: /* raise window */
2731 XRaiseWindow(Xdisplay, TermWin.parent[0]); 2816 XRaiseWindow (display->display, TermWin.parent[0]);
2732 break; 2817 break;
2733 case 6: /* lower window */ 2818 case 6: /* lower window */
2734 XLowerWindow(Xdisplay, TermWin.parent[0]); 2819 XLowerWindow (display->display, TermWin.parent[0]);
2735 break; 2820 break;
2736 case 7: /* refresh window */ 2821 case 7: /* refresh window */
2737 scr_touch (true); 2822 scr_touch (true);
2738 break; 2823 break;
2739 case 8: /* set size (chars) */ 2824 case 8: /* set size (chars) */
2740 set_widthheight ((unsigned int)(args[2] * TermWin.fwidth), 2825 set_widthheight ((unsigned int) (args[2] * TermWin.fwidth),
2741 (unsigned int)(args[1] * TermWin.fheight)); 2826 (unsigned int) (args[1] * TermWin.fheight));
2742 break; 2827 break;
2743 default: 2828 default:
2744 if (args[0] >= 24) /* set height (chars) */ 2829 if (args[0] >= 24) /* set height (chars) */
2745 set_widthheight ((unsigned int)TermWin.width, 2830 set_widthheight ((unsigned int)TermWin.width,
2746 (unsigned int)(args[1] * TermWin.fheight)); 2831 (unsigned int) (args[1] * TermWin.fheight));
2747 break; 2832 break;
2748 /* 2833 /*
2749 * reports - some output format copied from XTerm 2834 * reports - some output format copied from XTerm
2750 */ 2835 */
2751 case 11: /* report window state */ 2836 case 11: /* report window state */
2752 XGetWindowAttributes(Xdisplay, TermWin.parent[0], &wattr); 2837 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);
2753 tt_printf("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 2838 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
2754 break; 2839 break;
2755 case 13: /* report window position */ 2840 case 13: /* report window position */
2756 XGetWindowAttributes(Xdisplay, TermWin.parent[0], &wattr); 2841 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);
2757 XTranslateCoordinates(Xdisplay, TermWin.parent[0], wattr.root, 2842 XTranslateCoordinates (display->display, TermWin.parent[0], wattr.root,
2758 -wattr.border_width, -wattr.border_width, 2843 -wattr.border_width, -wattr.border_width,
2759 &x, &y, &wdummy); 2844 &x, &y, &wdummy);
2760 tt_printf("\033[3;%d;%dt", x, y); 2845 tt_printf ("\033[3;%d;%dt", x, y);
2761 break; 2846 break;
2762 case 14: /* report window size (pixels) */ 2847 case 14: /* report window size (pixels) */
2763 XGetWindowAttributes(Xdisplay, TermWin.parent[0], &wattr); 2848 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);
2764 tt_printf("\033[4;%d;%dt", wattr.height, wattr.width); 2849 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
2765 break; 2850 break;
2766 case 18: /* report window size (chars) */ 2851 case 18: /* report window size (chars) */
2767 tt_printf("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); 2852 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol);
2768 break; 2853 break;
2769#if 0 /* XXX: currently disabled due to security concerns */ 2854#if 0 /* XXX: currently disabled due to security concerns */
2770 case 20: /* report icon label */ 2855 case 20: /* report icon label */
2771 XGetIconName(Xdisplay, TermWin.parent[0], &s); 2856 XGetIconName (display->display, TermWin.parent[0], &s);
2772 tt_printf("\033]L%-.200s\234", s ? s : ""); /* 8bit ST */ 2857 tt_printf ("\033]L%-.200s\234", s ? s : ""); /* 8bit ST */
2773 break; 2858 break;
2774 case 21: /* report window title */ 2859 case 21: /* report window title */
2775 XFetchName(Xdisplay, TermWin.parent[0], &s); 2860 XFetchName (display->display, TermWin.parent[0], &s);
2776 tt_printf("\033]l%-.200s\234", s ? s : ""); /* 8bit ST */ 2861 tt_printf ("\033]l%-.200s\234", s ? s : ""); /* 8bit ST */
2777 break; 2862 break;
2778#endif 2863#endif
2864
2779 } 2865 }
2780} 2866}
2781#endif 2867#endif
2782 2868
2783/*----------------------------------------------------------------------*/ 2869/*----------------------------------------------------------------------*/
2784/* 2870/*
2785 * get input up until STRING TERMINATOR (or BEL) 2871 * get input up until STRING TERMINATOR (or BEL)
2786 * ends_how is terminator used. returned input must be free()d 2872 * ends_how is terminator used. returned input must be free ()d
2787 */ 2873 */
2788unsigned char * 2874unsigned char *
2789rxvt_term::get_to_st (unsigned char *ends_how) 2875rxvt_term::get_to_st (unsigned char *ends_how)
2790{ 2876{
2791 int seen_esc = 0; /* seen escape? */ 2877 int seen_esc = 0; /* seen escape? */
2792 unsigned int n = 0; 2878 unsigned int n = 0;
2793 unsigned char *s; 2879 unsigned char *s;
2794 unsigned char ch, string[STRING_MAX]; 2880 unsigned char ch, string[STRING_MAX];
2795 2881
2796 for (; (ch = cmd_getc ());) { 2882 for (; (ch = cmd_getc ());)
2883 {
2797 if (ch == C0_BEL 2884 if (ch == C0_BEL
2798 || ch == CHAR_ST 2885 || ch == CHAR_ST
2799 || (ch == 0x5c && seen_esc)) /* 7bit ST */ 2886 || (ch == 0x5c && seen_esc)) /* 7bit ST */
2800 break; 2887 break;
2801 if (ch == C0_ESC) { 2888 if (ch == C0_ESC)
2889 {
2802 seen_esc = 1; 2890 seen_esc = 1;
2803 continue; 2891 continue;
2892 }
2804 } else if (ch == '\t') 2893 else if (ch == '\t')
2805 ch = ' '; /* translate '\t' to space */ 2894 ch = ' '; /* translate '\t' to space */
2806 else if (ch < 0x08 || (ch > 0x0d && ch < 0x20)) 2895 else if (ch < 0x08 || (ch > 0x0d && ch < 0x20))
2807 return NULL; /* other control character - exit */ 2896 return NULL; /* other control character - exit */
2808 if (n < sizeof(string) - 1) 2897 if (n < sizeof (string) - 1)
2809 string[n++] = ch; 2898 string[n++] = ch;
2810 seen_esc = 0; 2899 seen_esc = 0;
2811 } 2900 }
2812 string[n++] = '\0'; 2901 string[n++] = '\0';
2813 if ((s = (unsigned char *)rxvt_malloc(n)) == NULL) 2902 if ((s = (unsigned char *)rxvt_malloc (n)) == NULL)
2814 return NULL; 2903 return NULL;
2815 *ends_how = (ch == 0x5c ? C0_ESC : ch); 2904 *ends_how = (ch == 0x5c ? C0_ESC : ch);
2816 STRNCPY(s, string, n); 2905 STRNCPY (s, string, n);
2817 return s; 2906 return s;
2818} 2907}
2819 2908
2820/*----------------------------------------------------------------------*/ 2909/*----------------------------------------------------------------------*/
2821/* 2910/*
2822 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 2911 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
2823 */ 2912 */
2824void 2913void
2825rxvt_term::process_dcs_seq () 2914rxvt_term::process_dcs_seq ()
2826{ 2915{
2827 unsigned char eh, *s; 2916 unsigned char eh, *s;
2828/* 2917 /*
2829 * Not handled yet 2918 * Not handled yet
2830 */ 2919 */
2831 s = get_to_st (&eh); 2920 s = get_to_st (&eh);
2832 if (s) 2921 if (s)
2833 free(s); 2922 free (s);
2834 return; 2923 return;
2835} 2924}
2836 2925
2837/*----------------------------------------------------------------------*/ 2926/*----------------------------------------------------------------------*/
2838/* 2927/*
2839 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)' 2928 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)'
2840 */ 2929 */
2841void 2930void
2842rxvt_term::process_osc_seq () 2931rxvt_term::process_osc_seq ()
2843{ 2932{
2844 unsigned char ch, eh, *s; 2933 unsigned char ch, eh, *s;
2845 int arg; 2934 int arg;
2846 2935
2847 ch = cmd_getc (); 2936 ch = cmd_getc ();
2848 for (arg = 0; isdigit(ch); ch = cmd_getc ()) 2937 for (arg = 0; isdigit (ch); ch = cmd_getc ())
2849 arg = arg * 10 + (ch - '0'); 2938 arg = arg * 10 + (ch - '0');
2850 2939
2851 if (ch == ';') { 2940 if (ch == ';')
2941 {
2852 s = get_to_st (&eh); 2942 s = get_to_st (&eh);
2853 if (s) { 2943 if (s)
2854 /* 2944 {
2945 /*
2855 * rxvt_menubar_dispatch() violates the constness of the string, 2946 * rxvt_menubar_dispatch () violates the constness of the string,
2856 * so do it here 2947 * so do it here
2857 */ 2948 */
2858 if (arg == XTerm_Menu) 2949 if (arg == XTerm_Menu)
2859#if 0 /* XXX: currently disabled due to security concerns */ 2950#if 0 /* XXX: currently disabled due to security concerns */
2860 menubar_dispatch ((char *)s); 2951 menubar_dispatch ((char *)s);
2861#else 2952#else
2862 (void)0; 2953 (void)0;
2863#endif 2954#endif
2864 else 2955 else
2865 xterm_seq (arg, (char *)s, eh); 2956 xterm_seq (arg, (char *)s, eh);
2866 free(s); 2957 free (s);
2867 } 2958 }
2868 } 2959 }
2869} 2960}
2870/* 2961/*
2871 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 2962 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
2872 * 0 = change iconName/title 2963 * 0 = change iconName/title
… …
2880 * 19 = change underlined character color 2971 * 19 = change underlined character color
2881 * 46 = change logfile (not implemented) 2972 * 46 = change logfile (not implemented)
2882 * 50 = change font 2973 * 50 = change font
2883 * 2974 *
2884 * rxvt extensions: 2975 * rxvt extensions:
2976 * 9 = change locale (NYI)
2885 * 10 = menu (may change in future) 2977 * 10 = menu (may change in future)
2886 * 20 = bg pixmap 2978 * 20 = bg pixmap
2887 * 39 = change default fg color 2979 * 39 = change default fg color
2888 * 49 = change default bg color 2980 * 49 = change default bg color
2889 * 55 = dump scrollback buffer and all of screen 2981 * 55 = dump scrollback buffer and all of screen
2890 */ 2982 */
2891void 2983void
2892rxvt_term::xterm_seq (int op, const char *str, unsigned char resp __attribute__((unused))) 2984rxvt_term::xterm_seq (int op, const char *str, unsigned char resp __attribute__ ((unused)))
2893{ 2985{
2894 int changed = 0; 2986 int changed = 0;
2895 int color; 2987 int color;
2896 char *buf, *name; 2988 char *buf, *name;
2897 2989
2898 assert(str != NULL); 2990 assert (str != NULL);
2899 switch (op) { 2991 switch (op)
2992 {
2900 case XTerm_name: 2993 case XTerm_name:
2901 set_title (str); 2994 set_title (str);
2902 /* FALLTHROUGH */ 2995 /* FALLTHROUGH */
2903 case XTerm_iconName: 2996 case XTerm_iconName:
2904 set_iconName (str); 2997 set_iconName (str);
2905 break; 2998 break;
2906 case XTerm_title: 2999 case XTerm_title:
2907 set_title (str); 3000 set_title (str);
2908 break; 3001 break;
2909 case XTerm_Color: 3002 case XTerm_Color:
2910 for (buf = (char *)str; buf && *buf;) { 3003 for (buf = (char *)str; buf && *buf;)
3004 {
2911 if ((name = STRCHR(buf, ';')) == NULL) 3005 if ((name = STRCHR (buf, ';')) == NULL)
2912 break; 3006 break;
2913 *name++ = '\0'; 3007 *name++ = '\0';
2914 color = atoi(buf); 3008 color = atoi (buf);
2915 if (color < 0 || color >= TOTAL_COLORS) 3009 if (color < 0 || color >= TOTAL_COLORS)
2916 break; 3010 break;
2917 if ((buf = STRCHR(name, ';')) != NULL) 3011 if ((buf = STRCHR (name, ';')) != NULL)
2918 *buf++ = '\0'; 3012 *buf++ = '\0';
2919 set_window_color (color + minCOLOR, name); 3013 set_window_color (color + minCOLOR, name);
2920 } 3014 }
2921 break; 3015 break;
2922#ifndef NO_CURSORCOLOR 3016#ifndef NO_CURSORCOLOR
2923 case XTerm_Color_cursor: 3017 case XTerm_Color_cursor:
2924 set_window_color (Color_cursor, str); 3018 set_window_color (Color_cursor, str);
2925 break; 3019 break;
2926#endif 3020#endif
2927 case XTerm_Color_pointer: 3021 case XTerm_Color_pointer:
2928 set_window_color (Color_pointer, str); 3022 set_window_color (Color_pointer, str);
2929 break; 3023 break;
2930#ifndef NO_BOLD_UNDERLINE_REVERSE 3024#ifndef NO_BOLD_UNDERLINE_REVERSE
2931 case XTerm_Color_BD: 3025 case XTerm_Color_BD:
2932 set_window_color (Color_BD, str); 3026 set_window_color (Color_BD, str);
2933 break; 3027 break;
2934 case XTerm_Color_UL: 3028 case XTerm_Color_UL:
2935 set_window_color (Color_UL, str); 3029 set_window_color (Color_UL, str);
2936 break; 3030 break;
2937 case XTerm_Color_RV: 3031 case XTerm_Color_RV:
2938 set_window_color (Color_RV, str); 3032 set_window_color (Color_RV, str);
2939 break; 3033 break;
2940#endif 3034#endif
2941 3035
2942 case XTerm_Menu: 3036 case XTerm_Menu:
2943 /* 3037 /*
2944 * rxvt_menubar_dispatch() violates the constness of the string, 3038 * rxvt_menubar_dispatch () violates the constness of the string,
2945 * so DON'T do it here 3039 * so DON'T do it here
2946 */ 3040 */
2947 break; 3041 break;
2948 case XTerm_Pixmap: 3042 case XTerm_Pixmap:
2949 if (*str != ';') { 3043 if (*str != ';')
3044 {
2950#if XPM_BACKGROUND 3045#if XPM_BACKGROUND
2951 scale_pixmap (""); /* reset to default scaling */ 3046 scale_pixmap (""); /* reset to default scaling */
2952 set_bgPixmap (str); /* change pixmap */ 3047 set_bgPixmap (str); /* change pixmap */
2953#endif 3048#endif
2954 scr_touch (true); 3049 scr_touch (true);
2955 } 3050 }
2956 while ((str = STRCHR(str, ';')) != NULL) { 3051 while ((str = STRCHR (str, ';')) != NULL)
2957 str++; 3052 {
3053 str++;
2958#if XPM_BACKGROUND 3054#if XPM_BACKGROUND
2959 changed += scale_pixmap (str); 3055 changed += scale_pixmap (str);
2960#endif 3056#endif
2961 } 3057
2962 if (changed) { 3058 }
3059 if (changed)
3060 {
2963#ifdef XPM_BACKGROUND 3061#ifdef XPM_BACKGROUND
2964 resize_pixmap (); 3062 resize_pixmap ();
2965#endif 3063#endif
2966 scr_touch (true); 3064 scr_touch (true);
2967 } 3065 }
2968 break; 3066 break;
2969 3067
2970 case XTerm_restoreFG: 3068 case XTerm_restoreFG:
2971 set_window_color (Color_fg, str); 3069 set_window_color (Color_fg, str);
2972 break; 3070 break;
2973 case XTerm_restoreBG: 3071 case XTerm_restoreBG:
2974 set_window_color (Color_bg, str); 3072 set_window_color (Color_bg, str);
2975 break; 3073 break;
2976 case XTerm_logfile: 3074 case XTerm_logfile:
2977 break; 3075 break;
2978 case XTerm_font: 3076 case XTerm_font:
2979 change_font (0, str); 3077 change_font (str);
2980 break; 3078 break;
3079 case XTerm_locale:
3080 set_locale (str);
3081 im_cb ();
3082 break;
2981#if 0 3083#if 0
2982 case XTerm_dumpscreen: /* no error notices */ 3084 case XTerm_dumpscreen: /* no error notices */
2983 { 3085 {
2984 int fd; 3086 int fd;
2985 if ((fd = open(str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) { 3087 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
2986 scr_dump (fd); 3088 {
2987 close(fd); 3089 scr_dump (fd);
2988 } 3090 close (fd);
2989 } 3091 }
2990 break; 3092 }
3093 break;
2991#endif 3094#endif
3095
2992 } 3096 }
2993} 3097}
2994/*----------------------------------------------------------------------*/ 3098/*----------------------------------------------------------------------*/
2995 3099
2996/*{{{ process DEC private mode sequences `ESC [ ? Ps mode' */ 3100/*{{{ process DEC private mode sequences `ESC [ ? Ps mode' */
… …
3004 * so no need for fancy checking 3108 * so no need for fancy checking
3005 */ 3109 */
3006int 3110int
3007rxvt_term::privcases (int mode, unsigned long bit) 3111rxvt_term::privcases (int mode, unsigned long bit)
3008{ 3112{
3009 int state; 3113 int state;
3010 3114
3011 if (mode == 's') { 3115 if (mode == 's')
3116 {
3012 SavedModes |= (PrivateModes & bit); 3117 SavedModes |= (PrivateModes & bit);
3013 return -1; 3118 return -1;
3014 } else { 3119 }
3120 else
3121 {
3015 if (mode == 'r') 3122 if (mode == 'r')
3016 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3123 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3017 else 3124 else
3018 state = (mode == 't') ? !(PrivateModes & bit) : mode; 3125 state = (mode == 't') ? ! (PrivateModes & bit) : mode;
3019 PrivMode(state, bit); 3126 PrivMode (state, bit);
3020 } 3127 }
3021 return state; 3128 return state;
3022} 3129}
3023 3130
3024/* we're not using priv _yet_ */ 3131/* we're not using priv _yet_ */
3025void 3132void
3026rxvt_term::process_terminal_mode (int mode, int priv __attribute__((unused)), unsigned int nargs, const int *arg) 3133rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg)
3027{ 3134{
3028 unsigned int i, j; 3135 unsigned int i, j;
3029 int state; 3136 int state;
3030 static const struct { 3137 static const struct
3138 {
3031 const int argval; 3139 const int argval;
3032 const unsigned long bit; 3140 const unsigned long bit;
3141 }
3033 } argtopriv[] = { 3142 argtopriv[] = {
3034 { 1, PrivMode_aplCUR }, 3143 { 1, PrivMode_aplCUR },
3035 { 2, PrivMode_vt52 }, 3144 { 2, PrivMode_vt52 },
3036 { 3, PrivMode_132 }, 3145 { 3, PrivMode_132 },
3037 { 4, PrivMode_smoothScroll }, 3146 { 4, PrivMode_smoothScroll },
3038 { 5, PrivMode_rVideo }, 3147 { 5, PrivMode_rVideo },
3039 { 6, PrivMode_relOrigin }, 3148 { 6, PrivMode_relOrigin },
3040 { 7, PrivMode_Autowrap }, 3149 { 7, PrivMode_Autowrap },
3041 { 9, PrivMode_MouseX10 }, 3150 { 9, PrivMode_MouseX10 },
3042#ifdef menuBar_esc 3151#ifdef menuBar_esc
3043 { menuBar_esc, PrivMode_menuBar }, 3152 { menuBar_esc, PrivMode_menuBar },
3044#endif 3153#endif
3045#ifdef scrollBar_esc 3154#ifdef scrollBar_esc
3046 { scrollBar_esc, PrivMode_scrollBar }, 3155 { scrollBar_esc, PrivMode_scrollBar },
3047#endif 3156#endif
3048 { 25, PrivMode_VisibleCursor }, 3157 { 25, PrivMode_VisibleCursor },
3049 { 35, PrivMode_ShiftKeys }, 3158 { 35, PrivMode_ShiftKeys },
3050 { 40, PrivMode_132OK }, 3159 { 40, PrivMode_132OK },
3051 { 47, PrivMode_Screen }, 3160 { 47, PrivMode_Screen },
3052 { 66, PrivMode_aplKP }, 3161 { 66, PrivMode_aplKP },
3053#ifndef NO_BACKSPACE_KEY 3162#ifndef NO_BACKSPACE_KEY
3054 { 67, PrivMode_BackSpace }, 3163 { 67, PrivMode_BackSpace },
3055#endif 3164#endif
3056 { 1000, PrivMode_MouseX11 }, 3165 { 1000, PrivMode_MouseX11 },
3057 { 1010, PrivMode_TtyOutputInh }, 3166 { 1010, PrivMode_TtyOutputInh },
3058 { 1011, PrivMode_Keypress }, 3167 { 1011, PrivMode_Keypress },
3059 { 1047, PrivMode_Screen }, 3168 { 1047, PrivMode_Screen },
3060 { 1049, PrivMode_Screen }, /* xterm extension, not fully implemented */ 3169 { 1049, PrivMode_Screen }, /* xterm extension, not fully implemented */
3061 }; 3170 };
3062 3171
3063 if (nargs == 0) 3172 if (nargs == 0)
3064 return; 3173 return;
3065 3174
3066/* make lo/hi boolean */ 3175 /* make lo/hi boolean */
3067 if (mode == 'l') 3176 if (mode == 'l')
3068 mode = 0; /* reset */ 3177 mode = 0; /* reset */
3069 else if (mode == 'h') 3178 else if (mode == 'h')
3070 mode = 1; /* set */ 3179 mode = 1; /* set */
3071 3180
3072 for (i = 0; i < nargs; i++) { 3181 for (i = 0; i < nargs; i++)
3182 {
3073 state = -1; 3183 state = -1;
3074 3184
3075 /* basic handling */ 3185 /* basic handling */
3076 for (j = 0; j < (sizeof(argtopriv)/sizeof(argtopriv[0])); j++) 3186 for (j = 0; j < (sizeof (argtopriv)/sizeof (argtopriv[0])); j++)
3077 if (argtopriv[j].argval == arg[i]) { 3187 if (argtopriv[j].argval == arg[i])
3188 {
3078 state = privcases (mode, argtopriv[j].bit); 3189 state = privcases (mode, argtopriv[j].bit);
3079 break; 3190 break;
3080 } 3191 }
3081 3192
3082 /* extra handling for values with state unkept */ 3193 /* extra handling for values with state unkept */
3083 if (state == -1) 3194 if (state == -1)
3084 switch (arg[i]) { 3195 switch (arg[i])
3196 {
3085 case 1048: /* alternative cursor save */ 3197 case 1048: /* alternative cursor save */
3086 if (mode == 0) 3198 if (mode == 0)
3087 scr_cursor (RESTORE); 3199 scr_cursor (RESTORE);
3088 else if (mode == 1) 3200 else if (mode == 1)
3089 scr_cursor (SAVE); 3201 scr_cursor (SAVE);
3090 /* FALLTHROUGH */ 3202 /* FALLTHROUGH */
3091 default: 3203 default:
3092 continue; /* for(;i;) */ 3204 continue; /* for (;i;) */
3093 } 3205 }
3094 3206
3095 /* extra handling for values with valid 0 or 1 state */ 3207 /* extra handling for values with valid 0 or 1 state */
3096 switch (arg[i]) { 3208 switch (arg[i])
3209 {
3097 /* case 1: - application cursor keys */ 3210 /* case 1: - application cursor keys */
3098 case 2: /* VT52 mode */ 3211 case 2: /* VT52 mode */
3099 /* oddball mode. should be set regardless of set/reset 3212 /* oddball mode. should be set regardless of set/reset
3100 * parameter. Return from VT52 mode with an ESC < from 3213 * parameter. Return from VT52 mode with an ESC < from
3101 * within VT52 mode 3214 * within VT52 mode
3102 */ 3215 */
3103 PrivMode(1, PrivMode_vt52); 3216 PrivMode (1, PrivMode_vt52);
3104 break; 3217 break;
3105 case 3: /* 80/132 */ 3218 case 3: /* 80/132 */
3106 if (PrivateModes & PrivMode_132OK) 3219 if (PrivateModes & PrivMode_132OK)
3107 set_widthheight ( (unsigned int)((state ? 132 : 80) * TermWin.fwidth), 3220 set_widthheight ( (unsigned int) ((state ? 132 : 80) * TermWin.fwidth),
3108 (unsigned int)TermWin.height); 3221 (unsigned int)TermWin.height);
3109 break; 3222 break;
3110 case 4: /* smooth scrolling */ 3223 case 4: /* smooth scrolling */
3111 if (state) 3224 if (state)
3112 Options &= ~Opt_jumpScroll; 3225 Options &= ~Opt_jumpScroll;
3113 else 3226 else
3114 Options |= Opt_jumpScroll; 3227 Options |= Opt_jumpScroll;
3115 break; 3228 break;
3116 case 5: /* reverse video */ 3229 case 5: /* reverse video */
3117 scr_rvideo_mode (state); 3230 scr_rvideo_mode (state);
3118 break; 3231 break;
3119 case 6: /* relative/absolute origins */ 3232 case 6: /* relative/absolute origins */
3120 scr_relative_origin (state); 3233 scr_relative_origin (state);
3121 break; 3234 break;
3122 case 7: /* autowrap */ 3235 case 7: /* autowrap */
3123 scr_autowrap (state); 3236 scr_autowrap (state);
3124 break; 3237 break;
3125 /* case 8: - auto repeat, can't do on a per window basis */ 3238 /* case 8: - auto repeat, can't do on a per window basis */
3126 case 9: /* X10 mouse reporting */ 3239 case 9: /* X10 mouse reporting */
3127 if (state) /* orthogonal */ 3240 if (state) /* orthogonal */
3128 PrivateModes &= ~(PrivMode_MouseX11); 3241 PrivateModes &= ~ (PrivMode_MouseX11);
3129 break; 3242 break;
3130#ifdef menuBar_esc 3243#ifdef menuBar_esc
3131 case menuBar_esc: 3244 case menuBar_esc:
3132#ifdef MENUBAR 3245#ifdef MENUBAR
3133 map_menuBar (state); 3246 map_menuBar (state);
3134#endif 3247#endif
3135 break; 3248 break;
3136#endif 3249#endif
3137#ifdef scrollBar_esc 3250#ifdef scrollBar_esc
3138 case scrollBar_esc: 3251 case scrollBar_esc:
3139 if (scrollbar_mapping (state)) { 3252 if (scrollbar_mapping (state))
3253 {
3140 resize_all_windows (0, 0, 0); 3254 resize_all_windows (0, 0, 0);
3141 scr_touch (true); 3255 scr_touch (true);
3142 } 3256 }
3143 break; 3257 break;
3144#endif 3258#endif
3145 case 25: /* visible/invisible cursor */ 3259 case 25: /* visible/invisible cursor */
3146 scr_cursor_visible (state); 3260 scr_cursor_visible (state);
3147 break; 3261 break;
3148 /* case 35: - shift keys */ 3262 /* case 35: - shift keys */
3149 /* case 40: - 80 <--> 132 mode */ 3263 /* case 40: - 80 <--> 132 mode */
3150 case 47: /* secondary screen */ 3264 case 47: /* secondary screen */
3151 scr_change_screen (state); 3265 scr_change_screen (state);
3152 break; 3266 break;
3153 /* case 66: - application key pad */ 3267 /* case 66: - application key pad */
3154 /* case 67: - backspace key */ 3268 /* case 67: - backspace key */
3155 case 1000: /* X11 mouse reporting */ 3269 case 1000: /* X11 mouse reporting */
3156 if (state) /* orthogonal */ 3270 if (state) /* orthogonal */
3157 PrivateModes &= ~(PrivMode_MouseX10); 3271 PrivateModes &= ~ (PrivMode_MouseX10);
3158 break; 3272 break;
3159#if 0 3273#if 0
3160 case 1001: 3274 case 1001:
3161 break; /* X11 mouse highlighting */ 3275 break; /* X11 mouse highlighting */
3162#endif 3276#endif
3163 case 1010: /* scroll to bottom on TTY output inhibit */ 3277 case 1010: /* scroll to bottom on TTY output inhibit */
3164 if (state) 3278 if (state)
3165 Options &= ~Opt_scrollTtyOutput; 3279 Options &= ~Opt_scrollTtyOutput;
3166 else 3280 else
3167 Options |= Opt_scrollTtyOutput; 3281 Options |= Opt_scrollTtyOutput;
3168 break; 3282 break;
3169 case 1011: /* scroll to bottom on key press */ 3283 case 1011: /* scroll to bottom on key press */
3170 if (state) 3284 if (state)
3171 Options |= Opt_scrollTtyKeypress; 3285 Options |= Opt_scrollTtyKeypress;
3172 else 3286 else
3173 Options &= ~Opt_scrollTtyKeypress; 3287 Options &= ~Opt_scrollTtyKeypress;
3174 break; 3288 break;
3175 case 1047: /* secondary screen w/ clearing */ 3289 case 1047: /* secondary screen w/ clearing */
3176 case 1049: /* better secondary screen w/ clearing, but not fully implemented */ 3290 case 1049: /* better secondary screen w/ clearing, but not fully implemented */
3177 if (current_screen != PRIMARY) 3291 if (current_screen != PRIMARY)
3178 scr_erase_screen (2); 3292 scr_erase_screen (2);
3179 scr_change_screen (state); 3293 scr_change_screen (state);
3180 /* FALLTHROUGH */ 3294 /* FALLTHROUGH */
3181 default: 3295 default:
3182 break; 3296 break;
3183 } 3297 }
3184 } 3298 }
3185} 3299}
3186/*}}} */ 3300/*}}} */
3187 3301
3188/*{{{ process sgr sequences */ 3302/*{{{ process sgr sequences */
3189void 3303void
3190rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg) 3304rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg)
3191{ 3305{
3192 unsigned int i; 3306 unsigned int i;
3193 short rendset; 3307 short rendset;
3194 int rendstyle; 3308 int rendstyle;
3195 3309
3196 if (nargs == 0) { 3310 if (nargs == 0)
3311 {
3197 scr_rendition (0, ~RS_None); 3312 scr_rendition (0, ~RS_None);
3198 return; 3313 return;
3199 } 3314 }
3200 for (i = 0; i < nargs; i++) { 3315 for (i = 0; i < nargs; i++)
3316 {
3201 rendset = -1; 3317 rendset = -1;
3202 switch (arg[i]) { 3318 switch (arg[i])
3203 case 0: 3319 {
3320 case 0:
3204 rendset = 0, rendstyle = ~RS_None; 3321 rendset = 0, rendstyle = ~RS_None;
3205 break; 3322 break;
3206 case 1: 3323 case 1:
3207 rendset = 1, rendstyle = RS_Bold; 3324 rendset = 1, rendstyle = RS_Bold;
3208 break; 3325 break;
3209 case 4: 3326 case 4:
3210 rendset = 1, rendstyle = RS_Uline; 3327 rendset = 1, rendstyle = RS_Uline;
3211 break; 3328 break;
3212 case 5: 3329 case 5:
3213 rendset = 1, rendstyle = RS_Blink; 3330 rendset = 1, rendstyle = RS_Blink;
3214 break; 3331 break;
3215 case 7: 3332 case 7:
3216 rendset = 1, rendstyle = RS_RVid; 3333 rendset = 1, rendstyle = RS_RVid;
3217 break; 3334 break;
3218 case 22: 3335 case 22:
3219 rendset = 0, rendstyle = RS_Bold; 3336 rendset = 0, rendstyle = RS_Bold;
3220 break; 3337 break;
3221 case 24: 3338 case 24:
3222 rendset = 0, rendstyle = RS_Uline; 3339 rendset = 0, rendstyle = RS_Uline;
3223 break; 3340 break;
3224 case 25: 3341 case 25:
3225 rendset = 0, rendstyle = RS_Blink; 3342 rendset = 0, rendstyle = RS_Blink;
3226 break; 3343 break;
3227 case 27: 3344 case 27:
3228 rendset = 0, rendstyle = RS_RVid; 3345 rendset = 0, rendstyle = RS_RVid;
3229 break; 3346 break;
3230 } 3347 }
3231 if (rendset != -1) { 3348 if (rendset != -1)
3349 {
3232 scr_rendition (rendset, rendstyle); 3350 scr_rendition (rendset, rendstyle);
3233 continue; /* for(;i;) */ 3351 continue; /* for (;i;) */
3234 } 3352 }
3235 3353
3236 switch (arg[i]) { 3354 switch (arg[i])
3237 case 30: 3355 {
3356 case 30:
3238 case 31: /* set fg color */ 3357 case 31: /* set fg color */
3239 case 32: 3358 case 32:
3240 case 33: 3359 case 33:
3241 case 34: 3360 case 34:
3242 case 35: 3361 case 35:
3243 case 36: 3362 case 36:
3244 case 37: 3363 case 37:
3245 scr_color ((unsigned int)(minCOLOR + (arg[i] - 30)), 3364 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)),
3246 Color_fg); 3365 Color_fg);
3247 break; 3366 break;
3248#ifdef TTY_256COLOR 3367#ifdef TTY_256COLOR
3249 case 38: 3368 case 38:
3250 if (nargs > i + 2 && arg[i + 1] == 5) { 3369 if (nargs > i + 2 && arg[i + 1] == 5)
3370 {
3251 scr_color ((unsigned int)(minCOLOR + arg[i + 2]), 3371 scr_color ((unsigned int) (minCOLOR + arg[i + 2]),
3252 Color_fg); 3372 Color_fg);
3253 i += 2; 3373 i += 2;
3254 } 3374 }
3255 break; 3375 break;
3256#endif 3376#endif
3257 case 39: /* default fg */ 3377 case 39: /* default fg */
3258 scr_color (Color_fg, Color_fg); 3378 scr_color (Color_fg, Color_fg);
3259 break; 3379 break;
3260 3380
3261 case 40: 3381 case 40:
3262 case 41: /* set bg color */ 3382 case 41: /* set bg color */
3263 case 42: 3383 case 42:
3264 case 43: 3384 case 43:
3265 case 44: 3385 case 44:
3266 case 45: 3386 case 45:
3267 case 46: 3387 case 46:
3268 case 47: 3388 case 47:
3269 scr_color ((unsigned int)(minCOLOR + (arg[i] - 40)), 3389 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)),
3270 Color_bg); 3390 Color_bg);
3271 break; 3391 break;
3272#ifdef TTY_256COLOR 3392#ifdef TTY_256COLOR
3273 case 48: 3393 case 48:
3274 if (nargs > i + 2 && arg[i + 1] == 5) { 3394 if (nargs > i + 2 && arg[i + 1] == 5)
3395 {
3275 scr_color ((unsigned int)(minCOLOR + arg[i + 2]), 3396 scr_color ((unsigned int) (minCOLOR + arg[i + 2]),
3276 Color_bg); 3397 Color_bg);
3277 i += 2; 3398 i += 2;
3278 } 3399 }
3279 break; 3400 break;
3280#endif 3401#endif
3281 case 49: /* default bg */ 3402 case 49: /* default bg */
3282 scr_color (Color_bg, Color_bg); 3403 scr_color (Color_bg, Color_bg);
3283 break; 3404 break;
3284 3405
3285#ifndef NO_BRIGHTCOLOR 3406#ifndef NO_BRIGHTCOLOR
3286 case 90: 3407 case 90:
3287 case 91: /* set bright fg color */ 3408 case 91: /* set bright fg color */
3288 case 92: 3409 case 92:
3289 case 93: 3410 case 93:
3290 case 94: 3411 case 94:
3291 case 95: 3412 case 95:
3292 case 96: 3413 case 96:
3293 case 97: 3414 case 97:
3294 scr_color ((unsigned int)(minBrightCOLOR + (arg[i] - 90)), 3415 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)),
3295 Color_fg); 3416 Color_fg);
3296 break; 3417 break;
3297 case 100: 3418 case 100:
3298 case 101: /* set bright bg color */ 3419 case 101: /* set bright bg color */
3299 case 102: 3420 case 102:
3300 case 103: 3421 case 103:
3301 case 104: 3422 case 104:
3302 case 105: 3423 case 105:
3303 case 106: 3424 case 106:
3304 case 107: 3425 case 107:
3305 scr_color ((unsigned int)(minBrightCOLOR + (arg[i] - 100)), 3426 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)),
3306 Color_bg); 3427 Color_bg);
3307 break; 3428 break;
3308#endif 3429#endif
3309 } 3430
3431 }
3310 } 3432 }
3311} 3433}
3312/*}}} */ 3434/*}}} */
3313 3435
3314/*{{{ process Rob Nation's own graphics mode sequences */ 3436/*{{{ process Rob Nation's own graphics mode sequences */
3315void 3437void
3316rxvt_term::process_graphics () 3438rxvt_term::process_graphics ()
3317{ 3439{
3318 unsigned char ch, cmd = cmd_getc (); 3440 unsigned char ch, cmd = cmd_getc ();
3319 3441
3320#ifndef RXVT_GRAPHICS 3442 if (cmd == 'Q')
3321 if (cmd == 'Q') { /* query graphics */ 3443 { /* query graphics */
3322 tt_printf("\033G0\n"); /* no graphics */ 3444 tt_printf ("\033G0\n"); /* no graphics */
3323 return; 3445 return;
3324 } 3446 }
3325/* swallow other graphics sequences until terminating ':' */ 3447 /* swallow other graphics sequences until terminating ':' */
3326 do 3448 do
3327 ch = cmd_getc ();
3328 while (ch != ':');
3329#else
3330 unsigned int nargs;
3331 int args[NGRX_PTS];
3332 unsigned char *text = NULL;
3333
3334 if (cmd == 'Q') { /* query graphics */
3335 tt_printf("\033G1\n"); /* yes, graphics (color) */
3336 return;
3337 }
3338 for (nargs = 0; nargs < (sizeof(args) / sizeof(args[0])) - 1;) {
3339 int neg;
3340
3341 ch = cmd_getc ();
3342 neg = (ch == '-');
3343 if (neg || ch == '+')
3344 ch = cmd_getc (); 3449 ch = cmd_getc ();
3345 3450 while (ch != ':');
3346 for (args[nargs] = 0; isdigit(ch); ch = cmd_getc ())
3347 args[nargs] = args[nargs] * 10 + (ch - '0');
3348 if (neg)
3349 args[nargs] = -args[nargs];
3350
3351 nargs++;
3352 args[nargs] = 0;
3353 if (ch != ';')
3354 break;
3355 }
3356
3357 if ((cmd == 'T') && (nargs >= 5)) {
3358 int i, len = args[4];
3359
3360 text = (unsigned char *)rxvt_malloc((len + 1) * sizeof(char));
3361
3362 if (text != NULL) {
3363 for (i = 0; i < len; i++)
3364 text[i] = cmd_getc ();
3365 text[len] = '\0';
3366 }
3367 }
3368 Gr_do_graphics (cmd, nargs, args, text);
3369#endif
3370} 3451}
3371/*}}} */ 3452/*}}} */
3372 3453
3373/* ------------------------------------------------------------------------- */ 3454/* ------------------------------------------------------------------------- */
3374 3455
3375/* 3456/*
3376 * Send printf() formatted output to the command. 3457 * Send printf () formatted output to the command.
3377 * Only use for small amounts of data. 3458 * Only use for small amounts of data.
3378 */ 3459 */
3379void 3460void
3380rxvt_term::tt_printf (const char *fmt,...) 3461rxvt_term::tt_printf (const char *fmt,...)
3381{ 3462{

Diff Legend

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