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

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.105 by root, Fri Apr 14 14:55:28 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;
…		…
732	my $col_expand = (sum @col_expand) \|\| 1;	807	my $col_expand = (sum @col_expand) \|\| 1;
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;
		812
		813	CFClient::UI::harmonize $ws;
		814	CFClient::UI::harmonize $hs;
737		815
738	my $y;	816	my $y;
739		817
740	for my $r (0 .. $#{$self->{children}}) {	818	for my $r (0 .. $#{$self->{children}}) {
741	my $row = $self->{children}[$r]	819	my $row = $self->{children}[$r]
…		…
746		824
747	for my $c (0 .. $#$row) {	825	for my $c (0 .. $#$row) {
748	my $col_w = $ws->[$c];	826	my $col_w = $ws->[$c];
749		827
750	if (my $widget = $row->[$c]) {	828	if (my $widget = $row->[$c]) {
751	$widget->size_allocate ($x, $y, $col_w, $row_h);	829	$widget->configure ($x, $y, $col_w, $row_h);
752	}	830	}
753		831
754	$x += $col_w;	832	$x += $col_w;
755	}	833	}
756		834
…		…
801	(List::Util::max map $_->[1], @alloc),	879	(List::Util::max map $_->[1], @alloc),
802	)	880	)
803	}	881	}
804		882
805	sub size_allocate {	883	sub size_allocate {
806	my ($self, $x, $y, $w, $h) = @_;	884	my ($self, $w, $h) = @_;
807
808	$self->_size_allocate ($x, $y, $w, $h);
809		885
810	($h, $w) = ($w, $h);	886	($h, $w) = ($w, $h);
811		887
812	my $children = $self->{children};	888	my $children = $self->{children};
813		889
…		…
829	$alloc_h += ($h - $req_h) * $child->{expand} / $exp;	905	$alloc_h += ($h - $req_h) * $child->{expand} / $exp;
830	$h[$_] = $alloc_h;	906	$h[$_] = $alloc_h;
831	}	907	}
832	}	908	}
833		909
		910	CFClient::UI::harmonize \@h;
		911
834	my $y = 0;	912	my $y = 0;
835	for (0 .. $#$children) {	913	for (0 .. $#$children) {
836	my $child = $children->[$_];	914	my $child = $children->[$_];
837	my $h = int $h[$_];	915	my $h = $h[$_];
838	$child->size_allocate ($y, 0, $h, $w);	916	$child->configure ($y, 0, $h, $w);
839		917
840	$y += $h;	918	$y += $h;
841	}	919	}
		920
		921	1
842	}	922	}
843		923
844	#############################################################################	924	#############################################################################
845		925
846	package CFClient::UI::VBox;	926	package CFClient::UI::VBox;
…		…
859	(List::Util::sum map $_->[1], @alloc),	939	(List::Util::sum map $_->[1], @alloc),
860	)	940	)
861	}	941	}
862		942
863	sub size_allocate {	943	sub size_allocate {
864	my ($self, $x, $y, $w, $h) = @_;	944	my ($self, $w, $h) = @_;
865
866	$self->_size_allocate ($x, $y, $w, $h);
867		945
868	my $children = $self->{children};	946	my $children = $self->{children};
869		947
870	my @h = map +($_->size_request)[1], @$children;	948	my @h = map +($_->size_request)[1], @$children;
871		949
…		…
883		961
884	$h[$_] += ($h - $req_h) * $child->{expand} / $exp;	962	$h[$_] += ($h - $req_h) * $child->{expand} / $exp;
885	}	963	}
886	}	964	}
887		965
		966	CFClient::UI::harmonize \@h;
		967
888	my $y = 0;	968	my $y = 0;
889	for (0 .. $#$children) {	969	for (0 .. $#$children) {
890	my $child = $children->[$_];	970	my $child = $children->[$_];
891	my $h = int $h[$_];	971	my $h = $h[$_];
892	$child->size_allocate (0, $y, $w, $h);	972	$child->configure (0, $y, $w, $h);
893		973
894	$y += $h;	974	$y += $h;
895	}	975	}
		976
		977	1
