ViewVC Help

View File | Revision Log | Show Annotations | Download File

/cvs/deliantra/Deliantra-Client/DC/UI.pm

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.203 by root, Sun May 14 21:13:11 2006 UTC vs.
Revision 1.235 by root, Thu May 25 16:35:42 2006 UTC

…		…
31	$TOOLTIP->set_tooltip_from ($widget);	31	$TOOLTIP->set_tooltip_from ($widget);
32	$TOOLTIP->show;	32	$TOOLTIP->show;
33		33
34	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);	34	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
35		35
36	if ($x + $TOOLTIP->{w} > $::WIDTH) {
37	($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0);	36	($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0)
38	}	37	if $x + $TOOLTIP->{w} > $::WIDTH;
39		38
40	$TOOLTIP->move ($x, $y);	39	$TOOLTIP->move ($x, $y);
41	$TOOLTIP->check_size;	40	$TOOLTIP->check_size;
42	$TOOLTIP->update;	41	$TOOLTIP->update;
43	}	42	}
…		…
51	delete $TOOLTIP->{owner};	50	delete $TOOLTIP->{owner};
52	}	51	}
53		52
54	# class methods for events	53	# class methods for events
55	sub feed_sdl_key_down_event {	54	sub feed_sdl_key_down_event {
56	$FOCUS->emit (key_down => $_[0]) || $FOCUS->key_down ($_[0])	55	$FOCUS->emit (key_down => $_[0])
57	if $FOCUS;	56	if $FOCUS;
58	}	57	}
59		58
60	sub feed_sdl_key_up_event {	59	sub feed_sdl_key_up_event {
61	$FOCUS->emit (key_up => $_[0]) || $FOCUS->key_up ($_[0])	60	$FOCUS->emit (key_up => $_[0])
62	if $FOCUS;	61	if $FOCUS;
63	}	62	}
64		63
65	sub feed_sdl_button_down_event {	64	sub feed_sdl_button_down_event {
66	my ($ev) = @_;	65	my ($ev) = @_;
…		…
75	check_tooltip;	74	check_tooltip;
76	}	75	}
77		76
78	$BUTTON_STATE |= 1 << ($ev->{button} - 1);	77	$BUTTON_STATE |= 1 << ($ev->{button} - 1);
79		78
80	if ($GRAB) {	79	$GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
81	($x, $y) = $GRAB->coord2local ($x, $y);	80	if $GRAB;
82	$GRAB->emit (button_down => $ev, $x, $y) || $GRAB->button_down ($ev, $x, $y);
83	}
84	}	81	}
85		82
86	sub feed_sdl_button_up_event {	83	sub feed_sdl_button_up_event {
87	my ($ev) = @_;	84	my ($ev) = @_;
88	my ($x, $y) = ($ev->{x}, $ev->{y});	85	my ($x, $y) = ($ev->{x}, $ev->{y});
89		86
90	my $widget = $GRAB || $ROOT->find_widget ($x, $y);	87	my $widget = $GRAB || $ROOT->find_widget ($x, $y);
91		88
92	$BUTTON_STATE &= ~(1 << ($ev->{button} - 1));	89	$BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
93		90
94	if ($GRAB) {	91	$GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y))
95	($x, $y) = $GRAB->coord2local ($x, $y);	92	if $GRAB;
96	$GRAB->emit (button_up => $ev, $x, $y) || $GRAB->button_up ($ev, $x, $y);
97	}
98		93
99	if (!$BUTTON_STATE) {	94	if (!$BUTTON_STATE) {
100	my $grab = $GRAB; undef $GRAB;	95	my $grab = $GRAB; undef $GRAB;
101	$grab->update if $grab;	96	$grab->update if $grab;
102	$GRAB->update if $GRAB;	97	$GRAB->update if $GRAB;
…		…
118	$HOVER->update if $HOVER && $HOVER->{can_hover};	113	$HOVER->update if $HOVER && $HOVER->{can_hover};
119		114
120	check_tooltip;	115	check_tooltip;
121	}	116	}
122		117
123	if ($HOVER) {
124	($x, $y) = $HOVER->coord2local ($x, $y);
125	$HOVER->emit (mouse_motion => $ev, $x, $y) || $HOVER->mouse_motion ($ev, $x, $y);	118	$HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
126	}	119	if $HOVER;
127	}	120	}
128		121
129	# convert position array to integers	122	# convert position array to integers
130	sub harmonize {	123	sub harmonize {
131	my ($vals) = @_;	124	my ($vals) = @_;
…		…
137	$rem += $_ - $i;	130	$rem += $_ - $i;
138	$_ = $i;	131	$_ = $i;
139	}	132	}
140	}	133	}
141		134
		135	sub full_refresh {
		136	# make a copy, otherwise for complains about freed values.
		137	my @widgets = values %WIDGET;
		138
		139	$_->update
		140	for @widgets;
		141	}
		142
		143	sub reconfigure_widgets {
		144	# make a copy, otherwise C<for> complains about freed values.
		145	my @widgets = values %WIDGET;
		146
		147	$_->reconfigure
		148	for @widgets;
		149	}
		150
142	# call when resolution changes etc.	151	# call when resolution changes etc.
143	sub rescale_widgets {	152	sub rescale_widgets {
144	my ($sx, $sy) = @_;	153	my ($sx, $sy) = @_;
145		154
146	for my $widget (values %WIDGET) {	155	for my $widget (values %WIDGET) {
147	if ($widget->{toplevel}) {	156	if ($widget->{is_toplevel}) {
148	$widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x};	157	$widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x};
149	$widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};	158	$widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
150	$widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w};	159	$widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w};
151	$widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w};	160	$widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w};
152	$widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y};	161	$widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y};
153	$widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};	162	$widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
154	$widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h};	163	$widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h};
155	$widget->{user_h} = int 0.5 + $widget->{user_h} * $sy if exists $widget->{user_h};	164	$widget->{user_h} = int 0.5 + $widget->{user_h} * $sy if exists $widget->{user_h};
156	}	165	}
157
158	$widget->reconfigure;
159	}	166	}
		167
		168	reconfigure_widgets;
160	}	169	}
161		170
162	#############################################################################	171	#############################################################################
163		172
164	package CFClient::UI::Base;	173	package CFClient::UI::Base;
…		…
196	%$self = ();	205	%$self = ();
197	}	206	}
198		207
199	sub show {	208	sub show {
200	my ($self) = @_;	209	my ($self) = @_;
201
202	return if $self->{parent};	210	return if $self->{parent};
203		211
204	$CFClient::UI::ROOT->add ($self);	212	$CFClient::UI::ROOT->add ($self);
205	}	213	}
206		214
207	sub hide {	215	sub show_centered {
208	my ($self) = @_;	216	my ($self) = @_;
		217	return if $self->{parent};
		218
		219	$self->show;
		220
		221	$CFClient::UI::ROOT->on_post_alloc (
		222	"centered $self" => sub {
		223	$self->move (($::WIDTH - $self->{w}) * 0.5, ($::HEIGHT - $self->{h}) * 0.5);
		224	},
		225	);
		226	}
		227
		228	sub set_invisible {
		229	my ($self) = @_;
		230
		231	# broken show/hide model
		232
		233	delete $self->{visible};
209		234
210	undef $GRAB if $GRAB == $self;	235	undef $GRAB if $GRAB == $self;
211	undef $HOVER if $HOVER == $self;	236	undef $HOVER if $HOVER == $self;
		237
		238	CFClient::UI::check_tooltip
		239	if $CFClient::UI::TOOLTIP->{owner} == $self;
		240
		241	$self->focus_out;
		242	}
		243
		244	sub hide {
		245	my ($self) = @_;
		246
		247	$self->set_invisible;
212		248
213	$self->{parent}->remove ($self)	249	$self->{parent}->remove ($self)
214	if $self->{parent};	250	if $self->{parent};
215	}	251	}
216		252
…		…
283		319
284	delete $self->{max_w}; $self->{max_w} = $w if $w;	320	delete $self->{max_w}; $self->{max_w} = $w if $w;
285	delete $self->{max_h}; $self->{max_h} = $h if $h;	321	delete $self->{max_h}; $self->{max_h} = $h if $h;
286	}	322	}
287		323
		324	sub set_tooltip {
		325	my ($self, $tooltip) = @_;
		326
		327	$tooltip =~ s/^\s+//;
		328	$tooltip =~ s/\s+$//;
		329
		330	return if $self->{tooltip} eq $tooltip;
		331
		332	$self->{tooltip} = $tooltip;
		333
		334	if ($CFClient::UI::TOOLTIP->{owner} == $self) {
		335	delete $CFClient::UI::TOOLTIP->{owner};
		336	CFClient::UI::check_tooltip;
		337	}
		338	}
		339
