ViewVC Help

View File | Revision Log | Show Annotations | Download File

/cvs/deliantra/Deliantra-Client/DC/UI.pm

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.76 by root, Tue Apr 11 21:24:09 2006 UTC vs.
Revision 1.126 by root, Mon Apr 17 20:59:20 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_down ($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;	66	$hover->update if $hover && $hover->{can_hover};
67	$HOVER->update if $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;
…		…
79	use SDL::OpenGL;	92	use SDL::OpenGL;
80		93
81	sub new {	94	sub new {
82	my $class = shift;	95	my $class = shift;
83		96
84	bless {	97	my $self = bless {
85	x => 0,	98	x => 0,
86	y => 0,	99	y => 0,
87	z => 0,	100	z => 0,
88	w => -1,	101	w => -1,
89	h => -1,	102	h => -1,
90	@_	103	@_
91	}, $class	104	}, $class;
		105
		106	for (keys %$self) {
		107	if (/^connect_(.*)$/) {
		108	$self->connect ($1 => delete $self->{$_});
		109	}
		110	}
		111
		112	$self
92	}	113	}
93		114
94	sub move {	115	sub move {
95	my ($self, $x, $y, $z) = @_;	116	my ($self, $x, $y, $z) = @_;
96	$self->{x} = $x;	117	$self->{x} = int $x;
97	$self->{y} = $y;	118	$self->{y} = int $y;
98	$self->{z} = $z if defined $z;	119	$self->{z} = $z if defined $z;
99	}	120	}
100		121
101	sub needs_redraw {	122	sub needs_redraw {
102	0	123	0
…		…
125	my ($self, $x, $y, $w, $h) = @_;	146	my ($self, $x, $y, $w, $h) = @_;
126		147
127	$self->_size_allocate ($x, $y, $w, $h);	148	$self->_size_allocate ($x, $y, $w, $h);
128	}	149	}
129		150
130	# translate global koordinates to local coordinate system	151	# return top left coordinates
131	sub translate {	152	sub _topleft {
132	my ($self, $x, $y) = @_;	153	my ($self, $x, $y) = @_;
133		154
134	$self->{parent}->translate ($x - $self->{x}, $y - $self->{y});	155	$self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y});
		156	}
		157
		158	# translate global coordinates to local coordinate system
		159	sub coord2local {
		160	my ($self, $x, $y) = @_;
		161
		162	my ($X, $Y) = $self->_topleft;
		163	($x - $X, $y - $Y)
		164	}
		165
		166	# translate local coordinates to global coordinate system
		167	sub coord2global {
		168	my ($self, $x, $y) = @_;
		169
		170	my ($X, $Y) = $self->_topleft;
		171	($x + $X, $y + $Y)
135	}	172	}
136		173
137	sub focus_in {	174	sub focus_in {
138	my ($self) = @_;	175	my ($self) = @_;
139		176
140	return if $FOCUS == $self;	177	return if $FOCUS == $self;
		178	return unless $self->{can_focus};
141		179
142	my $focus = $FOCUS; $FOCUS = $self;	180	my $focus = $FOCUS; $FOCUS = $self;
		181
		182	$self->emit (focus_in => $focus);
		183
143	$focus->update if $focus;	184	$focus->update if $focus;
144	$FOCUS->update;	185	$FOCUS->update;
145	}	186	}
146		187
147	sub focus_out {	188	sub focus_out {
148	my ($self) = @_;	189	my ($self) = @_;
149		190
150	return unless $FOCUS == $self;	191	return unless $FOCUS == $self;
151		192
152	my $focus = $FOCUS; undef $FOCUS;	193	my $focus = $FOCUS; undef $FOCUS;
		194
		195	$self->emit (focus_out => $focus);
		196
153	$focus->update if $focus; #?	197	$focus->update if $focus; #?
154	}	198	}
155		199
156	sub mouse_motion { }	200	sub mouse_motion { }
157	sub button_up { }	201	sub button_up { }
…		…
178	glPushMatrix;	222	glPushMatrix;
179	glTranslate $self->{x}, $self->{y}, 0;	223	glTranslate $self->{x}, $self->{y}, 0;
180	$self->_draw;	224	$self->_draw;
181	glPopMatrix;	225	glPopMatrix;
182		226
183	if ($self == $HOVER) {	227	if ($self == $HOVER && $self->{can_hover}) {
184	my ($x, $y) = @$self{qw(x y)};	228	my ($x, $y) = @$self{qw(x y)};
185		229
186	glColor 0, 0, 1, 0.2;	230	glColor 1, 0.8, 0.5, 0.2;
187	glEnable GL_BLEND;	231	glEnable GL_BLEND;
188	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	232	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
189	glBegin GL_QUADS;	233	glBegin GL_QUADS;
190	glVertex $x , $y;	234	glVertex $x , $y;
191	glVertex $x + $self->{w}, $y;	235	glVertex $x + $self->{w}, $y;
…		…
200	my ($self) = @_;	244	my ($self) = @_;
201		245
202	warn "no draw defined for $self\n";	246	warn "no draw defined for $self\n";
203	}	247	}
204		248
205	sub bbox {
206	my ($self) = @_;
207	my ($w, $h) = $self->size_request;
208	(
209	$self->{x},
210	$self->{y},
211	$self->{x} = $w,
212	$self->{y} = $h
213	)
214	}
215
216	sub find_widget {	249	sub find_widget {
217	my ($self, $x, $y) = @_;	250	my ($self, $x, $y) = @_;
218		251
219	return $self	252	return $self
220	if $x >= $self->{x} && $x < $self->{x} + $self->{w}	253	if $x >= $self->{x} && $x < $self->{x} + $self->{w}
221	&& $y >= $self->{y} && $y < $self->{y} + $self->{h};	254	&& $y >= $self->{y} && $y < $self->{y} + $self->{h};
222		255
223	()	256	()
224	}	257	}
225		258
226	sub del_parent { $_[0]->{parent} = undef }
227
228	sub set_parent {	259	sub set_parent {
229	my ($self, $par) = @_;	260	my ($self, $parent) = @_;
230		261
231	$self->{parent} = $par;
232	Scalar::Util::weaken $self->{parent};	262	Scalar::Util::weaken ($self->{parent} = $parent);
233	}	263	}
234		264
235	sub get_parent {	265	sub check_size {
236	$_[0]->{parent}	266	my ($self) = @_;
		267
		268	my ($w, $h) = $self->size_request;
		269
		270	if ($w != $self->{req_w} || $h != $self->{req_h}) {
		271	$self->{req_w} = $w;
		272	$self->{req_h} = $h;
		273
		274	$self->{parent}->check_size
		275	if $self->{parent};
		276	}
237	}	277	}
238		278
239	sub update {	279	sub update {
240	my ($self) = @_;	280	my ($self) = @_;
241		281
…		…
276		316
277	# range [value, low, high, page]	317	# range [value, low, high, page]
278		318
279	$class->SUPER::new (	319	$class->SUPER::new (
280	bg => [0, 0, 0, 0.2],	320	bg => [0, 0, 0, 0.2],
281	active_bg => [1, 1, 1],	321	active_bg => [1, 1, 1, 0.5],
282	@_	322	@_
283	)	323	)
284	}	324	}
285		325
286	sub _draw {	326	sub _draw {
…		…
330		370
331	$self	371	$self
332	}	372	}
333		373
334	sub add {	374	sub add {
335	my ($self, $chld, $expand) = @_;	375	my ($self, $child) = @_;
336		376
337	$chld->{expand} = $expand;
338	$chld->set_parent ($self);	377	$child->set_parent ($self);
		378
		379	use sort 'stable';
339		380
340	$self->{children} = [	381	$self->{children} = [
341	sort { $a->{z} <=> $b->{z} }	382	sort { $a->{z} <=> $b->{z} }
342	@{$self->{children}}, $chld	383	@{$self->{children}}, $child
343	];	384	];
344		385
345	$self->{w} = $self->{h} = -1;	386	$self->{w} = $self->{h} = -1;
346	$self->update;	387
		388	$child->check_size;
347	}	389	}
348		390
349	sub remove {	391	sub remove {
350	my ($self, $widget) = @_;	392	my ($self, $widget) = @_;
351		393
352	$self->{children} = [ grep $_ != $widget, @{ $self->{children} } ];	394	$self->{children} = [ grep $_ != $widget, @{ $self->{children} } ];
353		395
354	$self->size_allocate (0, 0, $self->{w}, $self->{h});	396	$self->check_size;
355	}	397	}
356		398
357	sub find_widget {	399	sub find_widget {
358	my ($self, $x, $y) = @_;	400	my ($self, $x, $y) = @_;
359		401
…		…
444	}	486	}
445		487
446	sub render_chld {	488	sub render_chld {
447	my ($self) = @_;	489	my ($self) = @_;
448		490
449	$self->{texture} =	491	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
450	CFClient::Texture->new_from_opengl (	492	glClearColor 0, 0, 0, 1;
451	$self->{w}, $self->{h}, sub { $self->child->draw }	493	glClear GL_COLOR_BUFFER_BIT;
452	);	494	$self->child->draw;
		495	};
453	}	496	}
454		497
455	sub size_allocate {	498	sub size_allocate {
456	my ($self, $x, $y, $w, $h) = @_;	499	my ($self, $x, $y, $w, $h) = @_;
457		500
…		…
478	$tex->draw_quad (0, 0, $w, $h);	521	$tex->draw_quad (0, 0, $w, $h);
479		522
480	glDisable GL_BLEND;	523	glDisable GL_BLEND;
481	glDisable GL_TEXTURE_2D;	524	glDisable GL_TEXTURE_2D;
482	}	525	}
		526
		527	#############################################################################
		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 size_allocate {
		545	my ($self, $x, $y, $w, $h) = @_;
		546
		547	$self->_size_allocate ($x, $y, $w, $h) or return;
		548	}
		549
		550	sub _draw {
		551	my ($self) = @_;
		552
		553	$self->{children}[1]->draw;
		554	}
		555
