[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.130 by root, Tue Apr 18 01:51:06 2006 UTC

…		…
7		7
8	use CFClient;	8	use CFClient;
9		9
10	our ($FOCUS, $HOVER, $GRAB); # various widgets	10	our ($FOCUS, $HOVER, $GRAB); # various widgets
11		11
12	our $TOPLEVEL;	12	our $ROOT;
13	our $BUTTON_STATE;	13	our $BUTTON_STATE;
14		14
15	# class methods for events	15	# class methods for events
16	sub feed_sdl_key_down_event {	16	sub feed_sdl_key_down_event {
17	$FOCUS->key_down ($_[0]) if $FOCUS;	17	$FOCUS->key_down ($_[0]) if $FOCUS;
…		…
24	sub feed_sdl_button_down_event {	24	sub feed_sdl_button_down_event {
25	my ($ev) = @_;	25	my ($ev) = @_;
26	my ($x, $y) = ($ev->motion_x, $ev->motion_y);	26	my ($x, $y) = ($ev->motion_x, $ev->motion_y);
27		27
28	if (!$BUTTON_STATE) {	28	if (!$BUTTON_STATE) {
29	my $widget = $TOPLEVEL->find_widget ($x, $y);	29	my $widget = $ROOT->find_widget ($x, $y);
30		30
31	$GRAB = $widget;	31	$GRAB = $widget;
32	$GRAB->update if $GRAB;	32	$GRAB->update if $GRAB;
33	}	33	}
34		34
35	$BUTTON_STATE \|= 1 << ($ev->button - 1);	35	$BUTTON_STATE \|= 1 << ($ev->button - 1);
36		36
37	$GRAB->button_down ($ev, $GRAB->translate ($x, $y)) if $GRAB;	37	$GRAB->button_down ($ev, $GRAB->coord2local ($x, $y)) if $GRAB;
38	}	38	}
39		39
40	sub feed_sdl_button_up_event {	40	sub feed_sdl_button_up_event {
41	my ($ev) = @_;	41	my ($ev) = @_;
42	my ($x, $y) = ($ev->motion_x, $ev->motion_y);	42	my ($x, $y) = ($ev->motion_x, $ev->motion_y);
43		43
44	my $widget = $GRAB \|\| $TOPLEVEL->find_widget ($x, $y);	44	my $widget = $GRAB \|\| $ROOT->find_widget ($x, $y);
45		45
46	$BUTTON_STATE &= ~(1 << ($ev->button - 1));	46	$BUTTON_STATE &= ~(1 << ($ev->button - 1));
47		47
48	$GRAB->button_up ($ev, $GRAB->translate ($x, $y)) if $GRAB;	48	$GRAB->button_up ($ev, $GRAB->coord2local ($x, $y)) if $GRAB;
49		49
50	if (!$BUTTON_STATE) {	50	if (!$BUTTON_STATE) {
51	my $grab = $GRAB; undef $GRAB;	51	my $grab = $GRAB; undef $GRAB;
52	$grab->update if $grab;	52	$grab->update if $grab;
53	$GRAB->update if $GRAB;	53	$GRAB->update if $GRAB;
…		…
56		56
57	sub feed_sdl_motion_event {	57	sub feed_sdl_motion_event {
58	my ($ev) = @_;	58	my ($ev) = @_;
59	my ($x, $y) = ($ev->motion_x, $ev->motion_y);	59	my ($x, $y) = ($ev->motion_x, $ev->motion_y);
60		60
61	my $widget = $GRAB \|\| $TOPLEVEL->find_widget ($x, $y);	61	my $widget = $GRAB \|\| $ROOT->find_widget ($x, $y);
62		62
63	if ($widget != $HOVER) {	63	if ($widget != $HOVER) {
64	my $hover = $HOVER; $HOVER = $widget;	64	my $hover = $HOVER; $HOVER = $widget;
65		65
66	$hover->update if $hover && $hover->{can_hover};	66	$hover->update if $hover && $hover->{can_hover};
67	$HOVER->update if $HOVER && $HOVER->{can_hover};	67	$HOVER->update if $HOVER && $HOVER->{can_hover};
68	}	68	}
69		69
70	$HOVER->mouse_motion ($ev, $HOVER->translate ($x, $y)) if $HOVER;	70	$HOVER->mouse_motion ($ev, $HOVER->coord2local ($x, $y)) if $HOVER;
		71	}
		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
…		…
326		374
327	$self	375	$self
328	}	376	}
329		377
330	sub add {	378	sub add {
331	my ($self, $chld) = @_;	379	my ($self, $child) = @_;
332		380
333	$chld->set_parent ($self);	381	$child->set_parent ($self);
		382
		383	use sort 'stable';
334		384
335	$self->{children} = [	385	$self->{children} = [
336	sort { $a->{z} <=> $b->{z} }	386	sort { $a->{z} <=> $b->{z} }
337	@{$self->{children}}, $chld	387	@{$self->{children}}, $child
338	];	388	];
339		389
340	$self->{w} = $self->{h} = -1;	390	$self->{w} = $self->{h} = -1;
341	$self->update;	391
		392	$child->check_size;
342	}	393	}
343		394
344	sub remove {	395	sub remove {
345	my ($self, $widget) = @_;	396	my ($self, $widget) = @_;
346		397
347	$self->{children} = [ grep $_ != $widget, @{ $self->{children} } ];	398	$self->{children} = [ grep $_ != $widget, @{ $self->{children} } ];
348		399
349	$self->size_allocate (0, 0, $self->{w}, $self->{h});	400	$self->check_size;
350	}	401	}
351		402
352	sub find_widget {	403	sub find_widget {
353	my ($self, $x, $y) = @_;	404	my ($self, $x, $y) = @_;
354		405
…		…
407	sub size_request {	458	sub size_request {
408	$_[0]{children}[0]->size_request	459	$_[0]{children}[0]->size_request
409	}	460	}
410		461
411	sub size_allocate {	462	sub size_allocate {
412	my ($self, $x, $y, $w, $h) = @_;	463	my ($self, $w, $h) = @_;
413		464
414	$self->_size_allocate ($x, $y, $w, $h) or return;
415
416	$self->{children}[0]->size_allocate (0, 0, $w, $h);	465	$self->{children}[0]->configure (0, 0, $w, $h);
417	}	466	}
418		467
419	#############################################################################	468	#############################################################################
420		469
421	package CFClient::UI::Window;	470	package CFClient::UI::Window;
…		…
447	$self->child->draw;	496	$self->child->draw;
448	};	497	};
449	}	498	}
450		499
451	sub size_allocate {	500	sub size_allocate {
452	my ($self, $x, $y, $w, $h) = @_;	501	my ($self, $w, $h) = @_;
453		502
454	$self->_size_allocate ($x, $y, $w, $h) or return;
455
456	$self->child->size_allocate (0, 0, $w, $h);	503	$self->child->configure (0, 0, $w, $h);
457		504
458	$self->render_chld;	505	$self->render_chld;
459	}	506	}
460		507
461	sub _draw {	508	sub _draw {
…		…
477	glDisable GL_TEXTURE_2D;	524	glDisable GL_TEXTURE_2D;
478	}	525	}
479		526
480	#############################################################################	527	#############################################################################
481		528
		529	package CFClient::UI::ViewPort;
		530
		531	our @ISA = CFClient::UI::Window::;
		532
		533	sub new { die }
		534
		535	sub size_request {
		536	my ($self) = @_;
		537
		538	@$self{qw(child_w child_h)} = $self->child->size_request;
		539	$self->child->size_allocate (0, 0, @$self{qw(child_w child_h)});
		540
		541	@$self{qw(child_w child_h)}
		542	}
		543
		544	sub _draw {
		545	my ($self) = @_;
		546
		547	$self->{children}[1]->draw;
		548	}
		549
		550
		551	#############################################################################
		552
482	package CFClient::UI::Frame;	553	package CFClient::UI::Frame;
483		554
484	our @ISA = CFClient::UI::Bin::;	555	our @ISA = CFClient::UI::Bin::;
485		556
486	use SDL::OpenGL;	557	use SDL::OpenGL;
…		…
496	}	567	}
497		568
498	sub size_allocate {	569	sub size_allocate {
499	my ($self, $x, $y, $w, $h) = @_;	570	my ($self, $x, $y, $w, $h) = @_;
500		571
501	$self->_size_allocate ($x, $y, $w, $h) or return;
502
503	$self->child->size_allocate (2, 2, $w - 4, $h - 4);	572	$self->child->configure (2, 2, $w - 4, $h - 4);
504	}	573	}
505		574
506	sub _draw {	575	sub _draw {
507	my ($self) = @_;	576	my ($self) = @_;
508		577
…		…
539	# TODO: user_x, user_y, overwrite moveto?	608	# TODO: user_x, user_y, overwrite moveto?
540		609
541	$class->SUPER::new (	610	$class->SUPER::new (
542	bg => [1, 1, 1, 1],	611	bg => [1, 1, 1, 1],
543	border_bg => [1, 1, 1, 1],	612	border_bg => [1, 1, 1, 1],
544	border => $::FONTSIZE * 0.8,	613	border => int $::FONTSIZE * 0.8,
545	@_	614	@_
546	)	615	)
547	}	616	}
548		617
549	sub size_request {	618	sub size_request {
…		…
558	$h + $self->{border} * 2,	627	$h + $self->{border} * 2,
559	)	628	)
560	}	629	}
561		630
562	sub size_allocate {	631	sub size_allocate {
563	my ($self, $x, $y, $w, $h) = @_;	632	my ($self, $w, $h) = @_;
564
565	$self->_size_allocate ($x, $y, $w, $h) or return;
566		633
567	$h -= List::Util::max 0, $self->{border} * 2;	634	$h -= List::Util::max 0, $self->{border} * 2;
568	$w -= List::Util::max 0, $self->{border} * 2;	635	$w -= List::Util::max 0, $self->{border} * 2;
569		636
570	$self->child->size_allocate ($self->{border}, $self->{border}, $w, $h);	637	$self->child->configure ($self->{border}, $self->{border}, $w, $h);
571	}	638	}
572		639
573	sub button_down {	640	sub button_down {
574	my ($self, $ev, $x, $y) = @_;	641	my ($self, $ev, $x, $y) = @_;
575		642
…		…
584		651
585	($x, $y) = ($ev->motion_x, $ev->motion_y);	652	($x, $y) = ($ev->motion_x, $ev->motion_y);
586		653
587	$self->{user_w} = $bw + $x - $ox;	654	$self->{user_w} = $bw + $x - $ox;
588	$self->{user_h} = $bh + $y - $oy;	655	$self->{user_h} = $bh + $y - $oy;
589	$self->update;	656	$self->check_size;
590	};	657	};
591		658
592	} elsif ($x >= 0 && $x < $self->{w}	659	} elsif ($x >= 0 && $x < $self->{w}
593	&& $y >= 0 && $y < $self->{border}) {	660	&& $y >= 0 && $y < $self->{border}) {
594		661
…		…
672	@_	739	@_
673	)	740	)
674	}	741	}
675		742
676	sub add {	743	sub add {
677	my ($self, $x, $y, $chld) = @_;	744	my ($self, $x, $y, $child) = @_;
678		745
		746	$child->set_parent ($self);
679	$self->{children}[$y][$x] = $chld;	747	$self->{children}[$y][$x] = $child;
680	$chld->set_parent ($self);
681		748
682	$self->{w} = $self->{h} = -1;	749	$self->{w} = $self->{h} = -1;
		750
		751	$child->check_size;
		752	}
		753
		754	# TODO: move to container class maybe? send childs a signal on removal?
		755	sub clear {
		756	my ($self) = @_;
		757
		758	delete $self->{children};
683	$self->update;	759	$self->update;
684	}	760	}
685		761
686	sub get_wh {	762	sub get_wh {
687	my ($self) = @_;	763	my ($self) = @_;
…		…
715	(sum @$hs),	791	(sum @$hs),
716	)	792	)
717	}	793	}
718		794
719	sub size_allocate {	795	sub size_allocate {
720	my ($self, $x, $y, $w, $h) = @_;	796	my ($self, $w, $h) = @_;
721
722	$self->_size_allocate ($x, $y, $w, $h) or return;
723		797
724	my ($ws, $hs) = $self->get_wh;	798	my ($ws, $hs) = $self->get_wh;
725		799
726	my $req_w = sum @$ws;	800	my $req_w = sum @$ws;
727	my $req_h = sum @$hs;	801	my $req_h = sum @$hs;
…		…
732	my $col_expand = (sum @col_expand) \|\| 1;	806	my $col_expand = (sum @col_expand) \|\| 1;
733		807
734	# linearly scale sizes	808	# linearly scale sizes
735	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;	809	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
736	$hs->[$_] = 1 $h / $req_h for 0 .. $#$hs;	810	$hs->[$_] = 1 $h / $req_h for 0 .. $#$hs;
		811
		812	CFClient::UI::harmonize $ws;
		813	CFClient::UI::harmonize $hs;
737		814
738	my $y;	815	my $y;
739		816
740	for my $r (0 .. $#{$self->{children}}) {	817	for my $r (0 .. $#{$self->{children}}) {
741	my $row = $self->{children}[$r]	818	my $row = $self->{children}[$r]
…		…
746		823
747	for my $c (0 .. $#$row) {	824	for my $c (0 .. $#$row) {
748	my $col_w = $ws->[$c];	825	my $col_w = $ws->[$c];
749		826
750	if (my $widget = $row->[$c]) {	827	if (my $widget = $row->[$c]) {
751	$widget->size_allocate ($x, $y, $col_w, $row_h);	828	$widget->configure ($x, $y, $col_w, $row_h);
752	}	829	}
753		830
754	$x += $col_w;	831	$x += $col_w;
755	}	832	}
756		833
…		…
801	(List::Util::max map $_->[1], @alloc),	878	(List::Util::max map $_->[1], @alloc),
802	)	879	)
803	}	880	}
804		881
805	sub size_allocate {	882	sub size_allocate {
806	my ($self, $x, $y, $w, $h) = @_;	883	my ($self, $w, $h) = @_;
807
808	$self->_size_allocate ($x, $y, $w, $h);
809		884
810	($h, $w) = ($w, $h);	885	($h, $w) = ($w, $h);
811		886
812	my $children = $self->{children};	887	my $children = $self->{children};
813		888
…		…
829	$alloc_h += ($h - $req_h) * $child->{expand} / $exp;	904	$alloc_h += ($h - $req_h) * $child->{expand} / $exp;
830	$h[$_] = $alloc_h;	905	$h[$_] = $alloc_h;
831	}	906	}
832	}	907	}
833		908
		909	CFClient::UI::harmonize \@h;
		910