896	}	978	}
897		979
898	#############################################################################	980	#############################################################################
899		981
900	package CFClient::UI::Label;	982	package CFClient::UI::Label;
…		…
909	my $self = $class->SUPER::new (	991	my $self = $class->SUPER::new (
910	fg => [1, 1, 1],	992	fg => [1, 1, 1],
911	fontsize => $::FONTSIZE,	993	fontsize => $::FONTSIZE,
912	text => "",	994	text => "",
913	align => -1,	995	align => -1,
		996	valign => -1,
914	padding => 2,	997	padding => 2,
915	layout => new CFClient::Layout,	998	layout => new CFClient::Layout,
916	%arg	999	%arg
917	);	1000	);
918		1001
919	$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};
920		1006
921	$self	1007	$self
922	}	1008	}
923		1009
924	sub escape_text {	1010	sub escape_text {
…		…
932	}	1018	}
933		1019
934	sub set_text {	1020	sub set_text {
935	my ($self, $text) = @_;	1021	my ($self, $text) = @_;
936		1022
937	$self->{text} = $text;
938	$self->{layout}->set_markup ($text);	1023	$self->{layout}->set_text ($text);
939		1024
940	delete $self->{texture};	1025	delete $self->{texture};
941	# $self->{w} = $self->{h} = -1;
942	$self->update;	1026	$self->update;
943	}	1027	}
944		1028
945	sub get_text {	1029	sub set_markup {
946	my ($self, $text) = @_;	1030	my ($self, $markup) = @_;
947		1031
948	$self->{text}	1032	$self->{layout}->set_markup ($markup);
		1033
		1034	delete $self->{texture};
		1035	$self->update;
949	}	1036	}
950		1037
951	sub size_request {	1038	sub size_request {
952	my ($self) = @_;	1039	my ($self) = @_;
953		1040
954	$self->{layout}->set_width;	1041	$self->{layout}->set_width;
955	$self->{layout}->set_height ($self->{fontsize});	1042	$self->{layout}->set_height ($self->{fontsize});
		1043
956	my ($w, $h) = $self->{layout}->size;	1044	my ($w, $h) = $self->{layout}->size;
957		1045
958	(	1046	(
959	$w + $self->{padding} * 2,	1047	$w + $self->{padding} * 2,
960	$h + $self->{padding} * 2,	1048	$h + $self->{padding} * 2,
961	)	1049	)
962	}	1050	}
963		1051
964	sub size_allocate {	1052	sub size_allocate {
965	my ($self, $x, $y, $w, $h) = @_;	1053	my ($self, $w, $h) = @_;
966
967	$self->_size_allocate ($x, $y, $w, $h) or return;
968		1054
969	delete $self->{texture};	1055	delete $self->{texture};
970	}	1056	}
971		1057
972	sub update {	1058	sub update {
…		…
979	sub _draw {	1065	sub _draw {
980	my ($self) = @_;	1066	my ($self) = @_;
981		1067
982	my $tex = $self->{texture} \|\|= do {	1068	my $tex = $self->{texture} \|\|= do {
983	$self->{layout}->set_width ($self->{w});	1069	$self->{layout}->set_width ($self->{w});
984	$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});
985	new_from_layout CFClient::Texture $self->{layout}	1071	new_from_layout CFClient::Texture $self->{layout}
986	};	1072	};
987		1073
988	glEnable GL_BLEND;	1074	glEnable GL_BLEND;
989	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	1075	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
990	glEnable GL_TEXTURE_2D;	1076	glEnable GL_TEXTURE_2D;
991	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1077	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
992		1078
993	glColor @{$self->{fg}};	1079	glColor @{$self->{fg}};
994		1080
995	my $x =	1081	$self->{ox} = int (
996	$self->{align} < 0 ? $self->{padding}	1082	$self->{align} < 0 ? $self->{padding}
997	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}	1083	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
998	: ($self->{w} - $tex->{w}) * 0.5;	1084	: ($self->{w} - $tex->{w}) * 0.5
		1085	);
999		1086
1000	$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});
1001		1094
1002	glDisable GL_TEXTURE_2D;	1095	glDisable GL_TEXTURE_2D;
1003	glDisable GL_BLEND;	1096	glDisable GL_BLEND;
1004	}	1097	}
1005		1098
1006	#############################################################################	1099	#############################################################################
1007		1100
1008	package CFClient::UI::Entry;	1101	package CFClient::UI::EntryBase;
1009		1102
1010	our @ISA = CFClient::UI::Label::;	1103	our @ISA = CFClient::UI::Label::;
1011		1104
1012	use SDL;	1105	use SDL;
1013	use SDL::OpenGL;	1106	use SDL::OpenGL;
…		…
1020	bg => [0, 0, 0, 0.2],	1113	bg => [0, 0, 0, 0.2],
1021	active_bg => [1, 1, 1, 0.5],	1114	active_bg => [1, 1, 1, 0.5],
1022	active_fg => [0, 0, 0],	1115	active_fg => [0, 0, 0],
1023	can_hover => 1,	1116	can_hover => 1,
1024	can_focus => 1,	1117	can_focus => 1,
		1118	valign => 0,
1025	@_	1119	@_
1026	)	1120	)
1027	}	1121	}
1028		1122
1029	sub _set_text {	1123	sub _set_text {
1030	my ($self, $text) = @_;	1124	my ($self, $text) = @_;
1031		1125
1032	my $old_text = $self->{text};	1126	delete $self->{cur_h};
		1127
		1128	return if $self->{text} eq $text;
1033		1129
1034	$self->{last_activity} = $::NOW;	1130	$self->{last_activity} = $::NOW;
1035
1036	$self->{text} = $text;	1131	$self->{text} = $text;
1037	$self->{layout}->set_width ($self->{w});
1038	$self->{layout}->set_height (List::Util::min $self->{h} - $self->{padding} * 2, $self->{fontsize});
1039		1132
1040	$text =~ s/./*/g if $self->{hidden};	1133	$text =~ s/./*/g if $self->{hidden};
		1134	$self->{layout}->set_text ("$text ");
1041		1135
1042	$self->{layout}->set_markup ($self->escape_text ($text) . " ");	1136	$self->emit (changed => $self->{text});
		1137	}
1043		1138
1044	$text = substr $text, 0, $self->{cursor};	1139	sub get_text {
1045	utf8::encode $text;	1140	$_[0]{text}
1046
1047	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text);
1048
1049	$self->emit (changed => $self->{text}) # XXX: is this the right place to do this?
1050	if $old_text ne $self->{text};
1051	}	1141	}
1052		1142
1053	sub size_request {	1143	sub size_request {
1054	my ($self) = @_;	1144	my ($self) = @_;
1055		1145
…		…
1057		1147
1058	($w + 1, $h) # add 1 for cursor	1148	($w + 1, $h) # add 1 for cursor
1059	}	1149	}
1060		1150
1061	sub size_allocate {	1151	sub size_allocate {
1062	my ($self, $x, $y, $w, $h) = @_;	1152	my ($self, $w, $h) = @_;
1063
1064	$self->SUPER::size_allocate ($x, $y, $w, $h);
1065		1153
1066	$self->_set_text ($self->{text});	1154	$self->_set_text ($self->{text});
1067	}	1155	}
1068		1156
1069	sub set_text {	1157	sub set_text {
…		…
1159		1247
1160	$self->SUPER::_draw;	1248	$self->SUPER::_draw;
1161		1249
1162	#TODO: force update every cursor change :(	1250	#TODO: force update every cursor change :(
1163	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
1164	glColor @{$self->{fg}};	1260	glColor @{$self->{fg}};
1165	glBegin GL_LINES;	1261	glBegin GL_LINES;
1166	glVertex $self->{cur_x}, $self->{cur_y};
1167	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};
1168	glEnd;	1264	glEnd;
1169	}	1265	}
1170	}	1266	}
1171		1267
1172	package CFClient::UI::LineEntry;	1268	package CFClient::UI::Entry;
1173		1269
1174	our @ISA = CFClient::UI::Entry::;	1270	our @ISA = CFClient::UI::EntryBase::;
1175		1271
1176	use SDL;	1272	use SDL;
1177	use SDL::OpenGL;	1273	use SDL::OpenGL;
1178		1274
1179	sub key_down {	1275	sub key_down {
…		…
1209		1305
1210	$class->SUPER::new (	1306	$class->SUPER::new (
1211	padding => 4,	1307	padding => 4,
1212	fg => [1, 1, 1],	1308	fg => [1, 1, 1],
1213	bg => [1, 1, 1, 0.2],	1309	bg => [1, 1, 1, 0.2],
1214	active_fg => [1, 1, 0],	1310	active_fg => [0, 0, 1],
1215	can_hover => 1,	1311	can_hover => 1,
		1312	align => 0,
		1313	valign => 0,
1216	@_	1314	@_
1217	)	1315	)
1218	}	1316	}
1219		1317
1220	sub button_up {	1318	sub button_up {
…		…
1228		1326
1229	sub _draw {	1327	sub _draw {
1230	my ($self) = @_;	1328	my ($self) = @_;
1231		1329
1232	local $self->{fg} = $self->{fg};	1330	local $self->{fg} = $self->{fg};
1233	my $tex = $tex[0];
1234
1235	glEnable GL_BLEND;
1236	glEnable GL_TEXTURE_2D;
1237	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1238		1331
1239	if ($GRAB == $self) {	1332	if ($GRAB == $self) {
1240	$self->{fg} = $self->{active_fg};	1333	$self->{fg} = $self->{active_fg};
1241	}	1334	}
1242		1335
1243	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;
1244	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;
1245		1341
1246	$tex->draw_quad (0, 0, $self->{w}, $self->{h});	1342	$tex[0]->draw_quad (0, 0, $self->{w}, $self->{h});
1247		1343
1248	glDisable GL_TEXTURE_2D;	1344	glDisable GL_TEXTURE_2D;
1249	glDisable GL_BLEND;	1345	glDisable GL_BLEND;
1250		1346
1251	$self->SUPER::_draw;	1347	$self->SUPER::_draw;
…		…
1281	my ($self) = @_;	1377	my ($self) = @_;
1282		1378
1283	($self->{padding} * 2 + 6) x 2	1379	($self->{padding} * 2 + 6) x 2
1284	}	1380	}
1285		1381
1286	sub size_allocate {
1287	my ($self, $x, $y, $w, $h) = @_;
1288
1289	$self->_size_allocate ($x, $y, $w, $h);
1290	}
1291
1292	sub button_down {	1382	sub button_down {
1293	my ($self, $ev, $x, $y) = @_;	1383	my ($self, $ev, $x, $y) = @_;
1294		1384
1295	if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}	1385	if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}
1296	&& $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {	1386	&& $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {
…		…
1318		1408
1319	$tex->draw_quad (0, 0, $s, $s);	1409	$tex->draw_quad (0, 0, $s, $s);
1320		1410
1321	glDisable GL_TEXTURE_2D;	1411	glDisable GL_TEXTURE_2D;
1322	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;
1323	}	1520	}
1324		1521
1325	#############################################################################	1522	#############################################################################
1326		1523
1327	package CFClient::UI::Slider;	1524	package CFClient::UI::Slider;
…		…
1424	my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};	1621	my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
1425	my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};	1622	my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
1426		1623
1427	my ($value, $lo, $hi, $page) = @{$self->{range}};	1624	my ($value, $lo, $hi, $page) = @{$self->{range}};
1428		1625
		1626	$hi = $value + 1 if $lo == $hi;
		1627
