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

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.229 by root, Fri Aug 18 23:03:31 2006 UTC vs.
Revision 1.308 by ayin, Tue Feb 19 13:01:32 2008 UTC

…		…
11	* Copyright (c) 1997 mj olesen <olesen@me.QueensU.CA>	11	* Copyright (c) 1997 mj olesen <olesen@me.QueensU.CA>
12	* - extensive modifications	12	* - extensive modifications
13	* Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de>	13	* Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de>
14	* Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>	14	* Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>
15	* - extensive modifications	15	* - extensive modifications
16	* Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com>	16	* Copyright (c) 2003-2008 Marc Lehmann <pcg@goof.com>
17	*	17	*
18	* This program is free software; you can redistribute it and/or modify	18	* This program is free software; you can redistribute it and/or modify
19	* it under the terms of the GNU General Public License as published by	19	* it under the terms of the GNU General Public License as published by
20	* the Free Software Foundation; either version 2 of the License, or	20	* the Free Software Foundation; either version 2 of the License, or
21	* (at your option) any later version.	21	* (at your option) any later version.
…		…
38	#include <limits>	38	#include <limits>
39		39
40	#include <csignal>	40	#include <csignal>
41	#include <cstring>	41	#include <cstring>
42		42
43	#ifdef TTY_GID_SUPPORT
44	# include <grp.h>
45	#endif
46
47	#ifdef HAVE_TERMIOS_H
48	# include <termios.h>	43	#include <termios.h>
		44
		45	#ifdef HAVE_XSETLOCALE
		46	# define X_LOCALE
		47	# include <X11/Xlocale.h>
		48	#else
		49	# ifdef HAVE_SETLOCALE
		50	# include <clocale>
		51	# endif