483		556
484	#############################################################################	557	#############################################################################
485		558
486	package CFClient::UI::Frame;	559	package CFClient::UI::Frame;
487		560
…		…
535		608
536	my @tex =	609	my @tex =
537	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }	610	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
538	qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);	611	qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
539		612
		613	sub new {
		614	my $class = shift;
		615
		616	# TODO: user_x, user_y, overwrite moveto?
		617
		618	$class->SUPER::new (
		619	bg => [1, 1, 1, 1],
		620	border_bg => [1, 1, 1, 1],
		621	border => int $::FONTSIZE * 0.8,
		622	@_
		623	)
		624	}
		625
540	sub size_request {	626	sub size_request {
541	my ($self) = @_;	627	my ($self) = @_;
542		628
		629	return ($self->{user_w}, $self->{user_h}) if $self->{user_w} && $self->{user_h};
		630
543	my ($w, $h) = $self->SUPER::size_request;	631	my ($w, $h) = $self->SUPER::size_request;
544		632
545	$h += $tex[1]->{h};	633	(
546	$h += $tex[4]->{h};	634	$w + $self->{border} * 2,
547	$w += $tex[2]->{w};	635	$h + $self->{border} * 2,
548	$w += $tex[3]->{w};	636	)
549
550	($w, $h)
551	}	637	}
552		638
553	sub size_allocate {	639	sub size_allocate {
554	my ($self, $x, $y, $w, $h) = @_;	640	my ($self, $x, $y, $w, $h) = @_;
555		641
556	$self->_size_allocate ($x, $y, $w, $h) or return;	642	$self->_size_allocate ($x, $y, $w, $h) or return;
557		643
558	$h -= $tex[1]->{h};	644	$h -= List::Util::max 0, $self->{border} * 2;
559	$h -= $tex[4]->{h};	645	$w -= List::Util::max 0, $self->{border} * 2;
560	$w -= $tex[2]->{w};
561	$w -= $tex[3]->{w};
562		646
563	$h = $h < 0 ? 0 : $h;	647	$self->child->size_allocate ($self->{border}, $self->{border}, $w, $h);
564	$w = $w < 0 ? 0 : $w;	648	}
565		649
566	my $child = $self->child;	650	sub button_down {
		651	my ($self, $ev, $x, $y) = @_;
567		652
568	$child->size_allocate ($tex[3]->{w}, $tex[1]->{h}, $w, $h);	653	if ($x < $self->{w} && $x >= $self->{w} - $self->{border}
		654	&& $y < $self->{h} && $y >= $self->{h} - $self->{border}) {
		655
		656	my ($ox, $oy) = ($ev->button_x, $ev->button_y);
		657	my ($bw, $bh) = ($self->{w}, $self->{h});
		658
		659	$self->{motion} = sub {
		660	my ($ev, $x, $y) = @_;
		661
		662	($x, $y) = ($ev->motion_x, $ev->motion_y);
		663
		664	$self->{user_w} = $bw + $x - $ox;
		665	$self->{user_h} = $bh + $y - $oy;
		666	$self->update;
		667	};
		668
		669	} elsif ($x >= 0 && $x < $self->{w}
		670	&& $y >= 0 && $y < $self->{border}) {
		671
		672	my ($ox, $oy) = ($ev->button_x, $ev->button_y);
		673	my ($bx, $by) = ($self->{x}, $self->{y});
		674
		675	$self->{motion} = sub {
		676	my ($ev, $x, $y) = @_;
		677
		678	($x, $y) = ($ev->motion_x, $ev->motion_y);
		679
		680	$self->move ($bx + $x - $ox, $by + $y - $oy);
		681	$self->update;
		682	};
		683	}
		684	}
		685
		686	sub button_up {
		687	my ($self, $ev, $x, $y) = @_;
		688
		689	delete $self->{motion};
		690	}
		691
		692	sub mouse_motion {
		693	my ($self, $ev, $x, $y) = @_;
		694
		695	$self->{motion}->($ev, $x, $y) if $self->{motion};
569	}	696	}
570		697
571	sub _draw {	698	sub _draw {
572	my ($self) = @_;	699	my ($self) = @_;
573		700
574	my ($w, $h) = ($self->{w}, $self->{h});	701	my ($w, $h ) = ($self->{w}, $self->{h});
575	my ($cw, $ch) = ($self->child->{w}, $self->child->{h});	702	my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
576		703
577	glEnable GL_BLEND;	704	glEnable GL_BLEND;
578	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	705	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
579	glEnable GL_TEXTURE_2D;	706	glEnable GL_TEXTURE_2D;
580	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	707	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
581		708
582	my $top = $tex[1];	709	glColor @{ $self->{border_bg} };
583	$top->draw_quad (0, 0, $w, $top->{h});	710	$tex[1]->draw_quad (0, 0, $w, $self->{border});
584		711	$tex[3]->draw_quad (0, $self->{border}, $self->{border}, $ch);
585	my $left = $tex[3];	712	$tex[2]->draw_quad ($w - $self->{border}, $self->{border}, $self->{border}, $ch);
586	$left->draw_quad (0, $top->{h}, $left->{w}, $ch);	713	$tex[4]->draw_quad (0, $h - $self->{border}, $w, $self->{border});
587
588	my $right = $tex[2];
589	$right->draw_quad ($w - $right->{w}, $top->{h}, $right->{w}, $ch);
590
591	my $bottom = $tex[4];
592	$bottom->draw_quad (0, $h - $bottom->{h}, $w, $bottom->{h});
593		714
594	my $bg = $tex[0];	715	my $bg = $tex[0];
595		716
596	glBindTexture GL_TEXTURE_2D, $bg->{name};	717	# TODO: repeat texture not scale
597	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
598	glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT;
599	glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT;
600
601	my $rep_x = $cw / $bg->{w};	718	my $rep_x = $cw / $bg->{w};
602	my $rep_y = $ch / $bg->{h};	719	my $rep_y = $ch / $bg->{h};
603		720
		721	glColor @{ $self->{bg} };
		722
		723	$bg->{s} = $rep_x;
		724	$bg->{t} = $rep_y;
		725	$bg->{wrap_mode} = 1;
604	$bg->draw_quad ($left->{w}, $top->{h}, $cw, $ch);	726	$bg->draw_quad ($self->{border}, $self->{border}, $cw, $ch);
605		727
606	glDisable GL_TEXTURE_2D;	728	glDisable GL_TEXTURE_2D;
607	glDisable GL_BLEND;	729	glDisable GL_BLEND;
608		730
609	$self->child->draw;	731	$self->child->draw;
610
611	}	732	}
612		733
613	#############################################################################	734	#############################################################################
614		735
615	package CFClient::UI::Table;	736	package CFClient::UI::Table;
…		…
618		739
619	use List::Util qw(max sum);	740	use List::Util qw(max sum);
620		741
621	use SDL::OpenGL;	742	use SDL::OpenGL;
622		743
		744	sub new {
		745	my $class = shift;
		746
		747	$class->SUPER::new (
		748	col_expand => [],
		749	@_
		750	)
		751	}
		752