834	my $y = 0;	911	my $y = 0;
835	for (0 .. $#$children) {	912	for (0 .. $#$children) {
836	my $child = $children->[$_];	913	my $child = $children->[$_];
837	my $h = int $h[$_];	914	my $h = $h[$_];
838	$child->size_allocate ($y, 0, $h, $w);	915	$child->configure ($y, 0, $h, $w);
839		916
840	$y += $h;	917	$y += $h;
841	}	918	}
		919
		920	1
842	}	921	}
843		922
844	#############################################################################	923	#############################################################################
845		924
846	package CFClient::UI::VBox;	925	package CFClient::UI::VBox;
…		…
859	(List::Util::sum map $_->[1], @alloc),	938	(List::Util::sum map $_->[1], @alloc),
860	)	939	)
861	}	940	}
862		941
863	sub size_allocate {	942	sub size_allocate {
864	my ($self, $x, $y, $w, $h) = @_;	943	my ($self, $w, $h) = @_;
865
866	$self->_size_allocate ($x, $y, $w, $h);
867		944
868	my $children = $self->{children};	945	my $children = $self->{children};
869		946
870	my @h = map +($_->size_request)[1], @$children;	947	my @h = map +($_->size_request)[1], @$children;
871		948
…		…
883		960
884	$h[$_] += ($h - $req_h) * $child->{expand} / $exp;	961	$h[$_] += ($h - $req_h) * $child->{expand} / $exp;
885	}	962	}
886	}	963	}
887		964
		965	CFClient::UI::harmonize \@h;
		966
