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.93 by root, Wed Apr 12 23:59:42 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;	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;
…		…
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;
		179	return unless $self->{can_focus};
149		180
150	my $focus = $FOCUS; $FOCUS = $self;	181	my $focus = $FOCUS; $FOCUS = $self;
		182
		183	$self->emit (focus_in => $focus);
		184
151	$focus->update if $focus;	185	$focus->update if $focus;
152	$FOCUS->update;	186	$FOCUS->update;
153	}	187	}
154		188
155	sub focus_out {	189	sub focus_out {
156	my ($self) = @_;	190	my ($self) = @_;
157		191
158	return unless $FOCUS == $self;	192	return unless $FOCUS == $self;
159		193
160	my $focus = $FOCUS; undef $FOCUS;	194	my $focus = $FOCUS; undef $FOCUS;
		195
		196	$self->emit (focus_out => $focus);
		197
161	$focus->update if $focus; #?	198	$focus->update if $focus; #?
162	}	199	}
163		200
164	sub mouse_motion { }	201	sub mouse_motion { }
165	sub button_up { }	202	sub button_up { }
…		…
186	glPushMatrix;	223	glPushMatrix;
187	glTranslate $self->{x}, $self->{y}, 0;	224	glTranslate $self->{x}, $self->{y}, 0;
188	$self->_draw;	225	$self->_draw;
189	glPopMatrix;	226	glPopMatrix;
190		227
191	if ($self == $HOVER) {	228	if ($self == $HOVER && $self->{can_hover}) {
192	my ($x, $y) = @$self{qw(x y)};	229	my ($x, $y) = @$self{qw(x y)};
193		230
194	glColor 0, 0, 1, 0.2;	231	glColor 1, 0.8, 0.5, 0.2;
195	glEnable GL_BLEND;	232	glEnable GL_BLEND;
196	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	233	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
197	glBegin GL_QUADS;	234	glBegin GL_QUADS;
198	glVertex $x , $y;	235	glVertex $x , $y;
199	glVertex $x + $self->{w}, $y;	236	glVertex $x + $self->{w}, $y;
…		…
219		256
220	()	257	()
221	}	258	}
222		259
223	sub set_parent {	260	sub set_parent {
224	my ($self, $par) = @_;	261	my ($self, $parent) = @_;
225		262
226	$self->{parent} = $par;
227	Scalar::Util::weaken $self->{parent};	263	Scalar::Util::weaken ($self->{parent} = $parent);
228	}	264	}
229		265
230	sub get_parent {	266	sub check_size {
231	$_[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	}
232	}	281	}
233		282
234	sub update {	283	sub update {
235	my ($self) = @_;	284	my ($self) = @_;
236		285
…		…
325		374
326	$self	375	$self
327	}	376	}
328		377
329	sub add {	378	sub add {
330	my ($self, $chld) = @_;	379	my ($self, $child) = @_;
331		380
332	$chld->set_parent ($self);	381	$child->set_parent ($self);
		382
		383	use sort 'stable';
333		384
334	$self->{children} = [	385	$self->{children} = [
335	sort { $a->{z} <=> $b->{z} }	386	sort { $a->{z} <=> $b->{z} }
336	@{$self->{children}}, $chld	387	@{$self->{children}}, $child
337	];	388	];
338		389
339	$self->{w} = $self->{h} = -1;	390	$self->{w} = $self->{h} = -1;
340	$self->update;	391
		392	$child->check_size;
341	}	393	}
342		394
343	sub remove {	395	sub remove {
344	my ($self, $widget) = @_;	396	my ($self, $widget) = @_;
345		397
346	$self->{children} = [ grep $_ != $widget, @{ $self->{children} } ];	398	$self->{children} = [ grep $_ != $widget, @{ $self->{children} } ];
347		399
348	$self->size_allocate (0, 0, $self->{w}, $self->{h});	400	$self->check_size;
349	}	401	}
350		402
351	sub find_widget {	403	sub find_widget {
352	my ($self, $x, $y) = @_;	404	my ($self, $x, $y) = @_;
353		405
…		…
406	sub size_request {	458	sub size_request {
407	$_[0]{children}[0]->size_request	459	$_[0]{children}[0]->size_request
408	}	460	}
409		461
410	sub size_allocate {	462	sub size_allocate {
411	my ($self, $x, $y, $w, $h) = @_;	463	my ($self, $w, $h) = @_;
412		464
413	$self->_size_allocate ($x, $y, $w, $h) or return;
414
415	$self->{children}[0]->size_allocate (0, 0, $w, $h);	465	$self->{children}[0]->configure (0, 0, $w, $h);
416	}	466	}
417		467
418	#############################################################################	468	#############################################################################
419		469
420	package CFClient::UI::Window;	470	package CFClient::UI::Window;
…		…
438	}	488	}
439		489
440	sub render_chld {	490	sub render_chld {
441	my ($self) = @_;	491	my ($self) = @_;
442		492
443	$self->{texture} =	493	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
444	CFClient::Texture->new_from_opengl (	494	glClearColor 0, 0, 0, 1;
445	$self->{w}, $self->{h}, sub { $self->child->draw }	495	glClear GL_COLOR_BUFFER_BIT;
446	);	496	$self->child->draw;
		497	};
447	}	498	}
448		499
449	sub size_allocate {	500	sub size_allocate {
450	my ($self, $x, $y, $w, $h) = @_;	501	my ($self, $w, $h) = @_;
451		502
452	$self->_size_allocate ($x, $y, $w, $h) or return;
453
454	$self->child->size_allocate (0, 0, $w, $h);	503	$self->child->configure (0, 0, $w, $h);
455		504
456	$self->render_chld;	505	$self->render_chld;
457	}	506	}
458		507
459	sub _draw {	508	sub _draw {
…		…
475	glDisable GL_TEXTURE_2D;	524	glDisable GL_TEXTURE_2D;
476	}	525	}
477		526
478	#############################################################################	527	#############################################################################
479		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
480	package CFClient::UI::Frame;	553	package CFClient::UI::Frame;
481		554
482	our @ISA = CFClient::UI::Bin::;	555	our @ISA = CFClient::UI::Bin::;
483		556
484	use SDL::OpenGL;	557	use SDL::OpenGL;
…		…
494	}	567	}
495		568
496	sub size_allocate {	569	sub size_allocate {
497	my ($self, $x, $y, $w, $h) = @_;	570	my ($self, $x, $y, $w, $h) = @_;
498		571
499	$self->_size_allocate ($x, $y, $w, $h) or return;
500
501	$self->child->size_allocate (2, 2, $w - 4, $h - 4);	572	$self->child->configure (2, 2, $w - 4, $h - 4);
502	}	573	}
503		574
504	sub _draw {	575	sub _draw {
505	my ($self) = @_;	576	my ($self) = @_;
506		577
…		…
529		600
530	my @tex =	601	my @tex =
531	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }	602	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
532	qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);	603	qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
533		604
		605	sub new {
		606	my $class = shift;
		607
		608	# TODO: user_x, user_y, overwrite moveto?
		609
		610	$class->SUPER::new (
		611	bg => [1, 1, 1, 1],
		612	border_bg => [1, 1, 1, 1],
		613	border => int $::FONTSIZE * 0.8,
		614	@_
		615	)
		616	}
		617
