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.15 by pcg, Tue Dec 16 23:04:13 2003 UTC vs.
Revision 1.36 by pcg, Sun Feb 1 01:34:41 2004 UTC

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

Diff Legend

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