888	my $y = 0;	967	my $y = 0;
889	for (0 .. $#$children) {	968	for (0 .. $#$children) {
890	my $child = $children->[$_];	969	my $child = $children->[$_];
891	my $h = int $h[$_];	970	my $h = $h[$_];
892	$child->size_allocate (0, $y, $w, $h);	971	$child->configure (0, $y, $w, $h);
893		972
894	$y += $h;	973	$y += $h;
895	}	974	}
		975
		976	1
896	}	977	}
897		978
898	#############################################################################	979	#############################################################################
899		980
900	package CFClient::UI::Label;	981	package CFClient::UI::Label;
…		…
909	my $self = $class->SUPER::new (	990	my $self = $class->SUPER::new (
910	fg => [1, 1, 1],	991	fg => [1, 1, 1],
911	fontsize => $::FONTSIZE,	992	fontsize => $::FONTSIZE,
912	text => "",	993	text => "",
913	align => -1,	994	align => -1,
		995	valign => -1,
914	padding => 2,	996	padding => 2,
915	layout => new CFClient::Layout,	997	layout => new CFClient::Layout,
916	%arg	998	%arg
917	);	999	);
918		1000
919	$self->set_text ($self->{text});	1001	$self->{xxx}++ if $self->{text} eq "Client Setup" && $self->{align};#d#
		1002
		1003	$self->set_text (delete $self->{text}) if exists $self->{text};
		1004	$self->set_markup (delete $self->{markup}) if exists $self->{markup};
920		1005
921	$self	1006	$self
922	}	1007	}
923		1008
924	sub escape_text {	1009	sub escape_text {
…		…
932	}	1017	}
933		1018
934	sub set_text {	1019	sub set_text {
935	my ($self, $text) = @_;	1020	my ($self, $text) = @_;
936		1021
937	$self->{text} = $text;
938	$self->{layout}->set_markup ($text);	1022	$self->{layout}->set_text ($text);
939		1023
940	delete $self->{texture};	1024	delete $self->{texture};
941	# $self->{w} = $self->{h} = -1;
942	$self->update;	1025	$self->update;
943	}	1026	}
944		1027
945	sub get_text {	1028	sub set_markup {
946	my ($self, $text) = @_;	1029	my ($self, $markup) = @_;
947		1030
948	$self->{text}	1031	$self->{layout}->set_markup ($markup);
		1032
		1033	delete $self->{texture};
		1034	$self->update;
949	}	1035	}
950		1036
951	sub size_request {	1037	sub size_request {
952	my ($self) = @_;	1038	my ($self) = @_;
953		1039
954	$self->{layout}->set_width;	1040	$self->{layout}->set_width;
955	$self->{layout}->set_height ($self->{fontsize});	1041	$self->{layout}->set_height ($self->{fontsize});
		1042
956	my ($w, $h) = $self->{layout}->size;	1043	my ($w, $h) = $self->{layout}->size;
957		1044
958	(	1045	(
959	$w + $self->{padding} * 2,	1046	$w + $self->{padding} * 2,
960	$h + $self->{padding} * 2,	1047	$h + $self->{padding} * 2,
961	)	1048	)
962	}	1049	}
963		1050
964	sub size_allocate {	1051	sub size_allocate {
965	my ($self, $x, $y, $w, $h) = @_;	1052	my ($self, $w, $h) = @_;
966
967	$self->_size_allocate ($x, $y, $w, $h) or return;
968		1053
969	delete $self->{texture};	1054	delete $self->{texture};
970	}	1055	}
971		1056
972	sub update {	1057	sub update {
…		…
979	sub _draw {	1064	sub _draw {
980	my ($self) = @_;	1065	my ($self) = @_;
981		1066
982	my $tex = $self->{texture} \|\|= do {	1067	my $tex = $self->{texture} \|\|= do {
983	$self->{layout}->set_width ($self->{w});	1068	$self->{layout}->set_width ($self->{w});
984	$self->{layout}->set_height (List::Util::min $self->{h} - $self->{padding} * 2, $self->{fontsize});	1069	$self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize});
985	new_from_layout CFClient::Texture $self->{layout}	1070	new_from_layout CFClient::Texture $self->{layout}
986	};	1071	};
987		1072
988	glEnable GL_BLEND;	1073	glEnable GL_BLEND;
989	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	1074	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
990	glEnable GL_TEXTURE_2D;	1075	glEnable GL_TEXTURE_2D;
991	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1076	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
992		1077
993	glColor @{$self->{fg}};	1078	glColor @{$self->{fg}};
994		1079
995	my $x =	1080	$self->{ox} = int (
996	$self->{align} < 0 ? $self->{padding}	1081	$self->{align} < 0 ? $self->{padding}
997	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}	1082	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
998	: ($self->{w} - $tex->{w}) * 0.5;	1083	: ($self->{w} - $tex->{w}) * 0.5
		1084	);
999		1085
1000	$tex->draw_quad (int $x, int +($self->{h} - $tex->{h}) * 0.5);	1086	$self->{oy} = int (
		1087	$self->{valign} < 0 ? $self->{padding}
		1088	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
		1089	: ($self->{h} - $tex->{h}) * 0.5
		1090	);
		1091
		1092	$tex->draw_quad ($self->{ox}, $self->{oy});
1001		1093
1002	glDisable GL_TEXTURE_2D;	1094	glDisable GL_TEXTURE_2D;
1003	glDisable GL_BLEND;	1095	glDisable GL_BLEND;
1004	}	1096	}
1005		1097
1006	#############################################################################	1098	#############################################################################
1007		1099
1008	package CFClient::UI::Entry;	1100	package CFClient::UI::EntryBase;
1009		1101
1010	our @ISA = CFClient::UI::Label::;	1102	our @ISA = CFClient::UI::Label::;
1011		1103
1012	use SDL;	1104	use SDL;
1013	use SDL::OpenGL;	1105	use SDL::OpenGL;
…		…
1020	bg => [0, 0, 0, 0.2],	1112	bg => [0, 0, 0, 0.2],
1021	active_bg => [1, 1, 1, 0.5],	1113	active_bg => [1, 1, 1, 0.5],
1022	active_fg => [0, 0, 0],	1114	active_fg => [0, 0, 0],
1023	can_hover => 1,	1115	can_hover => 1,
1024	can_focus => 1,	1116	can_focus => 1,
		1117	valign => 0,
