[ViewVC] Diff of: cvs/rxvt-unicode/src/main.C

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.77 by root, Tue Aug 10 20:39:19 2004 UTC vs.
Revision 1.94 by root, Sun Aug 15 22:09:24 2004 UTC

…		…
51	static char curlocale[128];	51	static char curlocale[128];
52		52
53	bool	53	bool
54	rxvt_set_locale (const char *locale)	54	rxvt_set_locale (const char *locale)
55	{	55	{
56	if (!locale \|\| !STRNCMP (locale, curlocale, 128))	56	if (!locale \|\| !strncmp (locale, curlocale, 128))
57	return false;	57	return false;
58		58
59	STRNCPY (curlocale, locale, 128);	59	strncpy (curlocale, locale, 128);
60	setlocale (LC_CTYPE, curlocale);	60	setlocale (LC_CTYPE, curlocale);
61	return true;	61	return true;
62	}	62	}
63		63
64	#if ENABLE_COMBINING	64	#if ENABLE_COMBINING
…		…
128	void *	128	void *
129	rxvt_term::operator new (size_t s)	129	rxvt_term::operator new (size_t s)
130	{	130	{
131	void *p = malloc (s);	131	void *p = malloc (s);
132		132
133	MEMSET (p, 0, s);	133	memset (p, 0, s);
134	return p;	134	return p;
135	}	135	}
136		136
137	void	137	void
138	rxvt_term::operator delete (void *p, size_t s)	138	rxvt_term::operator delete (void *p, size_t s)
…		…
140	free (p);	140	free (p);
141	}	141	}
142		142
143	rxvt_term::rxvt_term ()	143	rxvt_term::rxvt_term ()
144	:	144	:
		145	#if TRANSPARENT
145	rootwin_ev (this, &rxvt_term::rootwin_cb),	146	rootwin_ev (this, &rxvt_term::rootwin_cb),
		147	#endif
		148	#ifdef HAVE_SCROLLBARS
		149	scrollbar_ev (this, &rxvt_term::x_cb),
		150	#endif
		151	#ifdef MENUBAR
		152	menubar_ev (this, &rxvt_term::x_cb),
		153	#endif
		154	#ifdef CURSOR_BLINK
		155	cursor_blink_ev (this, &rxvt_term::cursor_blink_cb),
		156	#endif
		157	#ifdef TEXT_BLINK
		158	text_blink_ev (this, &rxvt_term::text_blink_cb),
		159	#endif
		160	#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
		161	cont_scroll_ev (this, &rxvt_term::cont_scroll_cb),
		162	#endif
		163	#ifdef SELECTION_SCROLLING
		164	sel_scroll_ev (this, &rxvt_term::sel_scroll_cb),
		165	#endif
		166	#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
		167	slip_wheel_ev (this, &rxvt_term::slip_wheel_cb),
		168	#endif
		169	#ifdef POINTER_BLANK
		170	pointer_ev (this, &rxvt_term::pointer_cb),
		171	#endif
		172	#ifdef USE_XIM
		173	im_ev (this, &rxvt_term::im_cb),
		174	#endif