534	sub size_request {	618	sub size_request {
535	my ($self) = @_;	619	my ($self) = @_;
536		620
537	return ($self->{user_w}, $self->{user_h}) if $self->{user_w} && $self->{user_h};	621	return ($self->{user_w}, $self->{user_h}) if $self->{user_w} && $self->{user_h};
538		622
539	my ($w, $h) = $self->SUPER::size_request;	623	my ($w, $h) = $self->SUPER::size_request;
540		624
541	$h += $tex[1]->{h};	625	(
542	$h += $tex[4]->{h};	626	$w + $self->{border} * 2,
543	$w += $tex[2]->{w};	627	$h + $self->{border} * 2,
544	$w += $tex[3]->{w};	628	)
545
546	($w, $h)
547	}	629	}
548		630
549	sub size_allocate {	631	sub size_allocate {
550	my ($self, $x, $y, $w, $h) = @_;	632	my ($self, $w, $h) = @_;
551		633
552	$self->_size_allocate ($x, $y, $w, $h) or return;	634	$h -= List::Util::max 0, $self->{border} * 2;
		635	$w -= List::Util::max 0, $self->{border} * 2;
553		636
554	$h -= $tex[1]{h};	637	$self->child->configure ($self->{border}, $self->{border}, $w, $h);
555	$h -= $tex[4]{h};
556	$w -= $tex[2]{w};
557	$w -= $tex[3]{w};
558
559	$h = $h < 0 ? 0 : $h;
560	$w = $w < 0 ? 0 : $w;
561
562	my $child = $self->child;
563
564	$child->size_allocate ($tex[3]->{w}, $tex[1]->{h}, $w, $h);
565	}	638	}
566		639
567	sub button_down {	640	sub button_down {
568	my ($self, $ev, $x, $y) = @_;	641	my ($self, $ev, $x, $y) = @_;
569		642
570	if ($x < $self->{w} && $x >= $self->{w} - $tex[2]{w}	643	if ($x < $self->{w} && $x >= $self->{w} - $self->{border}
571	&& $y < $self->{h} && $y >= $self->{h} - $tex[4]{h}) {	644	&& $y < $self->{h} && $y >= $self->{h} - $self->{border}) {
572		645
573	my ($ox, $oy) = ($ev->button_x, $ev->button_y);	646	my ($ox, $oy) = ($ev->button_x, $ev->button_y);
574	my ($bw, $bh) = ($self->{w}, $self->{h});	647	my ($bw, $bh) = ($self->{w}, $self->{h});
575		648
576	$self->{motion} = sub {	649	$self->{motion} = sub {
…		…
578		651
579	($x, $y) = ($ev->motion_x, $ev->motion_y);	652	($x, $y) = ($ev->motion_x, $ev->motion_y);
580		653
581	$self->{user_w} = $bw + $x - $ox;	654	$self->{user_w} = $bw + $x - $ox;
582	$self->{user_h} = $bh + $y - $oy;	655	$self->{user_h} = $bh + $y - $oy;
583	$self->update;	656	$self->check_size;
584	};	657	};
585		658
586	} elsif ($x >= 0 && $x < $self->{w}	659	} elsif ($x >= 0 && $x < $self->{w}
587	&& $y >= 0 && $y < $tex[1]{h}) {	660	&& $y >= 0 && $y < $self->{border}) {
588		661
589	my ($ox, $oy) = ($ev->button_x, $ev->button_y);	662	my ($ox, $oy) = ($ev->button_x, $ev->button_y);
590	my ($bx, $by) = ($self->{x}, $self->{y});	663	my ($bx, $by) = ($self->{x}, $self->{y});
591		664
592	$self->{motion} = sub {	665	$self->{motion} = sub {
…		…
613	}	686	}
614		687
615	sub _draw {	688	sub _draw {
616	my ($self) = @_;	689	my ($self) = @_;
617		690
618	my ($w, $h) = ($self->{w}, $self->{h});	691	my ($w, $h ) = ($self->{w}, $self->{h});
619	my ($cw, $ch) = ($self->child->{w}, $self->child->{h});	692	my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
620		693
621	glEnable GL_BLEND;	694	glEnable GL_BLEND;
622	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	695	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
623	glEnable GL_TEXTURE_2D;	696	glEnable GL_TEXTURE_2D;
624	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	697	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
625		698
626	my $top = $tex[1];	699	glColor @{ $self->{border_bg} };
627	$top->draw_quad (0, 0, $w, $top->{h});	700	$tex[1]->draw_quad (0, 0, $w, $self->{border});
628		701	$tex[3]->draw_quad (0, $self->{border}, $self->{border}, $ch);
629	my $left = $tex[3];	702	$tex[2]->draw_quad ($w - $self->{border}, $self->{border}, $self->{border}, $ch);
630	$left->draw_quad (0, $top->{h}, $left->{w}, $ch);	703	$tex[4]->draw_quad (0, $h - $self->{border}, $w, $self->{border});
631
632	my $right = $tex[2];
633	$right->draw_quad ($w - $right->{w}, $top->{h}, $right->{w}, $ch);
634
635	my $bottom = $tex[4];
636	$bottom->draw_quad (0, $h - $bottom->{h}, $w, $bottom->{h});
637		704
638	my $bg = $tex[0];	705	my $bg = $tex[0];
639		706
640	glBindTexture GL_TEXTURE_2D, $bg->{name};	707	# TODO: repeat texture not scale
641	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
642
643	my $rep_x = $cw / $bg->{w};	708	my $rep_x = $cw / $bg->{w};
644	my $rep_y = $ch / $bg->{h};	709	my $rep_y = $ch / $bg->{h};
645		710
		711	glColor @{ $self->{bg} };
		712
		713	$bg->{s} = $rep_x;
		714	$bg->{t} = $rep_y;
		715	$bg->{wrap_mode} = 1;
646	$bg->draw_quad ($left->{w}, $top->{h}, $cw, $ch);	716	$bg->draw_quad ($self->{border}, $self->{border}, $cw, $ch);
647		717
648	glDisable GL_TEXTURE_2D;	718	glDisable GL_TEXTURE_2D;
649	glDisable GL_BLEND;	719	glDisable GL_BLEND;
650		720
651	$self->child->draw;	721	$self->child->draw;
652
653	}	722	}
654		723
655	#############################################################################	724	#############################################################################
656		725
657	package CFClient::UI::Table;	726	package CFClient::UI::Table;
…		…
670	@_	739	@_
671	)	740	)
672	}	741	}
673		742
674	sub add {	743	sub add {
675	my ($self, $x, $y, $chld) = @_;	744	my ($self, $x, $y, $child) = @_;
676		745
		746	$child->set_parent ($self);
677	$self->{children}[$y][$x] = $chld;	747	$self->{children}[$y][$x] = $child;
678	$chld->set_parent ($self);
679		748
680	$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};
681	$self->update;	759	$self->update;
682	}	760	}
683		761
684	sub get_wh {	762	sub get_wh {
685	my ($self) = @_;	763	my ($self) = @_;
…		…
713	(sum @$hs),	791	(sum @$hs),
714	)	792	)
715	}	793	}
716		794
717	sub size_allocate {	795	sub size_allocate {
718	my ($self, $x, $y, $w, $h) = @_;	796	my ($self, $w, $h) = @_;
719
720	$self->_size_allocate ($x, $y, $w, $h) or return;
721		797
722	my ($ws, $hs) = $self->get_wh;	798	my ($ws, $hs) = $self->get_wh;
723		799
724	my $req_w = sum @$ws;	800	my $req_w = sum @$ws;
725	my $req_h = sum @$hs;	801	my $req_h = sum @$hs;
…		…
730	my $col_expand = (sum @col_expand) || 1;	806	my $col_expand = (sum @col_expand) || 1;
731		807
732	# linearly scale sizes	808	# linearly scale sizes
733	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;	809	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
734	$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;
735		814
736	my $y;	815	my $y;
737		816
738	for my $r (0 .. $#{$self->{children}}) {	817	for my $r (0 .. $#{$self->{children}}) {
739	my $row = $self->{children}[$r]	818	my $row = $self->{children}[$r]
…		…
744		823
745	for my $c (0 .. $#$row) {	824	for my $c (0 .. $#$row) {
746	my $col_w = $ws->[$c];	825	my $col_w = $ws->[$c];
747		826
748	if (my $widget = $row->[$c]) {	827	if (my $widget = $row->[$c]) {
749	$widget->size_allocate ($x, $y, $col_w, $row_h);	828	$widget->configure ($x, $y, $col_w, $row_h);
750	}	829	}
751		830
752	$x += $col_w;	831	$x += $col_w;
753	}	832	}
754		833
…		…
799	(List::Util::max map $_->[1], @alloc),	878	(List::Util::max map $_->[1], @alloc),
800	)	879	)
801	}	880	}
802		881
803	sub size_allocate {	882	sub size_allocate {
804	my ($self, $x, $y, $w, $h) = @_;	883	my ($self, $w, $h) = @_;
805
806	$self->_size_allocate ($x, $y, $w, $h);
807		884
808	($h, $w) = ($w, $h);	885	($h, $w) = ($w, $h);
809		886
810	my $children = $self->{children};	887	my $children = $self->{children};
811		888
…		…
827	$alloc_h += ($h - $req_h) * $child->{expand} / $exp;	904	$alloc_h += ($h - $req_h) * $child->{expand} / $exp;
828	$h[$_] = $alloc_h;	905	$h[$_] = $alloc_h;
829	}	906	}
830	}	907	}
831		908
		909	CFClient::UI::harmonize \@h;
		910
