ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/main.C
(Generate patch)

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.14 by pcg, Thu Dec 18 00:29:29 2003 UTC vs.
Revision 1.45 by pcg, Tue Feb 24 21:46:15 2004 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*--------------------------------*-C-*---------------------------------*;
2 * File: main.c 2 * File: main.c
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * $Id: main.C,v 1.14 2003/12/18 00:29:29 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>
12 * Copyright (c) 1997 mj olesen <olesen@me.QueensU.CA> 11 * Copyright (c) 1997 mj olesen <olesen@me.QueensU.CA>
13 * - extensive modifications 12 * - extensive modifications
14 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de> 13 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de>
15 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com> 14 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>
16 * - extensive modifications 15 * - extensive modifications
16 * Copyright (c) 2003-2004 Marc Lehmann <pcg@goof.com>
17 * 17 *
18 * This program is free software; you can redistribute it and/or modify 18 * This program is free software; you can redistribute it and/or modify
19 * it under the terms of the GNU General Public License as published by 19 * it under the terms of the GNU General Public License as published by
20 * the Free Software Foundation; either version 2 of the License, or 20 * the Free Software Foundation; either version 2 of the License, or
21 * (at your option) any later version. 21 * (at your option) any later version.
42 42
43#ifdef HAVE_TERMIOS_H 43#ifdef HAVE_TERMIOS_H
44# include <termios.h> 44# include <termios.h>
45#endif 45#endif
46 46
47#include <cstring>
48
49static char curlocale[128];
50
51void
52rxvt_set_locale (const char *locale)
53{
54 if (locale && STRNCMP (locale, curlocale, 128))
55 {
56 STRNCPY (curlocale, locale, 128);
57 setlocale (LC_CTYPE, curlocale);
58 }
59}
60
47void * 61void *
48rxvt_term::operator new (size_t s) 62rxvt_term::operator new (size_t s)
49{ 63{
50 void *p = malloc (s); 64 void *p = malloc (s);
51 65
58{ 72{
59 free (p); 73 free (p);
60} 74}
61 75
62rxvt_term::rxvt_term () 76rxvt_term::rxvt_term ()
77 :
78 rootwin_ev (this, &rxvt_term::rootwin_cb),
79 termwin_ev (this, &rxvt_term::x_cb),
63: pty_ev (this, &rxvt_term::pty_cb), 80 vt_ev (this, &rxvt_term::x_cb),
81#ifdef HAVE_SCROLLBARS
82 scrollbar_ev (this, &rxvt_term::x_cb),
83#endif
84#ifdef MENUBAR
85 menubar_ev (this, &rxvt_term::x_cb),
86#endif
64#ifdef CURSOR_BLINK 87#ifdef CURSOR_BLINK
88 cursor_blink_ev (this, &rxvt_term::cursor_blink_cb),
89#endif
90#ifdef TEXT_BLINK
65 blink_ev (this, &rxvt_term::blink_cb), 91 text_blink_ev (this, &rxvt_term::text_blink_cb),
66#endif 92#endif
67#ifdef POINTER_BLANK 93#ifdef POINTER_BLANK
68 pointer_ev (this, &rxvt_term::pointer_cb), 94 pointer_ev (this, &rxvt_term::pointer_cb),
69#endif 95#endif
96#ifdef USE_XIM
70 x_ev (this, &rxvt_term::x_cb), 97 im_ev (this, &rxvt_term::im_cb),
98#endif
99 check_ev (this, &rxvt_term::check_cb),
71 destroy_ev (this, &rxvt_term::destroy_cb), 100 destroy_ev (this, &rxvt_term::destroy_cb),
72 check_ev (this, &rxvt_term::check_cb), 101 pty_ev (this, &rxvt_term::pty_cb),
73 incr_ev (this, &rxvt_term::incr_cb) 102 incr_ev (this, &rxvt_term::incr_cb)
74{ 103{
75 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base; 104 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;
76} 105}
77 106
78rxvt_term::~rxvt_term () 107rxvt_term::~rxvt_term ()
79{ 108{
80 scr_release ();
81
82#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
83 free (locale);
84#endif
85#ifndef NO_SETOWNER_TTYDEV
86 rxvt_privileged_ttydev (this, RESTORE);
87#endif
88#ifdef UTMP_SUPPORT
89 rxvt_privileged_utmp (this, RESTORE);
90#endif
91#ifdef USE_XIM
92 if (Input_Context != NULL)
93 {
94 XDestroyIC (Input_Context);
95 Input_Context = NULL;
96 }
97#endif
98
99 if (cmd_fd >= 0) 109 if (cmd_fd >= 0)
100 close (cmd_fd); 110 close (cmd_fd);
101 111
102 if (Xfd >= 0) 112#ifndef NO_SETOWNER_TTYDEV
103 XCloseDisplay (Xdisplay); 113 privileged_ttydev (RESTORE);
114#endif
115#ifdef UTMP_SUPPORT
116 privileged_utmp (RESTORE);
117#endif
118
119 delete TermWin.fontset;
120
121 if (display)
122 {
123#if defined(MENUBAR) && (MENUBAR_MAX > 1)
124 delete menuBar.drawable;
125 //if (menuBar.win)
126 // XDestroyWindow (display->display, menuBar.win);
127#endif
128 delete TermWin.drawable;
129 // destroy all windows
130 if (TermWin.parent[0])
131 XDestroyWindow (display->display, TermWin.parent[0]);
132 }
133
134 // TODO: free pixcolours, colours should become part of rxvt_display
104 135
105 delete PixColors; 136 delete PixColors;
137
138 displays.put (display);
139
140 scr_release ();
141
142 free (env_windowid);
143 free (env_display);
144 free (env_term);
145 free (env_colorfgbg);
146 free (locale);
147 free (codeset);
148
149 delete envv;
150 delete argv;
106} 151}
107 152
108void 153void
109rxvt_term::destroy () 154rxvt_term::destroy ()
110{ 155{
156 if (display)
157 {
158 rootwin_ev.stop (display);
159 termwin_ev.stop (display);
160 vt_ev.stop (display);
161#ifdef USE_XIM
162 im_destroy ();
163 im_ev.stop (display);
164#endif
165#ifdef HAVE_SCROLLBARS
166 scrollbar_ev.stop (display);
167#endif
168#ifdef MENUBAR
169 menubar_ev.stop (display);
170#endif
171 }
172
111 check_ev.stop (); 173 check_ev.stop ();
112 pty_ev.stop (); 174 pty_ev.stop ();
113 x_ev.stop ();
114#ifdef CURSOR_BLINK 175#ifdef CURSOR_BLINK
176 cursor_blink_ev.stop ();
177#endif
178#ifdef TEXT_BLINK
115 blink_ev.stop (); 179 text_blink_ev.stop ();
116#endif 180#endif
117#ifdef POINTER_BLANK 181#ifdef POINTER_BLANK
118 pointer_ev.stop (); 182 pointer_ev.stop ();
119#endif 183#endif
120 184
128 192
129 delete this; 193 delete this;
130} 194}
131 195
132/*----------------------------------------------------------------------*/ 196/*----------------------------------------------------------------------*/
133/* rxvt_init() */ 197/* rxvt_init () */
134/* LIBPROTO */ 198/* LIBPROTO */
135rxvt_t 199rxvt_t
136rxvt_init (int argc, const char *const *argv) 200rxvt_init (int argc, const char *const *argv)
137{ 201{
138 SET_R (new rxvt_term); 202 SET_R (new rxvt_term);
139 dR;
140 203
141 if (!R->init_vars () || !R->init (argc, argv)) 204 if (!GET_R->init_vars () || !GET_R->init (argc, argv))
142 { 205 {
143 delete R; 206 delete GET_R;
144 return NULL; 207 SET_R (0);
145 } 208 }
146 209
147 return R; 210 return GET_R;
148} 211}
149 212
150/* EXTPROTO */ 213static int (*old_xerror_handler) (Display *dpy, XErrorEvent *event);
214
151void 215void
152rxvt_init_signals () 216rxvt_init_signals ()
153{ 217{
154/* install exit handler for cleanup */ 218 /* install exit handler for cleanup */
155#if 0 219#if 0
156#ifdef HAVE_ATEXIT 220#ifdef HAVE_ATEXIT
157 atexit(rxvt_clean_exit); 221 atexit (rxvt_clean_exit);
158#else 222#else
159#endif 223#endif
160#endif 224#endif
161 225
162 struct sigaction sa; 226 struct sigaction sa;
168 sa.sa_handler = rxvt_Exit_signal; sigaction (SIGINT , &sa, 0); 232 sa.sa_handler = rxvt_Exit_signal; sigaction (SIGINT , &sa, 0);
169 sa.sa_handler = rxvt_Exit_signal; sigaction (SIGQUIT, &sa, 0); 233 sa.sa_handler = rxvt_Exit_signal; sigaction (SIGQUIT, &sa, 0);
170 sa.sa_handler = rxvt_Exit_signal; sigaction (SIGTERM, &sa, 0); 234 sa.sa_handler = rxvt_Exit_signal; sigaction (SIGTERM, &sa, 0);
171 sa.sa_handler = rxvt_Child_signal; sigaction (SIGCHLD, &sa, 0); 235 sa.sa_handler = rxvt_Child_signal; sigaction (SIGCHLD, &sa, 0);
172 236
173/* need to trap SIGURG for SVR4 (Unixware) rlogin */ 237 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
174/* signal (SIGURG, SIG_DFL); */ 238 /* signal (SIGURG, SIG_DFL); */
175 239
176 XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 240 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
177 //XSetIOErrorHandler ((XErrorHandler) rxvt_xioerror_handler); 241 //XSetIOErrorHandler ((XErrorHandler) rxvt_xioerror_handler);
178} 242}
179 243
180bool 244bool
181rxvt_term::init (int argc, const char *const *argv) 245rxvt_term::init (int argc, const char *const *argv)
182{ 246{
183 dR;//TODO (scrollbar, setidle)
184
185 /* 247 /*
186 * Save and then give up any super-user privileges 248 * Save and then give up any super-user privileges
187 * If we need privileges in any area then we must specifically request it. 249 * If we need privileges in any area then we must specifically request it.
188 * We should only need to be root in these cases: 250 * We should only need to be root in these cases:
189 * 1. write utmp entries on some systems 251 * 1. write utmp entries on some systems
190 * 2. chown tty on some systems 252 * 2. chown tty on some systems
191 */ 253 */
192 rxvt_privileges (this, SAVE); 254 privileges (SAVE);
193 rxvt_privileges (this, IGNORE); 255 privileges (IGNORE);
194 256
195 rxvt_init_secondary (this); 257 init_secondary ();
196 258
197 const char **cmd_argv = rxvt_init_resources (this, argc, argv); 259 const char **cmd_argv = init_resources (argc, argv);
198 260
261 set_locale ("");
262
199#if (MENUBAR_MAX) 263#if MENUBAR_MAX
200 rxvt_menubar_read (this, rs[Rs_menu]); 264 menubar_read (rs[Rs_menu]);
201#endif 265#endif
202#ifdef HAVE_SCROLLBARS 266#ifdef HAVE_SCROLLBARS
203 if (Options & Opt_scrollBar) 267 if (Options & Opt_scrollBar)
204 scrollbar_setIdle (); /* set existence for size calculations */ 268 scrollBar.setIdle (); /* set existence for size calculations */
205#endif 269#endif
206 270
207 rxvt_Create_Windows (this, argc, argv); 271 create_windows (argc, argv);
208 272
209 rxvt_init_xlocale (this); 273 init_xlocale ();
210 274
211 scr_reset (); /* initialize screen */ 275 scr_reset (); /* initialize screen */
212#ifdef RXVT_GRAPHICS
213 rxvt_Gr_reset (this); /* reset graphics */
214#endif
215 276
216#if 0 277#if 0
217#ifdef DEBUG_X
218 XSynchronize(Xdisplay, True); 278 XSynchronize (display->display, True);
219#endif
220#endif 279#endif
221 280
222#ifdef HAVE_SCROLLBARS 281#ifdef HAVE_SCROLLBARS
223 if (Options & Opt_scrollBar) 282 if (Options & Opt_scrollBar)
224 rxvt_Resize_scrollBar (this); /* create and map scrollbar */ 283 resize_scrollbar (); /* create and map scrollbar */
225#endif 284#endif
226#if (MENUBAR_MAX) 285#if (MENUBAR_MAX)
227 if (menubar_visible(r)) 286 if (menubar_visible ())
228 XMapWindow (Xdisplay, menuBar.win); 287 XMapWindow (display->display, menuBar.win);
229#endif 288#endif
230#ifdef TRANSPARENT 289#ifdef TRANSPARENT
231 if (Options & Opt_transparent) 290 if (Options & Opt_transparent)
232 { 291 {
233 XSelectInput (Xdisplay, Xroot, PropertyChangeMask); 292 XSelectInput (display->display, display->root, PropertyChangeMask);
234 rxvt_check_our_parents (this); 293 check_our_parents ();
235 } 294 }
236#endif 295#endif
296
297 rootwin_ev.start (display, display->root);
298
237 XMapWindow (Xdisplay, TermWin.vt); 299 XMapWindow (display->display, TermWin.vt);
238 XMapWindow (Xdisplay, TermWin.parent[0]); 300 XMapWindow (display->display, TermWin.parent[0]);
239 301
240 rxvt_init_env (this);
241 rxvt_init_command (this, cmd_argv); 302 init_command (cmd_argv);
242 303
243 x_ev.start (Xfd, EVENT_READ);
244 pty_ev.start (cmd_fd, EVENT_READ); 304 pty_ev.start (cmd_fd, EVENT_READ);
245 305
246 check_ev.start (); 306 check_ev.start ();
247
248 process_x_events ();
249 307
250 return true; 308 return true;
251} 309}
252 310
253/* ------------------------------------------------------------------------- * 311/* ------------------------------------------------------------------------- *
257 * Catch a SIGCHLD signal and exit if the direct child has died 315 * Catch a SIGCHLD signal and exit if the direct child has died
258 */ 316 */
259/* ARGSUSED */ 317/* ARGSUSED */
260/* EXTPROTO */ 318/* EXTPROTO */
261RETSIGTYPE 319RETSIGTYPE
262rxvt_Child_signal(int sig __attribute__ ((unused))) 320rxvt_Child_signal (int sig __attribute__ ((unused)))
263{ 321{
264 int pid, save_errno = errno; 322 int pid, save_errno = errno;
265 while ((pid = waitpid (-1, NULL, WNOHANG)) == -1 && errno == EINTR) 323 while ((pid = waitpid (-1, NULL, WNOHANG)) == -1 && errno == EINTR)
266 ; 324 ;
267 errno = save_errno; 325 errno = save_errno;
268 326
269#if 0 327#if 0
270 if (pid == R->cmd_pid) 328 if (pid == cmd_pid)
271 exit (EXIT_SUCCESS); 329 exit (EXIT_SUCCESS);
272#endif 330#endif
273} 331}
274 332
275/* 333/*
276 * Catch a fatal signal and tidy up before quitting 334 * Catch a fatal signal and tidy up before quitting
277 */ 335 */
278/* EXTPROTO */ 336/* EXTPROTO */
279RETSIGTYPE 337RETSIGTYPE
280rxvt_Exit_signal(int sig) 338rxvt_Exit_signal (int sig)
281{ 339{
282 signal(sig, SIG_DFL); 340 signal (sig, SIG_DFL);
283#ifdef DEBUG_CMD 341#ifdef DEBUG_CMD
284 rxvt_print_error("signal %d", sig); 342 rxvt_print_error ("signal %d", sig);
285#endif 343#endif
286 rxvt_clean_exit(); 344 rxvt_clean_exit ();
287 kill(getpid(), sig); 345 kill (getpid (), sig);
288} 346}
289 347
290/* ARGSUSED */
291/* INTPROTO */ 348/* INTPROTO */
292int 349int
293rxvt_xerror_handler(const Display * display 350rxvt_xerror_handler (Display *display, XErrorEvent *event)
294 __attribute__ ((unused)), const XErrorEvent * event)
295{ 351{
296 dR;
297
298 if (R->allowedxerror == -1) 352 if (GET_R->allowedxerror == -1)
299 R->allowedxerror = event->error_code; 353 GET_R->allowedxerror = event->error_code;
300 else 354 else
301 { 355 {
302 rxvt_print_error("XError: Request: %d . %d, Error: %d", 356 old_xerror_handler (display, event);
303 event->request_code, event->minor_code,
304 event->error_code);
305
306 R->destroy (); 357 GET_R->destroy ();
307 } 358 }
308 359
309 return 0; 360 return 0;
310} 361}
311 362
316 */ 367 */
317/* EXTPROTO */ 368/* EXTPROTO */
318void 369void
319rxvt_clean_exit () 370rxvt_clean_exit ()
320{ 371{
321 dR; 372 // TODO: rxvtd should clean up all ressources
322 373 if (GET_R)
323 R->destroy (); 374 GET_R->destroy ();
324} 375}
325 376
326/* ------------------------------------------------------------------------- * 377/* ------------------------------------------------------------------------- *
327 * MEMORY ALLOCATION WRAPPERS * 378 * MEMORY ALLOCATION WRAPPERS *
328 * ------------------------------------------------------------------------- */ 379 * ------------------------------------------------------------------------- */
329/* EXTPROTO */ 380/* EXTPROTO */
330void * 381void *
331rxvt_malloc(size_t size) 382rxvt_malloc (size_t size)
332{ 383{
333 void *p; 384 void *p;
334 385
335 p = malloc(size); 386 p = malloc (size);
336 if (p) 387 if (p)
337 return p; 388 return p;
338 389
339 fprintf(stderr, APL_NAME ": memory allocation failure. Aborting"); 390 fprintf (stderr, APL_NAME ": memory allocation failure. Aborting");
340 rxvt_clean_exit(); 391 rxvt_clean_exit ();
341 exit(EXIT_FAILURE); 392 exit (EXIT_FAILURE);
342/* NOTREACHED */ 393 /* NOTREACHED */
343} 394}
344 395
345/* EXTPROTO */ 396/* EXTPROTO */
346void * 397void *
347rxvt_calloc(size_t number, size_t size) 398rxvt_calloc (size_t number, size_t size)
348{ 399{
349 void *p; 400 void *p;
350 401
351 p = calloc(number, size); 402 p = calloc (number, size);
352 if (p) 403 if (p)
353 return p; 404 return p;
354 405
355 fprintf(stderr, APL_NAME ": memory allocation failure. Aborting"); 406 fprintf (stderr, APL_NAME ": memory allocation failure. Aborting");
356 rxvt_clean_exit(); 407 rxvt_clean_exit ();
357 exit(EXIT_FAILURE); 408 exit (EXIT_FAILURE);
358/* NOTREACHED */ 409 /* NOTREACHED */
359} 410}
360 411
361/* EXTPROTO */ 412/* EXTPROTO */
362void * 413void *
363rxvt_realloc(void *ptr, size_t size) 414rxvt_realloc (void *ptr, size_t size)
364{ 415{
365 void *p; 416 void *p;
366 417
367 if (ptr) 418 if (ptr)
368 p = realloc(ptr, size); 419 p = realloc (ptr, size);
369 else 420 else
370 p = malloc(size); 421 p = malloc (size);
371 if (p) 422 if (p)
372 return p; 423 return p;
373 424
374 fprintf(stderr, APL_NAME ": memory allocation failure. Aborting"); 425 fprintf (stderr, APL_NAME ": memory allocation failure. Aborting");
375 rxvt_clean_exit(); 426 rxvt_clean_exit ();
376 exit(EXIT_FAILURE); 427 exit (EXIT_FAILURE);
377/* NOTREACHED */ 428 /* NOTREACHED */
378} 429}
379 430
380/* ------------------------------------------------------------------------- * 431/* ------------------------------------------------------------------------- *
381 * PRIVILEGED OPERATIONS * 432 * PRIVILEGED OPERATIONS *
382 * ------------------------------------------------------------------------- */ 433 * ------------------------------------------------------------------------- */
383/* take care of suid/sgid super-user (root) privileges */ 434/* take care of suid/sgid super-user (root) privileges */
384/* INTPROTO */
385void 435void
386rxvt_privileges(pR_ int mode) 436rxvt_term::privileges (int mode)
387{ 437{
388#if ! defined(__CYGWIN32__) 438#if ! defined(__CYGWIN32__)
389# if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID) 439# if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID)
390/* setreuid() is the poor man's setuid(), seteuid() */ 440 /* setreuid () is the poor man's setuid (), seteuid () */
391# define seteuid(a) setreuid(-1, (a)) 441# define seteuid(a) setreuid(-1, (a))
392# define setegid(a) setregid(-1, (a)) 442# define setegid(a) setregid(-1, (a))
393# define HAVE_SETEUID 443# define HAVE_SETEUID
394# endif 444# endif
395# ifdef HAVE_SETEUID 445# ifdef HAVE_SETEUID
396 switch (mode) { 446 switch (mode)
447 {
397 case IGNORE: 448 case IGNORE:
398 /* 449 /*
399 * change effective uid/gid - not real uid/gid - so we can switch 450 * change effective uid/gid - not real uid/gid - so we can switch
400 * back to root later, as required 451 * back to root later, as required
401 */ 452 */
402 seteuid(getuid()); 453 seteuid (getuid ());
403 setegid(getgid()); 454 setegid (getgid ());
404 break; 455 break;
405 case SAVE: 456 case SAVE:
406 R->euid = geteuid(); 457 euid = geteuid ();
407 R->egid = getegid(); 458 egid = getegid ();
408 break; 459 break;
409 case RESTORE: 460 case RESTORE:
410 seteuid(R->euid); 461 seteuid (euid);
411 setegid(R->egid); 462 setegid (egid);
412 break; 463 break;
413 } 464 }
414# else 465# else
415 switch (mode) { 466 switch (mode)
467 {
416 case IGNORE: 468 case IGNORE:
417 setuid(getuid()); 469 setuid (getuid ());
418 setgid(getgid()); 470 setgid (getgid ());
419 /* FALLTHROUGH */ 471 /* FALLTHROUGH */
420 case SAVE: 472 case SAVE:
421 /* FALLTHROUGH */ 473 /* FALLTHROUGH */
422 case RESTORE: 474 case RESTORE:
423 break; 475 break;
424 } 476 }
425# endif 477# endif
426#endif 478#endif
427} 479}
428 480
429#ifdef UTMP_SUPPORT 481#ifdef UTMP_SUPPORT
430/* EXTPROTO */
431void 482void
432rxvt_privileged_utmp(pR_ char action) 483rxvt_term::privileged_utmp (char action)
433{ 484{
434 D_MAIN((stderr, "rxvt_privileged_utmp(%c); waiting for: %c (pid: %d)", 485 D_MAIN ((stderr, "rxvt_privileged_utmp (%c); waiting for: %c (pid: %d)",
435 action, R->next_utmp_action, getpid())); 486 action, next_utmp_action, getpid ()));
436 if (R->next_utmp_action != action || (action != SAVE && action != RESTORE) 487 if (next_utmp_action != action || (action != SAVE && action != RESTORE)
437 || (R->Options & Opt_utmpInhibit) 488 || (Options & Opt_utmpInhibit)
438 || R->ttydev == NULL || *R->ttydev == '\0') 489 || ttydev == NULL || *ttydev == '\0')
439 return; 490 return;
440 491
441 rxvt_privileges(aR_ RESTORE); 492 privileges (RESTORE);
442 if (action == SAVE) { 493 if (action == SAVE)
494 {
443 R->next_utmp_action = RESTORE; 495 next_utmp_action = RESTORE;
444 rxvt_makeutent(aR_ R->ttydev, R->rs[Rs_display_name]); 496 makeutent (ttydev, rs[Rs_display_name]);
497 }
498 else
445 } else { /* action == RESTORE */ 499 { /* action == RESTORE */
446 R->next_utmp_action = IGNORE; 500 next_utmp_action = IGNORE;
447 rxvt_cleanutent(aR); 501 cleanutent ();
448 } 502 }
449 rxvt_privileges(aR_ IGNORE); 503 privileges (IGNORE);
450} 504}
451#endif 505#endif
452 506
453#ifndef NO_SETOWNER_TTYDEV 507#ifndef NO_SETOWNER_TTYDEV
454/* EXTPROTO */
455void 508void
456rxvt_privileged_ttydev(pR_ char action) 509rxvt_term::privileged_ttydev (char action)
457{ 510{
458 D_MAIN((stderr, 511 D_MAIN ((stderr,
459 "rxvt_privileged_ttydev(aR_ %c); waiting for: %c (pid: %d)", 512 "privileged_ttydev (%c); waiting for: %c (pid: %d)",
460 action, R->next_tty_action, getpid())); 513 action, next_tty_action, getpid ()));
461 if (R->next_tty_action != action || (action != SAVE && action != RESTORE) 514 if (next_tty_action != action || (action != SAVE && action != RESTORE)
462 || R->ttydev == NULL || *R->ttydev == '\0') 515 || ttydev == NULL || *ttydev == '\0')
463 return; 516 return;
464 517
465 rxvt_privileges(aR_ RESTORE); 518 privileges (RESTORE);
466 519
467 if (action == SAVE) { 520 if (action == SAVE)
521 {
468 R->next_tty_action = RESTORE; 522 next_tty_action = RESTORE;
469# ifndef RESET_TTY_TO_COMMON_DEFAULTS 523# ifndef RESET_TTY_TO_COMMON_DEFAULTS
470/* store original tty status for restoration rxvt_clean_exit() -- rgg 04/12/95 */ 524 /* store original tty status for restoration rxvt_clean_exit () -- rgg 04/12/95 */
471 if (lstat(R->ttydev, &R->ttyfd_stat) < 0) /* you lose out */ 525 if (lstat (ttydev, &ttyfd_stat) < 0) /* you lose out */
472 R->next_tty_action = IGNORE; 526 next_tty_action = IGNORE;
473 else 527 else
474# endif 528# endif
529
475 { 530 {
476 chown(R->ttydev, getuid(), R->ttygid); /* fail silently */ 531 chown (ttydev, getuid (), ttygid); /* fail silently */
477 chmod(R->ttydev, R->ttymode); 532 chmod (ttydev, ttymode);
478# ifdef HAVE_REVOKE 533# ifdef HAVE_REVOKE
479 revoke(R->ttydev); 534 revoke (ttydev);
480# endif 535# endif
536
481 } 537 }
538 }
539 else
482 } else { /* action == RESTORE */ 540 { /* action == RESTORE */
483 R->next_tty_action = IGNORE; 541 next_tty_action = IGNORE;
484# ifndef RESET_TTY_TO_COMMON_DEFAULTS 542# ifndef RESET_TTY_TO_COMMON_DEFAULTS
485 chmod(R->ttydev, R->ttyfd_stat.st_mode); 543 chmod (ttydev, ttyfd_stat.st_mode);
486 chown(R->ttydev, R->ttyfd_stat.st_uid, R->ttyfd_stat.st_gid); 544 chown (ttydev, ttyfd_stat.st_uid, ttyfd_stat.st_gid);
487# else 545# else
488 chmod(R->ttydev, 546 chmod (ttydev,
489 (S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH)); 547 (S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH));
490 chown(R->ttydev, 0, 0); 548 chown (ttydev, 0, 0);
491# endif 549# endif
492 }
493 550
551 }
552
494 rxvt_privileges(aR_ IGNORE); 553 privileges (IGNORE);
495 554
496# ifndef RESET_TTY_TO_COMMON_DEFAULTS 555# ifndef RESET_TTY_TO_COMMON_DEFAULTS
497 D_MAIN((stderr, "%s \"%s\": mode %03o, uid %d, gid %d", 556 D_MAIN ((stderr, "%s \"%s\": mode %03o, uid %d, gid %d",
498 action == RESTORE ? "Restoring" : (action == 557 action == RESTORE ? "Restoring" : (action ==
499 SAVE ? "Saving" : 558 SAVE ? "Saving" :
500 "UNKNOWN ERROR for"), R->ttydev, 559 "UNKNOWN ERROR for"), ttydev,
501 R->ttyfd_stat.st_mode, R->ttyfd_stat.st_uid, 560 ttyfd_stat.st_mode, ttyfd_stat.st_uid,
502 R->ttyfd_stat.st_gid)); 561 ttyfd_stat.st_gid));
503# endif 562# endif
504} 563}
505#endif 564#endif
506 565
507/*----------------------------------------------------------------------*/ 566/*----------------------------------------------------------------------*/
508/* 567/*
509 * window size/position calculcations for XSizeHint and other storage. 568 * window size/position calculcations for XSizeHint and other storage.
510 * if width/height are non-zero then override calculated width/height 569 * if width/height are non-zero then override calculated width/height
511 */ 570 */
512/* EXTPROTO */
513void 571void
514rxvt_window_calc(pR_ unsigned int width, unsigned int height) 572rxvt_term::window_calc (unsigned int width, unsigned int height)
515{ 573{
516 short recalc_x, recalc_y; 574 short recalc_x, recalc_y;
517 int x, y, sb_w, mb_h, flags; 575 int x, y, sb_w, mb_h, flags;
518 unsigned int w, h; 576 unsigned int w, h;
519 unsigned int max_width, max_height; 577 unsigned int max_width, max_height;
520 578
521 D_SIZE((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d", 579 D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
522 R->TermWin.ncol, R->TermWin.nrow, R->szHint.width, 580 TermWin.ncol, TermWin.nrow, szHint.width,
523 R->szHint.height)); 581 szHint.height));
524 R->szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 582 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
525 R->szHint.win_gravity = NorthWestGravity; 583 szHint.win_gravity = NorthWestGravity;
526/* R->szHint.min_aspect.x = R->szHint.min_aspect.y = 1; */ 584 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */
527 585
528 recalc_x = recalc_y = 0; 586 recalc_x = recalc_y = 0;
529 flags = 0; 587 flags = 0;
530 if (!R->parsed_geometry) { 588 if (!parsed_geometry)
589 {
531 R->parsed_geometry = 1; 590 parsed_geometry = 1;
532 if (R->rs[Rs_geometry]) 591 if (rs[Rs_geometry])
533 flags = XParseGeometry(R->rs[Rs_geometry], &x, &y, &w, &h); 592 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h);
534 if (flags & WidthValue) { 593 if (flags & WidthValue)
594 {
535 R->TermWin.ncol = BOUND_POSITIVE_INT16(w); 595 TermWin.ncol = BOUND_POSITIVE_INT16 (w);
536 R->szHint.flags |= USSize; 596 szHint.flags |= USSize;
537 } 597 }
538 if (flags & HeightValue) { 598 if (flags & HeightValue)
599 {
539 R->TermWin.nrow = BOUND_POSITIVE_INT16(h); 600 TermWin.nrow = BOUND_POSITIVE_INT16 (h);
540 R->szHint.flags |= USSize; 601 szHint.flags |= USSize;
541 } 602 }
542 if (flags & XValue) { 603 if (flags & XValue)
604 {
543 R->szHint.x = x; 605 szHint.x = x;
544 R->szHint.flags |= USPosition; 606 szHint.flags |= USPosition;
545 if (flags & XNegative) { 607 if (flags & XNegative)
608 {
546 recalc_x = 1; 609 recalc_x = 1;
547 R->szHint.win_gravity = NorthEastGravity; 610 szHint.win_gravity = NorthEastGravity;
548 } 611 }
549 } 612 }
550 if (flags & YValue) { 613 if (flags & YValue)
614 {
551 R->szHint.y = y; 615 szHint.y = y;
552 R->szHint.flags |= USPosition; 616 szHint.flags |= USPosition;
553 if (flags & YNegative) { 617 if (flags & YNegative)
618 {
554 recalc_y = 1; 619 recalc_y = 1;
555 if (R->szHint.win_gravity == NorthEastGravity) 620 if (szHint.win_gravity == NorthEastGravity)
556 R->szHint.win_gravity = SouthEastGravity; 621 szHint.win_gravity = SouthEastGravity;
557 else 622 else
558 R->szHint.win_gravity = SouthWestGravity; 623 szHint.win_gravity = SouthWestGravity;
559 } 624 }
560 } 625 }
561 } 626 }
562/* TODO: BOUNDS */ 627 /* TODO: BOUNDS */
563 R->TermWin.width = R->TermWin.ncol * R->TermWin.fwidth; 628 TermWin.width = TermWin.ncol * TermWin.fwidth;
564 R->TermWin.height = R->TermWin.nrow * R->TermWin.fheight; 629 TermWin.height = TermWin.nrow * TermWin.fheight;
565 max_width = MAX_COLS * R->TermWin.fwidth; 630 max_width = MAX_COLS * TermWin.fwidth;
566 max_height = MAX_ROWS * R->TermWin.fheight; 631 max_height = MAX_ROWS * TermWin.fheight;
567 632
568 R->szHint.base_width = R->szHint.base_height = 2 * R->TermWin.int_bwidth; 633 szHint.base_width = szHint.base_height = 2 * TermWin.int_bwidth;
569 634
570 sb_w = mb_h = 0; 635 sb_w = mb_h = 0;
571 R->window_vt_x = R->window_vt_y = 0; 636 window_vt_x = window_vt_y = 0;
572 if (scrollbar_visible(R)) { 637 if (scrollbar_visible ())
638 {
573 sb_w = scrollbar_TotalWidth(); 639 sb_w = scrollbar_TotalWidth ();
574 R->szHint.base_width += sb_w; 640 szHint.base_width += sb_w;
575 if (!(R->Options & Opt_scrollBar_right)) 641 if (! (Options & Opt_scrollBar_right))
576 R->window_vt_x = sb_w; 642 window_vt_x = sb_w;
577 } 643 }
578 if (menubar_visible(R)) { 644 if (menubar_visible ())
645 {
579 mb_h = menuBar_TotalHeight(); 646 mb_h = menuBar_TotalHeight ();
580 R->szHint.base_height += mb_h; 647 szHint.base_height += mb_h;
581 R->window_vt_y = mb_h; 648 window_vt_y = mb_h;
582 } 649 }
583 R->szHint.width_inc = R->TermWin.fwidth; 650 szHint.width_inc = TermWin.fwidth;
584 R->szHint.height_inc = R->TermWin.fheight; 651 szHint.height_inc = TermWin.fheight;
585 R->szHint.min_width = R->szHint.base_width + R->szHint.width_inc; 652 szHint.min_width = szHint.base_width + szHint.width_inc;
586 R->szHint.min_height = R->szHint.base_height + R->szHint.height_inc; 653 szHint.min_height = szHint.base_height + szHint.height_inc;
587 654
588 if (width && width - R->szHint.base_width < max_width) { 655 if (width && width - szHint.base_width < max_width)
656 {
589 R->szHint.width = width; 657 szHint.width = width;
590 R->TermWin.width = width - R->szHint.base_width; 658 TermWin.width = width - szHint.base_width;
591 } else { 659 }
660 else
661 {
592 MIN_IT(R->TermWin.width, max_width); 662 MIN_IT (TermWin.width, max_width);
593 R->szHint.width = R->szHint.base_width + R->TermWin.width; 663 szHint.width = szHint.base_width + TermWin.width;
594 } 664 }
595 if (height && height - R->szHint.base_height < max_height) { 665 if (height && height - szHint.base_height < max_height)
666 {
596 R->szHint.height = height; 667 szHint.height = height;
597 R->TermWin.height = height - R->szHint.base_height; 668 TermWin.height = height - szHint.base_height;
598 } else { 669 }
670 else
671 {
599 MIN_IT(R->TermWin.height, max_height); 672 MIN_IT (TermWin.height, max_height);
600 R->szHint.height = R->szHint.base_height + R->TermWin.height; 673 szHint.height = szHint.base_height + TermWin.height;
601 } 674 }
602 if (scrollbar_visible(R) && (R->Options & Opt_scrollBar_right)) 675 if (scrollbar_visible () && (Options & Opt_scrollBar_right))
603 R->window_sb_x = R->szHint.width - sb_w; 676 window_sb_x = szHint.width - sb_w;
604 677
605 if (recalc_x) 678 if (recalc_x)
606 R->szHint.x += (DisplayWidth(R->Xdisplay, Xscreen) 679 szHint.x += (DisplayWidth (display->display, DefaultScreen (display->display))
607 - R->szHint.width - 2 * R->TermWin.ext_bwidth); 680 - szHint.width - 2 * TermWin.ext_bwidth);
608 if (recalc_y) 681 if (recalc_y)
609 R->szHint.y += (DisplayHeight(R->Xdisplay, Xscreen) 682 szHint.y += (DisplayHeight (display->display, DefaultScreen (display->display))
610 - R->szHint.height - 2 * R->TermWin.ext_bwidth); 683 - szHint.height - 2 * TermWin.ext_bwidth);
611 684
612 R->TermWin.ncol = R->TermWin.width / R->TermWin.fwidth; 685 TermWin.ncol = TermWin.width / TermWin.fwidth;
613 R->TermWin.nrow = R->TermWin.height / R->TermWin.fheight; 686 TermWin.nrow = TermWin.height / TermWin.fheight;
614 D_SIZE((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d", 687 D_SIZE ((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
615 R->TermWin.ncol, R->TermWin.nrow, R->szHint.width, 688 TermWin.ncol, TermWin.nrow, szHint.width,
616 R->szHint.height)); 689 szHint.height));
617 return; 690 return;
618} 691}
619 692
620/*----------------------------------------------------------------------*/ 693/*----------------------------------------------------------------------*/
621/* 694/*
622 * Tell the teletype handler what size the window is. 695 * Tell the teletype handler what size the window is.
623 * Called after a window size change. 696 * Called after a window size change.
624 */ 697 */
625void 698void
626rxvt_term::tt_winch () 699rxvt_term::tt_winch ()
627{ 700{
628 struct winsize ws; 701 struct winsize ws;
629 702
630 if (cmd_fd < 0) 703 if (cmd_fd < 0)
631 return; 704 return;
632 705
633 ws.ws_col = TermWin.ncol; 706 ws.ws_col = TermWin.ncol;
635 ws.ws_xpixel = ws.ws_ypixel = 0; 708 ws.ws_xpixel = ws.ws_ypixel = 0;
636#ifndef DEBUG_SIZE 709#ifndef DEBUG_SIZE
637 (void)ioctl (cmd_fd, TIOCSWINSZ, &ws); 710 (void)ioctl (cmd_fd, TIOCSWINSZ, &ws);
638#else 711#else
639 if (ioctl (cmd_fd, TIOCSWINSZ, &ws) < 0) 712 if (ioctl (cmd_fd, TIOCSWINSZ, &ws) < 0)
640 D_SIZE((stderr, "Failed to send TIOCSWINSZ to fd %d", fd)); 713 D_SIZE ((stderr, "Failed to send TIOCSWINSZ to fd %d", fd));
641# ifdef SIGWINCH 714# ifdef SIGWINCH
642 else if (cmd_pid) /* force through to the command */ 715 else if (cmd_pid) /* force through to the command */
643 kill (cmd_pid, SIGWINCH); 716 kill (cmd_pid, SIGWINCH);
644# endif 717# endif
645#endif 718#endif
646} 719}
647 720
648/*----------------------------------------------------------------------*/ 721/*----------------------------------------------------------------------*/
649/* rxvt_change_font() - Switch to a new font */ 722/* rxvt_change_font () - Switch to a new font */
650/* 723/*
651 * init = 1 - initialize 724 * init = 1 - initialize
652 * 725 *
653 * fontname == FONT_UP - switch to bigger font 726 * fontname == FONT_UP - switch to bigger font
654 * fontname == FONT_DN - switch to smaller font 727 * fontname == FONT_DN - switch to smaller font
655 */ 728 */
656/* EXTPROTO */ 729bool
657void
658rxvt_change_font(pR_ int init, const char *fontname) 730rxvt_term::change_font (const char *fontname)
659{ 731{
660} 732 if (fontname == FONT_UP)
733 {
734 // TODO
735 }
736 else if (fontname == FONT_DN)
737 {
738 // TODO
739 }
740 else
741 {
742 rxvt_fontset *fs = new rxvt_fontset (this);
661 743
662/* INTPROTO */ 744 if (fs && fs->populate (fontname))
663void 745 {
746 delete TermWin.fontset;
747 TermWin.fontset = fs;
748 TermWin.fwidth = fs->base_font ()->width;
749 TermWin.fheight = fs->base_font ()->height;
750 TermWin.fbase = fs->base_font ()->ascent;
751
752 // TODO: screen needs to be told about new fonts
753
754 if (TermWin.parent[0])
755 {
756 resize_all_windows (0, 0, 0);
757 scr_remap_chars ();
758 scr_touch (true);
759 }
760
761 return true;
762 }
763 }
764
765 return false;
766}
767
768bool
664rxvt_font_up_down(pR_ int n, int direction) 769rxvt_term::font_up_down (int n, int direction)
665{ 770{
771 return false;
666} 772}
667 773
668/*----------------------------------------------------------------------*/ 774/*----------------------------------------------------------------------*/
669/*----------------------------------------------------------------------*/ 775/*----------------------------------------------------------------------*/
670/* xterm sequences - title, iconName, color (exptl) */ 776/* xterm sequences - title, iconName, color (exptl) */
671/* EXTPROTO */
672void 777void
673rxvt_set_title(pR_ const char *str) 778rxvt_term::set_title (const char *str)
674{ 779{
675#ifndef SMART_WINDOW_TITLE 780#ifndef SMART_WINDOW_TITLE
676 XStoreName(R->Xdisplay, R->TermWin.parent[0], str); 781 XStoreName (display->display, TermWin.parent[0], str);
677#else 782#else
678 char *name; 783 char *name;
679 784
680 if (XFetchName(R->Xdisplay, R->TermWin.parent[0], &name) == 0) 785 if (XFetchName (display->display, TermWin.parent[0], &name) == 0)
681 name = NULL; 786 name = NULL;
682 if (name == NULL || STRCMP(name, str)) 787 if (name == NULL || STRCMP (name, str))
683 XStoreName(R->Xdisplay, R->TermWin.parent[0], str); 788 XStoreName (display->display, TermWin.parent[0], str);
684 if (name) 789 if (name)
685 XFree(name); 790 XFree (name);
686#endif 791#endif
687} 792}
688 793
689/* EXTPROTO */
690void 794void
691rxvt_set_iconName(pR_ const char *str) 795rxvt_term::set_iconName (const char *str)
692{ 796{
693#ifndef SMART_WINDOW_TITLE 797#ifndef SMART_WINDOW_TITLE
694 XSetIconName(R->Xdisplay, R->TermWin.parent[0], str); 798 XSetIconName (display->display, TermWin.parent[0], str);
695#else 799#else
696 char *name; 800 char *name;
697 801
698 if (XGetIconName(R->Xdisplay, R->TermWin.parent[0], &name)) 802 if (XGetIconName (display->display, TermWin.parent[0], &name))
699 name = NULL; 803 name = NULL;
700 if (name == NULL || STRCMP(name, str)) 804 if (name == NULL || STRCMP (name, str))
701 XSetIconName(R->Xdisplay, R->TermWin.parent[0], str); 805 XSetIconName (display->display, TermWin.parent[0], str);
702 if (name) 806 if (name)
703 XFree(name); 807 XFree (name);
704#endif 808#endif
705} 809}
706 810
707#ifdef XTERM_COLOR_CHANGE 811#ifdef XTERM_COLOR_CHANGE
708/* EXTPROTO */
709void 812void
710rxvt_set_window_color(pR_ int idx, const char *color) 813rxvt_term::set_window_color (int idx, const char *color)
711{ 814{
712 rxvt_color xcol; 815 rxvt_color xcol;
713 int i; 816 int i;
714 817
715 if (color == NULL || *color == '\0') 818 if (color == NULL || *color == '\0')
716 return; 819 return;
717 820
718/* handle color aliases */ 821 /* handle color aliases */
719 if (isdigit(*color)) { 822 if (isdigit (*color))
823 {
720 i = atoi(color); 824 i = atoi (color);
825 if (i >= 8 && i <= 15)
721 if (i >= 8 && i <= 15) { /* bright colors */ 826 { /* bright colors */
722 i -= 8; 827 i -= 8;
723# ifndef NO_BRIGHTCOLOR 828# ifndef NO_BRIGHTCOLOR
724 R->PixColors[idx] = R->PixColors[minBrightCOLOR + i]; 829 PixColors[idx] = PixColors[minBrightCOLOR + i];
725 SET_PIXCOLOR(R, idx); 830 SET_PIXCOLOR (idx);
726 goto Done; 831 goto Done;
727# endif 832# endif
833
728 } 834 }
729 if (i >= 0 && i <= 7) { /* normal colors */ 835 if (i >= 0 && i <= 7)
836 { /* normal colors */
730 R->PixColors[idx] = R->PixColors[minCOLOR + i]; 837 PixColors[idx] = PixColors[minCOLOR + i];
731 SET_PIXCOLOR(R, idx); 838 SET_PIXCOLOR (idx);
732 goto Done; 839 goto Done;
733 } 840 }
734 } 841 }
735 if (!rxvt_rXParseAllocColor(aR_ & xcol, color)) 842 if (!rXParseAllocColor (& xcol, color))
736 return; 843 return;
737/* XStoreColor (R->Xdisplay, XCMAP, XColor*); */ 844 /* XStoreColor (display->display, XCMAP, XColor*); */
738 845
739/* 846 /*
740 * FIXME: should free colors here, but no idea how to do it so instead, 847 * FIXME: should free colors here, but no idea how to do it so instead,
741 * so just keep gobbling up the colormap 848 * so just keep gobbling up the colormap
742 */ 849 */
743# if 0 850# if 0
744 for (i = Color_Black; i <= Color_White; i++) 851 for (i = Color_Black; i <= Color_White; i++)
745 if (R->PixColors[idx] == R->PixColors[i]) 852 if (PixColors[idx] == PixColors[i])
746 break; 853 break;
747 if (i > Color_White) { 854 if (i > Color_White)
855 {
748 /* fprintf (stderr, "XFreeColors: R->PixColors [%d] = %lu\n", idx, R->PixColors [idx]); */ 856 /* fprintf (stderr, "XFreeColors: PixColors [%d] = %lu\n", idx, PixColors [idx]); */
749 XFreeColors(R->Xdisplay, XCMAP, (R->PixColors + idx), 1, 857 XFreeColors (display->display, XCMAP, (PixColors + idx), 1,
750 DisplayPlanes(R->Xdisplay, Xscreen)); 858 DisplayPlanes (display->display, display->screen));
751 } 859 }
752# endif 860# endif
753 861
754 R->PixColors[idx] = xcol; 862 PixColors[idx] = xcol;
755 SET_PIXCOLOR(R, idx); 863 SET_PIXCOLOR (idx);
756 864
757/* XSetWindowAttributes attr; */ 865 /* XSetWindowAttributes attr; */
758/* Cursor cursor; */ 866 /* Cursor cursor; */
759 Done: 867Done:
760 if (idx == Color_bg && !(R->Options & Opt_transparent)) 868 if (idx == Color_bg && ! (Options & Opt_transparent))
761 XSetWindowBackground(R->Xdisplay, R->TermWin.vt, 869 XSetWindowBackground (display->display, TermWin.vt,
762 R->PixColors[Color_bg]); 870 PixColors[Color_bg]);
763 871
764/* handle Color_BD, scrollbar background, etc. */ 872 /* handle Color_BD, scrollbar background, etc. */
765 873
766 rxvt_set_colorfgbg(aR); 874 set_colorfgbg ();
767 rxvt_recolour_cursor(aR); 875 recolour_cursor ();
768/* the only reasonable way to enforce a clean update */ 876 /* the only reasonable way to enforce a clean update */
769 rxvt_scr_poweron(aR); 877 scr_poweron ();
770} 878}
771 879
772#else 880#else
773# define rxvt_set_window_color(aR_ idx,color) ((void)0) 881# define set_window_color (idx,color) ((void)0)
774#endif /* XTERM_COLOR_CHANGE */ 882#endif /* XTERM_COLOR_CHANGE */
775 883
776/* EXTPROTO */
777void 884void
778rxvt_recolour_cursor(pR) 885rxvt_term::recolour_cursor ()
779{ 886{
780 rxvt_color xcol[2];
781
782#if TODO 887#if TODO
888 rxvt_color xcol[2];
889
783 xcol[0] = R->PixColors[Color_pointer]; 890 xcol[0] = PixColors[Color_pointer];
784 xcol[1] = R->PixColors[Color_bg]; 891 xcol[1] = PixColors[Color_bg];
785 XQueryColors(R->Xdisplay, XCMAP, xcol, 2); 892 XQueryColors (display->display, XCMAP, xcol, 2);
786 XRecolorCursor(R->Xdisplay, R->TermWin_cursor, &(xcol[0]), &(xcol[1])); 893 XRecolorCursor (display->display, TermWin_cursor, & (xcol[0]), & (xcol[1]));
787#endif 894#endif
788} 895}
789 896
790/*----------------------------------------------------------------------*/ 897/*----------------------------------------------------------------------*/
791/* 898/*
792 * find if fg/bg matches any of the normal (low-intensity) colors 899 * find if fg/bg matches any of the normal (low-intensity) colors
793 */ 900 */
794/* INTPROTO */
795void 901void
796rxvt_set_colorfgbg(pR) 902rxvt_term::set_colorfgbg ()
797{ 903{
798 unsigned int i; 904 unsigned int i;
799 const char *xpmb = "\0"; 905 const char *xpmb = "\0";
800 char fstr[sizeof("default") + 1], bstr[sizeof("default") + 1]; 906 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];
801 907
802 R->env_colorfgbg = 908 env_colorfgbg =
803 (char *)rxvt_malloc(sizeof("COLORFGBG=default;default;bg") + 1); 909 (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg") + 1);
804 STRCPY(fstr, "default"); 910 STRCPY (fstr, "default");
805 STRCPY(bstr, "default"); 911 STRCPY (bstr, "default");
806 for (i = Color_Black; i <= Color_White; i++) 912 for (i = Color_Black; i <= Color_White; i++)
807 if (R->PixColors[Color_fg] == R->PixColors[i]) { 913 if (PixColors[Color_fg] == PixColors[i])
914 {
808 sprintf(fstr, "%d", (i - Color_Black)); 915 sprintf (fstr, "%d", (i - Color_Black));
809 break; 916 break;
810 } 917 }
811 for (i = Color_Black; i <= Color_White; i++) 918 for (i = Color_Black; i <= Color_White; i++)
812 if (R->PixColors[Color_bg] == R->PixColors[i]) { 919 if (PixColors[Color_bg] == PixColors[i])
920 {
813 sprintf(bstr, "%d", (i - Color_Black)); 921 sprintf (bstr, "%d", (i - Color_Black));
814#ifdef XPM_BACKGROUND 922#ifdef XPM_BACKGROUND
815 xpmb = "default;"; 923 xpmb = "default;";
816#endif 924#endif
817 break; 925 break;
818 } 926 }
927
819 sprintf(R->env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr); 928 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);
820 putenv(R->env_colorfgbg);
821 929
822#ifndef NO_BRIGHTCOLOR 930#ifndef NO_BRIGHTCOLOR
823 R->colorfgbg = DEFAULT_RSTYLE; 931 colorfgbg = DEFAULT_RSTYLE;
824 for (i = minCOLOR; i <= maxCOLOR; i++) { 932 for (i = minCOLOR; i <= maxCOLOR; i++)
933 {
825 if (R->PixColors[Color_fg] == R->PixColors[i]) 934 if (PixColors[Color_fg] == PixColors[i])
826 R->colorfgbg = SET_FGCOLOR(R->colorfgbg, i); 935 colorfgbg = SET_FGCOLOR (colorfgbg, i);
827 if (R->PixColors[Color_bg] == R->PixColors[i]) 936 if (PixColors[Color_bg] == PixColors[i])
828 R->colorfgbg = SET_BGCOLOR(R->colorfgbg, i); 937 colorfgbg = SET_BGCOLOR (colorfgbg, i);
829 } 938 }
830#endif 939#endif
831} 940}
832 941
833/*----------------------------------------------------------------------*/ 942/*----------------------------------------------------------------------*/
834/* 943/*
835 * Colour determination for low colour displays, routine from 944 * Colour determination for low colour displays, routine from
836 * Hans de Goede <hans@highrise.nl> 945 * Hans de Goede <hans@highrise.nl>
837 */ 946 */
838 947
839/* EXTPROTO */
840int 948int
841rxvt_rXParseAllocColor(pR_ rxvt_color * screen_in_out, const char *colour) 949rxvt_term::rXParseAllocColor (rxvt_color *screen_in_out, const char *colour)
842{ 950{
843 screen_in_out->set(aR_ colour);
844
845 if (!screen_in_out->set(aR_ colour)) { 951 if (!screen_in_out->set (display, colour))
952 {
846 rxvt_print_error("can't allocate colour: %s", colour); 953 rxvt_print_error ("can't allocate colour: %s", colour);
847 return false; 954 return false;
848 } 955 }
849 956
850 return true; 957 return true;
851} 958}
852 959
853/* -------------------------------------------------------------------- * 960/* -------------------------------------------------------------------- *
854 * - WINDOW RESIZING - * 961 * - WINDOW RESIZING - *
855 * -------------------------------------------------------------------- */ 962 * -------------------------------------------------------------------- */
856/* EXTPROTO */
857void 963void
858rxvt_resize_all_windows(pR_ unsigned int width, unsigned int height, 964rxvt_term::resize_all_windows (unsigned int width, unsigned int height, int ignoreparent)
859 int ignoreparent)
860{ 965{
861 int fix_screen; 966 int fix_screen;
862 967
863#ifdef SMART_RESIZE 968#ifdef SMART_RESIZE
864 int old_width = R->szHint.width, old_height = R->szHint.height; 969 int old_width = szHint.width, old_height = szHint.height;
865#endif 970#endif
866 971
867 rxvt_window_calc(aR_ width, height); 972 window_calc (width, height);
868 XSetWMNormalHints(R->Xdisplay, R->TermWin.parent[0], &R->szHint); 973 XSetWMNormalHints (display->display, TermWin.parent[0], &szHint);
869 if (!ignoreparent) { 974 if (!ignoreparent)
975 {
870#ifdef SMART_RESIZE 976#ifdef SMART_RESIZE
871/* 977 /*
872 * resize by Marius Gedminas <marius.gedminas@uosis.mif.vu.lt> 978 * resize by Marius Gedminas <marius.gedminas@uosis.mif.vu.lt>
873 * reposition window on resize depending on placement on screen 979 * reposition window on resize depending on placement on screen
874 */ 980 */
875 int x, y, x1, y1; 981 int x, y, x1, y1;
876 int dx, dy; 982 int dx, dy;
877 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 983 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
878 Window unused_cr; 984 Window unused_cr;
879 985
880 XTranslateCoordinates(R->Xdisplay, R->TermWin.parent[0], Xroot, 986 XTranslateCoordinates (display->display, TermWin.parent[0], display->root,
881 0, 0, &x, &y, &unused_cr); 987 0, 0, &x, &y, &unused_cr);
882 XGetGeometry(R->Xdisplay, R->TermWin.parent[0], &unused_cr, &x1, &y1, 988 XGetGeometry (display->display, TermWin.parent[0], &unused_cr, &x1, &y1,
883 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 989 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
884 /* 990 /*
885 * if Xroot isn't the parent window, a WM will probably have offset 991 * if display->root isn't the parent window, a WM will probably have offset
886 * our position for handles and decorations. Counter it 992 * our position for handles and decorations. Counter it
887 */ 993 */
888 if (x1 != x || y1 != y) { 994 if (x1 != x || y1 != y)
995 {
889 x -= x1; 996 x -= x1;
890 y -= y1; 997 y -= y1;
891 } 998 }
892 999
893 x1 = (DisplayWidth(R->Xdisplay, Xscreen) - old_width) / 2; 1000 x1 = (DisplayWidth (display->display, display->screen) - old_width) / 2;
894 y1 = (DisplayHeight(R->Xdisplay, Xscreen) - old_height) / 2; 1001 y1 = (DisplayHeight (display->display, display->screen) - old_height) / 2;
895 dx = old_width - R->szHint.width; 1002 dx = old_width - szHint.width;
896 dy = old_height - R->szHint.height; 1003 dy = old_height - szHint.height;
897 1004
898 /* Check position of the center of the window */ 1005 /* Check position of the center of the window */
899 if (x < x1) /* left half */ 1006 if (x < x1) /* left half */
900 dx = 0; 1007 dx = 0;
901 else if (x == x1) /* exact center */ 1008 else if (x == x1) /* exact center */
902 dx /= 2; 1009 dx /= 2;
903 if (y < y1) /* top half */ 1010 if (y < y1) /* top half */
904 dy = 0; 1011 dy = 0;
905 else if (y == y1) /* exact center */ 1012 else if (y == y1) /* exact center */
906 dy /= 2; 1013 dy /= 2;
907 1014
908 XMoveResizeWindow(R->Xdisplay, R->TermWin.parent[0], x + dx, y + dy, 1015 XMoveResizeWindow (display->display, TermWin.parent[0], x + dx, y + dy,
909 R->szHint.width, R->szHint.height); 1016 szHint.width, szHint.height);
910#else 1017#else
911 XResizeWindow(R->Xdisplay, R->TermWin.parent[0], R->szHint.width, 1018 XResizeWindow (display->display, TermWin.parent[0], szHint.width,
912 R->szHint.height); 1019 szHint.height);
913#endif 1020#endif
914 }
915 1021
1022 }
1023
916 fix_screen = (R->TermWin.ncol != R->prev_ncol 1024 fix_screen = (TermWin.ncol != prev_ncol
917 || R->TermWin.nrow != R->prev_nrow); 1025 || TermWin.nrow != prev_nrow);
1026
918 if (fix_screen || width != R->old_width || height != R->old_height) { 1027 if (fix_screen || width != old_width || height != old_height)
1028 {
919 if (scrollbar_visible(R)) { 1029 if (scrollbar_visible ())
1030 {
920 XMoveResizeWindow(R->Xdisplay, R->scrollBar.win, R->window_sb_x, 1031 XMoveResizeWindow (display->display, scrollBar.win, window_sb_x,
921 0, scrollbar_TotalWidth(), R->szHint.height); 1032 0, scrollbar_TotalWidth (), szHint.height);
922 rxvt_Resize_scrollBar(aR); 1033 resize_scrollbar ();
923 } 1034 }
1035
924 if (menubar_visible(R)) 1036 if (menubar_visible ())
925 XMoveResizeWindow(R->Xdisplay, R->menuBar.win, R->window_vt_x, 1037 XMoveResizeWindow (display->display, menuBar.win, window_vt_x,
926 0, TermWin_TotalWidth(), menuBar_TotalHeight()); 1038 0, TermWin_TotalWidth (), menuBar_TotalHeight ());
1039
927 XMoveResizeWindow(R->Xdisplay, R->TermWin.vt, R->window_vt_x, 1040 XMoveResizeWindow (display->display, TermWin.vt, window_vt_x,
928 R->window_vt_y, TermWin_TotalWidth(), 1041 window_vt_y, TermWin_TotalWidth (),
929 TermWin_TotalHeight()); 1042 TermWin_TotalHeight ());
930#ifdef RXVT_GRAPHICS
931 if (R->old_height)
932 rxvt_Gr_Resize(aR_ R->old_width - R->szHint.base_width,
933 R->old_height - R->szHint.base_height);
934#endif
935 rxvt_scr_clear(aR); 1043 scr_clear ();
936#ifdef XPM_BACKGROUND 1044#ifdef XPM_BACKGROUND
937 rxvt_resize_pixmap(aR); 1045 resize_pixmap ();
938#endif 1046#endif
939 }
940 1047
1048 }
1049
941 if (fix_screen || R->old_height == 0) { 1050 if (fix_screen || old_height == 0)
1051 {
942 int curr_screen = -1; 1052 int curr_screen = -1;
943 uint16_t old_ncol = R->prev_ncol; 1053 int old_ncol = prev_ncol;
944 1054
945 /* scr_reset only works on the primary screen */ 1055 /* scr_reset only works on the primary screen */
946 if (R->old_height) /* this is not the first time through */ 1056 if (old_height) /* this is not the first time through */
1057 {
1058 unsigned int ncol = TermWin.ncol;
1059 TermWin.ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this
947 curr_screen = rxvt_scr_change_screen(aR_ PRIMARY); 1060 curr_screen = scr_change_screen (PRIMARY);
948 1061 TermWin.ncol = ncol;
949 R->scr_reset();
950
951 if (curr_screen >= 0) { /* this is not the first time through */
952 rxvt_scr_change_screen(aR_ curr_screen);
953 rxvt_selection_check(aR_(old_ncol != R->TermWin.ncol ? 4 : 0));
954 } 1062 }
955 }
956 1063
1064 scr_reset ();
1065
1066 if (curr_screen >= 0) /* this is not the first time through */
1067 {
1068 scr_change_screen (curr_screen);
1069 selection_check (old_ncol != TermWin.ncol ? 4 : 0);
1070 }
1071 }
1072
957 R->old_width = R->szHint.width; 1073 old_width = szHint.width;
958 R->old_height = R->szHint.height; 1074 old_height = szHint.height;
959 1075
960#ifdef USE_XIM 1076#ifdef USE_XIM
961 rxvt_IMSetStatusPosition(aR); 1077 IMSetStatusPosition ();
962#endif 1078#endif
963} 1079}
964 1080
965/* 1081/*
966 * Set the width/height of the vt window in characters. Units are pixels. 1082 * Set the width/height of the vt window in characters. Units are pixels.
967 * good for toggling 80/132 columns 1083 * good for toggling 80/132 columns
968 */ 1084 */
969/* EXTPROTO */
970void 1085void
971rxvt_set_widthheight(pR_ unsigned int width, unsigned int height) 1086rxvt_term::set_widthheight (unsigned int width, unsigned int height)
972{ 1087{
973 XWindowAttributes wattr; 1088 XWindowAttributes wattr;
974 1089
975 if (width == 0 || height == 0) { 1090 if (width == 0 || height == 0)
1091 {
976 XGetWindowAttributes(R->Xdisplay, Xroot, &wattr); 1092 XGetWindowAttributes (display->display, display->root, &wattr);
977 if (width == 0) 1093 if (width == 0)
978 width = wattr.width - R->szHint.base_width; 1094 width = wattr.width - szHint.base_width;
979 if (height == 0) 1095 if (height == 0)
980 height = wattr.height - R->szHint.base_height; 1096 height = wattr.height - szHint.base_height;
981 } 1097 }
982 if (width != R->TermWin.width || height != R->TermWin.height) { 1098 if (width != TermWin.width || height != TermWin.height)
1099 {
983 width += R->szHint.base_width; 1100 width += szHint.base_width;
984 height += R->szHint.base_height; 1101 height += szHint.base_height;
985 rxvt_resize_all_windows(aR_ width, height, 0); 1102 resize_all_windows (width, height, 0);
986 } 1103 }
987} 1104}
988 1105
989/* -------------------------------------------------------------------- * 1106/* -------------------------------------------------------------------- *
990 * - X INPUT METHOD ROUTINES - * 1107 * - X INPUT METHOD ROUTINES - *
991 * -------------------------------------------------------------------- */ 1108 * -------------------------------------------------------------------- */
992#ifdef USE_XIM 1109#ifdef USE_XIM
993/* INTPROTO */ 1110
994void 1111void
995rxvt_setSize(pR_ XRectangle * size) 1112rxvt_term::im_set_size (XRectangle *size)
996{ 1113{
997 size->x = R->TermWin.int_bwidth; 1114 size->x = TermWin.int_bwidth;
998 size->y = R->TermWin.int_bwidth; 1115 size->y = TermWin.int_bwidth;
999 size->width = Width2Pixel(R->TermWin.ncol); 1116 size->width = Width2Pixel (TermWin.ncol);
1000 size->height = Height2Pixel(R->TermWin.nrow); 1117 size->height = Height2Pixel (TermWin.nrow);
1001} 1118}
1002 1119
1003/* INTPROTO */
1004void 1120void
1005rxvt_setColor(pR_ unsigned long *fg, unsigned long *bg) 1121rxvt_term::im_set_color (unsigned long *fg, unsigned long *bg)
1006{ 1122{
1007 *fg = R->PixColors[Color_fg]; 1123 *fg = PixColors[Color_fg];
1008 *bg = R->PixColors[Color_bg]; 1124 *bg = PixColors[Color_bg];
1009} 1125}
1010 1126
1011/* Checking whether input method is running. */ 1127/* Checking whether input method is running. */
1012/* INTPROTO */
1013Bool 1128bool
1014rxvt_IMisRunning(pR) 1129rxvt_term::IMisRunning ()
1015{ 1130{
1016 char *p; 1131 char *p;
1017 Atom atom; 1132 Atom atom;
1018 Window win; 1133 Window win;
1019 char server[IMBUFSIZ]; 1134 char server[IMBUFSIZ];
1020 1135
1021/* get current locale modifier */ 1136 /* get current locale modifier */
1022 if ((p = XSetLocaleModifiers(NULL)) != NULL) { 1137 if ((p = XSetLocaleModifiers (NULL)) != NULL)
1138 {
1023 STRCPY(server, "@server="); 1139 STRCPY (server, "@server=");
1024 STRNCAT(server, &(p[4]), IMBUFSIZ - 9); /* skip "@im=" */ 1140 STRNCAT (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */
1025 if ((p = STRCHR(server + 1, '@')) != NULL) /* first one only */ 1141 if ((p = STRCHR (server + 1, '@')) != NULL) /* first one only */
1026 *p = '\0'; 1142 *p = '\0';
1027 1143
1028 atom = XInternAtom(R->Xdisplay, server, False); 1144 atom = XInternAtom (display->display, server, False);
1029 win = XGetSelectionOwner(R->Xdisplay, atom); 1145 win = XGetSelectionOwner (display->display, atom);
1030 if (win != None) 1146 if (win != None)
1031 return True; 1147 return True;
1032 } 1148 }
1033 return False; 1149 return False;
1034} 1150}
1035 1151
1036/* EXTPROTO */
1037void 1152void
1038rxvt_IMSendSpot(pR) 1153rxvt_term::IMSendSpot ()
1039{ 1154{
1040 XPoint spot; 1155 XPoint spot;
1041 XVaNestedList preedit_attr; 1156 XVaNestedList preedit_attr;
1042 1157
1043 if (R->Input_Context == NULL 1158 if (Input_Context == NULL
1044 || !R->TermWin.focus || !(R->input_style & XIMPreeditPosition) 1159 || !TermWin.focus || ! (input_style & XIMPreeditPosition)
1045 || !(R->event_type == KeyPress 1160 || ! (event_type == KeyPress
1046 || R->event_type == Expose 1161 || event_type == Expose
1047 || R->event_type == NoExpose 1162 || event_type == NoExpose
1048 || R->event_type == SelectionNotify 1163 || event_type == SelectionNotify
1049 || R->event_type == ButtonRelease || R->event_type == FocusIn) 1164 || event_type == ButtonRelease || event_type == FocusIn)
1050 || !rxvt_IMisRunning(aR)) 1165 || !IMisRunning ())
1051 return; 1166 return;
1052 1167
1053 rxvt_setPosition(aR_ & spot); 1168 im_set_position (&spot);
1054 1169
1055 preedit_attr = XVaCreateNestedList(0, XNSpotLocation, &spot, NULL); 1170 preedit_attr = XVaCreateNestedList (0, XNSpotLocation, &spot, NULL);
1056 XSetICValues(R->Input_Context, XNPreeditAttributes, preedit_attr, NULL); 1171 XSetICValues (Input_Context, XNPreeditAttributes, preedit_attr, NULL);
1057 XFree(preedit_attr); 1172 XFree (preedit_attr);
1058} 1173}
1059 1174
1060/* EXTPROTO */
1061void 1175void
1062rxvt_setTermFontSet(pR_ int idx)
1063{
1064 char *string;
1065 long length;
1066 int success = 0;
1067
1068 if (idx < 0 || idx >= MAX_NFONTS)
1069 return;
1070}
1071
1072/* INTPROTO */
1073void
1074rxvt_setPreeditArea (pR_ XRectangle * preedit_rect, XRectangle * status_rect, 1176rxvt_term::im_set_preedit_area (XRectangle * preedit_rect, XRectangle * status_rect,
1075 XRectangle * needed_rect) 1177 XRectangle * needed_rect)
1076{ 1178{
1077 int mbh, vtx = 0; 1179 int mbh, vtx = 0;
1078 1180
1079 if (scrollbar_visible(R) && !(R->Options & Opt_scrollBar_right)) 1181 if (scrollbar_visible () && ! (Options & Opt_scrollBar_right))
1080 vtx = scrollbar_TotalWidth(); 1182 vtx = scrollbar_TotalWidth ();
1183
1081 mbh = menubar_visible(R) ? menuBar_TotalHeight() : 0; 1184 mbh = menubar_visible () ? menuBar_TotalHeight () : 0;
1082 mbh -= R->TermWin.lineSpace; 1185 mbh -= TermWin.lineSpace;
1083 1186
1084 preedit_rect->x = needed_rect->width + vtx; 1187 preedit_rect->x = needed_rect->width + vtx;
1085 preedit_rect->y = Height2Pixel(R->TermWin.nrow - 1) + mbh; 1188 preedit_rect->y = Height2Pixel (TermWin.nrow - 1) + mbh;
1086 1189
1087 preedit_rect->width = Width2Pixel(R->TermWin.ncol + 1) - needed_rect->width 1190 preedit_rect->width = Width2Pixel (TermWin.ncol + 1) - needed_rect->width + vtx;
1088 + vtx;
1089 preedit_rect->height = Height2Pixel(1); 1191 preedit_rect->height = Height2Pixel (1);
1090 1192
1091 status_rect->x = vtx; 1193 status_rect->x = vtx;
1092 status_rect->y = Height2Pixel(R->TermWin.nrow - 1) + mbh; 1194 status_rect->y = Height2Pixel (TermWin.nrow - 1) + mbh;
1093 1195
1094 status_rect->width = needed_rect->width ? needed_rect->width 1196 status_rect->width = needed_rect->width ? needed_rect->width : Width2Pixel (TermWin.ncol + 1);
1095 : Width2Pixel(R->TermWin.ncol + 1);
1096 status_rect->height = Height2Pixel(1); 1197 status_rect->height = Height2Pixel (1);
1097} 1198}
1098 1199
1099/* ARGSUSED */
1100/* INTPROTO */
1101void 1200void
1102rxvt_IMDestroyCallback(XIM xim __attribute__ ((unused)), XPointer client_data 1201rxvt_term::im_destroy ()
1103 __attribute__ ((unused)), XPointer call_data
1104 __attribute__ ((unused)))
1105{ 1202{
1106 dR; 1203 if (Input_Context)
1107 1204 {
1205 XDestroyIC (Input_Context);
1108 R->Input_Context = NULL; 1206 Input_Context = NULL;
1109/* To avoid Segmentation Fault in C locale: Solaris only? */ 1207 }
1110 if (STRCMP(R->locale, "C")) 1208
1111 XRegisterIMInstantiateCallback(R->Xdisplay, NULL, NULL, NULL, 1209 if (input_method)
1112 rxvt_IMInstantiateCallback, NULL); 1210 {
1211 display->put_xim (input_method);
1212 input_method = 0;
1213 }
1113} 1214}
1114 1215
1115/* 1216/*
1116 * X manual pages and include files don't match on some systems: 1217 * Try to open a XIM with the current modifiers, then see if we can
1117 * some think this is an XIDProc and others an XIMProc so we can't 1218 * open a suitable preedit type
1118 * use the first argument - need to update this to be nice for
1119 * both types via some sort of configure detection
1120 */ 1219 */
1121/* ARGSUSED */ 1220bool
1122/* EXTPROTO */ 1221rxvt_term::IM_get_IC (const char *modifiers)
1123void
1124rxvt_IMInstantiateCallback(Display * unused
1125 __attribute__ ((unused)), XPointer client_data
1126 __attribute__ ((unused)), XPointer call_data
1127 __attribute__ ((unused)))
1128{ 1222{
1129 dR; 1223 int i, j, found;
1224 XIM xim;
1225 XPoint spot;
1226 XRectangle rect, status_rect, needed_rect;
1227 unsigned long fg, bg;
1228 const char *p;
1229 char **s;
1230 XIMStyles *xim_styles;
1231 XVaNestedList preedit_attr, status_attr;
1232
1233 if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1234 return false;
1235
1236 D_MAIN ((stderr, "rxvt_IM_get_IC ()"));
1237 input_method = display->get_xim (locale, modifiers);
1238 if (input_method == NULL)
1239 return false;
1240
1241 xim = input_method->xim;
1242
1243 xim_styles = NULL;
1244 if (XGetIMValues (xim, XNQueryInputStyle, &xim_styles, NULL)
1245 || !xim_styles || !xim_styles->count_styles)
1246 {
1247 display->put_xim (input_method);
1248 return false;
1249 }
1250
1251 p = rs[Rs_preeditType] ? rs[Rs_preeditType] : "OverTheSpot,OffTheSpot,Root";
1252 s = rxvt_splitcommastring (p);
1253 for (i = found = 0; !found && s[i]; i++)
1254 {
1255 if (!STRCMP (s[i], "OverTheSpot"))
1256 input_style = (XIMPreeditPosition | XIMStatusNothing);
1257 else if (!STRCMP (s[i], "OffTheSpot"))
1258 input_style = (XIMPreeditArea | XIMStatusArea);
1259 else if (!STRCMP (s[i], "Root"))
1260 input_style = (XIMPreeditNothing | XIMStatusNothing);
1261
1262 for (j = 0; j < xim_styles->count_styles; j++)
1263 if (input_style == xim_styles->supported_styles[j])
1264 {
1265 found = 1;
1266 break;
1267 }
1268 }
1269
1270 for (i = 0; s[i]; i++)
1271 free (s[i]);
1272
1273 free (s);
1274 XFree (xim_styles);
1275
1276 if (!found)
1277 {
1278 display->put_xim (input_method);
1279 return false;
1280 }
1281
1282 preedit_attr = status_attr = NULL;
1283
1284 if (input_style & XIMPreeditPosition)
1285 {
1286 im_set_size (&rect);
1287 im_set_position (&spot);
1288 im_set_color (&fg, &bg);
1289
1290 preedit_attr = XVaCreateNestedList (0, XNArea, &rect,
1291 XNSpotLocation, &spot,
1292 XNForeground, fg, XNBackground, bg,
1293 //XNFontSet, TermWin.fontset,
1294 NULL);
1295 }
1296 else if (input_style & XIMPreeditArea)
1297 {
1298 im_set_color (&fg, &bg);
1299
1300 /*
1301 * The necessary width of preedit area is unknown
1302 * until create input context.
1303 */
1304 needed_rect.width = 0;
1305
1306 im_set_preedit_area (&rect, &status_rect, &needed_rect);
1307
1308 preedit_attr = XVaCreateNestedList (0, XNArea, &rect,
1309 XNForeground, fg, XNBackground, bg,
1310 //XNFontSet, TermWin.fontset,
1311 NULL);
1312 status_attr = XVaCreateNestedList (0, XNArea, &status_rect,
1313 XNForeground, fg, XNBackground, bg,
1314 //XNFontSet, TermWin.fontset,
1315 NULL);
1316 }
1317
1318 Input_Context = XCreateIC (xim, XNInputStyle, input_style,
1319 XNClientWindow, TermWin.parent[0],
1320 XNFocusWindow, TermWin.parent[0],
1321 preedit_attr ? XNPreeditAttributes : NULL,
1322 preedit_attr,
1323 status_attr ? XNStatusAttributes : NULL,
1324 status_attr, NULL);
1325 if (preedit_attr) XFree (preedit_attr);
1326 if (status_attr) XFree (status_attr);
1327
1328 if (Input_Context == NULL)
1329 {
1330 rxvt_print_error ("failed to create input context");
1331 display->put_xim (input_method);
1332 return false;
1333 }
1334
1335 if (input_style & XIMPreeditArea)
1336 IMSetStatusPosition ();
1337
1338 D_MAIN ((stderr, "rxvt_IM_get_IC () - successful connection"));
1339 return true;
1340}
1341
1342void
1343rxvt_term::im_cb ()
1344{
1130 int i, found, had_im; 1345 int i, found, had_im;
1131 const char *p; 1346 const char *p;
1132 char **s; 1347 char **s;
1133 char buf[IMBUFSIZ]; 1348 char buf[IMBUFSIZ];
1134 1349
1350 im_destroy ();
1351
1135 D_MAIN((stderr, "rxvt_IMInstantiateCallback()")); 1352 D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()"));
1136 if (R->Input_Context) 1353 if (Input_Context)
1137 return; 1354 return;
1138 1355
1139#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE) 1356#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1140 if (R->rs[Rs_imLocale]) 1357 if (rs[Rs_imLocale])
1141 setlocale (LC_CTYPE, R->rs[Rs_imLocale]); 1358 SET_LOCALE (rs[Rs_imLocale]);
1142#endif 1359#endif
1143 1360
1144 p = R->rs[Rs_inputMethod]; 1361 p = rs[Rs_inputMethod];
1145 if (p && *p) 1362 if (p && *p)
1146 { 1363 {
1147 bool found = false; 1364 bool found = false;
1148 1365
1149 s = rxvt_splitcommastring (p); 1366 s = rxvt_splitcommastring (p);
1151 { 1368 {
1152 if (*s[i]) 1369 if (*s[i])
1153 { 1370 {
1154 STRCPY (buf, "@im="); 1371 STRCPY (buf, "@im=");
1155 STRNCAT (buf, s[i], IMBUFSIZ - 5); 1372 STRNCAT (buf, s[i], IMBUFSIZ - 5);
1156 if ((p = XSetLocaleModifiers (buf)) && *p 1373 if (IM_get_IC (buf))
1157 && rxvt_IM_get_IC (aR))
1158 { 1374 {
1159 found = true; 1375 found = true;
1160 break; 1376 break;
1161 } 1377 }
1162 } 1378 }
1163 } 1379 }
1164 for (i = 0; s[i]; i++) 1380 for (i = 0; s[i]; i++)
1165 free(s[i]); 1381 free (s[i]);
1166 free(s); 1382 free (s);
1167 1383
1168 if (found) 1384 if (found)
1169 goto done; 1385 goto done;
1170 } 1386 }
1171 1387
1172/* try with XMODIFIERS env. var. */ 1388 /* try with XMODIFIERS env. var. */
1173 if ((p = XSetLocaleModifiers ("")) && *p 1389 if (IM_get_IC (""))
1174 && rxvt_IM_get_IC (aR))
1175 goto done; 1390 goto done;
1176 1391
1177/* try with no modifiers base IF the user didn't specify an IM */ 1392 /* try with no modifiers base IF the user didn't specify an IM */
1178 if ((p = XSetLocaleModifiers ("@im=none")) && *p 1393 if (IM_get_IC ("@im=none"))
1179 && rxvt_IM_get_IC (aR) == True)
1180 goto done; 1394 goto done;
1181 1395
1182done: 1396done:
1183#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE) 1397#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1184 if (R->rs[Rs_imLocale]) 1398 if (rs[Rs_imLocale])
1185 setlocale (LC_CTYPE, R->locale); 1399 SET_LOCALE (locale);
1186#endif 1400#endif
1187} 1401}
1188 1402
1189/*
1190 * Try to open a XIM with the current modifiers, then see if we can
1191 * open a suitable preedit type
1192 */
1193/* INTPROTO */
1194Bool
1195rxvt_IM_get_IC(pR)
1196{
1197 int i, j, found;
1198 XIM xim;
1199 XPoint spot;
1200 XRectangle rect, status_rect, needed_rect;
1201 unsigned long fg, bg;
1202 const char *p;
1203 char **s;
1204 XIMStyles *xim_styles;
1205 XVaNestedList preedit_attr, status_attr;
1206 XIMCallback ximcallback;
1207
1208 D_MAIN((stderr, "rxvt_IM_get_IC()"));
1209 xim = XOpenIM(R->Xdisplay, NULL, NULL, NULL);
1210 if (xim == NULL)
1211 return False;
1212
1213 xim_styles = NULL;
1214 if (XGetIMValues(xim, XNQueryInputStyle, &xim_styles, NULL)
1215 || !xim_styles || !xim_styles->count_styles) {
1216 XCloseIM(xim);
1217 return False;
1218 }
1219
1220 p = R->rs[Rs_preeditType] ? R->rs[Rs_preeditType]
1221 : "OverTheSpot,OffTheSpot,Root";
1222 s = rxvt_splitcommastring(p);
1223 for (i = found = 0; !found && s[i]; i++) {
1224 if (!STRCMP(s[i], "OverTheSpot"))
1225 R->input_style = (XIMPreeditPosition | XIMStatusNothing);
1226 else if (!STRCMP(s[i], "OffTheSpot"))
1227 R->input_style = (XIMPreeditArea | XIMStatusArea);
1228 else if (!STRCMP(s[i], "Root"))
1229 R->input_style = (XIMPreeditNothing | XIMStatusNothing);
1230
1231 for (j = 0; j < xim_styles->count_styles; j++)
1232 if (R->input_style == xim_styles->supported_styles[j]) {
1233 found = 1;
1234 break;
1235 }
1236 }
1237 for (i = 0; s[i]; i++)
1238 free(s[i]);
1239 free(s);
1240 XFree(xim_styles);
1241
1242 if (!found) {
1243 XCloseIM(xim);
1244 return False;
1245 }
1246
1247 ximcallback.callback = rxvt_IMDestroyCallback;
1248
1249/* XXX: not sure why we need this (as well as IC one below) */
1250 XSetIMValues(xim, XNDestroyCallback, &ximcallback, NULL);
1251
1252 preedit_attr = status_attr = NULL;
1253
1254 if (R->input_style & XIMPreeditPosition) {
1255 rxvt_setSize(aR_ & rect);
1256 rxvt_setPosition(aR_ & spot);
1257 rxvt_setColor(aR_ & fg, &bg);
1258
1259 preedit_attr = XVaCreateNestedList(0, XNArea, &rect,
1260 XNSpotLocation, &spot,
1261 XNForeground, fg, XNBackground, bg,
1262 //XNFontSet, R->TermWin.fontset,
1263 NULL);
1264 } else if (R->input_style & XIMPreeditArea) {
1265 rxvt_setColor(aR_ & fg, &bg);
1266
1267 /*
1268 * The necessary width of preedit area is unknown
1269 * until create input context.
1270 */
1271 needed_rect.width = 0;
1272
1273 rxvt_setPreeditArea(aR_ & rect, &status_rect, &needed_rect);
1274
1275 preedit_attr = XVaCreateNestedList(0, XNArea, &rect,
1276 XNForeground, fg, XNBackground, bg,
1277 //XNFontSet, R->TermWin.fontset,
1278 NULL);
1279 status_attr = XVaCreateNestedList(0, XNArea, &status_rect,
1280 XNForeground, fg, XNBackground, bg,
1281 //XNFontSet, R->TermWin.fontset,
1282 NULL);
1283 }
1284 R->Input_Context = XCreateIC(xim, XNInputStyle, R->input_style,
1285 XNClientWindow, R->TermWin.parent[0],
1286 XNFocusWindow, R->TermWin.parent[0],
1287 XNDestroyCallback, &ximcallback,
1288 preedit_attr ? XNPreeditAttributes : NULL,
1289 preedit_attr,
1290 status_attr ? XNStatusAttributes : NULL,
1291 status_attr, NULL);
1292 if (preedit_attr)
1293 XFree(preedit_attr);
1294 if (status_attr)
1295 XFree(status_attr);
1296 if (R->Input_Context == NULL) {
1297 rxvt_print_error("failed to create input context");
1298 XCloseIM(xim);
1299 return False;
1300 }
1301 if (R->input_style & XIMPreeditArea)
1302 rxvt_IMSetStatusPosition(aR);
1303 D_MAIN((stderr, "rxvt_IM_get_IC() - successful connection"));
1304 return True;
1305}
1306
1307/* EXTPROTO */
1308void 1403void
1309rxvt_IMSetStatusPosition(pR) 1404rxvt_term::IMSetStatusPosition ()
1310{ 1405{
1311 XRectangle preedit_rect, status_rect, *needed_rect; 1406 XRectangle preedit_rect, status_rect, *needed_rect;
1312 XVaNestedList preedit_attr, status_attr; 1407 XVaNestedList preedit_attr, status_attr;
1313 1408
1314 if (R->Input_Context == NULL 1409 if (Input_Context == NULL
1315 || !R->TermWin.focus || !(R->input_style & XIMPreeditArea) 1410 || !TermWin.focus || ! (input_style & XIMPreeditArea)
1316 || !rxvt_IMisRunning(aR)) 1411 || !IMisRunning ())
1317 return; 1412 return;
1318 1413
1319/* Getting the necessary width of preedit area */ 1414 /* Getting the necessary width of preedit area */
1320 status_attr = XVaCreateNestedList(0, XNAreaNeeded, &needed_rect, NULL); 1415 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL);
1321 XGetICValues(R->Input_Context, XNStatusAttributes, status_attr, NULL); 1416 XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL);
1322 XFree(status_attr); 1417 XFree (status_attr);
1323 1418
1324 rxvt_setPreeditArea(aR_ & preedit_rect, &status_rect, needed_rect); 1419 im_set_preedit_area (&preedit_rect, &status_rect, needed_rect);
1325 1420
1326 preedit_attr = XVaCreateNestedList(0, XNArea, &preedit_rect, NULL); 1421 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1327 status_attr = XVaCreateNestedList(0, XNArea, &status_rect, NULL); 1422 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL);
1328 1423
1329 XSetICValues(R->Input_Context, 1424 XSetICValues (Input_Context,
1330 XNPreeditAttributes, preedit_attr, 1425 XNPreeditAttributes, preedit_attr,
1331 XNStatusAttributes, status_attr, NULL); 1426 XNStatusAttributes, status_attr, NULL);
1332 1427
1333 XFree(preedit_attr); 1428 XFree (preedit_attr);
1334 XFree(status_attr); 1429 XFree (status_attr);
1335} 1430}
1336#endif /* USE_XIM */ 1431#endif /* USE_XIM */
1337 1432
1338/*----------------------------------------------------------------------*/ 1433/*----------------------------------------------------------------------*/
1339rxvt_t rxvt_current_term; 1434rxvt_t rxvt_current_term;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines