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.11 by pcg, Tue Dec 2 21:49:46 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.11 2003/12/02 21:49:46 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)
821 {
822 bool flag = true;
823
791 // loop, but don't allow a single term to monopolize us 824 // loop, but don't allow a single term to monopolize us
792 // the number of loops is fully arbitrary, and thus wrong 825 // the number of loops is fully arbitrary, and thus wrong
793 for (int i = 1; i-- && pty_fill (); ) 826 while (flag && pty_fill ())
794 { 827 {
795 if (!seen_input) 828 if (!seen_input)
796 { 829 {
797 seen_input = 1; 830 seen_input = 1;
798 /* once we know the shell is running, send the screen size. Again! */ 831 /* once we know the shell is running, send the screen size. Again! */
799 tt_winch (); 832 tt_winch ();
800 } 833 }
801 834
802 uint32_t ch = NOCHAR; 835 uint32_t ch = NOCHAR;
803 836
804 for (;;) 837 for (;;)
805 { 838 {
806 if (ch == NOCHAR) 839 if (ch == NOCHAR)
807 ch = next_char (); 840 ch = next_char ();
808 841
809 if (ch == NOCHAR) // TODO: improve 842 if (ch == NOCHAR) // TODO: improve
810 break; 843 break;
811 844
812 if (ch >= ' ' || ch == '\t' || ch == '\n' || ch == '\r') 845 if (ch >= ' ' || ch == '\t' || ch == '\n' || ch == '\r')
813 { 846 {
814 /* Read a text string from the input buffer */ 847 /* Read a text string from the input buffer */
815 uint32_t buf[BUFSIZ]; 848 uint32_t buf[BUFSIZ];
816 bool refreshnow = false; 849 bool refreshnow = false;
817 int nlines = 0; 850 int nlines = 0;
818 uint32_t *str = buf; 851 uint32_t *str = buf;
819 852
820 *str++ = ch; 853 *str++ = ch;
821 854
822 for (;;) 855 for (;;)
823 { 856 {
824 ch = next_char (); 857 ch = next_char ();
825 858
826 if (ch == NOCHAR || (ch < ' ' && ch != '\t' && ch != '\n' && ch != '\r')) 859 if (ch == NOCHAR || (ch < ' ' && ch != '\t' && ch != '\n' && ch != '\r'))
827 break; 860 break;
828 else 861 else
829 { 862 {
830 *str++ = ch; 863 *str++ = ch;
831 864
832 if (ch == '\n') 865 if (ch == '\n')
833 { 866 {
834 nlines++; 867 nlines++;
835 refresh_count++; 868 refresh_count++;
836 869
837 if (!(Options & Opt_jumpScroll) 870 if (! (Options & Opt_jumpScroll)
838 || (refresh_count >= (refresh_limit * (TermWin.nrow - 1)))) 871 || (refresh_count >= (refresh_limit * (TermWin.nrow - 1))))
839 { 872 {
840 refreshnow = true; 873 refreshnow = true;
874 flag = false;
841 ch = NOCHAR; 875 ch = NOCHAR;
842 break; 876 break;
843 } 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 }
844 } 886 }
845 887
846 if (str >= buf + BUFSIZ) 888 if (str >= buf + BUFSIZ)
847 { 889 {
848 ch = NOCHAR; 890 ch = NOCHAR;
849 break; 891 break;
850 } 892 }
851 } 893 }
852 } 894 }
853 895
854 rxvt_scr_add_lines (this, buf, nlines, str - buf); 896 scr_add_lines (buf, nlines, str - buf);
855 897
856 /* 898 /*
857 * 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
858 * 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.
859 * the number of pages between refreshes is refresh_limit, which 901 * the number of pages between refreshes is refresh_limit, which
860 * is incremented here because we must be doing flat-out scrolling. 902 * is incremented here because we must be doing flat-out scrolling.
861 * 903 *
862 * refreshing should be correct for small scrolls, because of the 904 * refreshing should be correct for small scrolls, because of the
863 * time-out 905 * time-out
864 */ 906 */
865 if (refreshnow) 907 if (refreshnow)
866 { 908 {
867 if ((Options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 909 if ((Options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
868 refresh_limit++; 910 refresh_limit++;
869 911
870 rxvt_scr_refresh (this, refresh_type); 912 scr_refresh (refresh_type);
871 } 913 }
872 914
873 } 915 }
874 else 916 else
875 { 917 {
876 switch (ch) 918 switch (ch)
877 { 919 {
878 default: 920 default:
879 rxvt_process_nonprinting (this, ch); 921 process_nonprinting (ch);
880 break; 922 break;
881 case C0_ESC: /* escape char */ 923 case C0_ESC: /* escape char */
882 rxvt_process_escape_seq (this); 924 process_escape_seq ();
883 break; 925 break;
884 /*case 0x9b: */ /* CSI */ 926 /*case 0x9b: */ /* CSI */
885 /* rxvt_process_csi_seq (this); */ 927 /* process_csi_seq (); */
886 } 928 }
887 929
888 ch = NOCHAR; 930 ch = NOCHAR;
889 } 931 }
890 } 932 }
891 } 933 }
934 }
892} 935}
893 936
894// read the next character, currently handles UTF-8 937// read the next character, currently handles UTF-8
895// will probably handle all sorts of other stuff in the future 938// will probably handle all sorts of other stuff in the future
896uint32_t 939uint32_t
897rxvt_term::next_char () 940rxvt_term::next_char ()
898{ 941{
899 struct mbstate &s = mbstate;
900
901 while (cmdbuf_ptr < cmdbuf_endp) 942 while (cmdbuf_ptr < cmdbuf_endp)
902 { 943 {
903 uint8_t ch = *cmdbuf_ptr; 944 if (*cmdbuf_ptr < 0x80) // assume < 0x80 to be ascii ALWAYS (all shift-states etc.) uh-oh
904
905 if (s.cnt)
906 {
907 if ((ch & 0xc0) == 0x80)
908 {
909 cmdbuf_ptr++;
910
911 /* continuation */
912 s.reg = (s.reg << 6) | (ch & 0x7f);
913
914 if (--s.cnt == 0 && s.reg >= 128) /* if !inrange then corruption or Racking */
915 return s.reg;
916
917 continue;
918 }
919 else
920 {
921 s.cnt = 0;
922 return s.orig; /* the _occasional_ non-utf-8 character may slip through... */
923 }
924 }
925
926 if ((ch & 0xc0) == 0xc0)
927 {
928 cmdbuf_ptr++; 945 return *cmdbuf_ptr++;
929 946
930 /* first byte */ 947 wchar_t wc;
931 s.orig = ch; /* for broken encodings */ 948 size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
932 s.reg = ch; 949
933 if ((ch & 0xe0) == 0xc0) { s.reg &= 0x1f; s.cnt = 1; } 950 if (len == (size_t)-2)
934 if ((ch & 0xf0) == 0xe0) { s.reg &= 0x0f; s.cnt = 2; } 951 return NOCHAR;
935 if ((ch & 0xf8) == 0xf0) { s.reg &= 0x07; s.cnt = 3; } 952
936 if ((ch & 0xfc) == 0xf8) { s.reg &= 0x03; s.cnt = 4; } 953 if (len == (size_t)-1)
937 if ((ch & 0xfe) == 0xfc) { s.reg &= 0x01; s.cnt = 5; } 954 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
938 } 955
939 else 956 // assume wchar == unicode
940 { 957 cmdbuf_ptr += len;
941 cmdbuf_ptr++; /* _occasional_ non-utf8 may slip through... */
942 return ch; 958 return wc;
943 }
944 } 959 }
945 960
946 return NOCHAR; 961 return NOCHAR;
947} 962}
948 963
949/* rxvt_cmd_getc() - Return next input character */ 964/* rxvt_cmd_getc () - Return next input character */
950/* 965/*
951 * Return the next input character after first passing any keyboard input 966 * Return the next input character after first passing any keyboard input
952 * to the command. 967 * to the command.
953 */ 968 */
954/* INTPROTO */
955uint32_t 969uint32_t
956rxvt_cmd_getc(pR) 970rxvt_term::cmd_getc ()
957{ 971{
958 for (;;) 972 for (;;)
959 { 973 {
960 uint32_t c = R->next_char (); 974 uint32_t c = next_char ();
961 if (c != NOCHAR) 975 if (c != NOCHAR)
962 return c; 976 return c;
963 977
964 // incomplete sequences should occur rarely, still, a better solution 978 // incomplete sequences should occur rarely, still, a better solution
965 // would be preferred. either setjmp/longjmp or better design. 979 // would be preferred. either setjmp/longjmp or better design.
966 fcntl (R->cmd_fd, F_SETFL, 0); 980 fcntl (cmd_fd, F_SETFL, 0);
967 R->pty_fill (); 981 pty_fill ();
968 fcntl (R->cmd_fd, F_SETFL, O_NONBLOCK); 982 fcntl (cmd_fd, F_SETFL, O_NONBLOCK);
969 }
970
971#if 0
972#define TIMEOUT_USEC 5000
973 fd_set readfds;
974 int quick_timeout, select_res;
975 int want_motion_time, want_keypress_time;
976 struct timeval value;
977#if defined(POINTER_BLANK) || defined(CURSOR_BLINK)
978 struct timeval tp;
979#endif
980
981 for (;;) {
982 /* loop until we can return something */
983
984 if (R->v_bufstr < R->v_bufptr) /* output any pending chars */
985 R->tt_write(NULL, 0);
986
987#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
988 if (R->mouse_slip_wheel_speed) {
989 quick_timeout = 1;
990 if (!R->mouse_slip_wheel_delay--
991 && rxvt_scr_page(aR_ R->mouse_slip_wheel_speed > 0 ? UP : DN,
992 abs(R->mouse_slip_wheel_speed))) {
993 R->mouse_slip_wheel_delay = SCROLLBAR_CONTINUOUS_DELAY;
994 R->refresh_type |= SMOOTH_REFRESH;
995 R->want_refresh = 1;
996 } 983 }
997 }
998#endif /* MOUSE_WHEEL && MOUSE_SLIP_WHEELING */
999#ifdef SELECTION_SCROLLING
1000 if (R->pending_scroll_selection) {
1001 quick_timeout = 1;
1002 if (!R->scroll_selection_delay--
1003 && rxvt_scr_page(aR_ R->scroll_selection_dir,
1004 R->scroll_selection_lines)) {
1005 rxvt_selection_extend(aR_ R->selection_save_x,
1006 R->selection_save_y, R->selection_save_state);
1007 R->scroll_selection_delay = SCROLLBAR_CONTINUOUS_DELAY;
1008 R->refresh_type |= SMOOTH_REFRESH;
1009 R->want_refresh = 1;
1010 }
1011 }
1012#endif
1013#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1014 if (scrollbar_isUp() || scrollbar_isDn()) {
1015 quick_timeout = 1;
1016 if (!R->scroll_arrow_delay--
1017 && rxvt_scr_page(aR_ scrollbar_isUp() ? UP : DN, 1)) {
1018 R->scroll_arrow_delay = SCROLLBAR_CONTINUOUS_DELAY;
1019 R->refresh_type |= SMOOTH_REFRESH;
1020 R->want_refresh = 1;
1021 }
1022 }
1023#endif /* NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING */
1024
1025#ifdef TRANSPARENT
1026 quick_timeout |= R->want_full_refresh;
1027#endif
1028#endif
1029} 984}
1030 985
986#ifdef POINTER_BLANK
1031void 987void
1032rxvt_term::pointer_unblank () 988rxvt_term::pointer_unblank ()
1033{ 989{
1034 XDefineCursor (Xdisplay, TermWin.vt, TermWin_cursor); 990 XDefineCursor (display->display, TermWin.vt, TermWin_cursor);
1035 rxvt_recolour_cursor (this); 991 recolour_cursor ();
1036 992
1037#ifdef POINTER_BLANK
1038 hidden_pointer = 0; 993 hidden_pointer = 0;
1039 994
1040 if (Options & Opt_pointerBlank) 995 if (Options & Opt_pointerBlank)
1041 pointer_ev.start (NOW + pointerBlankDelay); 996 pointer_ev.start (NOW + pointerBlankDelay);
1042#endif
1043} 997}
1044 998
1045#ifdef POINTER_BLANK
1046void 999void
1047rxvt_term::pointer_blank () 1000rxvt_term::pointer_blank ()
1048{ 1001{
1049 pointer_ev.stop ();
1050
1051 if (!(Options & Opt_pointerBlank)) 1002 if (! (Options & Opt_pointerBlank))
1052 return; 1003 return;
1053 1004
1054 XDefineCursor (Xdisplay, TermWin.vt, blank_cursor); 1005 XDefineCursor (display->display, TermWin.vt, blank_cursor);
1055 XFlush (Xdisplay); 1006 XFlush (display->display);
1056 1007
1057 hidden_pointer = 1; 1008 hidden_pointer = 1;
1058} 1009}
1059 1010
1060void 1011void
1061rxvt_term::pointer_cb (time_watcher &w) 1012rxvt_term::pointer_cb (time_watcher &w)
1062{ 1013{
1063 SET_R (this); 1014 SET_R (this);
1015 SET_LOCALE (locale);
1064 1016
1065 pointer_blank (); 1017 pointer_blank ();
1066} 1018}
1067#endif 1019#endif
1068 1020
1069/* INTPROTO */
1070void 1021void
1071rxvt_mouse_report(pR_ const XButtonEvent *ev) 1022rxvt_term::mouse_report (const XButtonEvent &ev)
1072{ 1023{
1073 int button_number, key_state = 0; 1024 int button_number, key_state = 0;
1074 int x, y; 1025 int x, y;
1075 1026
1076 x = ev->x; 1027 x = ev.x;
1077 y = ev->y; 1028 y = ev.y;
1078 rxvt_pixel_position(aR_ &x, &y); 1029 pixel_position (&x, &y);
1079 1030
1080 if (R->MEvent.button == AnyButton) { 1031 if (MEvent.button == AnyButton)
1032 {
1081 button_number = 3; 1033 button_number = 3;
1082 } else { 1034 }
1035 else
1036 {
1083 button_number = R->MEvent.button - Button1; 1037 button_number = MEvent.button - Button1;
1084 /* add 0x3D for wheel events, like xterm does */ 1038 /* add 0x3D for wheel events, like xterm does */
1085 if (button_number >= 3) 1039 if (button_number >= 3)
1086 button_number += (64 - 3); 1040 button_number += (64 - 3);
1087 } 1041 }
1088 1042
1089 if (R->PrivateModes & PrivMode_MouseX10) { 1043 if (PrivateModes & PrivMode_MouseX10)
1044 {
1090 /* 1045 /*
1091 * do not report ButtonRelease 1046 * do not report ButtonRelease
1092 * no state info allowed 1047 * no state info allowed
1093 */ 1048 */
1094 key_state = 0; 1049 key_state = 0;
1095 if (button_number == 3) 1050 if (button_number == 3)
1096 return; 1051 return;
1097 } else { 1052 }
1053 else
1054 {
1098 /* XTerm mouse reporting needs these values: 1055 /* XTerm mouse reporting needs these values:
1099 * 4 = Shift 1056 * 4 = Shift
1100 * 8 = Meta 1057 * 8 = Meta
1101 * 16 = Control 1058 * 16 = Control
1102 * plus will add in our own Double-Click reporting 1059 * plus will add in our own Double-Click reporting
1103 * 32 = Double Click 1060 * 32 = Double Click
1104 */ 1061 */
1105 key_state = ((R->MEvent.state & ShiftMask) ? 4 : 0) 1062 key_state = ((MEvent.state & ShiftMask) ? 4 : 0)
1106 + ((R->MEvent.state & R->ModMetaMask) ? 8 : 0) 1063 + ((MEvent.state & ModMetaMask) ? 8 : 0)
1107 + ((R->MEvent.state & ControlMask) ? 16 : 0); 1064 + ((MEvent.state & ControlMask) ? 16 : 0);
1108#ifdef MOUSE_REPORT_DOUBLECLICK 1065#ifdef MOUSE_REPORT_DOUBLECLICK
1109 key_state += ((R->MEvent.clicks > 1) ? 32 : 0); 1066 key_state += ((MEvent.clicks > 1) ? 32 : 0);
1110#endif 1067#endif
1068
1111 } 1069 }
1112 1070
1113#ifdef DEBUG_MOUSEREPORT 1071#ifdef DEBUG_MOUSEREPORT
1114 fprintf(stderr, "Mouse ["); 1072 fprintf (stderr, "Mouse [");
1115 if (key_state & 16) 1073 if (key_state & 16)
1116 fputc('C', stderr); 1074 fputc ('C', stderr);
1117 if (key_state & 4) 1075 if (key_state & 4)
1118 fputc('S', stderr); 1076 fputc ('S', stderr);
1119 if (key_state & 8) 1077 if (key_state & 8)
1120 fputc('A', stderr); 1078 fputc ('A', stderr);
1121 if (key_state & 32) 1079 if (key_state & 32)
1122 fputc('2', stderr); 1080 fputc ('2', stderr);
1123 fprintf(stderr, "]: <%d>, %d/%d\n", 1081 fprintf (stderr, "]: <%d>, %d/%d\n",
1124 button_number, 1082 button_number,
1125 x + 1, 1083 x + 1,
1126 y + 1); 1084 y + 1);
1127#else 1085#else
1128 R->tt_printf("\033[M%c%c%c", 1086 tt_printf ("\033[M%c%c%c",
1129 (32 + button_number + key_state), 1087 (32 + button_number + key_state),
1130 (32 + x + 1), 1088 (32 + x + 1),
1131 (32 + y + 1)); 1089 (32 + y + 1));
1132#endif 1090#endif
1133} 1091}
1134 1092
1135#ifdef USING_W11LIB 1093#ifdef USING_W11LIB
1136/* EXTPROTO */
1137void 1094void
1138rxvt_W11_process_x_event(XEvent *ev) 1095rxvt_W11_process_x_event (XEvent *ev)
1139{ 1096{
1140 rxvt_t *r = rxvt_get_r(); 1097 rxvt_t *r = rxvt_get_r ();
1141 1098
1142 rxvt_process_x_event(aR_ ev); 1099 x_cb (*ev);
1143} 1100}
1144#endif 1101#endif
1145 1102
1146/*{{{ process an X event */ 1103/*{{{ process an X event */
1147/* INTPROTO */
1148void 1104void
1149rxvt_process_x_event(pR_ XEvent *ev) 1105rxvt_term::x_cb (XEvent &ev)
1150{ 1106{
1151 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
1152 Window unused_root, unused_child; 1142 Window unused_root, unused_child;
1153 int unused_root_x, unused_root_y; 1143 int unused_root_x, unused_root_y;
1154 unsigned int unused_mask; 1144 unsigned int unused_mask;
1155 struct timeval tp;
1156 1145
1157#ifdef DEBUG_X 1146#ifdef DEBUG_X
1158 const char *const eventnames[] = 1147 const char *const eventnames[] =
1159 { /* mason - this matches my system */ 1148 { /* mason - this matches my system */
1160 "", 1149 "",
1161 "", 1150 "",
1162 "KeyPress", 1151 "KeyPress",
1163 "KeyRelease", 1152 "KeyRelease",
1164 "ButtonPress", 1153 "ButtonPress",
1165 "ButtonRelease", 1154 "ButtonRelease",
1166 "MotionNotify", 1155 "MotionNotify",
1167 "EnterNotify", 1156 "EnterNotify",
1168 "LeaveNotify", 1157 "LeaveNotify",
1169 "FocusIn", 1158 "FocusIn",
1170 "FocusOut", 1159 "FocusOut",
1171 "KeymapNotify", 1160 "KeymapNotify",
1172 "Expose", 1161 "Expose",
1173 "GraphicsExpose", 1162 "GraphicsExpose",
1174 "NoExpose", 1163 "NoExpose",
1175 "VisibilityNotify", 1164 "VisibilityNotify",
1176 "CreateNotify", 1165 "CreateNotify",
1177 "DestroyNotify", 1166 "DestroyNotify",
1178 "UnmapNotify", 1167 "UnmapNotify",
1179 "MapNotify", 1168 "MapNotify",
1180 "MapRequest", 1169 "MapRequest",
1181 "ReparentNotify", 1170 "ReparentNotify",
1182 "ConfigureNotify", 1171 "ConfigureNotify",
1183 "ConfigureRequest", 1172 "ConfigureRequest",
1184 "GravityNotify", 1173 "GravityNotify",
1185 "ResizeRequest", 1174 "ResizeRequest",
1186 "CirculateNotify", 1175 "CirculateNotify",
1187 "CirculateRequest", 1176 "CirculateRequest",
1188 "PropertyNotify", 1177 "PropertyNotify",
1189 "SelectionClear", 1178 "SelectionClear",
1190 "SelectionRequest", 1179 "SelectionRequest",
1191 "SelectionNotify", 1180 "SelectionNotify",
1192 "ColormapNotify", 1181 "ColormapNotify",
1193 "ClientMessage", 1182 "ClientMessage",
1194 "MappingNotify" 1183 "MappingNotify"
1195 }; 1184 };
1196 struct tm *ltt;
1197#endif 1185#endif
1198
1199 /*
1200 * check if we need to get the time for any timeouts
1201 */
1202
1203 for (i = NUM_TIMEOUTS; i--; )
1204 if (R->timeout[i].tv_sec) {
1205 want_timeout = 1;
1206 break;
1207 }
1208
1209#ifndef DEBUG_X
1210 if (want_timeout)
1211#endif
1212 (void)gettimeofday(&tp, NULL);
1213 1186
1214#ifdef DEBUG_X 1187#ifdef DEBUG_X
1188 struct timeval tp;
1189 struct tm *ltt;
1190 (void)gettimeofday (&tp, NULL);
1215 ltt = localtime(&(tp.tv_sec)); 1191 ltt = localtime (& (tp.tv_sec));
1216 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));
1217#endif 1193#endif
1218 1194
1219 /* X event timeouts */
1220 if (want_timeout)
1221 for (i = NUM_TIMEOUTS; i--; ) {
1222 if (R->timeout[i].tv_sec == 0)
1223 continue;
1224 if ((tp.tv_sec < R->timeout[i].tv_sec)
1225 || (tp.tv_sec == R->timeout[i].tv_sec
1226 && tp.tv_usec < R->timeout[i].tv_usec))
1227 continue;
1228 R->timeout[i].tv_sec = 0;
1229 switch(i) {
1230 case TIMEOUT_INCR:
1231 rxvt_print_error("data loss: timeout on INCR selection paste");
1232 R->selection_wait = Sel_none;
1233 break;
1234 default:
1235 break;
1236 }
1237 }
1238
1239 switch (ev->type) { 1195 switch (ev.type)
1196 {
1240 case KeyPress: 1197 case KeyPress:
1241 rxvt_lookup_key(aR_ (XKeyEvent *)ev); 1198 lookup_key (ev.xkey);
1242 break; 1199 break;
1243 1200
1244#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1201#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1245 case KeyRelease: 1202 case KeyRelease:
1246 { 1203 {
1247 if (!(ev->xkey.state & ControlMask)) 1204 if (! (ev.xkey.state & ControlMask))
1248 R->mouse_slip_wheel_speed = 0; 1205 mouse_slip_wheel_speed = 0;
1249 else { 1206 else
1250 KeySym ks; 1207 {
1251 1208 KeySym ks;
1209
1252 ks = XKeycodeToKeysym(R->Xdisplay, ev->xkey.keycode, 0); 1210 ks = XKeycodeToKeysym (display->display, ev.xkey.keycode, 0);
1253 if (ks == XK_Control_L || ks == XK_Control_R) 1211 if (ks == XK_Control_L || ks == XK_Control_R)
1254 R->mouse_slip_wheel_speed = 0; 1212 mouse_slip_wheel_speed = 0;
1255 } 1213 }
1256 break; 1214 break;
1257 } 1215 }
1258#endif 1216#endif
1259 1217
1260 case ButtonPress: 1218 case ButtonPress:
1261 rxvt_button_press(aR_ (XButtonEvent *)ev); 1219 button_press (ev.xbutton);
1262 break; 1220 break;
1263 1221
1264 case ButtonRelease: 1222 case ButtonRelease:
1265 rxvt_button_release(aR_ (XButtonEvent *)ev); 1223 button_release (ev.xbutton);
1266 break; 1224 break;
1267 1225
1268 case ClientMessage: 1226 case ClientMessage:
1269 if (ev->xclient.format == 32 1227 if (ev.xclient.format == 32
1270 && (Atom)ev->xclient.data.l[0] == R->xa[XA_WMDELETEWINDOW]) 1228 && (Atom)ev.xclient.data.l[0] == xa[XA_WMDELETEWINDOW])
1271 R->destroy (); 1229 destroy ();
1272#ifdef OFFIX_DND 1230#ifdef OFFIX_DND
1273 /* OffiX Dnd (drag 'n' drop) protocol */ 1231 /* OffiX Dnd (drag 'n' drop) protocol */
1274 else if (ev->xclient.message_type == R->xa[XA_DNDPROTOCOL] 1232 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1275 && (ev->xclient.data.l[0] == DndFile 1233 && (ev.xclient.data.l[0] == DndFile
1276 || ev->xclient.data.l[0] == DndDir 1234 || ev.xclient.data.l[0] == DndDir
1277 || ev->xclient.data.l[0] == DndLink)) { 1235 || ev.xclient.data.l[0] == DndLink))
1278 /* Get Dnd data */ 1236 {
1237 /* Get Dnd data */
1279 Atom ActualType; 1238 Atom ActualType;
1280 int ActualFormat; 1239 int ActualFormat;
1281 unsigned char *data; 1240 unsigned char *data;
1282 unsigned long Size, RemainingBytes; 1241 unsigned long Size, RemainingBytes;
1283 1242
1284 XGetWindowProperty(R->Xdisplay, Xroot, 1243 XGetWindowProperty (display->display, display->root,
1285 R->xa[XA_DNDSELECTION], 1244 xa[XA_DNDSELECTION],
1286 0L, 1000000L, 1245 0L, 1000000L,
1287 False, AnyPropertyType, 1246 False, AnyPropertyType,
1288 &ActualType, &ActualFormat, 1247 &ActualType, &ActualFormat,
1289 &Size, &RemainingBytes, 1248 &Size, &RemainingBytes,
1290 &data); 1249 &data);
1291 XChangeProperty(R->Xdisplay, Xroot, 1250 XChangeProperty (display->display, display->root,
1292 XA_CUT_BUFFER0, XA_STRING, 1251 XA_CUT_BUFFER0, XA_STRING,
1293 8, PropModeReplace, 1252 8, PropModeReplace,
1294 data, STRLEN(data)); 1253 data, STRLEN (data));
1295 rxvt_selection_paste(aR_ Xroot, XA_CUT_BUFFER0, True); 1254 selection_paste (display->root, XA_CUT_BUFFER0, True);
1296 XSetInputFocus(R->Xdisplay, Xroot, RevertToNone, CurrentTime); 1255 XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime);
1297 } 1256 }
1298#endif /* OFFIX_DND */ 1257#endif /* OFFIX_DND */
1299 break; 1258 break;
1300 1259
1301 case MappingNotify: 1260 case MappingNotify:
1302 XRefreshKeyboardMapping(&(ev->xmapping)); 1261 XRefreshKeyboardMapping (& (ev.xmapping));
1303 break; 1262 break;
1304 1263
1305 /* 1264 /*
1306 * XXX: this is not the _current_ arrangement 1265 * XXX: this is not the _current_ arrangement
1307 * Here's my conclusion: 1266 * Here's my conclusion:
1308 * If the window is completely unobscured, use bitblt's 1267 * If the window is completely unobscured, use bitblt's
1309 * to scroll. Even then, they're only used when doing partial 1268 * to scroll. Even then, they're only used when doing partial
1310 * screen scrolling. When partially obscured, we have to fill 1269 * screen scrolling. When partially obscured, we have to fill
1311 * in the GraphicsExpose parts, which means that after each refresh, 1270 * in the GraphicsExpose parts, which means that after each refresh,
1312 * we need to wait for the graphics expose or Noexpose events, 1271 * we need to wait for the graphics expose or Noexpose events,
1313 * which ought to make things real slow! 1272 * which ought to make things real slow!
1314 */ 1273 */
1315 case VisibilityNotify: 1274 case VisibilityNotify:
1316 switch (ev->xvisibility.state) 1275 switch (ev.xvisibility.state)
1317 { 1276 {
1318 case VisibilityUnobscured: 1277 case VisibilityUnobscured:
1319 R->refresh_type = FAST_REFRESH; 1278 refresh_type = FAST_REFRESH;
1320 break; 1279 break;
1321 case VisibilityPartiallyObscured: 1280 case VisibilityPartiallyObscured:
1322 R->refresh_type = SLOW_REFRESH; 1281 refresh_type = SLOW_REFRESH;
1323 break; 1282 break;
1324 default: 1283 default:
1325 R->refresh_type = NO_REFRESH; 1284 refresh_type = NO_REFRESH;
1326 break; 1285 break;
1327 } 1286 }
1328 break; 1287 break;
1329 1288
1330 case FocusIn: 1289 case FocusIn:
1331 if (!R->TermWin.focus) { 1290 if (!TermWin.focus)
1332 R->TermWin.focus = 1; 1291 {
1333 R->want_refresh = 1; 1292 TermWin.focus = 1;
1293 want_refresh = 1;
1334#ifdef USE_XIM 1294#ifdef USE_XIM
1335 if (R->Input_Context != NULL) 1295 if (Input_Context != NULL)
1336 XSetICFocus(R->Input_Context); 1296 XSetICFocus (Input_Context);
1337#endif 1297#endif
1338#ifdef CURSOR_BLINK 1298#ifdef CURSOR_BLINK
1339 if (R->Options & Opt_cursorBlink) 1299 if (Options & Opt_cursorBlink)
1340 R->blink_ev.start (NOW + BLINK_INTERVAL); 1300 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1341#endif 1301#endif
1342 }
1343 break;
1344 1302
1303 }
1304 break;
1305
1345 case FocusOut: 1306 case FocusOut:
1346 if (R->TermWin.focus) { 1307 if (TermWin.focus)
1347 R->TermWin.focus = 0; 1308 {
1348 R->want_refresh = 1; 1309 TermWin.focus = 0;
1310 want_refresh = 1;
1349#ifdef USE_XIM 1311#ifdef USE_XIM
1350 if (R->Input_Context != NULL) 1312 if (Input_Context != NULL)
1351 XUnsetICFocus(R->Input_Context); 1313 XUnsetICFocus (Input_Context);
1352#endif 1314#endif
1353#ifdef CURSOR_BLINK 1315#ifdef CURSOR_BLINK
1354 if (R->Options & Opt_cursorBlink) 1316 if (Options & Opt_cursorBlink)
1355 R->blink_ev.stop (); 1317 cursor_blink_ev.stop ();
1356 R->hidden_cursor = 0; 1318 hidden_cursor = 0;
1357#endif 1319#endif
1358 }
1359 break;
1360 1320
1321 }
1322 break;
1323
1361 case ConfigureNotify: 1324 case ConfigureNotify:
1362 if (ev->xconfigure.window == R->TermWin.parent[0]) { 1325 if (ev.xconfigure.window == TermWin.parent[0])
1363 int height, width; 1326 {
1327 int height, width;
1364 1328
1329 do
1365 do { /* Wrap lots of configures into one */ 1330 { /* Wrap lots of configures into one */
1366 width = ev->xconfigure.width; 1331 width = ev.xconfigure.width;
1367 height = ev->xconfigure.height; 1332 height = ev.xconfigure.height;
1368 D_SIZE((stderr, "Size: ConfigureNotify: %4d x %4d", width, height)); 1333 D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height));
1369 } while (XCheckTypedWindowEvent(R->Xdisplay, ev->xconfigure.window, 1334 }
1370 ConfigureNotify, ev)); 1335 while (XCheckTypedWindowEvent (display->display, ev.xconfigure.window, ConfigureNotify, &ev));
1336
1371 if (R->szHint.width != width || R->szHint.height != height) { 1337 if (szHint.width != width || szHint.height != height)
1338 {
1372 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));
1373 rxvt_resize_all_windows(aR_ (unsigned int)width, 1340 resize_all_windows (width, height, 1);
1374 (unsigned int)height, 1); 1341 }
1375 }
1376#ifdef DEBUG_SIZE 1342#ifdef DEBUG_SIZE
1377 else { 1343 else
1344 {
1378 D_SIZE((stderr, "Size: Not resizing")); 1345 D_SIZE ((stderr, "Size: Not resizing"));
1379 } 1346 }
1380#endif 1347#endif
1381#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1348#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1382 if (R->Options & Opt_transparent) { 1349 if (Options & Opt_transparent)
1383 rxvt_check_our_parents(aR); 1350 {
1384 if (R->am_transparent) 1351 check_our_parents ();
1385 R->want_full_refresh = 1; 1352 if (am_transparent)
1386 } 1353 want_full_refresh = 1;
1354 }
1387#endif 1355#endif
1388 }
1389 break;
1390 1356
1357 }
1358 break;
1359
1391 case SelectionClear: 1360 case SelectionClear:
1392 rxvt_selection_clear(aR); 1361 display->set_selection_owner (0);
1393 break; 1362 break;
1394 1363
1395 case SelectionNotify: 1364 case SelectionNotify:
1396 if (R->selection_wait == Sel_normal) 1365 if (selection_wait == Sel_normal)
1397 rxvt_selection_paste(aR_ ev->xselection.requestor, 1366 selection_paste (ev.xselection.requestor,
1398 ev->xselection.property, True); 1367 ev.xselection.property, True);
1399 break; 1368 break;
1400 1369
1401 case SelectionRequest: 1370 case SelectionRequest:
1402 rxvt_selection_send(aR_ &(ev->xselectionrequest)); 1371 selection_send (ev.xselectionrequest);
1403 break; 1372 break;
1404 1373
1405 case UnmapNotify: 1374 case UnmapNotify:
1406 R->TermWin.mapped = 0; 1375 TermWin.mapped = 0;
1407 break; 1376#ifdef TEXT_BLINK
1377 text_blink_ev.stop ();
1378#endif
1379 break;
1408 1380
1409 case MapNotify: 1381 case MapNotify:
1410 R->TermWin.mapped = 1; 1382 TermWin.mapped = 1;
1411 break; 1383#ifdef TEXT_BLINK
1412 1384 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1413 case PropertyNotify: 1385#endif
1414 if (ev->xproperty.atom == R->xa[XA_VT_SELECTION]) {
1415 if (ev->xproperty.state == PropertyNewValue)
1416 rxvt_selection_property(aR_ ev->xproperty.window,
1417 ev->xproperty.atom);
1418 break; 1386 break;
1419 } 1387
1420#ifdef TRANSPARENT 1388#ifdef TRANSPARENT
1421 /*
1422 * if user used some Esetroot compatible prog to set the root bg,
1423 * use the property to determine the pixmap. We use it later on.
1424 */
1425 if (R->xa[XA_XROOTPMAPID] == 0)
1426 R->xa[XA_XROOTPMAPID] = XInternAtom(R->Xdisplay,
1427 "_XROOTPMAP_ID", False);
1428 if (ev->xproperty.atom != R->xa[XA_XROOTPMAPID])
1429 break;
1430 /* FALLTHROUGH */
1431 case ReparentNotify: 1389 case ReparentNotify:
1432 if ((R->Options & Opt_transparent) && rxvt_check_our_parents(aR)) { 1390 rootwin_cb (ev);
1433 if (R->am_transparent) 1391 break;
1434 R->want_full_refresh = 1;
1435 }
1436#endif /* TRANSPARENT */ 1392#endif /* TRANSPARENT */
1437 break;
1438 1393
1439 case GraphicsExpose: 1394 case GraphicsExpose:
1440 case Expose: 1395 case Expose:
1441 if (ev->xany.window == R->TermWin.vt) { 1396 if (ev.xany.window == TermWin.vt)
1397 {
1442#ifdef NO_SLOW_LINK_SUPPORT 1398#ifdef NO_SLOW_LINK_SUPPORT
1443 rxvt_scr_expose(aR_ ev->xexpose.x, ev->xexpose.y, 1399 scr_expose (ev.xexpose.x, ev.xexpose.y,
1444 ev->xexpose.width, ev->xexpose.height, False); 1400 ev.xexpose.width, ev.xexpose.height, False);
1445#else 1401#else
1446 // don't understand this, so commented it out 1402 // don't understand this, so commented it out
1447 rxvt_scr_expose(aR_ ev->xexpose.x, ev->xexpose.y, 1403 scr_expose (ev.xexpose.x, ev.xexpose.y,
1448 ev->xexpose.width, ev->xexpose.height, False); 1404 ev.xexpose.width, ev.xexpose.height, False);
1449 //rxvt_scr_expose(aR_ ev->xexpose.x, 0, 1405 //scr_expose (ev.xexpose.x, 0,
1450 // ev->xexpose.width, R->TermWin.height, False); 1406 // ev.xexpose.width, TermWin.height, False);
1451#endif 1407#endif
1452 R->want_refresh = 1; 1408 want_refresh = 1;
1453 } else { 1409 }
1454 XEvent unused_xevent; 1410 else
1411 {
1412 XEvent unused_event;
1455 1413
1456 while (XCheckTypedWindowEvent(R->Xdisplay, ev->xany.window, 1414 while (XCheckTypedWindowEvent (display->display, ev.xany.window,
1457 Expose, 1415 Expose,
1458 &unused_xevent)) ; 1416 &unused_event)) ;
1459 while (XCheckTypedWindowEvent(R->Xdisplay, ev->xany.window, 1417 while (XCheckTypedWindowEvent (display->display, ev.xany.window,
1460 GraphicsExpose, 1418 GraphicsExpose,
1461 &unused_xevent)) ; 1419 &unused_event)) ;
1462 if (isScrollbarWindow(ev->xany.window)) { 1420 if (isScrollbarWindow (ev.xany.window))
1463 scrollbar_setIdle(); 1421 {
1464 rxvt_scrollbar_show(aR_ 0); 1422 scrollBar.setIdle ();
1465 } 1423 scrollbar_show (0);
1424 }
1466#ifdef MENUBAR 1425#ifdef MENUBAR
1467 if (menubar_visible(aR) && isMenuBarWindow(ev->xany.window)) 1426 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1468 rxvt_menubar_expose(aR); 1427 menubar_expose ();
1469#endif 1428#endif
1470#ifdef RXVT_GRAPHICS 1429#ifdef RXVT_GRAPHICS
1471 rxvt_Gr_expose(aR_ ev->xany.window); 1430 Gr_expose (ev.xany.window);
1472#endif 1431#endif
1473 }
1474 break;
1475 1432
1433 }
1434 break;
1435
1476 case MotionNotify: 1436 case MotionNotify:
1477#ifdef POINTER_BLANK 1437#ifdef POINTER_BLANK
1478 if (R->hidden_pointer) 1438 if (hidden_pointer)
1479 R->pointer_unblank (); 1439 pointer_unblank ();
1480#endif 1440#endif
1481#if MENUBAR 1441#if MENUBAR
1482 if (isMenuBarWindow(ev->xany.window)) { 1442 if (isMenuBarWindow (ev.xany.window))
1483 rxvt_menubar_control(aR_ &(ev->xbutton)); 1443 {
1484 break; 1444 menubar_control (& (ev.xbutton));
1485 } 1445 break;
1446 }
1486#endif 1447#endif
1487 if ((R->PrivateModes & PrivMode_mouse_report) && !(R->bypass_keystate)) 1448 if ((PrivateModes & PrivMode_mouse_report) && ! (bypass_keystate))
1488 break; 1449 break;
1489 1450
1490 if (ev->xany.window == R->TermWin.vt) { 1451 if (ev.xany.window == TermWin.vt)
1452 {
1491 if ((ev->xbutton.state & (Button1Mask | Button3Mask))) { 1453 if ((ev.xbutton.state & (Button1Mask | Button3Mask)))
1492 while (XCheckTypedWindowEvent(R->Xdisplay, R->TermWin.vt, 1454 {
1493 MotionNotify, ev)) ; 1455 while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev))
1494 XQueryPointer(R->Xdisplay, R->TermWin.vt, 1456 ;
1495 &unused_root, &unused_child, 1457
1496 &unused_root_x, &unused_root_y, 1458 XQueryPointer (display->display, TermWin.vt,
1497 &(ev->xbutton.x), &(ev->xbutton.y), 1459 &unused_root, &unused_child,
1498 &unused_mask); 1460 &unused_root_x, &unused_root_y,
1461 & (ev.xbutton.x), & (ev.xbutton.y),
1462 &unused_mask);
1499#ifdef MOUSE_THRESHOLD 1463#ifdef MOUSE_THRESHOLD
1500 /* deal with a `jumpy' mouse */ 1464 /* deal with a `jumpy' mouse */
1501 if ((ev->xmotion.time - R->MEvent.time) > MOUSE_THRESHOLD) { 1465 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD)
1466 {
1502#endif 1467#endif
1503 rxvt_selection_extend(aR_ (ev->xbutton.x), (ev->xbutton.y), 1468 selection_extend ((ev.xbutton.x), (ev.xbutton.y),
1504 (ev->xbutton.state & Button3Mask) ? 2 : 0); 1469 (ev.xbutton.state & Button3Mask) ? 2 : 0);
1505#ifdef SELECTION_SCROLLING 1470#ifdef SELECTION_SCROLLING
1506 if (ev->xbutton.y<R->TermWin.int_bwidth || 1471 if (ev.xbutton.y < TermWin.int_bwidth
1507 Pixel2Row(ev->xbutton.y)>(R->TermWin.nrow-1)) { 1472 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1))
1508 int dist; 1473 {
1509 1474 int dist;
1510 R->pending_scroll_selection=1; 1475
1511 1476 pending_scroll_selection=1;
1477
1512 /* don't clobber the current delay if we are 1478 /* don't clobber the current delay if we are
1513 * already in the middle of scrolling. 1479 * already in the middle of scrolling.
1514 */ 1480 */
1515 if (R->scroll_selection_delay<=0) 1481 if (scroll_selection_delay<=0)
1516 R->scroll_selection_delay=SCROLLBAR_CONTINUOUS_DELAY; 1482 scroll_selection_delay=SCROLLBAR_CONTINUOUS_DELAY;
1517 1483
1518 /* save the event params so we can highlight 1484 /* save the event params so we can highlight
1519 * the selection in the pending-scroll loop 1485 * the selection in the pending-scroll loop
1520 */ 1486 */
1521 R->selection_save_x=ev->xbutton.x; 1487 selection_save_x=ev.xbutton.x;
1522 R->selection_save_y=ev->xbutton.y; 1488 selection_save_y=ev.xbutton.y;
1523 R->selection_save_state= 1489 selection_save_state=
1524 (ev->xbutton.state & Button3Mask) ? 2 : 0; 1490 (ev.xbutton.state & Button3Mask) ? 2 : 0;
1525 1491
1526 /* calc number of lines to scroll */ 1492 /* calc number of lines to scroll */
1527 if (ev->xbutton.y<R->TermWin.int_bwidth) { 1493 if (ev.xbutton.y<TermWin.int_bwidth)
1528 R->scroll_selection_dir = UP; 1494 {
1529 dist = R->TermWin.int_bwidth - ev->xbutton.y; 1495 scroll_selection_dir = UP;
1530 } 1496 dist = TermWin.int_bwidth - ev.xbutton.y;
1531 else { 1497 }
1532 R->scroll_selection_dir = DN; 1498 else
1533 dist = ev->xbutton.y - 1499 {
1534 (R->TermWin.int_bwidth + R->TermWin.height); 1500 scroll_selection_dir = DN;
1535 } 1501 dist = ev.xbutton.y -
1536 R->scroll_selection_lines=(Pixel2Height(dist)/ 1502 (TermWin.int_bwidth + TermWin.height);
1537 SELECTION_SCROLL_LINE_SPEEDUP)+1; 1503 }
1538 MIN_IT(R->scroll_selection_lines, 1504 scroll_selection_lines= (Pixel2Height (dist)/
1539 SELECTION_SCROLL_MAX_LINES); 1505 SELECTION_SCROLL_LINE_SPEEDUP)+1;
1540 } 1506 MIN_IT (scroll_selection_lines,
1541 else { 1507 SELECTION_SCROLL_MAX_LINES);
1508 }
1509 else
1510 {
1542 /* we are within the text window, so we 1511 /* we are within the text window, so we
1543 * shouldn't be scrolling 1512 * shouldn't be scrolling
1544 */ 1513 */
1545 R->pending_scroll_selection = 0; 1514 pending_scroll_selection = 0;
1546 } 1515 }
1547#endif 1516#endif
1548#ifdef MOUSE_THRESHOLD 1517#ifdef MOUSE_THRESHOLD
1549 } 1518
1519 }
1550#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;
1551 } 1540 }
1552 } else if (isScrollbarWindow(ev->xany.window) && scrollbar_isMotion()) {
1553 while (XCheckTypedWindowEvent(R->Xdisplay, R->scrollBar.win,
1554 MotionNotify, ev)) ;
1555 XQueryPointer(R->Xdisplay, R->scrollBar.win,
1556 &unused_root, &unused_child,
1557 &unused_root_x, &unused_root_y,
1558 &(ev->xbutton.x), &(ev->xbutton.y),
1559 &unused_mask);
1560 rxvt_scr_move_to(aR_ scrollbar_position(ev->xbutton.y) - R->csrO,
1561 scrollbar_size());
1562 rxvt_scr_refresh(aR_ R->refresh_type);
1563 R->refresh_limit = 0;
1564 rxvt_scrollbar_show(aR_ 1);
1565 }
1566 break;
1567 }
1568} 1541}
1569 1542
1570/* INTPROTO */
1571void 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
1572rxvt_button_press(pR_ XButtonEvent *ev) 1583rxvt_term::button_press (const XButtonEvent &ev)
1573{ 1584{
1574 int reportmode = 0, clickintime; 1585 int reportmode = 0, clickintime;
1575 1586
1576 R->bypass_keystate = ev->state & (R->ModMetaMask | ShiftMask); 1587 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1577 if (!R->bypass_keystate) 1588 if (!bypass_keystate)
1578 reportmode = !!(R->PrivateModes & PrivMode_mouse_report); 1589 reportmode = !! (PrivateModes & PrivMode_mouse_report);
1579/* 1590 /*
1580 * VT window processing of button press 1591 * VT window processing of button press
1581 */ 1592 */
1582 if (ev->window == R->TermWin.vt) 1593 if (ev.window == TermWin.vt)
1583 { 1594 {
1584#if RXVT_GRAPHICS 1595#if RXVT_GRAPHICS
1585 if (ev->subwindow != None) 1596 if (ev.subwindow != None)
1586 rxvt_Gr_ButtonPress(ev->x, ev->y); 1597 rxvt_Gr_ButtonPress (ev.x, ev.y);
1587 else 1598 else
1588#endif 1599#endif
1600
1601 {
1602 clickintime = ev.time - MEvent.time < MULTICLICK_TIME;
1603 if (reportmode)
1589 { 1604 {
1590 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
1591 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)
1592 { 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 {
1593 /* mouse report from vt window */ 1860 /* mouse report from vt window */
1594 /* save the xbutton state (for ButtonRelease) */ 1861 /* don't report release of wheel "buttons" */
1595 R->MEvent.state = ev->state; 1862 if (ev.button >= 4)
1863 return;
1596#ifdef MOUSE_REPORT_DOUBLECLICK 1864#ifdef MOUSE_REPORT_DOUBLECLICK
1597 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)))
1598 { 1870 {
1599 /* same button, within alloted time */ 1871 MEvent.clicks = 0;
1600 R->MEvent.clicks++; 1872 MEvent.button = AnyButton;
1601 if (R->MEvent.clicks > 1) 1873 mouse_report (ev);
1602 {
1603 /* only report double clicks */
1604 R->MEvent.clicks = 2;
1605 rxvt_mouse_report(aR_ ev);
1606
1607 /* don't report the release */
1608 R->MEvent.clicks = 0;
1609 R->MEvent.button = AnyButton;
1610 }
1611 }
1612 else
1613 { 1874 }
1614 /* different button, or time expired */ 1875#else /* MOUSE_REPORT_DOUBLECLICK */
1615 R->MEvent.clicks = 1; 1876 MEvent.button = AnyButton;
1616 R->MEvent.button = ev->button; 1877 mouse_report (ev);
1617 rxvt_mouse_report(aR_ ev);
1618 }
1619#else
1620 R->MEvent.button = ev->button;
1621 rxvt_mouse_report(aR_ ev);
1622#endif /* MOUSE_REPORT_DOUBLECLICK */ 1878#endif /* MOUSE_REPORT_DOUBLECLICK */
1623 }
1624 else
1625 { 1879 return;
1626 if (ev->button != R->MEvent.button)
1627 R->MEvent.clicks = 0;
1628 switch (ev->button)
1629 {
1630 case Button1:
1631 if (R->MEvent.button == Button1 && clickintime)
1632 R->MEvent.clicks++;
1633 else
1634 R->MEvent.clicks = 1;
1635 rxvt_selection_click(aR_ R->MEvent.clicks, ev->x, ev->y);
1636 R->MEvent.button = Button1;
1637 break;
1638
1639 case Button3:
1640 if (R->MEvent.button == Button3 && clickintime)
1641 rxvt_selection_rotate(aR_ ev->x, ev->y);
1642 else
1643 rxvt_selection_extend(aR_ ev->x, ev->y, 1);
1644 R->MEvent.button = Button3;
1645 break;
1646 } 1880 }
1647 }
1648 R->MEvent.time = ev->time;
1649 return;
1650 }
1651 }
1652
1653/*
1654 * Scrollbar window processing of button press
1655 */
1656 if (isScrollbarWindow(ev->window))
1657 {
1658 scrollbar_setIdle();
1659 /*
1660 * Rxvt-style scrollbar:
1661 * move up if mouse is above slider
1662 * move dn if mouse is below slider
1663 *
1664 * XTerm-style scrollbar:
1665 * Move display proportional to pointer location
1666 * pointer near top -> scroll one line
1667 * pointer near bot -> scroll full page
1668 */
1669#ifndef NO_SCROLLBAR_REPORT
1670 if (reportmode) {
1671 /*
1672 * Mouse report disabled scrollbar:
1673 * arrow buttons - send up/down
1674 * click on scrollbar - send pageup/down
1675 */
1676 if ((R->scrollBar.style == R_SB_NEXT
1677 && scrollbarnext_upButton(ev->y))
1678 || (R->scrollBar.style == R_SB_RXVT
1679 && scrollbarrxvt_upButton(ev->y)))
1680 R->tt_printf("\033[A");
1681 else if ((R->scrollBar.style == R_SB_NEXT
1682 && scrollbarnext_dnButton(ev->y))
1683 || (R->scrollBar.style == R_SB_RXVT
1684 && scrollbarrxvt_dnButton(ev->y)))
1685 R->tt_printf("\033[B");
1686 else
1687 switch (ev->button) {
1688 case Button2:
1689 R->tt_printf("\014");
1690 break;
1691 case Button1:
1692 R->tt_printf("\033[6~");
1693 break;
1694 case Button3:
1695 R->tt_printf("\033[5~");
1696 break;
1697 }
1698 }
1699 else
1700#endif /* NO_SCROLLBAR_REPORT */
1701 {
1702 char upordown = 0;
1703
1704 if (R->scrollBar.style == R_SB_NEXT) {
1705 if (scrollbarnext_upButton(ev->y))
1706 upordown = -1; /* up */
1707 else if (scrollbarnext_dnButton(ev->y))
1708 upordown = 1; /* down */
1709 } else if (R->scrollBar.style == R_SB_RXVT) {
1710 if (scrollbarrxvt_upButton(ev->y))
1711 upordown = -1; /* up */
1712 else if (scrollbarrxvt_dnButton(ev->y))
1713 upordown = 1; /* down */
1714 }
1715 if (upordown) {
1716#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1717 R->scroll_arrow_delay = SCROLLBAR_INITIAL_DELAY;
1718#endif
1719 if (rxvt_scr_page(aR_ upordown < 0 ? UP : DN, 1)) {
1720 if (upordown < 0)
1721 scrollbar_setUp();
1722 else
1723 scrollbar_setDn();
1724 }
1725 } else
1726 switch (ev->button) {
1727 case Button2:
1728 switch (R->scrollbar_align) {
1729 case R_SB_ALIGN_TOP:
1730 R->csrO = 0;
1731 break;
1732 case R_SB_ALIGN_CENTRE:
1733 R->csrO = (R->scrollBar.bot - R->scrollBar.top) / 2;
1734 break;
1735 case R_SB_ALIGN_BOTTOM:
1736 R->csrO = R->scrollBar.bot - R->scrollBar.top;
1737 break;
1738 }
1739 if (R->scrollBar.style == R_SB_XTERM
1740 || scrollbar_above_slider(ev->y)
1741 || scrollbar_below_slider(ev->y))
1742 rxvt_scr_move_to(aR_
1743 scrollbar_position(ev->y) - R->csrO,
1744 scrollbar_size());
1745 scrollbar_setMotion();
1746 break;
1747
1748 case Button1:
1749 if (R->scrollbar_align == R_SB_ALIGN_CENTRE)
1750 R->csrO = ev->y - R->scrollBar.top;
1751 /* FALLTHROUGH */
1752
1753 case Button3:
1754 if (R->scrollBar.style != R_SB_XTERM) {
1755 if (scrollbar_above_slider(ev->y))
1756# ifdef RXVT_SCROLL_FULL
1757 rxvt_scr_page(aR_ UP, R->TermWin.nrow - 1);
1758# else
1759 rxvt_scr_page(aR_ UP, R->TermWin.nrow / 4);
1760# endif
1761 else if (scrollbar_below_slider(ev->y))
1762# ifdef RXVT_SCROLL_FULL
1763 rxvt_scr_page(aR_ DN, R->TermWin.nrow - 1);
1764# else
1765 rxvt_scr_page(aR_ DN, R->TermWin.nrow / 4);
1766# endif
1767 else
1768 scrollbar_setMotion();
1769 } else {
1770 rxvt_scr_page(aR_ (ev->button == Button1 ? DN : UP),
1771 (R->TermWin.nrow
1772 * scrollbar_position(ev->y)
1773 / scrollbar_size()));
1774 }
1775 break;
1776 }
1777 }
1778 return;
1779 }
1780#if MENUBAR
1781 /*
1782 * Menubar window processing of button press
1783 */
1784 if (isMenuBarWindow(ev->window))
1785 rxvt_menubar_control(aR_ ev);
1786#endif
1787}
1788
1789/* INTPROTO */
1790void
1791rxvt_button_release(pR_ XButtonEvent *ev)
1792{
1793 int reportmode = 0;
1794
1795 R->csrO = 0; /* reset csr Offset */
1796 if (!R->bypass_keystate)
1797 reportmode = !!(R->PrivateModes & PrivMode_mouse_report);
1798
1799 if (scrollbar_isUpDn()) {
1800 scrollbar_setIdle();
1801 rxvt_scrollbar_show(aR_ 0);
1802#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1803 R->refresh_type &= ~SMOOTH_REFRESH;
1804#endif
1805 }
1806#ifdef SELECTION_SCROLLING
1807 R->pending_scroll_selection=0;
1808#endif
1809 if (ev->window == R->TermWin.vt)
1810 {
1811#ifdef RXVT_GRAPHICS
1812 if (ev->subwindow != None)
1813 rxvt_Gr_ButtonRelease(ev->x, ev->y);
1814 else
1815#endif
1816 { 1881 /*
1817 if (reportmode)
1818 {
1819 /* mouse report from vt window */
1820 /* don't report release of wheel "buttons" */
1821 if (ev->button >= 4)
1822 return;
1823#ifdef MOUSE_REPORT_DOUBLECLICK
1824 /* only report the release of 'slow' single clicks */
1825 if (R->MEvent.button != AnyButton
1826 && (ev->button != R->MEvent.button
1827 || (ev->time - R->MEvent.time
1828 > MULTICLICK_TIME / 2)))
1829 {
1830 R->MEvent.clicks = 0;
1831 R->MEvent.button = AnyButton;
1832 rxvt_mouse_report(aR_ ev);
1833 }
1834#else /* MOUSE_REPORT_DOUBLECLICK */
1835 R->MEvent.button = AnyButton;
1836 rxvt_mouse_report(aR_ ev);
1837#endif /* MOUSE_REPORT_DOUBLECLICK */
1838 return;
1839 }
1840 /*
1841 * dumb hack to compensate for the failure of click-and-drag 1882 * dumb hack to compensate for the failure of click-and-drag
1842 * when overriding mouse reporting 1883 * when overriding mouse reporting
1843 */ 1884 */
1844 if (R->PrivateModes & PrivMode_mouse_report 1885 if (PrivateModes & PrivMode_mouse_report
1845 && R->bypass_keystate 1886 && bypass_keystate
1846 && ev->button == Button1 && R->MEvent.clicks <= 1) 1887 && ev.button == Button1 && MEvent.clicks <= 1)
1847 rxvt_selection_extend(aR_ ev->x, ev->y, 0); 1888 selection_extend (ev.x, ev.y, 0);
1848 1889
1849 switch (ev->button) { 1890 switch (ev.button)
1891 {
1850 case Button1: 1892 case Button1:
1851 case Button3: 1893 case Button3:
1852 rxvt_selection_make(aR_ ev->time); 1894 selection_make (ev.time);
1853 break; 1895 break;
1854 case Button2: 1896 case Button2:
1855 rxvt_selection_request(aR_ ev->time, ev->x, ev->y); 1897 selection_request (ev.time, ev.x, ev.y);
1856 break; 1898 break;
1857#ifdef MOUSE_WHEEL 1899#ifdef MOUSE_WHEEL
1858 case Button4: 1900 case Button4:
1859 case Button5: 1901 case Button5:
1860 { 1902 {
1861 int i, v; 1903 int i;
1904 page_dirn v;
1862 1905
1863 v = (ev->button == Button4) ? UP : DN; 1906 v = (ev.button == Button4) ? UP : DN;
1864 if (ev->state & ShiftMask) 1907 if (ev.state & ShiftMask)
1865 i = 1; 1908 i = 1;
1866 else if ((R->Options & Opt_mouseWheelScrollPage)) 1909 else if ((Options & Opt_mouseWheelScrollPage))
1867 i = R->TermWin.nrow - 1; 1910 i = TermWin.nrow - 1;
1868 else 1911 else
1869 i = 5; 1912 i = 5;
1870# ifdef MOUSE_SLIP_WHEELING 1913# ifdef MOUSE_SLIP_WHEELING
1871 if (ev->state & ControlMask) 1914 if (ev.state & ControlMask)
1872 { 1915 {
1873 R->mouse_slip_wheel_speed += (v ? -1 : 1); 1916 mouse_slip_wheel_speed += (v ? -1 : 1);
1874 R->mouse_slip_wheel_delay = SCROLLBAR_CONTINUOUS_DELAY; 1917 mouse_slip_wheel_delay = SCROLLBAR_CONTINUOUS_DELAY;
1875 } 1918 }
1876# endif 1919# endif
1877# ifdef JUMP_MOUSE_WHEEL 1920# ifdef JUMP_MOUSE_WHEEL
1878 rxvt_scr_page(aR_ v, i); 1921 scr_page (v, i);
1879 rxvt_scr_refresh(aR_ SMOOTH_REFRESH); 1922 scr_refresh (SMOOTH_REFRESH);
1880 rxvt_scrollbar_show(aR_ 1); 1923 scrollbar_show (1);
1881# else 1924# else
1882 for (; i--;) 1925 while (i--)
1883 { 1926 {
1884 rxvt_scr_page(aR_ v, 1); 1927 scr_page (v, 1);
1885 rxvt_scr_refresh(aR_ SMOOTH_REFRESH); 1928 scr_refresh (SMOOTH_REFRESH);
1886 rxvt_scrollbar_show(aR_ 1); 1929 scrollbar_show (1);
1887 } 1930 }
1888# endif 1931# endif
1889 } 1932
1890 break; 1933 }
1934 break;
1891#endif 1935#endif
1892 } 1936
1893 } 1937 }
1894 } 1938 }
1939 }
1895#ifdef MENUBAR 1940#ifdef MENUBAR
1896 else if (isMenuBarWindow(ev->window)) 1941 else if (isMenuBarWindow (ev.window))
1897 rxvt_menubar_control(aR_ ev); 1942 menubar_control (ev);
1898#endif 1943#endif
1899} 1944}
1900 1945
1901 1946
1902#ifdef TRANSPARENT 1947#ifdef TRANSPARENT
1903/* 1948/*
1904 * Check our parents are still who we think they are. 1949 * Check our parents are still who we think they are.
1905 * Do transparency updates if required 1950 * Do transparency updates if required
1906 */ 1951 */
1907/* EXTPROTO */
1908int 1952int
1909rxvt_check_our_parents(pR) 1953rxvt_term::check_our_parents ()
1910{ 1954{
1911 int i, pchanged, aformat, have_pixmap, rootdepth; 1955 int i, pchanged, aformat, have_pixmap, rootdepth;
1912 unsigned long nitems, bytes_after; 1956 unsigned long nitems, bytes_after;
1913 Atom atype; 1957 Atom atype;
1914 unsigned char *prop = NULL; 1958 unsigned char *prop = NULL;
1915 Window root, oldp, *list; 1959 Window root, oldp, *list;
1916 Pixmap rootpixmap = None; 1960 Pixmap rootpixmap = None;
1917 XWindowAttributes wattr, wrootattr; 1961 XWindowAttributes wattr, wrootattr;
1918 1962
1919 pchanged = 0; 1963 pchanged = 0;
1920 1964
1921 if (!(R->Options & Opt_transparent)) 1965 if (! (Options & Opt_transparent))
1922 return pchanged; /* Don't try any more */ 1966 return pchanged; /* Don't try any more */
1923 1967
1924 XGetWindowAttributes(R->Xdisplay, Xroot, &wrootattr); 1968 XGetWindowAttributes (display->display, display->root, &wrootattr);
1925 rootdepth = wrootattr.depth; 1969 rootdepth = wrootattr.depth;
1926 1970
1927 XGetWindowAttributes(R->Xdisplay, R->TermWin.parent[0], &wattr); 1971 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);
1928 if (rootdepth != wattr.depth) { 1972 if (rootdepth != wattr.depth)
1973 {
1929 if (R->am_transparent) { 1974 if (am_transparent)
1975 {
1930 pchanged = 1; 1976 pchanged = 1;
1931 XSetWindowBackground(R->Xdisplay, R->TermWin.vt, 1977 XSetWindowBackground (display->display, TermWin.vt,
1932 R->PixColors[Color_bg]); 1978 PixColors[Color_bg]);
1933 R->am_transparent = R->am_pixmap_trans = 0; 1979 am_transparent = am_pixmap_trans = 0;
1934 } 1980 }
1935 return pchanged; /* Don't try any more */ 1981 return pchanged; /* Don't try any more */
1936 } 1982 }
1937 1983
1938/* 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. */
1939 XSync(R->Xdisplay, False); 1985 XSync (display->display, False);
1940 1986
1941/* 1987 /*
1942 * Make the frame window set by the window manager have 1988 * Make the frame window set by the window manager have
1943 * the root background. Some window managers put multiple nested frame 1989 * the root background. Some window managers put multiple nested frame
1944 * 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.
1945 */ 1991 */
1946 i = (R->xa[XA_XROOTPMAPID] != 0 1992 i = (xa[XA_XROOTPMAPID] != 0
1947 && (XGetWindowProperty(R->Xdisplay, Xroot, R->xa[XA_XROOTPMAPID], 1993 && (XGetWindowProperty (display->display, display->root, xa[XA_XROOTPMAPID],
1948 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 1994 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1949 &nitems, &bytes_after, &prop) == Success)); 1995 &nitems, &bytes_after, &prop) == Success));
1950 if (!i || prop == NULL) 1996 if (!i || prop == NULL)
1951 have_pixmap = 0; 1997 have_pixmap = 0;
1952 else { 1998 else
1999 {
1953 have_pixmap = 1; 2000 have_pixmap = 1;
1954 rootpixmap = *((Pixmap *)prop); 2001 rootpixmap = * ((Pixmap *)prop);
1955 XFree(prop); 2002 XFree (prop);
1956 } 2003 }
1957 if (have_pixmap) { 2004 if (have_pixmap)
1958/* 2005 {
2006 /*
1959 * Copy Xroot pixmap transparency 2007 * Copy display->root pixmap transparency
1960 */ 2008 */
1961 int sx, sy, nx, ny; 2009 int sx, sy, nx, ny;
1962 unsigned int nw, nh; 2010 unsigned int nw, nh;
1963 Window cr; 2011 Window cr;
1964 XImage *image; 2012 XImage *image;
1965 GC gc; 2013 GC gc;
1966 XGCValues gcvalue; 2014 XGCValues gcvalue;
1967 2015
1968 XTranslateCoordinates(R->Xdisplay, R->TermWin.parent[0], Xroot, 2016 XTranslateCoordinates (display->display, TermWin.parent[0], display->root,
1969 0, 0, &sx, &sy, &cr); 2017 0, 0, &sx, &sy, &cr);
1970 nw = (unsigned int)R->szHint.width; 2018 nw = (unsigned int)szHint.width;
1971 nh = (unsigned int)R->szHint.height; 2019 nh = (unsigned int)szHint.height;
1972 nx = ny = 0; 2020 nx = ny = 0;
1973 if (sx < 0) { 2021 if (sx < 0)
2022 {
1974 nw += sx; 2023 nw += sx;
1975 nx = -sx; 2024 nx = -sx;
1976 sx = 0; 2025 sx = 0;
1977 } 2026 }
1978 if (sy < 0) { 2027 if (sy < 0)
2028 {
1979 nh += sy; 2029 nh += sy;
1980 ny = -sy; 2030 ny = -sy;
1981 sy = 0; 2031 sy = 0;
1982 } 2032 }
1983 MIN_IT(nw, (unsigned int)(wrootattr.width - sx)); 2033 MIN_IT (nw, (unsigned int) (wrootattr.width - sx));
1984 MIN_IT(nh, (unsigned int)(wrootattr.height - sy)); 2034 MIN_IT (nh, (unsigned int) (wrootattr.height - sy));
1985 R->allowedxerror = -1; 2035 allowedxerror = -1;
1986 image = XGetImage(R->Xdisplay, rootpixmap, sx, sy, nw, nh, AllPlanes, 2036 image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes,
1987 ZPixmap); 2037 ZPixmap);
1988 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 2038 /* XXX: handle BadMatch - usually because we're outside the pixmap */
1989 /* XXX: may need a delay here? */ 2039 /* XXX: may need a delay here? */
1990 R->allowedxerror = 0; 2040 allowedxerror = 0;
1991 if (image == NULL) { 2041 if (image == NULL)
2042 {
1992 if (R->am_transparent && R->am_pixmap_trans) { 2043 if (am_transparent && am_pixmap_trans)
1993 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 {
1994 if (R->TermWin.pixmap != None) { 2056 if (TermWin.pixmap != None)
1995 XFreePixmap(R->Xdisplay, R->TermWin.pixmap); 2057 XFreePixmap (display->display, TermWin.pixmap);
1996 R->TermWin.pixmap = None; 2058 TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt,
1997 } 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 }
1998 } 2074 }
1999 R->am_pixmap_trans = 0;
2000 } else {
2001 if (R->TermWin.pixmap != None)
2002 XFreePixmap(R->Xdisplay, R->TermWin.pixmap);
2003 R->TermWin.pixmap = XCreatePixmap(R->Xdisplay, R->TermWin.vt,
2004 (unsigned int)R->szHint.width,
2005 (unsigned int)R->szHint.height,
2006 (unsigned int)image->depth);
2007 gc = XCreateGC(R->Xdisplay, R->TermWin.vt, 0UL, &gcvalue);
2008 XPutImage(R->Xdisplay, R->TermWin.pixmap, gc, image, 0, 0,
2009 nx, ny, (unsigned int)image->width,
2010 (unsigned int)image->height);
2011 XFreeGC(R->Xdisplay, gc);
2012 XDestroyImage(image);
2013 XSetWindowBackgroundPixmap(R->Xdisplay, R->TermWin.vt,
2014 R->TermWin.pixmap);
2015 if (!R->am_transparent || !R->am_pixmap_trans)
2016 pchanged = 1;
2017 R->am_transparent = R->am_pixmap_trans = 1;
2018 }
2019 }
2020 if (!R->am_pixmap_trans) { 2075 if (!am_pixmap_trans)
2076 {
2021 unsigned int n; 2077 unsigned int n;
2022/* 2078 /*
2023 * InheritPixmap transparency 2079 * InheritPixmap transparency
2024 */ 2080 */
2025 D_X((stderr, "InheritPixmap Seeking to %08lx", Xroot)); 2081 D_X ((stderr, "InheritPixmap Seeking to %08lx", display->root));
2026 for (i = 1; i < (int)(sizeof(R->TermWin.parent) / sizeof(Window)); 2082 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window));
2027 i++) { 2083 i++)
2084 {
2028 oldp = R->TermWin.parent[i]; 2085 oldp = TermWin.parent[i];
2029 XQueryTree(R->Xdisplay, R->TermWin.parent[i - 1], &root, 2086 XQueryTree (display->display, TermWin.parent[i - 1], &root,
2030 &R->TermWin.parent[i], &list, &n); 2087 &TermWin.parent[i], &list, &n);
2031 XFree(list); 2088 XFree (list);
2032 D_X((stderr, "InheritPixmap Parent[%d] = %08lx", i, R->TermWin.parent[i])); 2089 D_X ((stderr, "InheritPixmap Parent[%d] = %08lx", i, TermWin.parent[i]));
2033 if (R->TermWin.parent[i] == Xroot) { 2090 if (TermWin.parent[i] == display->root)
2034 if (oldp != None) 2091 {
2035 pchanged = 1; 2092 if (oldp != None)
2036 break; 2093 pchanged = 1;
2037 } 2094 break;
2095 }
2038 if (oldp != R->TermWin.parent[i]) 2096 if (oldp != TermWin.parent[i])
2039 pchanged = 1; 2097 pchanged = 1;
2040 } 2098 }
2041 n = 0; 2099 n = 0;
2042 if (pchanged) { 2100 if (pchanged)
2101 {
2043 for (; n < (unsigned int)i; n++) { 2102 for (; n < (unsigned int)i; n++)
2103 {
2044 XGetWindowAttributes(R->Xdisplay, R->TermWin.parent[n], &wattr); 2104 XGetWindowAttributes (display->display, TermWin.parent[n], &wattr);
2045 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"));
2046 if (wattr.depth != rootdepth || wattr.class == InputOnly) { 2106 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2107 {
2047 n = (int)(sizeof(R->TermWin.parent) / sizeof(Window)) + 1; 2108 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1;
2048 break; 2109 break;
2049 } 2110 }
2050 } 2111 }
2051 } 2112 }
2052 if (n > (int)(sizeof(R->TermWin.parent) 2113 if (n > (int) (sizeof (TermWin.parent)
2053 / sizeof(R->TermWin.parent[0]))) { 2114 / sizeof (TermWin.parent[0])))
2115 {
2054 D_X((stderr, "InheritPixmap Turning off")); 2116 D_X ((stderr, "InheritPixmap Turning off"));
2055 XSetWindowBackground(R->Xdisplay, R->TermWin.parent[0], 2117 XSetWindowBackground (display->display, TermWin.parent[0],
2056 R->PixColors[Color_fg]); 2118 PixColors[Color_fg]);
2057 XSetWindowBackground(R->Xdisplay, R->TermWin.vt, 2119 XSetWindowBackground (display->display, TermWin.vt,
2058 R->PixColors[Color_bg]); 2120 PixColors[Color_bg]);
2059 R->am_transparent = 0; 2121 am_transparent = 0;
2060 /* XXX: also turn off Opt_transparent? */ 2122 /* XXX: also turn off Opt_transparent? */
2061 } else { 2123 }
2124 else
2125 {
2062 /* wait (an arbitrary period) for the WM to do its thing 2126 /* wait (an arbitrary period) for the WM to do its thing
2063 * needed for fvwm2.2.2 (and before?) */ 2127 * needed for fvwm2.2.2 (and before?) */
2064# ifdef HAVE_NANOSLEEP 2128# ifdef HAVE_NANOSLEEP
2065 struct timespec rqt; 2129 struct timespec rqt;
2066 2130
2067 rqt.tv_sec = 1; 2131 rqt.tv_sec = 1;
2068 rqt.tv_nsec = 0; 2132 rqt.tv_nsec = 0;
2069 nanosleep(&rqt, NULL); 2133 nanosleep (&rqt, NULL);
2070# else 2134# else
2071 sleep(1); 2135 sleep (1);
2072# endif 2136# endif
2073 D_X((stderr, "InheritPixmap Turning on (%d parents)", i - 1)); 2137 D_X ((stderr, "InheritPixmap Turning on (%d parents)", i - 1));
2074 for (n = 0; n < (unsigned int)i; n++) 2138 for (n = 0; n < (unsigned int)i; n++)
2075 XSetWindowBackgroundPixmap(R->Xdisplay, R->TermWin.parent[n], 2139 XSetWindowBackgroundPixmap (display->display, TermWin.parent[n],
2076 ParentRelative); 2140 ParentRelative);
2077 XSetWindowBackgroundPixmap(R->Xdisplay, R->TermWin.vt, 2141 XSetWindowBackgroundPixmap (display->display, TermWin.vt,
2078 ParentRelative); 2142 ParentRelative);
2079 R->am_transparent = 1; 2143 am_transparent = 1;
2080 } 2144 }
2081 for (; i < (int)(sizeof(R->TermWin.parent) / sizeof(Window)); i++) 2145 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)
2082 R->TermWin.parent[i] = None; 2146 TermWin.parent[i] = None;
2083 } 2147 }
2084 return pchanged; 2148 return pchanged;
2085} 2149}
2086#endif 2150#endif
2087 2151
2088/*}}} */ 2152/*}}} */
2089 2153
2090/*{{{ print pipe */ 2154/*{{{ print pipe */
2091/*----------------------------------------------------------------------*/ 2155/*----------------------------------------------------------------------*/
2092#ifdef PRINTPIPE 2156#ifdef PRINTPIPE
2093/* EXTPROTO */ 2157FILE *
2094FILE *
2095rxvt_popen_printer(pR) 2158rxvt_term::popen_printer ()
2096{ 2159{
2097 FILE *stream = popen(R->rs[Rs_print_pipe], "w"); 2160 FILE *stream = popen (rs[Rs_print_pipe], "w");
2098 2161
2099 if (stream == NULL) 2162 if (stream == NULL)
2100 rxvt_print_error("can't open printer pipe"); 2163 rxvt_print_error ("can't open printer pipe");
2101 return stream; 2164 return stream;
2102} 2165}
2103 2166
2104/* EXTPROTO */
2105int 2167int
2106rxvt_pclose_printer (FILE *stream) 2168rxvt_term::pclose_printer (FILE *stream)
2107{ 2169{
2108 fflush (stream); 2170 fflush (stream);
2109/* pclose() reported not to work on SunOS 4.1.3 */ 2171 /* pclose () reported not to work on SunOS 4.1.3 */
2110# if defined (__sun__) /* TODO: RESOLVE THIS */ 2172# if defined (__sun__) /* TODO: RESOLVE THIS */
2111/* pclose works provided SIGCHLD handler uses waitpid */ 2173 /* pclose works provided SIGCHLD handler uses waitpid */
2112 return pclose (stream); /* return fclose (stream); */ 2174 return pclose (stream); /* return fclose (stream); */
2113# else 2175# else
2114 return pclose (stream); 2176 return pclose (stream);
2115# endif 2177# endif
2116} 2178}
2117 2179
2118/* 2180/*
2119 * simulate attached vt100 printer 2181 * simulate attached vt100 printer
2120 */ 2182 */
2121/* INTPROTO */
2122void 2183void
2123rxvt_process_print_pipe(pR) 2184rxvt_term::process_print_pipe ()
2124{ 2185{
2125 int done; 2186 int done;
2126 FILE *fd; 2187 FILE *fd;
2127 2188
2128 if ((fd = rxvt_popen_printer(aR)) == NULL) 2189 if ((fd = popen_printer ()) == NULL)
2129 return; 2190 return;
2130 2191
2131/* 2192 /*
2132 * 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
2133 * is received. 2194 * is received.
2134 */ 2195 */
2135 for (done = 0; !done;) { 2196 for (done = 0; !done;)
2197 {
2136 unsigned char buf[8]; 2198 unsigned char buf[8];
2137 unsigned char ch; 2199 unsigned char ch;
2138 unsigned int i, len; 2200 unsigned int i, len;
2139 2201
2140 if ((ch = rxvt_cmd_getc(aR)) != C0_ESC) { 2202 if ((ch = cmd_getc ()) != C0_ESC)
2203 {
2141 if (putc(ch, fd) == EOF) 2204 if (putc (ch, fd) == EOF)
2142 break; /* done = 1 */ 2205 break; /* done = 1 */
2143 } else { 2206 }
2207 else
2208 {
2144 len = 0; 2209 len = 0;
2145 buf[len++] = ch; 2210 buf[len++] = ch;
2146 2211
2147 if ((buf[len++] = rxvt_cmd_getc(aR)) == '[') { 2212 if ((buf[len++] = cmd_getc ()) == '[')
2148 if ((ch = rxvt_cmd_getc(aR)) == '?') { 2213 {
2149 buf[len++] = '?'; 2214 if ((ch = cmd_getc ()) == '?')
2150 ch = rxvt_cmd_getc(aR); 2215 {
2151 } 2216 buf[len++] = '?';
2217 ch = cmd_getc ();
2218 }
2152 if ((buf[len++] = ch) == '4') { 2219 if ((buf[len++] = ch) == '4')
2220 {
2153 if ((buf[len++] = rxvt_cmd_getc(aR)) == 'i') 2221 if ((buf[len++] = cmd_getc ()) == 'i')
2154 break; /* done = 1 */ 2222 break; /* done = 1 */
2155 } 2223 }
2224 }
2225 for (i = 0; i < len; i++)
2226 if (putc (buf[i], fd) == EOF)
2227 {
2228 done = 1;
2229 break;
2230 }
2231 }
2156 } 2232 }
2157 for (i = 0; i < len; i++)
2158 if (putc(buf[i], fd) == EOF) {
2159 done = 1;
2160 break;
2161 }
2162 }
2163 }
2164 rxvt_pclose_printer(fd); 2233 pclose_printer (fd);
2165} 2234}
2166#endif /* PRINTPIPE */ 2235#endif /* PRINTPIPE */
2167/*}}} */ 2236/*}}} */
2168 2237
2169/* *INDENT-OFF* */ 2238/* *INDENT-OFF* */
2170enum { 2239enum {
2171 C1_40 = 0x40, 2240 C1_40 = 0x40,
2172 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,
2173 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,
2174 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,
2175 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
2176}; 2245};
2177/* *INDENT-ON* */ 2246/* *INDENT-ON* */
2178 2247
2179/*{{{ process non-printing single characters */ 2248/*{{{ process non-printing single characters */
2180/* INTPROTO */
2181void 2249void
2182rxvt_process_nonprinting(pR_ unsigned char ch) 2250rxvt_term::process_nonprinting (unsigned char ch)
2183{ 2251{
2184 switch (ch) { 2252 switch (ch)
2253 {
2185 case C0_ENQ: /* terminal Status */ 2254 case C0_ENQ: /* terminal Status */
2186 if (R->rs[Rs_answerbackstring]) 2255 if (rs[Rs_answerbackstring])
2187 R->tt_write( 2256 tt_write (
2188 (const unsigned char *)R->rs[Rs_answerbackstring], 2257 (const unsigned char *)rs[Rs_answerbackstring],
2189 (unsigned int)STRLEN(R->rs[Rs_answerbackstring])); 2258 (unsigned int)STRLEN (rs[Rs_answerbackstring]));
2190 else 2259 else
2191 R->tt_write((unsigned char *)VT100_ANS, 2260 tt_write ((unsigned char *)VT100_ANS,
2192 (unsigned int)STRLEN(VT100_ANS)); 2261 (unsigned int)STRLEN (VT100_ANS));
2193 break; 2262 break;
2194 case C0_BEL: /* bell */ 2263 case C0_BEL: /* bell */
2195 rxvt_scr_bell(aR); 2264 scr_bell ();
2196 break; 2265 break;
2197 case C0_BS: /* backspace */ 2266 case C0_BS: /* backspace */
2198 rxvt_scr_backspace(aR); 2267 scr_backspace ();
2199 break; 2268 break;
2200 case C0_HT: /* tab */ 2269 case C0_HT: /* tab */
2201 rxvt_scr_tab(aR_ 1); 2270 scr_tab (1);
2202 break; 2271 break;
2203 case C0_CR: /* carriage return */ 2272 case C0_CR: /* carriage return */
2204 rxvt_scr_gotorc(aR_ 0, 0, R_RELATIVE); 2273 scr_gotorc (0, 0, R_RELATIVE);
2205 break; 2274 break;
2206 case C0_VT: /* vertical tab, form feed */ 2275 case C0_VT: /* vertical tab, form feed */
2207 case C0_FF: 2276 case C0_FF:
2208 case C0_LF: /* line feed */ 2277 case C0_LF: /* line feed */
2209 rxvt_scr_index(aR_ UP); 2278 scr_index (UP);
2210 break; 2279 break;
2211 case C0_SO: /* shift out - acs */ 2280 case C0_SO: /* shift out - acs */
2212 rxvt_scr_charset_choose(aR_ 1); 2281 scr_charset_choose (1);
2213 break; 2282 break;
2214 case C0_SI: /* shift in - acs */ 2283 case C0_SI: /* shift in - acs */
2215 rxvt_scr_charset_choose(aR_ 0); 2284 scr_charset_choose (0);
2216 break; 2285 break;
2217 } 2286 }
2218} 2287}
2219/*}}} */ 2288/*}}} */
2220 2289
2221 2290
2222/*{{{ process VT52 escape sequences */ 2291/*{{{ process VT52 escape sequences */
2223/* INTPROTO */
2224void 2292void
2225rxvt_process_escape_vt52(pR_ unsigned char ch) 2293rxvt_term::process_escape_vt52 (unsigned char ch)
2226{ 2294{
2227 int row, col; 2295 int row, col;
2296
2297 switch (ch)
2228 2298 {
2229 switch (ch) {
2230 case 'A': /* cursor up */ 2299 case 'A': /* cursor up */
2231 rxvt_scr_gotorc(aR_ -1, 0, R_RELATIVE | C_RELATIVE); 2300 scr_gotorc (-1, 0, R_RELATIVE | C_RELATIVE);
2232 break; 2301 break;
2233 case 'B': /* cursor down */ 2302 case 'B': /* cursor down */
2234 rxvt_scr_gotorc(aR_ 1, 0, R_RELATIVE | C_RELATIVE); 2303 scr_gotorc (1, 0, R_RELATIVE | C_RELATIVE);
2235 break; 2304 break;
2236 case 'C': /* cursor right */ 2305 case 'C': /* cursor right */
2237 rxvt_scr_gotorc(aR_ 0, 1, R_RELATIVE | C_RELATIVE); 2306 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
2238 break; 2307 break;
2239 case 'D': /* cursor left */ 2308 case 'D': /* cursor left */
2240 rxvt_scr_gotorc(aR_ 0, -1, R_RELATIVE | C_RELATIVE); 2309 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE);
2241 break; 2310 break;
2242 case 'H': /* cursor home */ 2311 case 'H': /* cursor home */
2243 rxvt_scr_gotorc(aR_ 0, 0, 0); 2312 scr_gotorc (0, 0, 0);
2244 break; 2313 break;
2245 case 'I': /* cursor up and scroll down if needed */ 2314 case 'I': /* cursor up and scroll down if needed */
2246 rxvt_scr_index(aR_ DN); 2315 scr_index (DN);
2247 break; 2316 break;
2248 case 'J': /* erase to end of screen */ 2317 case 'J': /* erase to end of screen */
2249 rxvt_scr_erase_screen(aR_ 0); 2318 scr_erase_screen (0);
2250 break; 2319 break;
2251 case 'K': /* erase to end of line */ 2320 case 'K': /* erase to end of line */
2252 rxvt_scr_erase_line(aR_ 0); 2321 scr_erase_line (0);
2253 break; 2322 break;
2254 case 'Y': /* move to specified row and col */ 2323 case 'Y': /* move to specified row and col */
2255 /* full command is 'ESC Y row col' where row and col 2324 /* full command is 'ESC Y row col' where row and col
2256 * are encoded by adding 32 and sending the ascii 2325 * are encoded by adding 32 and sending the ascii
2257 * character. eg. SPACE = 0, '+' = 13, '0' = 18, 2326 * character. eg. SPACE = 0, '+' = 13, '0' = 18,
2258 * etc. */ 2327 * etc. */
2259 row = rxvt_cmd_getc(aR) - ' '; 2328 row = cmd_getc () - ' ';
2260 col = rxvt_cmd_getc(aR) - ' '; 2329 col = cmd_getc () - ' ';
2261 rxvt_scr_gotorc(aR_ row, col, 0); 2330 scr_gotorc (row, col, 0);
2262 break; 2331 break;
2263 case 'Z': /* identify the terminal type */ 2332 case 'Z': /* identify the terminal type */
2264 R->tt_printf("\033/Z"); /* I am a VT100 emulating a VT52 */ 2333 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
2265 break; 2334 break;
2266 case '<': /* turn off VT52 mode */ 2335 case '<': /* turn off VT52 mode */
2267 PrivMode(0, PrivMode_vt52); 2336 PrivMode (0, PrivMode_vt52);
2268 break; 2337 break;
2269 case 'F': /* use special graphics character set */ 2338 case 'F': /* use special graphics character set */
2270 case 'G': /* use regular character set */ 2339 case 'G': /* use regular character set */
2271 /* unimplemented */ 2340 /* unimplemented */
2272 break; 2341 break;
2273 case '=': /* use alternate keypad mode */ 2342 case '=': /* use alternate keypad mode */
2274 case '>': /* use regular keypad mode */ 2343 case '>': /* use regular keypad mode */
2275 /* unimplemented */ 2344 /* unimplemented */
2276 break; 2345 break;
2277 } 2346 }
2278} 2347}
2279/*}}} */ 2348/*}}} */
2280 2349
2281 2350
2282/*{{{ process escape sequences */ 2351/*{{{ process escape sequences */
2283/* INTPROTO */
2284void 2352void
2285rxvt_process_escape_seq(pR) 2353rxvt_term::process_escape_seq ()
2286{ 2354{
2287 unsigned char ch = rxvt_cmd_getc(aR); 2355 unsigned char ch = cmd_getc ();
2288 2356
2289 if (R->PrivateModes & PrivMode_vt52) { 2357 if (PrivateModes & PrivMode_vt52)
2290 rxvt_process_escape_vt52(aR_ ch);
2291 return;
2292 }
2293 2358 {
2359 process_escape_vt52 (ch);
2360 return;
2361 }
2362
2294 switch (ch) { 2363 switch (ch)
2364 {
2295 /* case 1: do_tek_mode (); break; */ 2365 /* case 1: do_tek_mode (); break; */
2296 case '#': 2366 case '#':
2297 if (rxvt_cmd_getc(aR) == '8') 2367 if (cmd_getc () == '8')
2298 rxvt_scr_E(aR); 2368 scr_E ();
2299 break; 2369 break;
2300 case '(': 2370 case '(':
2301 rxvt_scr_charset_set(aR_ 0, (unsigned int)rxvt_cmd_getc(aR)); 2371 scr_charset_set (0, (unsigned int)cmd_getc ());
2302 break; 2372 break;
2303 case ')': 2373 case ')':
2304 rxvt_scr_charset_set(aR_ 1, (unsigned int)rxvt_cmd_getc(aR)); 2374 scr_charset_set (1, (unsigned int)cmd_getc ());
2305 break; 2375 break;
2306 case '*': 2376 case '*':
2307 rxvt_scr_charset_set(aR_ 2, (unsigned int)rxvt_cmd_getc(aR)); 2377 scr_charset_set (2, (unsigned int)cmd_getc ());
2308 break; 2378 break;
2309 case '+': 2379 case '+':
2310 rxvt_scr_charset_set(aR_ 3, (unsigned int)rxvt_cmd_getc(aR)); 2380 scr_charset_set (3, (unsigned int)cmd_getc ());
2311 break; 2381 break;
2312#ifdef MULTICHAR_SET 2382#ifdef MULTICHAR_SET
2313 case '$': 2383 case '$':
2314 rxvt_scr_charset_set(aR_ -2, (unsigned int)rxvt_cmd_getc(aR)); 2384 scr_charset_set (-2, (unsigned int)cmd_getc ());
2315 break; 2385 break;
2316#endif 2386#endif
2317#ifndef NO_FRILLS 2387#ifndef NO_FRILLS
2318 case '6': 2388 case '6':
2319 rxvt_scr_backindex(aR); 2389 scr_backindex ();
2320 break; 2390 break;
2321#endif 2391#endif
2322 case '7': 2392 case '7':
2323 rxvt_scr_cursor(aR_ SAVE); 2393 scr_cursor (SAVE);
2324 break; 2394 break;
2325 case '8': 2395 case '8':
2326 rxvt_scr_cursor(aR_ RESTORE); 2396 scr_cursor (RESTORE);
2327 break; 2397 break;
2328#ifndef NO_FRILLS 2398#ifndef NO_FRILLS
2329 case '9': 2399 case '9':
2330 rxvt_scr_forwardindex(aR); 2400 scr_forwardindex ();
2331 break; 2401 break;
2332#endif 2402#endif
2333 case '=': 2403 case '=':
2334 case '>': 2404 case '>':
2335 PrivMode((ch == '='), PrivMode_aplKP); 2405 PrivMode ((ch == '='), PrivMode_aplKP);
2336 break; 2406 break;
2337 2407
2338 case C1_40: 2408 case C1_40:
2339 rxvt_cmd_getc(aR); 2409 cmd_getc ();
2340 break; 2410 break;
2341 case C1_44: 2411 case C1_44:
2342 rxvt_scr_index(aR_ UP); 2412 scr_index (UP);
2343 break; 2413 break;
2344 2414
2345 /* 8.3.87: NEXT LINE */ 2415 /* 8.3.87: NEXT LINE */
2346 case C1_NEL: /* ESC E */ 2416 case C1_NEL: /* ESC E */
2347 { 2417 {
2348 uint32_t nlcr[] = { '\n', '\r' }; 2418 uint32_t nlcr[] = { '\n', '\r' };
2349 rxvt_scr_add_lines(aR_ nlcr, 1, 2); 2419 scr_add_lines (nlcr, 1, 2);
2350 } 2420 }
2351 break; 2421 break;
2352 2422
2353 /* kidnapped escape sequence: Should be 8.3.48 */ 2423 /* kidnapped escape sequence: Should be 8.3.48 */
2354 case C1_ESA: /* ESC G */ 2424 case C1_ESA: /* ESC G */
2355 rxvt_process_graphics(aR); 2425 process_graphics ();
2356 break; 2426 break;
2357 2427
2358 /* 8.3.63: CHARACTER TABULATION SET */ 2428 /* 8.3.63: CHARACTER TABULATION SET */
2359 case C1_HTS: /* ESC H */ 2429 case C1_HTS: /* ESC H */
2360 rxvt_scr_set_tab(aR_ 1); 2430 scr_set_tab (1);
2361 break; 2431 break;
2362 2432
2363 /* 8.3.105: REVERSE LINE FEED */ 2433 /* 8.3.105: REVERSE LINE FEED */
2364 case C1_RI: /* ESC M */ 2434 case C1_RI: /* ESC M */
2365 rxvt_scr_index(aR_ DN); 2435 scr_index (DN);
2366 break; 2436 break;
2367 2437
2368 /* 8.3.142: SINGLE-SHIFT TWO */ 2438 /* 8.3.142: SINGLE-SHIFT TWO */
2369 /*case C1_SS2: scr_single_shift (2); break; */ 2439 /*case C1_SS2: scr_single_shift (2); break; */
2370 2440
2371 /* 8.3.143: SINGLE-SHIFT THREE */ 2441 /* 8.3.143: SINGLE-SHIFT THREE */
2372 /*case C1_SS3: scr_single_shift (3); break; */ 2442 /*case C1_SS3: scr_single_shift (3); break; */
2373 2443
2374 /* 8.3.27: DEVICE CONTROL STRING */ 2444 /* 8.3.27: DEVICE CONTROL STRING */
2375 case C1_DCS: /* ESC P */ 2445 case C1_DCS: /* ESC P */
2376 rxvt_process_dcs_seq(aR); 2446 process_dcs_seq ();
2377 break; 2447 break;
2378 2448
2379 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2449 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
2380 case C1_SCI: /* ESC Z */ 2450 case C1_SCI: /* ESC Z */
2381 R->tt_write((const unsigned char *)ESCZ_ANSWER, 2451 tt_write ((const unsigned char *)ESCZ_ANSWER,
2382 (unsigned int)(sizeof(ESCZ_ANSWER) - 1)); 2452 (unsigned int) (sizeof (ESCZ_ANSWER) - 1));
2383 break; /* steal obsolete ESC [ c */ 2453 break; /* steal obsolete ESC [ c */
2384 2454
2385 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2455 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */
2386 case C1_CSI: /* ESC [ */ 2456 case C1_CSI: /* ESC [ */
2387 rxvt_process_csi_seq(aR); 2457 process_csi_seq ();
2388 break; 2458 break;
2389 2459
2390 /* 8.3.90: OPERATING SYSTEM COMMAND */ 2460 /* 8.3.90: OPERATING SYSTEM COMMAND */
2391 case C1_OSC: /* ESC ] */ 2461 case C1_OSC: /* ESC ] */
2392 rxvt_process_osc_seq(aR); 2462 process_osc_seq ();
2393 break; 2463 break;
2394 2464
2395 /* 8.3.106: RESET TO INITIAL STATE */ 2465 /* 8.3.106: RESET TO INITIAL STATE */
2396 case 'c': 2466 case 'c':
2397 rxvt_scr_poweron(aR); 2467 scr_poweron ();
2398 rxvt_scrollbar_show(aR_ 1); 2468 scrollbar_show (1);
2399 break; 2469 break;
2400 2470
2401 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */ 2471 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
2402 case 'n': 2472 case 'n':
2403 rxvt_scr_charset_choose(aR_ 2); 2473 scr_charset_choose (2);
2404 break; 2474 break;
2405 2475
2406 /* 8.3.81: LOCKING-SHIFT THREE (see ISO2022) */ 2476 /* 8.3.81: LOCKING-SHIFT THREE (see ISO2022) */
2407 case 'o': 2477 case 'o':
2408 rxvt_scr_charset_choose(aR_ 3); 2478 scr_charset_choose (3);
2409 break; 2479 break;
2410 } 2480 }
2411} 2481}
2412/*}}} */ 2482/*}}} */
2413 2483
2414/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */ 2484/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */
2415/* *INDENT-OFF* */ 2485/* *INDENT-OFF* */
2416enum { 2486enum {
2417 CSI_ICH = 0x40, 2487 CSI_ICH = 0x40,
2418 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,
2419 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 ,
2420 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,
2421 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,
2422 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,
2423 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,
2424 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 ,
2425 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
2426}; 2496};
2427 2497
2428#define make_byte(b7,b6,b5,b4,b3,b2,b1,b0) \ 2498#define make_byte(b7,b6,b5,b4,b3,b2,b1,b0) \
2429 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \ 2499 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \
2430 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0)) 2500 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0))
2431#define get_byte_array_bit(array, bit) \ 2501#define get_byte_array_bit(array, bit) \
2432 (!!((array)[(bit) / 8] & (128 >> ((bit) & 7)))) 2502 (!! ((array)[ (bit) / 8] & (128 >> ((bit) & 7))))
2433 2503
2434const unsigned char csi_defaults[] = { 2504const unsigned char csi_defaults[] =
2505 {
2435 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, */
2436 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, */
2437 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, */
2438 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, [, \, ], ^, _, */
2439 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, */
2440 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, */
2441 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, */
2442 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, {, |, }, ~, */
2443}; 2514 };
2444/* *INDENT-ON* */ 2515/* *INDENT-ON* */
2445 2516
2446/* INTPROTO */
2447void 2517void
2448rxvt_process_csi_seq(pR) 2518rxvt_term::process_csi_seq ()
2449{ 2519{
2450 unsigned char ch, priv, i; 2520 unsigned char ch, priv, i;
2451 unsigned int nargs, p; 2521 unsigned int nargs, p;
2452 int n, ndef; 2522 int n, ndef;
2453 int arg[ESC_ARGS]; 2523 int arg[ESC_ARGS];
2454 2524
2455 for (nargs = ESC_ARGS; nargs > 0;) 2525 for (nargs = ESC_ARGS; nargs > 0;)
2456 arg[--nargs] = 0; 2526 arg[--nargs] = 0;
2457 2527
2458 priv = 0; 2528 priv = 0;
2529 ch = cmd_getc ();
2530 if (ch >= '<' && ch <= '?')
2531 { /* '<' '=' '>' '?' */
2532 priv = ch;
2459 ch = rxvt_cmd_getc(aR); 2533 ch = cmd_getc ();
2460 if (ch >= '<' && ch <= '?') { /* '<' '=' '>' '?' */
2461 priv = ch;
2462 ch = rxvt_cmd_getc(aR);
2463 } 2534 }
2464/* read any numerical arguments */ 2535 /* read any numerical arguments */
2465 for (n = -1; ch < CSI_ICH; ) { 2536 for (n = -1; ch < CSI_ICH; )
2537 {
2466 if (isdigit(ch)) { 2538 if (isdigit (ch))
2539 {
2467 if (n < 0) 2540 if (n < 0)
2468 n = ch - '0'; 2541 n = ch - '0';
2469 else 2542 else
2470 n = n * 10 + ch - '0'; 2543 n = n * 10 + ch - '0';
2544 }
2471 } else if (ch == ';') { 2545 else if (ch == ';')
2546 {
2472 if (nargs < ESC_ARGS) 2547 if (nargs < ESC_ARGS)
2473 arg[nargs++] = n; 2548 arg[nargs++] = n;
2474 n = -1; 2549 n = -1;
2550 }
2475 } else if (ch == '\b') { 2551 else if (ch == '\b')
2476 rxvt_scr_backspace(aR); 2552 {
2553 scr_backspace ();
2554 }
2477 } else if (ch == C0_ESC) { 2555 else if (ch == C0_ESC)
2478 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)
2479 return; 2568 return;
2480 } else if (ch < ' ') {
2481 rxvt_process_nonprinting(aR_ ch);
2482 }
2483 ch = rxvt_cmd_getc(aR);
2484 }
2485 2569
2486 if (ch > CSI_7F)
2487 return;
2488
2489 if (nargs < ESC_ARGS) 2570 if (nargs < ESC_ARGS)
2490 arg[nargs++] = n; 2571 arg[nargs++] = n;
2491 2572
2492 i = ch - CSI_ICH; 2573 i = ch - CSI_ICH;
2493 ndef = get_byte_array_bit(csi_defaults, i); 2574 ndef = get_byte_array_bit (csi_defaults, i);
2494 for (p = 0; p < nargs; p++) 2575 for (p = 0; p < nargs; p++)
2495 if (arg[p] == -1) 2576 if (arg[p] == -1)
2496 arg[p] = ndef; 2577 arg[p] = ndef;
2497 2578
2498#ifdef DEBUG_CMD 2579#ifdef DEBUG_CMD
2499 fprintf(stderr, "CSI "); 2580 fprintf (stderr, "CSI ");
2500 for (p = 0; p < nargs; p++) 2581 for (p = 0; p < nargs; p++)
2501 fprintf(stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : ""); 2582 fprintf (stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : "");
2502 fprintf(stderr, "%c\n", ch); 2583 fprintf (stderr, "%c\n", ch);
2503#endif 2584#endif
2504 2585
2505/* 2586 /*
2506 * private mode handling 2587 * private mode handling
2507 */ 2588 */
2508 if (priv) { 2589 if (priv)
2509 switch (priv) { 2590 {
2510 case '>': 2591 switch (priv)
2592 {
2593 case '>':
2511 if (ch == CSI_DA) /* secondary device attributes */ 2594 if (ch == CSI_DA) /* secondary device attributes */
2512 R->tt_printf("\033[>%d;%-.8s;0c", 'R', VSTRING); 2595 tt_printf ("\033[>%d;%-.8s;0c", 'R', VSTRING);
2513 break; 2596 break;
2514 case '?': 2597 case '?':
2515 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2598 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2516 rxvt_process_terminal_mode(aR_ ch, priv, nargs, arg); 2599 process_terminal_mode (ch, priv, nargs, arg);
2517 break; 2600 break;
2518 } 2601 }
2519 return; 2602 return;
2520 } 2603 }
2521 2604
2522 switch (ch) { 2605 switch (ch)
2523/* 2606 {
2607 /*
2524 * ISO/IEC 6429:1992(E) CSI sequences (defaults in parentheses) 2608 * ISO/IEC 6429:1992 (E) CSI sequences (defaults in parentheses)
2525 */ 2609 */
2526#ifdef PRINTPIPE 2610#ifdef PRINTPIPE
2527 case CSI_MC: /* 8.3.83: (0) MEDIA COPY */ 2611 case CSI_MC: /* 8.3.83: (0) MEDIA COPY */
2528 switch (arg[0]) { 2612 switch (arg[0])
2613 {
2529 case 0: /* initiate transfer to primary aux device */ 2614 case 0: /* initiate transfer to primary aux device */
2530 rxvt_scr_printscreen(aR_ 0); 2615 scr_printscreen (0);
2531 break; 2616 break;
2532 case 5: /* start relay to primary aux device */ 2617 case 5: /* start relay to primary aux device */
2533 rxvt_process_print_pipe(aR); 2618 process_print_pipe ();
2619 break;
2620 }
2534 break; 2621 break;
2535 }
2536 break;
2537#endif 2622#endif
2538 2623
2539 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */ 2624 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */
2540 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */ 2625 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */
2541 arg[0] = -arg[0]; 2626 arg[0] = -arg[0];
2542 /* FALLTHROUGH */ 2627 /* FALLTHROUGH */
2543 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */ 2628 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */
2544 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */ 2629 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */
2545 rxvt_scr_gotorc(aR_ arg[0], 0, RELATIVE); 2630 scr_gotorc (arg[0], 0, RELATIVE);
2546 break; 2631 break;
2547 2632
2548 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */ 2633 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */
2549 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */ 2634 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */
2550#ifdef ISO6429 2635#ifdef ISO6429
2551 arg[0] = -arg[0]; 2636 arg[0] = -arg[0];
2552#else /* emulate common DEC VTs */ 2637#else /* emulate common DEC VTs */
2553 arg[0] = arg[0] ? -arg[0] : -1; 2638 arg[0] = arg[0] ? -arg[0] : -1;
2554#endif 2639#endif
2555 /* FALLTHROUGH */ 2640 /* FALLTHROUGH */
2556 case CSI_CUF: /* 8.3.20: (1) CURSOR RIGHT */ 2641 case CSI_CUF: /* 8.3.20: (1) CURSOR RIGHT */
2557 case CSI_HPR: /* 8.3.60: (1) CHARACTER POSITION FORWARD */ 2642 case CSI_HPR: /* 8.3.60: (1) CHARACTER POSITION FORWARD */
2558#ifdef ISO6429 2643#ifdef ISO6429
2559 rxvt_scr_gotorc(aR_ 0, arg[0], RELATIVE); 2644 scr_gotorc (0, arg[0], RELATIVE);
2560#else /* emulate common DEC VTs */ 2645#else /* emulate common DEC VTs */
2561 rxvt_scr_gotorc(aR_ 0, arg[0] ? arg[0] : 1, RELATIVE); 2646 scr_gotorc (0, arg[0] ? arg[0] : 1, RELATIVE);
2562#endif 2647#endif
2563 break; 2648 break;
2564 2649
2565 case CSI_CPL: /* 8.3.13: (1) CURSOR PRECEDING LINE */ 2650 case CSI_CPL: /* 8.3.13: (1) CURSOR PRECEDING LINE */
2566 arg[0] = -arg[0]; 2651 arg[0] = -arg[0];
2567 /* FALLTHROUGH */ 2652 /* FALLTHROUGH */
2568 case CSI_CNL: /* 8.3.12: (1) CURSOR NEXT LINE */ 2653 case CSI_CNL: /* 8.3.12: (1) CURSOR NEXT LINE */
2569 rxvt_scr_gotorc(aR_ arg[0], 0, R_RELATIVE); 2654 scr_gotorc (arg[0], 0, R_RELATIVE);
2570 break; 2655 break;
2571 2656
2572 case CSI_CHA: /* 8.3.9: (1) CURSOR CHARACTER ABSOLUTE */ 2657 case CSI_CHA: /* 8.3.9: (1) CURSOR CHARACTER ABSOLUTE */
2573 case CSI_HPA: /* 8.3.58: (1) CURSOR POSITION ABSOLUTE */ 2658 case CSI_HPA: /* 8.3.58: (1) CURSOR POSITION ABSOLUTE */
2574 rxvt_scr_gotorc(aR_ 0, arg[0] - 1, R_RELATIVE); 2659 scr_gotorc (0, arg[0] - 1, R_RELATIVE);
2575 break; 2660 break;
2576 2661
2577 case CSI_VPA: /* 8.3.159: (1) LINE POSITION ABSOLUTE */ 2662 case CSI_VPA: /* 8.3.159: (1) LINE POSITION ABSOLUTE */
2578 rxvt_scr_gotorc(aR_ arg[0] - 1, 0, C_RELATIVE); 2663 scr_gotorc (arg[0] - 1, 0, C_RELATIVE);
2579 break; 2664 break;
2580 2665
2581 case CSI_CUP: /* 8.3.21: (1,1) CURSOR POSITION */ 2666 case CSI_CUP: /* 8.3.21: (1,1) CURSOR POSITION */
2582 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 */
2583 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);
2584 break; 2669 break;
2585 2670
2586 case CSI_CBT: /* 8.3.7: (1) CURSOR BACKWARD TABULATION */ 2671 case CSI_CBT: /* 8.3.7: (1) CURSOR BACKWARD TABULATION */
2587 arg[0] = -arg[0]; 2672 arg[0] = -arg[0];
2588 /* FALLTHROUGH */ 2673 /* FALLTHROUGH */
2589 case CSI_CHT: /* 8.3.10: (1) CURSOR FORWARD TABULATION */ 2674 case CSI_CHT: /* 8.3.10: (1) CURSOR FORWARD TABULATION */
2590 rxvt_scr_tab(aR_ arg[0]); 2675 scr_tab (arg[0]);
2591 break; 2676 break;
2592 2677
2593 case CSI_ED: /* 8.3.40: (0) ERASE IN PAGE */ 2678 case CSI_ED: /* 8.3.40: (0) ERASE IN PAGE */
2594 rxvt_scr_erase_screen(aR_ arg[0]); 2679 scr_erase_screen (arg[0]);
2595 break; 2680 break;
2596 2681
2597 case CSI_EL: /* 8.3.42: (0) ERASE IN LINE */ 2682 case CSI_EL: /* 8.3.42: (0) ERASE IN LINE */
2598 rxvt_scr_erase_line(aR_ arg[0]); 2683 scr_erase_line (arg[0]);
2599 break; 2684 break;
2600 2685
2601 case CSI_ICH: /* 8.3.65: (1) INSERT CHARACTER */ 2686 case CSI_ICH: /* 8.3.65: (1) INSERT CHARACTER */
2602 rxvt_scr_insdel_chars(aR_ arg[0], INSERT); 2687 scr_insdel_chars (arg[0], INSERT);
2603 break; 2688 break;
2604 2689
2605 case CSI_IL: /* 8.3.68: (1) INSERT LINE */ 2690 case CSI_IL: /* 8.3.68: (1) INSERT LINE */
2606 rxvt_scr_insdel_lines(aR_ arg[0], INSERT); 2691 scr_insdel_lines (arg[0], INSERT);
2607 break; 2692 break;
2608 2693
2609 case CSI_DL: /* 8.3.33: (1) DELETE LINE */ 2694 case CSI_DL: /* 8.3.33: (1) DELETE LINE */
2610 rxvt_scr_insdel_lines(aR_ arg[0], DELETE); 2695 scr_insdel_lines (arg[0], DELETE);
2611 break; 2696 break;
2612 2697
2613 case CSI_ECH: /* 8.3.39: (1) ERASE CHARACTER */ 2698 case CSI_ECH: /* 8.3.39: (1) ERASE CHARACTER */
2614 rxvt_scr_insdel_chars(aR_ arg[0], ERASE); 2699 scr_insdel_chars (arg[0], ERASE);
2615 break; 2700 break;
2616 2701
2617 case CSI_DCH: /* 8.3.26: (1) DELETE CHARACTER */ 2702 case CSI_DCH: /* 8.3.26: (1) DELETE CHARACTER */
2618 rxvt_scr_insdel_chars(aR_ arg[0], DELETE); 2703 scr_insdel_chars (arg[0], DELETE);
2619 break; 2704 break;
2620 2705
2621 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */ 2706 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */
2622 arg[0] = -arg[0]; 2707 arg[0] = -arg[0];
2623 /* FALLTHROUGH */ 2708 /* FALLTHROUGH */
2624 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 2709 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
2625 rxvt_scroll_text(aR_ R->screen.tscroll, R->screen.bscroll, arg[0], 0); 2710 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0);
2626 break; 2711 break;
2627 2712
2628 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 2713 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
2629 R->tt_write((const unsigned char *)VT100_ANS, 2714 tt_write ((const unsigned char *)VT100_ANS,
2630 (unsigned int)(sizeof(VT100_ANS) - 1)); 2715 (unsigned int) (sizeof (VT100_ANS) - 1));
2631 break; 2716 break;
2632 2717
2633 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 2718 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
2634 rxvt_process_sgr_mode(aR_ nargs, arg); 2719 process_sgr_mode (nargs, arg);
2635 break; 2720 break;
2636 2721
2637 case CSI_DSR: /* 8.3.36: (0) DEVICE STATUS REPORT */ 2722 case CSI_DSR: /* 8.3.36: (0) DEVICE STATUS REPORT */
2638 switch (arg[0]) { 2723 switch (arg[0])
2724 {
2639 case 5: /* DSR requested */ 2725 case 5: /* DSR requested */
2640 R->tt_printf("\033[0n"); 2726 tt_printf ("\033[0n");
2641 break; 2727 break;
2642 case 6: /* CPR requested */ 2728 case 6: /* CPR requested */
2643 rxvt_scr_report_position(aR); 2729 scr_report_position ();
2644 break; 2730 break;
2645#if defined (ENABLE_DISPLAY_ANSWER) 2731#if defined (ENABLE_DISPLAY_ANSWER)
2646 case 7: /* unofficial extension */ 2732 case 7: /* unofficial extension */
2647 R->tt_printf("%-.250s\n", R->rs[Rs_display_name]); 2733 tt_printf ("%-.250s\n", rs[Rs_display_name]);
2648 break; 2734 break;
2649#endif 2735#endif
2650 case 8: /* unofficial extension */ 2736 case 8: /* unofficial extension */
2651 rxvt_xterm_seq(aR_ XTerm_title, APL_NAME "-" VERSION, CHAR_ST); 2737 xterm_seq (XTerm_title, APL_NAME "-" VERSION, CHAR_ST);
2738 break;
2739 }
2652 break; 2740 break;
2653 }
2654 break;
2655 2741
2656 case CSI_TBC: /* 8.3.155: (0) TABULATION CLEAR */ 2742 case CSI_TBC: /* 8.3.155: (0) TABULATION CLEAR */
2657 switch (arg[0]) { 2743 switch (arg[0])
2744 {
2658 case 0: /* char tab stop cleared at active position */ 2745 case 0: /* char tab stop cleared at active position */
2659 rxvt_scr_set_tab(aR_ 0); 2746 scr_set_tab (0);
2660 break; 2747 break;
2661 /* case 1: */ /* line tab stop cleared in active line */ 2748 /* case 1: */ /* line tab stop cleared in active line */
2662 /* case 2: */ /* char tab stops cleared in active line */ 2749 /* case 2: */ /* char tab stops cleared in active line */
2663 case 3: /* all char tab stops are cleared */ 2750 case 3: /* all char tab stops are cleared */
2664 /* case 4: */ /* all line tab stops are cleared */ 2751 /* case 4: */ /* all line tab stops are cleared */
2665 case 5: /* all tab stops are cleared */ 2752 case 5: /* all tab stops are cleared */
2666 rxvt_scr_set_tab(aR_ -1); 2753 scr_set_tab (-1);
2754 break;
2755 }
2667 break; 2756 break;
2668 }
2669 break;
2670 2757
2671 case CSI_CTC: /* 8.3.17: (0) CURSOR TABULATION CONTROL */ 2758 case CSI_CTC: /* 8.3.17: (0) CURSOR TABULATION CONTROL */
2672 switch (arg[0]) { 2759 switch (arg[0])
2760 {
2673 case 0: /* char tab stop set at active position */ 2761 case 0: /* char tab stop set at active position */
2674 rxvt_scr_set_tab(aR_ 1); 2762 scr_set_tab (1);
2675 break; /* = ESC H */ 2763 break; /* = ESC H */
2676 /* case 1: */ /* line tab stop set at active line */ 2764 /* case 1: */ /* line tab stop set at active line */
2677 case 2: /* char tab stop cleared at active position */ 2765 case 2: /* char tab stop cleared at active position */
2678 rxvt_scr_set_tab(aR_ 0); 2766 scr_set_tab (0);
2679 break; /* = ESC [ 0 g */ 2767 break; /* = ESC [ 0 g */
2680 /* case 3: */ /* line tab stop cleared at active line */ 2768 /* case 3: */ /* line tab stop cleared at active line */
2681 /* case 4: */ /* char tab stops cleared at active line */ 2769 /* case 4: */ /* char tab stops cleared at active line */
2682 case 5: /* all char tab stops are cleared */ 2770 case 5: /* all char tab stops are cleared */
2683 rxvt_scr_set_tab(aR_ -1); 2771 scr_set_tab (-1);
2684 break; /* = ESC [ 3 g */ 2772 break; /* = ESC [ 3 g */
2685 /* case 6: */ /* all line tab stops are cleared */ 2773 /* case 6: */ /* all line tab stops are cleared */
2686 } 2774 }
2687 break; 2775 break;
2688 2776
2689 case CSI_RM: /* 8.3.107: RESET MODE */ 2777 case CSI_RM: /* 8.3.107: RESET MODE */
2690 if (arg[0] == 4) 2778 if (arg[0] == 4)
2691 rxvt_scr_insert_mode(aR_ 0); 2779 scr_insert_mode (0);
2692 break; 2780 break;
2693 2781
2694 case CSI_SM: /* 8.3.126: SET MODE */ 2782 case CSI_SM: /* 8.3.126: SET MODE */
2695 if (arg[0] == 4) 2783 if (arg[0] == 4)
2696 rxvt_scr_insert_mode(aR_ 1); 2784 scr_insert_mode (1);
2697 break; 2785 break;
2698 2786
2699/* 2787 /*
2700 * PRIVATE USE beyond this point. All CSI_7? sequences here 2788 * PRIVATE USE beyond this point. All CSI_7? sequences here
2701 */ 2789 */
2702 case CSI_72: /* DECSTBM: set top and bottom margins */ 2790 case CSI_72: /* DECSTBM: set top and bottom margins */
2703 if (nargs == 1) 2791 if (nargs == 1)
2704 rxvt_scr_scroll_region(aR_ arg[0] - 1, MAX_ROWS - 1); 2792 scr_scroll_region (arg[0] - 1, MAX_ROWS - 1);
2705 else if (nargs == 0 || arg[0] >= arg[1]) 2793 else if (nargs == 0 || arg[0] >= arg[1])
2706 rxvt_scr_scroll_region(aR_ 0, MAX_ROWS - 1); 2794 scr_scroll_region (0, MAX_ROWS - 1);
2707 else 2795 else
2708 rxvt_scr_scroll_region(aR_ arg[0] - 1, arg[1] - 1); 2796 scr_scroll_region (arg[0] - 1, arg[1] - 1);
2709 break; 2797 break;
2710 2798
2711 case CSI_73: 2799 case CSI_73:
2712 rxvt_scr_cursor(aR_ SAVE); 2800 scr_cursor (SAVE);
2713 break; 2801 break;
2714 case CSI_75: 2802 case CSI_75:
2715 rxvt_scr_cursor(aR_ RESTORE); 2803 scr_cursor (RESTORE);
2716 break; 2804 break;
2717 2805
2718#ifndef NO_FRILLS 2806#ifndef NO_FRILLS
2719 case CSI_74: 2807 case CSI_74:
2720 rxvt_process_window_ops(aR_ arg, nargs); 2808 process_window_ops (arg, nargs);
2721 break; 2809 break;
2722#endif 2810#endif
2723 2811
2724 case CSI_78: /* DECREQTPARM */ 2812 case CSI_78: /* DECREQTPARM */
2725 if (arg[0] == 0 || arg[0] == 1) 2813 if (arg[0] == 0 || arg[0] == 1)
2726 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);
2727 /* FALLTHROUGH */ 2815 /* FALLTHROUGH */
2728 2816
2729 default: 2817 default:
2730 break; 2818 break;
2731 } 2819 }
2732} 2820}
2733/*}}} */ 2821/*}}} */
2734 2822
2735#ifndef NO_FRILLS 2823#ifndef NO_FRILLS
2736/* ARGSUSED */ 2824/* ARGSUSED */
2737/* INTPROTO */
2738void 2825void
2739rxvt_process_window_ops(pR_ const int *args, unsigned int nargs) 2826rxvt_term::process_window_ops (const int *args, unsigned int nargs)
2740{ 2827{
2741 int x, y; 2828 int x, y;
2742#if 0 2829#if 0
2743 char *s; 2830 char *s;
2744#endif 2831#endif
2745 XWindowAttributes wattr; 2832 XWindowAttributes wattr;
2746 Window wdummy; 2833 Window wdummy;
2747 2834
2748 if (nargs == 0) 2835 if (nargs == 0)
2749 return; 2836 return;
2750 switch (args[0]) { 2837 switch (args[0])
2838 {
2751 /* 2839 /*
2752 * commands 2840 * commands
2753 */ 2841 */
2754 case 1: /* deiconify window */ 2842 case 1: /* deiconify window */
2755 XMapWindow(R->Xdisplay, R->TermWin.parent[0]); 2843 XMapWindow (display->display, TermWin.parent[0]);
2756 break; 2844 break;
2757 case 2: /* iconify window */ 2845 case 2: /* iconify window */
2758 XIconifyWindow(R->Xdisplay, R->TermWin.parent[0], 2846 XIconifyWindow (display->display, TermWin.parent[0],
2759 DefaultScreen(R->Xdisplay)); 2847 DefaultScreen (display->display));
2760 break; 2848 break;
2761 case 3: /* set position (pixels) */ 2849 case 3: /* set position (pixels) */
2762 XMoveWindow(R->Xdisplay, R->TermWin.parent[0], args[1], args[2]); 2850 XMoveWindow (display->display, TermWin.parent[0], args[1], args[2]);
2763 break; 2851 break;
2764 case 4: /* set size (pixels) */ 2852 case 4: /* set size (pixels) */
2765 rxvt_set_widthheight(aR_ (unsigned int)args[2], (unsigned int)args[1]); 2853 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
2766 break; 2854 break;
2767 case 5: /* raise window */ 2855 case 5: /* raise window */
2768 XRaiseWindow(R->Xdisplay, R->TermWin.parent[0]); 2856 XRaiseWindow (display->display, TermWin.parent[0]);
2769 break; 2857 break;
2770 case 6: /* lower window */ 2858 case 6: /* lower window */
2771 XLowerWindow(R->Xdisplay, R->TermWin.parent[0]); 2859 XLowerWindow (display->display, TermWin.parent[0]);
2772 break; 2860 break;
2773 case 7: /* refresh window */ 2861 case 7: /* refresh window */
2774 rxvt_scr_touch(aR_ True); 2862 scr_touch (true);
2775 break; 2863 break;
2776 case 8: /* set size (chars) */ 2864 case 8: /* set size (chars) */
2777 rxvt_set_widthheight(aR_ (unsigned int)(args[2] * R->TermWin.fwidth), 2865 set_widthheight ((unsigned int) (args[2] * TermWin.fwidth),
2778 (unsigned int)(args[1] * R->TermWin.fheight)); 2866 (unsigned int) (args[1] * TermWin.fheight));
2779 break; 2867 break;
2780 default: 2868 default:
2781 if (args[0] >= 24) /* set height (chars) */ 2869 if (args[0] >= 24) /* set height (chars) */
2782 rxvt_set_widthheight(aR_ (unsigned int)R->TermWin.width, 2870 set_widthheight ((unsigned int)TermWin.width,
2783 (unsigned int)(args[1] * R->TermWin.fheight)); 2871 (unsigned int) (args[1] * TermWin.fheight));
2784 break; 2872 break;
2785 /* 2873 /*
2786 * reports - some output format copied from XTerm 2874 * reports - some output format copied from XTerm
2787 */ 2875 */
2788 case 11: /* report window state */ 2876 case 11: /* report window state */
2789 XGetWindowAttributes(R->Xdisplay, R->TermWin.parent[0], &wattr); 2877 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);
2790 R->tt_printf("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 2878 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
2791 break; 2879 break;
2792 case 13: /* report window position */ 2880 case 13: /* report window position */
2793 XGetWindowAttributes(R->Xdisplay, R->TermWin.parent[0], &wattr); 2881 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);
2794 XTranslateCoordinates(R->Xdisplay, R->TermWin.parent[0], wattr.root, 2882 XTranslateCoordinates (display->display, TermWin.parent[0], wattr.root,
2795 -wattr.border_width, -wattr.border_width, 2883 -wattr.border_width, -wattr.border_width,
2796 &x, &y, &wdummy); 2884 &x, &y, &wdummy);
2797 R->tt_printf("\033[3;%d;%dt", x, y); 2885 tt_printf ("\033[3;%d;%dt", x, y);
2798 break; 2886 break;
2799 case 14: /* report window size (pixels) */ 2887 case 14: /* report window size (pixels) */
2800 XGetWindowAttributes(R->Xdisplay, R->TermWin.parent[0], &wattr); 2888 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);
2801 R->tt_printf("\033[4;%d;%dt", wattr.height, wattr.width); 2889 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
2802 break; 2890 break;
2803 case 18: /* report window size (chars) */ 2891 case 18: /* report window size (chars) */
2804 R->tt_printf("\033[8;%d;%dt", R->TermWin.nrow, R->TermWin.ncol); 2892 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol);
2805 break; 2893 break;
2806#if 0 /* XXX: currently disabled due to security concerns */ 2894#if 0 /* XXX: currently disabled due to security concerns */
2807 case 20: /* report icon label */ 2895 case 20: /* report icon label */
2808 XGetIconName(R->Xdisplay, R->TermWin.parent[0], &s); 2896 XGetIconName (display->display, TermWin.parent[0], &s);
2809 R->tt_printf("\033]L%-.200s\234", s ? s : ""); /* 8bit ST */ 2897 tt_printf ("\033]L%-.200s\234", s ? s : ""); /* 8bit ST */
2810 break; 2898 break;
2811 case 21: /* report window title */ 2899 case 21: /* report window title */
2812 XFetchName(R->Xdisplay, R->TermWin.parent[0], &s); 2900 XFetchName (display->display, TermWin.parent[0], &s);
2813 R->tt_printf("\033]l%-.200s\234", s ? s : ""); /* 8bit ST */ 2901 tt_printf ("\033]l%-.200s\234", s ? s : ""); /* 8bit ST */
2814 break; 2902 break;
2815#endif 2903#endif
2904
2816 } 2905 }
2817} 2906}
2818#endif 2907#endif
2819 2908
2820/*----------------------------------------------------------------------*/ 2909/*----------------------------------------------------------------------*/
2821/* 2910/*
2822 * get input up until STRING TERMINATOR (or BEL) 2911 * get input up until STRING TERMINATOR (or BEL)
2823 * ends_how is terminator used. returned input must be free()d 2912 * ends_how is terminator used. returned input must be free ()d
2824 */ 2913 */
2825/* INTPROTO */
2826unsigned char * 2914unsigned char *
2827rxvt_get_to_st(pR_ unsigned char *ends_how) 2915rxvt_term::get_to_st (unsigned char *ends_how)
2828{ 2916{
2829 int seen_esc = 0; /* seen escape? */ 2917 int seen_esc = 0; /* seen escape? */
2830 unsigned int n = 0; 2918 unsigned int n = 0;
2831 unsigned char *s; 2919 unsigned char *s;
2832 unsigned char ch, string[STRING_MAX]; 2920 unsigned char ch, string[STRING_MAX];
2833 2921
2834 for (; (ch = rxvt_cmd_getc(aR));) { 2922 for (; (ch = cmd_getc ());)
2923 {
2835 if (ch == C0_BEL 2924 if (ch == C0_BEL
2836 || ch == CHAR_ST 2925 || ch == CHAR_ST
2837 || (ch == 0x5c && seen_esc)) /* 7bit ST */ 2926 || (ch == 0x5c && seen_esc)) /* 7bit ST */
2838 break; 2927 break;
2839 if (ch == C0_ESC) { 2928 if (ch == C0_ESC)
2929 {
2840 seen_esc = 1; 2930 seen_esc = 1;
2841 continue; 2931 continue;
2932 }
2842 } else if (ch == '\t') 2933 else if (ch == '\t')
2843 ch = ' '; /* translate '\t' to space */ 2934 ch = ' '; /* translate '\t' to space */
2844 else if (ch < 0x08 || (ch > 0x0d && ch < 0x20)) 2935 else if (ch < 0x08 || (ch > 0x0d && ch < 0x20))
2845 return NULL; /* other control character - exit */ 2936 return NULL; /* other control character - exit */
2846 if (n < sizeof(string) - 1) 2937 if (n < sizeof (string) - 1)
2847 string[n++] = ch; 2938 string[n++] = ch;
2848 seen_esc = 0; 2939 seen_esc = 0;
2849 } 2940 }
2850 string[n++] = '\0'; 2941 string[n++] = '\0';
2851 if ((s = (unsigned char *)rxvt_malloc(n)) == NULL) 2942 if ((s = (unsigned char *)rxvt_malloc (n)) == NULL)
2852 return NULL; 2943 return NULL;
2853 *ends_how = (ch == 0x5c ? C0_ESC : ch); 2944 *ends_how = (ch == 0x5c ? C0_ESC : ch);
2854 STRNCPY(s, string, n); 2945 STRNCPY (s, string, n);
2855 return s; 2946 return s;
2856} 2947}
2857 2948
2858/*----------------------------------------------------------------------*/ 2949/*----------------------------------------------------------------------*/
2859/* 2950/*
2860 * 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)'
2861 */ 2952 */
2862/* INTPROTO */
2863void 2953void
2864rxvt_process_dcs_seq(pR) 2954rxvt_term::process_dcs_seq ()
2865{ 2955{
2866 unsigned char eh, *s; 2956 unsigned char eh, *s;
2867/* 2957 /*
2868 * Not handled yet 2958 * Not handled yet
2869 */ 2959 */
2870 s = rxvt_get_to_st(aR_ &eh); 2960 s = get_to_st (&eh);
2871 if (s) 2961 if (s)
2872 free(s); 2962 free (s);
2873 return; 2963 return;
2874} 2964}
2875 2965
2876/*----------------------------------------------------------------------*/ 2966/*----------------------------------------------------------------------*/
2877/* 2967/*
2878 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)' 2968 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)'
2879 */ 2969 */
2880/* INTPROTO */
2881void 2970void
2882rxvt_process_osc_seq(pR) 2971rxvt_term::process_osc_seq ()
2883{ 2972{
2884 unsigned char ch, eh, *s; 2973 unsigned char ch, eh, *s;
2885 int arg; 2974 int arg;
2886 2975
2887 ch = rxvt_cmd_getc(aR); 2976 ch = cmd_getc ();
2888 for (arg = 0; isdigit(ch); ch = rxvt_cmd_getc(aR)) 2977 for (arg = 0; isdigit (ch); ch = cmd_getc ())
2889 arg = arg * 10 + (ch - '0'); 2978 arg = arg * 10 + (ch - '0');
2890 2979
2891 if (ch == ';') { 2980 if (ch == ';')
2892 s = rxvt_get_to_st(aR_ &eh); 2981 {
2893 if (s) { 2982 s = get_to_st (&eh);
2894 /* 2983 if (s)
2984 {
2985 /*
2895 * rxvt_menubar_dispatch() violates the constness of the string, 2986 * rxvt_menubar_dispatch () violates the constness of the string,
2896 * so do it here 2987 * so do it here
2897 */ 2988 */
2898 if (arg == XTerm_Menu) 2989 if (arg == XTerm_Menu)
2899#if 0 /* XXX: currently disabled due to security concerns */ 2990#if 0 /* XXX: currently disabled due to security concerns */
2900 rxvt_menubar_dispatch(aR_ (char *)s); 2991 menubar_dispatch ((char *)s);
2901#else 2992#else
2902 0; 2993 (void)0;
2903#endif 2994#endif
2904 else 2995 else
2905 rxvt_xterm_seq(aR_ arg, (char *)s, eh); 2996 xterm_seq (arg, (char *)s, eh);
2906 free(s); 2997 free (s);
2907 } 2998 }
2908 } 2999 }
2909} 3000}
2910/* 3001/*
2911 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3002 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
2912 * 0 = change iconName/title 3003 * 0 = change iconName/title
… …
2926 * 20 = bg pixmap 3017 * 20 = bg pixmap
2927 * 39 = change default fg color 3018 * 39 = change default fg color
2928 * 49 = change default bg color 3019 * 49 = change default bg color
2929 * 55 = dump scrollback buffer and all of screen 3020 * 55 = dump scrollback buffer and all of screen
2930 */ 3021 */
2931/* EXTPROTO */
2932void 3022void
2933rxvt_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)))
2934{ 3024{
2935 int changed = 0; 3025 int changed = 0;
2936 int color; 3026 int color;
2937 char *buf, *name; 3027 char *buf, *name;
2938 3028
2939 assert(str != NULL); 3029 assert (str != NULL);
2940 switch (op) { 3030 switch (op)
3031 {
2941 case XTerm_name: 3032 case XTerm_name:
2942 rxvt_set_title(aR_ str); 3033 set_title (str);
2943 /* FALLTHROUGH */ 3034 /* FALLTHROUGH */
2944 case XTerm_iconName: 3035 case XTerm_iconName:
2945 rxvt_set_iconName(aR_ str); 3036 set_iconName (str);
2946 break; 3037 break;
2947 case XTerm_title: 3038 case XTerm_title:
2948 rxvt_set_title(aR_ str); 3039 set_title (str);
2949 break; 3040 break;
2950 case XTerm_Color: 3041 case XTerm_Color:
2951 for (buf = (char *)str; buf && *buf;) { 3042 for (buf = (char *)str; buf && *buf;)
3043 {
2952 if ((name = STRCHR(buf, ';')) == NULL) 3044 if ((name = STRCHR (buf, ';')) == NULL)
2953 break; 3045 break;
2954 *name++ = '\0'; 3046 *name++ = '\0';
2955 color = atoi(buf); 3047 color = atoi (buf);
2956 if (color < 0 || color >= TOTAL_COLORS) 3048 if (color < 0 || color >= TOTAL_COLORS)
2957 break; 3049 break;
2958 if ((buf = STRCHR(name, ';')) != NULL) 3050 if ((buf = STRCHR (name, ';')) != NULL)
2959 *buf++ = '\0'; 3051 *buf++ = '\0';
2960 rxvt_set_window_color(aR_ color + minCOLOR, name); 3052 set_window_color (color + minCOLOR, name);
2961 } 3053 }
2962 break; 3054 break;
2963#ifndef NO_CURSORCOLOR 3055#ifndef NO_CURSORCOLOR
2964 case XTerm_Color_cursor: 3056 case XTerm_Color_cursor:
2965 rxvt_set_window_color(aR_ Color_cursor, str); 3057 set_window_color (Color_cursor, str);
2966 break; 3058 break;
2967#endif 3059#endif
2968 case XTerm_Color_pointer: 3060 case XTerm_Color_pointer:
2969 rxvt_set_window_color(aR_ Color_pointer, str); 3061 set_window_color (Color_pointer, str);
2970 break; 3062 break;
2971#ifndef NO_BOLD_UNDERLINE_REVERSE 3063#ifndef NO_BOLD_UNDERLINE_REVERSE
2972 case XTerm_Color_BD: 3064 case XTerm_Color_BD:
2973 rxvt_set_window_color(aR_ Color_BD, str); 3065 set_window_color (Color_BD, str);
2974 break; 3066 break;
2975 case XTerm_Color_UL: 3067 case XTerm_Color_UL:
2976 rxvt_set_window_color(aR_ Color_UL, str); 3068 set_window_color (Color_UL, str);
2977 break; 3069 break;
2978 case XTerm_Color_RV: 3070 case XTerm_Color_RV:
2979 rxvt_set_window_color(aR_ Color_RV, str); 3071 set_window_color (Color_RV, str);
2980 break; 3072 break;
2981#endif 3073#endif
2982 3074
2983 case XTerm_Menu: 3075 case XTerm_Menu:
2984 /* 3076 /*
2985 * rxvt_menubar_dispatch() violates the constness of the string, 3077 * rxvt_menubar_dispatch () violates the constness of the string,
2986 * so DON'T do it here 3078 * so DON'T do it here
2987 */ 3079 */
2988 break; 3080 break;
2989 case XTerm_Pixmap: 3081 case XTerm_Pixmap:
2990 if (*str != ';') { 3082 if (*str != ';')
3083 {
2991#if XPM_BACKGROUND 3084#if XPM_BACKGROUND
2992 rxvt_scale_pixmap(aR_ ""); /* reset to default scaling */ 3085 scale_pixmap (""); /* reset to default scaling */
2993 rxvt_set_bgPixmap(aR_ str); /* change pixmap */ 3086 set_bgPixmap (str); /* change pixmap */
2994#endif 3087#endif
2995 rxvt_scr_touch(aR_ True); 3088 scr_touch (true);
2996 } 3089 }
2997 while ((str = STRCHR(str, ';')) != NULL) { 3090 while ((str = STRCHR (str, ';')) != NULL)
2998 str++; 3091 {
3092 str++;
2999#if XPM_BACKGROUND 3093#if XPM_BACKGROUND
3000 changed += rxvt_scale_pixmap(aR_ str); 3094 changed += scale_pixmap (str);
3001#endif 3095#endif
3002 } 3096
3003 if (changed) { 3097 }
3098 if (changed)
3099 {
3004#ifdef XPM_BACKGROUND 3100#ifdef XPM_BACKGROUND
3005 rxvt_resize_pixmap(aR); 3101 resize_pixmap ();
3006#endif 3102#endif
3007 rxvt_scr_touch(aR_ True); 3103 scr_touch (true);
3008 } 3104 }
3009 break; 3105 break;
3010 3106
3011 case XTerm_restoreFG: 3107 case XTerm_restoreFG:
3012 rxvt_set_window_color(aR_ Color_fg, str); 3108 set_window_color (Color_fg, str);
3013 break; 3109 break;
3014 case XTerm_restoreBG: 3110 case XTerm_restoreBG:
3015 rxvt_set_window_color(aR_ Color_bg, str); 3111 set_window_color (Color_bg, str);
3016 break; 3112 break;
3017 case XTerm_logfile: 3113 case XTerm_logfile:
3018 break; 3114 break;
3019 case XTerm_font: 3115 case XTerm_font:
3020 rxvt_change_font(aR_ 0, str); 3116 change_font (0, str);
3021 break; 3117 break;
3022#if 0 3118#if 0
3023 case XTerm_dumpscreen: /* no error notices */ 3119 case XTerm_dumpscreen: /* no error notices */
3024 { 3120 {
3025 int fd; 3121 int fd;
3026 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)
3027 rxvt_scr_dump(aR_ fd); 3123 {
3028 close(fd); 3124 scr_dump (fd);
3029 } 3125 close (fd);
3030 } 3126 }
3031 break; 3127 }
3128 break;
3032#endif 3129#endif
3130
3033 } 3131 }
3034} 3132}
3035/*----------------------------------------------------------------------*/ 3133/*----------------------------------------------------------------------*/
3036 3134
3037/*{{{ process DEC private mode sequences `ESC [ ? Ps mode' */ 3135/*{{{ process DEC private mode sequences `ESC [ ? Ps mode' */
… …
3042 * 's' = save 3140 * 's' = save
3043 * 'r' = restore 3141 * 'r' = restore
3044 * 't' = toggle 3142 * 't' = toggle
3045 * so no need for fancy checking 3143 * so no need for fancy checking
3046 */ 3144 */
3047/* INTPROTO */
3048int 3145int
3049rxvt_privcases(pR_ int mode, unsigned long bit) 3146rxvt_term::privcases (int mode, unsigned long bit)
3050{ 3147{
3051 int state; 3148 int state;
3052 3149
3053 if (mode == 's') { 3150 if (mode == 's')
3151 {
3054 R->SavedModes |= (R->PrivateModes & bit); 3152 SavedModes |= (PrivateModes & bit);
3055 return -1; 3153 return -1;
3056 } else { 3154 }
3155 else
3156 {
3057 if (mode == 'r') 3157 if (mode == 'r')
3058 state = (R->SavedModes & bit) ? 1 : 0; /* no overlapping */ 3158 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3059 else 3159 else
3060 state = (mode == 't') ? !(R->PrivateModes & bit) : mode; 3160 state = (mode == 't') ? ! (PrivateModes & bit) : mode;
3061 PrivMode(state, bit); 3161 PrivMode (state, bit);
3062 } 3162 }
3063 return state; 3163 return state;
3064} 3164}
3065 3165
3066/* we're not using priv _yet_ */ 3166/* we're not using priv _yet_ */
3067/* INTPROTO */
3068void 3167void
3069rxvt_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)
3070{ 3169{
3071 unsigned int i, j; 3170 unsigned int i, j;
3072 int state; 3171 int state;
3073 static const struct { 3172 static const struct
3173 {
3074 const int argval; 3174 const int argval;
3075 const unsigned long bit; 3175 const unsigned long bit;
3176 }
3076 } argtopriv[] = { 3177 argtopriv[] = {
3077 { 1, PrivMode_aplCUR }, 3178 { 1, PrivMode_aplCUR },
3078 { 2, PrivMode_vt52 }, 3179 { 2, PrivMode_vt52 },
3079 { 3, PrivMode_132 }, 3180 { 3, PrivMode_132 },
3080 { 4, PrivMode_smoothScroll }, 3181 { 4, PrivMode_smoothScroll },
3081 { 5, PrivMode_rVideo }, 3182 { 5, PrivMode_rVideo },
3082 { 6, PrivMode_relOrigin }, 3183 { 6, PrivMode_relOrigin },
3083 { 7, PrivMode_Autowrap }, 3184 { 7, PrivMode_Autowrap },
3084 { 9, PrivMode_MouseX10 }, 3185 { 9, PrivMode_MouseX10 },
3085#ifdef menuBar_esc 3186#ifdef menuBar_esc
3086 { menuBar_esc, PrivMode_menuBar }, 3187 { menuBar_esc, PrivMode_menuBar },
3087#endif 3188#endif
3088#ifdef scrollBar_esc 3189#ifdef scrollBar_esc
3089 { scrollBar_esc, PrivMode_scrollBar }, 3190 { scrollBar_esc, PrivMode_scrollBar },
3090#endif 3191#endif
3091 { 25, PrivMode_VisibleCursor }, 3192 { 25, PrivMode_VisibleCursor },
3092 { 35, PrivMode_ShiftKeys }, 3193 { 35, PrivMode_ShiftKeys },
3093 { 40, PrivMode_132OK }, 3194 { 40, PrivMode_132OK },
3094 { 47, PrivMode_Screen }, 3195 { 47, PrivMode_Screen },
3095 { 66, PrivMode_aplKP }, 3196 { 66, PrivMode_aplKP },
3096#ifndef NO_BACKSPACE_KEY 3197#ifndef NO_BACKSPACE_KEY
3097 { 67, PrivMode_BackSpace }, 3198 { 67, PrivMode_BackSpace },
3098#endif 3199#endif
3099 { 1000, PrivMode_MouseX11 }, 3200 { 1000, PrivMode_MouseX11 },
3100 { 1010, PrivMode_TtyOutputInh }, 3201 { 1010, PrivMode_TtyOutputInh },
3101 { 1011, PrivMode_Keypress }, 3202 { 1011, PrivMode_Keypress },
3102 { 1047, PrivMode_Screen }, 3203 { 1047, PrivMode_Screen },
3103 }; 3204 { 1049, PrivMode_Screen }, /* xterm extension, not fully implemented */
3205 };
3104 3206
3105 if (nargs == 0) 3207 if (nargs == 0)
3106 return; 3208 return;
3107 3209
3108/* make lo/hi boolean */ 3210 /* make lo/hi boolean */
3109 if (mode == 'l') 3211 if (mode == 'l')
3110 mode = 0; /* reset */ 3212 mode = 0; /* reset */
3111 else if (mode == 'h') 3213 else if (mode == 'h')
3112 mode = 1; /* set */ 3214 mode = 1; /* set */
3113 3215
3114 for (i = 0; i < nargs; i++) { 3216 for (i = 0; i < nargs; i++)
3217 {
3115 state = -1; 3218 state = -1;
3116 3219
3117 /* basic handling */ 3220 /* basic handling */
3118 for (j = 0; j < (sizeof(argtopriv)/sizeof(argtopriv[0])); j++) 3221 for (j = 0; j < (sizeof (argtopriv)/sizeof (argtopriv[0])); j++)
3119 if (argtopriv[j].argval == arg[i]) { 3222 if (argtopriv[j].argval == arg[i])
3223 {
3120 state = rxvt_privcases(aR_ mode, argtopriv[j].bit); 3224 state = privcases (mode, argtopriv[j].bit);
3121 break; 3225 break;
3122 } 3226 }
3123 3227
3124 /* extra handling for values with state unkept */ 3228 /* extra handling for values with state unkept */
3125 if (state == -1) 3229 if (state == -1)
3126 switch (arg[i]) { 3230 switch (arg[i])
3231 {
3127 case 1048: /* alternative cursor save */ 3232 case 1048: /* alternative cursor save */
3128 if (mode == 0) 3233 if (mode == 0)
3129 rxvt_scr_cursor(aR_ RESTORE); 3234 scr_cursor (RESTORE);
3130 else if (mode == 1) 3235 else if (mode == 1)
3131 rxvt_scr_cursor(aR_ SAVE); 3236 scr_cursor (SAVE);
3132 /* FALLTHROUGH */ 3237 /* FALLTHROUGH */
3133 default: 3238 default:
3134 continue; /* for(;i;) */ 3239 continue; /* for (;i;) */
3135 } 3240 }
3136 3241
3137 /* extra handling for values with valid 0 or 1 state */ 3242 /* extra handling for values with valid 0 or 1 state */
3138 switch (arg[i]) { 3243 switch (arg[i])
3244 {
3139 /* case 1: - application cursor keys */ 3245 /* case 1: - application cursor keys */
3140 case 2: /* VT52 mode */ 3246 case 2: /* VT52 mode */
3141 /* oddball mode. should be set regardless of set/reset 3247 /* oddball mode. should be set regardless of set/reset
3142 * parameter. Return from VT52 mode with an ESC < from 3248 * parameter. Return from VT52 mode with an ESC < from
3143 * within VT52 mode 3249 * within VT52 mode
3144 */ 3250 */
3145 PrivMode(1, PrivMode_vt52); 3251 PrivMode (1, PrivMode_vt52);
3146 break; 3252 break;
3147 case 3: /* 80/132 */ 3253 case 3: /* 80/132 */
3148 if (R->PrivateModes & PrivMode_132OK) 3254 if (PrivateModes & PrivMode_132OK)
3149 rxvt_set_widthheight(aR_
3150 (unsigned int)((state ? 132 : 80) * R->TermWin.fwidth), 3255 set_widthheight ( (unsigned int) ((state ? 132 : 80) * TermWin.fwidth),
3151 (unsigned int)R->TermWin.height); 3256 (unsigned int)TermWin.height);
3152 break; 3257 break;
3153 case 4: /* smooth scrolling */ 3258 case 4: /* smooth scrolling */
3154 if (state) 3259 if (state)
3155 R->Options &= ~Opt_jumpScroll; 3260 Options &= ~Opt_jumpScroll;
3156 else 3261 else
3157 R->Options |= Opt_jumpScroll; 3262 Options |= Opt_jumpScroll;
3158 break; 3263 break;
3159 case 5: /* reverse video */ 3264 case 5: /* reverse video */
3160 rxvt_scr_rvideo_mode(aR_ state); 3265 scr_rvideo_mode (state);
3161 break; 3266 break;
3162 case 6: /* relative/absolute origins */ 3267 case 6: /* relative/absolute origins */
3163 rxvt_scr_relative_origin(aR_ state); 3268 scr_relative_origin (state);
3164 break; 3269 break;
3165 case 7: /* autowrap */ 3270 case 7: /* autowrap */
3166 rxvt_scr_autowrap(aR_ state); 3271 scr_autowrap (state);
3167 break; 3272 break;
3168 /* 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 */
3169 case 9: /* X10 mouse reporting */ 3274 case 9: /* X10 mouse reporting */
3170 if (state) /* orthogonal */ 3275 if (state) /* orthogonal */
3171 R->PrivateModes &= ~(PrivMode_MouseX11); 3276 PrivateModes &= ~ (PrivMode_MouseX11);
3172 break; 3277 break;
3173#ifdef menuBar_esc 3278#ifdef menuBar_esc
3174 case menuBar_esc: 3279 case menuBar_esc:
3175#ifdef MENUBAR 3280#ifdef MENUBAR
3176 rxvt_map_menuBar(aR_ state); 3281 map_menuBar (state);
3177#endif 3282#endif
3178 break; 3283 break;
3179#endif 3284#endif
3180#ifdef scrollBar_esc 3285#ifdef scrollBar_esc
3181 case scrollBar_esc: 3286 case scrollBar_esc:
3182 if (rxvt_scrollbar_mapping(aR_ state)) { 3287 if (scrollbar_mapping (state))
3183 rxvt_resize_all_windows(aR_ 0, 0, 0); 3288 {
3184 rxvt_scr_touch(aR_ True); 3289 resize_all_windows (0, 0, 0);
3185 } 3290 scr_touch (true);
3186 break; 3291 }
3292 break;
3187#endif 3293#endif
3188 case 25: /* visible/invisible cursor */ 3294 case 25: /* visible/invisible cursor */
3189 rxvt_scr_cursor_visible(aR_ state); 3295 scr_cursor_visible (state);
3190 break; 3296 break;
3191 /* case 35: - shift keys */ 3297 /* case 35: - shift keys */
3192 /* case 40: - 80 <--> 132 mode */ 3298 /* case 40: - 80 <--> 132 mode */
3193 case 47: /* secondary screen */ 3299 case 47: /* secondary screen */
3194 rxvt_scr_change_screen(aR_ state); 3300 scr_change_screen (state);
3195 break; 3301 break;
3196 /* case 66: - application key pad */ 3302 /* case 66: - application key pad */
3197 /* case 67: - backspace key */ 3303 /* case 67: - backspace key */
3198 case 1000: /* X11 mouse reporting */ 3304 case 1000: /* X11 mouse reporting */
3199 if (state) /* orthogonal */ 3305 if (state) /* orthogonal */
3200 R->PrivateModes &= ~(PrivMode_MouseX10); 3306 PrivateModes &= ~ (PrivMode_MouseX10);
3201 break; 3307 break;
3202#if 0 3308#if 0
3203 case 1001: 3309 case 1001:
3204 break; /* X11 mouse highlighting */ 3310 break; /* X11 mouse highlighting */
3205#endif 3311#endif
3206 case 1010: /* scroll to bottom on TTY output inhibit */ 3312 case 1010: /* scroll to bottom on TTY output inhibit */
3207 if (state) 3313 if (state)
3208 R->Options &= ~Opt_scrollTtyOutput; 3314 Options &= ~Opt_scrollTtyOutput;
3209 else 3315 else
3210 R->Options |= Opt_scrollTtyOutput; 3316 Options |= Opt_scrollTtyOutput;
3211 break; 3317 break;
3212 case 1011: /* scroll to bottom on key press */ 3318 case 1011: /* scroll to bottom on key press */
3213 if (state) 3319 if (state)
3214 R->Options |= Opt_scrollTtyKeypress; 3320 Options |= Opt_scrollTtyKeypress;
3215 else 3321 else
3216 R->Options &= ~Opt_scrollTtyKeypress; 3322 Options &= ~Opt_scrollTtyKeypress;
3217 break; 3323 break;
3218 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 */
3219 if (R->current_screen != PRIMARY) 3326 if (current_screen != PRIMARY)
3220 rxvt_scr_erase_screen(aR_ 2); 3327 scr_erase_screen (2);
3221 rxvt_scr_change_screen(aR_ state); 3328 scr_change_screen (state);
3222 /* FALLTHROUGH */ 3329 /* FALLTHROUGH */
3223 default: 3330 default:
3224 break; 3331 break;
3225 } 3332 }
3226 } 3333 }
3227} 3334}
3228/*}}} */ 3335/*}}} */
3229 3336
3230/*{{{ process sgr sequences */ 3337/*{{{ process sgr sequences */
3231/* INTPROTO */
3232void 3338void
3233rxvt_process_sgr_mode(pR_ unsigned int nargs, const int *arg) 3339rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg)
3234{ 3340{
3235 unsigned int i; 3341 unsigned int i;
3236 short rendset; 3342 short rendset;
3237 int rendstyle; 3343 int rendstyle;
3238 3344
3239 if (nargs == 0) { 3345 if (nargs == 0)
3240 rxvt_scr_rendition(aR_ 0, ~RS_None);
3241 return;
3242 } 3346 {
3347 scr_rendition (0, ~RS_None);
3348 return;
3349 }
3243 for (i = 0; i < nargs; i++) { 3350 for (i = 0; i < nargs; i++)
3351 {
3244 rendset = -1; 3352 rendset = -1;
3245 switch (arg[i]) { 3353 switch (arg[i])
3246 case 0: 3354 {
3355 case 0:
3247 rendset = 0, rendstyle = ~RS_None; 3356 rendset = 0, rendstyle = ~RS_None;
3248 break; 3357 break;
3249 case 1: 3358 case 1:
3250 rendset = 1, rendstyle = RS_Bold; 3359 rendset = 1, rendstyle = RS_Bold;
3251 break; 3360 break;
3252 case 4: 3361 case 4:
3253 rendset = 1, rendstyle = RS_Uline; 3362 rendset = 1, rendstyle = RS_Uline;
3254 break; 3363 break;
3255 case 5: 3364 case 5:
3256 rendset = 1, rendstyle = RS_Blink; 3365 rendset = 1, rendstyle = RS_Blink;
3257 break; 3366 break;
3258 case 7: 3367 case 7:
3259 rendset = 1, rendstyle = RS_RVid; 3368 rendset = 1, rendstyle = RS_RVid;
3260 break; 3369 break;
3261 case 22: 3370 case 22:
3262 rendset = 0, rendstyle = RS_Bold; 3371 rendset = 0, rendstyle = RS_Bold;
3263 break; 3372 break;
3264 case 24: 3373 case 24:
3265 rendset = 0, rendstyle = RS_Uline; 3374 rendset = 0, rendstyle = RS_Uline;
3266 break; 3375 break;
3267 case 25: 3376 case 25:
3268 rendset = 0, rendstyle = RS_Blink; 3377 rendset = 0, rendstyle = RS_Blink;
3269 break; 3378 break;
3270 case 27: 3379 case 27:
3271 rendset = 0, rendstyle = RS_RVid; 3380 rendset = 0, rendstyle = RS_RVid;
3272 break; 3381 break;
3273 } 3382 }
3274 if (rendset != -1) { 3383 if (rendset != -1)
3275 rxvt_scr_rendition(aR_ rendset, rendstyle); 3384 {
3385 scr_rendition (rendset, rendstyle);
3276 continue; /* for(;i;) */ 3386 continue; /* for (;i;) */
3277 } 3387 }
3278 3388
3279 switch (arg[i]) { 3389 switch (arg[i])
3280 case 30: 3390 {
3391 case 30:
3281 case 31: /* set fg color */ 3392 case 31: /* set fg color */
3282 case 32: 3393 case 32:
3283 case 33: 3394 case 33:
3284 case 34: 3395 case 34:
3285 case 35: 3396 case 35:
3286 case 36: 3397 case 36:
3287 case 37: 3398 case 37:
3288 rxvt_scr_color(aR_ (unsigned int)(minCOLOR + (arg[i] - 30)), 3399 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)),
3289 Color_fg); 3400 Color_fg);
3290 break; 3401 break;
3291#ifdef TTY_256COLOR 3402#ifdef TTY_256COLOR
3292 case 38: 3403 case 38:
3293 if (nargs > i + 2 && arg[i + 1] == 5) { 3404 if (nargs > i + 2 && arg[i + 1] == 5)
3405 {
3294 rxvt_scr_color(aR_ (unsigned int)(minCOLOR + arg[i + 2]), 3406 scr_color ((unsigned int) (minCOLOR + arg[i + 2]),
3295 Color_fg); 3407 Color_fg);
3296 i += 2; 3408 i += 2;
3297 } 3409 }
3298 break; 3410 break;
3299#endif 3411#endif
3300 case 39: /* default fg */ 3412 case 39: /* default fg */
3301 rxvt_scr_color(aR_ Color_fg, Color_fg); 3413 scr_color (Color_fg, Color_fg);
3302 break; 3414 break;
3303 3415
3304 case 40: 3416 case 40:
3305 case 41: /* set bg color */ 3417 case 41: /* set bg color */
3306 case 42: 3418 case 42:
3307 case 43: 3419 case 43:
3308 case 44: 3420 case 44:
3309 case 45: 3421 case 45:
3310 case 46: 3422 case 46:
3311 case 47: 3423 case 47:
3312 rxvt_scr_color(aR_ (unsigned int)(minCOLOR + (arg[i] - 40)), 3424 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)),
3313 Color_bg); 3425 Color_bg);
3314 break; 3426 break;
3315#ifdef TTY_256COLOR 3427#ifdef TTY_256COLOR
3316 case 48: 3428 case 48:
3317 if (nargs > i + 2 && arg[i + 1] == 5) { 3429 if (nargs > i + 2 && arg[i + 1] == 5)
3430 {
3318 rxvt_scr_color(aR_ (unsigned int)(minCOLOR + arg[i + 2]), 3431 scr_color ((unsigned int) (minCOLOR + arg[i + 2]),
3319 Color_bg); 3432 Color_bg);
3320 i += 2; 3433 i += 2;
3321 } 3434 }
3322 break; 3435 break;
3323#endif 3436#endif
3324 case 49: /* default bg */ 3437 case 49: /* default bg */
3325 rxvt_scr_color(aR_ Color_bg, Color_bg); 3438 scr_color (Color_bg, Color_bg);
3326 break; 3439 break;
3327 3440
3328#ifndef NO_BRIGHTCOLOR 3441#ifndef NO_BRIGHTCOLOR
3329 case 90: 3442 case 90:
3330 case 91: /* set bright fg color */ 3443 case 91: /* set bright fg color */
3331 case 92: 3444 case 92:
3332 case 93: 3445 case 93:
3333 case 94: 3446 case 94:
3334 case 95: 3447 case 95:
3335 case 96: 3448 case 96:
3336 case 97: 3449 case 97:
3337 rxvt_scr_color(aR_ (unsigned int)(minBrightCOLOR + (arg[i] - 90)), 3450 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)),
3338 Color_fg); 3451 Color_fg);
3339 break; 3452 break;
3340 case 100: 3453 case 100:
3341 case 101: /* set bright bg color */ 3454 case 101: /* set bright bg color */
3342 case 102: 3455 case 102:
3343 case 103: 3456 case 103:
3344 case 104: 3457 case 104:
3345 case 105: 3458 case 105:
3346 case 106: 3459 case 106:
3347 case 107: 3460 case 107:
3348 rxvt_scr_color(aR_ (unsigned int)(minBrightCOLOR + (arg[i] - 100)), 3461 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)),
3349 Color_bg); 3462 Color_bg);
3350 break; 3463 break;
3351#endif 3464#endif
3352 } 3465
3466 }
3353 } 3467 }
3354} 3468}
3355/*}}} */ 3469/*}}} */
3356 3470
3357/*{{{ process Rob Nation's own graphics mode sequences */ 3471/*{{{ process Rob Nation's own graphics mode sequences */
3358/* INTPROTO */
3359void 3472void
3360rxvt_process_graphics(pR) 3473rxvt_term::process_graphics ()
3361{ 3474{
3362 unsigned char ch, cmd = rxvt_cmd_getc(aR); 3475 unsigned char ch, cmd = cmd_getc ();
3363 3476
3364#ifndef RXVT_GRAPHICS 3477#ifndef RXVT_GRAPHICS
3478 if (cmd == 'Q')
3365 if (cmd == 'Q') { /* query graphics */ 3479 { /* query graphics */
3366 R->tt_printf("\033G0\n"); /* no graphics */ 3480 tt_printf ("\033G0\n"); /* no graphics */
3367 return; 3481 return;
3368 } 3482 }
3369/* swallow other graphics sequences until terminating ':' */ 3483 /* swallow other graphics sequences until terminating ':' */
3370 do 3484 do
3371 ch = rxvt_cmd_getc(aR); 3485 ch = cmd_getc ();
3372 while (ch != ':'); 3486 while (ch != ':');
3373#else 3487#else
3374 unsigned int nargs; 3488 unsigned int nargs;
3375 int args[NGRX_PTS]; 3489 int args[NGRX_PTS];
3376 unsigned char *text = NULL; 3490 unsigned char *text = NULL;
3377 3491
3492 if (cmd == 'Q')
3378 if (cmd == 'Q') { /* query graphics */ 3493 { /* query graphics */
3379 R->tt_printf("\033G1\n"); /* yes, graphics (color) */ 3494 tt_printf ("\033G1\n"); /* yes, graphics (color) */
3380 return; 3495 return;
3381 } 3496 }
3382 for (nargs = 0; nargs < (sizeof(args) / sizeof(args[0])) - 1;) { 3497 for (nargs = 0; nargs < (sizeof (args) / sizeof (args[0])) - 1;)
3498 {
3383 int neg; 3499 int neg;
3384 3500
3385 ch = rxvt_cmd_getc(aR); 3501 ch = cmd_getc ();
3386 neg = (ch == '-'); 3502 neg = (ch == '-');
3387 if (neg || ch == '+') 3503 if (neg || ch == '+')
3388 ch = rxvt_cmd_getc(aR); 3504 ch = cmd_getc ();
3389 3505
3390 for (args[nargs] = 0; isdigit(ch); ch = rxvt_cmd_getc(aR)) 3506 for (args[nargs] = 0; isdigit (ch); ch = cmd_getc ())
3391 args[nargs] = args[nargs] * 10 + (ch - '0'); 3507 args[nargs] = args[nargs] * 10 + (ch - '0');
3392 if (neg) 3508 if (neg)
3393 args[nargs] = -args[nargs]; 3509 args[nargs] = -args[nargs];
3394 3510
3395 nargs++; 3511 nargs++;
3396 args[nargs] = 0; 3512 args[nargs] = 0;
3397 if (ch != ';') 3513 if (ch != ';')
3398 break; 3514 break;
3399 } 3515 }
3400 3516
3401 if ((cmd == 'T') && (nargs >= 5)) { 3517 if ((cmd == 'T') && (nargs >= 5))
3518 {
3402 int i, len = args[4]; 3519 int i, len = args[4];
3403 3520
3404 text = rxvt_malloc((len + 1) * sizeof(char)); 3521 text = (unsigned char *)rxvt_malloc ((len + 1) * sizeof (char));
3405 3522
3406 if (text != NULL) { 3523 if (text != NULL)
3524 {
3407 for (i = 0; i < len; i++) 3525 for (i = 0; i < len; i++)
3408 text[i] = rxvt_cmd_getc(aR); 3526 text[i] = cmd_getc ();
3409 text[len] = '\0'; 3527 text[len] = '\0';
3410 } 3528 }
3411 } 3529 }
3412 rxvt_Gr_do_graphics(aR_ cmd, nargs, args, text); 3530 Gr_do_graphics (cmd, nargs, args, text);
3413#endif 3531#endif
3414} 3532}
3415/*}}} */ 3533/*}}} */
3416 3534
3417/* ------------------------------------------------------------------------- */ 3535/* ------------------------------------------------------------------------- */
3418 3536
3419/* 3537/*
3420 * Send printf() formatted output to the command. 3538 * Send printf () formatted output to the command.
3421 * Only use for small amounts of data. 3539 * Only use for small amounts of data.
3422 */ 3540 */
3423void 3541void
3424rxvt_term::tt_printf (const char *fmt,...) 3542rxvt_term::tt_printf (const char *fmt,...)
3425{ 3543{
… …
3443 3561
3444 if (len) 3562 if (len)
3445 { 3563 {
3446 if (v_buflen == 0) 3564 if (v_buflen == 0)
3447 { 3565 {
3448 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
3449 if (written == len) 3568 if ((unsigned int)written == len)
3450 return; 3569 return;
3451 3570
3452 data += written; 3571 data += written;
3453 len -= written; 3572 len -= written;
3454 } 3573 }

Diff Legend

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