[ViewVC] Diff of: cvs/deliantra/Deliantra-Client/DC/UI.pm

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.112 by root, Sat Apr 15 12:29:46 2006 UTC vs.
Revision 1.130 by root, Tue Apr 18 01:51:06 2006 UTC

…		…
7		7
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 $TOPLEVEL;	12	our $ROOT;
13	our $BUTTON_STATE;	13	our $BUTTON_STATE;
14		14
15	# class methods for events	15	# class methods for events
16	sub feed_sdl_key_down_event {	16	sub feed_sdl_key_down_event {
17	$FOCUS->key_down ($_[0]) if $FOCUS;	17	$FOCUS->key_down ($_[0]) if $FOCUS;
…		…
24	sub feed_sdl_button_down_event {	24	sub feed_sdl_button_down_event {
25	my ($ev) = @_;	25	my ($ev) = @_;
26	my ($x, $y) = ($ev->motion_x, $ev->motion_y);	26	my ($x, $y) = ($ev->motion_x, $ev->motion_y);
27		27
28	if (!$BUTTON_STATE) {	28	if (!$BUTTON_STATE) {
29	my $widget = $TOPLEVEL->find_widget ($x, $y);	29	my $widget = $ROOT->find_widget ($x, $y);
30		30
31	$GRAB = $widget;	31	$GRAB = $widget;
32	$GRAB->update if $GRAB;	32	$GRAB->update if $GRAB;
33	}	33	}
34		34
35	$BUTTON_STATE \|= 1 << ($ev->button - 1);	35	$BUTTON_STATE \|= 1 << ($ev->button - 1);
36		36
37	$GRAB->button_down ($ev, $GRAB->translate ($x, $y)) if $GRAB;	37	$GRAB->button_down ($ev, $GRAB->coord2local ($x, $y)) if $GRAB;
38	}	38	}
39		39
40	sub feed_sdl_button_up_event {	40	sub feed_sdl_button_up_event {
41	my ($ev) = @_;	41	my ($ev) = @_;
42	my ($x, $y) = ($ev->motion_x, $ev->motion_y);	42	my ($x, $y) = ($ev->motion_x, $ev->motion_y);
43		43
44	my $widget = $GRAB \|\| $TOPLEVEL->find_widget ($x, $y);	44	my $widget = $GRAB \|\| $ROOT->find_widget ($x, $y);
45		45
46	$BUTTON_STATE &= ~(1 << ($ev->button - 1));	46	$BUTTON_STATE &= ~(1 << ($ev->button - 1));
47		47
48	$GRAB->button_up ($ev, $GRAB->translate ($x, $y)) if $GRAB;	48	$GRAB->button_up ($ev, $GRAB->coord2local ($x, $y)) if $GRAB;
49		49
50	if (!$BUTTON_STATE) {	50	if (!$BUTTON_STATE) {
51	my $grab = $GRAB; undef $GRAB;	51	my $grab = $GRAB; undef $GRAB;
52	$grab->update if $grab;	52	$grab->update if $grab;
53	$GRAB->update if $GRAB;	53	$GRAB->update if $GRAB;
…		…
56		56
57	sub feed_sdl_motion_event {	57	sub feed_sdl_motion_event {
58	my ($ev) = @_;	58	my ($ev) = @_;
59	my ($x, $y) = ($ev->motion_x, $ev->motion_y);	59	my ($x, $y) = ($ev->motion_x, $ev->motion_y);
60		60
61	my $widget = $GRAB \|\| $TOPLEVEL->find_widget ($x, $y);	61	my $widget = $GRAB \|\| $ROOT->find_widget ($x, $y);
62		62
63	if ($widget != $HOVER) {	63	if ($widget != $HOVER) {
64	my $hover = $HOVER; $HOVER = $widget;	64	my $hover = $HOVER; $HOVER = $widget;
65		65
66	$hover->update if $hover && $hover->{can_hover};	66	$hover->update if $hover && $hover->{can_hover};
67	$HOVER->update if $HOVER && $HOVER->{can_hover};	67	$HOVER->update if $HOVER && $HOVER->{can_hover};
68	}	68	}
69		69
70	$HOVER->mouse_motion ($ev, $HOVER->translate ($x, $y)) if $HOVER;	70	$HOVER->mouse_motion ($ev, $HOVER->coord2local ($x, $y)) if $HOVER;
71	}	71	}
72		72
73	# convert position array to integers	73	# convert position array to integers
74	sub harmonize {	74	sub harmonize {
75	my ($vals) = @_;	75	my ($vals) = @_;
76		76
77	my $rem = 0;	77	my $rem = 0;
78		78
79	for ($vals) {	79	for (@$vals) {
80	my $i = int $_ + $rem;	80	my $i = int $_ + $rem;
81	$rem += $_ - $i;	81	$rem += $_ - $i;
82	$_ = $i;	82	$_ = $i;
83	}	83	}
84	}	84	}
…		…
112	$self	112	$self
113	}	113	}
114		114
115	sub move {	115	sub move {
116	my ($self, $x, $y, $z) = @_;	116	my ($self, $x, $y, $z) = @_;
		117
117	$self->{x} = $x;	118	$self->{x} = int $x;
118	$self->{y} = $y;	119	$self->{y} = int $y;
119	$self->{z} = $z if defined $z;	120	$self->{z} = $z if defined $z;
		121
		122	$self->update;
120	}	123	}
121		124
122	sub needs_redraw {	125	sub needs_redraw {
123	0	126	0
124	}	127	}
…		…
126	sub size_request {	129	sub size_request {
127	require Carp;	130	require Carp;
128	Carp::confess "size_request is abtract";	131	Carp::confess "size_request is abtract";
129	}	132	}
130		133
131	sub _size_allocate {	134	sub configure {
132	my ($self, $x, $y, $w, $h) = @_;	135	my ($self, $x, $y, $w, $h) = @_;
133		136
134	$self->{x} = $x;	137	$self->{x} = $x;
135	$self->{y} = $y;	138	$self->{y} = $y;
136		139
137	return unless $self->{w} != $w \|\| $self->{h} != $h;	140	return unless $self->{w} != $w \|\| $self->{h} != $h;
138		141
139	$self->{w} = $w;	142	$self->{w} = $w;
140	$self->{h} = $h;	143	$self->{h} = $h;
141		144
142	1	145	$self->size_allocate ($w, $h);
143	}	146	}
144		147
145	sub size_allocate {	148	sub size_allocate {
		149	# nothing to be done
		150	}
		151
		152	# return top left coordinates
		153	sub _topleft {
146	my ($self, $x, $y, $w, $h) = @_;	154	my ($self, $x, $y) = @_;
147		155
148	$self->_size_allocate ($x, $y, $w, $h);	156	$self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y});
149	}	157	}
150		158
151	# translate global coordinates to local coordinate system	159	# translate global coordinates to local coordinate system
152	sub translate {	160	sub coord2local {
153	my ($self, $x, $y) = @_;	161	my ($self, $x, $y) = @_;
154		162
155	$self->{parent}->translate ($x - $self->{x}, $y - $self->{y});	163	my ($X, $Y) = $self->_topleft;
		164	($x - $X, $y - $Y)
		165	}
		166
		167	# translate local coordinates to global coordinate system
		168	sub coord2global {
		169	my ($self, $x, $y) = @_;
		170
		171	my ($X, $Y) = $self->_topleft;
		172	($x + $X, $y + $Y)
156	}	173	}
157		174
158	sub focus_in {	175	sub focus_in {
159	my ($self) = @_;	176	my ($self) = @_;
160		177
161	return if $FOCUS == $self;	178	return if $FOCUS == $self;
162	return unless $self->{can_focus};	179	return unless $self->{can_focus};
163		180
164	my $focus = $FOCUS; $FOCUS = $self;	181	my $focus = $FOCUS; $FOCUS = $self;
		182
		183	$self->emit (focus_in => $focus);
		184
165	$focus->update if $focus;	185	$focus->update if $focus;
166	$FOCUS->update;	186	$FOCUS->update;
167	}	187	}
168		188
169	sub focus_out {	189	sub focus_out {
170	my ($self) = @_;	190	my ($self) = @_;
171		191
172	return unless $FOCUS == $self;	192	return unless $FOCUS == $self;
173		193
174	my $focus = $FOCUS; undef $FOCUS;	194	my $focus = $FOCUS; undef $FOCUS;
		195
		196	$self->emit (focus_out => $focus);
		197
175	$focus->update if $focus; #?	198	$focus->update if $focus; #?
176	}	199	}
177		200
178	sub mouse_motion { }	201	sub mouse_motion { }
179	sub button_up { }	202	sub button_up { }
…		…
203	glPopMatrix;	226	glPopMatrix;
204		227
205	if ($self == $HOVER && $self->{can_hover}) {	228	if ($self == $HOVER && $self->{can_hover}) {
206	my ($x, $y) = @$self{qw(x y)};	229	my ($x, $y) = @$self{qw(x y)};
207		230
208	glColor 0, 0, 1, 0.2;	231	glColor 1, 0.8, 0.5, 0.2;
209	glEnable GL_BLEND;	232	glEnable GL_BLEND;
210	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	233	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
211	glBegin GL_QUADS;	234	glBegin GL_QUADS;
212	glVertex $x , $y;	235	glVertex $x , $y;
213	glVertex $x + $self->{w}, $y;	236	glVertex $x + $self->{w}, $y;
…		…
233		256
234	()	257	()
235	}	258	}
236		259
237	sub set_parent {	260	sub set_parent {
238	my ($self, $par) = @_;	261	my ($self, $parent) = @_;
239		262
240	$self->{parent} = $par;
241	Scalar::Util::weaken $self->{parent};	263	Scalar::Util::weaken ($self->{parent} = $parent);
242	}	264	}
243		265
244	sub get_parent {	266	sub check_size {
245	$_[0]->{parent}	267	my ($self) = @_;
		268
		269	my ($w, $h) = $self->size_request;
		270
		271	if ($w != $self->{req_w} \|\| $h != $self->{req_h}) {
		272	$self->{req_w} = $w;
		273	$self->{req_h} = $h;
		274
		275	$self->{parent}->check_size
		276	if $self->{parent};
		277
		278	$self->size_allocate ($w, $h);
		279	$self->update;
		280	}
246	}	281	}
247		282
248	sub update {	283	sub update {
249	my ($self) = @_;	284	my ($self) = @_;
250		285
…		…
339		374
340	$self	375	$self
341	}	376	}
342		377
343	sub add {	378	sub add {
344	my ($self, $chld) = @_;	379	my ($self, $child) = @_;
345		380
346	$chld->set_parent ($self);	381	$child->set_parent ($self);
		382
		383	use sort 'stable';
347		384
348	$self->{children} = [	385	$self->{children} = [
349	sort { $a->{z} <=> $b->{z} }	386	sort { $a->{z} <=> $b->{z} }
350	@{$self->{children}}, $chld	387	@{$self->{children}}, $child
351	];	388	];
352		389
353	$self->{w} = $self->{h} = -1;	390	$self->{w} = $self->{h} = -1;
354	$self->update;	391
		392	$child->check_size;
355	}	393	}
356		394
357	sub remove {	395	sub remove {
358	my ($self, $widget) = @_;	396	my ($self, $widget) = @_;
359		397
360	$self->{children} = [ grep $_ != $widget, @{ $self->{children} } ];	398	$self->{children} = [ grep $_ != $widget, @{ $self->{children} } ];
361		399
362	$self->size_allocate (0, 0, $self->{w}, $self->{h});	400	$self->check_size;
363	}	401	}
364		402
365	sub find_widget {	403	sub find_widget {
366	my ($self, $x, $y) = @_;	404	my ($self, $x, $y) = @_;
367		405
…		…
420	sub size_request {	458	sub size_request {
421	$_[0]{children}[0]->size_request	459	$_[0]{children}[0]->size_request
422	}	460	}
423		461
424	sub size_allocate {	462	sub size_allocate {
425	my ($self, $x, $y, $w, $h) = @_;	463	my ($self, $w, $h) = @_;
426		464
427	$self->_size_allocate ($x, $y, $w, $h) or return;
428
429	$self->{children}[0]->size_allocate (0, 0, $w, $h);	465	$self->{children}[0]->configure (0, 0, $w, $h);
430	}	466	}
431		467
432	#############################################################################	468	#############################################################################
433		469
434	package CFClient::UI::Window;	470	package CFClient::UI::Window;
…		…
460	$self->child->draw;	496	$self->child->draw;
461	};	497	};
462	}	498	}
463		499
464	sub size_allocate {	500	sub size_allocate {
465	my ($self, $x, $y, $w, $h) = @_;	501	my ($self, $w, $h) = @_;
466		502
467	$self->_size_allocate ($x, $y, $w, $h) or return;
468
469	$self->child->size_allocate (0, 0, $w, $h);	503	$self->child->configure (0, 0, $w, $h);
470		504
471	$self->render_chld;	505	$self->render_chld;
472	}	506	}
473		507
474	sub _draw {	508	sub _draw {
…		…
490	glDisable GL_TEXTURE_2D;	524	glDisable GL_TEXTURE_2D;
491	}	525	}
492		526
493	#############################################################################	527	#############################################################################
494		528
		529	package CFClient::UI::ViewPort;
		530
		531	our @ISA = CFClient::UI::Window::;
		532
		533	sub new { die }
		534
		535	sub size_request {
		536	my ($self) = @_;
		537
		538	@$self{qw(child_w child_h)} = $self->child->size_request;
		539	$self->child->size_allocate (0, 0, @$self{qw(child_w child_h)});
		540
		541	@$self{qw(child_w child_h)}
		542	}
		543
		544	sub _draw {
		545	my ($self) = @_;
		546
		547	$self->{children}[1]->draw;
		548	}
		549
		550
		551	#############################################################################
		552
495	package CFClient::UI::Frame;	553	package CFClient::UI::Frame;
496		554
497	our @ISA = CFClient::UI::Bin::;	555	our @ISA = CFClient::UI::Bin::;
498		556
499	use SDL::OpenGL;	557	use SDL::OpenGL;
…		…
509	}	567	}
510		568
511	sub size_allocate {	569	sub size_allocate {
512	my ($self, $x, $y, $w, $h) = @_;	570	my ($self, $x, $y, $w, $h) = @_;
513		571
514	$self->_size_allocate ($x, $y, $w, $h) or return;
515
516	$self->child->size_allocate (2, 2, $w - 4, $h - 4);	572	$self->child->configure (2, 2, $w - 4, $h - 4);
517	}	573	}
518		574
519	sub _draw {	575	sub _draw {
520	my ($self) = @_;	576	my ($self) = @_;
521		577
…		…
552	# TODO: user_x, user_y, overwrite moveto?	608	# TODO: user_x, user_y, overwrite moveto?
553		609
554	$class->SUPER::new (	610	$class->SUPER::new (
555	bg => [1, 1, 1, 1],	611	bg => [1, 1, 1, 1],
556	border_bg => [1, 1, 1, 1],	612	border_bg => [1, 1, 1, 1],
557	border => $::FONTSIZE * 0.8,	613	border => int $::FONTSIZE * 0.8,
558	@_	614	@_
559	)	615	)
560	}	616	}
561		617
562	sub size_request {	618	sub size_request {
…		…
571	$h + $self->{border} * 2,	627	$h + $self->{border} * 2,
572	)	628	)
573	}	629	}
574		630
575	sub size_allocate {	631	sub size_allocate {
576	my ($self, $x, $y, $w, $h) = @_;	632	my ($self, $w, $h) = @_;
577
578	$self->_size_allocate ($x, $y, $w, $h) or return;
579		633
580	$h -= List::Util::max 0, $self->{border} * 2;	634	$h -= List::Util::max 0, $self->{border} * 2;
581	$w -= List::Util::max 0, $self->{border} * 2;	635	$w -= List::Util::max 0, $self->{border} * 2;
582		636
583	$self->child->size_allocate ($self->{border}, $self->{border}, $w, $h);	637	$self->child->configure ($self->{border}, $self->{border}, $w, $h);
584	}	638	}
585		639
586	sub button_down {	640	sub button_down {
587	my ($self, $ev, $x, $y) = @_;	641	my ($self, $ev, $x, $y) = @_;
588		642
…		…
597		651
598	($x, $y) = ($ev->motion_x, $ev->motion_y);	652	($x, $y) = ($ev->motion_x, $ev->motion_y);
599		653
600	$self->{user_w} = $bw + $x - $ox;	654	$self->{user_w} = $bw + $x - $ox;
601	$self->{user_h} = $bh + $y - $oy;	655	$self->{user_h} = $bh + $y - $oy;
602	$self->update;	656	$self->check_size;
603	};	657	};
604		658
605	} elsif ($x >= 0 && $x < $self->{w}	659	} elsif ($x >= 0 && $x < $self->{w}
606	&& $y >= 0 && $y < $self->{border}) {	660	&& $y >= 0 && $y < $self->{border}) {
607		661
…		…
685	@_	739	@_
686	)	740	)
687	}	741	}
688		742
689	sub add {	743	sub add {
690	my ($self, $x, $y, $chld) = @_;	744	my ($self, $x, $y, $child) = @_;
691		745
		746	$child->set_parent ($self);
692	$self->{children}[$y][$x] = $chld;	747	$self->{children}[$y][$x] = $child;
693	$chld->set_parent ($self);
694		748
695	$self->{w} = $self->{h} = -1;	749	$self->{w} = $self->{h} = -1;
		750
		751	$child->check_size;
		752	}
		753
		754	# TODO: move to container class maybe? send childs a signal on removal?
		755	sub clear {
		756	my ($self) = @_;
		757
		758	delete $self->{children};
696	$self->update;	759	$self->update;
697	}	760	}
698		761
699	sub get_wh {	762	sub get_wh {
700	my ($self) = @_;	763	my ($self) = @_;
…		…
728	(sum @$hs),	791	(sum @$hs),
729	)	792	)
730	}	793	}
731		794
732	sub size_allocate {	795	sub size_allocate {
733	my ($self, $x, $y, $w, $h) = @_;	796	my ($self, $w, $h) = @_;
734
735	$self->_size_allocate ($x, $y, $w, $h) or return;
736		797
737	my ($ws, $hs) = $self->get_wh;	798	my ($ws, $hs) = $self->get_wh;
738		799
739	my $req_w = sum @$ws;	800	my $req_w = sum @$ws;
740	my $req_h = sum @$hs;	801	my $req_h = sum @$hs;
…		…
762		823
763	for my $c (0 .. $#$row) {	824	for my $c (0 .. $#$row) {
764	my $col_w = $ws->[$c];	825	my $col_w = $ws->[$c];
765		826
766	if (my $widget = $row->[$c]) {	827	if (my $widget = $row->[$c]) {
767	$widget->size_allocate ($x, $y, $col_w, $row_h);	828	$widget->configure ($x, $y, $col_w, $row_h);
768	}	829	}
769		830
770	$x += $col_w;	831	$x += $col_w;
771	}	832	}
772		833
…		…
817	(List::Util::max map $_->[1], @alloc),	878	(List::Util::max map $_->[1], @alloc),
818	)	879	)
819	}	880	}
820		881
821	sub size_allocate {	882	sub size_allocate {
822	my ($self, $x, $y, $w, $h) = @_;	883	my ($self, $w, $h) = @_;
823
824	$self->_size_allocate ($x, $y, $w, $h);
825		884
826	($h, $w) = ($w, $h);	885	($h, $w) = ($w, $h);
827		886
828	my $children = $self->{children};	887	my $children = $self->{children};
829		888
…		…
851		910
852	my $y = 0;	911	my $y = 0;
853	for (0 .. $#$children) {	912	for (0 .. $#$children) {
854	my $child = $children->[$_];	913	my $child = $children->[$_];
855	my $h = $h[$_];	914	my $h = $h[$_];
856	$child->size_allocate ($y, 0, $h, $w);	915	$child->configure ($y, 0, $h, $w);
857		916
858	$y += $h;	917	$y += $h;
859	}	918	}
		919
		920	1
860	}	921	}
861		922
862	#############################################################################	923	#############################################################################
863		924
864	package CFClient::UI::VBox;	925	package CFClient::UI::VBox;
…		…
877	(List::Util::sum map $_->[1], @alloc),	938	(List::Util::sum map $_->[1], @alloc),
878	)	939	)
879	}	940	}
880		941
881	sub size_allocate {	942	sub size_allocate {
882	my ($self, $x, $y, $w, $h) = @_;	943	my ($self, $w, $h) = @_;
883
884	$self->_size_allocate ($x, $y, $w, $h);
885		944
886	my $children = $self->{children};	945	my $children = $self->{children};
887		946
888	my @h = map +($_->size_request)[1], @$children;	947	my @h = map +($_->size_request)[1], @$children;
889		948
…		…
907		966
908	my $y = 0;	967	my $y = 0;
909	for (0 .. $#$children) {	968	for (0 .. $#$children) {
910	my $child = $children->[$_];	969	my $child = $children->[$_];
911	my $h = $h[$_];	970	my $h = $h[$_];
912	$child->size_allocate (0, $y, $w, $h);	971	$child->configure (0, $y, $w, $h);
913		972
914	$y += $h;	973	$y += $h;
915	}	974	}
		975
		976	1
916	}	977	}
917		978
918	#############################################################################	979	#############################################################################
919		980
920	package CFClient::UI::Label;	981	package CFClient::UI::Label;
…		…
929	my $self = $class->SUPER::new (	990	my $self = $class->SUPER::new (
930	fg => [1, 1, 1],	991	fg => [1, 1, 1],
931	fontsize => $::FONTSIZE,	992	fontsize => $::FONTSIZE,
932	text => "",	993	text => "",
933	align => -1,	994	align => -1,
		995	valign => -1,
934	padding => 2,	996	padding => 2,
935	layout => new CFClient::Layout,	997	layout => new CFClient::Layout,
936	%arg	998	%arg
937	);	999	);
938		1000
939	$self->set_text ($self->{text});	1001	$self->{xxx}++ if $self->{text} eq "Client Setup" && $self->{align};#d#
		1002
		1003	$self->set_text (delete $self->{text}) if exists $self->{text};
		1004	$self->set_markup (delete $self->{markup}) if exists $self->{markup};
940		1005
941	$self	1006	$self
942	}	1007	}
943		1008
944	sub escape_text {	1009	sub escape_text {
…		…
952	}	1017	}
953		1018
954	sub set_text {	1019	sub set_text {
955	my ($self, $text) = @_;	1020	my ($self, $text) = @_;
956		1021
957	$self->{text} = $text;
958	$self->{layout}->set_markup ($text);	1022	$self->{layout}->set_text ($text);
959		1023
960	delete $self->{texture};	1024	delete $self->{texture};
961	# $self->{w} = $self->{h} = -1;
962	$self->update;	1025	$self->update;
963	}	1026	}
964		1027
965	sub get_text {	1028	sub set_markup {
966	my ($self, $text) = @_;	1029	my ($self, $markup) = @_;
967		1030
968	$self->{text}	1031	$self->{layout}->set_markup ($markup);
		1032
		1033	delete $self->{texture};
		1034	$self->update;
969	}	1035	}
970		1036
971	sub size_request {	1037	sub size_request {
972	my ($self) = @_;	1038	my ($self) = @_;
973		1039
974	$self->{layout}->set_width;	1040	$self->{layout}->set_width;
975	$self->{layout}->set_height ($self->{fontsize});	1041	$self->{layout}->set_height ($self->{fontsize});
		1042
976	my ($w, $h) = $self->{layout}->size;	1043	my ($w, $h) = $self->{layout}->size;
977		1044
978	(	1045	(
979	$w + $self->{padding} * 2,	1046	$w + $self->{padding} * 2,
980	$h + $self->{padding} * 2,	1047	$h + $self->{padding} * 2,
981	)	1048	)
982	}	1049	}
983		1050
984	sub size_allocate {	1051	sub size_allocate {
985	my ($self, $x, $y, $w, $h) = @_;	1052	my ($self, $w, $h) = @_;
986
987	$self->_size_allocate ($x, $y, $w, $h) or return;
988		1053
989	delete $self->{texture};	1054	delete $self->{texture};
990	}	1055	}
991		1056
992	sub update {	1057	sub update {
…		…
999	sub _draw {	1064	sub _draw {
1000	my ($self) = @_;	1065	my ($self) = @_;
1001		1066
1002	my $tex = $self->{texture} \|\|= do {	1067	my $tex = $self->{texture} \|\|= do {
1003	$self->{layout}->set_width ($self->{w});	1068	$self->{layout}->set_width ($self->{w});
1004	$self->{layout}->set_height (List::Util::min $self->{h} - $self->{padding} * 2, $self->{fontsize});	1069	$self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize});
1005	new_from_layout CFClient::Texture $self->{layout}	1070	new_from_layout CFClient::Texture $self->{layout}
1006	};	1071	};
1007		1072
1008	glEnable GL_BLEND;	1073	glEnable GL_BLEND;
1009	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	1074	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1010	glEnable GL_TEXTURE_2D;	1075	glEnable GL_TEXTURE_2D;
1011	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1076	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1012		1077
1013	glColor @{$self->{fg}};	1078	glColor @{$self->{fg}};
1014		1079
1015	my $x =	1080	$self->{ox} = int (
1016	$self->{align} < 0 ? $self->{padding}	1081	$self->{align} < 0 ? $self->{padding}
1017	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}	1082	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1018	: ($self->{w} - $tex->{w}) * 0.5;	1083	: ($self->{w} - $tex->{w}) * 0.5
		1084	);
1019		1085
1020	$tex->draw_quad (int $x, int +($self->{h} - $tex->{h}) * 0.5);	1086	$self->{oy} = int (
		1087	$self->{valign} < 0 ? $self->{padding}
		1088	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
		1089	: ($self->{h} - $tex->{h}) * 0.5
		1090	);
		1091
		1092	$tex->draw_quad ($self->{ox}, $self->{oy});
1021		1093
1022	glDisable GL_TEXTURE_2D;	1094	glDisable GL_TEXTURE_2D;
1023	glDisable GL_BLEND;	1095	glDisable GL_BLEND;
1024	}	1096	}
1025		1097
1026	#############################################################################	1098	#############################################################################
1027		1099
1028	package CFClient::UI::Entry;	1100	package CFClient::UI::EntryBase;
1029		1101
1030	our @ISA = CFClient::UI::Label::;	1102	our @ISA = CFClient::UI::Label::;
1031		1103
1032	use SDL;	1104	use SDL;
1033	use SDL::OpenGL;	1105	use SDL::OpenGL;
…		…
1040	bg => [0, 0, 0, 0.2],	1112	bg => [0, 0, 0, 0.2],
1041	active_bg => [1, 1, 1, 0.5],	1113	active_bg => [1, 1, 1, 0.5],
1042	active_fg => [0, 0, 0],	1114	active_fg => [0, 0, 0],
1043	can_hover => 1,	1115	can_hover => 1,
1044	can_focus => 1,	1116	can_focus => 1,
		1117	valign => 0,
1045	@_	1118	@_
1046	)	1119	)
1047	}	1120	}
1048		1121
1049	sub _set_text {	1122	sub _set_text {
1050	my ($self, $text) = @_;	1123	my ($self, $text) = @_;
1051		1124
1052	my $old_text = $self->{text};	1125	delete $self->{cur_h};
		1126
		1127	return if $self->{text} eq $text;
1053		1128
1054	$self->{last_activity} = $::NOW;	1129	$self->{last_activity} = $::NOW;
1055
1056	$self->{text} = $text;	1130	$self->{text} = $text;
1057	$self->{layout}->set_width ($self->{w});
1058	$self->{layout}->set_height (List::Util::min $self->{h} - $self->{padding} * 2, $self->{fontsize});
1059		1131
1060	$text =~ s/./*/g if $self->{hidden};	1132	$text =~ s/./*/g if $self->{hidden};
		1133	$self->{layout}->set_text ("$text ");
1061		1134
1062	$self->{layout}->set_markup ($self->escape_text ($text) . " ");	1135	$self->emit (changed => $self->{text});
		1136	}
1063		1137
1064	$text = substr $text, 0, $self->{cursor};	1138	sub get_text {
1065	utf8::encode $text;	1139	$_[0]{text}
1066
1067	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text);
1068
1069	$self->emit (changed => $self->{text}) # XXX: is this the right place to do this?
1070	if $old_text ne $self->{text};
1071	}	1140	}
1072		1141
1073	sub size_request {	1142	sub size_request {
1074	my ($self) = @_;	1143	my ($self) = @_;
1075		1144
…		…
1077		1146
1078	($w + 1, $h) # add 1 for cursor	1147	($w + 1, $h) # add 1 for cursor
1079	}	1148	}
1080		1149
1081	sub size_allocate {	1150	sub size_allocate {
1082	my ($self, $x, $y, $w, $h) = @_;	1151	my ($self, $w, $h) = @_;
1083
1084	$self->SUPER::size_allocate ($x, $y, $w, $h);
1085		1152
1086	$self->_set_text ($self->{text});	1153	$self->_set_text ($self->{text});
1087	}	1154	}
1088		1155
1089	sub set_text {	1156	sub set_text {
…		…
1179		1246
1180	$self->SUPER::_draw;	1247	$self->SUPER::_draw;
1181		1248
1182	#TODO: force update every cursor change :(	1249	#TODO: force update every cursor change :(
1183	if ($FOCUS == $self && (($::NOW - $self->{last_activity}) & 1023) < 600) {	1250	if ($FOCUS == $self && (($::NOW - $self->{last_activity}) & 1023) < 600) {
		1251
		1252	unless (exists $self->{cur_h}) {
		1253	my $text = substr $self->{text}, 0, $self->{cursor};
		1254	utf8::encode $text;
		1255
		1256	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
		1257	}
		1258
1184	glColor @{$self->{fg}};	1259	glColor @{$self->{fg}};
1185	glBegin GL_LINES;	1260	glBegin GL_LINES;
1186	glVertex $self->{cur_x}, $self->{cur_y};
1187	glVertex $self->{cur_x}, $self->{cur_y} + $self->{cur_h};	1261	glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};
		1262	glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1188	glEnd;	1263	glEnd;
1189	}	1264	}
1190	}	1265	}
1191		1266
1192	package CFClient::UI::LineEntry;	1267	package CFClient::UI::Entry;
1193		1268
1194	our @ISA = CFClient::UI::Entry::;	1269	our @ISA = CFClient::UI::EntryBase::;
1195		1270
1196	use SDL;	1271	use SDL;
1197	use SDL::OpenGL;	1272	use SDL::OpenGL;
1198		1273
1199	sub key_down {	1274	sub key_down {
…		…
1229		1304
1230	$class->SUPER::new (	1305	$class->SUPER::new (
1231	padding => 4,	1306	padding => 4,
1232	fg => [1, 1, 1],	1307	fg => [1, 1, 1],
1233	bg => [1, 1, 1, 0.2],	1308	bg => [1, 1, 1, 0.2],
1234	active_fg => [1, 1, 0],	1309	active_fg => [0, 0, 1],
1235	can_hover => 1,	1310	can_hover => 1,
		1311	align => 0,
		1312	valign => 0,
1236	@_	1313	@_
1237	)	1314	)
1238	}	1315	}
1239		1316
1240	sub button_up {	1317	sub button_up {
…		…
1248		1325
1249	sub _draw {	1326	sub _draw {
1250	my ($self) = @_;	1327	my ($self) = @_;
1251		1328
1252	local $self->{fg} = $self->{fg};	1329	local $self->{fg} = $self->{fg};
1253	my $tex = $tex[0];
1254
1255	glEnable GL_BLEND;
1256	glEnable GL_TEXTURE_2D;
1257	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1258		1330
1259	if ($GRAB == $self) {	1331	if ($GRAB == $self) {
1260	$self->{fg} = $self->{active_fg};	1332	$self->{fg} = $self->{active_fg};
1261	}	1333	}
1262		1334
1263	glBindTexture GL_TEXTURE_2D, $tex->{name};	1335	glEnable GL_BLEND;
		1336	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
		1337	glEnable GL_TEXTURE_2D;
1264	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1338	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		1339	glColor 0, 0, 0, 1;
1265		1340
1266	$tex->draw_quad (0, 0, $self->{w}, $self->{h});	1341	$tex[0]->draw_quad (0, 0, $self->{w}, $self->{h});
1267		1342
1268	glDisable GL_TEXTURE_2D;	1343	glDisable GL_TEXTURE_2D;
1269	glDisable GL_BLEND;	1344	glDisable GL_BLEND;
1270		1345
1271	$self->SUPER::_draw;	1346	$self->SUPER::_draw;
…		…
1301	my ($self) = @_;	1376	my ($self) = @_;
1302		1377
1303	($self->{padding} * 2 + 6) x 2	1378	($self->{padding} * 2 + 6) x 2
1304	}	1379	}
1305		1380
1306	sub size_allocate {
1307	my ($self, $x, $y, $w, $h) = @_;
1308
1309	$self->_size_allocate ($x, $y, $w, $h);
1310	}
1311
1312	sub button_down {	1381	sub button_down {
1313	my ($self, $ev, $x, $y) = @_;	1382	my ($self, $ev, $x, $y) = @_;
1314		1383
1315	if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}	1384	if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}
1316	&& $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {	1385	&& $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {
…		…
1338		1407
1339	$tex->draw_quad (0, 0, $s, $s);	1408	$tex->draw_quad (0, 0, $s, $s);
1340		1409
1341	glDisable GL_TEXTURE_2D;	1410	glDisable GL_TEXTURE_2D;
1342	glDisable GL_BLEND;	1411	glDisable GL_BLEND;
		1412	}
		1413
		1414	#############################################################################
		1415
		1416	package CFClient::UI::VGauge;
		1417
		1418	our @ISA = CFClient::UI::Base::;
		1419
		1420	use SDL::OpenGL;
		1421
		1422	my %tex = (
		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
		1441	# eg. VGauge->new (gauge => 'food'), default gauge: food
		1442	sub new {
		1443	my $class = shift;
		1444
		1445	my $self = $class->SUPER::new (gauge => 'food', @_);
		1446
		1447	$self
		1448	}
		1449
		1450	sub size_request {
		1451	my ($self) = @_;
		1452
		1453	my $tex = $tex{$self->{gauge}}[0];
		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	}
		1475
		1476	sub _draw {
		1477	my ($self) = @_;
		1478
		1479	my $tex = $tex{$self->{gauge}};
		1480
		1481	my ($w, $h) = ($self->{w}, $self->{h});
		1482
		1483	my $ycut = $self->{val} / ($self->{max_val} \|\| 1);
		1484	$ycut = 1 if $self->{val} > $self->{max_val};
		1485
		1486	my $t1 = $tex->[0];
		1487	my $t2 = $tex->[1];
		1488
		1489	glEnable GL_BLEND;
		1490	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
		1491	glEnable GL_TEXTURE_2D;
		1492	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		1493
		1494	my $h1 = $self->{h} - $ycut * $self->{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
		1517	glDisable GL_BLEND;
		1518	glDisable GL_TEXTURE_2D;
1343	}	1519	}
1344		1520
1345	#############################################################################	1521	#############################################################################
1346		1522
1347	package CFClient::UI::Slider;	1523	package CFClient::UI::Slider;
…		…
1541		1717
1542	($self->{req_w}, $self->{req_h})	1718	($self->{req_w}, $self->{req_h})
1543	}	1719	}
1544		1720
1545	sub size_allocate {	1721	sub size_allocate {
1546	my ($self, $x, $y, $w, $h) = @_;	1722	my ($self, $w, $h) = @_;
1547
1548	$self->SUPER::size_allocate ($x, $y, $w, $h);
1549		1723
1550	$self->{layout}->set_height ($self->{fontsize});	1724	$self->{layout}->set_height ($self->{fontsize});
1551	$self->{layout}->set_width ($self->{w});	1725	$self->{layout}->set_width ($self->{w});
1552		1726
1553	$self->reflow;	1727	$self->reflow;
		1728	$self->update;
1554	}	1729	}
1555		1730
1556	sub add_paragraph {	1731	sub add_paragraph {
1557	my ($self, $color, $text) = @_;	1732	my ($self, $color, $text) = @_;
1558		1733
…		…
1575		1750
1576	return unless $self->{h} > 0;	1751	return unless $self->{h} > 0;
1577		1752
1578	delete $self->{texture};	1753	delete $self->{texture};
1579		1754
1580	$TOPLEVEL->on_refresh ($self, sub {	1755	$ROOT->on_refresh ($self, sub {
1581	if (delete $self->{need_reflow}) {	1756	if (delete $self->{need_reflow}) {
1582	my $height = 0;	1757	my $height = 0;
1583		1758
1584	$height += $_->[0] = $self->text_height ($_->[2])	1759	$height += $_->[0] = $self->text_height ($_->[2])
1585	for @{$self->{par}};	1760	for @{$self->{par}};
…		…
1739		1914
1740	my ($w, $h, $data) = $::MAP->draw ($sx, $sy, 0, 0, $sw + 1, $sh + 1);	1915	my ($w, $h, $data) = $::MAP->draw ($sx, $sy, 0, 0, $sw + 1, $sh + 1);
1741		1916
1742	if ($::CFG->{fow_enable}) {	1917	if ($::CFG->{fow_enable}) {
1743	if ($::CFG->{fow_smooth}) { # smooth fog of war	1918	if ($::CFG->{fow_smooth}) { # smooth fog of war
1744	glConvolutionParameter GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER;	1919	glConvolutionParameter (GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER);
1745	glConvolutionFilter2D	1920	glConvolutionFilter2D (
1746	GL_CONVOLUTION_2D,	1921	GL_CONVOLUTION_2D,
1747	GL_ALPHA,	1922	GL_ALPHA,
1748	3, 3,	1923	3, 3,
1749	GL_ALPHA, GL_FLOAT,	1924	GL_ALPHA, GL_FLOAT,
1750	pack "f*",	1925	pack "f*",
1751	0.1, 0.1, 0.1,	1926	0.1, 0.1, 0.1,
1752	0.1, 0.2, 0.1,	1927	0.1, 0.2, 0.1,
1753	0.1, 0.1, 0.1,	1928	0.1, 0.1, 0.1,
1754	;	1929	);
1755	glEnable GL_CONVOLUTION_2D;	1930	glEnable GL_CONVOLUTION_2D;
1756	}	1931	}
1757		1932
1758	my $tex = new CFClient::Texture	1933	$self->{fow_texture} = new CFClient::Texture
1759	w => $w,	1934	w => $w,
1760	h => $h,	1935	h => $h,
1761	data => $data,	1936	data => $data,
1762	internalformat => GL_ALPHA,	1937	internalformat => GL_ALPHA,
1763	format => GL_ALPHA;	1938	format => GL_ALPHA;
…		…
1768	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	1943	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1769	glEnable GL_TEXTURE_2D;	1944	glEnable GL_TEXTURE_2D;
1770	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	1945	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1771		1946
1772	glColor +($::CFG->{fow_intensity}) x 3, 1;	1947	glColor +($::CFG->{fow_intensity}) x 3, 1;
1773	$tex->draw_quad (0, 0, $w * 32, $h * 32);	1948	$self->{fow_texture}->draw_quad (0, 0, $w * 32, $h * 32);
1774		1949
1775	glDisable GL_TEXTURE_2D;	1950	glDisable GL_TEXTURE_2D;
1776	glDisable GL_BLEND;	1951	glDisable GL_BLEND;
1777	}	1952	}
1778		1953
…		…
1784	glEnable GL_BLEND;	1959	glEnable GL_BLEND;
1785	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	1960	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1786	glEnable GL_TEXTURE_2D;	1961	glEnable GL_TEXTURE_2D;
1787	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1962	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1788		1963
		1964	$self->{mapmap_texture} =
1789	CFClient::Texture->new (	1965	new CFClient::Texture
1790	w => $w,	1966	w => $w,
1791	h => $h,	1967	h => $h,
1792	data => $::MAP->mapmap ($w, $h),	1968	data => $::MAP->mapmap ($w, $h),
1793	type => GL_UNSIGNED_INT_8_8_8_8_REV	1969	type => $CFClient::GL_VERSION >= 1.2 ? GL_UNSIGNED_INT_8_8_8_8_REV : GL_UNSIGNED_BYTE;
1794	)->draw_quad (100, 100);	1970
		1971	$self->{mapmap_texture}->draw_quad (100, 100);
1795		1972
1796	glDisable GL_TEXTURE_2D;	1973	glDisable GL_TEXTURE_2D;
1797	glDisable GL_BLEND;	1974	glDisable GL_BLEND;
1798	}	1975	}
1799	# HACK END	1976	# HACK END
…		…
1841		2018
1842	my $mod = $ev->key_mod;	2019	my $mod = $ev->key_mod;
1843	my $sym = $ev->key_sym;	2020	my $sym = $ev->key_sym;
1844		2021
1845	if ($sym == SDLK_KP5) {	2022	if ($sym == SDLK_KP5) {
1846	$::CONN->user_send ("command stay fire");	2023	$::CONN->user_send ("stay fire");
1847	} elsif ($sym == SDLK_a) {	2024	} elsif ($sym == SDLK_a) {
1848	$::CONN->user_send ("command apply");	2025	$::CONN->user_send ("apply");
1849	} elsif ($sym == SDLK_QUOTE) {	2026	} elsif ($sym == SDLK_QUOTE) {
1850	$self->emit ('activate_console');	2027	$self->emit ('activate_console');
1851	} elsif ($sym == SDLK_SLASH) {	2028	} elsif ($sym == SDLK_SLASH) {
1852	$self->emit ('activate_console' => '/');	2029	$self->emit ('activate_console' => '/');
1853	} elsif (exists $DIR{$sym}) {	2030	} elsif (exists $DIR{$sym}) {
1854	if ($mod & KMOD_SHIFT) {	2031	if ($mod & KMOD_SHIFT) {
1855	$self->{shft}++;	2032	$self->{shft}++;
1856	$::CONN->user_send ("command fire $DIR{$sym}[0]");	2033	$::CONN->user_send ("fire $DIR{$sym}[0]");
1857	} elsif ($mod & KMOD_CTRL) {	2034	} elsif ($mod & KMOD_CTRL) {
1858	$self->{ctrl}++;	2035	$self->{ctrl}++;
1859	$::CONN->user_send ("command run $DIR{$sym}[0]");	2036	$::CONN->user_send ("run $DIR{$sym}[0]");
1860	} else {	2037	} else {
1861	$::CONN->user_send ("command $DIR{$sym}[1]");	2038	$::CONN->user_send ("$DIR{$sym}[1]");
1862	}	2039	}
1863	}	2040	}
1864	}	2041	}
1865		2042
1866	sub key_up {	2043	sub key_up {
…		…
1868		2045
1869	my $mod = $ev->key_mod;	2046	my $mod = $ev->key_mod;
1870	my $sym = $ev->key_sym;	2047	my $sym = $ev->key_sym;
1871		2048
1872	if (!($mod & KMOD_SHIFT) && delete $self->{shft}) {	2049	if (!($mod & KMOD_SHIFT) && delete $self->{shft}) {
1873	$::CONN->user_send ("command fire_stop");	2050	$::CONN->user_send ("fire_stop");
1874	}	2051	}
1875	if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) {	2052	if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) {
1876	$::CONN->user_send ("command run_stop");	2053	$::CONN->user_send ("run_stop");
1877	}	2054	}
1878	}	2055	}
1879		2056
1880	#############################################################################	2057	#############################################################################
1881		2058
…		…
1945	sub toggle_flopper {	2122	sub toggle_flopper {
1946	my ($self) = @_;	2123	my ($self) = @_;
1947		2124
1948	# TODO: use animation	2125	# TODO: use animation
1949	if ($self->{state} = !$self->{state}) {	2126	if ($self->{state} = !$self->{state}) {
1950	$CFClient::UI::TOPLEVEL->add ($self->{other});	2127	$CFClient::UI::ROOT->add ($self->{other});
1951	$self->{other}->move (	2128	$self->{other}->move ($self->coord2global (0, $self->{h}));
1952	($::WIDTH - $self->{other}{w}) * 0.5,	2129	$self->emit ("open");
1953	($::HEIGHT - $self->{other}{h}) * 0.5,
1954	);
1955	} else {	2130	} else {
1956	$CFClient::UI::TOPLEVEL->remove ($self->{other});	2131	$CFClient::UI::ROOT->remove ($self->{other});
		2132	$self->emit ("close");
1957	}	2133	}
1958	}
1959		2134
1960	#############################################################################	2135	$self->emit (changed => $self->{state});
		2136	}
1961		2137
		2138	#############################################################################
		2139
1962	package CFClient::UI::Toplevel;	2140	package CFClient::UI::Root;
1963		2141
1964	our @ISA = CFClient::UI::Container::;	2142	our @ISA = CFClient::UI::Container::;
1965		2143
1966	use SDL::OpenGL;	2144	use SDL::OpenGL;
		2145
		2146	sub check_size {
		2147	my ($self) = @_;
		2148
		2149	$self->configure (0, 0, $::WITH, $::HEIGHT);
		2150	}
1967		2151
1968	sub size_request {	2152	sub size_request {
1969	($::WIDTH, $::HEIGHT)	2153	($::WIDTH, $::HEIGHT)
1970	}	2154	}
1971		2155
1972	sub size_allocate {	2156	sub configure {
1973	my ($self, $x, $y, $w, $h) = @_;	2157	my ($self, $x, $y, $w, $h) = @_;
1974		2158
1975	$self->_size_allocate ($x, $y, $w, $h);	2159	$self->SUPER::configure ($x, $y, $w, $h);
1976		2160
1977	$_->size_allocate ($_->{x}, $_->{y}, $_->size_request)	2161	$_->configure ($_->{x}, $_->{y}, $_->size_request)
1978	for @{$self->{children}};	2162	for @{$self->{children}};
1979	}	2163	}
1980		2164
1981	sub translate {	2165	sub _topleft {
1982	my ($self, $x, $y) = @_;	2166	my ($self, $x, $y) = @_;
1983		2167
1984	($x, $y)	2168	($x, $y)
1985	}	2169	}
1986		2170
1987	sub update {	2171	sub update {
1988	my ($self) = @_;	2172	my ($self) = @_;
1989		2173
1990	$self->size_allocate (0, 0, $::WIDTH, $::HEIGHT);	2174	$self->check_size;
1991	::refresh ();	2175	::refresh ();
1992	}	2176	}
1993		2177
1994	sub add {	2178	sub add {
1995	my ($self, $widget) = @_;	2179	my ($self, $child) = @_;
1996		2180
1997	$self->SUPER::add ($widget);	2181	$self->SUPER::add ($child);
1998
1999	$widget->size_allocate ($widget->{x}, $widget->{y}, $widget->size_request);
2000	}	2182	}
2001		2183
2002	sub on_refresh {	2184	sub on_refresh {
2003	my ($self, $id, $cb) = @_;	2185	my ($self, $id, $cb) = @_;
2004		2186
…		…
2027		2209
2028	#############################################################################	2210	#############################################################################
2029		2211
2030	package CFClient::UI;	2212	package CFClient::UI;
2031		2213
2032	$TOPLEVEL = new CFClient::UI::Toplevel;	2214	$ROOT = new CFClient::UI::Root;
2033		2215
2034	1	2216	1
2035		2217

Diff Legend

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

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents): Revision 1.112 by root, Sat Apr 15 12:29:46 2006 UTC vs. Revision 1.130 by root, Tue Apr 18 01:51:06 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.112 by root, Sat Apr 15 12:29:46 2006 UTC vs.
Revision 1.130 by root, Tue Apr 18 01:51:06 2006 UTC