288	# translate global coordinates to local coordinate system	340	# translate global coordinates to local coordinate system
289	sub coord2local {	341	sub coord2local {
290	my ($self, $x, $y) = @_;	342	my ($self, $x, $y) = @_;
291		343
292	$self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})	344	$self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
…		…
305	return if $FOCUS == $self;	357	return if $FOCUS == $self;
306	return unless $self->{can_focus};	358	return unless $self->{can_focus};
307		359
308	my $focus = $FOCUS; $FOCUS = $self;	360	my $focus = $FOCUS; $FOCUS = $self;
309		361
310	$self->emit (focus_in => $focus);	362	$self->_emit (focus_in => $focus);
311		363
312	$focus->update if $focus;	364	$focus->update if $focus;
313	$FOCUS->update;	365	$FOCUS->update;
314	}	366	}
315		367
…		…
318		370
319	return unless $FOCUS == $self;	371	return unless $FOCUS == $self;
320		372
321	my $focus = $FOCUS; undef $FOCUS;	373	my $focus = $FOCUS; undef $FOCUS;
322		374
323	$self->emit (focus_out => $focus);	375	$self->_emit (focus_out => $focus);
324		376
325	$focus->update if $focus; #?	377	$focus->update if $focus; #?
		378
		379	$::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus
		380	unless $FOCUS;
326	}	381	}
327		382
328	sub mouse_motion { }	383	sub mouse_motion { }
329	sub button_up { }	384	sub button_up { }
330	sub key_down { }	385	sub key_down { }
331	sub key_up { }	386	sub key_up { }
332		387
333	sub button_down {	388	sub button_down {
334	my ($self, $ev, $x, $y) = @_;	389	my ($self, $ev, $x, $y) = @_;
335		390
336	$self->focus_in;	391	$self->focus_in;
…		…
370	if ($ENV{PCLIENT_DEBUG}) {	425	if ($ENV{PCLIENT_DEBUG}) {
371	glPushMatrix;	426	glPushMatrix;
372	glColor 1, 1, 0, 1;	427	glColor 1, 1, 0, 1;
373	glTranslate $self->{x} + 0.375, $self->{y} + 0.375;	428	glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
374	glBegin GL_LINE_LOOP;	429	glBegin GL_LINE_LOOP;
375	glVertex 0 , 0;	430	glVertex 0 , 0;
376	glVertex $self->{w}, 0;	431	glVertex $self->{w} - 1, 0;
377	glVertex $self->{w}, $self->{h};	432	glVertex $self->{w} - 1, $self->{h} - 1;
378	glVertex 0 , $self->{h};	433	glVertex 0 , $self->{h} - 1;
379	glEnd;	434	glEnd;
380	glPopMatrix;	435	glPopMatrix;
381	CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;	436	#CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
382	}	437	}
383	}	438	}
384		439
385	sub _draw {	440	sub _draw {
386	my ($self) = @_;	441	my ($self) = @_;
…		…
406	Scalar::Util::weaken ($self->{parent} = $parent);	461	Scalar::Util::weaken ($self->{parent} = $parent);
407		462
408	# TODO: req_w _does_change after ->reconfigure	463	# TODO: req_w _does_change after ->reconfigure
409	$self->check_size	464	$self->check_size
410	unless exists $self->{req_w};	465	unless exists $self->{req_w};
		466
		467	$self->show;
411	}	468	}
412		469
413	sub check_size {	470	sub check_size {
414	my ($self, $forced) = @_;	471	my ($self, $forced) = @_;
415		472
…		…
428	my ($self, $signal, $cb) = @_;	485	my ($self, $signal, $cb) = @_;
429		486
430	push @{ $self->{signal_cb}{$signal} }, $cb;	487	push @{ $self->{signal_cb}{$signal} }, $cb;
431	}	488	}
432		489
		490	sub _emit {
		491	my ($self, $signal, @args) = @_;
		492
		493	List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
		494	}
		495
433	sub emit {	496	sub emit {
434	my ($self, $signal, @args) = @_;	497	my ($self, $signal, @args) = @_;
435		498
436	List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}	499	$self->_emit ($signal, @args)
		500	|| $self->$signal (@args);
437	}	501	}
438		502
439	sub DESTROY {	503	sub DESTROY {
440	my ($self) = @_;	504	my ($self) = @_;
441		505
…		…
456	my $class = shift;	520	my $class = shift;
457		521
458	# range [value, low, high, page]	522	# range [value, low, high, page]
459		523
460	$class->SUPER::new (	524	$class->SUPER::new (
461	bg => [0, 0, 0, 0.2],	525	#bg => [0, 0, 0, 0.2],
462	active_bg => [1, 1, 1, 0.5],	526	#active_bg => [1, 1, 1, 0.5],
463	@_	527	@_
464	)	528	)
465	}	529	}
466		530
467	sub _draw {	531	sub _draw {
468	my ($self) = @_;	532	my ($self) = @_;
469		533
		534	my $color = $FOCUS == $self && $self->{active_bg}
		535	? $self->{active_bg}
		536	: $self->{bg};
		537
		538	if ($color && (@$color < 4 || $color->[3])) {
470	my ($w, $h) = @$self{qw(w h)};	539	my ($w, $h) = @$self{qw(w h)};
471		540
472	glEnable GL_BLEND;	541	glEnable GL_BLEND;
473	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	542	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
474	glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} };	543	glColor @$color;
475		544
476	glBegin GL_QUADS;	545	glBegin GL_QUADS;
477	glVertex 0 , 0;	546	glVertex 0 , 0;
478	glVertex 0 , $h;	547	glVertex 0 , $h;
479	glVertex $w, $h;	548	glVertex $w, $h;
480	glVertex $w, 0;	549	glVertex $w, 0;
481	glEnd;	550	glEnd;
482		551
483	glDisable GL_BLEND;	552	glDisable GL_BLEND;
		553	}
484	}	554	}
485		555
486	#############################################################################	556	#############################################################################
487		557
488	package CFClient::UI::Empty;	558	package CFClient::UI::Empty;
…		…
672	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {	742	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
673	glClearColor 0, 0, 0, 0;	743	glClearColor 0, 0, 0, 0;
674	glClear GL_COLOR_BUFFER_BIT;	744	glClear GL_COLOR_BUFFER_BIT;
675		745
676	$self->_render;	746	$self->_render;
677	# glColorMask 1, 1, 1, 0;
678	# glEnable GL_BLEND;
679	# glBlendFunc GL_SRC_ALPHA, GL_ZERO;
680	# glRasterPos 0, 0;
681	# glCopyPixels 0, 0, $self->{w}, $self->{h};
682	# glDisable GL_BLEND;
683	# glColorMask 1, 1, 1, 1;
684	};	747	};
685	}	748	}
686		749
687	sub _draw {	750	sub _draw {
688	my ($self) = @_;	751	my ($self) = @_;
…		…
692	my $tex = $self->{texture}	755	my $tex = $self->{texture}
693	or return;	756	or return;
694		757
695	glEnable GL_TEXTURE_2D;	758	glEnable GL_TEXTURE_2D;
696	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	759	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
697	glColor 0, 0, 0, 1;	760	glColor 1, 1, 1, 1;
698		761
699	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);	762	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
700		763
701	glDisable GL_TEXTURE_2D;	764	glDisable GL_TEXTURE_2D;
702	}	765	}
…		…
705		768
706	package CFClient::UI::ViewPort;	769	package CFClient::UI::ViewPort;
707		770
708	our @ISA = CFClient::UI::Window::;	771	our @ISA = CFClient::UI::Window::;
709		772
		773	sub new {
		774	my $class = shift;
		775
		776	$class->SUPER::new (
		777	scroll_x => 0,
		778	scroll_y => 1,
		779	@_,
		780	)
		781	}
		782