623	sub add {	753	sub add {
624	my ($self, $x, $y, $chld) = @_;	754	my ($self, $x, $y, $child) = @_;
625		755
		756	$child->set_parent ($self);
626	$self->{children}[$y][$x] = $chld;	757	$self->{children}[$y][$x] = $child;
627	$chld->set_parent ($self);
628		758
629	$self->{w} = $self->{h} = -1;	759	$self->{w} = $self->{h} = -1;
		760
		761	$child->check_size;
		762	}
		763
		764	# TODO: move to container class maybe? send childs a signal on removal?
		765	sub clear {
		766	my ($self) = @_;
		767
		768	delete $self->{children};
630	$self->update;	769	$self->update;
631	}	770	}
632		771
633	sub get_wh {	772	sub get_wh {
634	my ($self) = @_;	773	my ($self) = @_;
…		…
656	my ($self) = @_;	795	my ($self) = @_;
657		796
658	my ($ws, $hs) = $self->get_wh;	797	my ($ws, $hs) = $self->get_wh;
659		798
660	(	799	(
661	(List::Util::sum @$ws),	800	(sum @$ws),
662	(List::Util::sum @$hs),	801	(sum @$hs),
663	)	802	)
664	}	803	}
665		804
666	sub size_allocate {	805	sub size_allocate {
667	my ($self, $x, $y, $w, $h) = @_;	806	my ($self, $x, $y, $w, $h) = @_;
668		807
669	$self->_size_allocate ($x, $y, $w, $h) or return;	808	$self->_size_allocate ($x, $y, $w, $h) or return;
670		809
671	my ($ws, $hs) = $self->get_wh;	810	my ($ws, $hs) = $self->get_wh;
672		811
673	my $req_w = List::Util::sum @$ws;	812	my $req_w = sum @$ws;
674	my $req_h = List::Util::sum @$hs;	813	my $req_h = sum @$hs;
		814
		815	# TODO: nicer code && do row_expand
		816	my @col_expand = @{$self->{col_expand}};
		817	@col_expand = (1) x @$ws unless @col_expand;
		818	my $col_expand = (sum @col_expand) || 1;
675		819
676	# linearly scale sizes	820	# linearly scale sizes
677	$_ *= $req_w / $w for @$ws;	821	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
678	$_ *= $req_h / $h for @$hs;	822	$hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
		823
		824	CFClient::UI::harmonize $ws;
		825	CFClient::UI::harmonize $hs;
679		826
680	my $y;	827	my $y;
681		828
682	for my $r (0 .. $#{$self->{children}}) {	829	for my $r (0 .. $#{$self->{children}}) {
683	my $row = $self->{children}[$r]	830	my $row = $self->{children}[$r]
…		…
685		832
686	my $x = 0;	833	my $x = 0;
687	my $row_h = $hs->[$r];	834	my $row_h = $hs->[$r];
688		835
689	for my $c (0 .. $#$row) {	836	for my $c (0 .. $#$row) {
690	my $widget = $row->[$c]
691	or next;
692
693	my $col_w = $ws->[$c];	837	my $col_w = $ws->[$c];
694		838
		839	if (my $widget = $row->[$c]) {
695	$widget->size_allocate ($x, $y, $col_w, $row_h);	840	$widget->size_allocate ($x, $y, $col_w, $row_h);
		841	}
696		842
697	$x += $col_w;	843	$x += $col_w;
698	}	844	}
699		845
700	$y += $row_h;	846	$y += $row_h;
…		…
748	sub size_allocate {	894	sub size_allocate {
749	my ($self, $x, $y, $w, $h) = @_;	895	my ($self, $x, $y, $w, $h) = @_;
750		896
751	$self->_size_allocate ($x, $y, $w, $h) or return;	897	$self->_size_allocate ($x, $y, $w, $h) or return;
752		898
753	return unless $self->{w};
754
755	($h, $w) = ($w, $h);	899	($h, $w) = ($w, $h);
756		900
757	my $children = $self->{children};	901	my $children = $self->{children};
758		902
759	my @h = map +($_->size_request)[0], @$children;	903	my @h = map +($_->size_request)[0], @$children;
760		904
761	my $req_h = List::Util::sum @h;	905	my $req_h = List::Util::sum @h;
762		906
763	if ($req_h > $h) {	907	if ($req_h > $h) {
764	# ah well, not enough space	908	# ah well, not enough space
765	$_ = $h[$_] * $h / $req_h for @h;	909	$_ *= $h / $req_h for @h;
766	} else {	910	} else {
767	my @exp = grep $_->{expand}, @$children;	911	my $exp = List::Util::sum map $_->{expand}, @$children;
768	@exp = @$children unless @exp;	912	$exp ||= 1;
769		913
770	my %exp = map +($_ => 1), @exp;
771
772	for (0 .. $#$children) {	914	for (0 .. $#$children) {
773	my $child = $children->[$_];	915	my $child = $children->[$_];
774		916
775	my $alloc_h = $h[$_];	917	my $alloc_h = $h[$_];
776	$alloc_h += ($h - $req_h) / @exp if $exp{$child};	918	$alloc_h += ($h - $req_h) * $child->{expand} / $exp;
777	$h[$_] = $alloc_h;	919	$h[$_] = $alloc_h;
778	}	920	}
779	}	921	}
		922
		923	CFClient::UI::harmonize \@h;
780		924
781	my $y = 0;	925	my $y = 0;
782	for (0 .. $#$children) {	926	for (0 .. $#$children) {
783	my $child = $children->[$_];	927	my $child = $children->[$_];
784	my $h = $h[$_];	928	my $h = $h[$_];
785	$child->size_allocate ($y, 0, $h, $w);	929	$child->size_allocate ($y, 0, $h, $w);
786		930
787	$y += $h;	931	$y += $h;
788	}	932	}
		933
		934	1
789	}	935	}
790		936
791	#############################################################################	937	#############################################################################
792		938
793	package CFClient::UI::VBox;	939	package CFClient::UI::VBox;
…		…
810	sub size_allocate {	956	sub size_allocate {
811	my ($self, $x, $y, $w, $h) = @_;	957	my ($self, $x, $y, $w, $h) = @_;
812		958
813	$self->_size_allocate ($x, $y, $w, $h) or return;	959	$self->_size_allocate ($x, $y, $w, $h) or return;
814		960
815	return unless $self->{h};
816
817	my $children = $self->{children};	961	my $children = $self->{children};
818		962
819	my @h = map +($_->size_request)[1], @$children;	963	my @h = map +($_->size_request)[1], @$children;
820		964
821	my $req_h = List::Util::sum @h;	965	my $req_h = List::Util::sum @h;
822		966
823	if ($req_h > $h) {	967	if ($req_h > $h) {
824	# ah well, not enough space	968	# ah well, not enough space
825	$_ = $h[$_] * $h / $req_h for @h;	969	$_ *= $h / $req_h for @h;
826	} else {	970	} else {
827	my @exp = grep $_->{expand}, @$children;	971	my $exp = List::Util::sum map $_->{expand}, @$children;
828	@exp = @$children unless @exp;	972	$exp ||= 1;
829		973
830	my %exp = map +($_ => 1), @exp;
831
832	for (0 .. $#$children) {	974	for (0 .. $#$children) {
833	my $child = $children->[$_];	975	my $child = $children->[$_];
834		976
835	my $alloc_h = $h[$_];	977	$h[$_] += ($h - $req_h) * $child->{expand} / $exp;
836	$alloc_h += ($h - $req_h) / @exp if $exp{$child};
837	$h[$_] = $alloc_h;
838	}	978	}
839	}	979	}
		980
		981	CFClient::UI::harmonize \@h;
840		982
841	my $y = 0;	983	my $y = 0;
842	for (0 .. $#$children) {	984	for (0 .. $#$children) {
843	my $child = $children->[$_];	985	my $child = $children->[$_];
844	my $h = $h[$_];	986	my $h = $h[$_];
845	$child->size_allocate (0, $y, $w, $h);	987	$child->size_allocate (0, $y, $w, $h);
846		988
847	$y += $h;	989	$y += $h;
848	}	990	}
		991
		992	1