49	#endif	52	#endif
50		53
51	vector<rxvt_term *> rxvt_term::termlist;	54	vector<rxvt_term *> rxvt_term::termlist;
52		55
53	// used to tell global functions which terminal instance is "active"	56	// used to tell global functions which terminal instance is "active"
…		…
88	class rxvt_composite_vec rxvt_composite;	91	class rxvt_composite_vec rxvt_composite;
89		92
90	text_t rxvt_composite_vec::compose (unicode_t c1, unicode_t c2)	93	text_t rxvt_composite_vec::compose (unicode_t c1, unicode_t c2)
91	{	94	{
92	compose_char *cc;	95	compose_char *cc;
93		96
94	// break compose chains, as stupid readline really likes to duplicate	97	// break compose chains, as stupid readline really likes to duplicate
95	// composing characters for some reason near the end of a line.	98	// composing characters for some reason near the end of a line.
96	cc = (*this)[c1];	99	cc = (*this)[c1];
97	while (cc)	100	while (cc)
98	{	101	{
…		…
147		150
148	}	151	}
149	#endif	152	#endif
150		153
151	rxvt_term::rxvt_term ()	154	rxvt_term::rxvt_term ()
152	:	155	{
153	#if TRANSPARENT \|\| ENABLE_PERL	156	#if HAVE_BG_PIXMAP
154	rootwin_ev (this, &rxvt_term::rootwin_cb),	157	update_background_ev.set<rxvt_term, &rxvt_term::update_background_cb> (this);
155	#endif
156	#ifdef HAVE_SCROLLBARS
157	scrollbar_ev (this, &rxvt_term::x_cb),
158	#endif	158	#endif
159	#ifdef CURSOR_BLINK	159	#ifdef CURSOR_BLINK
160	cursor_blink_ev (this, &rxvt_term::cursor_blink_cb),	160	cursor_blink_ev.set <rxvt_term, &rxvt_term::cursor_blink_cb> (this); cursor_blink_ev.set (0., CURSOR_BLINK_INTERVAL);
161	#endif	161	#endif
162	#ifdef TEXT_BLINK	162	#ifdef TEXT_BLINK
163	text_blink_ev (this, &rxvt_term::text_blink_cb),	163	text_blink_ev.set <rxvt_term, &rxvt_term::text_blink_cb> (this); text_blink_ev.set (0., TEXT_BLINK_INTERVAL);
164	#endif	164	#endif
165	#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING	165	#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
166	cont_scroll_ev (this, &rxvt_term::cont_scroll_cb),	166	cont_scroll_ev.set <rxvt_term, &rxvt_term::cont_scroll_cb> (this);
167	#endif	167	#endif
168	#ifdef SELECTION_SCROLLING	168	#ifdef SELECTION_SCROLLING
169	sel_scroll_ev (this, &rxvt_term::sel_scroll_cb),	169	sel_scroll_ev.set <rxvt_term, &rxvt_term::sel_scroll_cb> (this);
170	#endif	170	#endif
171	#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)	171	#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
172	slip_wheel_ev (this, &rxvt_term::slip_wheel_cb),	172	slip_wheel_ev.set <rxvt_term, &rxvt_term::slip_wheel_cb> (this);
		173	#endif
		174	#if ENABLE_TRANSPARENCY \|\| ENABLE_PERL
		175	rootwin_ev.set <rxvt_term, &rxvt_term::rootwin_cb> (this),
		176	#endif
		177	scrollbar_ev.set <rxvt_term, &rxvt_term::x_cb> (this),
		178	#ifdef USE_XIM
		179	im_ev.set <rxvt_term, &rxvt_term::im_cb> (this),
173	#endif	180	#endif
174	#ifdef POINTER_BLANK	181	#ifdef POINTER_BLANK
175	pointer_ev (this, &rxvt_term::pointer_cb),	182	pointer_ev.set <rxvt_term, &rxvt_term::pointer_cb> (this);
176	#endif	183	#endif
177	#ifdef USE_XIM
178	im_ev (this, &rxvt_term::im_cb),
179	#endif
180	#ifndef NO_BELL	184	#ifndef NO_BELL
181	bell_ev (this, &rxvt_term::bell_cb),	185	bell_ev.set <rxvt_term, &rxvt_term::bell_cb> (this);
182	#endif	186	#endif
183	termwin_ev (this, &rxvt_term::x_cb),	187	child_ev.set <rxvt_term, &rxvt_term::child_cb> (this);
184	vt_ev (this, &rxvt_term::x_cb),	188	flush_ev.set <rxvt_term, &rxvt_term::flush_cb> (this);
185	child_ev (this, &rxvt_term::child_cb),	189	destroy_ev.set <rxvt_term, &rxvt_term::destroy_cb> (this);
186	check_ev (this, &rxvt_term::check_cb),	190	pty_ev.set <rxvt_term, &rxvt_term::pty_cb> (this);
187	flush_ev (this, &rxvt_term::flush_cb),	191	incr_ev.set <rxvt_term, &rxvt_term::incr_cb> (this);
188	destroy_ev (this, &rxvt_term::destroy_cb),	192	termwin_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
189	pty_ev (this, &rxvt_term::pty_cb),	193	vt_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
190	incr_ev (this, &rxvt_term::incr_cb)	194
191	{
192	cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;	195	cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;
193		196
194	termlist.push_back (this);	197	termlist.push_back (this);
195		198
196	#ifdef KEYSYM_RESOURCE	199	#ifdef KEYSYM_RESOURCE
…		…
198	#endif	201	#endif
199	}	202	}
200		203
201	// clean up the most important stuff, do not call x or free mem etc.	204	// clean up the most important stuff, do not call x or free mem etc.
202	// for use before an emergency exit	205	// for use before an emergency exit
		206	void
203	void rxvt_term::emergency_cleanup ()	207	rxvt_term::emergency_cleanup ()
204	{	208	{
205	if (cmd_pid)	209	if (cmd_pid)
206	kill (-cmd_pid, SIGHUP);	210	kill (-cmd_pid, SIGHUP);
207		211
208	pty_ev.stop ();	212	pty_ev.stop ();
…		…
220	if (fontset[i] != fontset[0])	224	if (fontset[i] != fontset[0])
221	delete fontset[i];	225	delete fontset[i];
222	#endif	226	#endif
223	delete fontset[0];	227	delete fontset[0];
224		228
		229	#ifdef HAVE_BG_PIXMAP
		230	bgPixmap.destroy ();
		231	#endif
		232
225	if (display)	233	if (display)
226	{	234	{
227	selection_clear ();	235	selection_clear ();
228		236
229	#ifdef USE_XIM	237	#ifdef USE_XIM
230	im_destroy ();	238	im_destroy ();
231	#endif	239	#endif
232	#ifdef XTERM_SCROLLBAR	240	scrollBar.destroy ();
233	if (xscrollbarGC) XFreeGC (dpy, xscrollbarGC);
234	if (ShadowGC) XFreeGC (dpy, ShadowGC);
235	#endif
236	#ifdef PLAIN_SCROLLBAR
237	if (pscrollbarGC) XFreeGC (dpy, pscrollbarGC);
238	#endif
239	#ifdef NEXT_SCROLLBAR
240	if (blackGC) XFreeGC (dpy, blackGC);
241	if (whiteGC) XFreeGC (dpy, whiteGC);
242	if (grayGC) XFreeGC (dpy, grayGC);
243	if (darkGC) XFreeGC (dpy, darkGC);
244	if (stippleGC) XFreeGC (dpy, stippleGC);
245	if (dimple) XFreePixmap (dpy, dimple);
246	if (upArrow) XFreePixmap (dpy, upArrow);
247	if (downArrow) XFreePixmap (dpy, downArrow);
248	if (upArrowHi) XFreePixmap (dpy, upArrowHi);
249	if (downArrowHi) XFreePixmap (dpy, downArrowHi);
250	#endif
251	#ifdef RXVT_SCROLLBAR
252	if (topShadowGC) XFreeGC (dpy, topShadowGC);
253	if (botShadowGC) XFreeGC (dpy, botShadowGC);
254	if (scrollbarGC) XFreeGC (dpy, scrollbarGC);
255	#endif
256	if (gc) XFreeGC (dpy, gc);	241	if (gc) XFreeGC (dpy, gc);
257		242
258	delete drawable;	243	delete drawable;
259	// destroy all windows	244	// destroy all windows
260	if (parent[0])	245	if (parent[0])
…		…
268	pix_colors_unfocused [i].free (this);	253	pix_colors_unfocused [i].free (this);
269	#endif	254	#endif
270	}	255	}
271		256
272	clear ();	257	clear ();
273	}
274		258
275	delete [] pix_colors_focused;	259	display->flush (); /* ideally .put should do this */
276	#if OFF_FOCUS_FADING
277	delete [] pix_colors_unfocused;
278	#endif
279
280	displays.put (display);	260	displays.put (display);
		261	}
281		262
282	scr_release ();	263	scr_release ();
283		264
284	/* clear all resources */	265	/* clear all resources */
285	for (int i = 0; i < allocated.size (); i++)	266	for (int i = 0; i < allocated.size (); i++)
…		…
297	delete argv;	278	delete argv;
298		279
299	#ifdef KEYSYM_RESOURCE	280	#ifdef KEYSYM_RESOURCE
300	delete keyboard;	281	delete keyboard;
301	#endif	282	#endif
		283	#ifndef NO_RESOURCES
		284	XrmDestroyDatabase (option_db);
		285	#endif
302	}	286	}
303		287
304	// child has exited, usually destroys	288	// child has exited, usually destroys
305	void	289	void
306	rxvt_term::child_cb (child_watcher &w, int status)	290	rxvt_term::child_cb (ev::child &w, int status)
307	{	291	{
308	HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END));	292	HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END));
309		293
310	cmd_pid = 0;	294	cmd_pid = 0;
311		295
312	if (!OPTION (Opt_hold))	296	if (!option (Opt_hold))
313	destroy ();	297	destroy ();
314	}	298	}
315		299
316	void	300	void
317	rxvt_term::destroy ()	301	rxvt_term::destroy ()
318	{	302	{
319	if (destroy_ev.active)	303	if (destroy_ev.is_active ())
320	return;	304	return;
321		305
322	HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));	306	HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
323		307
324	#if ENABLE_OVERLAY	308	#if ENABLE_OVERLAY
…		…
328	if (display)	312	if (display)
329	{	313	{
330	#if USE_XIM	314	#if USE_XIM
331	im_ev.stop (display);	315	im_ev.stop (display);
332	#endif	316	#endif
333	#if HAVE_SCROLLBARS
334	scrollbar_ev.stop (display);	317	scrollbar_ev.stop (display);
335	#endif
336	#if TRANSPARENT \|\| ENABLE_PERL	318	#if ENABLE_TRANSPARENCY \|\| ENABLE_PERL
337	rootwin_ev.stop (display);	319	rootwin_ev.stop (display);
338	#endif	320	#endif
339	incr_ev.stop ();	321	incr_ev.stop ();
340	termwin_ev.stop (display);	322	termwin_ev.stop (display);
341	vt_ev.stop (display);	323	vt_ev.stop (display);
342	}	324	}
343		325
344	check_ev.stop ();	326	flush_ev.stop ();
345	pty_ev.stop ();	327	pty_ev.stop ();
346	#ifdef CURSOR_BLINK	328	#ifdef CURSOR_BLINK
347	cursor_blink_ev.stop ();	329	cursor_blink_ev.stop ();
348	#endif	330	#endif
349	#ifdef TEXT_BLINK	331	#ifdef TEXT_BLINK
…		…
357	#endif	339	#endif
358	#ifdef POINTER_BLANK	340	#ifdef POINTER_BLANK
359	pointer_ev.stop ();	341	pointer_ev.stop ();
360	#endif	342	#endif
361		343
362	destroy_ev.start (0);	344	destroy_ev.start ();
363	}	345	}
364		346
365	void	347	void
366	rxvt_term::destroy_cb (time_watcher &w)	348	rxvt_term::destroy_cb (ev::idle &w, int revents)
367	{	349	{
368	make_current ();	350	make_current ();
369		351
370	delete this;	352	delete this;
371	}	353	}
…		…
425	else	407	else
426	XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x",	408	XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x",
427	mesg, BUFSIZ);	409	mesg, BUFSIZ);
428	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);	410	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);
429	}	411	}
430	XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",	412	XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",
431	mesg, BUFSIZ);	413	mesg, BUFSIZ);
432	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);	414	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);
433	}	415	}
434	#endif	416	#endif
435		417
…		…
459	DisplayString (display));	441	DisplayString (display));
460	rxvt_emergency_cleanup ();	442	rxvt_emergency_cleanup ();
461	_exit (EXIT_FAILURE);	443	_exit (EXIT_FAILURE);
462	}	444	}
463		445
464	/----------------------------------------------------------------------/
465	bool
466	rxvt_term::init (int argc, const char const argv, stringvec *envv)
467	{
468	this->envv = envv;
469
470	SET_R (this);
471	set_locale ("");
472	set_environ (envv); // few things in X do not call setlocale :(
473
474	if (!init_vars ())
475	return false;
476
477	init_secondary ();
478
479	const char **cmd_argv = init_resources (argc, argv);
480
481	#ifdef KEYSYM_RESOURCE
482	keyboard->register_done ();
483	#endif
484
485	#ifdef HAVE_SCROLLBARS
486	if (OPTION (Opt_scrollBar))
487	scrollBar.setIdle (); /* set existence for size calculations */
488	#endif
489
490	pty = ptytty::create ();
491
492	create_windows (argc, argv);
493
494	init_xlocale ();
495
496	scr_reset (); // initialize screen
497
498	#if 0
499	XSynchronize (dpy, True);
500	#endif
501
502	#ifdef HAVE_SCROLLBARS
503	if (OPTION (Opt_scrollBar))
504	resize_scrollbar (); /* create and map scrollbar */
505	#endif
506	#ifdef TRANSPARENT
507	if (OPTION (Opt_transparent))
508	{
509	XSelectInput (dpy, display->root, PropertyChangeMask);
510	check_our_parents ();
511	rootwin_ev.start (display, display->root);
512	}
513	#endif
514	#if ENABLE_PERL
515	rootwin_ev.start (display, display->root);
516	#endif
517
518	set_colorfgbg ();
519
520	init_command (cmd_argv);
521
522	free (cmd_argv);
523
524	if (pty->pty >= 0)
525	pty_ev.start (pty->pty, EVENT_READ);
526
527	check_ev.start ();
528
529	HOOK_INVOKE ((this, HOOK_START, DT_END));
530
531	#if ENABLE_XEMBED
532	if (rs[Rs_embed])
533	{
534	long info[2] = { 0, XEMBED_MAPPED };
535
536	XChangeProperty (dpy, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
537	32, PropModeReplace, (unsigned char *)&info, 2);
538	}
539	#endif
540
541	XMapWindow (dpy, vt);
542	XMapWindow (dpy, parent[0]);
543
544	return true;
545	}
546
547	static struct sig_handlers	446	static struct sig_handlers
548	{	447	{
549	sig_watcher sw_term, sw_int;	448	ev::sig sw_term, sw_int;
550		449
551	/*	450	/*
552	* Catch a fatal signal and tidy up before quitting	451	* Catch a fatal signal and tidy up before quitting
553	*/	452	*/
554	void	453	void sig_term (ev::sig &w, int revents);
555	sig_term (sig_watcher &w)	454
		455	sig_handlers ()
556	{	456	{
557	rxvt_emergency_cleanup ();	457	sw_term.set<sig_handlers, &sig_handlers::sig_term> (this);
558	signal (w.signum, SIG_DFL);
559	kill (getpid (), w.signum);
560	}
561
562	sig_handlers ()
563	: sw_term (this, &sig_handlers::sig_term),
564	sw_int (this, &sig_handlers::sig_term)	458	sw_int .set<sig_handlers, &sig_handlers::sig_term> (this);
565	{
566	}	459	}
567	} sig_handlers;	460	} sig_handlers;
568		461
		462	void
		463	sig_handlers::sig_term (ev::sig &w, int revents)
		464	{
		465	rxvt_emergency_cleanup ();
		466	w.stop ();
		467	kill (getpid (), w.signum);
		468	}
		469