1025	@_	1118	@_
1026	)	1119	)
1027	}	1120	}
1028		1121
1029	sub _set_text {	1122	sub _set_text {
1030	my ($self, $text) = @_;	1123	my ($self, $text) = @_;
1031		1124
1032	my $old_text = $self->{text};	1125	delete $self->{cur_h};
		1126
		1127	return if $self->{text} eq $text;
1033		1128
1034	$self->{last_activity} = $::NOW;	1129	$self->{last_activity} = $::NOW;
1035
1036	$self->{text} = $text;	1130	$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		1131
1040	$text =~ s/./*/g if $self->{hidden};	1132	$text =~ s/./*/g if $self->{hidden};
		1133	$self->{layout}->set_text ("$text ");
1041		1134
1042	$self->{layout}->set_markup ($self->escape_text ($text) . " ");	1135	$self->emit (changed => $self->{text});
		1136	}
1043		1137
1044	$text = substr $text, 0, $self->{cursor};	1138	sub get_text {
1045	utf8::encode $text;	1139	$_[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	}	1140	}
1052		1141
1053	sub size_request {	1142	sub size_request {
1054	my ($self) = @_;	1143	my ($self) = @_;
1055		1144
…		…
1057		1146
1058	($w + 1, $h) # add 1 for cursor	1147	($w + 1, $h) # add 1 for cursor
1059	}	1148	}
1060		1149
1061	sub size_allocate {	1150	sub size_allocate {
1062	my ($self, $x, $y, $w, $h) = @_;	1151	my ($self, $w, $h) = @_;
1063
1064	$self->SUPER::size_allocate ($x, $y, $w, $h);
1065		1152
1066	$self->_set_text ($self->{text});	1153	$self->_set_text ($self->{text});
1067	}	1154	}
1068		1155
1069	sub set_text {	1156	sub set_text {
…		…
1159		1246
1160	$self->SUPER::_draw;	1247	$self->SUPER::_draw;
1161		1248
1162	#TODO: force update every cursor change :(	1249	#TODO: force update every cursor change :(
1163	if ($FOCUS == $self && (($::NOW - $self->{last_activity}) & 1023) < 600) {	1250	if ($FOCUS == $self && (($::NOW - $self->{last_activity}) & 1023) < 600) {
		1251
		1252	unless (exists $self->{cur_h}) {
		1253	my $text = substr $self->{text}, 0, $self->{cursor};
		1254	utf8::encode $text;
		1255
		1256	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
		1257	}
		1258
1164	glColor @{$self->{fg}};	1259	glColor @{$self->{fg}};
1165	glBegin GL_LINES;	1260	glBegin GL_LINES;
1166	glVertex $self->{cur_x}, $self->{cur_y};
1167	glVertex $self->{cur_x}, $self->{cur_y} + $self->{cur_h};	1261	glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};
		1262	glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1168	glEnd;	1263	glEnd;
1169	}	1264	}
1170	}	1265	}
1171		1266
1172	package CFClient::UI::LineEntry;	1267	package CFClient::UI::Entry;
1173		1268
1174	our @ISA = CFClient::UI::Entry::;	1269	our @ISA = CFClient::UI::EntryBase::;
1175		1270
1176	use SDL;	1271	use SDL;
1177	use SDL::OpenGL;	1272	use SDL::OpenGL;
1178		1273
1179	sub key_down {	1274	sub key_down {
…		…
1209		1304
1210	$class->SUPER::new (	1305	$class->SUPER::new (
1211	padding => 4,	1306	padding => 4,
1212	fg => [1, 1, 1],	1307	fg => [1, 1, 1],
1213	bg => [1, 1, 1, 0.2],	1308	bg => [1, 1, 1, 0.2],
1214	active_fg => [1, 1, 0],	1309	active_fg => [0, 0, 1],
1215	can_hover => 1,	1310	can_hover => 1,
		1311	align => 0,
		1312	valign => 0,
1216	@_	1313	@_
1217	)	1314	)
1218	}	1315	}
1219		1316
1220	sub button_up {	1317	sub button_up {
…		…
1228		1325
1229	sub _draw {	1326	sub _draw {
1230	my ($self) = @_;	1327	my ($self) = @_;
1231		1328
1232	local $self->{fg} = $self->{fg};	1329	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		1330
1239	if ($GRAB == $self) {	1331	if ($GRAB == $self) {
1240	$self->{fg} = $self->{active_fg};	1332	$self->{fg} = $self->{active_fg};
1241	}	1333	}
1242		1334
1243	glBindTexture GL_TEXTURE_2D, $tex->{name};	1335	glEnable GL_BLEND;
		1336	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
		1337	glEnable GL_TEXTURE_2D;
1244	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1338	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		1339	glColor 0, 0, 0, 1;
1245		1340
1246	$tex->draw_quad (0, 0, $self->{w}, $self->{h});	1341	$tex[0]->draw_quad (0, 0, $self->{w}, $self->{h});
1247		1342
1248	glDisable GL_TEXTURE_2D;	1343	glDisable GL_TEXTURE_2D;
1249	glDisable GL_BLEND;	1344	glDisable GL_BLEND;
1250		1345
1251	$self->SUPER::_draw;	1346	$self->SUPER::_draw;
…		…
1281	my ($self) = @_;	1376	my ($self) = @_;
1282		1377
1283	($self->{padding} * 2 + 6) x 2	1378	($self->{padding} * 2 + 6) x 2
1284	}	1379	}
1285		1380
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 {	1381	sub button_down {
1293	my ($self, $ev, $x, $y) = @_;	1382	my ($self, $ev, $x, $y) = @_;
1294		1383
1295	if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}	1384	if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}
1296	&& $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {	1385	&& $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {
…		…
1318		1407
1319	$tex->draw_quad (0, 0, $s, $s);	1408	$tex->draw_quad (0, 0, $s, $s);
1320		1409
1321	glDisable GL_TEXTURE_2D;	1410	glDisable GL_TEXTURE_2D;
1322	glDisable GL_BLEND;	1411	glDisable GL_BLEND;
		1412	}
		1413
		1414	#############################################################################
		1415
		1416	package CFClient::UI::VGauge;
		1417
		1418	our @ISA = CFClient::UI::Base::;
		1419
		1420	use SDL::OpenGL;
		1421
		1422	my %tex = (
		1423	food => [
		1424	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
		1425	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
		1426	],
		1427	grace => [
		1428	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
		1429	qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png/
		1430	],
		1431	hp => [
		1432	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
		1433	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
		1434	],
		1435	mana => [
		1436	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
		1437	qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png/
		1438	],
		1439	);
		1440
		1441	# eg. VGauge->new (gauge => 'food'), default gauge: food
		1442	sub new {
		1443	my $class = shift;
		1444
		1445	my $self = $class->SUPER::new (gauge => 'food', @_);
		1446
		1447	$self
		1448	}
		1449
		1450	sub size_request {
		1451	my ($self) = @_;
		1452
		1453	my $tex = $tex{$self->{gauge}}[0];
		1454
		1455	@$tex{qw(w h)}
		1456	}
		1457
		1458	sub set_max {
		1459	my ($self, $max) = @_;
		1460
		1461	$self->{max_val} = $max;
		1462	}
		1463
		1464	sub set_value {
		1465	my ($self, $val, $max) = @_;
		1466
		1467	$self->set_max ($max)
		1468	if defined $max;
		1469
		1470	$max = $self->{max_val};
		1471	$self->{val} = $val;
		1472
		1473	$self->update;
		1474	}
		1475
		1476	sub _draw {
		1477	my ($self) = @_;
		1478
		1479	my $tex = $tex{$self->{gauge}};
		1480
		1481	my ($w, $h) = ($self->{w}, $self->{h});
		1482
		1483	my $ycut = $self->{val} / ($self->{max_val} \|\| 1);
		1484	$ycut = 1 if $self->{val} > $self->{max_val};
		1485
		1486	my $t1 = $tex->[0];
		1487	my $t2 = $tex->[1];
		1488
		1489	glEnable GL_BLEND;
		1490	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
		1491	glEnable GL_TEXTURE_2D;
		1492	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		1493
		1494	my $h1 = $self->{h} - $ycut * $self->{h};
		1495	my $h2 = $ycut * $self->{h};
		1496
		1497	my $yp = 0;
		1498
		1499	glBindTexture (GL_TEXTURE_2D, $t1->{name});
		1500	glBegin (GL_QUADS);
		1501	glTexCoord (0, 0); glVertex (0 , $yp);
		1502	glTexCoord (0, (1 - $ycut)); glVertex (0 , $yp + $h1);
		1503	glTexCoord (1, (1 - $ycut)); glVertex (0 + $w, $yp + $h1);
		1504	glTexCoord (1, 0); glVertex (0 + $w, $yp);
		1505	glEnd ();
		1506
		1507	$yp += $h1;
		1508
		1509	glBindTexture (GL_TEXTURE_2D, $t2->{name});
		1510	glBegin (GL_QUADS);
		1511	glTexCoord (0, (1 - $ycut)); glVertex (0 , $yp);
		1512	glTexCoord (0, 1); glVertex (0 , $yp + $h2);
		1513	glTexCoord (1, 1); glVertex (0 + $w, $yp + $h2);
		1514	glTexCoord (1, (1 - $ycut)); glVertex (0 + $w, $yp);
		1515	glEnd ();
		1516
		1517	glDisable GL_BLEND;
		1518	glDisable GL_TEXTURE_2D;
1323	}	1519	}
1324		1520
1325	#############################################################################	1521	#############################################################################
1326		1522
1327	package CFClient::UI::Slider;	1523	package CFClient::UI::Slider;
…		…
1424	my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};	1620	my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
1425	my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};	1621	my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
1426		1622
1427	my ($value, $lo, $hi, $page) = @{$self->{range}};	1623	my ($value, $lo, $hi, $page) = @{$self->{range}};
1428		1624
		1625	$hi = $value + 1 if $lo == $hi;
		1626
1429	my $inner_pad_px = $self->_calc_inner_pad_px ($w);	1627	my $inner_pad_px = $self->_calc_inner_pad_px ($w);
1430	my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right	1628	my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
1431		1629
1432	$page = int $page * $inner_w / ($hi - $lo);	1630	$page = int $page * $inner_w / ($hi - $lo);
1433	$value = int +($value - $lo) * $inner_w / ($hi - $lo);	1631	$value = int +($value - $lo) * $inner_w / ($hi - $lo);
…		…
1479	(new CFClient::UI::Empty expand => 1),	1677	(new CFClient::UI::Empty expand => 1),
1480	(new CFClient::UI::Slider vertical => 1),	1678	(new CFClient::UI::Slider vertical => 1),
1481	],	1679	],
1482	);	1680	);
1483		1681
		1682	$self->{children}[1]->connect (changed => sub {
		1683	$self->update;
		1684	});
		1685