849	}	993	}
850		994
851	#############################################################################	995	#############################################################################
852		996
853	package CFClient::UI::Label;	997	package CFClient::UI::Label;
…		…
858		1002
859	sub new {	1003	sub new {
860	my ($class, %arg) = @_;	1004	my ($class, %arg) = @_;
861		1005
862	my $self = $class->SUPER::new (	1006	my $self = $class->SUPER::new (
863	fg => [1, 1, 1],	1007	fg => [1, 1, 1],
864	height => $::FONTSIZE,	1008	fontsize => $::FONTSIZE,
865	text => "",	1009	text => "",
866	align => -1,	1010	align => -1,
		1011	valign => -1,
867	padding => 2,	1012	padding => 2,
868	layout => new CFClient::Layout,	1013	layout => new CFClient::Layout,
869	%arg	1014	%arg
870	);	1015	);
871		1016
872	$self->set_text ($self->{text});	1017	$self->{xxx}++ if $self->{text} eq "Client Setup" && $self->{align};#d#
		1018
		1019	$self->set_text (delete $self->{text}) if exists $self->{text};
		1020	$self->set_markup (delete $self->{markup}) if exists $self->{markup};
873		1021
874	$self	1022	$self
875	}	1023	}
876		1024
877	sub escape_text {	1025	sub escape_text {
…		…
885	}	1033	}
886		1034
887	sub set_text {	1035	sub set_text {
888	my ($self, $text) = @_;	1036	my ($self, $text) = @_;
889		1037
890	$self->{text} = $text;
891	$self->{layout}->set_markup ($text);	1038	$self->{layout}->set_text ($text);
892		1039
893	delete $self->{texture};	1040	delete $self->{texture};
894	$self->update;	1041	$self->update;
895	}	1042	}
896		1043
897	sub get_text {	1044	sub set_markup {
898	my ($self, $text) = @_;	1045	my ($self, $markup) = @_;
899		1046
900	$self->{text}	1047	$self->{layout}->set_markup ($markup);
		1048
		1049	delete $self->{texture};
		1050	$self->update;
901	}	1051	}
902		1052
903	sub size_request {	1053	sub size_request {
904	my ($self) = @_;	1054	my ($self) = @_;
905		1055
906	$self->{layout}->set_width;	1056	$self->{layout}->set_width;
907	$self->{layout}->set_height ($self->{height});	1057	$self->{layout}->set_height ($self->{fontsize});
		1058
908	my ($w, $h) = $self->{layout}->size;	1059	my ($w, $h) = $self->{layout}->size;
909		1060
910	(	1061	(
911	$w + $self->{padding} * 2,	1062	$w + $self->{padding} * 2,
912	$h + $self->{padding} * 2,	1063	$h + $self->{padding} * 2,
…		…
931	sub _draw {	1082	sub _draw {
932	my ($self) = @_;	1083	my ($self) = @_;
933		1084
934	my $tex = $self->{texture} ||= do {	1085	my $tex = $self->{texture} ||= do {
935	$self->{layout}->set_width ($self->{w});	1086	$self->{layout}->set_width ($self->{w});
		1087	$self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize});
936	new_from_layout CFClient::Texture $self->{layout}	1088	new_from_layout CFClient::Texture $self->{layout}
937	};	1089	};
938		1090
939	glEnable GL_BLEND;	1091	glEnable GL_BLEND;
940	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	1092	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
941	glEnable GL_TEXTURE_2D;	1093	glEnable GL_TEXTURE_2D;
942	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	1094	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
943		1095
944	glColor @{$self->{fg}};	1096	glColor @{$self->{fg}};
945		1097
946	my $x =	1098	$self->{ox} = int (
947	$self->{align} < 0 ? $self->{padding}	1099	$self->{align} < 0 ? $self->{padding}
948	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}	1100	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
949	: ($self->{w} - $tex->{w}) * 0.5;	1101	: ($self->{w} - $tex->{w}) * 0.5
		1102	);
950		1103
951	$tex->draw_quad ($x, 0);	1104	$self->{oy} = int (
		1105	$self->{valign} < 0 ? $self->{padding}
		1106	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
		1107	: ($self->{h} - $tex->{h}) * 0.5
		1108	);
		1109
		1110	$tex->draw_quad ($self->{ox}, $self->{oy});
952		1111
953	glDisable GL_TEXTURE_2D;	1112	glDisable GL_TEXTURE_2D;
954	glDisable GL_BLEND;	1113	glDisable GL_BLEND;
955	}	1114	}
956		1115
957	#############################################################################	1116	#############################################################################
958		1117
959	package CFClient::UI::Entry;	1118	package CFClient::UI::EntryBase;
960		1119
961	our @ISA = CFClient::UI::Label::;	1120	our @ISA = CFClient::UI::Label::;
962		1121
963	use SDL;	1122	use SDL;
964	use SDL::OpenGL;	1123	use SDL::OpenGL;
…		…
967	my $class = shift;	1126	my $class = shift;
968		1127
969	$class->SUPER::new (	1128	$class->SUPER::new (
970	fg => [1, 1, 1],	1129	fg => [1, 1, 1],
971	bg => [0, 0, 0, 0.2],	1130	bg => [0, 0, 0, 0.2],
972	active_bg => [1, 1, 1],	1131	active_bg => [1, 1, 1, 0.5],
973	active_fg => [0, 0, 0],	1132	active_fg => [0, 0, 0],
		1133	can_hover => 1,
		1134	can_focus => 1,
		1135	valign => 0,
974	@_	1136	@_
975	)	1137	)
976	}	1138	}
977		1139
978	sub _set_text {	1140	sub _set_text {
979	my ($self, $text) = @_;	1141	my ($self, $text) = @_;
980		1142
		1143	delete $self->{cur_h};
		1144
		1145	return if $self->{text} eq $text;
		1146
981	$self->{last_activity} = $::NOW;	1147	$self->{last_activity} = $::NOW;
982
983	$self->{text} = $text;	1148	$self->{text} = $text;
984	$self->{layout}->set_width ($self->{w});
985		1149
986	$text =~ s/./*/g if $self->{hidden};	1150	$text =~ s/./*/g if $self->{hidden};
		1151	$self->{layout}->set_text ("$text ");
987		1152
988	$self->{layout}->set_markup ($self->escape_text ($text) . " ");	1153	$self->emit (changed => $self->{text});
		1154	}
989		1155
990	$text = substr $text, 0, $self->{cursor};	1156	sub get_text {
991	utf8::encode $text;	1157	$_[0]{text}
992
993	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text);
994	}	1158	}
995		1159
996	sub size_request {	1160	sub size_request {
997	my ($self) = @_;	1161	my ($self) = @_;
998		1162
…		…
1002	}	1166	}
1003		1167
1004	sub size_allocate {	1168	sub size_allocate {
1005	my ($self, $x, $y, $w, $h) = @_;	1169	my ($self, $x, $y, $w, $h) = @_;
1006		1170
1007	$self->SUPER::size_allocate ($x, $y, $w, $h);	1171	$self->SUPER::size_allocate ($x, $y, $w, $h) or return;
1008		1172
1009	$self->_set_text ($self->{text});	1173	$self->_set_text ($self->{text});
1010	}	1174	}
1011		1175
1012	sub set_text {	1176	sub set_text {
…		…
1037	++$self->{cursor} if $self->{cursor} < length $self->{text};	1201	++$self->{cursor} if $self->{cursor} < length $self->{text};
1038	} elsif ($sym == SDLK_HOME) {	1202	} elsif ($sym == SDLK_HOME) {
1039	$self->{cursor} = 0;	1203	$self->{cursor} = 0;
1040	} elsif ($sym == SDLK_END) {	1204	} elsif ($sym == SDLK_END) {
1041	$self->{cursor} = length $text;	1205	$self->{cursor} = length $text;
		1206	} elsif ($sym == SDLK_ESCAPE) {
		1207	$self->emit ('escape');
1042	} elsif ($uni) {	1208	} elsif ($uni) {
1043	substr $text, $self->{cursor}++, 0, chr $uni;	1209	substr $text, $self->{cursor}++, 0, chr $uni;
1044	}	1210	}
1045		1211
1046	$self->_set_text ($text);	1212	$self->_set_text ($text);
…		…
1100		1266
1101	$self->SUPER::_draw;	1267	$self->SUPER::_draw;
1102		1268
1103	#TODO: force update every cursor change :(	1269	#TODO: force update every cursor change :(
1104	if ($FOCUS == $self && (($::NOW - $self->{last_activity}) & 1023) < 600) {	1270	if ($FOCUS == $self && (($::NOW - $self->{last_activity}) & 1023) < 600) {
		1271
		1272	unless (exists $self->{cur_h}) {
		1273	my $text = substr $self->{text}, 0, $self->{cursor};
		1274	utf8::encode $text;
		1275
		1276	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
		1277	}
		1278
1105	glColor @{$self->{fg}};	1279	glColor @{$self->{fg}};
1106	glBegin GL_LINES;	1280	glBegin GL_LINES;
1107	glVertex $self->{cur_x}, $self->{cur_y};
1108	glVertex $self->{cur_x}, $self->{cur_y} + $self->{cur_h};	1281	glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};
		1282	glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1109	glEnd;	1283	glEnd;
1110	}	1284	}
1111	}	1285	}
1112		1286
1113	#############################################################################
1114
1115	package CFClient::UI::Slider;	1287	package CFClient::UI::Entry;
1116		1288
1117	use strict;	1289	our @ISA = CFClient::UI::EntryBase::;
1118		1290
		1291	use SDL;
1119	use SDL::OpenGL;	1292	use SDL::OpenGL;
1120		1293
		1294	sub key_down {
		1295	my ($self, $ev) = @_;
		1296
		1297	my $sym = $ev->key_sym;
		1298
		1299	if ($sym == SDLK_RETURN) {
		1300	$self->emit (activate => $self->get_text);
		1301	$self->update;
		1302
		1303	} else {
		1304	$self->SUPER::key_down ($ev);
		1305	}
		1306
		1307	}
		1308
		1309	#############################################################################
		1310
		1311	package CFClient::UI::Button;
		1312
1121	our @ISA = CFClient::UI::DrawBG::;	1313	our @ISA = CFClient::UI::Label::;
		1314
		1315	use SDL;
		1316	use SDL::OpenGL;
		1317
		1318	my @tex =
		1319	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
		1320	qw(b1_button_active.png);
1122		1321
1123	sub new {	1322	sub new {
1124	my $class = shift;	1323	my $class = shift;
1125		1324
		1325	$class->SUPER::new (
		1326	padding => 4,
		1327	fg => [1, 1, 1],
		1328	bg => [1, 1, 1, 0.2],
		1329	active_fg => [0, 0, 1],
		1330	can_hover => 1,
		1331	align => 0,
		1332	valign => 0,
		1333	@_
		1334	)
		1335	}
		1336
		1337	sub button_up {
		1338	my ($self, $ev, $x, $y) = @_;
		1339
		1340	if ($x >= 0 && $x < $self->{w}
		1341	&& $y >= 0 && $y < $self->{h}) {
		1342	$self->emit ("activate");
		1343	}
		1344	}
		1345
		1346	sub _draw {
		1347	my ($self) = @_;
		1348
		1349	local $self->{fg} = $self->{fg};
		1350
		1351	if ($GRAB == $self) {
		1352	$self->{fg} = $self->{active_fg};
		1353	}
		1354
		1355	glEnable GL_BLEND;
		1356	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
		1357	glEnable GL_TEXTURE_2D;
		1358	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		1359	glColor 0, 0, 0, 1;
		1360
		1361	$tex[0]->draw_quad (0, 0, $self->{w}, $self->{h});
		1362
		1363	glDisable GL_TEXTURE_2D;
		1364	glDisable GL_BLEND;
		1365
		1366	$self->SUPER::_draw;
		1367	}
		1368
		1369	#############################################################################
		1370
		1371	package CFClient::UI::CheckBox;
		1372
		1373	our @ISA = CFClient::UI::DrawBG::;
		1374
		1375	my @tex =
		1376	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
		1377	qw(c1_checkbox_bg.png c1_checkbox_active.png);
		1378
		1379	use SDL;
		1380	use SDL::OpenGL;
		1381
		1382	sub new {
		1383	my $class = shift;
		1384
		1385	$class->SUPER::new (
		1386	padding => 2,
		1387	fg => [1, 1, 1],
		1388	active_fg => [1, 1, 0],
		1389	state => 0,
		1390	can_hover => 1,
		1391	@_
		1392	)
		1393	}
		1394
		1395	sub size_request {
		1396	my ($self) = @_;
		1397
		1398	($self->{padding} * 2 + 6) x 2
		1399	}
		1400
		1401	sub size_allocate {
		1402	my ($self, $x, $y, $w, $h) = @_;
		1403
		1404	$self->_size_allocate ($x, $y, $w, $h) or return;
		1405	}
		1406
		1407	sub button_down {
		1408	my ($self, $ev, $x, $y) = @_;
		1409
		1410	if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}
		1411	&& $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {
		1412	$self->{state} = !$self->{state};
		1413	$self->emit (changed => $self->{state});
		1414	}
		1415	}
		1416
		1417	sub _draw {
		1418	my ($self) = @_;
		1419
		1420	$self->SUPER::_draw;
		1421
		1422	glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0;
		1423
		1424	my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;
		1425
		1426	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
		1427
		1428	glEnable GL_BLEND;
		1429	glEnable GL_TEXTURE_2D;
		1430	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
		1431
		1432	my $tex = $self->{state} ? $tex[1] : $tex[0];
		1433
		1434	$tex->draw_quad (0, 0, $s, $s);
		1435
		1436	glDisable GL_TEXTURE_2D;
		1437	glDisable GL_BLEND;
		1438	}
		1439
		1440	#############################################################################
		1441
		1442	package CFClient::UI::VGauge;
		1443
		1444	our @ISA = CFClient::UI::Base::;
		1445
		1446	use SDL::OpenGL;
		1447
		1448	my %tex = (
		1449	food => [
		1450	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
		1451	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
		1452	],
		1453	grace => [
		1454	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
		1455	qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png/
		1456	],
		1457	hp => [
		1458	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
		1459	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
		1460	],
		1461	mana => [
		1462	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
		1463	qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png/
		1464	],
		1465	);
		1466
		1467	# eg. VGauge->new (gauge => 'food'), default gauge: food
		1468	sub new {
		1469	my $class = shift;
		1470
		1471	my $self = $class->SUPER::new (gauge => 'food', @_);
		1472
		1473	$self
		1474	}
		1475
		1476	sub size_request {
		1477	my ($self) = @_;
		1478
		1479	(30, 100)
		1480	}
		1481
		1482	sub set_max {
		1483	my ($self, $max) = @_;
		1484	$self->{max_val} = $max;
		1485	}
		1486
		1487	sub set_value {
		1488	my ($self, $val, $max) = @_;
		1489
		1490	$self->set_max ($max)
		1491	if defined $max;
		1492
		1493	$max = $self->{max_val};
		1494	$self->{val} = $val;
		1495
		1496	$self->update;
		1497	}
		1498
		1499	sub _draw {
		1500	my ($self) = @_;
		1501
		1502	my $tex = $tex{$self->{gauge}};
		1503
		1504	my ($w, $h) = ($self->{w}, $self->{h});
		1505
		1506	my $ycut = $self->{val} / ($self->{max_val} || 1);
		1507	$ycut = 1 if $self->{val} > $self->{max_val};
		1508
		1509	my $t1 = $tex->[0];
		1510	my $t2 = $tex->[1];
		1511
		1512	glEnable GL_BLEND;
		1513	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
		1514	glEnable GL_TEXTURE_2D;
		1515	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		1516
		1517	my $h1 = $self->{h} - $ycut * $self->{h};
		1518	my $h2 = $ycut * $self->{h};
		1519
		1520	my $yp = 0;
		1521
		1522	glBindTexture (GL_TEXTURE_2D, $t1->{name});
		1523	glBegin (GL_QUADS);
		1524	glTexCoord (0, 0); glVertex (0 , $yp);
		1525	glTexCoord (0, (1 - $ycut)); glVertex (0 , $yp + $h1);
		1526	glTexCoord (1, (1 - $ycut)); glVertex (0 + $w, $yp + $h1);
		1527	glTexCoord (1, 0); glVertex (0 + $w, $yp);
		1528	glEnd ();
		1529
		1530	$yp += $h1;
		1531
		1532	glBindTexture (GL_TEXTURE_2D, $t2->{name});
		1533	glBegin (GL_QUADS);
		1534	glTexCoord (0, (1 - $ycut)); glVertex (0 , $yp);
		1535	glTexCoord (0, 1); glVertex (0 , $yp + $h2);
		1536	glTexCoord (1, 1); glVertex (0 + $w, $yp + $h2);
		1537	glTexCoord (1, (1 - $ycut)); glVertex (0 + $w, $yp);
		1538	glEnd ();
		1539
		1540	glDisable GL_BLEND;
		1541	glDisable GL_TEXTURE_2D;
		1542	}
		1543
		1544	#############################################################################
		1545
		1546	package CFClient::UI::Slider;
		1547
		1548	use strict;
		1549
		1550	use SDL::OpenGL;
		1551
		1552	our @ISA = CFClient::UI::DrawBG::;
		1553
		1554	my @tex =
		1555	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
		1556	qw(s1_slider.png s1_slider_bg.png);
		1557
		1558	sub new {
		1559	my $class = shift;
		1560
1126	# range [value, low, high, page]	1561	# range [value, low, high, page]
1127		1562
		1563	# TODO: 0-width page
		1564	# TODO: req_w/h are wrong with vertical
		1565	# TODO: calculations are off
1128	my $self = $class->SUPER::new (	1566	my $self = $class->SUPER::new (
1129	fg => [1, 1, 1],	1567	fg => [1, 1, 1],
1130	active_fg => [0, 0, 0],	1568	active_fg => [0, 0, 0],
1131	range => [0, 0, 100, 10],	1569	range => [0, 0, 100, 10],
1132	req_w => 40,	1570	req_w => 40,
1133	req_h => 10,	1571	req_h => 13,
1134	vertical => 0,	1572	vertical => 0,
		1573	can_hover => 1,
		1574	inner_pad => 5,
1135	@_	1575	@_
1136	);	1576	);
1137		1577
1138	$self	1578	$self
1139	}	1579	}
…		…
1160	if ($GRAB == $self) {	1600	if ($GRAB == $self) {
1161	my ($value, $lo, $hi, $page) = @{$self->{range}};	1601	my ($value, $lo, $hi, $page) = @{$self->{range}};
1162		1602
1163	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});	1603	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
1164		1604
		1605	my $inner_pad_px = $self->_calc_inner_pad_px ($w);
		1606	my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
		1607
		1608	$x -= $inner_pad_px; # substract the padding
1165	$x = $x * ($hi - $lo) / $w + $lo;	1609	$x = $x * ($hi - $lo) / $inner_w + $lo;
1166	$x = $lo if $x < $lo;	1610	$x = $lo if $x < $lo;
1167	$x = $hi - $page if $x > $hi - $page;	1611	$x = $hi - $page if $x > $hi - $page;
1168	$self->{range}[0] = $x;	1612	$self->{range}[0] = $x;
1169		1613
1170	$self->emit (changed => $x);	1614	$self->emit (changed => $x);
1171	$self->update;	1615	$self->update;
1172	}	1616	}
		1617	}
		1618
		1619	# the inner_* stuff is for generating a padding for the slider handle,
		1620	# so that the handle doesn't leave the texture. This calculation isn't 100%
		1621	# correct propably, but it does the job for now
		1622	sub _calc_inner_pad_px {
		1623	my ($self, $w) = @_;
		1624	($w / 100) * $self->{inner_pad} # % to pixels
1173	}	1625	}
1174		1626
1175	sub _draw {	1627	sub _draw {
1176	my ($self) = @_;	1628	my ($self) = @_;
1177		1629
…		…
1191	my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};	1643	my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
1192	my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};	1644	my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
1193		1645
1194	my ($value, $lo, $hi, $page) = @{$self->{range}};	1646	my ($value, $lo, $hi, $page) = @{$self->{range}};
1195		1647
		1648	$hi = $value + 1 if $lo == $hi;
		1649
		1650	my $inner_pad_px = $self->_calc_inner_pad_px ($w);
		1651	my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
		1652
1196	$page = int $page * $w / ($hi - $lo);	1653	$page = int $page * $inner_w / ($hi - $lo);
1197	$value = int +($value - $lo) * $w / ($hi - $lo);	1654	$value = int +($value - $lo) * $inner_w / ($hi - $lo);
1198		1655
1199	$w -= $page;	1656	$w -= $page;
1200	$page &= ~1;	1657	$page &= ~1;
1201	glTranslate $page * 0.5, 0, 0;	1658	glTranslate $page * 0.5, 0, 0;
		1659	$page ||= 2;
1202		1660
1203	glColor @$fg;
1204	glBegin GL_LINES;
1205	glVertex 0, 0; glVertex 0, $h;
1206	glVertex $w - 1, 0; glVertex $w - 1, $h;
1207	glVertex 0, $h * 0.5; glVertex $w, $h * 0.5;
1208	glEnd;
1209
1210	my $knob_a = $value - $page * 0.5;	1661	my $knob_a = $inner_pad_px + ($value - $page * 0.5);
1211	my $knob_b = $value + $page * 0.5;	1662	my $knob_b = $inner_pad_px + ($value + $page * 0.5);
1212		1663
1213	glBegin GL_QUADS;	1664	glEnable GL_BLEND;
1214	glColor @$fg;	1665	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1215	glVertex $knob_a, 0;	1666	glEnable GL_TEXTURE_2D;
1216	glVertex $knob_a, $h;	1667	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1217	glVertex $knob_b, $h;
1218	glVertex $knob_b, 0;
1219		1668
1220	if ($knob_a < $knob_b - 2) {	1669	# draw background
1221	glColor @$bg;	1670	$tex[1]->draw_quad (0, 0, $w, $h);
1222	glVertex $knob_a + 1, 1;	1671
1223	glVertex $knob_a + 1, $h - 1;	1672	# draw handle
1224	glVertex $knob_b - 1, $h - 1;	1673	$tex[0]->draw_quad ($knob_a, 0, $knob_b - $knob_a, $h);
1225	glVertex $knob_b - 1, 1;	1674
		1675	glDisable GL_BLEND;
		1676	glDisable GL_TEXTURE_2D;
		1677	}
		1678
		1679	#############################################################################
		1680
		1681	package CFClient::UI::TextView;
		1682
		1683	our @ISA = CFClient::UI::HBox::;
		1684
		1685	use SDL::OpenGL;
		1686
		1687	sub new {
		1688	my $class = shift;
		1689
		1690	my $self = $class->SUPER::new (
		1691	req_w => $::WIDTH / 6,
		1692	req_h => $::HEIGHT / 6,
		1693	fontsize => $::FONTSIZE,
		1694	@_,
		1695
		1696	layout => (new CFClient::Layout),
		1697	par => [],
		1698	height => 0,
		1699	children => [
		1700	(new CFClient::UI::Empty expand => 1),
		1701	(new CFClient::UI::Slider vertical => 1),
		1702	],
		1703	);
		1704
		1705	$self->{children}[1]->connect (changed => sub {
		1706	$self->update;
		1707	});
		1708
		1709	$self
		1710	}
		1711
		1712	sub set_fontsize {
		1713	my ($self, $fontsize) = @_;
		1714
		1715	$self->{fontsize} = $fontsize;
		1716	$self->reflow;
		1717	}
		1718
		1719	sub text_height {
		1720	my ($self, $text) = @_;
		1721
		1722	my $layout = $self->{layout};
		1723
		1724	$layout->set_height ($self->{fontsize});
		1725	$layout->set_width ($self->{w});
		1726	$layout->set_text ($text);
1226	}	1727
1227	glEnd;	1728	($layout->size)[1]
		1729	}
		1730
		1731	sub reflow {
		1732	my ($self) = @_;
		1733
		1734	$self->{need_reflow}++;
		1735	$self->update;
		1736	}
		1737
		1738	sub size_request {
		1739	my ($self) = @_;
		1740
		1741	($self->{req_w}, $self->{req_h})
		1742	}
		1743
		1744	sub size_allocate {
		1745	my ($self, $x, $y, $w, $h) = @_;
		1746
		1747	$self->SUPER::size_allocate ($x, $y, $w, $h) or return;
		1748
		1749	$self->{layout}->set_height ($self->{fontsize});
		1750	$self->{layout}->set_width ($self->{w});
		1751
		1752	$self->reflow;
		1753	$self->update;
		1754	}
		1755
		1756	sub add_paragraph {
		1757	my ($self, $color, $text) = @_;
		1758
		1759	#TODO: intelligently "reformat" paragraph
		1760
		1761	my $height = $self->text_height ($text);
		1762
		1763	$self->{height} += $height;
		1764
		1765	push @{$self->{par}}, [$height, $color, $text];
		1766
		1767	$self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}];
		1768	$self->{children}[1]->update;
		1769	}
		1770
		1771	sub update {
		1772	my ($self) = @_;
		1773
		1774	$self->SUPER::update;
		1775
		1776	return unless $self->{h} > 0;
		1777
		1778	delete $self->{texture};
		1779
		1780	$ROOT->on_refresh ($self, sub {
		1781	if (delete $self->{need_reflow}) {
		1782	my $height = 0;
		1783
		1784	$height += $_->[0] = $self->text_height ($_->[2])
		1785	for @{$self->{par}};
		1786
		1787	$self->{height} = $height;
		1788
		1789	$self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];
		1790
		1791	delete $self->{texture};
		1792	}
		1793
		1794	$self->{texture} ||= new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
		1795	glClearColor 0, 0, 0, 1;
		1796	glClear GL_COLOR_BUFFER_BIT;
		1797
		1798	glEnable GL_BLEND;
		1799	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
		1800	glEnable GL_TEXTURE_2D;
		1801	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		1802
		1803	my $top = int $self->{children}[1]{range}[0];
		1804
		1805	my $y0 = $top;
		1806	my $y1 = $top + $self->{h};
		1807
		1808	my $y = 0;
		1809
		1810	my $layout = $self->{layout};
		1811
		1812	for my $par (@{$self->{par}}) {
		1813	my $h = $par->[0];
		1814
		1815	if ($y0 < $y + $h && $y < $y1) {
		1816	$layout->set_text ($par->[2]);
		1817
		1818	glColor @{ $par->[1] };
		1819	my ($W, $H) = $layout->size;
		1820	CFClient::Texture->new_from_layout ($layout)->draw_quad (0, $y - $y0);
		1821	}
		1822
		1823	$y += $h;
		1824	}
		1825
		1826	glDisable GL_TEXTURE_2D;
		1827	glDisable GL_BLEND;
		1828	};
		1829	});
		1830	}
		1831
		1832	sub _draw {
		1833	my ($self) = @_;
		1834
		1835	if ($self->{texture}) {
		1836	glEnable GL_TEXTURE_2D;
		1837	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		1838	$self->{texture}->draw_quad (0, 0, $self->{w}, $self->{h});
		1839	glDisable GL_TEXTURE_2D;
		1840	}
		1841
		1842	$self->{children}[1]->draw;
		1843
1228	}	1844	}
1229		1845
1230	#############################################################################	1846	#############################################################################
1231		1847
1232	package CFClient::UI::MapWidget;	1848	package CFClient::UI::MapWidget;
…		…
1242		1858
1243	sub new {	1859	sub new {
1244	my $class = shift;	1860	my $class = shift;
1245		1861
1246	$class->SUPER::new (	1862	$class->SUPER::new (
1247	z => -1,	1863	z => -1,
		1864	can_focus => 1,
1248	list => (glGenLists 1),	1865	list => (glGenLists 1),
1249	@_	1866	@_
1250	)	1867	)
1251	}	1868	}
1252		1869
1253	sub key_down {	1870	sub key_down {
…		…
1255	}	1872	}
1256		1873
1257	sub key_up {	1874	sub key_up {
1258	}	1875	}
1259		1876
		1877	sub button_down {
		1878	my ($self, $ev, $x, $y) = @_;
		1879
		1880	$self->focus_in;
		1881
		1882	if ($ev->button == 2) {
		1883	my ($ox, $oy) = ($ev->button_x, $ev->button_y);
		1884	my ($bw, $bh) = ($::CFG->{map_shift_x}, $::CFG->{map_shift_y});
		1885
		1886	$self->{motion} = sub {
		1887	my ($ev, $x, $y) = @_;
		1888
		1889	($x, $y) = ($ev->motion_x, $ev->motion_y);
		1890
		1891	$::CFG->{map_shift_x} = $bw + $x - $ox;
		1892	$::CFG->{map_shift_y} = $bh + $y - $oy;
		1893
		1894	$self->update;
		1895	};
		1896	}
		1897	}
		1898
		1899	sub button_up {
		1900	my ($self, $ev, $x, $y) = @_;
		1901
		1902	delete $self->{motion};
		1903	}
		1904
		1905	sub mouse_motion {
		1906	my ($self, $ev, $x, $y) = @_;
		1907
		1908	$self->{motion}->($ev, $x, $y) if $self->{motion};
		1909	}
		1910