832	my $y = 0;	911	my $y = 0;
833	for (0 .. $#$children) {	912	for (0 .. $#$children) {
834	my $child = $children->[$_];	913	my $child = $children->[$_];
835	my $h = $h[$_];	914	my $h = $h[$_];
836	$child->size_allocate ($y, 0, $h, $w);	915	$child->configure ($y, 0, $h, $w);
837		916
838	$y += $h;	917	$y += $h;
839	}	918	}
		919
		920	1
840	}	921	}
841		922
842	#############################################################################	923	#############################################################################
843		924
844	package CFClient::UI::VBox;	925	package CFClient::UI::VBox;
…		…
857	(List::Util::sum map $_->[1], @alloc),	938	(List::Util::sum map $_->[1], @alloc),
858	)	939	)
859	}	940	}
860		941
861	sub size_allocate {	942	sub size_allocate {
862	my ($self, $x, $y, $w, $h) = @_;	943	my ($self, $w, $h) = @_;
863
864	$self->_size_allocate ($x, $y, $w, $h);
865		944
866	my $children = $self->{children};	945	my $children = $self->{children};
867		946
868	my @h = map +($_->size_request)[1], @$children;	947	my @h = map +($_->size_request)[1], @$children;
869		948
…		…
881		960
882	$h[$_] += ($h - $req_h) * $child->{expand} / $exp;	961	$h[$_] += ($h - $req_h) * $child->{expand} / $exp;
883	}	962	}
884	}	963	}
885		964
		965	CFClient::UI::harmonize \@h;
		966
886	my $y = 0;	967	my $y = 0;
887	for (0 .. $#$children) {	968	for (0 .. $#$children) {
888	my $child = $children->[$_];	969	my $child = $children->[$_];
889	my $h = $h[$_];	970	my $h = $h[$_];
890	$child->size_allocate (0, $y, $w, $h);	971	$child->configure (0, $y, $w, $h);
891		972
892	$y += $h;	973	$y += $h;
893	}	974	}
		975
		976	1
