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.130 by root, Tue Apr 18 01:51:06 2006 UTC vs.
Revision 1.158 by root, Mon Apr 24 02:41:48 2006 UTC

…		…
8	use CFClient;	8	use CFClient;
9		9
10	our ($FOCUS, $HOVER, $GRAB); # various widgets	10	our ($FOCUS, $HOVER, $GRAB); # various widgets
11		11
12	our $ROOT;	12	our $ROOT;
		13	our $TOOLTIP;
13	our $BUTTON_STATE;	14	our $BUTTON_STATE;
		15
		16	sub check_tooltip {
		17	if (!$GRAB) {
		18	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
		19	if (exists $widget->{tooltip}) {
		20
		21	if ($TOOLTIP->{owner} != $widget) {
		22	$TOOLTIP->{owner} = $widget;
		23
		24	my $tip = $widget->{tooltip};
		25
		26	$tip = $tip->($widget) if CODE:: eq ref $tip;
		27
		28	$TOOLTIP->set_text ($widget->{tooltip});
		29	$TOOLTIP->move ($widget->coord2global ($widget->{w}, 0));
		30	$TOOLTIP->show;
		31	}
		32
		33	return;
		34	}
		35	}
		36	}
		37
		38	$TOOLTIP->hide;
		39	delete $TOOLTIP->{owner};
		40	}
14		41
15	# class methods for events	42	# class methods for events
16	sub feed_sdl_key_down_event {	43	sub feed_sdl_key_down_event {
17	$FOCUS->key_down ($_[0]) if $FOCUS;	44	$FOCUS->key_down ($_[0]) if $FOCUS;
18	}	45	}
…		…
21	$FOCUS->key_up ($_[0]) if $FOCUS;	48	$FOCUS->key_up ($_[0]) if $FOCUS;
22	}	49	}
23		50
24	sub feed_sdl_button_down_event {	51	sub feed_sdl_button_down_event {
25	my ($ev) = @_;	52	my ($ev) = @_;
26	my ($x, $y) = ($ev->motion_x, $ev->motion_y);	53	my ($x, $y) = ($ev->{x}, $ev->{y});
27		54
28	if (!$BUTTON_STATE) {	55	if (!$BUTTON_STATE) {
29	my $widget = $ROOT->find_widget ($x, $y);	56	my $widget = $ROOT->find_widget ($x, $y);
30		57
31	$GRAB = $widget;	58	$GRAB = $widget;
32	$GRAB->update if $GRAB;	59	$GRAB->update if $GRAB;
33	}
34		60
		61	check_tooltip;
		62	}
		63
35	$BUTTON_STATE |= 1 << ($ev->button - 1);	64	$BUTTON_STATE |= 1 << ($ev->{button} - 1);
36		65
37	$GRAB->button_down ($ev, $GRAB->coord2local ($x, $y)) if $GRAB;	66	$GRAB->button_down ($ev, $GRAB->coord2local ($x, $y)) if $GRAB;
38	}	67	}
39		68
40	sub feed_sdl_button_up_event {	69	sub feed_sdl_button_up_event {
41	my ($ev) = @_;	70	my ($ev) = @_;
42	my ($x, $y) = ($ev->motion_x, $ev->motion_y);	71	my ($x, $y) = ($ev->{x}, $ev->{y});
43		72
44	my $widget = $GRAB || $ROOT->find_widget ($x, $y);	73	my $widget = $GRAB || $ROOT->find_widget ($x, $y);
45		74
46	$BUTTON_STATE &= ~(1 << ($ev->button - 1));	75	$BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
47		76
48	$GRAB->button_up ($ev, $GRAB->coord2local ($x, $y)) if $GRAB;	77	$GRAB->button_up ($ev, $GRAB->coord2local ($x, $y)) if $GRAB;
49		78
50	if (!$BUTTON_STATE) {	79	if (!$BUTTON_STATE) {
51	my $grab = $GRAB; undef $GRAB;	80	my $grab = $GRAB; undef $GRAB;
52	$grab->update if $grab;	81	$grab->update if $grab;
53	$GRAB->update if $GRAB;	82	$GRAB->update if $GRAB;
		83
		84	check_tooltip;
54	}	85	}
55	}	86	}
56		87
57	sub feed_sdl_motion_event {	88	sub feed_sdl_motion_event {
58	my ($ev) = @_;	89	my ($ev) = @_;
59	my ($x, $y) = ($ev->motion_x, $ev->motion_y);	90	my ($x, $y) = ($ev->{x}, $ev->{y});
60		91
61	my $widget = $GRAB || $ROOT->find_widget ($x, $y);	92	my $widget = $GRAB || $ROOT->find_widget ($x, $y);
62		93
63	if ($widget != $HOVER) {	94	if ($widget != $HOVER) {
64	my $hover = $HOVER; $HOVER = $widget;	95	my $hover = $HOVER; $HOVER = $widget;
65		96
66	$hover->update if $hover && $hover->{can_hover};	97	$hover->update if $hover && $hover->{can_hover};
67	$HOVER->update if $HOVER && $HOVER->{can_hover};	98	$HOVER->update if $HOVER && $HOVER->{can_hover};
		99
		100	check_tooltip;
68	}	101	}
69		102
70	$HOVER->mouse_motion ($ev, $HOVER->coord2local ($x, $y)) if $HOVER;	103	$HOVER->mouse_motion ($ev, $HOVER->coord2local ($x, $y)) if $HOVER;
71	}	104	}
72		105
…		…
87		120
88	package CFClient::UI::Base;	121	package CFClient::UI::Base;
89		122
90	use strict;	123	use strict;
91		124
92	use SDL::OpenGL;	125	use CFClient::OpenGL;
93		126
94	sub new {	127	sub new {
95	my $class = shift;	128	my $class = shift;
96		129
97	my $self = bless {	130	my $self = bless {
98	x => 0,	131	x => 0,
99	y => 0,	132	y => 0,
100	z => 0,	133	z => 0,
101	w => -1,	134	can_events => 1,
102	h => -1,
103	@_	135	@_
104	}, $class;	136	}, $class;
105		137
106	for (keys %$self) {	138	for (keys %$self) {
107	if (/^connect_(.*)$/) {	139	if (/^connect_(.*)$/) {
…		…
110	}	142	}
111		143
112	$self	144	$self
113	}	145	}
114		146
		147	sub show {
		148	my ($self) = @_;
		149
		150	return if $self->{parent};
		151
		152	$CFClient::UI::ROOT->add ($self);
		153	}
		154
		155	sub hide {
		156	my ($self) = @_;
		157
		158	return unless $self->{parent};
		159
		160	$self->{parent}->remove ($self);
		161	}
		162
115	sub move {	163	sub move {
116	my ($self, $x, $y, $z) = @_;	164	my ($self, $x, $y, $z) = @_;
117		165
118	$self->{x} = int $x;	166	$self->{x} = int $x;
119	$self->{y} = int $y;	167	$self->{y} = int $y;
120	$self->{z} = $z if defined $z;	168	$self->{z} = $z if defined $z;
121		169
122	$self->update;	170	$self->update;
123	}	171	}
124		172
125	sub needs_redraw {	173	sub set_size {
126	0	174	my ($self, $w, $h) = @_;
		175
		176	$self->{user_w} = $w;
		177	$self->{user_h} = $h;
		178
		179	$self->check_size;
127	}	180	}
128		181
129	sub size_request {	182	sub size_request {
130	require Carp;	183	require Carp;
131	Carp::confess "size_request is abtract";	184	Carp::confess "size_request is abstract";
132	}	185	}
133		186
134	sub configure {	187	sub configure {
135	my ($self, $x, $y, $w, $h) = @_;	188	my ($self, $x, $y, $w, $h) = @_;
136		189
		190	if ($self->{aspect}) {
		191	my $w2 = List::Util::min $w, int $h * $self->{aspect};
		192	my $h2 = List::Util::min $h, int $w / $self->{aspect};
		193
		194	# use alignment to adjust x, y
		195
		196	$x += int +($w - $w2) * 0.5;
		197	$y += int +($h - $h2) * 0.5;
		198
		199	($w, $h) = ($w2, $h2);
		200	}
		201
		202	if ($self->{x} != $x || $self->{y} != $y) {
137	$self->{x} = $x;	203	$self->{x} = $x;
138	$self->{y} = $y;	204	$self->{y} = $y;
		205	$self->update;
		206	}
139		207
140	return unless $self->{w} != $w || $self->{h} != $h;	208	if ($self->{w} != $w || $self->{h} != $h) {
141
142	$self->{w} = $w;	209	$self->{w} = $w;
143	$self->{h} = $h;	210	$self->{h} = $h;
144		211
145	$self->size_allocate ($w, $h);	212	$self->size_allocate ($w, $h);
		213	$self->update;
		214	}
146	}	215	}
147		216
148	sub size_allocate {	217	sub size_allocate {
149	# nothing to be done	218	# nothing to be done
		219	}
		220
		221	sub set_max_size {
		222	my ($self, $w, $h) = @_;
		223
		224	delete $self->{max_w}; $self->{max_w} = $w if $w;
		225	delete $self->{max_h}; $self->{max_h} = $h if $h;
150	}	226	}
151		227
152	# return top left coordinates	228	# return top left coordinates
153	sub _topleft {	229	sub _topleft {
154	my ($self, $x, $y) = @_;	230	my ($self, $x, $y) = @_;
…		…
248	}	324	}
249		325
250	sub find_widget {	326	sub find_widget {
251	my ($self, $x, $y) = @_;	327	my ($self, $x, $y) = @_;
252		328
		329	return () unless $self->{can_events};
		330
253	return $self	331	return $self
254	if $x >= $self->{x} && $x < $self->{x} + $self->{w}	332	if $x >= $self->{x} && $x < $self->{x} + $self->{w}
255	&& $y >= $self->{y} && $y < $self->{y} + $self->{h};	333	&& $y >= $self->{y} && $y < $self->{y} + $self->{h};
256		334
257	()	335	()
…		…
264	}	342	}
265		343
266	sub check_size {	344	sub check_size {
267	my ($self) = @_;	345	my ($self) = @_;
268		346
269	my ($w, $h) = $self->size_request;	347	$self->{parent}
		348	or return 1;
270		349
		350	my ($w, $h) = $self->{user_w} && $self->{user_h}
		351	? @$self{qw(user_w user_h)}
		352	: $self->size_request;
		353
271	if ($w != $self->{req_w} || $h != $self->{req_h}) {	354	if ($w != $self->{req_w} || $h != $self->{req_h}) {
272	$self->{req_w} = $w;	355	$self->{req_w} = $w;
273	$self->{req_h} = $h;	356	$self->{req_h} = $h;
274		357
275	$self->{parent}->check_size	358	$self->{parent}->check_size
276	if $self->{parent};
277
278	$self->size_allocate ($w, $h);	359	or $self->size_allocate (
279	$self->update;	360	(List::Util::max $self->{w}, $w),
		361	(List::Util::max $self->{h}, $h),
		362	);
		363
		364	1
		365	} else {
		366	0
280	}	367	}
281	}	368	}
282		369
283	sub update {	370	sub update {
284	my ($self) = @_;	371	my ($self) = @_;
…		…
288	}	375	}
289		376
290	sub connect {	377	sub connect {
291	my ($self, $signal, $cb) = @_;	378	my ($self, $signal, $cb) = @_;
292		379
293	push @{ $self->{cb}{$signal} }, $cb;	380	push @{ $self->{signal_cb}{$signal} }, $cb;
294	}	381	}
295		382
296	sub emit {	383	sub emit {
297	my ($self, $signal, @args) = @_;	384	my ($self, $signal, @args) = @_;
298		385
		386	for my $cb (@{$self->{signal_cb}{$signal} || []}) {
299	$_->($self, @args)	387	$cb->($self, @args);
300	for @{$self->{cb}{$signal} || []};	388	}
301	}	389	}
302		390
303	sub DESTROY {	391	sub DESTROY {
304	my ($self) = @_;	392	my ($self) = @_;
305		393
…		…
311	package CFClient::UI::DrawBG;	399	package CFClient::UI::DrawBG;
312		400
313	our @ISA = CFClient::UI::Base::;	401	our @ISA = CFClient::UI::Base::;
314		402
315	use strict;	403	use strict;
316	use SDL::OpenGL;	404	use CFClient::OpenGL;
317		405
318	sub new {	406	sub new {
319	my $class = shift;	407	my $class = shift;
320		408
321	# range [value, low, high, page]	409	# range [value, low, high, page]
…		…
350		438
351	package CFClient::UI::Empty;	439	package CFClient::UI::Empty;
352		440
353	our @ISA = CFClient::UI::Base::;	441	our @ISA = CFClient::UI::Base::;
354		442
		443	sub new {
		444	my ($class, %arg) = @_;
		445	$class->SUPER::new (can_events => 0, %arg);
		446	}
		447
355	sub size_request {	448	sub size_request {
356	(0, 0)	449	(0, 0)
357	}	450	}
358		451
359	sub draw { }	452	sub draw { }
…		…
367	sub new {	460	sub new {
368	my ($class, %arg) = @_;	461	my ($class, %arg) = @_;
369		462
370	my $children = delete $arg{children} || [];	463	my $children = delete $arg{children} || [];
371		464
372	my $self = $class->SUPER::new (children => [], %arg);	465	my $self = $class->SUPER::new (children => [], can_events => 0, %arg);
373	$self->add ($_) for @$children;	466	$self->add ($_) for @$children;
374		467
375	$self	468	$self
376	}	469	}
377		470
…		…
385	$self->{children} = [	478	$self->{children} = [
386	sort { $a->{z} <=> $b->{z} }	479	sort { $a->{z} <=> $b->{z} }
387	@{$self->{children}}, $child	480	@{$self->{children}}, $child
388	];	481	];
389		482
390	$self->{w} = $self->{h} = -1;
391
392	$child->check_size;	483	$child->check_size;
393	}	484	}
394		485
395	sub remove {	486	sub remove {
396	my ($self, $widget) = @_;	487	my ($self, $child) = @_;
397		488
		489	delete $child->{parent};
		490
398	$self->{children} = [ grep $_ != $widget, @{ $self->{children} } ];	491	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
399		492
400	$self->check_size;	493	$self->check_size;
		494	$self->update;
401	}	495	}
402		496
403	sub find_widget {	497	sub find_widget {
404	my ($self, $x, $y) = @_;	498	my ($self, $x, $y) = @_;
405		499
…		…
435		529
436	$class->SUPER::new (children => [$child], %arg)	530	$class->SUPER::new (children => [$child], %arg)
437	}	531	}
438		532
439	sub add {	533	sub add {
440	my ($self, $widget) = @_;	534	my ($self, $child) = @_;
441		535
442	$self->{children} = [];	536	$self->{children} = [];
443		537
444	$self->SUPER::add ($widget);	538	$self->SUPER::add ($child);
445	}	539	}
446		540
447	sub remove {	541	sub remove {
448	my ($self, $widget) = @_;	542	my ($self, $widget) = @_;
449		543
…		…
469		563
470	package CFClient::UI::Window;	564	package CFClient::UI::Window;
471		565
472	our @ISA = CFClient::UI::Bin::;	566	our @ISA = CFClient::UI::Bin::;
473		567
474	use SDL::OpenGL;	568	use CFClient::OpenGL;
475		569
476	sub new {	570	sub new {
477	my ($class, %arg) = @_;	571	my ($class, %arg) = @_;
478		572
479	my $self = $class->SUPER::new (%arg);	573	my $self = $class->SUPER::new (%arg);
…		…
533	sub new { die }	627	sub new { die }
534		628
535	sub size_request {	629	sub size_request {
536	my ($self) = @_;	630	my ($self) = @_;
537		631
538	@$self{qw(child_w child_h)} = $self->child->size_request;	632	@$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
539	$self->child->size_allocate (0, 0, @$self{qw(child_w child_h)});	633	$self->child->size_allocate (0, 0, @$self{qw(child_w child_h)});
540		634
541	@$self{qw(child_w child_h)}	635	@$self{qw(child_w child_h)}
542	}	636	}
543		637
…		…
552		646
553	package CFClient::UI::Frame;	647	package CFClient::UI::Frame;
554		648
555	our @ISA = CFClient::UI::Bin::;	649	our @ISA = CFClient::UI::Bin::;
556		650
557	use SDL::OpenGL;	651	use CFClient::OpenGL;
558
559	sub size_request {
560	my ($self) = @_;
561	my $chld = $self->child
562	or return (0, 0);
563
564	$chld->move (2, 2);
565
566	map { $_ + 4 } $chld->size_request;
567	}
568
569	sub size_allocate {
570	my ($self, $x, $y, $w, $h) = @_;
571
572	$self->child->configure (2, 2, $w - 4, $h - 4);
573	}
574
575	sub _draw {
576	my ($self) = @_;
577
578	my $chld = $self->child;
579
580	my ($w, $h) = $chld->size_request;
581
582	glBegin GL_QUADS;
583	glColor 0, 0, 0;
584	glVertex 0 , 0;
585	glVertex 0 , $h + 4;
586	glVertex $w + 4 , $h + 4;
587	glVertex $w + 4 , 0;
588	glEnd;
589
590	$chld->draw;
591	}
592
593	#############################################################################
594
595	package CFClient::UI::FancyFrame;
596
597	our @ISA = CFClient::UI::Bin::;
598
599	use SDL::OpenGL;
600
601	my @tex =
602	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
603	qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
604		652
605	sub new {	653	sub new {
606	my $class = shift;	654	my $class = shift;
607		655
608	# TODO: user_x, user_y, overwrite moveto?
609
610	$class->SUPER::new (	656	my $self = $class->SUPER::new (
611	bg => [1, 1, 1, 1],	657	bg => [1, 1, 1, 1],
612	border_bg => [1, 1, 1, 1],	658	border_bg => [1, 1, 1, 1],
613	border => int $::FONTSIZE * 0.8,	659	border => 0.8,
614	@_	660	@_
615	)	661	);
		662
		663	$self
		664	}
		665
		666	sub _draw {
		667	my ($self) = @_;
		668
		669	my ($w, $h) = ($self->{w}, $self->{h});
		670
		671	glEnable GL_BLEND;
		672	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
		673	glEnable GL_TEXTURE_2D;
		674	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		675
		676	# glBegin GL_QUADS;
		677	# glColor 0, 0, 0, 0;
		678	# glVertex 0 , 0;
		679	# glVertex 0 , $h;
		680	# glVertex $w, $h;
		681	# glVertex $w, 0;
		682	# glEnd;
		683
		684
		685	$self->child->draw;
		686	glDisable GL_BLEND;
		687	glDisable GL_TEXTURE_2D;
		688	}
		689
		690	#############################################################################
		691
		692	package CFClient::UI::FancyFrame;
		693
		694	our @ISA = CFClient::UI::Bin::;
		695
		696	use CFClient::OpenGL;
		697
		698	my @tex =
		699	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
		700	qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
		701
		702	sub new {
		703	my $class = shift;
		704
		705	# TODO: user_x, user_y, overwrite moveto?
		706
		707	my $self = $class->SUPER::new (
		708	bg => [1, 1, 1, 1],
		709	border_bg => [1, 1, 1, 1],
		710	border => 0.8,
		711	can_events => 1,
		712	@_
		713	);
		714
		715	$self->{title} &&= new CFClient::UI::Label
		716	align => 0,
		717	valign => 1,
		718	text => $self->{title},
		719	fontsize => 1;
		720
		721	$self
		722	}
		723
		724	sub border {
		725	int $_[0]{border} * $::FONTSIZE
616	}	726	}
617		727
618	sub size_request {	728	sub size_request {
619	my ($self) = @_;	729	my ($self) = @_;
620		730
621	return ($self->{user_w}, $self->{user_h}) if $self->{user_w} && $self->{user_h};
622
623	my ($w, $h) = $self->SUPER::size_request;	731	my ($w, $h) = $self->SUPER::size_request;
624		732
625	(	733	(
626	$w + $self->{border} * 2,	734	$w + $self->border * 2,
627	$h + $self->{border} * 2,	735	$h + $self->border * 2,
628	)	736	)
629	}	737	}
630		738
631	sub size_allocate {	739	sub size_allocate {
632	my ($self, $w, $h) = @_;	740	my ($self, $w, $h) = @_;
633		741
634	$h -= List::Util::max 0, $self->{border} * 2;	742	$h -= List::Util::max 0, $self->border * 2;
635	$w -= List::Util::max 0, $self->{border} * 2;	743	$w -= List::Util::max 0, $self->border * 2;
636		744
		745	$self->{title}->configure ($self->border, $self->border - $::FONTSIZE * 2, $w, $::FONTSIZE * 2)
		746	if $self->{title};
		747
637	$self->child->configure ($self->{border}, $self->{border}, $w, $h);	748	$self->child->configure ($self->border, $self->border, $w, $h);
638	}	749	}
639		750
640	sub button_down {	751	sub button_down {
641	my ($self, $ev, $x, $y) = @_;	752	my ($self, $ev, $x, $y) = @_;
642		753
		754	my $border = $self->border;
		755
643	if ($x < $self->{w} && $x >= $self->{w} - $self->{border}	756	if ($x < $self->{w} && $x >= $self->{w} - $border
644	&& $y < $self->{h} && $y >= $self->{h} - $self->{border}) {	757	&& $y < $self->{h} && $y >= $self->{h} - $border) {
645		758
646	my ($ox, $oy) = ($ev->button_x, $ev->button_y);	759	my ($ox, $oy) = ($ev->{x}, $ev->{y});
647	my ($bw, $bh) = ($self->{w}, $self->{h});	760	my ($bw, $bh) = ($self->{w}, $self->{h});
648		761
649	$self->{motion} = sub {	762	$self->{motion} = sub {
650	my ($ev, $x, $y) = @_;	763	my ($ev, $x, $y) = @_;
651		764
652	($x, $y) = ($ev->motion_x, $ev->motion_y);	765	($x, $y) = ($ev->{x}, $ev->{y});
653		766
654	$self->{user_w} = $bw + $x - $ox;	767	$self->{user_w} = $bw + $x - $ox;
655	$self->{user_h} = $bh + $y - $oy;	768	$self->{user_h} = $bh + $y - $oy;
656	$self->check_size;	769	$self->check_size;
657	};	770	};
658		771
659	} elsif ($x >= 0 && $x < $self->{w}	772	} elsif ($x >= 0 && $x < $self->{w}
660	&& $y >= 0 && $y < $self->{border}) {	773	&& $y >= 0 && $y < $border) {
661		774
662	my ($ox, $oy) = ($ev->button_x, $ev->button_y);	775	my ($ox, $oy) = ($ev->{x}, $ev->{y});
663	my ($bx, $by) = ($self->{x}, $self->{y});	776	my ($bx, $by) = ($self->{x}, $self->{y});
664		777
665	$self->{motion} = sub {	778	$self->{motion} = sub {
666	my ($ev, $x, $y) = @_;	779	my ($ev, $x, $y) = @_;
667		780
668	($x, $y) = ($ev->motion_x, $ev->motion_y);	781	($x, $y) = ($ev->{x}, $ev->{y});
669		782
670	$self->move ($bx + $x - $ox, $by + $y - $oy);	783	$self->move ($bx + $x - $ox, $by + $y - $oy);
671	$self->update;	784	$self->update;
672	};	785	};
673	}	786	}
…		…
694	glEnable GL_BLEND;	807	glEnable GL_BLEND;
695	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	808	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
696	glEnable GL_TEXTURE_2D;	809	glEnable GL_TEXTURE_2D;
697	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	810	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
698		811
		812	my $border = $self->border;
		813
699	glColor @{ $self->{border_bg} };	814	glColor @{ $self->{border_bg} };
700	$tex[1]->draw_quad (0, 0, $w, $self->{border});	815	$tex[1]->draw_quad (0, 0, $w, $border);
701	$tex[3]->draw_quad (0, $self->{border}, $self->{border}, $ch);	816	$tex[3]->draw_quad (0, $border, $border, $ch);
702	$tex[2]->draw_quad ($w - $self->{border}, $self->{border}, $self->{border}, $ch);	817	$tex[2]->draw_quad ($w - $border, $border, $border, $ch);
703	$tex[4]->draw_quad (0, $h - $self->{border}, $w, $self->{border});	818	$tex[4]->draw_quad (0, $h - $border, $w, $border);
704		819
705	my $bg = $tex[0];	820	my $bg = $tex[0];
706		821
707	# TODO: repeat texture not scale	822	# TODO: repeat texture not scale
708	my $rep_x = $cw / $bg->{w};	823	my $rep_x = $cw / $bg->{w};
…		…
711	glColor @{ $self->{bg} };	826	glColor @{ $self->{bg} };
712		827
713	$bg->{s} = $rep_x;	828	$bg->{s} = $rep_x;
714	$bg->{t} = $rep_y;	829	$bg->{t} = $rep_y;
715	$bg->{wrap_mode} = 1;	830	$bg->{wrap_mode} = 1;
716	$bg->draw_quad ($self->{border}, $self->{border}, $cw, $ch);	831	$bg->draw_quad ($border, $border, $cw, $ch);
717		832
718	glDisable GL_TEXTURE_2D;	833	glDisable GL_TEXTURE_2D;
719	glDisable GL_BLEND;	834	glDisable GL_BLEND;
720		835
		836	$self->{title}->draw if $self->{title};
721	$self->child->draw;	837	$self->child->draw;
722	}	838	}
723		839
724	#############################################################################	840	#############################################################################
725		841
…		…
727		843
728	our @ISA = CFClient::UI::Base::;	844	our @ISA = CFClient::UI::Base::;
729		845
730	use List::Util qw(max sum);	846	use List::Util qw(max sum);
731		847
732	use SDL::OpenGL;	848	use CFClient::OpenGL;
733		849
734	sub new {	850	sub new {
735	my $class = shift;	851	my $class = shift;
736		852
737	$class->SUPER::new (	853	$class->SUPER::new (
…		…
744	my ($self, $x, $y, $child) = @_;	860	my ($self, $x, $y, $child) = @_;
745		861
746	$child->set_parent ($self);	862	$child->set_parent ($self);
747	$self->{children}[$y][$x] = $child;	863	$self->{children}[$y][$x] = $child;
748		864
749	$self->{w} = $self->{h} = -1;
750
751	$child->check_size;	865	$child->check_size;
752	}	866	}
753		867
754	# TODO: move to container class maybe? send childs a signal on removal?	868	# TODO: move to container class maybe? send childs a signal on removal?
755	sub clear {	869	sub clear {
…		…
769	or next;	883	or next;
770		884
771	for my $x (0 .. $#$row) {	885	for my $x (0 .. $#$row) {
772	my $widget = $row->[$x]	886	my $widget = $row->[$x]
773	or next;	887	or next;
774	my ($w, $h) = $widget->size_request;	888	my ($w, $h) = @$widget{qw(req_w req_h)};
775		889
776	$w[$x] = max $w[$x], $w;	890	$w[$x] = max $w[$x], $w;
777	$h[$y] = max $h[$y], $h;	891	$h[$y] = max $h[$y], $h;
778	}	892	}
779	}	893	}
…		…
884		998
885	($h, $w) = ($w, $h);	999	($h, $w) = ($w, $h);
886		1000
887	my $children = $self->{children};	1001	my $children = $self->{children};
888		1002
889	my @h = map +($_->size_request)[0], @$children;	1003	my @h = map $_->{req_w}, @$children;
890		1004
891	my $req_h = List::Util::sum @h;	1005	my $req_h = List::Util::sum @h;
892		1006
893	if ($req_h > $h) {	1007	if ($req_h > $h) {
894	# ah well, not enough space	1008	# ah well, not enough space
…		…
942	sub size_allocate {	1056	sub size_allocate {
943	my ($self, $w, $h) = @_;	1057	my ($self, $w, $h) = @_;
944		1058
945	my $children = $self->{children};	1059	my $children = $self->{children};
946		1060
947	my @h = map +($_->size_request)[1], @$children;	1061	my @h = map $_->{req_h}, @$children;
948		1062
949	my $req_h = List::Util::sum @h;	1063	my $req_h = List::Util::sum @h;
950		1064
951	if ($req_h > $h) {	1065	if ($req_h > $h) {
952	# ah well, not enough space	1066	# ah well, not enough space
…		…
980		1094
981	package CFClient::UI::Label;	1095	package CFClient::UI::Label;
982		1096
983	our @ISA = CFClient::UI::Base::;	1097	our @ISA = CFClient::UI::Base::;
984		1098
985	use SDL::OpenGL;	1099	use CFClient::OpenGL;
986		1100
987	sub new {	1101	sub new {
988	my ($class, %arg) = @_;	1102	my ($class, %arg) = @_;
989		1103
990	my $self = $class->SUPER::new (	1104	my $self = $class->SUPER::new (
991	fg => [1, 1, 1],	1105	fg => [1, 1, 1],
		1106	#font => default_font
992	fontsize => $::FONTSIZE,	1107	fontsize => 1,
993	text => "",	1108	text => "",
994	align => -1,	1109	align => -1,
995	valign => -1,	1110	valign => -1,
996	padding => 2,	1111	padding => 2,
997	layout => new CFClient::Layout,	1112	layout => new CFClient::Layout,
		1113	can_events => 0,
998	%arg	1114	%arg
999	);	1115	);
1000		1116
1001	$self->{xxx}++ if $self->{text} eq "Client Setup" && $self->{align};#d#	1117	if (exists $self->{template}) {
		1118	my $layout = new CFClient::Layout;
		1119	$layout->set_text (delete $self->{template});
		1120	$self->{template} = $layout;
		1121	}
1002		1122
1003	$self->set_text (delete $self->{text}) if exists $self->{text};	1123	$self->set_text (delete $self->{text}) if exists $self->{text};
1004	$self->set_markup (delete $self->{markup}) if exists $self->{markup};	1124	$self->set_markup (delete $self->{markup}) if exists $self->{markup};
1005		1125
1006	$self	1126	$self
…		…
1020	my ($self, $text) = @_;	1140	my ($self, $text) = @_;
1021		1141
1022	$self->{layout}->set_text ($text);	1142	$self->{layout}->set_text ($text);
1023		1143
1024	delete $self->{texture};	1144	delete $self->{texture};
		1145	$self->check_size;
1025	$self->update;	1146	$self->update;
1026	}	1147	}
1027		1148
1028	sub set_markup {	1149	sub set_markup {
1029	my ($self, $markup) = @_;	1150	my ($self, $markup) = @_;
1030		1151
1031	$self->{layout}->set_markup ($markup);	1152	$self->{layout}->set_markup ($markup);
1032		1153
1033	delete $self->{texture};	1154	delete $self->{texture};
		1155	$self->check_size;
1034	$self->update;	1156	$self->update;
1035	}	1157	}
1036		1158
1037	sub size_request {	1159	sub size_request {
1038	my ($self) = @_;	1160	my ($self) = @_;
1039		1161
1040	$self->{layout}->set_width;	1162	$self->{layout}->set_font ($self->{font}) if $self->{font};
		1163	$self->{layout}->set_width ($self->{max_w} || -1);
1041	$self->{layout}->set_height ($self->{fontsize});	1164	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1042		1165
1043	my ($w, $h) = $self->{layout}->size;	1166	my ($w, $h) = $self->{layout}->size;
		1167
		1168	if (exists $self->{template}) {
		1169	$self->{template}->set_font ($self->{font}) if $self->{font};
		1170	$self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
		1171
		1172	my ($w2, $h2) = $self->{template}->size;
		1173
		1174	$w = List::Util::max $w, $w2;
		1175	$h = List::Util::max $h, $h2;
		1176	}
1044		1177
1045	(	1178	(
1046	$w + $self->{padding} * 2,	1179	$w + $self->{padding} * 2,
1047	$h + $self->{padding} * 2,	1180	$h + $self->{padding} * 2,
1048	)	1181	)
…		…
1052	my ($self, $w, $h) = @_;	1185	my ($self, $w, $h) = @_;
1053		1186
1054	delete $self->{texture};	1187	delete $self->{texture};
1055	}	1188	}
1056		1189
1057	sub update {	1190	sub set_fontsize {
1058	my ($self) = @_;	1191	my ($self, $fontsize) = @_;
1059		1192
		1193	$self->{fontsize} = $fontsize;
1060	delete $self->{texture};	1194	delete $self->{texture};
		1195	$self->check_size;
1061	$self->SUPER::update;	1196	$self->update;
1062	}	1197	}
1063		1198
1064	sub _draw {	1199	sub _draw {
1065	my ($self) = @_;	1200	my ($self) = @_;
1066		1201
1067	my $tex = $self->{texture} ||= do {	1202	my $tex = $self->{texture} ||= do {
		1203	$self->{layout}->set_font ($self->{font}) if $self->{font};
1068	$self->{layout}->set_width ($self->{w});	1204	$self->{layout}->set_width ($self->{w});
1069	$self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize});	1205	$self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE);
1070	new_from_layout CFClient::Texture $self->{layout}	1206	new_from_layout CFClient::Texture $self->{layout}
1071	};	1207	};
1072		1208
1073	glEnable GL_BLEND;	1209	glEnable GL_BLEND;
1074	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	1210	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
…		…
1099		1235
1100	package CFClient::UI::EntryBase;	1236	package CFClient::UI::EntryBase;
1101		1237
1102	our @ISA = CFClient::UI::Label::;	1238	our @ISA = CFClient::UI::Label::;
1103		1239
1104	use SDL;	1240	use CFClient::OpenGL;
1105	use SDL::OpenGL;
1106		1241
1107	sub new {	1242	sub new {
1108	my $class = shift;	1243	my $class = shift;
1109		1244
1110	$class->SUPER::new (	1245	$class->SUPER::new (
…		…
1113	active_bg => [1, 1, 1, 0.5],	1248	active_bg => [1, 1, 1, 0.5],
1114	active_fg => [0, 0, 0],	1249	active_fg => [0, 0, 0],
1115	can_hover => 1,	1250	can_hover => 1,
1116	can_focus => 1,	1251	can_focus => 1,
1117	valign => 0,	1252	valign => 0,
		1253	can_events => 1,
1118	@_	1254	@_
1119	)	1255	)
1120	}	1256	}
1121		1257
1122	sub _set_text {	1258	sub _set_text {
…		…
1124		1260
1125	delete $self->{cur_h};	1261	delete $self->{cur_h};
1126		1262
1127	return if $self->{text} eq $text;	1263	return if $self->{text} eq $text;
1128		1264
		1265	delete $self->{texture};
		1266
1129	$self->{last_activity} = $::NOW;	1267	$self->{last_activity} = $::NOW;
1130	$self->{text} = $text;	1268	$self->{text} = $text;
1131		1269
1132	$text =~ s/./*/g if $self->{hidden};	1270	$text =~ s/./*/g if $self->{hidden};
1133	$self->{layout}->set_text ("$text ");	1271	$self->{layout}->set_text ("$text ");
…		…
1148	}	1286	}
1149		1287
1150	sub size_allocate {	1288	sub size_allocate {
1151	my ($self, $w, $h) = @_;	1289	my ($self, $w, $h) = @_;
1152		1290
1153	$self->_set_text ($self->{text});	1291	$self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1154	}	1292	}
1155		1293
1156	sub set_text {	1294	sub set_text {
1157	my ($self, $text) = @_;	1295	my ($self, $text) = @_;
1158		1296
…		…
1162	}	1300	}
1163		1301
1164	sub key_down {	1302	sub key_down {
1165	my ($self, $ev) = @_;	1303	my ($self, $ev) = @_;
1166		1304
1167	my $mod = $ev->key_mod;	1305	my $mod = $ev->{mod};
1168	my $sym = $ev->key_sym;	1306	my $sym = $ev->{sym};
1169
1170	my $uni = $ev->key_unicode;	1307	my $uni = $ev->{unicode};
1171		1308
1172	my $text = $self->get_text;	1309	my $text = $self->get_text;
1173		1310
1174	if ($sym == SDLK_BACKSPACE) {	1311	if ($sym == 8) {
1175	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};	1312	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1176	} elsif ($sym == SDLK_DELETE) {	1313	} elsif ($sym == 127) {
1177	substr $text, $self->{cursor}, 1, "";	1314	substr $text, $self->{cursor}, 1, "";
1178	} elsif ($sym == SDLK_LEFT) {	1315	} elsif ($sym == CFClient::SDLK_LEFT) {
1179	--$self->{cursor} if $self->{cursor};	1316	--$self->{cursor} if $self->{cursor};
1180	} elsif ($sym == SDLK_RIGHT) {	1317	} elsif ($sym == CFClient::SDLK_RIGHT) {
1181	++$self->{cursor} if $self->{cursor} < length $self->{text};	1318	++$self->{cursor} if $self->{cursor} < length $self->{text};
1182	} elsif ($sym == SDLK_HOME) {	1319	} elsif ($sym == CFClient::SDLK_HOME) {
1183	$self->{cursor} = 0;	1320	$self->{cursor} = 0;
1184	} elsif ($sym == SDLK_END) {	1321	} elsif ($sym == CFClient::SDLK_END) {
1185	$self->{cursor} = length $text;	1322	$self->{cursor} = length $text;
1186	} elsif ($sym == SDLK_ESCAPE) {	1323	} elsif ($sym == 27) {
1187	$self->emit ('escape');	1324	$self->emit ('escape');
1188	} elsif ($uni) {	1325	} elsif ($uni) {
1189	substr $text, $self->{cursor}++, 0, chr $uni;	1326	substr $text, $self->{cursor}++, 0, chr $uni;
1190	}	1327	}
1191		1328
…		…
1266		1403
1267	package CFClient::UI::Entry;	1404	package CFClient::UI::Entry;
1268		1405
1269	our @ISA = CFClient::UI::EntryBase::;	1406	our @ISA = CFClient::UI::EntryBase::;
1270		1407
1271	use SDL;	1408	use CFClient::OpenGL;
1272	use SDL::OpenGL;
1273		1409
1274	sub key_down {	1410	sub key_down {
1275	my ($self, $ev) = @_;	1411	my ($self, $ev) = @_;
1276		1412
1277	my $sym = $ev->key_sym;	1413	my $sym = $ev->{sym};
1278		1414
1279	if ($sym == SDLK_RETURN) {	1415	if ($sym == 13) {
1280	$self->emit (activate => $self->get_text);	1416	$self->emit (activate => $self->get_text);
1281	$self->update;	1417	$self->update;
1282		1418
1283	} else {	1419	} else {
1284	$self->SUPER::key_down ($ev);	1420	$self->SUPER::key_down ($ev);
…		…
1290		1426
1291	package CFClient::UI::Button;	1427	package CFClient::UI::Button;
1292		1428
1293	our @ISA = CFClient::UI::Label::;	1429	our @ISA = CFClient::UI::Label::;
1294		1430
1295	use SDL;	1431	use CFClient::OpenGL;
1296	use SDL::OpenGL;
1297		1432
1298	my @tex =	1433	my @tex =
1299	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }	1434	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1300	qw(b1_button_active.png);	1435	qw(b1_button_active.png);
1301		1436
1302	sub new {	1437	sub new {
1303	my $class = shift;	1438	my $class = shift;
1304		1439
…		…
1308	bg => [1, 1, 1, 0.2],	1443	bg => [1, 1, 1, 0.2],
1309	active_fg => [0, 0, 1],	1444	active_fg => [0, 0, 1],
1310	can_hover => 1,	1445	can_hover => 1,
1311	align => 0,	1446	align => 0,
1312	valign => 0,	1447	valign => 0,
		1448	can_events => 1,
1313	@_	1449	@_
1314	)	1450	)
1315	}	1451	}
1316		1452
1317	sub button_up {	1453	sub button_up {
…		…
1351	package CFClient::UI::CheckBox;	1487	package CFClient::UI::CheckBox;
1352		1488
1353	our @ISA = CFClient::UI::DrawBG::;	1489	our @ISA = CFClient::UI::DrawBG::;
1354		1490
1355	my @tex =	1491	my @tex =
1356	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }	1492	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1357	qw(c1_checkbox_bg.png c1_checkbox_active.png);	1493	qw(c1_checkbox_bg.png c1_checkbox_active.png);
1358		1494
1359	use SDL;	1495	use CFClient::OpenGL;
1360	use SDL::OpenGL;
1361		1496
1362	sub new {	1497	sub new {
1363	my $class = shift;	1498	my $class = shift;
1364		1499
1365	$class->SUPER::new (	1500	$class->SUPER::new (
…		…
1411	glDisable GL_BLEND;	1546	glDisable GL_BLEND;
1412	}	1547	}
1413		1548
1414	#############################################################################	1549	#############################################################################
1415		1550
1416	package CFClient::UI::VGauge;	1551	package CFClient::UI::Image;
1417		1552
1418	our @ISA = CFClient::UI::Base::;	1553	our @ISA = CFClient::UI::Base::;
1419		1554
1420	use SDL::OpenGL;	1555	use CFClient::OpenGL;
		1556	use Carp qw/confess/;
1421		1557
1422	my %tex = (	1558	our %loaded_images;
1423	food => [
1424	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
1425	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
1426	],
1427	grace => [
1428	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
1429	qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png/
1430	],
1431	hp => [
1432	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
1433	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
1434	],
1435	mana => [
1436	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
1437	qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png/
1438	],
1439	);
1440		1559
1441	# eg. VGauge->new (gauge => 'food'), default gauge: food
1442	sub new {	1560	sub new {
1443	my $class = shift;	1561	my $class = shift;
1444		1562
1445	my $self = $class->SUPER::new (gauge => 'food', @_);	1563	my $self = $class->SUPER::new (can_events => 0, @_);
		1564
		1565	$self->{image} or confess "Image has 'image' not set. This is a fatal error!";
		1566
		1567	$loaded_images{$self->{image}} ||=
		1568	new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1;
		1569
		1570	my $tex = $self->{tex} = $loaded_images{$self->{image}};
		1571
		1572	Scalar::Util::weaken $loaded_images{$self->{image}};
		1573
		1574	$self->{aspect} = $tex->{w} / $tex->{h};
1446		1575
1447	$self	1576	$self
1448	}	1577	}
1449		1578
1450	sub size_request {	1579	sub size_request {
1451	my ($self) = @_;	1580	my ($self) = @_;
1452		1581
1453	my $tex = $tex{$self->{gauge}}[0];	1582	($self->{tex}->{w}, $self->{tex}->{h})
1454
1455	@$tex{qw(w h)}
1456	}
1457
1458	sub set_max {
1459	my ($self, $max) = @_;
1460
1461	$self->{max_val} = $max;
1462	}
1463
1464	sub set_value {
1465	my ($self, $val, $max) = @_;
1466
1467	$self->set_max ($max)
1468	if defined $max;
1469
1470	$max = $self->{max_val};
1471	$self->{val} = $val;
1472
1473	$self->update;
1474	}	1583	}
1475		1584
1476	sub _draw {	1585	sub _draw {
1477	my ($self) = @_;	1586	my ($self) = @_;
1478		1587
1479	my $tex = $tex{$self->{gauge}};	1588	my $tex = $self->{tex};
1480		1589
1481	my ($w, $h) = ($self->{w}, $self->{h});	1590	my ($w, $h) = ($self->{w}, $self->{h});
1482		1591
1483	my $ycut = $self->{val} / ($self->{max_val} || 1);	1592	if ($self->{rot90}) {
1484	$ycut = 1 if $self->{val} > $self->{max_val};	1593	glRotate 90, 0, 0, 1;
		1594	glTranslate 0, -$self->{w}, 0;
1485		1595
1486	my $t1 = $tex->[0];	1596	($w, $h) = ($h, $w);
1487	my $t2 = $tex->[1];	1597	}
1488		1598
1489	glEnable GL_BLEND;	1599	glEnable GL_BLEND;
1490	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	1600	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1491	glEnable GL_TEXTURE_2D;	1601	glEnable GL_TEXTURE_2D;
1492	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1602	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1493		1603
1494	my $h1 = $self->{h} - $ycut * $self->{h};	1604	$tex->draw_quad (0, 0, $w, $h);
1495	my $h2 = $ycut * $self->{h};
1496
1497	my $yp = 0;
1498
1499	glBindTexture (GL_TEXTURE_2D, $t1->{name});
1500	glBegin (GL_QUADS);
1501	glTexCoord (0, 0); glVertex (0 , $yp);
1502	glTexCoord (0, (1 - $ycut)); glVertex (0 , $yp + $h1);
1503	glTexCoord (1, (1 - $ycut)); glVertex (0 + $w, $yp + $h1);
1504	glTexCoord (1, 0); glVertex (0 + $w, $yp);
1505	glEnd ();
1506
1507	$yp += $h1;
1508
1509	glBindTexture (GL_TEXTURE_2D, $t2->{name});
1510	glBegin (GL_QUADS);
1511	glTexCoord (0, (1 - $ycut)); glVertex (0 , $yp);
1512	glTexCoord (0, 1); glVertex (0 , $yp + $h2);
1513	glTexCoord (1, 1); glVertex (0 + $w, $yp + $h2);
1514	glTexCoord (1, (1 - $ycut)); glVertex (0 + $w, $yp);
1515	glEnd ();
1516		1605
1517	glDisable GL_BLEND;	1606	glDisable GL_BLEND;
1518	glDisable GL_TEXTURE_2D;	1607	glDisable GL_TEXTURE_2D;
1519	}	1608	}
1520		1609
1521	#############################################################################	1610	#############################################################################
1522		1611
		1612	package CFClient::UI::VGauge;
		1613
		1614	our @ISA = CFClient::UI::Base::;
		1615
		1616	use List::Util qw(min max);
		1617
		1618	use CFClient::OpenGL;
		1619
		1620	my %tex = (
		1621	food => [
		1622	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
		1623	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
		1624	],
		1625	grace => [
		1626	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
		1627	qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
		1628	],
		1629	hp => [
		1630	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
		1631	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
		1632	],
		1633	mana => [
		1634	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
		1635	qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
		1636	],
		1637	);
		1638
		1639	# eg. VGauge->new (gauge => 'food'), default gauge: food
		1640	sub new {
		1641	my $class = shift;
		1642
		1643	my $self = $class->SUPER::new (
		1644	type => 'food',
		1645	@_
		1646	);
		1647
		1648	$self->{aspect} = $tex{$self->{type}}[0]{w} / $tex{$self->{type}}[0]{h};
		1649
		1650	$self
		1651	}
		1652
		1653	sub size_request {
		1654	my ($self) = @_;
		1655
		1656	#my $tex = $tex{$self->{type}}[0];
		1657	#@$tex{qw(w h)}
		1658	(0, 0)
		1659	}
		1660
		1661	sub set_max {
		1662	my ($self, $max) = @_;
		1663
		1664	$self->{max_val} = $max;
		1665	}
		1666
		1667	sub set_value {
		1668	my ($self, $val, $max) = @_;
		1669
		1670	$self->set_max ($max)
		1671	if defined $max;
		1672
		1673	$max = $self->{max_val};
		1674	$self->{val} = $val;
		1675
		1676	$self->update;
		1677	}
		1678
		1679	sub _draw {
		1680	my ($self) = @_;
		1681
		1682	my $tex = $tex{$self->{type}};
		1683	my ($t1, $t2, $t3) = @$tex;
		1684
		1685	my ($w, $h) = ($self->{w}, $self->{h});
		1686
		1687	if ($self->{vertical}) {
		1688	glRotate 90, 0, 0, 1;
		1689	glTranslate 0, -$self->{w}, 0;
		1690
		1691	($w, $h) = ($h, $w);
		1692	}
		1693
		1694	my $ycut = $self->{val} / ($self->{max_val} || 1);
		1695
		1696	my $ycut1 = max 0, min 1, $ycut;
		1697	my $ycut2 = max 0, min 1, $ycut - 1;
		1698
		1699	my $h1 = $self->{h} * (1 - $ycut1);
		1700	my $h2 = $self->{h} * (1 - $ycut2);
		1701
		1702	glEnable GL_BLEND;
		1703	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
		1704	glEnable GL_TEXTURE_2D;
		1705	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		1706
		1707	glBindTexture GL_TEXTURE_2D, $t1->{name};
		1708	glBegin GL_QUADS;
		1709	glTexCoord 0 , 0; glVertex 0 , 0;
		1710	glTexCoord 0 , $t1->{t} * (1 - $ycut1); glVertex 0 , $h1;
		1711	glTexCoord $t1->{s}, $t1->{t} * (1 - $ycut1); glVertex $w, $h1;
		1712	glTexCoord $t1->{s}, 0; glVertex $w, 0;
		1713	glEnd;
		1714
		1715	my $ycut1 = List::Util::min 1, $ycut;
		1716	glBindTexture GL_TEXTURE_2D, $t2->{name};
		1717	glBegin GL_QUADS;
		1718	glTexCoord 0 , $t2->{t} * (1 - $ycut1); glVertex 0 , $h1;
		1719	glTexCoord 0 , $t2->{t} * (1 - $ycut2); glVertex 0 , $h2;
		1720	glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut2); glVertex $w, $h2;
		1721	glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut1); glVertex $w, $h1;
		1722	glEnd;
		1723
		1724	if ($t3) {
		1725	glBindTexture GL_TEXTURE_2D, $t3->{name};
		1726	glBegin GL_QUADS;
		1727	glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
		1728	glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h};
		1729	glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h};
		1730	glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
		1731	glEnd;
		1732	}
		1733
		1734	glDisable GL_BLEND;
		1735	glDisable GL_TEXTURE_2D;
		1736	}
		1737
		1738	#############################################################################
		1739
		1740	package CFClient::UI::Gauge;
		1741
		1742	our @ISA = CFClient::UI::VBox::;
		1743
		1744	sub new {
		1745	my ($class, %arg) = @_;
		1746
		1747	my $self = $class->SUPER::new (
		1748	tooltip => $arg{type},
		1749	%arg,
		1750	);
		1751
		1752	$self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999", can_events => 1, can_hover => 1);
		1753	$self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_events => 1, can_hover => 1);
		1754	$self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999", can_events => 1, can_hover => 1);
		1755
		1756	$self
		1757	}
		1758
		1759	sub set_fontsize {
		1760	my ($self, $fsize) = @_;
		1761
		1762	$self->{value}->set_fontsize ($fsize);
		1763	$self->{max} ->set_fontsize ($fsize);
		1764	}
		1765
		1766	sub set_value {
		1767	my ($self, $val, $max) = @_;
		1768
		1769	$self->set_max ($max)
		1770	if defined $max;
		1771
		1772	$self->{gauge}->set_value ($val, $max);
		1773	$self->{value}->set_text ($val);
		1774	}
		1775
		1776	sub set_max {
		1777	my ($self, $max) = @_;
		1778
		1779	$self->{gauge}->set_max ($max);
		1780	$self->{max}->set_text ($max);
		1781	}
		1782
		1783	#############################################################################
		1784
1523	package CFClient::UI::Slider;	1785	package CFClient::UI::Slider;
1524		1786
1525	use strict;	1787	use strict;
1526		1788
1527	use SDL::OpenGL;	1789	use CFClient::OpenGL;
1528		1790
1529	our @ISA = CFClient::UI::DrawBG::;	1791	our @ISA = CFClient::UI::DrawBG::;
1530		1792
1531	my @tex =	1793	my @tex =
1532	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }	1794	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
…		…
1542	# TODO: calculations are off	1804	# TODO: calculations are off
1543	my $self = $class->SUPER::new (	1805	my $self = $class->SUPER::new (
1544	fg => [1, 1, 1],	1806	fg => [1, 1, 1],
1545	active_fg => [0, 0, 0],	1807	active_fg => [0, 0, 0],
1546	range => [0, 0, 100, 10],	1808	range => [0, 0, 100, 10],
1547	req_w => 40,	1809	req_w => 20,
1548	req_h => 13,	1810	req_h => 20,
1549	vertical => 0,	1811	vertical => 0,
1550	can_hover => 1,	1812	can_hover => 1,
1551	inner_pad => 5,	1813	inner_pad => 5,
1552	@_	1814	@_
1553	);	1815	);
…		…
1657		1919
1658	package CFClient::UI::TextView;	1920	package CFClient::UI::TextView;
1659		1921
1660	our @ISA = CFClient::UI::HBox::;	1922	our @ISA = CFClient::UI::HBox::;
1661		1923
1662	use SDL::OpenGL;	1924	use CFClient::OpenGL;
1663		1925
1664	sub new {	1926	sub new {
1665	my $class = shift;	1927	my $class = shift;
1666		1928
1667	my $self = $class->SUPER::new (	1929	my $self = $class->SUPER::new (
1668	req_w => $::WIDTH / 6,
1669	req_h => $::HEIGHT / 6,
1670	fontsize => $::FONTSIZE,	1930	fontsize => 1,
		1931	#font => default_font
1671	@_,	1932	@_,
1672		1933
1673	layout => (new CFClient::Layout),	1934	layout => (new CFClient::Layout),
1674	par => [],	1935	par => [],
1675	height => 0,	1936	height => 0,
…		…
1696	sub text_height {	1957	sub text_height {
1697	my ($self, $text) = @_;	1958	my ($self, $text) = @_;
1698		1959
1699	my $layout = $self->{layout};	1960	my $layout = $self->{layout};
1700		1961
1701	$layout->set_height ($self->{fontsize});	1962	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
1702	$layout->set_width ($self->{w});	1963	$layout->set_width ($self->{w});
1703	$layout->set_text ($text);	1964	$layout->set_text ($text);
1704		1965
1705	($layout->size)[1]	1966	($layout->size)[1]
1706	}	1967	}
…		…
1710		1971
1711	$self->{need_reflow}++;	1972	$self->{need_reflow}++;
1712	$self->update;	1973	$self->update;
1713	}	1974	}
1714		1975
1715	sub size_request {
1716	my ($self) = @_;
1717
1718	($self->{req_w}, $self->{req_h})
1719	}
1720
1721	sub size_allocate {	1976	sub size_allocate {
1722	my ($self, $w, $h) = @_;	1977	my ($self, $w, $h) = @_;
1723		1978
		1979	$self->SUPER::size_allocate ($w, $h);
		1980
		1981	$self->{layout}->set_font ($self->{font}) if $self->{font};
1724	$self->{layout}->set_height ($self->{fontsize});	1982	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1725	$self->{layout}->set_width ($self->{w});	1983	$self->{layout}->set_width ($self->{children}[0]{w});
1726		1984
1727	$self->reflow;	1985	$self->reflow;
1728	$self->update;
1729	}	1986	}
1730		1987
1731	sub add_paragraph {	1988	sub add_paragraph {
1732	my ($self, $color, $text) = @_;	1989	my ($self, $color, $text) = @_;
1733		1990
…		…
1781	my $y1 = $top + $self->{h};	2038	my $y1 = $top + $self->{h};
1782		2039
1783	my $y = 0;	2040	my $y = 0;
1784		2041
1785	my $layout = $self->{layout};	2042	my $layout = $self->{layout};
		2043
		2044	$layout->set_font ($self->{font}) if $self->{font};
1786		2045
1787	for my $par (@{$self->{par}}) {	2046	for my $par (@{$self->{par}}) {
1788	my $h = $par->[0];	2047	my $h = $par->[0];
1789		2048
1790	if ($y0 < $y + $h && $y < $y1) {	2049	if ($y0 < $y + $h && $y < $y1) {
…		…
1818		2077
1819	}	2078	}
1820		2079
1821	#############################################################################	2080	#############################################################################
1822		2081
1823	package CFClient::UI::MapWidget;
1824
1825	use strict;
1826
1827	use List::Util qw(min max);
1828
1829	use SDL;
1830	use SDL::OpenGL;
1831
1832	our @ISA = CFClient::UI::Base::;
1833
1834	sub new {
1835	my $class = shift;
1836
1837	$class->SUPER::new (
1838	z => -1,
1839	can_focus => 1,
1840	list => (glGenLists 1),
1841	@_
1842	)
1843	}
1844
1845	sub key_down {
1846	print "MAPKEYDOWN\n";
1847	}
1848
1849	sub key_up {
1850	}
1851
1852	sub button_down {
1853	my ($self, $ev, $x, $y) = @_;
1854
1855	$self->focus_in;
1856
1857	if ($ev->button == 2) {
1858	my ($ox, $oy) = ($ev->button_x, $ev->button_y);
1859	my ($bw, $bh) = ($::CFG->{map_shift_x}, $::CFG->{map_shift_y});
1860
1861	$self->{motion} = sub {
1862	my ($ev, $x, $y) = @_;
1863
1864	($x, $y) = ($ev->motion_x, $ev->motion_y);
1865
1866	$::CFG->{map_shift_x} = $bw + $x - $ox;
1867	$::CFG->{map_shift_y} = $bh + $y - $oy;
1868
1869	$self->update;
1870	};
1871	}
1872	}
1873
1874	sub button_up {
1875	my ($self, $ev, $x, $y) = @_;
1876
1877	delete $self->{motion};
1878	}
1879
1880	sub mouse_motion {
1881	my ($self, $ev, $x, $y) = @_;
1882
1883	$self->{motion}->($ev, $x, $y) if $self->{motion};
1884	}
1885
1886	sub size_request {
1887	(
1888	1 + 32 * int $::WIDTH / 32,
1889	1 + 32 * int $::HEIGHT / 32,
1890	)
1891	}
1892
1893	sub update {
1894	my ($self) = @_;
1895
1896	$self->{need_update} = 1;
1897	$self->SUPER::update;
1898	}
1899
1900	sub draw {
1901	my ($self) = @_;
1902
1903	if (delete $self->{need_update}) {
1904	glNewList $self->{list}, GL_COMPILE;
1905
1906	if ($::MAP) {
1907	my $sw = int $::WIDTH / 32;
1908	my $sh = int $::HEIGHT / 32;
1909
1910	my $sx = $::CFG->{map_shift_x}; my $sx0 = $sx & 31; $sx = ($sx - $sx0) / 32;
1911	my $sy = $::CFG->{map_shift_y}; my $sy0 = $sy & 31; $sy = ($sy - $sy0) / 32;
1912
1913	glTranslate $sx0 - 32, $sy0 - 32, 0;
1914
1915	my ($w, $h, $data) = $::MAP->draw ($sx, $sy, 0, 0, $sw + 1, $sh + 1);
1916
1917	if ($::CFG->{fow_enable}) {
1918	if ($::CFG->{fow_smooth}) { # smooth fog of war
1919	glConvolutionParameter (GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER);
1920	glConvolutionFilter2D (
1921	GL_CONVOLUTION_2D,
1922	GL_ALPHA,
1923	3, 3,
1924	GL_ALPHA, GL_FLOAT,
1925	pack "f*",
1926	0.1, 0.1, 0.1,
1927	0.1, 0.2, 0.1,
1928	0.1, 0.1, 0.1,
1929	);
1930	glEnable GL_CONVOLUTION_2D;
1931	}
1932
1933	$self->{fow_texture} = new CFClient::Texture
1934	w => $w,
1935	h => $h,
1936	data => $data,
1937	internalformat => GL_ALPHA,
1938	format => GL_ALPHA;
1939
1940	glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth};
1941
1942	glEnable GL_BLEND;
1943	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1944	glEnable GL_TEXTURE_2D;
1945	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1946
1947	glColor +($::CFG->{fow_intensity}) x 3, 1;
1948	$self->{fow_texture}->draw_quad (0, 0, $w * 32, $h * 32);
1949
1950	glDisable GL_TEXTURE_2D;
1951	glDisable GL_BLEND;
1952	}
1953
1954	# HACK BEGIN
1955	{
1956	glTranslate -($sx0 - 32), -($sy0 - 32), 0;#remove
1957	my ($w, $h) = (250, 250);
1958
1959	glEnable GL_BLEND;
1960	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1961	glEnable GL_TEXTURE_2D;
1962	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1963
1964	$self->{mapmap_texture} =
1965	new CFClient::Texture
1966	w => $w,
1967	h => $h,
1968	data => $::MAP->mapmap ($w, $h),
1969	type => $CFClient::GL_VERSION >= 1.2 ? GL_UNSIGNED_INT_8_8_8_8_REV : GL_UNSIGNED_BYTE;
1970
1971	$self->{mapmap_texture}->draw_quad (100, 100);
1972
1973	glDisable GL_TEXTURE_2D;
1974	glDisable GL_BLEND;
1975	}
1976	# HACK END
1977	}
1978
1979	glEndList;
1980	}
1981
1982	glPushMatrix;
1983	glCallList $self->{list};
1984	glPopMatrix;
1985
1986	if ($FOCUS != $self) {
1987	glColor 64/255, 64/255, 64/255;
1988	glLogicOp GL_AND;
1989	glEnable GL_COLOR_LOGIC_OP;
1990	glBegin GL_QUADS;
1991	glVertex 0, 0;
1992	glVertex 0, $::HEIGHT;
1993	glVertex $::WIDTH, $::HEIGHT;
1994	glVertex $::WIDTH, 0;
1995	glEnd;
1996	glDisable GL_COLOR_LOGIC_OP;
1997	}
1998	}
1999
2000	my %DIR = (
2001	SDLK_KP8, [1, "north"],
2002	SDLK_KP9, [2, "northeast"],
2003	SDLK_KP6, [3, "east"],
2004	SDLK_KP3, [4, "southeast"],
2005	SDLK_KP2, [5, "south"],
2006	SDLK_KP1, [6, "southwest"],
2007	SDLK_KP4, [7, "west"],
2008	SDLK_KP7, [8, "northwest"],
2009
2010	SDLK_UP, [1, "north"],
2011	SDLK_RIGHT, [3, "east"],
2012	SDLK_DOWN, [5, "south"],
2013	SDLK_LEFT, [7, "west"],
2014	);
2015
2016	sub key_down {
2017	my ($self, $ev) = @_;
2018
2019	my $mod = $ev->key_mod;
2020	my $sym = $ev->key_sym;
2021
2022	if ($sym == SDLK_KP5) {
2023	$::CONN->user_send ("stay fire");
2024	} elsif ($sym == SDLK_a) {
2025	$::CONN->user_send ("apply");
2026	} elsif ($sym == SDLK_QUOTE) {
2027	$self->emit ('activate_console');
2028	} elsif ($sym == SDLK_SLASH) {
2029	$self->emit ('activate_console' => '/');
2030	} elsif (exists $DIR{$sym}) {
2031	if ($mod & KMOD_SHIFT) {
2032	$self->{shft}++;
2033	$::CONN->user_send ("fire $DIR{$sym}[0]");
2034	} elsif ($mod & KMOD_CTRL) {
2035	$self->{ctrl}++;
2036	$::CONN->user_send ("run $DIR{$sym}[0]");
2037	} else {
2038	$::CONN->user_send ("$DIR{$sym}[1]");
2039	}
2040	}
2041	}
2042
2043	sub key_up {
2044	my ($self, $ev) = @_;
2045
2046	my $mod = $ev->key_mod;
2047	my $sym = $ev->key_sym;
2048
2049	if (!($mod & KMOD_SHIFT) && delete $self->{shft}) {
2050	$::CONN->user_send ("fire_stop");
2051	}
2052	if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) {
2053	$::CONN->user_send ("run_stop");
2054	}
2055	}
2056
2057	#############################################################################
2058
2059	package CFClient::UI::Animator;	2082	package CFClient::UI::Animator;
2060		2083
2061	use SDL::OpenGL;	2084	use CFClient::OpenGL;
2062		2085
2063	our @ISA = CFClient::UI::Bin::;	2086	our @ISA = CFClient::UI::Bin::;
2064		2087
2065	sub moveto {	2088	sub moveto {
2066	my ($self, $x, $y) = @_;	2089	my ($self, $x, $y) = @_;
…		…
2106	my $class = shift;	2129	my $class = shift;
2107		2130
2108	my $self = $class->SUPER::new (	2131	my $self = $class->SUPER::new (
2109	state => 0,	2132	state => 0,
2110	connect_activate => \&toggle_flopper,	2133	connect_activate => \&toggle_flopper,
		2134	can_events => 1,
2111	@_	2135	@_
2112	);	2136	);
2113		2137
2114	if ($self->{state}) {	2138	if ($self->{state}) {
2115	$self->{state} = 0;	2139	$self->{state} = 0;
…		…
2135	$self->emit (changed => $self->{state});	2159	$self->emit (changed => $self->{state});
2136	}	2160	}
2137		2161
2138	#############################################################################	2162	#############################################################################
2139		2163
		2164	package CFClient::UI::Tooltip;
		2165
		2166	our @ISA = CFClient::UI::Bin::;
		2167
		2168	use CFClient::OpenGL;
		2169
		2170	sub new {
		2171	my $class = shift;
		2172
		2173	$class->SUPER::new (
		2174	@_,
		2175	can_events => 0,
		2176	)
		2177	}
		2178
		2179	sub set_text {
		2180	my ($self, $text) = @_;
		2181
		2182	$self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0];
		2183	$self->{label}->set_text ($text);
		2184	$self->add ($self->{label});
		2185	}
		2186
		2187	sub size_request {
		2188	my ($self) = @_;
		2189
		2190	$self->child->set_max_size ($::WIDTH * 0.2);
		2191
		2192	my ($w, $h) = @{$self->child}{qw(req_w req_h)};
		2193
		2194	($w + 4, $h + 4)
		2195	}
		2196
		2197	sub _draw {
		2198	my ($self) = @_;
		2199
		2200	glPushMatrix;
		2201	glTranslate 0.375, 0.375;
		2202
		2203	my ($w, $h) = @$self{qw(w h)};
		2204
		2205	glColor 1, 0.8, 0.4;
		2206	glBegin GL_QUADS;
		2207	glVertex 0 , 0;
		2208	glVertex 0 , $h;
		2209	glVertex $w, $h;
		2210	glVertex $w, 0;
		2211	glEnd;
		2212
		2213	glColor 0, 0, 0;
		2214	glBegin GL_LINE_LOOP;
		2215	glVertex 0 , 0;
		2216	glVertex 0 , $h;
		2217	glVertex $w, $h;
		2218	glVertex $w, 0;
		2219	glEnd;
		2220
		2221	glPopMatrix;
		2222
		2223	glTranslate 2, 2;
		2224	$self->SUPER::_draw;
		2225	}
		2226
		2227	#############################################################################
		2228
2140	package CFClient::UI::Root;	2229	package CFClient::UI::Root;
2141		2230
2142	our @ISA = CFClient::UI::Container::;	2231	our @ISA = CFClient::UI::Container::;
2143		2232
2144	use SDL::OpenGL;	2233	use CFClient::OpenGL;
2145		2234
2146	sub check_size {	2235	sub check_size {
2147	my ($self) = @_;	2236	my ($self) = @_;
2148		2237
2149	$self->configure (0, 0, $::WITH, $::HEIGHT);	2238	$self->configure (0, 0, $::WIDTH, $::HEIGHT);
2150	}	2239	}
2151		2240
2152	sub size_request {	2241	sub size_request {
2153	($::WIDTH, $::HEIGHT)	2242	($::WIDTH, $::HEIGHT)
2154	}	2243	}
…		…
2156	sub configure {	2245	sub configure {
2157	my ($self, $x, $y, $w, $h) = @_;	2246	my ($self, $x, $y, $w, $h) = @_;
2158		2247
2159	$self->SUPER::configure ($x, $y, $w, $h);	2248	$self->SUPER::configure ($x, $y, $w, $h);
2160		2249
2161	$_->configure ($_->{x}, $_->{y}, $_->size_request)
2162	for @{$self->{children}};	2250	for my $child (@{$self->{children}}) {
		2251	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
		2252
		2253	$X = List::Util::max 0, List::Util::min $w - $W, $X;
		2254	$Y = List::Util::max 0, List::Util::min $h - $H, $Y;
		2255	$child->configure ($X, $Y, $W,$H);
		2256	}
2163	}	2257	}
2164		2258
2165	sub _topleft {	2259	sub _topleft {
2166	my ($self, $x, $y) = @_;	2260	my ($self, $x, $y) = @_;
2167		2261
…		…
2175	::refresh ();	2269	::refresh ();
2176	}	2270	}
2177		2271
2178	sub add {	2272	sub add {
2179	my ($self, $child) = @_;	2273	my ($self, $child) = @_;
		2274
		2275	# integerize window positions
		2276	$child->{x} = int $child->{x};
		2277	$child->{y} = int $child->{y};
2180		2278
2181	$self->SUPER::add ($child);	2279	$self->SUPER::add ($child);
2182	}	2280	}
2183		2281
2184	sub on_refresh {	2282	sub on_refresh {
…		…
2210	#############################################################################	2308	#############################################################################
2211		2309
2212	package CFClient::UI;	2310	package CFClient::UI;
2213		2311
2214	$ROOT = new CFClient::UI::Root;	2312	$ROOT = new CFClient::UI::Root;
		2313	$TOOLTIP = new CFClient::UI::Tooltip;
2215		2314
2216	1	2315	1
2217		2316

Diff Legend

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