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.12 by pcg, Fri Dec 5 04:05:13 2003 UTC vs.
Revision 1.49 by pcg, Sat Feb 21 22:14:00 2004 UTC

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

Diff Legend

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