1484	$self	1686	$self
		1687	}
		1688
		1689	sub set_fontsize {
		1690	my ($self, $fontsize) = @_;
		1691
		1692	$self->{fontsize} = $fontsize;
		1693	$self->reflow;
1485	}	1694	}
1486		1695
1487	sub text_height {	1696	sub text_height {
1488	my ($self, $text) = @_;	1697	my ($self, $text) = @_;
1489		1698
…		…
1497	}	1706	}
1498		1707
1499	sub reflow {	1708	sub reflow {
1500	my ($self) = @_;	1709	my ($self) = @_;
1501		1710
1502	my $height = 0;	1711	$self->{need_reflow}++;
1503		1712	$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	}	1713	}
1512		1714
1513	sub size_request {	1715	sub size_request {
1514	my ($self) = @_;	1716	my ($self) = @_;
1515		1717
1516	($self->{req_w}, $self->{req_h})	1718	($self->{req_w}, $self->{req_h})
1517	}	1719	}
1518		1720
1519	sub size_allocate {	1721	sub size_allocate {
1520	my ($self, $x, $y, $w, $h) = @_;	1722	my ($self, $w, $h) = @_;
1521
1522	$self->SUPER::size_allocate ($x, $y, $w, $h);
1523		1723
1524	$self->{layout}->set_height ($self->{fontsize});	1724	$self->{layout}->set_height ($self->{fontsize});
1525	$self->{layout}->set_width ($self->{w});	1725	$self->{layout}->set_width ($self->{w});
1526		1726
1527	$self->reflow;	1727	$self->reflow;
…		…
1548		1748
1549	$self->SUPER::update;	1749	$self->SUPER::update;
1550		1750
1551	return unless $self->{h} > 0;	1751	return unless $self->{h} > 0;
1552		1752
		1753	delete $self->{texture};
		1754
		1755	$ROOT->on_refresh ($self, sub {
		1756	if (delete $self->{need_reflow}) {
		1757	my $height = 0;
		1758
		1759	$height += $_->[0] = $self->text_height ($_->[2])
		1760	for @{$self->{par}};
		1761
		1762	$self->{height} = $height;
		1763
		1764	$self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];
		1765
		1766	delete $self->{texture};
		1767	}
		1768
1553	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {	1769	$self->{texture} \|\|= new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
1554	glClearColor 0, 0, 0, 1;	1770	glClearColor 0, 0, 0, 1;
1555	glClear GL_COLOR_BUFFER_BIT;	1771	glClear GL_COLOR_BUFFER_BIT;
1556		1772
1557	my $y0 = $self->{height} - $self->{h};
1558	my $y1 = $self->{height};
1559
1560	glEnable GL_BLEND;	1773	glEnable GL_BLEND;
1561	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	1774	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1562	glEnable GL_TEXTURE_2D;	1775	glEnable GL_TEXTURE_2D;
1563	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1776	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1564		1777
		1778	my $top = int $self->{children}[1]{range}[0];
		1779
		1780	my $y0 = $top;
		1781	my $y1 = $top + $self->{h};
		1782
1565	my $y = 0;	1783	my $y = 0;
1566		1784
1567	my $layout = $self->{layout};	1785	my $layout = $self->{layout};
1568		1786
1569	for my $par (@{$self->{par}}) {	1787	for my $par (@{$self->{par}}) {
1570	my $h = $par->[0];	1788	my $h = $par->[0];
1571		1789
1572	if ($y0 < $y + $h && $y < $y1) {	1790	if ($y0 < $y + $h && $y < $y1) {
1573	$layout->set_text ($par->[2]);	1791	$layout->set_text ($par->[2]);
1574		1792
1575	glColor @{ $par->[1] };	1793	glColor @{ $par->[1] };
1576	my ($W, $H) = $layout->size;	1794	my ($W, $H) = $layout->size;
1577	CFClient::Texture->new_from_layout ($layout)->draw_quad (0, $y - $y0);	1795	CFClient::Texture->new_from_layout ($layout)->draw_quad (0, $y - $y0);
		1796	}
		1797
		1798	$y += $h;
1578	}	1799	}
1579		1800
1580	$y += $h;
1581	}
1582
1583	glDisable GL_TEXTURE_2D;	1801	glDisable GL_TEXTURE_2D;
1584	glDisable GL_BLEND;	1802	glDisable GL_BLEND;
		1803	};
1585	};	1804	});
1586	}	1805	}
1587		1806
1588	sub _draw {	1807	sub _draw {
1589	my ($self) = @_;	1808	my ($self) = @_;
1590		1809
…		…
1592	glEnable GL_TEXTURE_2D;	1811	glEnable GL_TEXTURE_2D;
1593	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1812	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1594	$self->{texture}->draw_quad (0, 0, $self->{w}, $self->{h});	1813	$self->{texture}->draw_quad (0, 0, $self->{w}, $self->{h});
1595	glDisable GL_TEXTURE_2D;	1814	glDisable GL_TEXTURE_2D;
1596	}	1815	}
		1816
		1817	$self->{children}[1]->draw;
1597		1818
1598	}	1819	}
1599		1820
1600	#############################################################################	1821	#############################################################################
1601		1822
…		…
1626	}	1847	}
1627		1848
1628	sub key_up {	1849	sub key_up {
1629	}	1850	}
1630		1851
		1852	sub button_down {
		1853	my ($self, $ev, $x, $y) = @_;
		1854
		1855	$self->focus_in;
		1856
		1857	if ($ev->button == 2) {
		1858	my ($ox, $oy) = ($ev->button_x, $ev->button_y);
		1859	my ($bw, $bh) = ($::CFG->{map_shift_x}, $::CFG->{map_shift_y});
		1860
		1861	$self->{motion} = sub {
		1862	my ($ev, $x, $y) = @_;
		1863
		1864	($x, $y) = ($ev->motion_x, $ev->motion_y);
		1865
		1866	$::CFG->{map_shift_x} = $bw + $x - $ox;
		1867	$::CFG->{map_shift_y} = $bh + $y - $oy;
		1868
		1869	$self->update;
		1870	};
		1871	}
		1872	}
		1873
		1874	sub button_up {
		1875	my ($self, $ev, $x, $y) = @_;
		1876
		1877	delete $self->{motion};
		1878	}
		1879
		1880	sub mouse_motion {
		1881	my ($self, $ev, $x, $y) = @_;
		1882
		1883	$self->{motion}->($ev, $x, $y) if $self->{motion};
		1884	}
		1885
1631	sub size_request {	1886	sub size_request {
1632	(	1887	(
1633	1 + 32 * int $::WIDTH / 32,	1888	1 + 32 * int $::WIDTH / 32,
1634	1 + 32 * int $::HEIGHT / 32,	1889	1 + 32 * int $::HEIGHT / 32,
1635	)	1890	)
…		…
1643	}	1898	}
1644		1899
1645	sub draw {	1900	sub draw {
1646	my ($self) = @_;	1901	my ($self) = @_;
1647		1902
1648	$self->{need_update}++;#d#
1649	if (delete $self->{need_update}) {	1903	if (delete $self->{need_update}) {
1650	glNewList $self->{list}, GL_COMPILE;	1904	glNewList $self->{list}, GL_COMPILE;
1651		1905
1652	my $sw = int $::WIDTH / 32;
1653	my $sh = int $::HEIGHT / 32;
1654
1655	if ($::MAP) {	1906	if ($::MAP) {
		1907	my $sw = int $::WIDTH / 32;
		1908	my $sh = int $::HEIGHT / 32;
		1909
		1910	my $sx = $::CFG->{map_shift_x}; my $sx0 = $sx & 31; $sx = ($sx - $sx0) / 32;
		1911	my $sy = $::CFG->{map_shift_y}; my $sy0 = $sy & 31; $sy = ($sy - $sy0) / 32;
		1912
		1913	glTranslate $sx0 - 32, $sy0 - 32, 0;
		1914
1656	my ($w, $h, $data) = $::MAP->draw (0, 0, $sw, $sh);	1915	my ($w, $h, $data) = $::MAP->draw ($sx, $sy, 0, 0, $sw + 1, $sh + 1);
1657		1916
1658	if ($::CFG->{fow_enable}) {	1917	if ($::CFG->{fow_enable}) {
1659	if ($::CFG->{fow_smooth}) { # smooth fog of war	1918	if ($::CFG->{fow_smooth}) { # smooth fog of war
1660	glConvolutionParameter GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER;	1919	glConvolutionParameter (GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER);
1661	glConvolutionFilter2D	1920	glConvolutionFilter2D (
1662	GL_CONVOLUTION_2D,	1921	GL_CONVOLUTION_2D,
1663	GL_ALPHA,	1922	GL_ALPHA,
1664	3, 3,	1923	3, 3,
1665	GL_ALPHA, GL_FLOAT,	1924	GL_ALPHA, GL_FLOAT,
1666	pack "f*",	1925	pack "f*",
1667	0.1, 0.1, 0.1,	1926	0.1, 0.1, 0.1,
1668	0.1, 0.2, 0.1,	1927	0.1, 0.2, 0.1,
1669	0.1, 0.1, 0.1,	1928	0.1, 0.1, 0.1,
1670	;	1929	);
1671	glEnable GL_CONVOLUTION_2D;	1930	glEnable GL_CONVOLUTION_2D;
1672	}	1931	}
1673		1932
1674	my $tex = new CFClient::Texture	1933	$self->{fow_texture} = new CFClient::Texture
1675	w => $w,	1934	w => $w,
1676	h => $h,	1935	h => $h,
1677	data => $data,	1936	data => $data,
1678	internalformat => GL_ALPHA,	1937	internalformat => GL_ALPHA,
1679	format => GL_ALPHA;	1938	format => GL_ALPHA;
1680		1939
1681	glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth};	1940	glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth};
1682		1941
1683	glEnable GL_BLEND;	1942	glEnable GL_BLEND;
		1943	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1684	glEnable GL_TEXTURE_2D;	1944	glEnable GL_TEXTURE_2D;
1685	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	1945	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1686		1946
1687	glColor +($::CFG->{fow_intensity}) x 3, 1;	1947	glColor +($::CFG->{fow_intensity}) x 3, 1;
1688	$tex->draw_quad (0, 0, $w * 32, $h * 32);	1948	$self->{fow_texture}->draw_quad (0, 0, $w * 32, $h * 32);
1689		1949
1690	glDisable GL_TEXTURE_2D;	1950	glDisable GL_TEXTURE_2D;
1691	glDisable GL_BLEND;	1951	glDisable GL_BLEND;
1692	}	1952	}
		1953
		1954	# HACK BEGIN
		1955	{
		1956	glTranslate -($sx0 - 32), -($sy0 - 32), 0;#remove
		1957	my ($w, $h) = (250, 250);
		1958
		1959	glEnable GL_BLEND;
		1960	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
		1961	glEnable GL_TEXTURE_2D;
		1962	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		1963
		1964	$self->{mapmap_texture} =
		1965	new CFClient::Texture
		1966	w => $w,
		1967	h => $h,
		1968	data => $::MAP->mapmap ($w, $h),
		1969	type => $CFClient::GL_VERSION >= 1.2 ? GL_UNSIGNED_INT_8_8_8_8_REV : GL_UNSIGNED_BYTE;
		1970
		1971	$self->{mapmap_texture}->draw_quad (100, 100);
		1972
		1973	glDisable GL_TEXTURE_2D;
		1974	glDisable GL_BLEND;
		1975	}
		1976	# HACK END
1693	}	1977	}
1694		1978
1695	glEndList;	1979	glEndList;
1696	}	1980	}
1697		1981
		1982	glPushMatrix;
1698	glCallList $self->{list};	1983	glCallList $self->{list};
		1984	glPopMatrix;