1429	my $inner_pad_px = $self->_calc_inner_pad_px ($w);	1628	my $inner_pad_px = $self->_calc_inner_pad_px ($w);
1430	my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right	1629	my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
1431		1630
1432	$page = int $page * $inner_w / ($hi - $lo);	1631	$page = int $page * $inner_w / ($hi - $lo);
1433	$value = int +($value - $lo) * $inner_w / ($hi - $lo);	1632	$value = int +($value - $lo) * $inner_w / ($hi - $lo);
…		…
1479	(new CFClient::UI::Empty expand => 1),	1678	(new CFClient::UI::Empty expand => 1),
1480	(new CFClient::UI::Slider vertical => 1),	1679	(new CFClient::UI::Slider vertical => 1),
1481	],	1680	],
1482	);	1681	);
1483		1682
		1683	$self->{children}[1]->connect (changed => sub {
		1684	$self->update;
		1685	});
		1686
1484	$self	1687	$self
		1688	}
		1689
		1690	sub set_fontsize {
		1691	my ($self, $fontsize) = @_;
		1692
		1693	$self->{fontsize} = $fontsize;
		1694	$self->reflow;
1485	}	1695	}
1486		1696
1487	sub text_height {	1697	sub text_height {
1488	my ($self, $text) = @_;	1698	my ($self, $text) = @_;
1489		1699
…		…
1497	}	1707	}
1498		1708
1499	sub reflow {	1709	sub reflow {
1500	my ($self) = @_;	1710	my ($self) = @_;
1501		1711
1502	my $height = 0;	1712	$self->{need_reflow}++;
1503		1713	$self->update;
1504	for (@{$self->{par}}) {
1505	$height += $_->[0] = $self->text_height ($_->[2]);
1506	}
1507
1508	$self->{height} = $height;
1509
1510	$self->{range} = [$height - $self->{h}, 0, $height, $self->{h}];
1511	}	1714	}
1512		1715
1513	sub size_request {	1716	sub size_request {
1514	my ($self) = @_;	1717	my ($self) = @_;
1515		1718
1516	($self->{req_w}, $self->{req_h})	1719	($self->{req_w}, $self->{req_h})
1517	}	1720	}
1518		1721
1519	sub size_allocate {	1722	sub size_allocate {
1520	my ($self, $x, $y, $w, $h) = @_;	1723	my ($self, $w, $h) = @_;
1521
1522	$self->SUPER::size_allocate ($x, $y, $w, $h);
1523		1724
1524	$self->{layout}->set_height ($self->{fontsize});	1725	$self->{layout}->set_height ($self->{fontsize});
1525	$self->{layout}->set_width ($self->{w});	1726	$self->{layout}->set_width ($self->{w});
1526		1727
1527	$self->reflow;	1728	$self->reflow;
…		…
1548		1749
1549	$self->SUPER::update;	1750	$self->SUPER::update;
1550		1751
1551	return unless $self->{h} > 0;	1752	return unless $self->{h} > 0;
1552		1753
		1754	delete $self->{texture};
		1755
		1756	$ROOT->on_refresh ($self, sub {
		1757	if (delete $self->{need_reflow}) {
		1758	my $height = 0;
		1759
		1760	$height += $_->[0] = $self->text_height ($_->[2])
		1761	for @{$self->{par}};
		1762
		1763	$self->{height} = $height;
		1764
		1765	$self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];
		1766
		1767	delete $self->{texture};
		1768	}
		1769
1553	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {	1770	$self->{texture} \|\|= new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
1554	glClearColor 0, 0, 0, 1;	1771	glClearColor 0, 0, 0, 1;
1555	glClear GL_COLOR_BUFFER_BIT;	1772	glClear GL_COLOR_BUFFER_BIT;
1556		1773
1557	my $y0 = $self->{height} - $self->{h};
1558	my $y1 = $self->{height};
1559
1560	glEnable GL_BLEND;	1774	glEnable GL_BLEND;
1561	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	1775	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1562	glEnable GL_TEXTURE_2D;	1776	glEnable GL_TEXTURE_2D;
1563	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1777	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1564		1778
		1779	my $top = int $self->{children}[1]{range}[0];
		1780
		1781	my $y0 = $top;
		1782	my $y1 = $top + $self->{h};
		1783
1565	my $y = 0;	1784	my $y = 0;
1566		1785
1567	my $layout = $self->{layout};	1786	my $layout = $self->{layout};
1568		1787
1569	for my $par (@{$self->{par}}) {	1788	for my $par (@{$self->{par}}) {
1570	my $h = $par->[0];	1789	my $h = $par->[0];
1571		1790
1572	if ($y0 < $y + $h && $y < $y1) {	1791	if ($y0 < $y + $h && $y < $y1) {
1573	$layout->set_text ($par->[2]);	1792	$layout->set_text ($par->[2]);
1574		1793
1575	glColor @{ $par->[1] };	1794	glColor @{ $par->[1] };
1576	my ($W, $H) = $layout->size;	1795	my ($W, $H) = $layout->size;
1577	CFClient::Texture->new_from_layout ($layout)->draw_quad (0, $y - $y0);	1796	CFClient::Texture->new_from_layout ($layout)->draw_quad (0, $y - $y0);
		1797	}
		1798
		1799	$y += $h;
1578	}	1800	}
1579		1801
1580	$y += $h;
1581	}
1582
1583	glDisable GL_TEXTURE_2D;	1802	glDisable GL_TEXTURE_2D;
1584	glDisable GL_BLEND;	1803	glDisable GL_BLEND;
		1804	};
1585	};	1805	});
1586	}	1806	}
1587		1807
1588	sub _draw {	1808	sub _draw {
1589	my ($self) = @_;	1809	my ($self) = @_;
1590		1810
…		…
1592	glEnable GL_TEXTURE_2D;	1812	glEnable GL_TEXTURE_2D;
1593	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1813	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1594	$self->{texture}->draw_quad (0, 0, $self->{w}, $self->{h});	1814	$self->{texture}->draw_quad (0, 0, $self->{w}, $self->{h});
1595	glDisable GL_TEXTURE_2D;	1815	glDisable GL_TEXTURE_2D;
1596	}	1816	}
		1817
		1818	$self->{children}[1]->draw;