146	termwin_ev (this, &rxvt_term::x_cb),	175	termwin_ev (this, &rxvt_term::x_cb),
147	vt_ev (this, &rxvt_term::x_cb),	176	vt_ev (this, &rxvt_term::x_cb),
148	#ifdef HAVE_SCROLLBARS
149	scrollbar_ev (this, &rxvt_term::x_cb),
150	#endif
151	#ifdef MENUBAR
152	menubar_ev (this, &rxvt_term::x_cb),
153	#endif
154	#ifdef CURSOR_BLINK
155	cursor_blink_ev (this, &rxvt_term::cursor_blink_cb),
156	#endif
157	#ifdef TEXT_BLINK
158	text_blink_ev (this, &rxvt_term::text_blink_cb),
159	#endif
160	#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
161	cont_scroll_ev (this, &rxvt_term::cont_scroll_cb),
162	#endif
163	#ifdef SELECTION_SCROLLING
164	sel_scroll_ev (this, &rxvt_term::sel_scroll_cb),
165	#endif
166	#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
167	slip_wheel_ev (this, &rxvt_term::slip_wheel_cb),
168	#endif
169	#ifdef POINTER_BLANK
170	pointer_ev (this, &rxvt_term::pointer_cb),
171	#endif
172	#ifdef USE_XIM
173	im_ev (this, &rxvt_term::im_cb),
174	#endif
175	check_ev (this, &rxvt_term::check_cb),	177	check_ev (this, &rxvt_term::check_cb),
176	flush_ev (this, &rxvt_term::flush_cb),	178	flush_ev (this, &rxvt_term::flush_cb),
177	destroy_ev (this, &rxvt_term::destroy_cb),	179	destroy_ev (this, &rxvt_term::destroy_cb),
178	pty_ev (this, &rxvt_term::pty_cb),	180	pty_ev (this, &rxvt_term::pty_cb),
179	incr_ev (this, &rxvt_term::incr_cb)	181	incr_ev (this, &rxvt_term::incr_cb)
…		…
185		187
186	rxvt_term::~rxvt_term ()	188	rxvt_term::~rxvt_term ()
187	{	189	{
188	termlist.erase (find (termlist.begin (), termlist.end(), this));	190	termlist.erase (find (termlist.begin (), termlist.end(), this));
189		191
190	if (cmd_fd >= 0)	192	if (cmd_pid)
191	close (cmd_fd);	193	kill (-cmd_pid, SIGHUP);
192		194
193	#ifndef NO_SETOWNER_TTYDEV	195	pty.put ();
194	privileged_ttydev (RESTORE);	196
195	#endif
196	#ifdef UTMP_SUPPORT	197	#ifdef UTMP_SUPPORT
197	privileged_utmp (RESTORE);	198	privileged_utmp (RESTORE);
198	#endif	199	#endif
199		200
200	delete TermWin.fontset;	201	delete TermWin.fontset;
…		…
205		206
206	#ifdef USE_XIM	207	#ifdef USE_XIM
207	im_destroy ();	208	im_destroy ();
208	#endif	209	#endif
209	#ifdef MENUBAR	210	#ifdef MENUBAR
210	if (menubarGC) XFreeGC (display->display, menubarGC);	211	if (menubarGC) XFreeGC (display->display, menubarGC);
211	#endif	212	#endif
212	#ifdef XTERM_SCROLLBAR	213	#ifdef XTERM_SCROLLBAR
213	if (xscrollbarGC) XFreeGC (display->display, xscrollbarGC);	214	if (xscrollbarGC) XFreeGC (display->display, xscrollbarGC);
214	if (ShadowGC) XFreeGC (display->display, ShadowGC);	215	if (ShadowGC) XFreeGC (display->display, ShadowGC);
215	#endif	216	#endif
…		…
246	XDestroyWindow (display->display, TermWin.parent[0]);	247	XDestroyWindow (display->display, TermWin.parent[0]);
247	}	248	}
248		249
249	// TODO: free pixcolours, colours should become part of rxvt_display	250	// TODO: free pixcolours, colours should become part of rxvt_display
250		251
251	delete PixColorsFocused;	252	delete pix_colors_focused;
252	#ifdef OFF_FOCUS_FADING	253	#ifdef OFF_FOCUS_FADING
253	delete PixColorsUnFocused;	254	delete pix_colors_unfocused;
254	#endif	255	#endif
255		256
256	displays.put (display);	257	displays.put (display);
257		258
258	scr_release ();	259	scr_release ();
…		…
280	rxvt_term::destroy ()	281	rxvt_term::destroy ()
281	{	282	{
282	if (destroy_ev.active)	283	if (destroy_ev.active)
283	return;	284	return;
284		285
		286	#if ENABLE_OVERLAY
		287	scr_overlay_off ();
		288	#endif
		289
285	if (display)	290	if (display)
286	{	291	{
287	#ifdef USE_XIM	292	#if USE_XIM
288	im_ev.stop (display);	293	im_ev.stop (display);
289	#endif	294	#endif
290	#ifdef HAVE_SCROLLBARS	295	#if HAVE_SCROLLBARS
291	scrollbar_ev.stop (display);	296	scrollbar_ev.stop (display);
292	#endif	297	#endif
293	#ifdef MENUBAR	298	#if MENUBAR
294	menubar_ev.stop (display);	299	menubar_ev.stop (display);
295	#endif	300	#endif
		301	#if TRANSPARENT
296	rootwin_ev.stop (display);	302	rootwin_ev.stop (display);
		303	#endif
		304	incr_ev.stop ();
297	termwin_ev.stop (display);	305	termwin_ev.stop (display);
298	vt_ev.stop (display);	306	vt_ev.stop (display);
299	}	307	}
300		308
301	check_ev.stop ();	309	check_ev.stop ();
…		…
335	SET_R (this);	343	SET_R (this);
336		344
337	if (!init_vars ())	345	if (!init_vars ())
338	return false;	346	return false;
339		347
		348	init_secondary ();
		349
		350	const char **cmd_argv = init_resources (argc, argv);
		351
		352	set_locale ("");
		353
		354	#if MENUBAR_MAX
		355	menubar_read (rs[Rs_menu]);
		356	#endif
		357	#ifdef HAVE_SCROLLBARS
		358	if (options & Opt_scrollBar)
		359	scrollBar.setIdle (); /* set existence for size calculations */
		360	#endif
		361
		362	create_windows (argc, argv);
		363
		364	init_xlocale ();
		365
		366	scr_reset (); /* initialize screen */
		367
		368	#if 0
		369	XSynchronize (display->display, True);
		370	#endif
		371
		372	#ifdef HAVE_SCROLLBARS
		373	if (options & Opt_scrollBar)
		374	resize_scrollbar (); /* create and map scrollbar */
		375	#endif
		376	#if (MENUBAR_MAX)
		377	if (menubar_visible ())
		378	XMapWindow (display->display, menuBar.win);
		379	#endif
		380	#ifdef TRANSPARENT
		381	if (options & Opt_transparent)
		382	{
		383	XSelectInput (display->display, display->root, PropertyChangeMask);
		384	check_our_parents ();
		385	rootwin_ev.start (display, display->root);
		386	}
		387	#endif
		388
		389	XMapWindow (display->display, TermWin.vt);
		390	XMapWindow (display->display, TermWin.parent[0]);
		391
		392	init_command (cmd_argv);
		393
		394	pty_ev.start (pty.pty, EVENT_READ);
		395
		396	check_ev.start ();
		397
		398	return true;
		399	}
		400
		401	static int (old_xerror_handler) (Display dpy, XErrorEvent *event);
		402
		403	void
		404	rxvt_init ()
		405	{
		406	/* install exit handler for cleanup */
		407	#if 0
		408	#ifdef HAVE_ATEXIT
		409	atexit (rxvt_clean_exit);
		410	#else
		411	#endif
		412	#endif
340	/*	413	/*
341	* Save and then give up any super-user privileges	414	* Save and then give up any super-user privileges
342	* If we need privileges in any area then we must specifically request it.	415	* If we need privileges in any area then we must specifically request it.
343	* We should only need to be root in these cases:	416	* We should only need to be root in these cases:
344	* 1. write utmp entries on some systems	417	* 1. write utmp entries on some systems
345	* 2. chown tty on some systems	418	* 2. chown tty on some systems
346	*/	419	*/
347	privileges (SAVE);	420	rxvt_privileges (SAVE);
348	privileges (IGNORE);	421	rxvt_privileges (IGNORE);
349
350	init_secondary ();
351
352	const char **cmd_argv = init_resources (argc, argv);
353
354	set_locale ("");
355
356	#if MENUBAR_MAX
357	menubar_read (rs[Rs_menu]);
358	#endif
359	#ifdef HAVE_SCROLLBARS
360	if (Options & Opt_scrollBar)
361	scrollBar.setIdle (); /* set existence for size calculations */
362	#endif
363
364	create_windows (argc, argv);
365
366	init_xlocale ();
367
368	scr_reset (); /* initialize screen */
369
370	#if 0
371	XSynchronize (display->display, True);
372	#endif
373
374	#ifdef HAVE_SCROLLBARS
375	if (Options & Opt_scrollBar)
376	resize_scrollbar (); /* create and map scrollbar */
377	#endif
378	#if (MENUBAR_MAX)
379	if (menubar_visible ())
380	XMapWindow (display->display, menuBar.win);
381	#endif
382	#ifdef TRANSPARENT
383	if (Options & Opt_transparent)
384	{
385	XSelectInput (display->display, display->root, PropertyChangeMask);
386	check_our_parents ();
387	}
388	#endif
389
390	rootwin_ev.start (display, display->root);
391
392	XMapWindow (display->display, TermWin.vt);
393	XMapWindow (display->display, TermWin.parent[0]);
394
395	init_command (cmd_argv);
396
397	pty_ev.start (cmd_fd, EVENT_READ);
398
399	check_ev.start ();
400
401	return true;
402	}
403
404	static int (old_xerror_handler) (Display dpy, XErrorEvent *event);
405
406	void
407	rxvt_init_signals ()
408	{
409	/* install exit handler for cleanup */
410	#if 0
411	#ifdef HAVE_ATEXIT
412	atexit (rxvt_clean_exit);
413	#else
414	#endif
415	#endif
416		422
417	struct sigaction sa;	423	struct sigaction sa;
418		424
419	sigfillset (&sa.sa_mask);	425	sigfillset (&sa.sa_mask);
420	sa.sa_flags = SA_NOCLDSTOP \| SA_RESTART;	426	sa.sa_flags = SA_NOCLDSTOP \| SA_RESTART;
…		…
448	break;	454	break;
449	}	455	}
450	}	456	}
451		457
452	/* ARGSUSED */	458	/* ARGSUSED */
453	/* EXTPROTO */	459	/* INTPROTO */
454	RETSIGTYPE	460	RETSIGTYPE
455	rxvt_Child_signal (int sig __attribute__ ((unused)))	461	rxvt_Child_signal (int sig __attribute__ ((unused)))
456	{	462	{
457	int pid, save_errno = errno;	463	int pid, save_errno = errno;
458		464
…		…
463	}	469	}
464		470
465	/*	471	/*
466	* Catch a fatal signal and tidy up before quitting	472	* Catch a fatal signal and tidy up before quitting
467	*/	473	*/
468	/* EXTPROTO */	474	/* INTPROTO */
469	RETSIGTYPE	475	RETSIGTYPE
470	rxvt_Exit_signal (int sig)	476	rxvt_Exit_signal (int sig)
471	{	477	{
472	signal (sig, SIG_DFL);	478	signal (sig, SIG_DFL);
473	#ifdef DEBUG_CMD	479	#ifdef DEBUG_CMD
…		…
495	/----------------------------------------------------------------------/	501	/----------------------------------------------------------------------/
496	/*	502	/*
497	* Exit gracefully, clearing the utmp entry and restoring tty attributes	503	* Exit gracefully, clearing the utmp entry and restoring tty attributes
498	* TODO: if debugging, this should free up any known resources if we can	504	* TODO: if debugging, this should free up any known resources if we can
499	*/	505	*/
500	/* EXTPROTO */	506	/* INTPROTO */
501	void	507	void
502	rxvt_clean_exit ()	508	rxvt_clean_exit ()
503	{	509	{
504	// TODO: rxvtd should clean up all ressources	510	// TODO: rxvtd should clean up all ressources
505	if (GET_R)	511	if (GET_R)
…		…
507	}	513	}
508		514
509	/* ------------------------------------------------------------------------- *	515	/* ------------------------------------------------------------------------- *
510	* MEMORY ALLOCATION WRAPPERS *	516	* MEMORY ALLOCATION WRAPPERS *
511	* ------------------------------------------------------------------------- */	517	* ------------------------------------------------------------------------- */
512	/* EXTPROTO */	518	/* INTPROTO */
513	void *	519	void *
514	rxvt_malloc (size_t size)	520	rxvt_malloc (size_t size)
515	{	521	{
516	void *p;	522	void *p;
517		523
518	p = malloc (size);	524	p = malloc (size);
519	if (p)	525	if (p)
520	return p;	526	return p;
521		527
522	fprintf (stderr, RESNAME ": memory allocation failure. Aborting");	528	rxvt_fatal ("memory allocation failure. aborting.\n");
523	rxvt_clean_exit ();
524	exit (EXIT_FAILURE);
525	/* NOTREACHED */	529	/* NOTREACHED */
526	}	530	}
527		531
528	/* EXTPROTO */	532	/* INTPROTO */
529	void *	533	void *
530	rxvt_calloc (size_t number, size_t size)	534	rxvt_calloc (size_t number, size_t size)
531	{	535	{
532	void *p;	536	void *p;
533		537
534	p = calloc (number, size);	538	p = calloc (number, size);
535	if (p)	539	if (p)
536	return p;	540	return p;
537		541
538	fprintf (stderr, RESNAME ": memory allocation failure. Aborting");	542	rxvt_fatal ("memory allocation failure. aborting.\n");
539	rxvt_clean_exit ();
540	exit (EXIT_FAILURE);
541	/* NOTREACHED */	543	/* NOTREACHED */
542	}	544	}
543		545
544	/* EXTPROTO */	546	/* INTPROTO */
545	void *	547	void *
546	rxvt_realloc (void *ptr, size_t size)	548	rxvt_realloc (void *ptr, size_t size)
547	{	549	{
548	void *p;	550	void *p;
549		551
550	if (ptr)	552	if (ptr)
551	p = realloc (ptr, size);	553	p = realloc (ptr, size);
552	else	554	else
553	p = malloc (size);	555	p = malloc (size);
		556
554	if (p)	557	if (p)
555	return p;	558	return p;
556		559
557	fprintf (stderr, RESNAME ": memory allocation failure. Aborting");	560	rxvt_fatal ("memory allocation failure. aborting.\n");
558	rxvt_clean_exit ();
559	exit (EXIT_FAILURE);
560	/* NOTREACHED */	561	/* NOTREACHED */
561	}	562	}
562		563
563	/* ------------------------------------------------------------------------- *	564	/* ------------------------------------------------------------------------- *
564	* PRIVILEGED OPERATIONS *	565	* PRIVILEGED OPERATIONS *
565	* ------------------------------------------------------------------------- */	566	* ------------------------------------------------------------------------- */
566	/* take care of suid/sgid super-user (root) privileges */	567	/* take care of suid/sgid super-user (root) privileges */
567	void	568	void
568	rxvt_term::privileges (int mode)	569	rxvt_privileges (rxvt_privaction action)
569	{	570	{
		571	#if (defined(HAVE_SETEUID) \|\| defined(HAVE_SETREUID)) && !defined(__CYGWIN32__)
		572	static uid_t euid;
		573	static gid_t egid;
		574	#endif
		575
570	#if ! defined(__CYGWIN32__)	576	#if ! defined(__CYGWIN32__)
571	# if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID)	577	# if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID)
572	/* setreuid () is the poor man's setuid (), seteuid () */	578	/* setreuid () is the poor man's setuid (), seteuid () */
573	# define seteuid(a) setreuid(-1, (a))	579	# define seteuid(a) setreuid(-1, (a))
574	# define setegid(a) setregid(-1, (a))	580	# define setegid(a) setregid(-1, (a))
575	# define HAVE_SETEUID	581	# define HAVE_SETEUID
576	# endif	582	# endif
577	# ifdef HAVE_SETEUID	583	# ifdef HAVE_SETEUID
578	switch (mode)	584	switch (action)
579	{	585	{
580	case IGNORE:	586	case IGNORE:
581	/*	587	/*
582	* change effective uid/gid - not real uid/gid - so we can switch	588	* change effective uid/gid - not real uid/gid - so we can switch
583	* back to root later, as required	589	* back to root later, as required
…		…
593	seteuid (euid);	599	seteuid (euid);
594	setegid (egid);	600	setegid (egid);
595	break;	601	break;
596	}	602	}
597	# else	603	# else
598	switch (mode)	604	switch (action)
599	{	605	{
600	case IGNORE:	606	case IGNORE:
601	setuid (getuid ());	607	setuid (getuid ());
602	setgid (getgid ());	608	setgid (getgid ());
603	/* FALLTHROUGH */	609	/* FALLTHROUGH */
…		…
610	#endif	616	#endif
611	}	617	}
612		618
613	#ifdef UTMP_SUPPORT	619	#ifdef UTMP_SUPPORT
614	void	620	void
615	rxvt_term::privileged_utmp (char action)	621	rxvt_term::privileged_utmp (rxvt_privaction action)
616	{	622	{
617	D_MAIN ((stderr, "rxvt_privileged_utmp (%c); waiting for: %c (pid: %d)",
618	action, next_utmp_action, getpid ()));
619	if (next_utmp_action != action \|\| (action != SAVE && action != RESTORE)
620	\|\| (Options & Opt_utmpInhibit)	623	if ((options & Opt_utmpInhibit)
621	\|\| ttydev == NULL \|\| *ttydev == '\0')	624	\|\| !pty.name \|\| !*pty.name)
622	return;	625	return;
623		626
624	privileges (RESTORE);	627	rxvt_privileges (RESTORE);
		628
625	if (action == SAVE)	629	if (action == SAVE)
626	{
627	next_utmp_action = RESTORE;
628	makeutent (ttydev, rs[Rs_display_name]);	630	makeutent (pty.name, rs[Rs_display_name]);
629	}
630	else	631	else
631	{ /* action == RESTORE */
632	next_utmp_action = IGNORE;
633	cleanutent ();	632	cleanutent ();
634	}	633
635	privileges (IGNORE);	634	rxvt_privileges (IGNORE);
636	}
637	#endif
638
639	#ifndef NO_SETOWNER_TTYDEV
640	void
641	rxvt_term::privileged_ttydev (char action)
642	{
643	D_MAIN ((stderr,
644	"privileged_ttydev (%c); waiting for: %c (pid: %d)",
645	action, next_tty_action, getpid ()));
646	if (next_tty_action != action \|\| (action != SAVE && action != RESTORE)
647	\|\| ttydev == NULL \|\| *ttydev == '\0')
648	return;
649
650	privileges (RESTORE);
651
652	if (action == SAVE)
653	{
654	next_tty_action = RESTORE;
655	# ifndef RESET_TTY_TO_COMMON_DEFAULTS
656	/* store original tty status for restoration rxvt_clean_exit () -- rgg 04/12/95 */
657	if (lstat (ttydev, &ttyfd_stat) < 0) /* you lose out */
658	next_tty_action = IGNORE;
659	else
660	# endif
661
662	{
663	chown (ttydev, getuid (), ttygid); /* fail silently */
664	chmod (ttydev, ttymode);
665	# ifdef HAVE_REVOKE
666	revoke (ttydev);
667	# endif
668
669	}
670	}
671	else
672	{ /* action == RESTORE */
673	next_tty_action = IGNORE;
674	# ifndef RESET_TTY_TO_COMMON_DEFAULTS
675	chmod (ttydev, ttyfd_stat.st_mode);
676	chown (ttydev, ttyfd_stat.st_uid, ttyfd_stat.st_gid);
677	# else
678	chmod (ttydev,
679	(S_IRUSR \| S_IWUSR \| S_IRGRP \| S_IWGRP \| S_IROTH \| S_IWOTH));
680	chown (ttydev, 0, 0);
681	# endif
682
683	}
684
685	privileges (IGNORE);
686
687	# ifndef RESET_TTY_TO_COMMON_DEFAULTS
688	D_MAIN ((stderr, "%s \"%s\": mode %03o, uid %d, gid %d",
689	action == RESTORE ? "Restoring" : (action ==
690	SAVE ? "Saving" :
691	"UNKNOWN ERROR for"), ttydev,
692	ttyfd_stat.st_mode, ttyfd_stat.st_uid,
693	ttyfd_stat.st_gid));
694	# endif
695	}	635	}
696	#endif	636	#endif
697		637
698	/----------------------------------------------------------------------/	638	/----------------------------------------------------------------------/
699	/*	639	/*
…		…
770		710
771	if (scrollbar_visible ())	711	if (scrollbar_visible ())
772	{	712	{
773	sb_w = scrollbar_TotalWidth ();	713	sb_w = scrollbar_TotalWidth ();
774	szHint.base_width += sb_w;	714	szHint.base_width += sb_w;
775	if (!(Options & Opt_scrollBar_right))	715	if (!(options & Opt_scrollBar_right))
776	window_vt_x += sb_w;	716	window_vt_x += sb_w;
777	}	717	}
778		718
779	if (menubar_visible ())	719	if (menubar_visible ())
780	{	720	{
…		…
808	{	748	{
809	MIN_IT (TermWin.height, max_height);	749	MIN_IT (TermWin.height, max_height);
810	szHint.height = szHint.base_height + TermWin.height;	750	szHint.height = szHint.base_height + TermWin.height;
811	}	751	}
812		752
813	if (scrollbar_visible () && (Options & Opt_scrollBar_right))	753	if (scrollbar_visible () && (options & Opt_scrollBar_right))
814	window_sb_x = szHint.width - sb_w;	754	window_sb_x = szHint.width - sb_w;
815		755
816	if (recalc_x)	756	if (recalc_x)
817	szHint.x += (DisplayWidth (display->display, DefaultScreen (display->display))	757	szHint.x += (DisplayWidth (display->display, DefaultScreen (display->display))
818	- szHint.width - 2 * TermWin.ext_bwidth);	758	- szHint.width - 2 * TermWin.ext_bwidth);
…		…
834	* Called after a window size change.	774	* Called after a window size change.
835	*/	775	*/
836	void	776	void
837	rxvt_term::tt_winch ()	777	rxvt_term::tt_winch ()
838	{	778	{
		779	if (pty.pty < 0)
		780	return;
		781
839	struct winsize ws;	782	struct winsize ws;
840
841	if (cmd_fd < 0)
842	return;
843		783
844	ws.ws_col = TermWin.ncol;	784	ws.ws_col = TermWin.ncol;
845	ws.ws_row = TermWin.nrow;	785	ws.ws_row = TermWin.nrow;
846	ws.ws_xpixel = ws.ws_ypixel = 0;	786	ws.ws_xpixel = TermWin.width;
847	#ifndef DEBUG_SIZE	787	ws.ws_ypixel = TermWin.height;
848	(void)ioctl (cmd_fd, TIOCSWINSZ, &ws);	788	(void)ioctl (pty.pty, TIOCSWINSZ, &ws);
849	#else	789
850	if (ioctl (cmd_fd, TIOCSWINSZ, &ws) < 0)	790	#if 0
851	D_SIZE ((stderr, "Failed to send TIOCSWINSZ to fd %d", fd));	791	// TIOCSWINSZ⎈ is supposed to do this automatically and correctly
852	# ifdef SIGWINCH
853	else if (cmd_pid) /* force through to the command */	792	if (cmd_pid) /* force through to the command */
854	kill (cmd_pid, SIGWINCH);	793	kill (cmd_pid, SIGWINCH);
855	# endif
856	#endif	794	#endif
857	}	795	}
858		796
859	/----------------------------------------------------------------------/	797	/----------------------------------------------------------------------/
860	/* rxvt_change_font () - Switch to a new font */	798	/* rxvt_change_font () - Switch to a new font */
…		…
920	char *name;	858	char *name;
921		859
922	if (!XFetchName (display->display, TermWin.parent[0], &name))	860	if (!XFetchName (display->display, TermWin.parent[0], &name))
923	name = NULL;	861	name = NULL;
924		862
925	if (name == NULL \|\| STRCMP (name, str))	863	if (name == NULL \|\| strcmp (name, str))
926	#endif	864	#endif
927	XStoreName (display->display, TermWin.parent[0], str);	865	XStoreName (display->display, TermWin.parent[0], str);
928		866
929	#ifdef SMART_WINDOW_TITLE	867	#ifdef SMART_WINDOW_TITLE
930	if (name)	868	if (name)
…		…
939	char *name;	877	char *name;
940		878
941	if (!XGetIconName (display->display, TermWin.parent[0], &name))	879	if (!XGetIconName (display->display, TermWin.parent[0], &name))
942	name = NULL;	880	name = NULL;
943		881
944	if (name == NULL \|\| STRCMP (name, str))	882	if (name == NULL \|\| strcmp (name, str))
945	#endif	883	#endif
946	XSetIconName (display->display, TermWin.parent[0], str);	884	XSetIconName (display->display, TermWin.parent[0], str);
947		885
948	#ifdef SMART_WINDOW_TITLE	886	#ifdef SMART_WINDOW_TITLE
949	if (name)	887	if (name)
…		…
967	i = atoi (color);	905	i = atoi (color);
968	if (i >= 8 && i <= 15)	906	if (i >= 8 && i <= 15)
969	{ /* bright colors */	907	{ /* bright colors */
970	i -= 8;	908	i -= 8;
971	# ifndef NO_BRIGHTCOLOR	909	# ifndef NO_BRIGHTCOLOR
972	PixColorsFocused[idx] = PixColorsFocused[minBrightCOLOR + i];	910	pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i];
973	SET_PIXCOLOR (idx);	911	SET_PIXCOLOR (idx);
974	goto Done;	912	goto Done;
975	# endif	913	# endif
976		914
977	}	915	}
978	if (i >= 0 && i <= 7)	916	if (i >= 0 && i <= 7)
979	{ /* normal colors */	917	{ /* normal colors */
980	PixColorsFocused[idx] = PixColorsFocused[minCOLOR + i];	918	pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
981	SET_PIXCOLOR (idx);	919	SET_PIXCOLOR (idx);
982	goto Done;	920	goto Done;
983	}	921	}
984	}	922	}
985		923
…		…
992	* FIXME: should free colors here, but no idea how to do it so instead,	930	* FIXME: should free colors here, but no idea how to do it so instead,
993	* so just keep gobbling up the colormap	931	* so just keep gobbling up the colormap
994	*/	932	*/
995	# if 0	933	# if 0
996	for (i = Color_Black; i <= Color_White; i++)	934	for (i = Color_Black; i <= Color_White; i++)
997	if (PixColors[idx] == PixColors[i])	935	if (pix_colors[idx] == pix_colors[i])
998	break;	936	break;
999	if (i > Color_White)	937	if (i > Color_White)
1000	{	938	{
1001	/* fprintf (stderr, "XFreeColors: PixColors [%d] = %lu\n", idx, PixColors [idx]); */	939	/* fprintf (stderr, "XFreeColors: pix_colors [%d] = %lu\n", idx, pix_colors [idx]); */
1002	XFreeColors (display->display, display->cmap, (PixColors + idx), 1,	940	XFreeColors (display->display, display->cmap, (pix_colors + idx), 1,
1003	DisplayPlanes (display->display, display->screen));	941	DisplayPlanes (display->display, display->screen));
1004	}	942	}
1005	# endif	943	# endif
1006		944
1007	PixColorsFocused[idx] = xcol;	945	pix_colors_focused[idx] = xcol;
1008	SET_PIXCOLOR (idx);	946	SET_PIXCOLOR (idx);
1009		947
1010	/* XSetWindowAttributes attr; */	948	/* XSetWindowAttributes attr; */
1011	/* Cursor cursor; */	949	/* Cursor cursor; */
1012	Done:	950	Done:
1013	#ifdef OFF_FOCUS_FADING	951	#ifdef OFF_FOCUS_FADING
1014	PixColorsUnFocused[idx] = PixColorsFocused[idx].fade (display, atoi (rs[Rs_fade]));	952	pix_colors_unfocused[idx] = pix_colors_focused[idx].fade (display, atoi (rs[Rs_fade]));
1015	#endif	953	#endif
1016	if (idx == Color_bg && ! (Options & Opt_transparent))	954	if (idx == Color_bg && ! (options & Opt_transparent))
1017	XSetWindowBackground (display->display, TermWin.vt, PixColors[Color_bg]);	955	XSetWindowBackground (display->display, TermWin.vt, pix_colors[Color_bg]);
1018		956
1019	/* handle Color_BD, scrollbar background, etc. */	957	/* handle Color_BD, scrollbar background, etc. */
1020		958
1021	set_colorfgbg ();	959	set_colorfgbg ();
1022	recolour_cursor ();	960	recolour_cursor ();
…		…
1030	void	968	void
1031	rxvt_term::recolour_cursor ()	969	rxvt_term::recolour_cursor ()
1032	{	970	{
1033	XColor xcol[2];	971	XColor xcol[2];
1034		972
1035	xcol[0].pixel = ISSET_PIXCOLOR (Color_pointer_fg) ? PixColorsFocused[Color_pointer_fg] : PixColorsFocused[Color_fg];	973	xcol[0].pixel = ISSET_PIXCOLOR (Color_pointer_fg) ? pix_colors_focused[Color_pointer_fg] : pix_colors_focused[Color_fg];
1036	xcol[1].pixel = ISSET_PIXCOLOR (Color_pointer_bg) ? PixColorsFocused[Color_pointer_bg] : PixColorsFocused[Color_bg];	974	xcol[1].pixel = ISSET_PIXCOLOR (Color_pointer_bg) ? pix_colors_focused[Color_pointer_bg] : pix_colors_focused[Color_bg];
1037	XQueryColors (display->display, display->cmap, xcol, 2);	975	XQueryColors (display->display, display->cmap, xcol, 2);
1038	XRecolorCursor (display->display, TermWin_cursor, xcol + 0, xcol + 1);	976	XRecolorCursor (display->display, TermWin_cursor, xcol + 0, xcol + 1);
1039	}	977	}
1040		978
1041	/----------------------------------------------------------------------/	979	/----------------------------------------------------------------------/
…		…
1049	const char *xpmb = "\0";	987	const char *xpmb = "\0";
1050	char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];	988	char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];
1051		989
1052	env_colorfgbg =	990	env_colorfgbg =
1053	(char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg") + 1);	991	(char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg") + 1);
1054	STRCPY (fstr, "default");	992	strcpy (fstr, "default");
1055	STRCPY (bstr, "default");	993	strcpy (bstr, "default");
1056	for (i = Color_Black; i <= Color_White; i++)	994	for (i = Color_Black; i <= Color_White; i++)
1057	if (PixColors[Color_fg] == PixColors[i])	995	if (pix_colors[Color_fg] == pix_colors[i])
1058	{	996	{
1059	sprintf (fstr, "%d", (i - Color_Black));	997	sprintf (fstr, "%d", (i - Color_Black));
1060	break;	998	break;
1061	}	999	}
1062	for (i = Color_Black; i <= Color_White; i++)	1000	for (i = Color_Black; i <= Color_White; i++)
1063	if (PixColors[Color_bg] == PixColors[i])	1001	if (pix_colors[Color_bg] == pix_colors[i])
1064	{	1002	{
1065	sprintf (bstr, "%d", (i - Color_Black));	1003	sprintf (bstr, "%d", (i - Color_Black));
1066	#ifdef XPM_BACKGROUND	1004	#ifdef XPM_BACKGROUND
1067	xpmb = "default;";	1005	xpmb = "default;";
1068	#endif	1006	#endif
…		…
1073		1011
1074	#ifndef NO_BRIGHTCOLOR	1012	#ifndef NO_BRIGHTCOLOR
1075	colorfgbg = DEFAULT_RSTYLE;	1013	colorfgbg = DEFAULT_RSTYLE;
1076	for (i = minCOLOR; i <= maxCOLOR; i++)	1014	for (i = minCOLOR; i <= maxCOLOR; i++)
1077	{	1015	{
1078	if (PixColors[Color_fg] == PixColors[i])	1016	if (pix_colors[Color_fg] == pix_colors[i])
1079	colorfgbg = SET_FGCOLOR (colorfgbg, i);	1017	colorfgbg = SET_FGCOLOR (colorfgbg, i);
1080	if (PixColors[Color_bg] == PixColors[i])	1018	if (pix_colors[Color_bg] == pix_colors[i])
1081	colorfgbg = SET_BGCOLOR (colorfgbg, i);	1019	colorfgbg = SET_BGCOLOR (colorfgbg, i);
1082	}	1020	}
1083	#endif	1021	#endif
1084	}	1022	}
1085		1023
…		…
1236	if (width == 0)	1174	if (width == 0)
1237	width = wattr.width - szHint.base_width;	1175	width = wattr.width - szHint.base_width;
1238	if (height == 0)	1176	if (height == 0)
1239	height = wattr.height - szHint.base_height;	1177	height = wattr.height - szHint.base_height;
1240	}	1178	}
		1179