710	sub size_request {	783	sub size_request {
711	my ($self) = @_;	784	my ($self) = @_;
712		785
713	@$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};	786	@$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
714	$self->child->configure (0, 0, @$self{qw(child_w child_h)});
715		787
716	@$self{qw(child_w child_h)}	788	@$self{qw(child_w child_h)}
717	}	789	}
718		790
719	sub size_allocate {	791	sub size_allocate {
720	my ($self, $w, $h) = @_;	792	my ($self, $w, $h) = @_;
721		793
		794	$w = $self->{child_w} if $self->{scroll_x} && $self->{child_w};
		795	$h = $self->{child_h} if $self->{scroll_y} && $self->{child_h};
		796
		797	$self->child->configure (0, 0, $w, $h);
722	$self->update;	798	$self->update;
723	}	799	}
724		800
725	sub set_offset {	801	sub set_offset {
726	my ($self, $x, $y) = @_;	802	my ($self, $x, $y) = @_;
…		…
780		856
781	my $slider = new CFClient::UI::Slider	857	my $slider = new CFClient::UI::Slider
782	vertical => 1,	858	vertical => 1,
783	range => [0, 0, 1, 0.01], # HACK fix	859	range => [0, 0, 1, 0.01], # HACK fix
784	connect_changed => sub {	860	connect_changed => sub {
785	$self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h}));	861	$self->{vp}->set_offset (0, $_[1]);
786	},	862	},
787	;	863	;
788		864
789	$self = $class->SUPER::new (	865	$self = $class->SUPER::new (
790	vp => (new CFClient::UI::ViewPort),	866	vp => (new CFClient::UI::ViewPort expand => 1),
791	slider => $slider,	867	slider => $slider,
792	@_,	868	@_,
793	);	869	);
794		870
795	$self->{vp}->add ($self->{scrolled});	871	$self->{vp}->add ($self->{scrolled});
796	$self->add ($self->{vp});	872	$self->add ($self->{vp});
797	$self->add ($self->{slider});	873	$self->add ($self->{slider});
798		874
799	$self	875	$self
		876	}
		877
		878	sub size_allocate {
		879	my ($self, $w, $h) = @_;
		880
		881	$self->SUPER::size_allocate ($w, $h);
		882
		883	my $child = $self->{vp}->child;
		884	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
800	}	885	}
801		886
802	#TODO# update range on size_allocate depending on child	887	#TODO# update range on size_allocate depending on child
803	# update viewport offset on scroll	888	# update viewport offset on scroll
804		889
…		…
858	my $class = shift;	943	my $class = shift;
859		944
860	# TODO: user_x, user_y, overwrite moveto?	945	# TODO: user_x, user_y, overwrite moveto?
861		946
862	my $self = $class->SUPER::new (	947	my $self = $class->SUPER::new (
863	bg => [1, 1, 1, 1],	948	bg => [1, 1, 1, 1],
864	border_bg => [1, 1, 1, 1],	949	border_bg => [1, 1, 1, 1],
865	border => 0.6,	950	border => 0.6,
866	toplevel => 1,	951	is_toplevel => 1,
867	can_events => 1,	952	can_events => 1,
868	@_	953	@_
869	);	954	);
870		955
871	$self->{title} &&= new CFClient::UI::Label	956	$self->{title} &&= new CFClient::UI::Label
872	align => 0,	957	align => 0,
…		…
896	my ($self, $w, $h) = @_;	981	my ($self, $w, $h) = @_;
897		982
898	$h -= List::Util::max 0, $self->border * 2;	983	$h -= List::Util::max 0, $self->border * 2;
899	$w -= List::Util::max 0, $self->border * 2;	984	$w -= List::Util::max 0, $self->border * 2;
900		985
901	$self->{title}->configure ($self->border, $self->border - $::FONTSIZE * 2, $w, $::FONTSIZE * 2)	986	$self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
902	if $self->{title};	987	if $self->{title};
903		988
904	$self->child->configure ($self->border, $self->border, $w, $h);	989	$self->child->configure ($self->border, $self->border, $w, $h);
905	}	990	}
906		991
…		…
1012	sub new {	1097	sub new {
1013	my $class = shift;	1098	my $class = shift;
1014		1099
1015	$class->SUPER::new (	1100	$class->SUPER::new (
1016	col_expand => [],	1101	col_expand => [],
1017	@_	1102	@_,
1018	)	1103	)
1019	}	1104	}
1020		1105
1021	sub add {	1106	sub add {
1022	my ($self, $x, $y, $child) = @_;	1107	my ($self, $x, $y, $child) = @_;
…		…
1267		1352
1268	#############################################################################	1353	#############################################################################
1269		1354
1270	package CFClient::UI::Label;	1355	package CFClient::UI::Label;
1271		1356
1272	our @ISA = CFClient::UI::Base::;	1357	our @ISA = CFClient::UI::DrawBG::;
1273		1358
1274	use CFClient::OpenGL;	1359	use CFClient::OpenGL;
1275		1360
1276	sub new {	1361	sub new {
1277	my ($class, %arg) = @_;	1362	my ($class, %arg) = @_;
1278		1363
1279	my $self = $class->SUPER::new (	1364	my $self = $class->SUPER::new (
1280	fg => [1, 1, 1],	1365	fg => [1, 1, 1],
		1366	#bg => none
		1367	#active_bg => none
1281	#font => default_font	1368	#font => default_font
1282	#text => initial text	1369	#text => initial text
1283	#markup => initial narkup	1370	#markup => initial narkup
		1371	#max_w => maximum pixel width
		1372	ellipsise => 3, # end
1284	layout => (new CFClient::Layout),	1373	layout => (new CFClient::Layout),
1285	fontsize => 1,	1374	fontsize => 1,
1286	align => -1,	1375	align => -1,
1287	valign => -1,	1376	valign => -1,
1288	padding => 2,	1377	padding => 2,
…		…
1303	}	1392	}
1304		1393
1305	$self	1394	$self
1306	}	1395	}
1307		1396
1308	sub escape {	1397	sub escape($) {
1309	local $_ = $_[1];	1398	local $_ = $_[0];
1310		1399
1311	s/&/&amp;/g;	1400	s/&/&amp;/g;
1312	s/>/&gt;/g;	1401	s/>/&gt;/g;
1313	s/</&lt;/g;	1402	s/</&lt;/g;
1314		1403
1315	$_[1]	1404	$_
1316	}	1405	}
1317		1406
1318	sub update {	1407	sub update {
1319	my ($self) = @_;	1408	my ($self) = @_;
1320		1409
…		…
1353	sub size_request {	1442	sub size_request {
1354	my ($self) = @_;	1443	my ($self) = @_;
1355		1444
1356	$self->{layout}->set_font ($self->{font}) if $self->{font};	1445	$self->{layout}->set_font ($self->{font}) if $self->{font};
1357	$self->{layout}->set_width ($self->{max_w} || -1);	1446	$self->{layout}->set_width ($self->{max_w} || -1);
		1447	$self->{layout}->set_ellipsise ($self->{ellipsise});
		1448	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1358	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1449	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1359		1450
1360	my ($w, $h) = $self->{layout}->size;	1451	my ($w, $h) = $self->{layout}->size;
1361		1452
1362	if (exists $self->{template}) {	1453	if (exists $self->{template}) {
…		…
1392	}	1483	}
1393		1484
1394	sub _draw {	1485	sub _draw {
1395	my ($self) = @_;	1486	my ($self) = @_;
1396		1487
		1488	$self->SUPER::_draw; # draw background, if applicable
		1489
1397	my $tex = $self->{texture} ||= do {	1490	my $tex = $self->{texture} ||= do {
1398	$self->{layout}->set_foreground (@{$self->{fg}});	1491	$self->{layout}->set_foreground (@{$self->{fg}});
1399	$self->{layout}->set_font ($self->{font}) if $self->{font};	1492	$self->{layout}->set_font ($self->{font}) if $self->{font};
1400	$self->{layout}->set_width ($self->{w});	1493	$self->{layout}->set_width ($self->{w});
		1494	$self->{layout}->set_ellipsise ($self->{ellipsise});
		1495	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1401	$self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE);	1496	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1402		1497
1403	my $tex = new_from_layout CFClient::Texture $self->{layout};	1498	my $tex = new_from_layout CFClient::Texture $self->{layout};
1404		1499
1405	$self->{ox} = int $self->{align} < 0 ? $self->{padding}	1500	$self->{ox} = int ($self->{align} < 0 ? $self->{padding}
1406	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}	1501	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1407	: ($self->{w} - $tex->{w}) * 0.5;	1502	: ($self->{w} - $tex->{w}) * 0.5);
1408		1503
1409	$self->{oy} = int $self->{valign} < 0 ? $self->{padding}	1504	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding}
1410	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}	1505	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1411	: ($self->{h} - $tex->{h}) * 0.5;	1506	: ($self->{h} - $tex->{h}) * 0.5);
1412		1507
1413	$tex	1508	$tex
1414	};	1509	};
1415		1510
1416	glEnable GL_TEXTURE_2D;	1511	glEnable GL_TEXTURE_2D;
…		…
1444	active_fg => [0, 0, 0],	1539	active_fg => [0, 0, 0],
1445	can_hover => 1,	1540	can_hover => 1,
1446	can_focus => 1,	1541	can_focus => 1,
1447	valign => 0,	1542	valign => 0,
1448	can_events => 1,	1543	can_events => 1,
		1544	#text => ...
1449	@_	1545	@_
1450	)	1546	)
1451	}	1547	}
1452		1548
1453	sub _set_text {	1549	sub _set_text {
…		…
1463	$self->{text} = $text;	1559	$self->{text} = $text;
1464		1560
1465	$text =~ s/./*/g if $self->{hidden};	1561	$text =~ s/./*/g if $self->{hidden};
1466	$self->{layout}->set_text ("$text ");	1562	$self->{layout}->set_text ("$text ");
1467		1563
1468	$self->emit (changed => $self->{text});	1564	$self->_emit (changed => $self->{text});
1469	}	1565	}
1470		1566
1471	sub set_text {	1567	sub set_text {
1472	my ($self, $text) = @_;	1568	my ($self, $text) = @_;
1473		1569
1474	$self->{cursor} = length $text;	1570	$self->{cursor} = length $text;
1475	$self->_set_text ($text);	1571	$self->_set_text ($text);
		1572	$self->update;
1476	$self->check_size;	1573	$self->check_size;
1477	$self->update;
1478	}	1574	}
1479		1575
1480	sub get_text {	1576	sub get_text {
1481	$_[0]{text}	1577	$_[0]{text}
1482	}	1578	}
…		…
1485	my ($self) = @_;	1581	my ($self) = @_;
1486		1582
1487	my ($w, $h) = $self->SUPER::size_request;	1583	my ($w, $h) = $self->SUPER::size_request;
1488		1584
1489	($w + 1, $h) # add 1 for cursor	1585	($w + 1, $h) # add 1 for cursor
1490	}
1491
1492	sub size_allocate {
1493	my ($self, $w, $h) = @_;
1494
1495	$self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1496	}	1586	}
1497		1587
1498	sub key_down {	1588	sub key_down {
1499	my ($self, $ev) = @_;	1589	my ($self, $ev) = @_;
1500		1590
…		…
1515	} elsif ($sym == CFClient::SDLK_HOME) {	1605	} elsif ($sym == CFClient::SDLK_HOME) {
1516	$self->{cursor} = 0;	1606	$self->{cursor} = 0;
1517	} elsif ($sym == CFClient::SDLK_END) {	1607	} elsif ($sym == CFClient::SDLK_END) {
1518	$self->{cursor} = length $text;	1608	$self->{cursor} = length $text;
1519	} elsif ($uni == 27) {	1609	} elsif ($uni == 27) {
1520	$self->emit ('escape');	1610	$self->_emit ('escape');
1521	} elsif ($uni) {	1611	} elsif ($uni) {
1522	substr $text, $self->{cursor}++, 0, chr $uni;	1612	substr $text, $self->{cursor}++, 0, chr $uni;
1523	}	1613	}
1524		1614
1525	$self->_set_text ($text);	1615	$self->_set_text ($text);
1526	$self->update;	1616	$self->update;
		1617	$self->check_size;