1597		1819
1598	}	1820	}
1599		1821
1600	#############################################################################	1822	#############################################################################
1601		1823
…		…
1626	}	1848	}
1627		1849
1628	sub key_up {	1850	sub key_up {
1629	}	1851	}
1630		1852
		1853	sub button_down {
		1854	my ($self, $ev, $x, $y) = @_;
		1855
		1856	$self->focus_in;
		1857
		1858	if ($ev->button == 2) {
		1859	my ($ox, $oy) = ($ev->button_x, $ev->button_y);
		1860	my ($bw, $bh) = ($::CFG->{map_shift_x}, $::CFG->{map_shift_y});
		1861
		1862	$self->{motion} = sub {
		1863	my ($ev, $x, $y) = @_;
		1864
		1865	($x, $y) = ($ev->motion_x, $ev->motion_y);
		1866
		1867	$::CFG->{map_shift_x} = $bw + $x - $ox;
		1868	$::CFG->{map_shift_y} = $bh + $y - $oy;
		1869
		1870	$self->update;
		1871	};
		1872	}
		1873	}
		1874
		1875	sub button_up {
		1876	my ($self, $ev, $x, $y) = @_;
		1877
		1878	delete $self->{motion};
		1879	}
		1880
		1881	sub mouse_motion {
		1882	my ($self, $ev, $x, $y) = @_;
		1883
		1884	$self->{motion}->($ev, $x, $y) if $self->{motion};
		1885	}
		1886
