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.16 by pcg, Wed Dec 17 09:00:35 2003 UTC vs.
Revision 1.51 by pcg, Sun Feb 22 08:28:36 2004 UTC

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

Diff Legend

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