1527	}	1618	}
1528		1619
1529	sub focus_in {	1620	sub focus_in {
1530	my ($self) = @_;	1621	my ($self) = @_;
1531		1622
…		…
1611	if ($sym == 13) {	1702	if ($sym == 13) {
1612	unshift @{$self->{history}},	1703	unshift @{$self->{history}},
1613	my $txt = $self->get_text;	1704	my $txt = $self->get_text;
1614	$self->{history_pointer} = -1;	1705	$self->{history_pointer} = -1;
1615	$self->{history_saveback} = '';	1706	$self->{history_saveback} = '';
1616	$self->emit (activate => $txt);	1707	$self->_emit (activate => $txt);
1617	$self->update;	1708	$self->update;
1618		1709
1619	} elsif ($sym == CFClient::SDLK_UP) {	1710	} elsif ($sym == CFClient::SDLK_UP) {
1620	if ($self->{history_pointer} < 0) {	1711	if ($self->{history_pointer} < 0) {
1621	$self->{history_saveback} = $self->get_text;	1712	$self->{history_saveback} = $self->get_text;
…		…
1660	my $class = shift;	1751	my $class = shift;
1661		1752
1662	$class->SUPER::new (	1753	$class->SUPER::new (
1663	padding => 4,	1754	padding => 4,
1664	fg => [1, 1, 1],	1755	fg => [1, 1, 1],
1665	bg => [1, 1, 1, 0.2],
1666	active_fg => [0, 0, 1],	1756	active_fg => [0, 0, 1],
1667	can_hover => 1,	1757	can_hover => 1,
1668	align => 0,	1758	align => 0,
1669	valign => 0,	1759	valign => 0,
1670	can_events => 1,	1760	can_events => 1,
1671	@_	1761	@_
1672	)	1762	)
1673	}	1763	}
1674		1764
		1765	sub activate { }
		1766
1675	sub button_up {	1767	sub button_up {
1676	my ($self, $ev, $x, $y) = @_;	1768	my ($self, $ev, $x, $y) = @_;
1677		1769
		1770	$self->emit ("activate")
1678	if ($x >= 0 && $x < $self->{w}	1771	if $x >= 0 && $x < $self->{w}
1679	&& $y >= 0 && $y < $self->{h}) {	1772	&& $y >= 0 && $y < $self->{h};
1680	$self->emit ("activate");
1681	}
1682	}	1773	}
1683		1774
1684	sub _draw {	1775	sub _draw {
1685	my ($self) = @_;	1776	my ($self) = @_;
1686		1777
…		…
1718		1809
1719	$class->SUPER::new (	1810	$class->SUPER::new (
1720	padding => 2,	1811	padding => 2,
1721	fg => [1, 1, 1],	1812	fg => [1, 1, 1],
1722	active_fg => [1, 1, 0],	1813	active_fg => [1, 1, 0],
		1814	bg => [0, 0, 0, 0.2],
		1815	active_bg => [1, 1, 1, 0.5],
1723	state => 0,	1816	state => 0,
1724	can_hover => 1,	1817	can_hover => 1,
1725	@_	1818	@_
1726	)	1819	)
1727	}	1820	}
…		…
1736	my ($self, $ev, $x, $y) = @_;	1829	my ($self, $ev, $x, $y) = @_;
1737		1830
1738	if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}	1831	if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}
1739	&& $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {	1832	&& $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {
1740	$self->{state} = !$self->{state};	1833	$self->{state} = !$self->{state};
1741	$self->emit (changed => $self->{state});	1834	$self->_emit (changed => $self->{state});
1742	}	1835	}
1743	}	1836	}
1744		1837
1745	sub _draw {	1838	sub _draw {
1746	my ($self) = @_;	1839	my ($self) = @_;
…		…
2011	qw(s1_slider.png s1_slider_bg.png);	2104	qw(s1_slider.png s1_slider_bg.png);
2012		2105
2013	sub new {	2106	sub new {
2014	my $class = shift;	2107	my $class = shift;
2015		2108
2016	# range [value, low, high, page]	2109	# range [value, low, high, page, unit]
2017		2110
2018	# TODO: 0-width page	2111	# TODO: 0-width page
2019	# TODO: req_w/h are wrong with vertical	2112	# TODO: req_w/h are wrong with vertical
2020	# TODO: calculations are off	2113	# TODO: calculations are off
2021	my $self = $class->SUPER::new (	2114	my $self = $class->SUPER::new (
2022	fg => [1, 1, 1],	2115	fg => [1, 1, 1],
2023	active_fg => [0, 0, 0],	2116	active_fg => [0, 0, 0],
		2117	bg => [0, 0, 0, 0.2],
		2118	active_bg => [1, 1, 1, 0.5],
2024	range => [0, 0, 100, 10],	2119	range => [0, 0, 100, 10, 0],
2025	req_w => $::WIDTH / 80,	2120	req_w => $::WIDTH / 80,
2026	req_h => $::WIDTH / 80,	2121	req_h => $::WIDTH / 80,
2027	vertical => 0,	2122	vertical => 0,
2028	can_hover => 1,	2123	can_hover => 1,
2029	inner_pad => 5,	2124	inner_pad => 0.02,
2030	@_	2125	@_
2031	);	2126	);
2032		2127
		2128	$self->set_value ($self->{range}[0]);
		2129	$self->update;
		2130
2033	$self	2131	$self
		2132	}
		2133
		2134	sub set_range {
		2135	my ($self, $range) = @_;
		2136
		2137	$self->{range} = $range;
		2138
		2139	$self->update;
		2140	}
		2141
		2142	sub set_value {
		2143	my ($self, $value) = @_;
		2144
		2145	my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
		2146
		2147	$hi = $lo + 1 if $hi <= $lo;
		2148
		2149	$page = $hi - $lo if $page > $hi - $lo;
		2150
		2151	$value = $lo if $value < $lo;
		2152	$value = $hi - $page if $value > $hi - $page;
		2153
		2154	$value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
		2155	if $unit;
		2156
		2157	@{$self->{range}} = ($value, $lo, $hi, $page, $unit);
		2158
		2159	if ($value != $old_value) {
		2160	$self->_emit (changed => $value);
		2161	$self->update;
		2162	}
2034	}	2163	}
2035		2164
2036	sub size_request {	2165	sub size_request {
2037	my ($self) = @_;	2166	my ($self) = @_;
2038		2167
…		…
2044		2173
2045	sub button_down {	2174	sub button_down {
2046	my ($self, $ev, $x, $y) = @_;	2175	my ($self, $ev, $x, $y) = @_;
2047		2176
2048	$self->SUPER::button_down ($ev, $x, $y);	2177	$self->SUPER::button_down ($ev, $x, $y);
		2178
		2179	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
		2180
2049	$self->mouse_motion ($ev, $x, $y);	2181	$self->mouse_motion ($ev, $x, $y);
2050	}	2182	}
2051		2183
2052	sub mouse_motion {	2184	sub mouse_motion {
2053	my ($self, $ev, $x, $y) = @_;	2185	my ($self, $ev, $x, $y) = @_;
2054		2186
2055	if ($GRAB == $self) {	2187	if ($GRAB == $self) {
		2188	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
		2189
		2190	my (undef, $lo, $hi, $page) = @{$self->{range}};
		2191
		2192	$x = ($x - $self->{click}[1]) / ($w * $self->{scale});
		2193
		2194	$self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
		2195	}
		2196	}
		2197
		2198	sub update {
		2199	my ($self) = @_;
		2200
		2201	$CFClient::UI::ROOT->on_post_alloc ($self => sub {
		2202	$self->set_value ($self->{range}[0]);
		2203
2056	my ($value, $lo, $hi, $page) = @{$self->{range}};	2204	my ($value, $lo, $hi, $page) = @{$self->{range}};
		2205	my $range = ($hi - $page - $lo) || 1e-100;
2057		2206
2058	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});	2207	my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
2059		2208
2060	my $inner_pad_px = $self->_calc_inner_pad_px ($w);	2209	$self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
2061	my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right	2210	$self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
2062		2211
2063	$x -= $inner_pad_px; # substract the padding	2212	$value = ($value - $lo) / $range;
2064	$x = $x * ($hi - $lo) / $inner_w + $lo;	2213	$value = $value * $self->{scale} + $self->{offset};
2065	$x = $lo if $x < $lo;
2066	$x = $hi - $page if $x > $hi - $page;
2067	$self->{range}[0] = $x;
2068		2214
2069	$self->emit (changed => $x);	2215	$self->{knob_x} = $value - $knob_w * 0.5;
2070	$self->update;	2216	$self->{knob_w} = $knob_w;
2071	}	2217	});
2072	}
2073		2218
2074	# the inner_* stuff is for generating a padding for the slider handle,	2219	$self->SUPER::update;
2075	# so that the handle doesn't leave the texture. This calculation isn't 100%
2076	# correct propably, but it does the job for now
2077	sub _calc_inner_pad_px {
2078	my ($self, $w) = @_;
2079	($w / 100) * $self->{inner_pad} # % to pixels
2080	}	2220	}
2081		2221
2082	sub _draw {	2222	sub _draw {
2083	my ($self) = @_;	2223	my ($self) = @_;
2084		2224
2085	$self->SUPER::_draw ();	2225	$self->SUPER::_draw ();
2086		2226
2087	my ($w, $h) = @$self{qw(w h)};	2227	glScale $self->{w}, $self->{h};
2088		2228
2089	if ($self->{vertical}) {	2229	if ($self->{vertical}) {
2090	# draw a vertical slider like a rotated horizontal slider	2230	# draw a vertical slider like a rotated horizontal slider
2091		2231
		2232	glTranslate 1, 0, 0;
2092	glRotate 90, 0, 0, 1;	2233	glRotate 90, 0, 0, 1;
2093	glTranslate 0, -$self->{w}, 0;
2094
2095	($w, $h) = ($h, $w);
2096	}	2234	}
2097		2235
2098	my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};	2236	my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
2099	my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};	2237	my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
2100		2238
2101	my ($value, $lo, $hi, $page) = @{$self->{range}};
2102
2103	$hi = $value + 1 if $lo == $hi;
2104
2105	my $inner_pad_px = $self->_calc_inner_pad_px ($w);
2106	my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
2107
2108	$page = int $page * $inner_w / ($hi - $lo);
2109	$value = int +($value - $lo) * $inner_w / ($hi - $lo);
2110
2111	$w -= $page;
2112	$page &= ~1;
2113	glTranslate $page * 0.5, 0, 0;
2114	$page ||= 2;
2115
2116	my $knob_a = $inner_pad_px + ($value - $page * 0.5);
2117	my $knob_b = $inner_pad_px + ($value + $page * 0.5);
2118
2119	glEnable GL_TEXTURE_2D;	2239	glEnable GL_TEXTURE_2D;
2120	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2240	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2121		2241
2122	# draw background	2242	# draw background
2123	$tex[1]->draw_quad_alpha (0, 0, $w, $h);	2243	$tex[1]->draw_quad_alpha (0, 0, 1, 1);
2124		2244
2125	# draw handle	2245	# draw handle
2126	$tex[0]->draw_quad_alpha ($knob_a, 0, $knob_b - $knob_a, $h);	2246	$tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
2127		2247
2128	glDisable GL_TEXTURE_2D;	2248	glDisable GL_TEXTURE_2D;
2129	}	2249	}
		2250
		2251	#############################################################################
		2252
		2253	package CFClient::UI::ValSlider;
		2254
		2255	our @ISA = CFClient::UI::HBox::;
		2256
		2257	sub new {
		2258	my ($class, %arg) = @_;
		2259
		2260	my $range = delete $arg{range};
		2261
		2262	my $self = $class->SUPER::new (
		2263	slider => (new CFClient::UI::Slider expand => 1, range => $range),
		2264	entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),
		2265	to_value => sub { shift },
		2266	from_value => sub { shift },
		2267	%arg,
		2268	);
		2269
		2270	$self->{slider}->connect (changed => sub {
		2271	my ($self, $value) = @_;
		2272	$self->{parent}{entry}->set_text ($self->{parent}{to_value}->($value));
		2273	$self->{parent}->emit (changed => $value);
		2274	});
		2275
		2276	# $self->{entry}->connect (changed => sub {
		2277	# my ($self, $value) = @_;
		2278	# $self->{parent}{slider}->set_value ($self->{parent}{from_value}->($value));
		2279	# $self->{parent}->emit (changed => $value);
		2280	# });
		2281
		2282	$self->add ($self->{slider}, $self->{entry});
		2283
		2284	$self->{slider}->emit (changed => $self->{slider}{range}[0]);
		2285
		2286	$self
		2287	}
		2288
		2289	sub set_range { shift->{slider}->set_range (@_) }
		2290	sub set_value { shift->{slider}->set_value (@_) }
2130		2291
2131	#############################################################################	2292	#############################################################################
2132		2293
2133	package CFClient::UI::TextView;	2294	package CFClient::UI::TextView;
2134		2295
…		…
2164		2325
2165	$self->{fontsize} = $fontsize;	2326	$self->{fontsize} = $fontsize;
2166	$self->reflow;	2327	$self->reflow;
2167	}	2328	}
2168		2329
2169	sub text_height {
2170	my ($self, $text) = @_;
2171
2172	my $layout = $self->{layout};
2173
2174	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
2175	$layout->set_width ($self->{children}[0]{w});
2176	$layout->set_markup ($text);
2177
2178	($layout->size)[1]
2179	}
2180
2181	sub reflow {
2182	my ($self) = @_;
2183
2184	$self->{need_reflow}++;
2185	$self->update;
2186	}
2187
2188	sub size_allocate {	2330	sub size_allocate {
2189	my ($self, $w, $h) = @_;	2331	my ($self, $w, $h) = @_;
2190		2332
2191	$self->SUPER::size_allocate ($w, $h);	2333	$self->SUPER::size_allocate ($w, $h);
2192		2334
…		…
2195	$self->{layout}->set_width ($self->{children}[0]{w});	2337	$self->{layout}->set_width ($self->{children}[0]{w});
2196		2338
2197	$self->reflow;	2339	$self->reflow;
2198	}	2340	}
2199		2341
		2342	sub text_size {
		2343	my ($self, $text, $indent) = @_;
		2344
		2345	my $layout = $self->{layout};
		2346
		2347	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
		2348	$layout->set_width ($self->{children}[0]{w} - $indent);
		2349	$layout->set_markup ($text);
		2350
		2351	$layout->size
		2352	}
		2353
		2354	sub reflow {
		2355	my ($self) = @_;
		2356
		2357	$self->{need_reflow}++;
		2358	$self->update;
		2359	}
		2360
		2361	sub set_offset {
		2362	my ($self, $offset) = @_;
		2363
		2364	# todo: base offset on lines or so, not on pixels
		2365	$self->{children}[1]->set_value ($offset);
		2366	}
		2367
		2368	sub clear {
		2369	my ($self) = @_;
		2370
		2371	$self->{par} = [];
		2372	$self->{height} = 0;
		2373	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
		2374	}
		2375
2200	sub add_paragraph {	2376	sub add_paragraph {
2201	my ($self, $color, $text) = @_;	2377	my ($self, $color, $text, $indent) = @_;
2202		2378
2203	#TODO: intelligently "reformat" paragraph	2379	for my $line (split /\n/, $text) {
2204		2380	my ($w, $h) = $self->text_size ($line);
2205	my $height = $self->text_height ($text);
2206
2207	$self->{height} += $height;	2381	$self->{height} += $h;
		2382	push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
		2383	}
2208		2384
2209	push @{$self->{par}}, [$height, $color, $text];
2210
2211	$self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}];	2385	$self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);
2212	$self->{children}[1]->update;
2213	}	2386	}
2214		2387
2215	sub update {	2388	sub update {
2216	my ($self) = @_;	2389	my ($self) = @_;
2217		2390
…		…
2220	return unless $self->{h} > 0;	2393	return unless $self->{h} > 0;
2221		2394
2222	delete $self->{texture};	2395	delete $self->{texture};
2223		2396
2224	$ROOT->on_post_alloc ($self, sub {	2397	$ROOT->on_post_alloc ($self, sub {
		2398	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
		2399
2225	if (delete $self->{need_reflow}) {	2400	if (delete $self->{need_reflow}) {
2226	my $height = 0;	2401	my $height = 0;
2227		2402
2228	$height += $_->[0] = $self->text_height ($_->[2])	2403	my $layout = $self->{layout};
		2404
		2405	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
		2406
2229	for @{$self->{par}};	2407	for (@{$self->{par}}) {
		2408	if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
		2409	$layout->set_width ($W - $_->[3]);
		2410	$layout->set_markup ($_->[4]);
		2411	my ($w, $h) = $layout->size;
		2412	$_->[0] = $w + $_->[3];
		2413	$_->[1] = $h;
		2414	}
		2415
		2416	$height += $_->[1];
		2417	}
2230		2418
2231	$self->{height} = $height;	2419	$self->{height} = $height;
2232		2420
2233	$self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];	2421	$self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2234		2422
2235	delete $self->{texture};	2423	delete $self->{texture};
2236	}	2424	}
2237		2425
2238	$self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub {	2426	$self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2239	glClearColor 0, 0, 0, 0;	2427	glClearColor 0.5, 0.5, 0.5, 0;
2240	glClear GL_COLOR_BUFFER_BIT;	2428	glClear GL_COLOR_BUFFER_BIT;
2241		2429
2242	glEnable GL_TEXTURE_2D;
2243	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2244
2245	my $top = int $self->{children}[1]{range}[0];	2430	my $top = int $self->{children}[1]{range}[0];
2246		2431
2247	my $y0 = $top;	2432	my $y0 = $top;
2248	my $y1 = $top + $self->{h};	2433	my $y1 = $top + $H;
2249		2434
2250	my $y = 0;	2435	my $y = 0;
2251		2436
2252	my $layout = $self->{layout};	2437	my $layout = $self->{layout};
2253		2438
2254	$layout->set_font ($self->{font}) if $self->{font};	2439	$layout->set_font ($self->{font}) if $self->{font};
2255		2440
		2441	glEnable GL_BLEND;
		2442	#TODO# not correct in windows where rgba is forced off
		2443	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
		2444
2256	for my $par (@{$self->{par}}) {	2445	for my $par (@{$self->{par}}) {
2257	my $h = $par->[0];	2446	my $h = $par->[1];
2258		2447
2259	if ($y0 < $y + $h && $y < $y1) {	2448	if ($y0 < $y + $h && $y < $y1) {
2260	$layout->set_foreground (@{ $par->[1] });	2449	$layout->set_foreground (@{ $par->[2] });
		2450	$layout->set_width ($W - $par->[3]);
2261	$layout->set_markup ($par->[2]);	2451	$layout->set_markup ($par->[4]);
2262		2452
2263	my ($W, $H) = $layout->size;	2453	my ($w, $h, $data, $format, $internalformat) = $layout->render;
2264	CFClient::Texture->new_from_layout ($layout)->draw_quad_alpha_premultiplied (0, $y - $y0);	2454
		2455	glRasterPos $par->[3], $y - $y0;
		2456	glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2265	}	2457	}
2266		2458
2267	$y += $h;	2459	$y += $h;
2268	}	2460	}
2269		2461
2270	glDisable GL_TEXTURE_2D;	2462	glDisable GL_BLEND;
2271	};	2463	};
2272	});	2464	});
2273	}	2465	}
2274		2466
2275	sub _draw {	2467	sub _draw {
2276	my ($self) = @_;	2468	my ($self) = @_;
2277		2469
2278	glEnable GL_TEXTURE_2D;	2470	glEnable GL_TEXTURE_2D;
2279	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2471	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2280	glColor 1, 1, 1, 1;	2472	glColor 1, 1, 1, 1;
2281	$self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});	2473	$self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2282	glDisable GL_TEXTURE_2D;	2474	glDisable GL_TEXTURE_2D;
2283		2475
2284	$self->{children}[1]->draw;	2476	$self->{children}[1]->draw;
2285		2477
2286	}	2478	}
…		…
2355		2547
2356	# TODO: use animation	2548	# TODO: use animation
2357	if ($self->{state} = !$self->{state}) {	2549	if ($self->{state} = !$self->{state}) {
2358	$CFClient::UI::ROOT->add ($self->{other});	2550	$CFClient::UI::ROOT->add ($self->{other});
2359	$self->{other}->move ($self->coord2global (0, $self->{h}));	2551	$self->{other}->move ($self->coord2global (0, $self->{h}));
2360	$self->emit ("open");	2552	$self->_emit ("open");
2361	} else {	2553	} else {
2362	$CFClient::UI::ROOT->remove ($self->{other});	2554	$CFClient::UI::ROOT->remove ($self->{other});
2363	$self->emit ("close");	2555	$self->_emit ("close");
2364	}	2556	}
2365		2557
2366	$self->emit (changed => $self->{state});	2558	$self->_emit (changed => $self->{state});
2367	}	2559	}
2368		2560
2369	#############################################################################	2561	#############################################################################
2370		2562
2371	package CFClient::UI::Tooltip;	2563	package CFClient::UI::Tooltip;
…		…
2385		2577
2386	sub set_tooltip_from {	2578	sub set_tooltip_from {
2387	my ($self, $widget) = @_;	2579	my ($self, $widget) = @_;
2388		2580
2389	$self->add (new CFClient::UI::Label	2581	$self->add (new CFClient::UI::Label
2390	markup => $widget->{tooltip},	2582	markup => $widget->{tooltip},
2391	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	2583	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2392	fontsize => 0.8,	2584	fontsize => 0.8,
2393	fg => [0, 0, 0, 1],	2585	fg => [0, 0, 0, 1],
		2586	ellipsise => 0,
2394	font => ($widget->{tooltip_font} || $::FONT_PROP),	2587	font => ($widget->{tooltip_font} || $::FONT_PROP),
2395	);	2588	);
2396	}	2589	}
2397		2590
2398	sub size_request {	2591	sub size_request {
2399	my ($self) = @_;	2592	my ($self) = @_;
…		…
2445	use CFClient::OpenGL;	2638	use CFClient::OpenGL;
2446		2639
2447	sub new {	2640	sub new {
2448	my $class = shift;	2641	my $class = shift;
2449		2642
2450	$class->SUPER::new (	2643	my $self = $class->SUPER::new (
2451	aspect => 1,	2644	aspect => 1,
		2645	can_events => 0,
2452	@_,	2646	@_,
2453	)	2647	);
		2648
		2649	if ($self->{anim} && $self->{animspeed}) {
		2650	Scalar::Util::weaken (my $widget = $self);
		2651
		2652	$self->{timer} = Event->timer (
		2653	at => $self->{animspeed} * int $::NOW / $self->{animspeed},
		2654	hard => 1,
		2655	interval => $self->{animspeed},
		2656	cb => sub {
		2657	++$widget->{frame};
		2658	$widget->update;
		2659	},
		2660	);
		2661	}
		2662
		2663	$self
2454	}	2664	}
2455		2665
2456	sub size_request {	2666	sub size_request {
2457	(32, 8)	2667	(32, 8)
2458	}	2668	}
2459		2669
		2670	sub update {
		2671	my ($self) = @_;
		2672
		2673	return unless $self->{visible};
		2674
		2675	$self->SUPER::update;
		2676	}
		2677
2460	sub _draw {	2678	sub _draw {
2461	my ($self) = @_;	2679	my ($self) = @_;
2462		2680
2463	return unless $::CONN;#d# manage and cache textures differently	2681	return unless $::CONN;
		2682
		2683	my $face;
		2684
		2685	if ($self->{frame}) {
		2686	my $anim = $::CONN->{anim}[$self->{anim}];
		2687
		2688	$face = $anim->[ $self->{frame} % @$anim ]
		2689	if $anim && @$anim;
		2690	}
		2691
2464	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]];	2692	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2465		2693
2466	# TODO animation
2467	if ($tex) {	2694	if ($tex) {
2468	glEnable GL_TEXTURE_2D;	2695	glEnable GL_TEXTURE_2D;
2469	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2696	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2470	glColor 1, 1, 1, 1;	2697	glColor 1, 1, 1, 1;
2471	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	2698	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2472	glDisable GL_TEXTURE_2D;	2699	glDisable GL_TEXTURE_2D;
2473	}	2700	}
2474	}	2701	}
2475		2702
		2703	sub DESTROY {
		2704	my ($self) = @_;
		2705
		2706	$self->{timer}->cancel
		2707	if $self->{timer};
		2708
		2709	$self->SUPER::DESTROY;
		2710	}
		2711