569	char **rxvt_environ; // startup environment	470	char **rxvt_environ; // startup environment
570		471
571	void	472	void
572	rxvt_init ()	473	rxvt_init ()
573	{	474	{
574	ptytty::init ();	475	ptytty::init ();
		476
		477	if (!ev_default_loop (0))
		478	rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n");
575		479
576	rxvt_environ = environ;	480	rxvt_environ = environ;
577		481
578	signal (SIGHUP, SIG_IGN);	482	signal (SIGHUP, SIG_IGN);
579	signal (SIGPIPE, SIG_IGN);	483	signal (SIGPIPE, SIG_IGN);
580		484
581	sig_handlers.sw_term.start (SIGTERM);	485	sig_handlers.sw_term.start (SIGTERM); ev_unref ();
582	sig_handlers.sw_int.start (SIGINT);	486	sig_handlers.sw_int.start (SIGINT); ev_unref ();
583		487
584	/* need to trap SIGURG for SVR4 (Unixware) rlogin */	488	/* need to trap SIGURG for SVR4 (Unixware) rlogin */
585	/* signal (SIGURG, SIG_DFL); */	489	/* signal (SIGURG, SIG_DFL); */
586		490
587	old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);	491	old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
…		…
589	XSetIOErrorHandler (rxvt_xioerror_handler);	493	XSetIOErrorHandler (rxvt_xioerror_handler);
590		494
591	XrmInitialize ();	495	XrmInitialize ();
592	}	496	}
593		497
594	/* ------------------------------------------------------------------------- *
595	* MEMORY ALLOCATION WRAPPERS *
596	* ------------------------------------------------------------------------- */
597	void *
598	rxvt_malloc (size_t size)
599	{
600	void *p = malloc (size);
601
602	if (!p)
603	rxvt_fatal ("memory allocation failure. aborting.\n");
604
605	return p;
606	}
607
608	void *
609	rxvt_calloc (size_t number, size_t size)
610	{
611	void *p = calloc (number, size);
612
613	if (!p)
614	rxvt_fatal ("memory allocation failure. aborting.\n");
615
616	return p;
617	}
618
619	void *
620	rxvt_realloc (void *ptr, size_t size)
621	{
622	void *p = realloc (ptr, size);
623
624	if (!p)
625	rxvt_fatal ("memory allocation failure. aborting.\n");
626
627	return p;
628	}
629
630	/----------------------------------------------------------------------/	498	/----------------------------------------------------------------------/
631	/*	499	/*
632	* window size/position calculcations for XSizeHint and other storage.	500	* window size/position calculations for XSizeHint and other storage.
633	* if width/height are non-zero then override calculated width/height	501	* if width/height are non-zero then override calculated width/height
634	*/	502	*/
635	void	503	void
636	rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)	504	rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
637	{	505	{
638	short recalc_x, recalc_y;	506	short recalc_x, recalc_y;
639	int x, y, sb_w, flags;	507	int x, y, flags;
640	unsigned int w, h;	508	unsigned int w, h;
641	unsigned int max_width, max_height;	509	unsigned int max_width, max_height;
642		510
643	szHint.flags = PMinSize \| PResizeInc \| PBaseSize \| PWinGravity;	511	szHint.flags = PMinSize \| PResizeInc \| PBaseSize \| PWinGravity;
644	szHint.win_gravity = NorthWestGravity;	512	szHint.win_gravity = NorthWestGravity;
…		…
701	max_width = MAX_COLS * fwidth;	569	max_width = MAX_COLS * fwidth;
702	max_height = MAX_ROWS * fheight;	570	max_height = MAX_ROWS * fheight;
703		571
704	szHint.base_width = szHint.base_height = 2 * int_bwidth;	572	szHint.base_width = szHint.base_height = 2 * int_bwidth;
705		573
706	sb_w = 0;
707	window_vt_x = window_vt_y = int_bwidth;	574	window_vt_x = window_vt_y = int_bwidth;
708		575
709	if (scrollBar.state)	576	if (scrollBar.state)
710	{	577	{
711	sb_w = scrollbar_TotalWidth ();	578	int sb_w = scrollBar.total_width ();
712	szHint.base_width += sb_w;	579	szHint.base_width += sb_w;
713		580
714	if (!OPTION (Opt_scrollBar_right))	581	if (!option (Opt_scrollBar_right))
715	window_vt_x += sb_w;	582	window_vt_x += sb_w;
716	}	583	}
717		584
718	szHint.width_inc = fwidth;	585	szHint.width_inc = fwidth;
719	szHint.height_inc = fheight;	586	szHint.height_inc = fheight;
…		…
739	else	606	else
740	{	607	{
741	min_it (height, max_height);	608	min_it (height, max_height);
742	szHint.height = szHint.base_height + height;	609	szHint.height = szHint.base_height + height;
743	}	610	}
744
745	if (scrollBar.state && OPTION (Opt_scrollBar_right))
746	window_sb_x = szHint.width - sb_w;
747		611
748	if (recalc_x)	612	if (recalc_x)
749	szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;	613	szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;
750		614
751	if (recalc_y)	615	if (recalc_y)
…		…
773	ws.ws_xpixel = width;	637	ws.ws_xpixel = width;
774	ws.ws_ypixel = height;	638	ws.ws_ypixel = height;
775	(void)ioctl (pty->pty, TIOCSWINSZ, &ws);	639	(void)ioctl (pty->pty, TIOCSWINSZ, &ws);
776		640
777	#if 0	641	#if 0
778	// TIOCSWINSZ⎈ is supposed to do this automatically and correctly	642	// TIOCSWINSZ is supposed to do this automatically and correctly
779	if (cmd_pid) /* force through to the command */	643	if (cmd_pid) /* force through to the command */
780	kill (-cmd_pid, SIGWINCH);	644	kill (-cmd_pid, SIGWINCH);
781	#endif	645	#endif
782	}	646	}
783		647
…		…
812	delete fontset[0];	676	delete fontset[0];
813	fontset[0] = fs;	677	fontset[0] = fs;
814		678
815	prop = (*fs)[1]->properties ();	679	prop = (*fs)[1]->properties ();
816	prop.height += lineSpace;	680	prop.height += lineSpace;
		681