1631	sub size_request {	1887	sub size_request {
1632	(	1888	(
1633	1 + 32 * int $::WIDTH / 32,	1889	1 + 32 * int $::WIDTH / 32,
1634	1 + 32 * int $::HEIGHT / 32,	1890	1 + 32 * int $::HEIGHT / 32,
1635	)	1891	)
…		…
1643	}	1899	}
1644		1900
1645	sub draw {	1901	sub draw {
1646	my ($self) = @_;	1902	my ($self) = @_;
1647		1903
1648	$self->{need_update}++;#d#
1649	if (delete $self->{need_update}) {	1904	if (delete $self->{need_update}) {
1650	glNewList $self->{list}, GL_COMPILE;	1905	glNewList $self->{list}, GL_COMPILE;
1651		1906
1652	my $sw = int $::WIDTH / 32;
1653	my $sh = int $::HEIGHT / 32;
1654
1655	if ($::MAP) {	1907	if ($::MAP) {
		1908	my $sw = int $::WIDTH / 32;
		1909	my $sh = int $::HEIGHT / 32;
		1910
		1911	my $sx = $::CFG->{map_shift_x}; my $sx0 = $sx & 31; $sx = ($sx - $sx0) / 32;
		1912	my $sy = $::CFG->{map_shift_y}; my $sy0 = $sy & 31; $sy = ($sy - $sy0) / 32;
		1913
		1914	glTranslate $sx0 - 32, $sy0 - 32, 0;
		1915
1656	my ($w, $h, $data) = $::MAP->draw (0, 0, $sw, $sh);	1916	my ($w, $h, $data) = $::MAP->draw ($sx, $sy, 0, 0, $sw + 1, $sh + 1);
1657		1917
1658	if ($::CFG->{fow_enable}) {	1918	if ($::CFG->{fow_enable}) {
1659	if ($::CFG->{fow_smooth}) { # smooth fog of war	1919	if ($::CFG->{fow_smooth} && $CFClient::GL_VERSION >= 1.2) { # smooth fog of war
1660	glConvolutionParameter GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER;	1920	glConvolutionParameter (GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER);
1661	glConvolutionFilter2D	1921	glConvolutionFilter2D (
1662	GL_CONVOLUTION_2D,	1922	GL_CONVOLUTION_2D,
1663	GL_ALPHA,	1923	GL_ALPHA,
1664	3, 3,	1924	3, 3,
1665	GL_ALPHA, GL_FLOAT,	1925	GL_ALPHA, GL_FLOAT,
1666	pack "f*",	1926	pack "f*",
1667	0.1, 0.1, 0.1,	1927	0.1, 0.1, 0.1,
1668	0.1, 0.2, 0.1,	1928	0.1, 0.2, 0.1,
1669	0.1, 0.1, 0.1,	1929	0.1, 0.1, 0.1,
1670	;	1930	);
1671	glEnable GL_CONVOLUTION_2D;	1931	glEnable GL_CONVOLUTION_2D;
1672	}	1932	}
1673		1933
1674	my $tex = new CFClient::Texture	1934	$self->{fow_texture} = new CFClient::Texture
1675	w => $w,	1935	w => $w,
1676	h => $h,	1936	h => $h,
1677	data => $data,	1937	data => $data,
1678	internalformat => GL_ALPHA,	1938	internalformat => GL_ALPHA,
1679	format => GL_ALPHA;	1939	format => GL_ALPHA;
1680		1940
1681	glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth};	1941	glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth};
1682		1942
1683	glEnable GL_BLEND;	1943	glEnable GL_BLEND;
		1944	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1684	glEnable GL_TEXTURE_2D;	1945	glEnable GL_TEXTURE_2D;
1685	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	1946	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1686		1947
1687	glColor +($::CFG->{fow_intensity}) x 3, 1;	1948	glColor +($::CFG->{fow_intensity}) x 3, 1;
1688	$tex->draw_quad (0, 0, $w * 32, $h * 32);	1949	$self->{fow_texture}->draw_quad (0, 0, $w * 32, $h * 32);
1689		1950
1690	glDisable GL_TEXTURE_2D;	1951	glDisable GL_TEXTURE_2D;
1691	glDisable GL_BLEND;	1952	glDisable GL_BLEND;
1692	}	1953	}
		1954
		1955	# HACK BEGIN
		1956	{
		1957	glTranslate -($sx0 - 32), -($sy0 - 32), 0;#remove
		1958	my ($w, $h) = (250, 250);
		1959
		1960	glEnable GL_BLEND;
		1961	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
		1962	glEnable GL_TEXTURE_2D;
		1963	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		1964
		1965	$self->{mapmap_texture} =
		1966	new CFClient::Texture
		1967	w => $w,
		1968	h => $h,
		1969	data => $::MAP->mapmap ($w, $h),
		1970	type => $CFClient::GL_VERSION >= 1.2 ? GL_UNSIGNED_INT_8_8_8_8_REV : GL_UNSIGNED_BYTE;
		1971
		1972	$self->{mapmap_texture}->draw_quad (100, 100);
		1973
		1974	glDisable GL_TEXTURE_2D;
		1975	glDisable GL_BLEND;
		1976	}
		1977	# HACK END
1693	}	1978	}
1694		1979
1695	glEndList;	1980	glEndList;
1696	}	1981	}
1697		1982
		1983	glPushMatrix;