894	}	977	}
895		978
896	#############################################################################	979	#############################################################################
897		980
898	package CFClient::UI::Label;	981	package CFClient::UI::Label;
…		…
903		986
904	sub new {	987	sub new {
905	my ($class, %arg) = @_;	988	my ($class, %arg) = @_;
906		989
907	my $self = $class->SUPER::new (	990	my $self = $class->SUPER::new (
908	fg => [1, 1, 1],	991	fg => [1, 1, 1],
909	height => $::FONTSIZE,	992	fontsize => $::FONTSIZE,
910	text => "",	993	text => "",
911	align => -1,	994	align => -1,
		995	valign => -1,
912	padding => 2,	996	padding => 2,
913	layout => new CFClient::Layout,	997	layout => new CFClient::Layout,
914	%arg	998	%arg
915	);	999	);
916		1000
917	$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};
918		1005
919	$self	1006	$self
920	}	1007	}
921		1008
922	sub escape_text {	1009	sub escape_text {
…		…
930	}	1017	}
931		1018
932	sub set_text {	1019	sub set_text {
933	my ($self, $text) = @_;	1020	my ($self, $text) = @_;
934		1021
935	$self->{text} = $text;
936	$self->{layout}->set_markup ($text);	1022	$self->{layout}->set_text ($text);
937		1023
938	delete $self->{texture};	1024	delete $self->{texture};
939	# $self->{w} = $self->{h} = -1;
940	$self->update;	1025	$self->update;
941	}	1026	}
942		1027
943	sub get_text {	1028	sub set_markup {
944	my ($self, $text) = @_;	1029	my ($self, $markup) = @_;
945		1030
946	$self->{text}	1031	$self->{layout}->set_markup ($markup);
		1032
		1033	delete $self->{texture};
		1034	$self->update;
947	}	1035	}
948		1036
949	sub size_request {	1037	sub size_request {
950	my ($self) = @_;	1038	my ($self) = @_;
951		1039
952	$self->{layout}->set_width;	1040	$self->{layout}->set_width;
953	$self->{layout}->set_height ($self->{height});	1041	$self->{layout}->set_height ($self->{fontsize});
		1042
954	my ($w, $h) = $self->{layout}->size;	1043	my ($w, $h) = $self->{layout}->size;
955		1044
956	(	1045	(
957	$w + $self->{padding} * 2,	1046	$w + $self->{padding} * 2,
958	$h + $self->{padding} * 2,	1047	$h + $self->{padding} * 2,
959	)	1048	)
960	}	1049	}
961		1050
962	sub size_allocate {	1051	sub size_allocate {
963	my ($self, $x, $y, $w, $h) = @_;	1052	my ($self, $w, $h) = @_;
964
965	$self->_size_allocate ($x, $y, $w, $h) or return;
966		1053
967	delete $self->{texture};	1054	delete $self->{texture};
968	}	1055	}
969		1056
970	sub update {	1057	sub update {
…		…
977	sub _draw {	1064	sub _draw {
978	my ($self) = @_;	1065	my ($self) = @_;
979		1066
980	my $tex = $self->{texture} ||= do {	1067	my $tex = $self->{texture} ||= do {
981	$self->{layout}->set_width ($self->{w});	1068	$self->{layout}->set_width ($self->{w});
982	$self->{layout}->set_height (List::Util::min $self->{h} - $self->{padding} * 2, $self->{height});	1069	$self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize});
983	new_from_layout CFClient::Texture $self->{layout}	1070	new_from_layout CFClient::Texture $self->{layout}
984	};	1071	};
985		1072
986	glEnable GL_BLEND;	1073	glEnable GL_BLEND;
987	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	1074	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
988	glEnable GL_TEXTURE_2D;	1075	glEnable GL_TEXTURE_2D;
989	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	1076	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
990		1077
991	glColor @{$self->{fg}};	1078	glColor @{$self->{fg}};
992		1079
993	my $x =	1080	$self->{ox} = int (
994	$self->{align} < 0 ? $self->{padding}	1081	$self->{align} < 0 ? $self->{padding}
995	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}	1082	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
996	: ($self->{w} - $tex->{w}) * 0.5;	1083	: ($self->{w} - $tex->{w}) * 0.5
		1084	);
997		1085
998	glTranslate $x, ($self->{h} - $tex->{h}) * 0.5, 0;	1086	$self->{oy} = int (
999	$tex->draw_quad (0, 0);	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});
1000		1093
1001	glDisable GL_TEXTURE_2D;	1094	glDisable GL_TEXTURE_2D;
1002	glDisable GL_BLEND;	1095	glDisable GL_BLEND;
1003	}	1096	}
1004		1097
1005	#############################################################################	1098	#############################################################################
1006		1099
1007	package CFClient::UI::Entry;	1100	package CFClient::UI::EntryBase;
1008		1101
1009	our @ISA = CFClient::UI::Label::;	1102	our @ISA = CFClient::UI::Label::;
1010		1103
1011	use SDL;	1104	use SDL;
1012	use SDL::OpenGL;	1105	use SDL::OpenGL;
…		…
1017	$class->SUPER::new (	1110	$class->SUPER::new (
1018	fg => [1, 1, 1],	1111	fg => [1, 1, 1],
1019	bg => [0, 0, 0, 0.2],	1112	bg => [0, 0, 0, 0.2],
1020	active_bg => [1, 1, 1, 0.5],	1113	active_bg => [1, 1, 1, 0.5],
1021	active_fg => [0, 0, 0],	1114	active_fg => [0, 0, 0],
		1115	can_hover => 1,
		1116	can_focus => 1,
		1117	valign => 0,
1022	@_	1118	@_
1023	)	1119	)
1024	}	1120	}
1025		1121
1026	sub _set_text {	1122	sub _set_text {
1027	my ($self, $text) = @_;	1123	my ($self, $text) = @_;
1028		1124
		1125	delete $self->{cur_h};
		1126
		1127	return if $self->{text} eq $text;
		1128
1029	$self->{last_activity} = $::NOW;	1129	$self->{last_activity} = $::NOW;
1030
1031	$self->{text} = $text;	1130	$self->{text} = $text;
1032	$self->{layout}->set_width ($self->{w});
1033	$self->{layout}->set_height (List::Util::min $self->{h} - $self->{padding} * 2, $self->{height});
1034		1131
1035	$text =~ s/./*/g if $self->{hidden};	1132	$text =~ s/./*/g if $self->{hidden};
		1133	$self->{layout}->set_text ("$text ");
1036		1134
1037	$self->{layout}->set_markup ($self->escape_text ($text) . " ");	1135	$self->emit (changed => $self->{text});
		1136	}
1038		1137
1039	$text = substr $text, 0, $self->{cursor};	1138	sub get_text {
1040	utf8::encode $text;	1139	$_[0]{text}
1041
1042	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text);
1043	}	1140	}
1044		1141
1045	sub size_request {	1142	sub size_request {
1046	my ($self) = @_;	1143	my ($self) = @_;
1047		1144
…		…
1049		1146
1050	($w + 1, $h) # add 1 for cursor	1147	($w + 1, $h) # add 1 for cursor
1051	}	1148	}
1052		1149
1053	sub size_allocate {	1150	sub size_allocate {
1054	my ($self, $x, $y, $w, $h) = @_;	1151	my ($self, $w, $h) = @_;
1055
1056	$self->SUPER::size_allocate ($x, $y, $w, $h);
1057		1152
1058	$self->_set_text ($self->{text});	1153	$self->_set_text ($self->{text});
1059	}	1154	}
1060		1155
1061	sub set_text {	1156	sub set_text {
…		…
1086	++$self->{cursor} if $self->{cursor} < length $self->{text};	1181	++$self->{cursor} if $self->{cursor} < length $self->{text};
1087	} elsif ($sym == SDLK_HOME) {	1182	} elsif ($sym == SDLK_HOME) {
1088	$self->{cursor} = 0;	1183	$self->{cursor} = 0;
1089	} elsif ($sym == SDLK_END) {	1184	} elsif ($sym == SDLK_END) {
1090	$self->{cursor} = length $text;	1185	$self->{cursor} = length $text;
		1186	} elsif ($sym == SDLK_ESCAPE) {
		1187	$self->emit ('escape');
1091	} elsif ($uni) {	1188	} elsif ($uni) {
1092	substr $text, $self->{cursor}++, 0, chr $uni;	1189	substr $text, $self->{cursor}++, 0, chr $uni;
1093	}	1190	}
1094		1191
1095	$self->_set_text ($text);	1192	$self->_set_text ($text);
…		…
1149		1246
1150	$self->SUPER::_draw;	1247	$self->SUPER::_draw;
1151		1248
1152	#TODO: force update every cursor change :(	1249	#TODO: force update every cursor change :(
1153	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
1154	glColor @{$self->{fg}};	1259	glColor @{$self->{fg}};
1155	glBegin GL_LINES;	1260	glBegin GL_LINES;
1156	glVertex $self->{cur_x}, $self->{cur_y};
1157	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};
1158	glEnd;	1263	glEnd;
1159	}	1264	}
		1265	}
		1266
		1267	package CFClient::UI::Entry;
		1268
		1269	our @ISA = CFClient::UI::EntryBase::;
		1270
		1271	use SDL;
		1272	use SDL::OpenGL;
		1273
		1274	sub key_down {
		1275	my ($self, $ev) = @_;
		1276
		1277	my $sym = $ev->key_sym;
		1278
		1279	if ($sym == SDLK_RETURN) {
		1280	$self->emit (activate => $self->get_text);
		1281	$self->update;
		1282
		1283	} else {
		1284	$self->SUPER::key_down ($ev);
		1285	}
		1286
1160	}	1287	}
1161		1288
1162	#############################################################################	1289	#############################################################################
1163		1290
1164	package CFClient::UI::Button;	1291	package CFClient::UI::Button;
…		…
1177		1304
1178	$class->SUPER::new (	1305	$class->SUPER::new (
1179	padding => 4,	1306	padding => 4,
1180	fg => [1, 1, 1],	1307	fg => [1, 1, 1],
1181	bg => [1, 1, 1, 0.2],	1308	bg => [1, 1, 1, 0.2],
1182	active_fg => [1, 1, 0],
1183	# active_bg => [0, 0, 0, 0.5],	1309	active_fg => [0, 0, 1],
1184	# border_fg => [1, 1, 0],	1310	can_hover => 1,
		1311	align => 0,
		1312	valign => 0,
1185	@_	1313	@_
1186	)	1314	)
1187	}	1315	}
1188		1316
1189	sub button_up {	1317	sub button_up {
…		…
1197		1325
1198	sub _draw {	1326	sub _draw {
1199	my ($self) = @_;	1327	my ($self) = @_;
1200		1328
1201	local $self->{fg} = $self->{fg};	1329	local $self->{fg} = $self->{fg};
1202	my $tex = $tex[0];
1203
1204	glEnable GL_BLEND;
1205	glEnable GL_TEXTURE_2D;
1206	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1207		1330
1208	if ($GRAB == $self) {	1331	if ($GRAB == $self) {
1209	$self->{fg} = $self->{active_fg};	1332	$self->{fg} = $self->{active_fg};
1210	}	1333	}
1211		1334
1212	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;
1213	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;
1214		1340
1215	$tex->draw_quad (0, 0, $self->{w}, $self->{h});	1341	$tex[0]->draw_quad (0, 0, $self->{w}, $self->{h});
1216		1342
1217	glDisable GL_TEXTURE_2D;	1343	glDisable GL_TEXTURE_2D;
1218	glDisable GL_BLEND;	1344	glDisable GL_BLEND;
1219		1345
1220	$self->SUPER::_draw;	1346	$self->SUPER::_draw;
…		…
1223	#############################################################################	1349	#############################################################################
1224		1350
1225	package CFClient::UI::CheckBox;	1351	package CFClient::UI::CheckBox;
1226		1352
1227	our @ISA = CFClient::UI::DrawBG::;	1353	our @ISA = CFClient::UI::DrawBG::;
		1354
		1355	my @tex =
		1356	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
		1357	qw(c1_checkbox_bg.png c1_checkbox_active.png);
1228		1358
1229	use SDL;	1359	use SDL;
1230	use SDL::OpenGL;	1360	use SDL::OpenGL;
1231		1361
1232	sub new {	1362	sub new {
…		…
1235	$class->SUPER::new (	1365	$class->SUPER::new (
1236	padding => 2,	1366	padding => 2,
1237	fg => [1, 1, 1],	1367	fg => [1, 1, 1],
1238	active_fg => [1, 1, 0],	1368	active_fg => [1, 1, 0],
1239	state => 0,	1369	state => 0,
		1370	can_hover => 1,
1240	@_	1371	@_
1241	)	1372	)
1242	}	1373	}
1243		1374
1244	sub size_request {	1375	sub size_request {
1245	my ($self) = @_;	1376	my ($self) = @_;
1246		1377
1247	($self->{padding} * 2 + 6) x 2	1378	($self->{padding} * 2 + 6) x 2
1248	}
1249
1250	sub size_allocate {
1251	my ($self, $x, $y, $w, $h) = @_;
1252
1253	$self->_size_allocate ($x, $y, $w, $h);
1254	}	1379	}
1255		1380
1256	sub button_down {	1381	sub button_down {
1257	my ($self, $ev, $x, $y) = @_;	1382	my ($self, $ev, $x, $y) = @_;
1258		1383
…		…
1269	$self->SUPER::_draw;	1394	$self->SUPER::_draw;
1270		1395
1271	glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0;	1396	glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0;
1272		1397
1273	my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;	1398	my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;
1274		1399
1275	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };	1400	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1276		1401
1277	glBegin GL_LINE_LOOP;	1402	glEnable GL_BLEND;
1278	glVertex 0 , 0;	1403	glEnable GL_TEXTURE_2D;
1279	glVertex 0 , $s;	1404	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1280	glVertex $s, $s;
1281	glVertex $s, 0;
1282	glEnd;
1283		1405
1284	if ($self->{state}) {	1406	my $tex = $self->{state} ? $tex[1] : $tex[0];
1285	glBegin GL_LINES;
1286	glVertex 0 , 0;
1287	glVertex $s, $s;
1288	glVertex $s, 0;
1289	glVertex 0 , $s;
1290	glEnd;
1291	}
1292	}
1293		1407
1294	#############################################################################	1408	$tex->draw_quad (0, 0, $s, $s);
1295		1409
		1410	glDisable GL_TEXTURE_2D;
		1411	glDisable GL_BLEND;
		1412	}
		1413
		1414	#############################################################################
		1415
1296	package CFClient::UI::Slider;	1416	package CFClient::UI::VGauge;
1297		1417
1298	use strict;	1418	our @ISA = CFClient::UI::Base::;
1299		1419
1300	use SDL::OpenGL;	1420	use SDL::OpenGL;
1301		1421
1302	our @ISA = CFClient::UI::DrawBG::;	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	);
1303		1440
		1441	# eg. VGauge->new (gauge => 'food'), default gauge: food
1304	sub new {	1442	sub new {
1305	my $class = shift;	1443	my $class = shift;
1306		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;
		1519	}
		1520
		1521	#############################################################################
		1522
		1523	package CFClient::UI::Slider;
		1524
		1525	use strict;
		1526
		1527	use SDL::OpenGL;
		1528
		1529	our @ISA = CFClient::UI::DrawBG::;
		1530
		1531	my @tex =
		1532	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
		1533	qw(s1_slider.png s1_slider_bg.png);
		1534
		1535	sub new {
		1536	my $class = shift;
		1537
1307	# range [value, low, high, page]	1538	# range [value, low, high, page]
1308		1539
		1540	# TODO: 0-width page
		1541	# TODO: req_w/h are wrong with vertical
		1542	# TODO: calculations are off
1309	my $self = $class->SUPER::new (	1543	my $self = $class->SUPER::new (
1310	fg => [1, 1, 1],	1544	fg => [1, 1, 1],
1311	active_fg => [0, 0, 0],	1545	active_fg => [0, 0, 0],
1312	range => [0, 0, 100, 10],	1546	range => [0, 0, 100, 10],
1313	req_w => 40,	1547	req_w => 40,
1314	req_h => 10,	1548	req_h => 13,
1315	vertical => 0,	1549	vertical => 0,
		1550	can_hover => 1,
		1551	inner_pad => 5,
1316	@_	1552	@_
1317	);	1553	);
1318		1554
1319	$self	1555	$self
1320	}	1556	}
…		…
1341	if ($GRAB == $self) {	1577	if ($GRAB == $self) {
1342	my ($value, $lo, $hi, $page) = @{$self->{range}};	1578	my ($value, $lo, $hi, $page) = @{$self->{range}};
1343		1579
1344	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});	1580	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
1345		1581
		1582	my $inner_pad_px = $self->_calc_inner_pad_px ($w);
		1583	my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
		1584
		1585	$x -= $inner_pad_px; # substract the padding
1346	$x = $x * ($hi - $lo) / $w + $lo;	1586	$x = $x * ($hi - $lo) / $inner_w + $lo;
1347	$x = $lo if $x < $lo;	1587	$x = $lo if $x < $lo;
1348	$x = $hi - $page if $x > $hi - $page;	1588	$x = $hi - $page if $x > $hi - $page;
1349	$self->{range}[0] = $x;	1589	$self->{range}[0] = $x;
1350		1590
1351	$self->emit (changed => $x);	1591	$self->emit (changed => $x);
1352	$self->update;	1592	$self->update;
1353	}	1593	}
		1594	}
		1595
		1596	# the inner_* stuff is for generating a padding for the slider handle,
		1597	# so that the handle doesn't leave the texture. This calculation isn't 100%
		1598	# correct propably, but it does the job for now
		1599	sub _calc_inner_pad_px {
		1600	my ($self, $w) = @_;
		1601	($w / 100) * $self->{inner_pad} # % to pixels
1354	}	1602	}
1355		1603
1356	sub _draw {	1604	sub _draw {
1357	my ($self) = @_;	1605	my ($self) = @_;
1358		1606
…		…
1372	my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};	1620	my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
1373	my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};	1621	my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
1374		1622
1375	my ($value, $lo, $hi, $page) = @{$self->{range}};	1623	my ($value, $lo, $hi, $page) = @{$self->{range}};
1376		1624
		1625	$hi = $value + 1 if $lo == $hi;
		1626
		1627	my $inner_pad_px = $self->_calc_inner_pad_px ($w);
		1628	my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
		1629
1377	$page = int $page * $w / ($hi - $lo);	1630	$page = int $page * $inner_w / ($hi - $lo);
1378	$value = int +($value - $lo) * $w / ($hi - $lo);	1631	$value = int +($value - $lo) * $inner_w / ($hi - $lo);
1379		1632
1380	$w -= $page;	1633	$w -= $page;
1381	$page &= ~1;	1634	$page &= ~1;
1382	glTranslate $page * 0.5, 0, 0;	1635	glTranslate $page * 0.5, 0, 0;
1383	$page ||= 2;	1636	$page ||= 2;
1384		1637
1385	glColor @$fg;
1386	glBegin GL_LINES;
1387	glVertex 0, 0; glVertex 0, $h;
1388	glVertex $w - 1, 0; glVertex $w - 1, $h;
1389	glVertex 0, $h * 0.5; glVertex $w, $h * 0.5;
1390	glEnd;
1391
1392	my $knob_a = $value - $page * 0.5;	1638	my $knob_a = $inner_pad_px + ($value - $page * 0.5);
1393	my $knob_b = $value + $page * 0.5;	1639	my $knob_b = $inner_pad_px + ($value + $page * 0.5);
1394		1640
1395	glBegin GL_QUADS;	1641	glEnable GL_BLEND;
1396	glColor @$fg;	1642	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1397	glVertex $knob_a, 0;	1643	glEnable GL_TEXTURE_2D;
1398	glVertex $knob_a, $h;	1644	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1399	glVertex $knob_b, $h;
1400	glVertex $knob_b, 0;
1401		1645
1402	if ($knob_a < $knob_b - 2) {	1646	# draw background
1403	glColor @$bg;	1647	$tex[1]->draw_quad (0, 0, $w, $h);
1404	glVertex $knob_a + 1, 1;	1648
1405	glVertex $knob_a + 1, $h - 1;	1649	# draw handle
1406	glVertex $knob_b - 1, $h - 1;	1650	$tex[0]->draw_quad ($knob_a, 0, $knob_b - $knob_a, $h);
1407	glVertex $knob_b - 1, 1;	1651
		1652	glDisable GL_BLEND;
		1653	glDisable GL_TEXTURE_2D;
		1654	}
		1655
		1656	#############################################################################
		1657
		1658	package CFClient::UI::TextView;
		1659
		1660	our @ISA = CFClient::UI::HBox::;
		1661
		1662	use SDL::OpenGL;
		1663
		1664	sub new {
		1665	my $class = shift;
		1666
		1667	my $self = $class->SUPER::new (
		1668	req_w => $::WIDTH / 6,
		1669	req_h => $::HEIGHT / 6,
		1670	fontsize => $::FONTSIZE,
		1671	@_,
		1672
		1673	layout => (new CFClient::Layout),
		1674	par => [],
		1675	height => 0,
		1676	children => [
		1677	(new CFClient::UI::Empty expand => 1),
		1678	(new CFClient::UI::Slider vertical => 1),
		1679	],
		1680	);
		1681
		1682	$self->{children}[1]->connect (changed => sub {
		1683	$self->update;
		1684	});
		1685
		1686	$self
		1687	}
		1688
		1689	sub set_fontsize {
		1690	my ($self, $fontsize) = @_;
		1691
		1692	$self->{fontsize} = $fontsize;
		1693	$self->reflow;
		1694	}
		1695
		1696	sub text_height {
		1697	my ($self, $text) = @_;
		1698
		1699	my $layout = $self->{layout};
		1700
		1701	$layout->set_height ($self->{fontsize});
		1702	$layout->set_width ($self->{w});
		1703	$layout->set_text ($text);
1408	}	1704
1409	glEnd;	1705	($layout->size)[1]
		1706	}
		1707
		1708	sub reflow {
		1709	my ($self) = @_;
		1710
		1711	$self->{need_reflow}++;
		1712	$self->update;
		1713	}
		1714
		1715	sub size_request {
		1716	my ($self) = @_;
		1717
		1718	($self->{req_w}, $self->{req_h})
		1719	}
		1720
		1721	sub size_allocate {
		1722	my ($self, $w, $h) = @_;
		1723
		1724	$self->{layout}->set_height ($self->{fontsize});
		1725	$self->{layout}->set_width ($self->{w});
		1726
		1727	$self->reflow;
		1728	$self->update;
		1729	}
		1730
		1731	sub add_paragraph {
		1732	my ($self, $color, $text) = @_;
		1733
		1734	#TODO: intelligently "reformat" paragraph
		1735
		1736	my $height = $self->text_height ($text);
		1737
		1738	$self->{height} += $height;
		1739
		1740	push @{$self->{par}}, [$height, $color, $text];
		1741
		1742	$self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}];
		1743	$self->{children}[1]->update;
		1744	}
		1745
		1746	sub update {
		1747	my ($self) = @_;
		1748
		1749	$self->SUPER::update;
		1750
		1751	return unless $self->{h} > 0;
		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
		1769	$self->{texture} ||= new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
		1770	glClearColor 0, 0, 0, 1;
		1771	glClear GL_COLOR_BUFFER_BIT;
		1772
		1773	glEnable GL_BLEND;
		1774	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
		1775	glEnable GL_TEXTURE_2D;
		1776	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		1777
		1778	my $top = int $self->{children}[1]{range}[0];
		1779
		1780	my $y0 = $top;
		1781	my $y1 = $top + $self->{h};
		1782
		1783	my $y = 0;
		1784
		1785	my $layout = $self->{layout};
		1786
		1787	for my $par (@{$self->{par}}) {
		1788	my $h = $par->[0];
		1789
		1790	if ($y0 < $y + $h && $y < $y1) {
		1791	$layout->set_text ($par->[2]);
		1792
		1793	glColor @{ $par->[1] };
		1794	my ($W, $H) = $layout->size;
		1795	CFClient::Texture->new_from_layout ($layout)->draw_quad (0, $y - $y0);
		1796	}
		1797
		1798	$y += $h;
		1799	}
		1800
		1801	glDisable GL_TEXTURE_2D;
		1802	glDisable GL_BLEND;
		1803	};
		1804	});
		1805	}
		1806
		1807	sub _draw {
		1808	my ($self) = @_;
		1809
		1810	if ($self->{texture}) {
		1811	glEnable GL_TEXTURE_2D;
		1812	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		1813	$self->{texture}->draw_quad (0, 0, $self->{w}, $self->{h});
		1814	glDisable GL_TEXTURE_2D;
		1815	}
		1816
		1817	$self->{children}[1]->draw;
		1818
1410	}	1819	}
1411		1820
1412	#############################################################################	1821	#############################################################################
1413		1822
1414	package CFClient::UI::MapWidget;	1823	package CFClient::UI::MapWidget;
…		…
1424		1833
1425	sub new {	1834	sub new {
1426	my $class = shift;	1835	my $class = shift;
1427		1836
1428	$class->SUPER::new (	1837	$class->SUPER::new (
1429	z => -1,	1838	z => -1,
		1839	can_focus => 1,
1430	list => (glGenLists 1),	1840	list => (glGenLists 1),
1431	@_	1841	@_
1432	)	1842	)
1433	}	1843	}
1434		1844
1435	sub key_down {	1845	sub key_down {
1436	print "MAPKEYDOWN\n";	1846	print "MAPKEYDOWN\n";
1437	}	1847	}
1438		1848
1439	sub key_up {	1849	sub key_up {
		1850	}
		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};