817	fs->set_prop (prop);	682	fs->set_prop (prop, false);
818		683
819	fwidth = prop.width;	684	fwidth = prop.width;
820	fheight = prop.height;	685	fheight = prop.height;
821	fbase = prop.ascent;	686	fbase = prop.ascent;
822		687
…		…
831	{	696	{
832	fontset[style] = fs = new rxvt_fontset (this);	697	fontset[style] = fs = new rxvt_fontset (this);
833	rxvt_fontprop prop2 = prop;	698	rxvt_fontprop prop2 = prop;
834		699
835	if (res)	700	if (res)
836	prop2.weight = prop2.slant = rxvt_fontprop::unset;	701	{
		702	fs->populate (res);
		703	fs->set_prop (prop2, false);
		704	}
837	else	705	else
838	{	706	{
839	res = fontset[0]->fontdesc;	707	fs->populate (fontset[0]->fontdesc);
840		708
841	if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold;	709	if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold;
842	if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic;	710	if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic;
		711
		712	fs->set_prop (prop2, true);
843	}	713	}
844		714
845	fs->populate (res);
846	fs->set_prop (prop2);
847	}	715	}
848	#else	716	#else
849	fontset[style] = fontset[0];	717	fontset[style] = fontset[0];
850	#endif	718	#endif
851	}	719	}
…		…
853	if (parent[0])	721	if (parent[0])
854	{	722	{
855	resize_all_windows (0, 0, 0);	723	resize_all_windows (0, 0, 0);
856	scr_remap_chars ();	724	scr_remap_chars ();
857	scr_touch (true);	725	scr_touch (true);
858	}	726	}
859		727
860	return true;	728	return true;
861	}	729	}
862		730
		731	void