1260	sub size_request {	1911	sub size_request {
1261	(	1912	(
1262	1 + int $::WIDTH / 32,	1913	1 + 32 * int $::WIDTH / 32,
1263	1 + int $::HEIGHT / 32,	1914	1 + 32 * int $::HEIGHT / 32,
1264	)	1915	)
1265	}	1916	}
1266		1917
1267	sub update {	1918	sub update {
1268	my ($self) = @_;	1919	my ($self) = @_;
1269		1920
1270	$self->{need_update} = 1;	1921	$self->{need_update} = 1;
1271	$self->SUPER::update;	1922	$self->SUPER::update;
1272	}	1923	}
1273		1924
1274	sub _draw {	1925	sub draw {
1275	my ($self) = @_;	1926	my ($self) = @_;
1276		1927
1277	if (delete $self->{need_update}) {	1928	if (delete $self->{need_update}) {
1278	glNewList $self->{list}, GL_COMPILE;	1929	glNewList $self->{list}, GL_COMPILE;
1279		1930
1280	my $mx = $::CONN->{mapx};	1931	if ($::MAP) {
1281	my $my = $::CONN->{mapy};
1282
1283	my $map = $::CONN->{map};
1284
1285	my ($xofs, $yofs);
1286
1287	my $sw = 1 + int $::WIDTH / 32;	1932	my $sw = int $::WIDTH / 32;
1288	my $sh = 1 + int $::HEIGHT / 32;	1933	my $sh = int $::HEIGHT / 32;
1289		1934
1290	if ($::CONN->{mapw} > $sw) {	1935	my $sx = $::CFG->{map_shift_x}; my $sx0 = $sx & 31; $sx = ($sx - $sx0) / 32;
1291	$xofs = $mx + ($::CONN->{mapw} - $sw) * 0.5;	1936	my $sy = $::CFG->{map_shift_y}; my $sy0 = $sy & 31; $sy = ($sy - $sy0) / 32;
1292	} else {	1937
1293	$xofs = $self->{xofs} = min $mx, max $mx + $::CONN->{mapw} - $sw + 1, $self->{xofs};	1938	glTranslate $sx0 - 32, $sy0 - 32, 0;
		1939
		1940	my ($w, $h, $data) = $::MAP->draw ($sx, $sy, 0, 0, $sw + 1, $sh + 1);
		1941
		1942	if ($::CFG->{fow_enable}) {
		1943	if ($::CFG->{fow_smooth}) { # smooth fog of war
		1944	glConvolutionParameter GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER;
		1945	glConvolutionFilter2D
		1946	GL_CONVOLUTION_2D,
		1947	GL_ALPHA,
		1948	3, 3,
		1949	GL_ALPHA, GL_FLOAT,
		1950	pack "f*",
		1951	0.1, 0.1, 0.1,
		1952	0.1, 0.2, 0.1,
		1953	0.1, 0.1, 0.1,
		1954	;
		1955	glEnable GL_CONVOLUTION_2D;
		1956	}
		1957
		1958	$self->{fow_texture} = new CFClient::Texture
		1959	w => $w,
		1960	h => $h,
		1961	data => $data,
		1962	internalformat => GL_ALPHA,
		1963	format => GL_ALPHA;
		1964
		1965	glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth};
		1966
		1967	glEnable GL_BLEND;
		1968	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
		1969	glEnable GL_TEXTURE_2D;
		1970	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
		1971
		1972	glColor +($::CFG->{fow_intensity}) x 3, 1;
		1973	$self->{fow_texture}->draw_quad (0, 0, $w * 32, $h * 32);
		1974
		1975	glDisable GL_TEXTURE_2D;
		1976	glDisable GL_BLEND;
		1977	}
		1978
		1979	# HACK BEGIN
		1980	{
		1981	glTranslate -($sx0 - 32), -($sy0 - 32), 0;#remove
		1982	my ($w, $h) = (250, 250);
		1983
		1984	glEnable GL_BLEND;
		1985	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
		1986	glEnable GL_TEXTURE_2D;
		1987	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		1988
		1989	$self->{mapmap_texture} =
		1990	new CFClient::Texture
		1991	w => $w,
		1992	h => $h,
		1993	data => $::MAP->mapmap ($w, $h),
		1994	type => GL_UNSIGNED_INT_8_8_8_8_REV;
		1995
		1996	$self->{mapmap_texture}->draw_quad (100, 100);
		1997
		1998	glDisable GL_TEXTURE_2D;
		1999	glDisable GL_BLEND;
		2000	}
		2001	# HACK END
1294	}	2002	}
1295		2003
1296	if ($::CONN->{maph} > $sh) {
1297	$yofs = $my + ($::CONN->{maph} - $sh) * 0.5;
1298	} else {
1299	$yofs = $self->{yofs} = min $my, max $my + $::CONN->{maph} - $sh + 1, $self->{yofs};
1300	}
1301
1302	glEnable GL_TEXTURE_2D;
1303	glEnable GL_BLEND;
1304	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1305	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1306
1307	my $sw4 = ($sw + 3) & ~3;
1308	my $darkness = "\x00" x ($sw4 * $sh);
1309
1310	for my $x (0 .. $sw - 1) {
1311	my $row = $map->[$x + $xofs];
1312	for my $y (0 .. $sh - 1) {
1313
1314	my $cell = $row->[$y + $yofs]
1315	or next;
1316
1317	my $dark = $cell->[0];
1318	if ($dark < 0) {
1319	substr $darkness, $y * $sw4 + $x, 1, chr 224;
1320	} else {
1321	substr $darkness, $y * $sw4 + $x, 1, chr 255 - $dark;
1322	}
1323
1324	for my $num (grep $_, @$cell[1,2,3]) {
1325	my $tex = $::CONN->{face}[$num]{texture} || next;
1326
1327	my ($w, $h) = @$tex{qw(w h)};
1328
1329	$tex->draw_quad (($x + 1) * 32 - $w, ($y + 1) * 32 - $h, $w, $h);
1330	}
1331	}
1332	}
1333
1334	# if (1) { # higher quality darkness
1335	# $lighting =~ s/(.)/$1$1$1/gs;
1336	# my $pb = new_from_data Gtk2::Gdk::Pixbuf $lighting, "rgb", 0, 8, $sw4, $sh, $sw4 * 3;
1337	#
1338	# $pb = $pb->scale_simple ($sw4 * 0.5, $sh * 0.5, "bilinear");
1339	#
1340	# $lighting = $pb->get_pixels;
1341	# $lighting =~ s/(.)../$1/gs;
1342	# }
1343
1344	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1345
1346	$darkness = new CFClient::Texture
1347	w => $sw4,
1348	h => $sh,
1349	data => $darkness,
1350	internalformat => GL_ALPHA,
1351	format => GL_ALPHA;
1352
1353	glColor 0.45, 0.45, 0.45, 1;
1354	$darkness->draw_quad (0, 0, $sw4 * 32, $sh * 32);
1355
1356	glDisable GL_TEXTURE_2D;
1357	glDisable GL_BLEND;
1358
1359	glEndList;	2004	glEndList;
1360	}	2005	}
1361		2006
		2007	glPushMatrix;
1362	glCallList $self->{list};	2008	glCallList $self->{list};
		2009	glPopMatrix;
		2010
		2011	if ($FOCUS != $self) {
		2012	glColor 64/255, 64/255, 64/255;
		2013	glLogicOp GL_AND;
		2014	glEnable GL_COLOR_LOGIC_OP;
		2015	glBegin GL_QUADS;
		2016	glVertex 0, 0;
		2017	glVertex 0, $::HEIGHT;
		2018	glVertex $::WIDTH, $::HEIGHT;
		2019	glVertex $::WIDTH, 0;
		2020	glEnd;
		2021	glDisable GL_COLOR_LOGIC_OP;
		2022	}
1363	}	2023	}
1364		2024
1365	my %DIR = (	2025	my %DIR = (
1366	SDLK_KP8, [1, "north"],	2026	SDLK_KP8, [1, "north"],
1367	SDLK_KP9, [2, "northeast"],	2027	SDLK_KP9, [2, "northeast"],
…		…
1383		2043
1384	my $mod = $ev->key_mod;	2044	my $mod = $ev->key_mod;
1385	my $sym = $ev->key_sym;	2045	my $sym = $ev->key_sym;
1386		2046
1387	if ($sym == SDLK_KP5) {	2047	if ($sym == SDLK_KP5) {
1388	$::CONN->send ("command stay fire");	2048	$::CONN->user_send ("stay fire");
		2049	} elsif ($sym == SDLK_a) {
		2050	$::CONN->user_send ("apply");
		2051	} elsif ($sym == SDLK_QUOTE) {
		2052	$self->emit ('activate_console');
		2053	} elsif ($sym == SDLK_SLASH) {
		2054	$self->emit ('activate_console' => '/');
1389	} elsif (exists $DIR{$sym}) {	2055	} elsif (exists $DIR{$sym}) {
1390	if ($mod & KMOD_SHIFT) {	2056	if ($mod & KMOD_SHIFT) {
1391	$self->{shft}++;	2057	$self->{shft}++;
1392	$::CONN->send ("command fire $DIR{$sym}[0]");	2058	$::CONN->user_send ("fire $DIR{$sym}[0]");
1393	} elsif ($mod & KMOD_CTRL) {	2059	} elsif ($mod & KMOD_CTRL) {
1394	$self->{ctrl}++;	2060	$self->{ctrl}++;
1395	$::CONN->send ("command run $DIR{$sym}[0]");	2061	$::CONN->user_send ("run $DIR{$sym}[0]");
1396	} else {	2062	} else {
1397	$::CONN->send ("command $DIR{$sym}[1]");	2063	$::CONN->user_send ("$DIR{$sym}[1]");
1398	}	2064	}
1399	}	2065	}
1400	}	2066	}
1401		2067
1402	sub key_up {	2068	sub key_up {
…		…
1404		2070
1405	my $mod = $ev->key_mod;	2071	my $mod = $ev->key_mod;
1406	my $sym = $ev->key_sym;	2072	my $sym = $ev->key_sym;
1407		2073
1408	if (!($mod & KMOD_SHIFT) && delete $self->{shft}) {	2074	if (!($mod & KMOD_SHIFT) && delete $self->{shft}) {
1409	$::CONN->send ("command fire_stop");	2075	$::CONN->user_send ("fire_stop");
1410	}	2076	}
1411	if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) {	2077	if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) {
1412	$::CONN->send ("command run_stop");	2078	$::CONN->user_send ("run_stop");
1413	}	2079	}
1414	}	2080	}
1415		2081
1416	#############################################################################	2082	#############################################################################
1417		2083
…		…
1455	glPopMatrix;	2121	glPopMatrix;
1456	}	2122	}
1457		2123
1458	#############################################################################	2124	#############################################################################
1459		2125
1460	package CFClient::UI::Toplevel;	2126	package CFClient::UI::Flopper;
		2127
		2128	our @ISA = CFClient::UI::Button::;
		2129
		2130	sub new {
		2131	my $class = shift;
		2132
		2133	my $self = $class->SUPER::new (
		2134	state => 0,
		2135	connect_activate => \&toggle_flopper,
		2136	@_
		2137	);
		2138
		2139	if ($self->{state}) {
		2140	$self->{state} = 0;
		2141	$self->toggle_flopper;
		2142	}
		2143
		2144	$self
		2145	}
		2146
		2147	sub toggle_flopper {
		2148	my ($self) = @_;
		2149
		2150	# TODO: use animation
		2151	if ($self->{state} = !$self->{state}) {
		2152	$CFClient::UI::ROOT->add ($self->{other});
		2153	$self->{other}->move ($self->coord2global (0, $self->{h}));
		2154	$self->emit ("open");
		2155	} else {
		2156	$CFClient::UI::ROOT->remove ($self->{other});
		2157	$self->emit ("close");
		2158	}
		2159
		2160	$self->emit (changed => $self->{state});
		2161	}
		2162
		2163	#############################################################################
		2164
		2165	package CFClient::UI::Root;