1440	}	1884	}
1441		1885
1442	sub size_request {	1886	sub size_request {
1443	(	1887	(
1444	1 + 32 * int $::WIDTH / 32,	1888	1 + 32 * int $::WIDTH / 32,
…		…
1457	my ($self) = @_;	1901	my ($self) = @_;
1458		1902
1459	if (delete $self->{need_update}) {	1903	if (delete $self->{need_update}) {
1460	glNewList $self->{list}, GL_COMPILE;	1904	glNewList $self->{list}, GL_COMPILE;
1461		1905
1462	my $mx = $::CONN->{mapx};	1906	if ($::MAP) {
1463	my $my = $::CONN->{mapy};
1464
1465	my $map = $::CONN->{map};
1466
1467	my ($xofs, $yofs);
1468
1469	my $sw = 1 + int $::WIDTH / 32;	1907	my $sw = int $::WIDTH / 32;
1470	my $sh = 1 + int $::HEIGHT / 32;	1908	my $sh = int $::HEIGHT / 32;
1471		1909
1472	if ($::CONN->{mapw} > $sw) {	1910	my $sx = $::CFG->{map_shift_x}; my $sx0 = $sx & 31; $sx = ($sx - $sx0) / 32;
1473	$xofs = $mx + ($::CONN->{mapw} - $sw) * 0.5;	1911	my $sy = $::CFG->{map_shift_y}; my $sy0 = $sy & 31; $sy = ($sy - $sy0) / 32;
1474	} else {	1912
1475	$xofs = $self->{xofs} = min $mx, max $mx + $::CONN->{mapw} - $sw + 1, $self->{xofs};	1913	glTranslate $sx0 - 32, $sy0 - 32, 0;
		1914
		1915	my ($w, $h, $data) = $::MAP->draw ($sx, $sy, 0, 0, $sw + 1, $sh + 1);
		1916
		1917	if ($::CFG->{fow_enable}) {
		1918	if ($::CFG->{fow_smooth}) { # smooth fog of war
		1919	glConvolutionParameter (GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER);
		1920	glConvolutionFilter2D (
		1921	GL_CONVOLUTION_2D,
		1922	GL_ALPHA,
		1923	3, 3,
		1924	GL_ALPHA, GL_FLOAT,
		1925	pack "f*",
		1926	0.1, 0.1, 0.1,
		1927	0.1, 0.2, 0.1,
		1928	0.1, 0.1, 0.1,
		1929	);
		1930	glEnable GL_CONVOLUTION_2D;
		1931	}
		1932
		1933	$self->{fow_texture} = new CFClient::Texture
		1934	w => $w,
		1935	h => $h,
		1936	data => $data,
		1937	internalformat => GL_ALPHA,
		1938	format => GL_ALPHA;
		1939
		1940	glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth};
		1941
		1942	glEnable GL_BLEND;
		1943	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
		1944	glEnable GL_TEXTURE_2D;
		1945	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
		1946
		1947	glColor +($::CFG->{fow_intensity}) x 3, 1;
		1948	$self->{fow_texture}->draw_quad (0, 0, $w * 32, $h * 32);
		1949
		1950	glDisable GL_TEXTURE_2D;
		1951	glDisable GL_BLEND;
		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
1476	}	1977	}
1477		1978
1478	if ($::CONN->{maph} > $sh) {
1479	$yofs = $my + ($::CONN->{maph} - $sh) * 0.5;
1480	} else {
1481	$yofs = $self->{yofs} = min $my, max $my + $::CONN->{maph} - $sh + 1, $self->{yofs};
1482	}
1483
1484	glEnable GL_TEXTURE_2D;
1485	glEnable GL_BLEND;
1486	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1487	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1488	glColor 1, 1, 1, 1;
1489
1490	my $sw4 = ($sw + 3) & ~3;
1491	my $darkness = "\x00" x ($sw4 * $sh);
1492
1493	for my $x (0 .. $sw - 1) {
1494	my $row = $map->[$x + $xofs];
1495	for my $y (0 .. $sh - 1) {
1496
1497	my $cell = $row->[$y + $yofs]
1498	or next;
1499
1500	my $dark = $cell->[0];
1501	if ($dark < 0) {
1502	substr $darkness, $y * $sw4 + $x, 1, chr 224;
1503	} else {
1504	substr $darkness, $y * $sw4 + $x, 1, chr 255 - $dark;
1505	}
1506
1507	for my $num (grep $_, @$cell[1,2,3]) {
1508	my $tex = $::CONN->{face}[$num]{texture} || next;
1509
1510	my ($w, $h) = @$tex{qw(w h)};
1511
1512	$tex->draw_quad (($x + 1) * 32 - $w, ($y + 1) * 32 - $h, $w, $h);
1513	}
1514	}
1515	}
1516
1517	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1518
1519	if ($::CFG->{fow_smooth}) { # smooth fog of war
1520	my @conv = (
1521	0.1, 0.1, 0.1,
1522	0.1, 0.2, 0.1,
1523	0.1, 0.1, 0.1,
1524	);
1525	glConvolutionParameter GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER;
1526	glConvolutionFilter2D GL_CONVOLUTION_2D,
1527	GL_ALPHA, 3, 3, GL_ALPHA, GL_FLOAT,
1528	pack "f*", @conv;
1529	glEnable GL_CONVOLUTION_2D;
1530	}
1531
1532	$darkness = new CFClient::Texture
1533	w => $sw4,
1534	h => $sh,
1535	data => $darkness,
1536	internalformat => GL_ALPHA,
1537	format => GL_ALPHA;
1538
1539	glColor +($::CFG->{fow_intensity}) x 3, 1;
1540	$darkness->draw_quad (0, 0, $sw4 * 32, $sh * 32);
1541
1542	glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth};
1543
1544	glDisable GL_TEXTURE_2D;
1545	glDisable GL_BLEND;
1546
1547	glEndList;	1979	glEndList;
1548	}	1980	}
1549		1981
		1982	glPushMatrix;
1550	glCallList $self->{list};	1983	glCallList $self->{list};
		1984	glPopMatrix;
1551		1985
1552	if ($FOCUS != $self) {	1986	if ($FOCUS != $self) {
1553	glEnable GL_BLEND;	1987	glColor 64/255, 64/255, 64/255;
1554	glColor 0, 0, 1, 0.4;	1988	glLogicOp GL_AND;
		1989	glEnable GL_COLOR_LOGIC_OP;
1555	glBegin GL_QUADS;	1990	glBegin GL_QUADS;
1556	glVertex 0, 0;	1991	glVertex 0, 0;
1557	glVertex 0, $::HEIGHT;	1992	glVertex 0, $::HEIGHT;
1558	glVertex $::WIDTH, $::HEIGHT;	1993	glVertex $::WIDTH, $::HEIGHT;
1559	glVertex $::WIDTH, 0;	1994	glVertex $::WIDTH, 0;
1560	glEnd;	1995	glEnd;
1561	glDisable GL_BLEND;	1996	glDisable GL_COLOR_LOGIC_OP;
1562	}	1997	}
1563	}	1998	}
1564		1999
1565	my %DIR = (	2000	my %DIR = (
1566	SDLK_KP8, [1, "north"],	2001	SDLK_KP8, [1, "north"],
…		…
1583		2018
1584	my $mod = $ev->key_mod;	2019	my $mod = $ev->key_mod;
1585	my $sym = $ev->key_sym;	2020	my $sym = $ev->key_sym;
1586		2021
1587	if ($sym == SDLK_KP5) {	2022	if ($sym == SDLK_KP5) {
1588	$::CONN->user_send ("command stay fire");	2023	$::CONN->user_send ("stay fire");
1589	} elsif ($sym == SDLK_a) {	2024	} elsif ($sym == SDLK_a) {
1590	$::CONN->user_send ("command apply");	2025	$::CONN->user_send ("apply");
		2026	} elsif ($sym == SDLK_QUOTE) {
		2027	$self->emit ('activate_console');
		2028	} elsif ($sym == SDLK_SLASH) {
		2029	$self->emit ('activate_console' => '/');
1591	} elsif (exists $DIR{$sym}) {	2030	} elsif (exists $DIR{$sym}) {
1592	if ($mod & KMOD_SHIFT) {	2031	if ($mod & KMOD_SHIFT) {
1593	$self->{shft}++;	2032	$self->{shft}++;
1594	$::CONN->user_send ("command fire $DIR{$sym}[0]");	2033	$::CONN->user_send ("fire $DIR{$sym}[0]");
1595	} elsif ($mod & KMOD_CTRL) {	2034	} elsif ($mod & KMOD_CTRL) {
1596	$self->{ctrl}++;	2035	$self->{ctrl}++;
1597	$::CONN->user_send ("command run $DIR{$sym}[0]");	2036	$::CONN->user_send ("run $DIR{$sym}[0]");
1598	} else {	2037	} else {
1599	$::CONN->user_send ("command $DIR{$sym}[1]");	2038	$::CONN->user_send ("$DIR{$sym}[1]");
1600	}	2039	}
1601	}	2040	}
1602	}	2041	}
1603		2042
1604	sub key_up {	2043	sub key_up {
…		…
1606		2045
1607	my $mod = $ev->key_mod;	2046	my $mod = $ev->key_mod;
1608	my $sym = $ev->key_sym;	2047	my $sym = $ev->key_sym;
1609		2048
1610	if (!($mod & KMOD_SHIFT) && delete $self->{shft}) {	2049	if (!($mod & KMOD_SHIFT) && delete $self->{shft}) {
1611	$::CONN->user_send ("command fire_stop");	2050	$::CONN->user_send ("fire_stop");
1612	}	2051	}
1613	if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) {	2052	if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) {
1614	$::CONN->user_send ("command run_stop");	2053	$::CONN->user_send ("run_stop");
1615	}	2054	}
1616	}	2055	}
1617		2056
1618	#############################################################################	2057	#############################################################################
1619		2058
…		…
1657	glPopMatrix;	2096	glPopMatrix;
1658	}	2097	}
1659		2098
1660	#############################################################################	2099	#############################################################################
1661		2100
1662	package CFClient::UI::Toplevel;	2101	package CFClient::UI::Flopper;
		2102
		2103	our @ISA = CFClient::UI::Button::;
		2104
		2105	sub new {
		2106	my $class = shift;
		2107
		2108	my $self = $class->SUPER::new (
		2109	state => 0,
		2110	connect_activate => \&toggle_flopper,
		2111	@_
		2112	);
		2113
		2114	if ($self->{state}) {
		2115	$self->{state} = 0;
		2116	$self->toggle_flopper;
		2117	}
		2118
		2119	$self
		2120	}
		2121
		2122	sub toggle_flopper {
		2123	my ($self) = @_;
		2124
		2125	# TODO: use animation
		2126	if ($self->{state} = !$self->{state}) {
		2127	$CFClient::UI::ROOT->add ($self->{other});
		2128	$self->{other}->move ($self->coord2global (0, $self->{h}));
		2129	$self->emit ("open");
		2130	} else {
		2131	$CFClient::UI::ROOT->remove ($self->{other});
		2132	$self->emit ("close");
		2133	}
		2134
		2135	$self->emit (changed => $self->{state});
		2136	}
		2137
		2138	#############################################################################
		2139
		2140	package CFClient::UI::Root;