1698	glCallList $self->{list};	1984	glCallList $self->{list};
		1985	glPopMatrix;
1699		1986
1700	if ($FOCUS != $self) {	1987	if ($FOCUS != $self) {
1701	glColor 64/255, 64/255, 64/255;	1988	glColor 64/255, 64/255, 64/255;
1702	glLogicOp GL_AND;	1989	glLogicOp GL_AND;
1703	glEnable GL_COLOR_LOGIC_OP;	1990	glEnable GL_COLOR_LOGIC_OP;
…		…
1732		2019
1733	my $mod = $ev->key_mod;	2020	my $mod = $ev->key_mod;
1734	my $sym = $ev->key_sym;	2021	my $sym = $ev->key_sym;
1735		2022
1736	if ($sym == SDLK_KP5) {	2023	if ($sym == SDLK_KP5) {
1737	$::CONN->user_send ("command stay fire");	2024	$::CONN->user_send ("stay fire");
1738	} elsif ($sym == SDLK_a) {	2025	} elsif ($sym == SDLK_a) {
1739	$::CONN->user_send ("command apply");	2026	$::CONN->user_send ("apply");
1740	} elsif ($sym == SDLK_QUOTE) {	2027	} elsif ($sym == SDLK_QUOTE) {
1741	$self->emit ('activate_console');	2028	$self->emit ('activate_console');
1742	} elsif ($sym == SDLK_SLASH) {	2029	} elsif ($sym == SDLK_SLASH) {
1743	$self->emit ('activate_console' => '/');	2030	$self->emit ('activate_console' => '/');
1744	} elsif (exists $DIR{$sym}) {	2031	} elsif (exists $DIR{$sym}) {
1745	if ($mod & KMOD_SHIFT) {	2032	if ($mod & KMOD_SHIFT) {
1746	$self->{shft}++;	2033	$self->{shft}++;
1747	$::CONN->user_send ("command fire $DIR{$sym}[0]");	2034	$::CONN->user_send ("fire $DIR{$sym}[0]");
1748	} elsif ($mod & KMOD_CTRL) {	2035	} elsif ($mod & KMOD_CTRL) {
1749	$self->{ctrl}++;	2036	$self->{ctrl}++;
1750	$::CONN->user_send ("command run $DIR{$sym}[0]");	2037	$::CONN->user_send ("run $DIR{$sym}[0]");
1751	} else {	2038	} else {
1752	$::CONN->user_send ("command $DIR{$sym}[1]");	2039	$::CONN->user_send ("$DIR{$sym}[1]");
1753	}	2040	}
1754	}	2041	}
1755	}	2042	}
1756		2043
1757	sub key_up {	2044	sub key_up {
…		…
1759		2046
1760	my $mod = $ev->key_mod;	2047	my $mod = $ev->key_mod;
1761	my $sym = $ev->key_sym;	2048	my $sym = $ev->key_sym;
1762		2049
1763	if (!($mod & KMOD_SHIFT) && delete $self->{shft}) {	2050	if (!($mod & KMOD_SHIFT) && delete $self->{shft}) {
1764	$::CONN->user_send ("command fire_stop");	2051	$::CONN->user_send ("fire_stop");
1765	}	2052	}
1766	if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) {	2053	if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) {
1767	$::CONN->user_send ("command run_stop");	2054	$::CONN->user_send ("run_stop");
1768	}	2055	}
1769	}	2056	}
1770		2057
1771	#############################################################################	2058	#############################################################################
1772		2059
…		…
1836	sub toggle_flopper {	2123	sub toggle_flopper {
1837	my ($self) = @_;	2124	my ($self) = @_;
1838		2125
1839	# TODO: use animation	2126	# TODO: use animation
1840	if ($self->{state} = !$self->{state}) {	2127	if ($self->{state} = !$self->{state}) {
1841	$CFClient::UI::TOPLEVEL->add ($self->{other});	2128	$CFClient::UI::ROOT->add ($self->{other});
1842	$self->{other}->move (	2129	$self->{other}->move ($self->coord2global (0, $self->{h}));
1843	($::WIDTH - $self->{other}{w}) * 0.5,	2130	$self->emit ("open");
1844	($::HEIGHT - $self->{other}{h}) * 0.5,
1845	);
1846	} else {	2131	} else {
1847	$CFClient::UI::TOPLEVEL->remove ($self->{other});	2132	$CFClient::UI::ROOT->remove ($self->{other});
		2133	$self->emit ("close");
1848	}	2134	}
1849	}
1850		2135
1851	#############################################################################	2136	$self->emit (changed => $self->{state});
		2137	}