863	void rxvt_term::set_string_property (Atom prop, const char *str, int len)	732	rxvt_term::set_string_property (Atom prop, const char *str, int len)
864	{	733	{
865	XChangeProperty (dpy, parent[0],	734	XChangeProperty (dpy, parent[0],
866	prop, XA_STRING, 8, PropModeReplace,	735	prop, XA_STRING, 8, PropModeReplace,
867	(const unsigned char *)str, len >= 0 ? len : strlen (str));	736	(const unsigned char *)str, len >= 0 ? len : strlen (str));
868	}	737	}
869		738
		739	void
870	void rxvt_term::set_utf8_property (Atom prop, const char *str, int len)	740	rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
871	{	741	{
872	wchar_t *ws = rxvt_mbstowcs (str, len);	742	wchar_t *ws = rxvt_mbstowcs (str, len);
873	char *s = rxvt_wcstoutf8 (ws);	743	char *s = rxvt_wcstoutf8 (ws);
874		744
875	XChangeProperty (dpy, parent[0],	745	XChangeProperty (dpy, parent[0],
…		…
899	#if ENABLE_EWMH	769	#if ENABLE_EWMH
900	set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);	770	set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);
901	#endif	771	#endif
902	}	772	}
903		773
		774	void
		775	rxvt_term::set_window_color (int idx, const char *color)
		776	{
904	#ifdef XTERM_COLOR_CHANGE	777	#ifdef XTERM_COLOR_CHANGE
905	void
906	rxvt_term::set_window_color (int idx, const char *color)
907	{
908	rxvt_color xcol;	778	rxvt_color xcol;
909	int i;	779
910
911	if (color == NULL \|\| *color == '\0')	780	if (color == NULL \|\| *color == '\0')
912	return;	781	return;
913		782
914	color = strdup (color);	783	color = strdup (color);
915	allocated.push_back ((void *)color);	784	allocated.push_back ((void *)color);
916	rs[Rs_color + idx] = color;	785	rs[Rs_color + idx] = color;
917		786
918	/* handle color aliases */	787	/* handle color aliases */
919	if (isdigit (*color))	788	if (isdigit (*color))
920	{	789	{
921	i = atoi (color);	790	int i = atoi (color);
922		791
923	if (i >= 8 && i <= 15)	792	if (i >= 8 && i <= 15)
		793	{
924	{ /* bright colors */	794	/* bright colors */
925	i -= 8;
926	pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i];	795	pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i - 8];
927	goto done;	796	goto done;
928	}	797	}
929		798
930	if (i >= 0 && i <= 7)	799	if (i >= 0 && i <= 7)
		800	{
931	{ /* normal colors */	801	/* normal colors */
932	pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];	802	pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
933	goto done;	803	goto done;
934	}	804	}
935	}	805	}
936		806
…		…
941	* so just keep gobbling up the colormap	811	* so just keep gobbling up the colormap
942	*/	812	*/
943		813
944	pix_colors_focused[idx] = xcol;	814	pix_colors_focused[idx] = xcol;
945		815
946	/* XSetWindowAttributes attr; */
947	/* Cursor cursor; */
948	done:	816	done:
949	/TODO: handle Color_BD, scrollbar background, etc. /	817	/TODO: handle Color_BD, scrollbar background, etc. /
950		818
951	update_fade_color (idx);	819	update_fade_color (idx);
952	recolour_cursor ();	820	recolour_cursor ();
953	scr_recolour ();	821	scr_recolour ();
		822	#endif /* XTERM_COLOR_CHANGE */