1241	if (width != TermWin.width \|\| height != TermWin.height)	1180	if (width != TermWin.width \|\| height != TermWin.height)
1242	{	1181	{
1243	width += szHint.base_width;	1182	width += szHint.base_width;
1244	height += szHint.base_height;	1183	height += szHint.base_height;
1245	resize_all_windows (width, height, 0);	1184	resize_all_windows (width, height, 0);
…		…
1250	* - X INPUT METHOD ROUTINES - *	1189	* - X INPUT METHOD ROUTINES - *
1251	* -------------------------------------------------------------------- */	1190	* -------------------------------------------------------------------- */
1252	#ifdef USE_XIM	1191	#ifdef USE_XIM
1253		1192
1254	void	1193	void
		1194	rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg)
		1195	{
		1196	fg = pix_colors[Color_fg];
		1197	bg = pix_colors[Color_bg];
		1198	}
		1199
		1200	void
1255	rxvt_term::im_set_size (XRectangle *size)	1201	rxvt_term::im_set_size (XRectangle &size)
1256	{	1202	{
		1203	// the int_bwidth terms make no sense to me
1257	size->x = TermWin.int_bwidth;	1204	size.x = TermWin.int_bwidth;
1258	size->y = TermWin.int_bwidth;	1205	size.y = TermWin.int_bwidth;
1259	size->width = Width2Pixel (TermWin.ncol);	1206	size.width = Width2Pixel (TermWin.ncol) + TermWin.int_bwidth;
1260	size->height = Height2Pixel (TermWin.nrow);	1207	size.height = Height2Pixel (TermWin.nrow) + TermWin.int_bwidth;
1261	}	1208	}
1262		1209
1263	void	1210	void
1264	rxvt_term::im_set_color (unsigned long fg, unsigned long bg)	1211	rxvt_term::im_set_preedit_area (XRectangle &preedit_rect,
		1212	XRectangle &status_rect,
		1213	const XRectangle &needed_rect)
1265	{	1214	{
1266	*fg = PixColors[Color_fg];	1215	preedit_rect.x = needed_rect.width;
1267	*bg = PixColors[Color_bg];	1216	preedit_rect.y = 0;
		1217	preedit_rect.width = Width2Pixel (TermWin.ncol) - needed_rect.width + 1;
		1218	preedit_rect.height = TermWin.fheight;
		1219
		1220	status_rect.x = 0;
		1221	status_rect.y = 0;
		1222	status_rect.width = needed_rect.width ? needed_rect.width : Width2Pixel (TermWin.ncol) + 1;
		1223	status_rect.height = TermWin.fheight;
1268	}	1224	}
1269		1225
1270	/* Checking whether input method is running. */	1226	/* Checking whether input method is running. */
1271	bool	1227	bool
1272	rxvt_term::IMisRunning ()	1228	rxvt_term::IMisRunning ()
1273	{	1229	{
1274	char *p;	1230	char *p;
1275	Atom atom;	1231	Atom atom;
1276	Window win;	1232	Window win;
1277	char server[IMBUFSIZ];	1233	char server[IMBUFSIZ];
1278		1234
1279	/* get current locale modifier */	1235	/* get current locale modifier */
1280	if ((p = XSetLocaleModifiers (NULL)) != NULL)	1236	if ((p = XSetLocaleModifiers (NULL)) != NULL)
1281	{	1237	{
1282	STRCPY (server, "@server=");	1238	strcpy (server, "@server=");
1283	STRNCAT (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */	1239	strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */
		1240
1284	if ((p = STRCHR (server + 1, '@')) != NULL) /* first one only */	1241	if ((p = strchr (server + 1, '@')) != NULL) /* first one only */
1285	*p = '\0';	1242	*p = '\0';
1286		1243
1287	atom = XInternAtom (display->display, server, False);	1244	atom = XInternAtom (display->display, server, False);
1288	win = XGetSelectionOwner (display->display, atom);	1245	win = XGetSelectionOwner (display->display, atom);
		1246
1289	if (win != None)	1247	if (win != None)
1290	return True;	1248	return True;
1291	}	1249	}
		1250
1292	return False;	1251	return False;
1293	}	1252	}
1294		1253
1295	void	1254	void
1296	rxvt_term::IMSendSpot ()	1255	rxvt_term::IMSendSpot ()
1297	{	1256	{
1298	XPoint spot;	1257	XPoint spot;
1299	XVaNestedList preedit_attr;	1258	XVaNestedList preedit_attr;
1300		1259
1301	if (Input_Context == NULL	1260	if (!Input_Context
		1261	\|\| !TermWin.focus
1302	\|\| !TermWin.focus \|\| ! (input_style & XIMPreeditPosition)	1262	\|\| !(input_style & XIMPreeditPosition)
		1263	#if 0
1303	\|\| ! (event_type == KeyPress	1264	\|\| !(event_type == KeyPress
1304	\|\| event_type == Expose	1265	\|\| event_type == Expose
1305	\|\| event_type == NoExpose	1266	\|\| event_type == NoExpose
1306	\|\| event_type == SelectionNotify	1267	\|\| event_type == SelectionNotify
1307	\|\| event_type == ButtonRelease \|\| event_type == FocusIn)	1268	\|\| event_type == ButtonRelease \|\| event_type == FocusIn)
		1269	#endif
1308	\|\| !IMisRunning ())	1270	\|\| !IMisRunning ())
1309	return;	1271	return;
1310		1272
1311	im_set_position (&spot);	1273	im_set_position (spot);
1312		1274
1313	preedit_attr = XVaCreateNestedList (0, XNSpotLocation, &spot, NULL);	1275	preedit_attr = XVaCreateNestedList (0, XNSpotLocation, &spot, NULL);
1314	XSetICValues (Input_Context, XNPreeditAttributes, preedit_attr, NULL);	1276	XSetICValues (Input_Context, XNPreeditAttributes, preedit_attr, NULL);
1315	XFree (preedit_attr);	1277	XFree (preedit_attr);
1316	}	1278	}
1317		1279
1318	void	1280	void
1319	rxvt_term::im_set_preedit_area (XRectangle * preedit_rect, XRectangle * status_rect,
1320	XRectangle * needed_rect)
1321	{
1322	int mbh, vtx = 0;
1323
1324	if (scrollbar_visible () && ! (Options & Opt_scrollBar_right))
1325	vtx = scrollbar_TotalWidth ();
1326
1327	mbh = menubar_visible () ? menuBar_TotalHeight () : 0;
1328	mbh -= TermWin.lineSpace;
1329
1330	preedit_rect->x = needed_rect->width + vtx;
1331	preedit_rect->y = Height2Pixel (TermWin.nrow - 1) + mbh;
1332
1333	preedit_rect->width = Width2Pixel (TermWin.ncol + 1) - needed_rect->width + vtx;
1334	preedit_rect->height = Height2Pixel (1);
1335
1336	status_rect->x = vtx;
1337	status_rect->y = Height2Pixel (TermWin.nrow - 1) + mbh;
1338
1339	status_rect->width = needed_rect->width ? needed_rect->width : Width2Pixel (TermWin.ncol + 1);
1340	status_rect->height = Height2Pixel (1);
1341	}
1342
1343	void
1344	rxvt_term::im_destroy ()	1281	rxvt_term::im_destroy ()
1345	{	1282	{
1346	if (Input_Context)	1283	if (Input_Context)
1347	{	1284	{
1348	XDestroyIC (Input_Context);	1285	XDestroyIC (Input_Context);
1349	Input_Context = NULL;	1286	Input_Context = 0;
1350	}	1287	}
1351		1288
1352	if (input_method)	1289	if (input_method)
1353	{	1290	{
1354	display->put_xim (input_method);	1291	display->put_xim (input_method);
…		…
1361	* open a suitable preedit type	1298	* open a suitable preedit type
1362	*/	1299	*/
1363	bool	1300	bool
1364	rxvt_term::IM_get_IC (const char *modifiers)	1301	rxvt_term::IM_get_IC (const char *modifiers)
1365	{	1302	{
1366	int i, j, found;	1303	int i, j, found;
1367	XIM xim;	1304	XIM xim;
1368	XPoint spot;	1305	XPoint spot;
1369	XRectangle rect, status_rect, needed_rect;	1306	XRectangle rect, status_rect, needed_rect;
1370	unsigned long fg, bg;	1307	unsigned long fg, bg;
1371	const char *p;	1308	const char *p;
1372	char **s;	1309	char **s;
1373	XIMStyles *xim_styles;	1310	XIMStyles *xim_styles;
1374	XVaNestedList preedit_attr, status_attr;
1375		1311
1376	if (! ((p = XSetLocaleModifiers (modifiers)) && *p))	1312	if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1377	return false;	1313	return false;
1378		1314
1379	D_MAIN ((stderr, "rxvt_IM_get_IC ()"));	1315	D_MAIN ((stderr, "rxvt_IM_get_IC ()"));
…		…
1385		1321
1386	xim_styles = NULL;	1322	xim_styles = NULL;
1387	if (XGetIMValues (xim, XNQueryInputStyle, &xim_styles, NULL)	1323	if (XGetIMValues (xim, XNQueryInputStyle, &xim_styles, NULL)
1388	\|\| !xim_styles \|\| !xim_styles->count_styles)	1324	\|\| !xim_styles \|\| !xim_styles->count_styles)
1389	{	1325	{
1390	display->put_xim (input_method);	1326	im_destroy ();
1391	return false;	1327	return false;
1392	}	1328	}
1393		1329
1394	p = rs[Rs_preeditType] ? rs[Rs_preeditType] : "OverTheSpot,OffTheSpot,Root";	1330	p = rs[Rs_preeditType] ? rs[Rs_preeditType] : "OverTheSpot,OffTheSpot,Root";
1395	s = rxvt_splitcommastring (p);	1331	s = rxvt_splitcommastring (p);
		1332
1396	for (i = found = 0; !found && s[i]; i++)	1333	for (i = found = 0; !found && s[i]; i++)
1397	{	1334	{
1398	if (!STRCMP (s[i], "OverTheSpot"))	1335	if (!strcmp (s[i], "OverTheSpot"))
1399	input_style = (XIMPreeditPosition \| XIMStatusNothing);	1336	input_style = (XIMPreeditPosition \| XIMStatusNothing);
1400	else if (!STRCMP (s[i], "OffTheSpot"))	1337	else if (!strcmp (s[i], "OffTheSpot"))
1401	input_style = (XIMPreeditArea \| XIMStatusArea);	1338	input_style = (XIMPreeditArea \| XIMStatusArea);
1402	else if (!STRCMP (s[i], "Root"))	1339	else if (!strcmp (s[i], "Root"))
1403	input_style = (XIMPreeditNothing \| XIMStatusNothing);	1340	input_style = (XIMPreeditNothing \| XIMStatusNothing);
1404		1341
1405	for (j = 0; j < xim_styles->count_styles; j++)	1342	for (j = 0; j < xim_styles->count_styles; j++)
1406	if (input_style == xim_styles->supported_styles[j])	1343	if (input_style == xim_styles->supported_styles[j])
1407	{	1344	{
…		…
1416	free (s);	1353	free (s);
1417	XFree (xim_styles);	1354	XFree (xim_styles);
1418		1355
1419	if (!found)	1356	if (!found)
1420	{	1357	{
1421	display->put_xim (input_method);	1358	im_destroy ();
1422	return false;	1359	return false;
1423	}	1360	}
1424		1361
1425	preedit_attr = status_attr = NULL;	1362	XFontSet fs = 0;
		1363	XVaNestedList preedit_attr = 0, status_attr = 0;
		1364
		1365	if (input_style & (XIMPreeditPosition \| XIMPreeditArea))
		1366	{
		1367	// fake us a font-set, please
		1368	char **missing_charset_list;
		1369	int missing_charset_count;
		1370	char *def_string;
		1371	char pat[512];
		1372
		1373	sprintf (pat,
		1374	"----R---%d------*,"
		1375	"----R---%d------*,"
		1376	"----R---%d------*,"
		1377	"----R---%d------*,"
		1378	"----R---%d------*,"
		1379	"*",
		1380	TermWin.fheight,
		1381	TermWin.fheight + 1, TermWin.fheight - 1,
		1382	TermWin.fheight - 2, TermWin.fheight + 2);
		1383
		1384	fs = XCreateFontSet (display->display, pat,
		1385	&missing_charset_list, &missing_charset_count, &def_string);
		1386
		1387	if (missing_charset_list)
		1388	XFreeStringList (missing_charset_list);
		1389
		1390	if (!fs)
		1391	{
		1392	input_style &= ~(XIMPreeditPosition \| XIMPreeditArea);
		1393	rxvt_warn ("unable to create fontset for input method, try \"-pt Root\". Continuing.\n");
		1394	}
		1395	}
1426		1396
1427	if (input_style & XIMPreeditPosition)	1397	if (input_style & XIMPreeditPosition)
1428	{	1398	{
1429	im_set_size (&rect);	1399	im_set_size (rect);
1430	im_set_position (&spot);	1400	im_set_position (spot);
1431	im_set_color (&fg, &bg);	1401	im_set_color (fg, bg);
1432		1402
1433	preedit_attr = XVaCreateNestedList (0, XNArea, &rect,	1403	preedit_attr = XVaCreateNestedList (0,
		1404	XNForeground, fg,
		1405	XNBackground, bg,
		1406	XNArea, &rect,
1434	XNSpotLocation, &spot,	1407	XNSpotLocation, &spot,
1435	XNForeground, fg, XNBackground, bg,
1436	//XNFontSet, TermWin.fontset,	1408	XNFontSet, fs,
1437	NULL);	1409	NULL);
1438	}	1410	}
1439	else if (input_style & XIMPreeditArea)	1411	else if (input_style & XIMPreeditArea)
1440	{	1412	{
1441	im_set_color (&fg, &bg);	1413	im_set_color (fg, bg);
1442		1414
1443	/*	1415	/*
1444	* The necessary width of preedit area is unknown	1416	* The necessary width of preedit area is unknown
1445	* until create input context.	1417	* until create input context.
1446	*/	1418	*/
1447	needed_rect.width = 0;	1419	needed_rect.width = 0;
1448
1449	im_set_preedit_area (&rect, &status_rect, &needed_rect);	1420	im_set_preedit_area (rect, status_rect, needed_rect);
1450		1421
1451	preedit_attr = XVaCreateNestedList (0, XNArea, &rect,	1422	preedit_attr = XVaCreateNestedList (0,
		1423	XNForeground, fg,
1452	XNForeground, fg, XNBackground, bg,	1424	XNBackground, bg,
		1425	XNArea, &rect,
		1426	XNFontSet, fs,
		1427	NULL);
		1428	status_attr = XVaCreateNestedList (0,
		1429	XNForeground, fg,
		1430	XNBackground, bg,
		1431	XNArea, &status_rect,
1453	//XNFontSet, TermWin.fontset,	1432	XNFontSet, fs,
1454	NULL);	1433	NULL);
1455	status_attr = XVaCreateNestedList (0, XNArea, &status_rect,
1456	XNForeground, fg, XNBackground, bg,
1457	//XNFontSet, TermWin.fontset,
1458	NULL);
1459	}	1434	}
1460		1435
1461	Input_Context = XCreateIC (xim, XNInputStyle, input_style,	1436	Input_Context = XCreateIC (xim,
		1437	XNInputStyle, input_style,
1462	XNClientWindow, TermWin.parent[0],	1438	XNClientWindow, TermWin.vt,
1463	XNFocusWindow, TermWin.parent[0],	1439	XNFocusWindow, TermWin.parent[0],
1464	preedit_attr ? XNPreeditAttributes : NULL,	1440	preedit_attr ? XNPreeditAttributes : NULL,
1465	preedit_attr,	1441	preedit_attr,
1466	status_attr ? XNStatusAttributes : NULL,	1442	status_attr ? XNStatusAttributes : NULL,
1467	status_attr, NULL);	1443	status_attr, NULL);
		1444
1468	if (preedit_attr) XFree (preedit_attr);	1445	if (preedit_attr) XFree (preedit_attr);
1469	if (status_attr) XFree (status_attr);	1446	if (status_attr) XFree (status_attr);
		1447	if (fs) XFreeFontSet (display->display, fs);
1470		1448
1471	if (Input_Context == NULL)	1449	if (Input_Context == NULL)
1472	{	1450	{
1473	rxvt_warn ("failed to create input context, continuing without XIM.\n");	1451	rxvt_warn ("failed to create input context, continuing without XIM.\n");
1474	display->put_xim (input_method);	1452	im_destroy ();
1475	return false;	1453	return false;
1476	}	1454	}
1477		1455
1478	if (input_style & XIMPreeditArea)	1456	if (input_style & XIMPreeditArea)
1479	IMSetStatusPosition ();	1457	IMSetStatusPosition ();
…		…
1509	s = rxvt_splitcommastring (p);	1487	s = rxvt_splitcommastring (p);
1510	for (i = 0; s[i]; i++)	1488	for (i = 0; s[i]; i++)
1511	{	1489	{
1512	if (*s[i])	1490	if (*s[i])
1513	{	1491	{
1514	STRCPY (buf, "@im=");	1492	strcpy (buf, "@im=");
1515	STRNCAT (buf, s[i], IMBUFSIZ - 5);	1493	strncat (buf, s[i], IMBUFSIZ - 5);
1516	if (IM_get_IC (buf))	1494	if (IM_get_IC (buf))
1517	{	1495	{
1518	found = true;	1496	found = true;
1519	break;	1497	break;
1520	}	1498	}
…		…
1544	}	1522	}
1545		1523
1546	void	1524	void
1547	rxvt_term::IMSetStatusPosition ()	1525	rxvt_term::IMSetStatusPosition ()
1548	{	1526	{
1549	XRectangle preedit_rect, status_rect, *needed_rect;	1527	XRectangle preedit_rect, status_rect, *needed_rect;
1550	XVaNestedList preedit_attr, status_attr;	1528	XVaNestedList preedit_attr, status_attr;
1551		1529
1552	if (Input_Context == NULL	1530	if (!Input_Context
		1531	\|\| !TermWin.focus
1553	\|\| !TermWin.focus \|\| ! (input_style & XIMPreeditArea)	1532	\|\| !(input_style & XIMPreeditArea)
1554	\|\| !IMisRunning ())	1533	\|\| !IMisRunning ())
1555	return;	1534	return;
1556		1535
1557	/* Getting the necessary width of preedit area */	1536	/* Getting the necessary width of preedit area */
1558	status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL);	1537	status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL);
1559	XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL);	1538	XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL);
1560	XFree (status_attr);	1539	XFree (status_attr);
1561		1540
1562	im_set_preedit_area (&preedit_rect, &status_rect, needed_rect);	1541	im_set_preedit_area (preedit_rect, status_rect, *needed_rect);
		1542	XFree (needed_rect);
1563		1543
1564	preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);	1544	preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1565	status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL);	1545	status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL);
1566		1546
1567	XSetICValues (Input_Context,	1547	XSetICValues (Input_Context,
1568	XNPreeditAttributes, preedit_attr,	1548	XNPreeditAttributes, preedit_attr,
1569	XNStatusAttributes, status_attr, NULL);	1549	XNStatusAttributes, status_attr, NULL);
1570		1550
1571	XFree (preedit_attr);	1551	XFree (preedit_attr);
1572	XFree (status_attr);	1552	XFree (status_attr);
1573	}	1553	}
1574	#endif /* USE_XIM */	1554	#endif /* USE_XIM */

Diff Legend

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

Comparing rxvt-unicode/src/main.C (file contents): Revision 1.77 by root, Tue Aug 10 20:39:19 2004 UTC vs. Revision 1.94 by root, Sun Aug 15 22:09:24 2004 UTC

Diff Legend

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.77 by root, Tue Aug 10 20:39:19 2004 UTC vs.
Revision 1.94 by root, Sun Aug 15 22:09:24 2004 UTC