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.10 by pcg, Wed Dec 3 23:19:44 2003 UTC vs.
Revision 1.33 by pcg, Fri Feb 13 13:28:17 2004 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines