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

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.109 by root, Sat Apr 15 01:13:47 2006 UTC vs.
Revision 1.133 by root, Tue Apr 18 21:39:31 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	}
		72
		73	# convert position array to integers
		74	sub harmonize {
		75	my ($vals) = @_;
		76
		77	my $rem = 0;
		78
		79	for (@$vals) {
		80	my $i = int $_ + $rem;
		81	$rem += $_ - $i;
		82	$_ = $i;
		83	}
71	}	84	}
72		85
73	#############################################################################	86	#############################################################################
74		87
75	package CFClient::UI::Base;	88	package CFClient::UI::Base;
…		…
99	$self	112	$self
100	}	113	}
101		114
102	sub move {	115	sub move {
103	my ($self, $x, $y, $z) = @_;	116	my ($self, $x, $y, $z) = @_;
		117
104	$self->{x} = $x;	118	$self->{x} = int $x;
105	$self->{y} = $y;	119	$self->{y} = int $y;
106	$self->{z} = $z if defined $z;	120	$self->{z} = $z if defined $z;
		121
		122	$self->update;
107	}	123	}
108		124
109	sub needs_redraw {	125	sub needs_redraw {
110	0	126	0
111	}	127	}
…		…
113	sub size_request {	129	sub size_request {
114	require Carp;	130	require Carp;
115	Carp::confess "size_request is abtract";	131	Carp::confess "size_request is abtract";
116	}	132	}
117		133
118	sub _size_allocate {	134	sub configure {
119	my ($self, $x, $y, $w, $h) = @_;	135	my ($self, $x, $y, $w, $h) = @_;
120		136
121	$self->{x} = $x;	137	$self->{x} = $x;
122	$self->{y} = $y;	138	$self->{y} = $y;
123		139
124	return unless $self->{w} != $w \|\| $self->{h} != $h;	140	return unless $self->{w} != $w \|\| $self->{h} != $h;
125		141
126	$self->{w} = $w;	142	$self->{w} = $w;
127	$self->{h} = $h;	143	$self->{h} = $h;
128		144
129	1	145	$self->size_allocate ($w, $h);
130	}	146	}
131		147
132	sub size_allocate {	148	sub size_allocate {
		149	# nothing to be done
		150	}
		151
		152	# return top left coordinates
		153	sub _topleft {
133	my ($self, $x, $y, $w, $h) = @_;	154	my ($self, $x, $y) = @_;
134		155
135	$self->_size_allocate ($x, $y, $w, $h);	156	$self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y});
136	}	157	}
137		158
138	# translate global coordinates to local coordinate system	159	# translate global coordinates to local coordinate system
139	sub translate {	160	sub coord2local {
140	my ($self, $x, $y) = @_;	161	my ($self, $x, $y) = @_;
141		162
142	$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)
143	}	173	}
144		174
145	sub focus_in {	175	sub focus_in {
146	my ($self) = @_;	176	my ($self) = @_;
147		177
148	return if $FOCUS == $self;	178	return if $FOCUS == $self;
149	return unless $self->{can_focus};	179	return unless $self->{can_focus};
150		180
151	my $focus = $FOCUS; $FOCUS = $self;	181	my $focus = $FOCUS; $FOCUS = $self;
		182
		183	$self->emit (focus_in => $focus);
		184
152	$focus->update if $focus;	185	$focus->update if $focus;
153	$FOCUS->update;	186	$FOCUS->update;
154	}	187	}
155		188
156	sub focus_out {	189	sub focus_out {
157	my ($self) = @_;	190	my ($self) = @_;
158		191
159	return unless $FOCUS == $self;	192	return unless $FOCUS == $self;
160		193
161	my $focus = $FOCUS; undef $FOCUS;	194	my $focus = $FOCUS; undef $FOCUS;
		195
		196	$self->emit (focus_out => $focus);
		197
162	$focus->update if $focus; #?	198	$focus->update if $focus; #?
163	}	199	}
164		200
165	sub mouse_motion { }	201	sub mouse_motion { }
166	sub button_up { }	202	sub button_up { }
…		…
190	glPopMatrix;	226	glPopMatrix;
191		227
192	if ($self == $HOVER && $self->{can_hover}) {	228	if ($self == $HOVER && $self->{can_hover}) {
193	my ($x, $y) = @$self{qw(x y)};	229	my ($x, $y) = @$self{qw(x y)};
194		230
195	glColor 0, 0, 1, 0.2;	231	glColor 1, 0.8, 0.5, 0.2;
196	glEnable GL_BLEND;	232	glEnable GL_BLEND;
197	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	233	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
198	glBegin GL_QUADS;	234	glBegin GL_QUADS;
199	glVertex $x , $y;	235	glVertex $x , $y;
200	glVertex $x + $self->{w}, $y;	236	glVertex $x + $self->{w}, $y;
…		…
220		256
221	()	257	()
222	}	258	}
223		259
224	sub set_parent {	260	sub set_parent {
225	my ($self, $par) = @_;	261	my ($self, $parent) = @_;
226		262
227	$self->{parent} = $par;
228	Scalar::Util::weaken $self->{parent};	263	Scalar::Util::weaken ($self->{parent} = $parent);
229	}	264	}
230		265
231	sub get_parent {	266	sub check_size {
232	$_[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	}
233	}	281	}
234		282
235	sub update {	283	sub update {
236	my ($self) = @_;	284	my ($self) = @_;
237		285
…		…
240	}	288	}
241		289
242	sub connect {	290	sub connect {
243	my ($self, $signal, $cb) = @_;	291	my ($self, $signal, $cb) = @_;
244		292
245	push @{ $self->{cb}{$signal} }, $cb;	293	push @{ $self->{signal_cb}{$signal} }, $cb;
246	}	294	}
247		295
248	sub emit {	296	sub emit {
249	my ($self, $signal, @args) = @_;	297	my ($self, $signal, @args) = @_;
250		298
		299	for my $cb (@{$self->{signal_cb}{$signal} \|\| []}) {
251	$_->($self, @args)	300	$cb->($self, @args);
252	for @{$self->{cb}{$signal} \|\| []};	301	}
253	}	302	}
254		303
255	sub DESTROY {	304	sub DESTROY {
256	my ($self) = @_;	305	my ($self) = @_;
257		306
…		…
326		375
327	$self	376	$self
328	}	377	}
329		378
330	sub add {	379	sub add {
331	my ($self, $chld) = @_;	380	my ($self, $child) = @_;
332		381
333	$chld->set_parent ($self);	382	$child->set_parent ($self);
		383
		384	use sort 'stable';
334		385
335	$self->{children} = [	386	$self->{children} = [
336	sort { $a->{z} <=> $b->{z} }	387	sort { $a->{z} <=> $b->{z} }
337	@{$self->{children}}, $chld	388	@{$self->{children}}, $child
338	];	389	];
339		390
340	$self->{w} = $self->{h} = -1;	391	$self->{w} = $self->{h} = -1;
341	$self->update;	392
		393	$child->check_size;
342	}	394	}
343		395
344	sub remove {	396	sub remove {
345	my ($self, $widget) = @_;	397	my ($self, $widget) = @_;
346		398
347	$self->{children} = [ grep $_ != $widget, @{ $self->{children} } ];	399	$self->{children} = [ grep $_ != $widget, @{ $self->{children} } ];
348		400
349	$self->size_allocate (0, 0, $self->{w}, $self->{h});	401	$self->check_size;
350	}	402	}
351		403
352	sub find_widget {	404	sub find_widget {
353	my ($self, $x, $y) = @_;	405	my ($self, $x, $y) = @_;
354		406
…		…
407	sub size_request {	459	sub size_request {
408	$_[0]{children}[0]->size_request	460	$_[0]{children}[0]->size_request
409	}	461	}
410		462
411	sub size_allocate {	463	sub size_allocate {
412	my ($self, $x, $y, $w, $h) = @_;	464	my ($self, $w, $h) = @_;
413		465
414	$self->_size_allocate ($x, $y, $w, $h) or return;
415
416	$self->{children}[0]->size_allocate (0, 0, $w, $h);	466	$self->{children}[0]->configure (0, 0, $w, $h);
417	}	467	}
418		468
419	#############################################################################	469	#############################################################################
420		470
421	package CFClient::UI::Window;	471	package CFClient::UI::Window;
…		…
447	$self->child->draw;	497	$self->child->draw;
448	};	498	};
449	}	499	}
450		500
451	sub size_allocate {	501	sub size_allocate {
452	my ($self, $x, $y, $w, $h) = @_;	502	my ($self, $w, $h) = @_;
453		503
454	$self->_size_allocate ($x, $y, $w, $h) or return;
455
456	$self->child->size_allocate (0, 0, $w, $h);	504	$self->child->configure (0, 0, $w, $h);
457		505
458	$self->render_chld;	506	$self->render_chld;
459	}	507	}
460		508
461	sub _draw {	509	sub _draw {
…		…
477	glDisable GL_TEXTURE_2D;	525	glDisable GL_TEXTURE_2D;
478	}	526	}
479		527
480	#############################################################################	528	#############################################################################
481		529
		530	package CFClient::UI::ViewPort;
		531
		532	our @ISA = CFClient::UI::Window::;
		533
		534	sub new { die }
		535
		536	sub size_request {
		537	my ($self) = @_;
		538
		539	@$self{qw(child_w child_h)} = $self->child->size_request;
		540	$self->child->size_allocate (0, 0, @$self{qw(child_w child_h)});
		541
		542	@$self{qw(child_w child_h)}
		543	}
		544
		545	sub _draw {
		546	my ($self) = @_;
		547
		548	$self->{children}[1]->draw;
		549	}
		550
		551
		552	#############################################################################
		553
482	package CFClient::UI::Frame;	554	package CFClient::UI::Frame;
483		555
484	our @ISA = CFClient::UI::Bin::;	556	our @ISA = CFClient::UI::Bin::;
485		557
486	use SDL::OpenGL;	558	use SDL::OpenGL;
…		…
496	}	568	}
497		569
498	sub size_allocate {	570	sub size_allocate {
499	my ($self, $x, $y, $w, $h) = @_;	571	my ($self, $x, $y, $w, $h) = @_;
500		572
501	$self->_size_allocate ($x, $y, $w, $h) or return;
502
503	$self->child->size_allocate (2, 2, $w - 4, $h - 4);	573	$self->child->configure (2, 2, $w - 4, $h - 4);
504	}	574	}
505		575
506	sub _draw {	576	sub _draw {
507	my ($self) = @_;	577	my ($self) = @_;
508		578
…		…
539	# TODO: user_x, user_y, overwrite moveto?	609	# TODO: user_x, user_y, overwrite moveto?
540		610
541	$class->SUPER::new (	611	$class->SUPER::new (
542	bg => [1, 1, 1, 1],	612	bg => [1, 1, 1, 1],
543	border_bg => [1, 1, 1, 1],	613	border_bg => [1, 1, 1, 1],
544	border => $::FONTSIZE * 0.8,	614	border => int $::FONTSIZE * 0.8,
545	@_	615	@_
546	)	616	)
547	}	617	}
548		618
549	sub size_request {	619	sub size_request {
…		…
558	$h + $self->{border} * 2,	628	$h + $self->{border} * 2,
559	)	629	)
560	}	630	}
561		631
562	sub size_allocate {	632	sub size_allocate {
563	my ($self, $x, $y, $w, $h) = @_;	633	my ($self, $w, $h) = @_;
564
565	$self->_size_allocate ($x, $y, $w, $h) or return;
566		634
567	$h -= List::Util::max 0, $self->{border} * 2;	635	$h -= List::Util::max 0, $self->{border} * 2;
568	$w -= List::Util::max 0, $self->{border} * 2;	636	$w -= List::Util::max 0, $self->{border} * 2;
569		637
570	$self->child->size_allocate ($self->{border}, $self->{border}, $w, $h);	638	$self->child->configure ($self->{border}, $self->{border}, $w, $h);
571	}	639	}
572		640
573	sub button_down {	641	sub button_down {
574	my ($self, $ev, $x, $y) = @_;	642	my ($self, $ev, $x, $y) = @_;
575		643
…		…
584		652
585	($x, $y) = ($ev->motion_x, $ev->motion_y);	653	($x, $y) = ($ev->motion_x, $ev->motion_y);
586		654
587	$self->{user_w} = $bw + $x - $ox;	655	$self->{user_w} = $bw + $x - $ox;
588	$self->{user_h} = $bh + $y - $oy;	656	$self->{user_h} = $bh + $y - $oy;
589	$self->update;	657	$self->check_size;
590	};	658	};
591		659
592	} elsif ($x >= 0 && $x < $self->{w}	660	} elsif ($x >= 0 && $x < $self->{w}
593	&& $y >= 0 && $y < $self->{border}) {	661	&& $y >= 0 && $y < $self->{border}) {
594		662
…		…
672	@_	740	@_
673	)	741	)
674	}	742	}
675		743
676	sub add {	744	sub add {
677	my ($self, $x, $y, $chld) = @_;	745	my ($self, $x, $y, $child) = @_;
678		746
		747	$child->set_parent ($self);
679	$self->{children}[$y][$x] = $chld;	748	$self->{children}[$y][$x] = $child;
680	$chld->set_parent ($self);
681		749
682	$self->{w} = $self->{h} = -1;	750	$self->{w} = $self->{h} = -1;
		751
		752	$child->check_size;
		753	}
		754
		755	# TODO: move to container class maybe? send childs a signal on removal?
		756	sub clear {
		757	my ($self) = @_;
		758
		759	delete $self->{children};
683	$self->update;	760	$self->update;
684	}	761	}
685		762
686	sub get_wh {	763	sub get_wh {
687	my ($self) = @_;	764	my ($self) = @_;
…		…
715	(sum @$hs),	792	(sum @$hs),
716	)	793	)
717	}	794	}
718		795
719	sub size_allocate {	796	sub size_allocate {
720	my ($self, $x, $y, $w, $h) = @_;	797	my ($self, $w, $h) = @_;
721
722	$self->_size_allocate ($x, $y, $w, $h) or return;
723		798
724	my ($ws, $hs) = $self->get_wh;	799	my ($ws, $hs) = $self->get_wh;
725		800
726	my $req_w = sum @$ws;	801	my $req_w = sum @$ws;
727	my $req_h = sum @$hs;	802	my $req_h = sum @$hs;
…		…
733		808
734	# linearly scale sizes	809	# linearly scale sizes
735	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;	810	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
736	$hs->[$_] = 1 $h / $req_h for 0 .. $#$hs;	811	$hs->[$_] = 1 $h / $req_h for 0 .. $#$hs;
737		812
738	$_ = int $_ for @$ws; #TODO: avoid rounding problems	813	CFClient::UI::harmonize $ws;
739	$_ = int $_ for @$hs; #TODO: avoid rounding problems	814	CFClient::UI::harmonize $hs;
740		815
741	my $y;	816	my $y;
742		817
743	for my $r (0 .. $#{$self->{children}}) {	818	for my $r (0 .. $#{$self->{children}}) {
744	my $row = $self->{children}[$r]	819	my $row = $self->{children}[$r]
…		…
749		824
750	for my $c (0 .. $#$row) {	825	for my $c (0 .. $#$row) {
751	my $col_w = $ws->[$c];	826	my $col_w = $ws->[$c];
752		827
753	if (my $widget = $row->[$c]) {	828	if (my $widget = $row->[$c]) {
754	$widget->size_allocate ($x, $y, $col_w, $row_h);	829	$widget->configure ($x, $y, $col_w, $row_h);
755	}	830	}
756		831
757	$x += $col_w;	832	$x += $col_w;
758	}	833	}
759		834
…		…
804	(List::Util::max map $_->[1], @alloc),	879	(List::Util::max map $_->[1], @alloc),
805	)	880	)
806	}	881	}
807		882
808	sub size_allocate {	883	sub size_allocate {
809	my ($self, $x, $y, $w, $h) = @_;	884	my ($self, $w, $h) = @_;
810
811	$self->_size_allocate ($x, $y, $w, $h);
812		885
813	($h, $w) = ($w, $h);	886	($h, $w) = ($w, $h);
814		887
815	my $children = $self->{children};	888	my $children = $self->{children};
816		889
…		…
832	$alloc_h += ($h - $req_h) * $child->{expand} / $exp;	905	$alloc_h += ($h - $req_h) * $child->{expand} / $exp;
833	$h[$_] = $alloc_h;	906	$h[$_] = $alloc_h;
834	}	907	}
835	}	908	}
836		909
		910	CFClient::UI::harmonize \@h;
		911
837	my $y = 0;	912	my $y = 0;
838	for (0 .. $#$children) {	913	for (0 .. $#$children) {
839	my $child = $children->[$_];	914	my $child = $children->[$_];
840	my $h = int $h[$_];	915	my $h = $h[$_];
841	$child->size_allocate ($y, 0, $h, $w);	916	$child->configure ($y, 0, $h, $w);
842		917
843	$y += $h;	918	$y += $h;
844	}	919	}
		920
		921	1
845	}	922	}
846		923
847	#############################################################################	924	#############################################################################
848		925
849	package CFClient::UI::VBox;	926	package CFClient::UI::VBox;
…		…
862	(List::Util::sum map $_->[1], @alloc),	939	(List::Util::sum map $_->[1], @alloc),
863	)	940	)
864	}	941	}
865		942
866	sub size_allocate {	943	sub size_allocate {
867	my ($self, $x, $y, $w, $h) = @_;	944	my ($self, $w, $h) = @_;
868
869	$self->_size_allocate ($x, $y, $w, $h);
870		945
871	my $children = $self->{children};	946	my $children = $self->{children};
872		947
873	my @h = map +($_->size_request)[1], @$children;	948	my @h = map +($_->size_request)[1], @$children;
874		949
…		…
886		961
887	$h[$_] += ($h - $req_h) * $child->{expand} / $exp;	962	$h[$_] += ($h - $req_h) * $child->{expand} / $exp;
888	}	963	}
889	}	964	}
890		965
		966	CFClient::UI::harmonize \@h;
		967
891	my $y = 0;	968	my $y = 0;
892	for (0 .. $#$children) {	969	for (0 .. $#$children) {
893	my $child = $children->[$_];	970	my $child = $children->[$_];
894	my $h = int $h[$_];	971	my $h = $h[$_];
895	$child->size_allocate (0, $y, $w, $h);	972	$child->configure (0, $y, $w, $h);
896		973
897	$y += $h;	974	$y += $h;
898	}	975	}
		976
		977	1
899	}	978	}
900		979
901	#############################################################################	980	#############################################################################
902		981
903	package CFClient::UI::Label;	982	package CFClient::UI::Label;
…		…
912	my $self = $class->SUPER::new (	991	my $self = $class->SUPER::new (
913	fg => [1, 1, 1],	992	fg => [1, 1, 1],
914	fontsize => $::FONTSIZE,	993	fontsize => $::FONTSIZE,
915	text => "",	994	text => "",
916	align => -1,	995	align => -1,
		996	valign => -1,
917	padding => 2,	997	padding => 2,
918	layout => new CFClient::Layout,	998	layout => new CFClient::Layout,
919	%arg	999	%arg
920	);	1000	);
921		1001
922	$self->set_text ($self->{text});	1002	$self->{xxx}++ if $self->{text} eq "Client Setup" && $self->{align};#d#
		1003
		1004	$self->set_text (delete $self->{text}) if exists $self->{text};
		1005	$self->set_markup (delete $self->{markup}) if exists $self->{markup};
923		1006
924	$self	1007	$self
925	}	1008	}
926		1009
927	sub escape_text {	1010	sub escape_text {
…		…
935	}	1018	}
936		1019
937	sub set_text {	1020	sub set_text {
938	my ($self, $text) = @_;	1021	my ($self, $text) = @_;
939		1022
940	$self->{text} = $text;
941	$self->{layout}->set_markup ($text);	1023	$self->{layout}->set_text ($text);
942		1024
943	delete $self->{texture};	1025	delete $self->{texture};
944	# $self->{w} = $self->{h} = -1;
945	$self->update;	1026	$self->update;
946	}	1027	}
947		1028
948	sub get_text {	1029	sub set_markup {
949	my ($self, $text) = @_;	1030	my ($self, $markup) = @_;
950		1031
951	$self->{text}	1032	$self->{layout}->set_markup ($markup);
		1033
		1034	delete $self->{texture};
		1035	$self->update;
952	}	1036	}
953		1037
954	sub size_request {	1038	sub size_request {
955	my ($self) = @_;	1039	my ($self) = @_;
956		1040
957	$self->{layout}->set_width;	1041	$self->{layout}->set_width;
958	$self->{layout}->set_height ($self->{fontsize});	1042	$self->{layout}->set_height ($self->{fontsize});
		1043
959	my ($w, $h) = $self->{layout}->size;	1044	my ($w, $h) = $self->{layout}->size;
960		1045
961	(	1046	(
962	$w + $self->{padding} * 2,	1047	$w + $self->{padding} * 2,
963	$h + $self->{padding} * 2,	1048	$h + $self->{padding} * 2,
964	)	1049	)
965	}	1050	}
966		1051
967	sub size_allocate {	1052	sub size_allocate {
968	my ($self, $x, $y, $w, $h) = @_;	1053	my ($self, $w, $h) = @_;
969
970	$self->_size_allocate ($x, $y, $w, $h) or return;
971		1054
972	delete $self->{texture};	1055	delete $self->{texture};
973	}	1056	}
974		1057
975	sub update {	1058	sub update {
…		…
982	sub _draw {	1065	sub _draw {
983	my ($self) = @_;	1066	my ($self) = @_;
984		1067
985	my $tex = $self->{texture} \|\|= do {	1068	my $tex = $self->{texture} \|\|= do {
986	$self->{layout}->set_width ($self->{w});	1069	$self->{layout}->set_width ($self->{w});
987	$self->{layout}->set_height (List::Util::min $self->{h} - $self->{padding} * 2, $self->{fontsize});	1070	$self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize});
988	new_from_layout CFClient::Texture $self->{layout}	1071	new_from_layout CFClient::Texture $self->{layout}
989	};	1072	};
990		1073
991	glEnable GL_BLEND;	1074	glEnable GL_BLEND;
992	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	1075	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
993	glEnable GL_TEXTURE_2D;	1076	glEnable GL_TEXTURE_2D;
994	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1077	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
995		1078
996	glColor @{$self->{fg}};	1079	glColor @{$self->{fg}};
997		1080
998	my $x =	1081	$self->{ox} = int (
999	$self->{align} < 0 ? $self->{padding}	1082	$self->{align} < 0 ? $self->{padding}
1000	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}	1083	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1001	: ($self->{w} - $tex->{w}) * 0.5;	1084	: ($self->{w} - $tex->{w}) * 0.5
		1085	);
1002		1086
1003	$tex->draw_quad (int $x, int +($self->{h} - $tex->{h}) * 0.5);	1087	$self->{oy} = int (
		1088	$self->{valign} < 0 ? $self->{padding}
		1089	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
		1090	: ($self->{h} - $tex->{h}) * 0.5
		1091	);
		1092
		1093	$tex->draw_quad ($self->{ox}, $self->{oy});
1004		1094
1005	glDisable GL_TEXTURE_2D;	1095	glDisable GL_TEXTURE_2D;
1006	glDisable GL_BLEND;	1096	glDisable GL_BLEND;
1007	}	1097	}
1008		1098
1009	#############################################################################	1099	#############################################################################
1010		1100
1011	package CFClient::UI::Entry;	1101	package CFClient::UI::EntryBase;
1012		1102
1013	our @ISA = CFClient::UI::Label::;	1103	our @ISA = CFClient::UI::Label::;
1014		1104
1015	use SDL;	1105	use SDL;
1016	use SDL::OpenGL;	1106	use SDL::OpenGL;
…		…
1023	bg => [0, 0, 0, 0.2],	1113	bg => [0, 0, 0, 0.2],
1024	active_bg => [1, 1, 1, 0.5],	1114	active_bg => [1, 1, 1, 0.5],
1025	active_fg => [0, 0, 0],	1115	active_fg => [0, 0, 0],
1026	can_hover => 1,	1116	can_hover => 1,
1027	can_focus => 1,	1117	can_focus => 1,
		1118	valign => 0,
1028	@_	1119	@_
1029	)	1120	)
1030	}	1121	}
1031		1122
1032	sub _set_text {	1123	sub _set_text {
1033	my ($self, $text) = @_;	1124	my ($self, $text) = @_;
1034		1125
1035	my $old_text = $self->{text};	1126	delete $self->{cur_h};
		1127
		1128	return if $self->{text} eq $text;
1036		1129
1037	$self->{last_activity} = $::NOW;	1130	$self->{last_activity} = $::NOW;
1038
1039	$self->{text} = $text;	1131	$self->{text} = $text;
1040	$self->{layout}->set_width ($self->{w});
1041	$self->{layout}->set_height (List::Util::min $self->{h} - $self->{padding} * 2, $self->{fontsize});
1042		1132
1043	$text =~ s/./*/g if $self->{hidden};	1133	$text =~ s/./*/g if $self->{hidden};
		1134	$self->{layout}->set_text ("$text ");
1044		1135
1045	$self->{layout}->set_markup ($self->escape_text ($text) . " ");	1136	$self->emit (changed => $self->{text});
		1137	}
1046		1138
1047	$text = substr $text, 0, $self->{cursor};	1139	sub get_text {
1048	utf8::encode $text;	1140	$_[0]{text}
1049
1050	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text);
1051
1052	$self->emit (changed => $self->{text}) # XXX: is this the right place to do this?
1053	if $old_text ne $self->{text};
1054	}	1141	}
1055		1142
1056	sub size_request {	1143	sub size_request {
1057	my ($self) = @_;	1144	my ($self) = @_;
1058		1145
…		…
1060		1147
1061	($w + 1, $h) # add 1 for cursor	1148	($w + 1, $h) # add 1 for cursor
1062	}	1149	}
1063		1150
1064	sub size_allocate {	1151	sub size_allocate {
1065	my ($self, $x, $y, $w, $h) = @_;	1152	my ($self, $w, $h) = @_;
1066
1067	$self->SUPER::size_allocate ($x, $y, $w, $h);
1068		1153
1069	$self->_set_text ($self->{text});	1154	$self->_set_text ($self->{text});
1070	}	1155	}
1071		1156
1072	sub set_text {	1157	sub set_text {
…		…
1162		1247
1163	$self->SUPER::_draw;	1248	$self->SUPER::_draw;
1164		1249
1165	#TODO: force update every cursor change :(	1250	#TODO: force update every cursor change :(
1166	if ($FOCUS == $self && (($::NOW - $self->{last_activity}) & 1023) < 600) {	1251	if ($FOCUS == $self && (($::NOW - $self->{last_activity}) & 1023) < 600) {
		1252
		1253	unless (exists $self->{cur_h}) {
		1254	my $text = substr $self->{text}, 0, $self->{cursor};
		1255	utf8::encode $text;
		1256
		1257	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
		1258	}
		1259
1167	glColor @{$self->{fg}};	1260	glColor @{$self->{fg}};
1168	glBegin GL_LINES;	1261	glBegin GL_LINES;
1169	glVertex $self->{cur_x}, $self->{cur_y};
1170	glVertex $self->{cur_x}, $self->{cur_y} + $self->{cur_h};	1262	glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};
		1263	glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1171	glEnd;	1264	glEnd;
1172	}	1265	}
1173	}	1266	}
1174		1267
1175	package CFClient::UI::LineEntry;	1268	package CFClient::UI::Entry;
1176		1269
1177	our @ISA = CFClient::UI::Entry::;	1270	our @ISA = CFClient::UI::EntryBase::;
1178		1271
1179	use SDL;	1272	use SDL;
1180	use SDL::OpenGL;	1273	use SDL::OpenGL;
1181		1274
1182	sub key_down {	1275	sub key_down {
…		…
1212		1305
1213	$class->SUPER::new (	1306	$class->SUPER::new (
1214	padding => 4,	1307	padding => 4,
1215	fg => [1, 1, 1],	1308	fg => [1, 1, 1],
1216	bg => [1, 1, 1, 0.2],	1309	bg => [1, 1, 1, 0.2],
1217	active_fg => [1, 1, 0],	1310	active_fg => [0, 0, 1],
1218	can_hover => 1,	1311	can_hover => 1,
		1312	align => 0,
		1313	valign => 0,
1219	@_	1314	@_
1220	)	1315	)
1221	}	1316	}
1222		1317
1223	sub button_up {	1318	sub button_up {
…		…
1231		1326
1232	sub _draw {	1327	sub _draw {
1233	my ($self) = @_;	1328	my ($self) = @_;
1234		1329
1235	local $self->{fg} = $self->{fg};	1330	local $self->{fg} = $self->{fg};
1236	my $tex = $tex[0];
1237
1238	glEnable GL_BLEND;
1239	glEnable GL_TEXTURE_2D;
1240	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1241		1331
1242	if ($GRAB == $self) {	1332	if ($GRAB == $self) {
1243	$self->{fg} = $self->{active_fg};	1333	$self->{fg} = $self->{active_fg};
1244	}	1334	}
1245		1335
1246	glBindTexture GL_TEXTURE_2D, $tex->{name};	1336	glEnable GL_BLEND;
		1337	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
		1338	glEnable GL_TEXTURE_2D;
1247	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1339	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		1340	glColor 0, 0, 0, 1;
1248		1341
1249	$tex->draw_quad (0, 0, $self->{w}, $self->{h});	1342	$tex[0]->draw_quad (0, 0, $self->{w}, $self->{h});
1250		1343
1251	glDisable GL_TEXTURE_2D;	1344	glDisable GL_TEXTURE_2D;
1252	glDisable GL_BLEND;	1345	glDisable GL_BLEND;
1253		1346
1254	$self->SUPER::_draw;	1347	$self->SUPER::_draw;
…		…
1284	my ($self) = @_;	1377	my ($self) = @_;
1285		1378
1286	($self->{padding} * 2 + 6) x 2	1379	($self->{padding} * 2 + 6) x 2
1287	}	1380	}
1288		1381
1289	sub size_allocate {
1290	my ($self, $x, $y, $w, $h) = @_;
1291
1292	$self->_size_allocate ($x, $y, $w, $h);
1293	}
1294
1295	sub button_down {	1382	sub button_down {
1296	my ($self, $ev, $x, $y) = @_;	1383	my ($self, $ev, $x, $y) = @_;
1297		1384
1298	if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}	1385	if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}
1299	&& $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {	1386	&& $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {
…		…
1321		1408
1322	$tex->draw_quad (0, 0, $s, $s);	1409	$tex->draw_quad (0, 0, $s, $s);
1323		1410
1324	glDisable GL_TEXTURE_2D;	1411	glDisable GL_TEXTURE_2D;
1325	glDisable GL_BLEND;	1412	glDisable GL_BLEND;
		1413	}
		1414
		1415	#############################################################################
		1416
		1417	package CFClient::UI::VGauge;
		1418
		1419	our @ISA = CFClient::UI::Base::;
		1420
		1421	use SDL::OpenGL;
		1422
		1423	my %tex = (
		1424	food => [
		1425	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
		1426	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
		1427	],
		1428	grace => [
		1429	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
		1430	qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png/
		1431	],
		1432	hp => [
		1433	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
		1434	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
		1435	],
		1436	mana => [
		1437	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
		1438	qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png/
		1439	],
		1440	);
		1441
		1442	# eg. VGauge->new (gauge => 'food'), default gauge: food
		1443	sub new {
		1444	my $class = shift;
		1445
		1446	my $self = $class->SUPER::new (gauge => 'food', @_);
		1447
		1448	$self
		1449	}
		1450
		1451	sub size_request {
		1452	my ($self) = @_;
		1453
		1454	my $tex = $tex{$self->{gauge}}[0];
		1455
		1456	@$tex{qw(w h)}
		1457	}
		1458
		1459	sub set_max {
		1460	my ($self, $max) = @_;
		1461
		1462	$self->{max_val} = $max;
		1463	}
		1464
		1465	sub set_value {
		1466	my ($self, $val, $max) = @_;
		1467
		1468	$self->set_max ($max)
		1469	if defined $max;
		1470
		1471	$max = $self->{max_val};
		1472	$self->{val} = $val;
		1473
		1474	$self->update;
		1475	}
		1476
		1477	sub _draw {
		1478	my ($self) = @_;
		1479
		1480	my $tex = $tex{$self->{gauge}};
		1481
		1482	my ($w, $h) = ($self->{w}, $self->{h});
		1483
		1484	my $ycut = $self->{val} / ($self->{max_val} \|\| 1);
		1485	$ycut = 1 if $self->{val} > $self->{max_val};
		1486
		1487	my $t1 = $tex->[0];
		1488	my $t2 = $tex->[1];
		1489
		1490	glEnable GL_BLEND;
		1491	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
		1492	glEnable GL_TEXTURE_2D;
		1493	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		1494
		1495	my $h1 = $self->{h} - $ycut * $self->{h};
		1496	my $h2 = $ycut * $self->{h};
		1497
		1498	my $yp = 0;
		1499
		1500	glBindTexture GL_TEXTURE_2D, $t1->{name};
		1501	glBegin GL_QUADS;
		1502	glTexCoord 0 , 0; glVertex 0 , $yp;
		1503	glTexCoord 0 , $t1->{t} * (1 - $ycut); glVertex 0 , $yp + $h1;
		1504	glTexCoord $t1->{s}, $t1->{t} * (1 - $ycut); glVertex 0 + $w, $yp + $h1;
		1505	glTexCoord $t1->{s}, 0; glVertex 0 + $w, $yp;
		1506	glEnd;
		1507
		1508	$yp += $h1;
		1509
		1510	glBindTexture GL_TEXTURE_2D, $t2->{name};
		1511	glBegin GL_QUADS;
		1512	glTexCoord 0 , $t2->{t} * (1 - $ycut); glVertex 0 , $yp;
		1513	glTexCoord 0 , $t2->{t}; glVertex 0 , $yp + $h2;
		1514	glTexCoord $t2->{s}, $t2->{t}; glVertex 0 + $w, $yp + $h2;
		1515	glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut); glVertex 0 + $w, $yp;
		1516	glEnd;
		1517
		1518	glDisable GL_BLEND;
		1519	glDisable GL_TEXTURE_2D;
1326	}	1520	}
1327		1521
1328	#############################################################################	1522	#############################################################################
1329		1523
1330	package CFClient::UI::Slider;	1524	package CFClient::UI::Slider;
…		…
1524		1718
1525	($self->{req_w}, $self->{req_h})	1719	($self->{req_w}, $self->{req_h})
1526	}	1720	}
1527		1721
1528	sub size_allocate {	1722	sub size_allocate {
1529	my ($self, $x, $y, $w, $h) = @_;	1723	my ($self, $w, $h) = @_;
1530
1531	$self->SUPER::size_allocate ($x, $y, $w, $h);
1532		1724
1533	$self->{layout}->set_height ($self->{fontsize});	1725	$self->{layout}->set_height ($self->{fontsize});
1534	$self->{layout}->set_width ($self->{w});	1726	$self->{layout}->set_width ($self->{w});
1535		1727
1536	$self->reflow;	1728	$self->reflow;
		1729	$self->update;
1537	}	1730	}
1538		1731
1539	sub add_paragraph {	1732	sub add_paragraph {
1540	my ($self, $color, $text) = @_;	1733	my ($self, $color, $text) = @_;
1541		1734
…		…
1558		1751
1559	return unless $self->{h} > 0;	1752	return unless $self->{h} > 0;
1560		1753
1561	delete $self->{texture};	1754	delete $self->{texture};
1562		1755
1563	$TOPLEVEL->on_refresh ($self, sub {	1756	$ROOT->on_refresh ($self, sub {
1564	if (delete $self->{need_reflow}) {	1757	if (delete $self->{need_reflow}) {
1565	my $height = 0;	1758	my $height = 0;
1566		1759
1567	$height += $_->[0] = $self->text_height ($_->[2])	1760	$height += $_->[0] = $self->text_height ($_->[2])
1568	for @{$self->{par}};	1761	for @{$self->{par}};
…		…
1713		1906
1714	if ($::MAP) {	1907	if ($::MAP) {
1715	my $sw = int $::WIDTH / 32;	1908	my $sw = int $::WIDTH / 32;
1716	my $sh = int $::HEIGHT / 32;	1909	my $sh = int $::HEIGHT / 32;
1717		1910
1718	my $sx = $::CFG->{map_shift_x};	1911	my $sx = $::CFG->{map_shift_x}; my $sx0 = $sx & 31; $sx = ($sx - $sx0) / 32;
1719	my $sy = $::CFG->{map_shift_y};	1912	my $sy = $::CFG->{map_shift_y}; my $sy0 = $sy & 31; $sy = ($sy - $sy0) / 32;
1720		1913
1721	glTranslate +($sx & 31) - 32, ($sy & 31) - 32, 0;	1914	glTranslate $sx0 - 32, $sy0 - 32, 0;
1722		1915
1723	my ($w, $h, $data) = $::MAP->draw ($sx >> 5, $sy >> 5, 0, 0, $sw + 1, $sh + 1);	1916	my ($w, $h, $data) = $::MAP->draw ($sx, $sy, 0, 0, $sw + 1, $sh + 1);
1724		1917
1725	if ($::CFG->{fow_enable}) {	1918	if ($::CFG->{fow_enable}) {
1726	if ($::CFG->{fow_smooth}) { # smooth fog of war	1919	if ($::CFG->{fow_smooth} && $CFClient::GL_VERSION >= 1.2) { # smooth fog of war
1727	glConvolutionParameter GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER;	1920	glConvolutionParameter (GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER);
1728	glConvolutionFilter2D	1921	glConvolutionFilter2D (
1729	GL_CONVOLUTION_2D,	1922	GL_CONVOLUTION_2D,
1730	GL_ALPHA,	1923	GL_ALPHA,
1731	3, 3,	1924	3, 3,
1732	GL_ALPHA, GL_FLOAT,	1925	GL_ALPHA, GL_FLOAT,
1733	pack "f*",	1926	pack "f*",
1734	0.1, 0.1, 0.1,	1927	0.1, 0.1, 0.1,
1735	0.1, 0.2, 0.1,	1928	0.1, 0.2, 0.1,
1736	0.1, 0.1, 0.1,	1929	0.1, 0.1, 0.1,
1737	;	1930	);
1738	glEnable GL_CONVOLUTION_2D;	1931	glEnable GL_CONVOLUTION_2D;
1739	}	1932	}
1740		1933
1741	my $tex = new CFClient::Texture	1934	$self->{fow_texture} = new CFClient::Texture
1742	w => $w,	1935	w => $w,
1743	h => $h,	1936	h => $h,
1744	data => $data,	1937	data => $data,
1745	internalformat => GL_ALPHA,	1938	internalformat => GL_ALPHA,
1746	format => GL_ALPHA;	1939	format => GL_ALPHA;
…		…
1751	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	1944	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1752	glEnable GL_TEXTURE_2D;	1945	glEnable GL_TEXTURE_2D;
1753	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	1946	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1754		1947
1755	glColor +($::CFG->{fow_intensity}) x 3, 1;	1948	glColor +($::CFG->{fow_intensity}) x 3, 1;
1756	$tex->draw_quad (0, 0, $w * 32, $h * 32);	1949	$self->{fow_texture}->draw_quad (0, 0, $w * 32, $h * 32);
1757		1950
1758	glDisable GL_TEXTURE_2D;	1951	glDisable GL_TEXTURE_2D;
1759	glDisable GL_BLEND;	1952	glDisable GL_BLEND;
1760	}	1953	}
1761		1954
1762	# HACK BEGIN	1955	# HACK BEGIN
1763	{	1956	{
		1957	glTranslate -($sx0 - 32), -($sy0 - 32), 0;#remove
1764	my ($w, $h) = (250, 250);	1958	my ($w, $h) = (250, 250);
1765		1959
1766	glEnable GL_BLEND;	1960	glEnable GL_BLEND;
1767	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	1961	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1768	glEnable GL_TEXTURE_2D;	1962	glEnable GL_TEXTURE_2D;
1769	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1963	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1770		1964
		1965	$self->{mapmap_texture} =
1771	CFClient::Texture->new (	1966	new CFClient::Texture
1772	w => $w,	1967	w => $w,
1773	h => $h,	1968	h => $h,
1774	data => $::MAP->mapmap ($w, $h),	1969	data => $::MAP->mapmap ($w, $h),
1775	type => GL_UNSIGNED_INT_8_8_8_8_REV	1970	type => $CFClient::GL_VERSION >= 1.2 ? GL_UNSIGNED_INT_8_8_8_8_REV : GL_UNSIGNED_BYTE;
1776	)->draw_quad (100, 100);	1971
		1972	$self->{mapmap_texture}->draw_quad (100, 100);
1777		1973
1778	glDisable GL_TEXTURE_2D;	1974	glDisable GL_TEXTURE_2D;
1779	glDisable GL_BLEND;	1975	glDisable GL_BLEND;
1780	}	1976	}
1781	# HACK END	1977	# HACK END
…		…
1823		2019
1824	my $mod = $ev->key_mod;	2020	my $mod = $ev->key_mod;
1825	my $sym = $ev->key_sym;	2021	my $sym = $ev->key_sym;
1826		2022
1827	if ($sym == SDLK_KP5) {	2023	if ($sym == SDLK_KP5) {
1828	$::CONN->user_send ("command stay fire");	2024	$::CONN->user_send ("stay fire");
1829	} elsif ($sym == SDLK_a) {	2025	} elsif ($sym == SDLK_a) {
1830	$::CONN->user_send ("command apply");	2026	$::CONN->user_send ("apply");
1831	} elsif ($sym == SDLK_QUOTE) {	2027	} elsif ($sym == SDLK_QUOTE) {
1832	$self->emit ('activate_console');	2028	$self->emit ('activate_console');
1833	} elsif ($sym == SDLK_SLASH) {	2029	} elsif ($sym == SDLK_SLASH) {
1834	$self->emit ('activate_console' => '/');	2030	$self->emit ('activate_console' => '/');
1835	} elsif (exists $DIR{$sym}) {	2031	} elsif (exists $DIR{$sym}) {
1836	if ($mod & KMOD_SHIFT) {	2032	if ($mod & KMOD_SHIFT) {
1837	$self->{shft}++;	2033	$self->{shft}++;
1838	$::CONN->user_send ("command fire $DIR{$sym}[0]");	2034	$::CONN->user_send ("fire $DIR{$sym}[0]");
1839	} elsif ($mod & KMOD_CTRL) {	2035	} elsif ($mod & KMOD_CTRL) {
1840	$self->{ctrl}++;	2036	$self->{ctrl}++;
1841	$::CONN->user_send ("command run $DIR{$sym}[0]");	2037	$::CONN->user_send ("run $DIR{$sym}[0]");
1842	} else {	2038	} else {
1843	$::CONN->user_send ("command $DIR{$sym}[1]");	2039	$::CONN->user_send ("$DIR{$sym}[1]");
1844	}	2040	}
1845	}	2041	}
1846	}	2042	}
1847		2043
1848	sub key_up {	2044	sub key_up {
…		…
1850		2046
1851	my $mod = $ev->key_mod;	2047	my $mod = $ev->key_mod;
1852	my $sym = $ev->key_sym;	2048	my $sym = $ev->key_sym;
1853		2049
1854	if (!($mod & KMOD_SHIFT) && delete $self->{shft}) {	2050	if (!($mod & KMOD_SHIFT) && delete $self->{shft}) {
1855	$::CONN->user_send ("command fire_stop");	2051	$::CONN->user_send ("fire_stop");
1856	}	2052	}
1857	if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) {	2053	if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) {
1858	$::CONN->user_send ("command run_stop");	2054	$::CONN->user_send ("run_stop");
1859	}	2055	}
1860	}	2056	}
1861		2057
1862	#############################################################################	2058	#############################################################################
1863		2059
…		…
1927	sub toggle_flopper {	2123	sub toggle_flopper {
1928	my ($self) = @_;	2124	my ($self) = @_;
1929		2125
1930	# TODO: use animation	2126	# TODO: use animation
1931	if ($self->{state} = !$self->{state}) {	2127	if ($self->{state} = !$self->{state}) {
1932	$CFClient::UI::TOPLEVEL->add ($self->{other});	2128	$CFClient::UI::ROOT->add ($self->{other});
1933	$self->{other}->move (	2129	$self->{other}->move ($self->coord2global (0, $self->{h}));
1934	($::WIDTH - $self->{other}{w}) * 0.5,	2130	$self->emit ("open");
1935	($::HEIGHT - $self->{other}{h}) * 0.5,
1936	);
1937	} else {	2131	} else {
1938	$CFClient::UI::TOPLEVEL->remove ($self->{other});	2132	$CFClient::UI::ROOT->remove ($self->{other});
		2133	$self->emit ("close");
1939	}	2134	}
1940	}
1941		2135
1942	#############################################################################	2136	$self->emit (changed => $self->{state});
		2137	}
1943		2138
		2139	#############################################################################
		2140
1944	package CFClient::UI::Toplevel;	2141	package CFClient::UI::Root;
1945		2142
1946	our @ISA = CFClient::UI::Container::;	2143	our @ISA = CFClient::UI::Container::;
1947		2144
1948	use SDL::OpenGL;	2145	use SDL::OpenGL;
		2146
		2147	sub check_size {
		2148	my ($self) = @_;
		2149
		2150	$self->configure (0, 0, $::WITH, $::HEIGHT);
		2151	}
1949		2152
1950	sub size_request {	2153	sub size_request {
1951	($::WIDTH, $::HEIGHT)	2154	($::WIDTH, $::HEIGHT)
1952	}	2155	}
1953		2156
1954	sub size_allocate {	2157	sub configure {
1955	my ($self, $x, $y, $w, $h) = @_;	2158	my ($self, $x, $y, $w, $h) = @_;
1956		2159
1957	$self->_size_allocate ($x, $y, $w, $h);	2160	$self->SUPER::configure ($x, $y, $w, $h);
1958		2161
1959	$_->size_allocate ($_->{x}, $_->{y}, $_->size_request)	2162	$_->configure ($_->{x}, $_->{y}, $_->size_request)
1960	for @{$self->{children}};	2163	for @{$self->{children}};
1961	}	2164	}
1962		2165
1963	sub translate {	2166	sub _topleft {
1964	my ($self, $x, $y) = @_;	2167	my ($self, $x, $y) = @_;
1965		2168
1966	($x, $y)	2169	($x, $y)
1967	}	2170	}
1968		2171
1969	sub update {	2172	sub update {
1970	my ($self) = @_;	2173	my ($self) = @_;
1971		2174
1972	$self->size_allocate (0, 0, $::WIDTH, $::HEIGHT);	2175	$self->check_size;
1973	::refresh ();	2176	::refresh ();
1974	}	2177	}
1975		2178
1976	sub add {	2179	sub add {
1977	my ($self, $widget) = @_;	2180	my ($self, $child) = @_;
1978		2181
1979	$self->SUPER::add ($widget);	2182	$self->SUPER::add ($child);
1980
1981	$widget->size_allocate ($widget->{x}, $widget->{y}, $widget->size_request);
1982	}	2183	}
1983		2184
1984	sub on_refresh {	2185	sub on_refresh {
1985	my ($self, $id, $cb) = @_;	2186	my ($self, $id, $cb) = @_;
1986		2187
…		…
2009		2210
2010	#############################################################################	2211	#############################################################################
2011		2212
2012	package CFClient::UI;	2213	package CFClient::UI;
2013		2214
2014	$TOPLEVEL = new CFClient::UI::Toplevel;	2215	$ROOT = new CFClient::UI::Root;
2015		2216
2016	1	2217	1
2017		2218

Diff Legend

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

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents): Revision 1.109 by root, Sat Apr 15 01:13:47 2006 UTC vs. Revision 1.133 by root, Tue Apr 18 21:39:31 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.109 by root, Sat Apr 15 01:13:47 2006 UTC vs.
Revision 1.133 by root, Tue Apr 18 21:39:31 2006 UTC