1852		2138
		2139	#############################################################################
		2140
1853	package CFClient::UI::Toplevel;	2141	package CFClient::UI::Root;
1854		2142
1855	our @ISA = CFClient::UI::Container::;	2143	our @ISA = CFClient::UI::Container::;
		2144
		2145	use SDL::OpenGL;
		2146
		2147	sub check_size {
		2148	my ($self) = @_;
		2149
		2150	$self->configure (0, 0, $::WITH, $::HEIGHT);
		2151	}
1856		2152
1857	sub size_request {	2153	sub size_request {
1858	($::WIDTH, $::HEIGHT)	2154	($::WIDTH, $::HEIGHT)
1859	}	2155	}
1860		2156
1861	sub size_allocate {	2157	sub configure {
1862	my ($self, $x, $y, $w, $h) = @_;	2158	my ($self, $x, $y, $w, $h) = @_;
1863		2159
1864	$self->_size_allocate ($x, $y, $w, $h);	2160	$self->SUPER::configure ($x, $y, $w, $h);
1865		2161
1866	$_->size_allocate ($_->{x}, $_->{y}, $_->size_request)	2162	$_->configure ($_->{x}, $_->{y}, $_->size_request)
1867	for @{$self->{children}};	2163	for @{$self->{children}};
1868	}	2164	}
1869		2165
1870	sub translate {	2166	sub _topleft {
1871	my ($self, $x, $y) = @_;	2167	my ($self, $x, $y) = @_;
1872		2168
1873	($x, $y)	2169	($x, $y)
1874	}	2170	}
1875		2171
1876	sub update {	2172	sub update {
1877	my ($self) = @_;	2173	my ($self) = @_;
1878		2174
1879	$self->size_allocate (0, 0, $::WIDTH, $::HEIGHT);	2175	$self->check_size;
1880	::refresh ();	2176	::refresh ();
1881	}	2177	}
1882		2178
1883	sub add {	2179	sub add {
1884	my ($self, $widget) = @_;	2180	my ($self, $child) = @_;
1885		2181
1886	$self->SUPER::add ($widget);	2182	$self->SUPER::add ($child);
		2183	}
1887		2184
1888	$widget->size_allocate ($widget->{x}, $widget->{y}, $widget->size_request);	2185	sub on_refresh {
		2186	my ($self, $id, $cb) = @_;
		2187
		2188	$self->{refresh_hook}{$id} = $cb;
1889	}	2189	}
1890		2190
1891	sub draw {	2191	sub draw {
1892	my ($self) = @_;	2192	my ($self) = @_;
1893		2193
		2194	while (my $rcb = delete $self->{refresh_hook}) {
		2195	$_->() for values %$rcb;
		2196	}
		2197
		2198	glViewport 0, 0, $::WIDTH, $::HEIGHT;
		2199	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
		2200	glClear GL_COLOR_BUFFER_BIT;
		2201
		2202	glMatrixMode GL_PROJECTION;
		2203	glLoadIdentity;
		2204	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000;
		2205	glMatrixMode GL_MODELVIEW;
		2206	glLoadIdentity;
		2207
1894	$self->_draw;	2208	$self->_draw;
1895	}	2209	}
1896		2210
1897	#############################################################################	2211	#############################################################################
1898		2212
1899	package CFClient::UI;	2213	package CFClient::UI;
1900		2214
1901	$TOPLEVEL = new CFClient::UI::Toplevel;	2215	$ROOT = new CFClient::UI::Root;
1902		2216
1903	1	2217	1
1904		2218

Diff Legend

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

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents): Revision 1.105 by root, Fri Apr 14 14:55:28 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.105 by root, Fri Apr 14 14:55:28 2006 UTC vs.
Revision 1.133 by root, Tue Apr 18 21:39:31 2006 UTC