954	}	823	}
955
956	#else
957	# define set_window_color (idx,color) ((void)0)
958	#endif /* XTERM_COLOR_CHANGE */
959		824
960	void	825	void
961	rxvt_term::recolour_cursor ()	826	rxvt_term::recolour_cursor ()
962	{	827	{
963	XColor fg, bg;	828	XColor fg, bg;
…		…
979	*/	844	*/
980	void	845	void
981	rxvt_term::set_colorfgbg ()	846	rxvt_term::set_colorfgbg ()
982	{	847	{
983	unsigned int i;	848	unsigned int i;
984	const char *xpmb = "\0";	849	const char *xpmb = "";
985	char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];	850	char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];
986		851
987	strcpy (fstr, "default");	852	strcpy (fstr, "default");
988	strcpy (bstr, "default");	853	strcpy (bstr, "default");
989	for (i = Color_Black; i <= Color_White; i++)	854	for (i = Color_Black; i <= Color_White; i++)
…		…
995		860
996	for (i = Color_Black; i <= Color_White; i++)	861	for (i = Color_Black; i <= Color_White; i++)
997	if (pix_colors[Color_bg] == pix_colors[i])	862	if (pix_colors[Color_bg] == pix_colors[i])
998	{	863	{
999	sprintf (bstr, "%d", (i - Color_Black));	864	sprintf (bstr, "%d", (i - Color_Black));
1000	#ifdef XPM_BACKGROUND	865	#ifdef BG_IMAGE_FROM_FILE
1001	xpmb = "default;";	866	xpmb = "default;";
1002	#endif	867	#endif
1003	break;	868	break;
1004	}	869	}
1005		870
…		…
1090	fix_screen = ncol != prev_ncol \|\| nrow != prev_nrow;	955	fix_screen = ncol != prev_ncol \|\| nrow != prev_nrow;
1091		956
1092	if (fix_screen \|\| newwidth != old_width \|\| newheight != old_height)	957	if (fix_screen \|\| newwidth != old_width \|\| newheight != old_height)
1093	{	958	{
1094	if (scrollBar.state)	959	if (scrollBar.state)
1095	{	960	scrollBar.resize ();
1096	XMoveResizeWindow (dpy, scrollBar.win,
1097	window_sb_x, 0,
1098	scrollbar_TotalWidth (), szHint.height);
1099	resize_scrollbar ();
1100	}
1101		961
1102	XMoveResizeWindow (dpy, vt,	962	XMoveResizeWindow (dpy, vt,
1103	window_vt_x, window_vt_y,	963	window_vt_x, window_vt_y,
1104	width, height);	964	width, height);
1105		965
		966	#ifdef HAVE_BG_PIXMAP
		967	if (bgPixmap.window_size_sensitive ())
		968	update_background ();
		969	#endif
		970
1106	scr_clear ();	971	scr_clear ();
1107	#ifdef XPM_BACKGROUND
1108	resize_pixmap ();
1109	#endif
1110	}	972	}
1111		973
1112	if (fix_screen \|\| old_height == 0)	974	if (fix_screen \|\| old_height == 0)
1113	scr_reset ();	975	scr_reset ();
1114		976
1115	// TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version	977	// TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version
1116	//scr_touch (false);	978	//scr_touch (false);
1117		979
1118	#ifdef XPM_BACKGROUND	980	#ifdef HAVE_BG_PIXMAP
1119	if (pixmap)	981	// TODO: this don't seem to have any effect - do we still need it ? If so - in which case exactly ?
		982	// if (bgPixmap.pixmap)
1120	scr_touch (false);	983	// scr_touch (false);
1121	#endif	984	#endif
1122		985
1123	#ifdef USE_XIM	986	#ifdef USE_XIM
1124	IMSetPosition ();	987	IMSetPosition ();
1125	#endif	988	#endif
…		…
1296	if (term->rs[Rs_imLocale])	1159	if (term->rs[Rs_imLocale])
1297	SET_LOCALE (term->locale);	1160	SET_LOCALE (term->locale);
1298	}	1161	}
1299	else	1162	else
1300	str = (void *)text->string.wide_char;	1163	str = (void *)text->string.wide_char;
1301		1164
1302	HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,	1165	HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1303	DT_INT, call_data->caret,	1166	DT_INT, call_data->caret,
1304	DT_INT, call_data->chg_first,	1167	DT_INT, call_data->chg_first,
1305	DT_INT, call_data->chg_length,	1168	DT_INT, call_data->chg_length,
1306	DT_LCS_LEN, (void *)text->feedback, text->feedback ? (int)text->length : 0,	1169	DT_LCS_LEN, (void *)text->feedback, text->feedback ? (int)text->length : 0,
…		…
1625		1488
1626	if (input_style & XIMPreeditPosition)	1489	if (input_style & XIMPreeditPosition)
1627	{	1490	{
1628	im_set_size (preedit_rect);	1491	im_set_size (preedit_rect);
1629	preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);	1492	preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1630		1493
1631	XSetICValues (Input_Context,	1494	XSetICValues (Input_Context,
1632	XNPreeditAttributes, preedit_attr, NULL);	1495	XNPreeditAttributes, preedit_attr, NULL);
1633	}	1496	}
1634	else	1497	else
1635	{	1498	{
…		…
1652	XFree (status_attr);	1515	XFree (status_attr);
1653	}	1516	}
1654		1517
1655	XFree (preedit_attr);	1518	XFree (preedit_attr);
1656	}	1519	}
1657	#endif /* USE_XIM */	1520	#endif /* USE_XIM */
		1521
		1522	void
		1523	rxvt_term::get_window_origin (int &x, int &y)
		1524	{
		1525	Window cr;
		1526	XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr);
		1527	/* fprintf (stderr, "origin is %+d%+d\n", x, y);*/
		1528	}
		1529
		1530	Pixmap
		1531	rxvt_term::get_pixmap_property (int prop_id)
		1532	{
		1533	if (prop_id > 0 && prop_id < NUM_XA)
		1534	if (xa[prop_id])
		1535	{
		1536	int aformat;
		1537	unsigned long nitems, bytes_after;
		1538	Atom atype;
		1539	unsigned char *prop = NULL;
		1540	int result = XGetWindowProperty (dpy, display->root, xa[prop_id],
		1541	0L, 1L, False, XA_PIXMAP, &atype, &aformat,
		1542	&nitems, &bytes_after, &prop);
		1543	if (result == Success && prop && atype == XA_PIXMAP)
		1544	return (Pixmap )prop;
		1545	}
		1546
		1547	return None;
		1548	}
		1549
		1550	#ifdef HAVE_BG_PIXMAP
		1551	# if TRACE_PIXMAPS
		1552	# undef update_background
		1553	void
		1554	rxvt_term::trace_update_background (const char *file, int line)
		1555	{
		1556	fprintf (stderr, "%s:%d:update_background()\n", file, line);
		1557	update_background ();
		1558	}
		1559	# endif
		1560
		1561	void
		1562	rxvt_term::update_background ()
		1563	{
		1564	if (update_background_ev.is_active ())
		1565	return;
		1566
		1567	bgPixmap.invalidate ();
		1568
		1569	ev_tstamp to_wait = 0.5 - (ev::now () - bgPixmap.valid_since);
		1570
		1571	if (to_wait <= 0.)
		1572	bgPixmap.render ();
		1573	else
		1574	update_background_ev.start (to_wait);
		1575	}
		1576
		1577	void
		1578	rxvt_term::update_background_cb (ev::timer &w, int revents)
		1579	{
		1580	make_current ();
		1581
		1582	update_background_ev.stop ();
		1583	bgPixmap.render ();
		1584	refresh_check ();
		1585	}
		1586
		1587	#endif /* HAVE_BG_PIXMAP */
1658		1588
1659	/----------------------- end-of-file (C source) -----------------------/	1589	/----------------------- end-of-file (C source) -----------------------/

Diff Legend

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

Comparing rxvt-unicode/src/main.C (file contents): Revision 1.229 by root, Fri Aug 18 23:03:31 2006 UTC vs. Revision 1.308 by ayin, Tue Feb 19 13:01:32 2008 UTC

Diff Legend

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.229 by root, Fri Aug 18 23:03:31 2006 UTC vs.
Revision 1.308 by ayin, Tue Feb 19 13:01:32 2008 UTC