2476	#############################################################################	2712	#############################################################################
2477		2713
2478	package CFClient::UI::InventoryItem;	2714	package CFClient::UI::Inventory;
2479		2715
2480	our @ISA = CFClient::UI::HBox::;	2716	our @ISA = CFClient::UI::ScrolledWindow::;
2481		2717
2482	sub new {	2718	sub new {
2483	my $class = shift;	2719	my $class = shift;
2484		2720
2485	my %args = @_;
2486
2487	my $item = delete $args{item};
2488
2489	my $desc = $item->{nrof} < 2
2490	? $item->{name}
2491	: "$item->{nrof} $item->{name_pl}";
2492
2493
2494	my $self = $class->SUPER::new (	2721	my $self = $class->SUPER::new (
2495	can_hover => 1,	2722	scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2496	can_events => 1,
2497	tooltip => (CFClient::UI::Label->escape ($desc)
2498	. "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2499	connect_button_down => sub {
2500	my ($self, $ev, $x, $y) = @_;
2501
2502	# todo: maybe put examine on 1? but should just be a tooltip :(
2503	if ($ev->{button} == 1) {
2504	$::CONN->send ("move $::CONN->{player}{tag} $item->{tag} 0");
2505	} elsif ($ev->{button} == 2) {
2506	$::CONN->send ("apply $item->{tag}");
2507	} elsif ($ev->{button} == 3) {
2508	CFClient::UI::Menu->new (
2509	items => [
2510	["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2511	[
2512	$item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2513	sub { $::CONN->send ("lock $item->{tag}") },
2514	],
2515	["mark", sub { $::CONN->send ("mark $item->{tag}") }],
2516	["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2517	["drop", sub { $::CONN->send ("move 0 $item->{tag} 0") }],
2518	],
2519	)->popup ($ev);
2520	}
2521
2522	1
2523	},
2524	%args
2525	);
2526
2527	$self->add (new CFClient::UI::Face
2528	can_events => 0,
2529	face => $item->{face},
2530	anim => $item->{anim},
2531	animspeed => $item->{animspeed},
2532	);
2533
2534	$self->add (new CFClient::UI::Label
2535	can_events => 0,
2536	text => $desc,
2537	);
2538
2539	$self
2540	}
2541
2542	#############################################################################
2543
2544	package CFClient::UI::Inventory;
2545
2546	our @ISA = CFClient::UI::ScrolledWindow::;
2547
2548	sub new {
2549	my $class = shift;
2550
2551	my $self = $class->SUPER::new (
2552	scrolled => (new CFClient::UI::VBox),
2553	@_,	2723	@_,
2554	);	2724	);
2555		2725
2556	$self	2726	$self
2557	}	2727	}
…		…
2567	or ($a->{name} cmp $b->{name})	2737	or ($a->{name} cmp $b->{name})
2568	} @$items;	2738	} @$items;
2569		2739
2570	$self->{real_items} = \@items;	2740	$self->{real_items} = \@items;
2571		2741
		2742	my $row = 0;
2572	for my $item (@items) {	2743	for my $item (@items) {
2573	my $desc = $item->{nrof} < 2	2744	CFClient::Item::update_widgets $item;
2574	? $item->{name}
2575	: "$item->{nrof} $item->{name_pl}";
2576		2745
2577	$item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;	2746	$self->{scrolled}->add (0, $row, $item->{face_widget});
2578	}	2747	$self->{scrolled}->add (1, $row, $item->{desc_widget});
		2748	$self->{scrolled}->add (2, $row, $item->{weight_widget});
2579		2749
2580	$self->{scrolled}->add (@items);	2750	$row++;
		2751	}