1461		2166
1462	our @ISA = CFClient::UI::Container::;	2167	our @ISA = CFClient::UI::Container::;
		2168
		2169	use SDL::OpenGL;
		2170
		2171	sub check_size {
		2172	my ($self) = @_;
		2173
		2174	$self->size_allocate (0, 0, $::WITH, $::HEIGHT);
		2175	}
1463		2176
1464	sub size_request {	2177	sub size_request {
1465	($::WIDTH, $::HEIGHT)	2178	($::WIDTH, $::HEIGHT)
1466	}	2179	}
1467		2180
…		…
1472		2185
1473	$_->size_allocate ($_->{x}, $_->{y}, $_->size_request)	2186	$_->size_allocate ($_->{x}, $_->{y}, $_->size_request)
1474	for @{$self->{children}};	2187	for @{$self->{children}};
1475	}	2188	}
1476		2189
1477	sub translate {	2190	sub _topleft {
1478	my ($self, $x, $y) = @_;	2191	my ($self, $x, $y) = @_;
1479		2192
1480	($x, $y)	2193	($x, $y)
1481	}	2194	}
1482		2195
1483	sub update {	2196	sub update {
1484	my ($self) = @_;	2197	my ($self) = @_;
1485		2198
1486	$self->size_allocate (0, 0, $::WIDTH, $::HEIGHT);	2199	$self->check_size;
1487	::refresh ();	2200	::refresh ();
1488	}	2201	}
1489		2202
1490	sub add {	2203	sub add {
1491	my ($self, $widget) = @_;	2204	my ($self, $widget) = @_;
1492		2205
1493	$self->SUPER::add ($widget);	2206	$self->SUPER::add ($widget);
1494		2207
1495	$widget->size_allocate ($widget->{x}, $widget->{y}, $widget->size_request);	2208	$widget->size_allocate (int $widget->{x}, int $widget->{y}, $widget->size_request);
		2209	}
		2210
		2211	sub on_refresh {
		2212	my ($self, $id, $cb) = @_;
		2213
		2214	$self->{refresh_hook}{$id} = $cb;
1496	}	2215	}
1497		2216
1498	sub draw {	2217	sub draw {
1499	my ($self) = @_;	2218	my ($self) = @_;
1500		2219
		2220	while (my $rcb = delete $self->{refresh_hook}) {
		2221	$_->() for values %$rcb;
		2222	}
		2223
		2224	glViewport 0, 0, $::WIDTH, $::HEIGHT;
		2225	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
		2226	glClear GL_COLOR_BUFFER_BIT;
		2227
		2228	glMatrixMode GL_PROJECTION;
		2229	glLoadIdentity;
		2230	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000;
		2231	glMatrixMode GL_MODELVIEW;
		2232	glLoadIdentity;
		2233
1501	$self->_draw;	2234	$self->_draw;
1502	}	2235	}
1503		2236
1504	#############################################################################	2237	#############################################################################
1505		2238
1506	package CFClient::UI;	2239	package CFClient::UI;
1507		2240
1508	$TOPLEVEL = new CFClient::UI::Toplevel;	2241	$ROOT = new CFClient::UI::Root;
1509		2242
1510	1	2243	1
1511		2244

Diff Legend

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