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.23 by pcg, Thu Dec 18 14:11:47 2003 UTC vs.
Revision 1.41 by pcg, Tue Feb 10 00:40:39 2004 UTC

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

Diff Legend

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