1663		2141
1664	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	}
1665		2151
1666	sub size_request {	2152	sub size_request {
1667	($::WIDTH, $::HEIGHT)	2153	($::WIDTH, $::HEIGHT)
1668	}	2154	}
1669		2155
1670	sub size_allocate {	2156	sub configure {
1671	my ($self, $x, $y, $w, $h) = @_;	2157	my ($self, $x, $y, $w, $h) = @_;
1672		2158
1673	$self->_size_allocate ($x, $y, $w, $h);	2159	$self->SUPER::configure ($x, $y, $w, $h);
1674		2160
1675	$_->size_allocate ($_->{x}, $_->{y}, $_->size_request)	2161	$_->configure ($_->{x}, $_->{y}, $_->size_request)
1676	for @{$self->{children}};	2162	for @{$self->{children}};
1677	}	2163	}
1678		2164
1679	sub translate {	2165	sub _topleft {
1680	my ($self, $x, $y) = @_;	2166	my ($self, $x, $y) = @_;
1681		2167
1682	($x, $y)	2168	($x, $y)
1683	}	2169	}
1684		2170
1685	sub update {	2171	sub update {
1686	my ($self) = @_;	2172	my ($self) = @_;
1687		2173
1688	$self->size_allocate (0, 0, $::WIDTH, $::HEIGHT);	2174	$self->check_size;
1689	::refresh ();	2175	::refresh ();
1690	}	2176	}
1691		2177
1692	sub add {	2178	sub add {
1693	my ($self, $widget) = @_;	2179	my ($self, $child) = @_;
1694		2180
1695	$self->SUPER::add ($widget);	2181	$self->SUPER::add ($child);
		2182	}
1696		2183
1697	$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;
1698	}	2188	}
1699		2189
1700	sub draw {	2190	sub draw {
1701	my ($self) = @_;	2191	my ($self) = @_;
1702		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
1703	$self->_draw;	2207	$self->_draw;
1704	}	2208	}
1705		2209
1706	#############################################################################	2210	#############################################################################
1707		2211
1708	package CFClient::UI;	2212	package CFClient::UI;
1709		2213
1710	$TOPLEVEL = new CFClient::UI::Toplevel;	2214	$ROOT = new CFClient::UI::Root;
1711		2215
1712	1	2216	1
1713		2217

Diff Legend

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