1699		1985
1700	if ($FOCUS != $self) {	1986	if ($FOCUS != $self) {
1701	glColor 64/255, 64/255, 64/255;	1987	glColor 64/255, 64/255, 64/255;
1702	glLogicOp GL_AND;	1988	glLogicOp GL_AND;
1703	glEnable GL_COLOR_LOGIC_OP;	1989	glEnable GL_COLOR_LOGIC_OP;
…		…
1732		2018
1733	my $mod = $ev->key_mod;	2019	my $mod = $ev->key_mod;
1734	my $sym = $ev->key_sym;	2020	my $sym = $ev->key_sym;
1735		2021
1736	if ($sym == SDLK_KP5) {	2022	if ($sym == SDLK_KP5) {
1737	$::CONN->user_send ("command stay fire");	2023	$::CONN->user_send ("stay fire");
1738	} elsif ($sym == SDLK_a) {	2024	} elsif ($sym == SDLK_a) {
1739	$::CONN->user_send ("command apply");	2025	$::CONN->user_send ("apply");
1740	} elsif ($sym == SDLK_QUOTE) {	2026	} elsif ($sym == SDLK_QUOTE) {
1741	$self->emit ('activate_console');	2027	$self->emit ('activate_console');
1742	} elsif ($sym == SDLK_SLASH) {	2028	} elsif ($sym == SDLK_SLASH) {
1743	$self->emit ('activate_console' => '/');	2029	$self->emit ('activate_console' => '/');
1744	} elsif (exists $DIR{$sym}) {	2030	} elsif (exists $DIR{$sym}) {
1745	if ($mod & KMOD_SHIFT) {	2031	if ($mod & KMOD_SHIFT) {
1746	$self->{shft}++;	2032	$self->{shft}++;
1747	$::CONN->user_send ("command fire $DIR{$sym}[0]");	2033	$::CONN->user_send ("fire $DIR{$sym}[0]");
1748	} elsif ($mod & KMOD_CTRL) {	2034	} elsif ($mod & KMOD_CTRL) {
1749	$self->{ctrl}++;	2035	$self->{ctrl}++;
1750	$::CONN->user_send ("command run $DIR{$sym}[0]");	2036	$::CONN->user_send ("run $DIR{$sym}[0]");
1751	} else {	2037	} else {
1752	$::CONN->user_send ("command $DIR{$sym}[1]");	2038	$::CONN->user_send ("$DIR{$sym}[1]");
1753	}	2039	}
1754	}	2040	}
1755	}	2041	}
1756		2042
1757	sub key_up {	2043	sub key_up {
…		…
1759		2045
1760	my $mod = $ev->key_mod;	2046	my $mod = $ev->key_mod;
1761	my $sym = $ev->key_sym;	2047	my $sym = $ev->key_sym;
1762		2048
1763	if (!($mod & KMOD_SHIFT) && delete $self->{shft}) {	2049	if (!($mod & KMOD_SHIFT) && delete $self->{shft}) {
1764	$::CONN->user_send ("command fire_stop");	2050	$::CONN->user_send ("fire_stop");
1765	}	2051	}
1766	if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) {	2052	if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) {
1767	$::CONN->user_send ("command run_stop");	2053	$::CONN->user_send ("run_stop");
1768	}	2054	}
1769	}	2055	}
1770		2056
1771	#############################################################################	2057	#############################################################################
1772		2058
…		…
1836	sub toggle_flopper {	2122	sub toggle_flopper {
1837	my ($self) = @_;	2123	my ($self) = @_;
1838		2124
1839	# TODO: use animation	2125	# TODO: use animation
1840	if ($self->{state} = !$self->{state}) {	2126	if ($self->{state} = !$self->{state}) {
1841	$CFClient::UI::TOPLEVEL->add ($self->{other});	2127	$CFClient::UI::ROOT->add ($self->{other});
1842	$self->{other}->move (	2128	$self->{other}->move ($self->coord2global (0, $self->{h}));
1843	($::WIDTH - $self->{other}{w}) * 0.5,	2129	$self->emit ("open");
1844	($::HEIGHT - $self->{other}{h}) * 0.5,
1845	);
1846	} else {	2130	} else {
1847	$CFClient::UI::TOPLEVEL->remove ($self->{other});	2131	$CFClient::UI::ROOT->remove ($self->{other});
		2132	$self->emit ("close");
1848	}	2133	}
1849	}
1850		2134
1851	#############################################################################	2135	$self->emit (changed => $self->{state});
		2136	}
1852		2137
		2138	#############################################################################
		2139
1853	package CFClient::UI::Toplevel;	2140	package CFClient::UI::Root;
1854		2141
1855	our @ISA = CFClient::UI::Container::;	2142	our @ISA = CFClient::UI::Container::;
		2143
		2144	use SDL::OpenGL;
		2145
		2146	sub check_size {
		2147	my ($self) = @_;
		2148
		2149	$self->configure (0, 0, $::WITH, $::HEIGHT);
		2150	}
1856		2151
1857	sub size_request {	2152	sub size_request {
1858	($::WIDTH, $::HEIGHT)	2153	($::WIDTH, $::HEIGHT)
1859	}	2154	}
1860		2155
1861	sub size_allocate {	2156	sub configure {
1862	my ($self, $x, $y, $w, $h) = @_;	2157	my ($self, $x, $y, $w, $h) = @_;
1863		2158
1864	$self->_size_allocate ($x, $y, $w, $h);	2159	$self->SUPER::configure ($x, $y, $w, $h);
1865		2160
1866	$_->size_allocate ($_->{x}, $_->{y}, $_->size_request)	2161	$_->configure ($_->{x}, $_->{y}, $_->size_request)
1867	for @{$self->{children}};	2162	for @{$self->{children}};
1868	}	2163	}
1869		2164
1870	sub translate {	2165	sub _topleft {
1871	my ($self, $x, $y) = @_;	2166	my ($self, $x, $y) = @_;
1872		2167
1873	($x, $y)	2168	($x, $y)
1874	}	2169	}
1875		2170
1876	sub update {	2171	sub update {
1877	my ($self) = @_;	2172	my ($self) = @_;
1878		2173
1879	$self->size_allocate (0, 0, $::WIDTH, $::HEIGHT);	2174	$self->check_size;
1880	::refresh ();	2175	::refresh ();
1881	}	2176	}
1882		2177
1883	sub add {	2178	sub add {
1884	my ($self, $widget) = @_;	2179	my ($self, $child) = @_;
1885		2180
1886	$self->SUPER::add ($widget);	2181	$self->SUPER::add ($child);
		2182	}
1887		2183
1888	$widget->size_allocate ($widget->{x}, $widget->{y}, $widget->size_request);	2184	sub on_refresh {
		2185	my ($self, $id, $cb) = @_;
		2186
		2187	$self->{refresh_hook}{$id} = $cb;
1889	}	2188	}
1890		2189
1891	sub draw {	2190	sub draw {
1892	my ($self) = @_;	2191	my ($self) = @_;
1893		2192
		2193	while (my $rcb = delete $self->{refresh_hook}) {
		2194	$_->() for values %$rcb;
		2195	}
		2196
		2197	glViewport 0, 0, $::WIDTH, $::HEIGHT;
		2198	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
		2199	glClear GL_COLOR_BUFFER_BIT;
		2200
		2201	glMatrixMode GL_PROJECTION;
		2202	glLoadIdentity;
		2203	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000;
		2204	glMatrixMode GL_MODELVIEW;
		2205	glLoadIdentity;
		2206
1894	$self->_draw;	2207	$self->_draw;
1895	}	2208	}
1896		2209
1897	#############################################################################	2210	#############################################################################
1898		2211
1899	package CFClient::UI;	2212	package CFClient::UI;
1900		2213
1901	$TOPLEVEL = new CFClient::UI::Toplevel;	2214	$ROOT = new CFClient::UI::Root;
1902		2215
1903	1	2216	1
1904		2217

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.130 by root, Tue Apr 18 01:51:06 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.130 by root, Tue Apr 18 01:51:06 2006 UTC