2581		2752
2582	# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];	2753	# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2583	}	2754	}
2584		2755
2585	sub size_request {	2756	sub size_request {
…		…
2627		2798
2628	# popup given the event (must be a mouse button down event currently)	2799	# popup given the event (must be a mouse button down event currently)
2629	sub popup {	2800	sub popup {
2630	my ($self, $ev) = @_;	2801	my ($self, $ev) = @_;
2631		2802
2632	$self->emit ("popdown");	2803	$self->_emit ("popdown");
2633		2804
2634	# maybe save $GRAB? must be careful about events...	2805	# maybe save $GRAB? must be careful about events...
2635	$GRAB = $self;	2806	$GRAB = $self;
2636	$self->{button} = $ev->{button};	2807	$self->{button} = $ev->{button};
2637		2808
…		…
2652		2823
2653	if ($ev->{button} == $self->{button}) {	2824	if ($ev->{button} == $self->{button}) {
2654	undef $GRAB;	2825	undef $GRAB;
2655	$self->hide;	2826	$self->hide;
2656		2827
2657	$self->emit ("popdown");	2828	$self->_emit ("popdown");
2658	$self->{hover}[1]->() if $self->{hover};	2829	$self->{hover}[1]->() if $self->{hover};
2659	}	2830	}
2660	}	2831	}
2661		2832
2662	#############################################################################	2833	#############################################################################
2663		2834
2664	package CFClient::UI::Statusbox;	2835	package CFClient::UI::Statusbox;
2665		2836
2666	our @ISA = CFClient::UI::VBox::;	2837	our @ISA = CFClient::UI::VBox::;
		2838
		2839	sub new {
		2840	my $class = shift;
		2841
		2842	$class->SUPER::new (
		2843	fontsize => 0.8,
		2844	@_,
		2845	)
		2846	}
2667		2847
2668	sub reorder {	2848	sub reorder {
2669	my ($self) = @_;	2849	my ($self) = @_;
2670	my $NOW = time;	2850	my $NOW = time;
2671		2851
…		…
2690	? "<b>$item->{count} ×</b> $item->{text}"	2870	? "<b>$item->{count} ×</b> $item->{text}"
2691	: $item->{text};	2871	: $item->{text};
2692		2872
2693	for ($short) {	2873	for ($short) {
2694	s/^\s+//;	2874	s/^\s+//;
2695	s/\012.*/…/s;	2875	s/\s+/ /g;
2696	my $len = int 40 / $item->{fontsize};
2697	substr $_, $len, length, "…" if $len < length;
2698	}	2876	}
2699		2877
2700	new CFClient::UI::Label	2878	new CFClient::UI::Label
2701	markup => $short,	2879	markup => $short,
2702	tooltip => $item->{tooltip},	2880	tooltip => $item->{tooltip},
2703	tooltip_font => $::FONT_PROP,	2881	tooltip_font => $::FONT_PROP,
2704	tooltip_width => 0.67,	2882	tooltip_width => 0.67,
2705	fontsize => $item->{fontsize},	2883	fontsize => $item->{fontsize} || $self->{fontsize},
		2884	max_w => $::WIDTH * 0.44,
2706	color => $item->{color},	2885	fg => $item->{fg},
2707	can_events => 1,	2886	can_events => 1,
2708	can_hover => 1	2887	can_hover => 1
2709	};	2888	};
2710	}	2889	}
2711		2890
…		…
2716	sub add {	2895	sub add {
2717	my ($self, $text, %arg) = @_;	2896	my ($self, $text, %arg) = @_;
2718		2897
2719	$text =~ s/^\s+//;	2898	$text =~ s/^\s+//;
2720	$text =~ s/\s+$//;	2899	$text =~ s/\s+$//;
		2900
		2901	return unless $text;
2721		2902
2722	my $timeout = time + ((delete $arg{timeout}) || 60);	2903	my $timeout = time + ((delete $arg{timeout}) || 60);
2723		2904
2724	my $group = exists $arg{group} ? $arg{group} : ++$self->{id};	2905	my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2725		2906
…		…
2737	$self->{item}{$group} = {	2918	$self->{item}{$group} = {
2738	id => ++$self->{id},	2919	id => ++$self->{id},
2739	text => $text,	2920	text => $text,
2740	timeout => $timeout,	2921	timeout => $timeout,
2741	tooltip => $text,	2922	tooltip => $text,
2742	fontsize => 0.8,
2743	color => [0.8, 0.8, 0.8, 0.8],	2923	fg => [0.8, 0.8, 0.8, 0.8],
2744	pri => 0,	2924	pri => 0,
2745	count => 1,	2925	count => 1,
2746	%arg,	2926	%arg,
2747	};	2927	};
2748	}	2928	}
2749		2929
2750	$self->reorder;	2930	$self->reorder;
2751	}	2931	}
2752		2932
		2933	sub reconfigure {
		2934	my ($self) = @_;
		2935
		2936	delete $_->{label}
		2937	for values %{ $self->{item} || {} };
		2938
		2939	$self->reorder;
		2940	$self->SUPER::reconfigure;
		2941	}
		2942
2753	#############################################################################	2943	#############################################################################
2754		2944
2755	package CFClient::UI::Root;	2945	package CFClient::UI::Root;
2756		2946
2757	our @ISA = CFClient::UI::Container::;	2947	our @ISA = CFClient::UI::Container::;
…		…
2787	}	2977	}
2788		2978
2789	sub size_allocate {	2979	sub size_allocate {
2790	my ($self, $w, $h) = @_;	2980	my ($self, $w, $h) = @_;
2791		2981
2792	my $old_w = $self->{old_w}; $self->{old_w} = $w;
2793	my $old_h = $self->{old_h}; $self->{old_h} = $h;
2794
2795	CFClient::UI::rescale_widgets $w / $old_w, $h / $old_h
2796	if $old_w && $old_h && ($old_w != $w || $old_h != $h);
2797
2798	for my $child ($self->children) {	2982	for my $child ($self->children) {
2799	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};	2983	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2800		2984
		2985	$X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1
		2986	if exists $child->{req_x};
		2987
		2988	$Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1
		2989	if exists $child->{req_y};
		2990
2801	$X = List::Util::max 0, List::Util::min $w - $W, $X;	2991	$X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
2802	$Y = List::Util::max 0, List::Util::min $h - $H, $Y;	2992	$Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
		2993
2803	$child->configure ($X, $Y, $W, $H);	2994	$child->configure ($X, $Y, $W, $H);
2804	}	2995	}
2805	}	2996	}
2806		2997
2807	sub coord2local {	2998	sub coord2local {
…		…
2824	}	3015	}
2825		3016
2826	sub add {	3017	sub add {
2827	my ($self, @children) = @_;	3018	my ($self, @children) = @_;
2828		3019
		3020	for (my @widgets = @children; my $w = pop @widgets; ) {
		3021	push @widgets, $w->children;
		3022	$w->{root} = $self;
		3023	$w->{visible} = 1;
		3024	}
		3025
2829	for my $child (@children) {	3026	for my $child (@children) {
2830	$child->{toplevel} = 1;	3027	$child->{is_toplevel} = 1;
2831		3028
2832	# integerise window positions	3029	# integerise window positions
2833	$child->{x} = int $child->{x};	3030	$child->{x} = int $child->{x};
2834	$child->{y} = int $child->{y};	3031	$child->{y} = int $child->{y};
2835	}	3032	}
2836		3033
2837	$self->SUPER::add (@children);	3034	$self->SUPER::add (@children);
		3035	}
		3036
		3037	sub remove {
		3038	my ($self, @children) = @_;
		3039
		3040	$self->SUPER::remove (@children);
		3041
		3042	while (@children) {
		3043	my $w = pop @children;
		3044	push @children, $w->children;
		3045	$w->set_invisible;
		3046	}
2838	}	3047	}
2839		3048
2840	sub on_refresh {	3049	sub on_refresh {
2841	my ($self, $id, $cb) = @_;	3050	my ($self, $id, $cb) = @_;
2842		3051
…		…
2895	$w = 0 if $w < 0;	3104	$w = 0 if $w < 0;
2896	$h = 0 if $h < 0;	3105	$h = 0 if $h < 0;
2897		3106
2898	$widget->{w} = $w;	3107	$widget->{w} = $w;
2899	$widget->{h} = $h;	3108	$widget->{h} = $h;
2900	$widget->size_allocate ($w, $h);
2901	$widget->emit (size_allocate => $w, $h);	3109	$widget->emit (size_allocate => $w, $h);
2902	}	3110	}
2903	}	3111	}
2904		3112
2905	while ($self->{post_alloc_hook}) {	3113	while ($self->{post_alloc_hook}) {
…		…
2911	glClearColor +($::CFG->{fow_intensity}) x 3, 1;	3119	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2912	glClear GL_COLOR_BUFFER_BIT;	3120	glClear GL_COLOR_BUFFER_BIT;
2913		3121
2914	glMatrixMode GL_PROJECTION;	3122	glMatrixMode GL_PROJECTION;
2915	glLoadIdentity;	3123	glLoadIdentity;
2916	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000;	3124	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2917	glMatrixMode GL_MODELVIEW;	3125	glMatrixMode GL_MODELVIEW;
2918	glLoadIdentity;	3126	glLoadIdentity;
2919		3127
2920	$self->_draw;	3128	$self->_draw;
2921	}	3129	}
…		…
2923	#############################################################################	3131	#############################################################################
2924		3132
2925	package CFClient::UI;	3133	package CFClient::UI;
2926		3134
2927	$ROOT = new CFClient::UI::Root;	3135	$ROOT = new CFClient::UI::Root;
2928	$TOOLTIP = new CFClient::UI::Tooltip;	3136	$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2929		3137
2930	1	3138	1
2931		3139

Diff Legend

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