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.83 by root, Wed Apr 12 12:16:58 2006 UTC vs.
Revision 1.133 by root, Tue Apr 18 21:39:31 2006 UTC

…		…
7		7
8	use CFClient;	8	use CFClient;
9		9
10	our ($FOCUS, $HOVER, $GRAB); # various widgets	10	our ($FOCUS, $HOVER, $GRAB); # various widgets
11		11
12	our $TOPLEVEL;	12	our $ROOT;
13	our $BUTTON_STATE;	13	our $BUTTON_STATE;
14		14
15	# class methods for events	15	# class methods for events
16	sub feed_sdl_key_down_event {	16	sub feed_sdl_key_down_event {
17	$FOCUS->key_down ($_[0]) if $FOCUS;	17	$FOCUS->key_down ($_[0]) if $FOCUS;
…		…
24	sub feed_sdl_button_down_event {	24	sub feed_sdl_button_down_event {
25	my ($ev) = @_;	25	my ($ev) = @_;
26	my ($x, $y) = ($ev->motion_x, $ev->motion_y);	26	my ($x, $y) = ($ev->motion_x, $ev->motion_y);
27		27
28	if (!$BUTTON_STATE) {	28	if (!$BUTTON_STATE) {
29	my $widget = $TOPLEVEL->find_widget ($x, $y);	29	my $widget = $ROOT->find_widget ($x, $y);
30		30
31	$GRAB = $widget;	31	$GRAB = $widget;
32	$GRAB->update if $GRAB;	32	$GRAB->update if $GRAB;
33	}	33	}
34		34
35	$BUTTON_STATE |= 1 << ($ev->button - 1);	35	$BUTTON_STATE |= 1 << ($ev->button - 1);
36		36
37	$GRAB->button_down ($ev, $GRAB->translate ($x, $y)) if $GRAB;	37	$GRAB->button_down ($ev, $GRAB->coord2local ($x, $y)) if $GRAB;
38	}	38	}
39		39
40	sub feed_sdl_button_up_event {	40	sub feed_sdl_button_up_event {
41	my ($ev) = @_;	41	my ($ev) = @_;
42	my ($x, $y) = ($ev->motion_x, $ev->motion_y);	42	my ($x, $y) = ($ev->motion_x, $ev->motion_y);
43		43
44	my $widget = $GRAB || $TOPLEVEL->find_widget ($x, $y);	44	my $widget = $GRAB || $ROOT->find_widget ($x, $y);
45		45
46	$BUTTON_STATE &= ~(1 << ($ev->button - 1));	46	$BUTTON_STATE &= ~(1 << ($ev->button - 1));
47		47
48	$GRAB->button_up ($ev, $GRAB->translate ($x, $y)) if $GRAB;	48	$GRAB->button_up ($ev, $GRAB->coord2local ($x, $y)) if $GRAB;
49		49
50	if (!$BUTTON_STATE) {	50	if (!$BUTTON_STATE) {
51	my $grab = $GRAB; undef $GRAB;	51	my $grab = $GRAB; undef $GRAB;
52	$grab->update if $grab;	52	$grab->update if $grab;
53	$GRAB->update if $GRAB;	53	$GRAB->update if $GRAB;
…		…
56		56
57	sub feed_sdl_motion_event {	57	sub feed_sdl_motion_event {
58	my ($ev) = @_;	58	my ($ev) = @_;
59	my ($x, $y) = ($ev->motion_x, $ev->motion_y);	59	my ($x, $y) = ($ev->motion_x, $ev->motion_y);
60		60
61	my $widget = $GRAB || $TOPLEVEL->find_widget ($x, $y);	61	my $widget = $GRAB || $ROOT->find_widget ($x, $y);
62		62
63	if ($widget != $HOVER) {	63	if ($widget != $HOVER) {
64	my $hover = $HOVER; $HOVER = $widget;	64	my $hover = $HOVER; $HOVER = $widget;
65		65
66	$hover->update if $hover;	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
…		…
239	}	288	}
240		289
241	sub connect {	290	sub connect {
242	my ($self, $signal, $cb) = @_;	291	my ($self, $signal, $cb) = @_;
243		292
244	push @{ $self->{cb}{$signal} }, $cb;	293	push @{ $self->{signal_cb}{$signal} }, $cb;
245	}	294	}
246		295
247	sub emit {	296	sub emit {
248	my ($self, $signal, @args) = @_;	297	my ($self, $signal, @args) = @_;
249		298
		299	for my $cb (@{$self->{signal_cb}{$signal} || []}) {
250	$_->($self, @args)	300	$cb->($self, @args);
251	for @{$self->{cb}{$signal} || []};	301	}
252	}	302	}
253		303
254	sub DESTROY {	304	sub DESTROY {
255	my ($self) = @_;	305	my ($self) = @_;
256		306
…		…
325		375
326	$self	376	$self
327	}	377	}
328		378
329	sub add {	379	sub add {
330	my ($self, $chld) = @_;	380	my ($self, $child) = @_;
331		381
332	$chld->set_parent ($self);	382	$child->set_parent ($self);
		383
		384	use sort 'stable';
333		385
334	$self->{children} = [	386	$self->{children} = [
335	sort { $a->{z} <=> $b->{z} }	387	sort { $a->{z} <=> $b->{z} }
336	@{$self->{children}}, $chld	388	@{$self->{children}}, $child
337	];	389	];
338		390
339	$self->{w} = $self->{h} = -1;	391	$self->{w} = $self->{h} = -1;
340	$self->update;	392
		393	$child->check_size;
341	}	394	}
342		395
343	sub remove {	396	sub remove {
344	my ($self, $widget) = @_;	397	my ($self, $widget) = @_;
345		398
346	$self->{children} = [ grep $_ != $widget, @{ $self->{children} } ];	399	$self->{children} = [ grep $_ != $widget, @{ $self->{children} } ];
347		400
348	$self->size_allocate (0, 0, $self->{w}, $self->{h});	401	$self->check_size;
349	}	402	}
350		403
351	sub find_widget {	404	sub find_widget {
352	my ($self, $x, $y) = @_;	405	my ($self, $x, $y) = @_;
353		406
…		…
406	sub size_request {	459	sub size_request {
407	$_[0]{children}[0]->size_request	460	$_[0]{children}[0]->size_request
408	}	461	}
409		462
410	sub size_allocate {	463	sub size_allocate {
411	my ($self, $x, $y, $w, $h) = @_;	464	my ($self, $w, $h) = @_;
412		465
413	$self->_size_allocate ($x, $y, $w, $h) or return;
414
415	$self->{children}[0]->size_allocate (0, 0, $w, $h);	466	$self->{children}[0]->configure (0, 0, $w, $h);
416	}	467	}
417		468
418	#############################################################################	469	#############################################################################
419		470
420	package CFClient::UI::Window;	471	package CFClient::UI::Window;
…		…
438	}	489	}
439		490
440	sub render_chld {	491	sub render_chld {
441	my ($self) = @_;	492	my ($self) = @_;
442		493
443	$self->{texture} =	494	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
444	CFClient::Texture->new_from_opengl (	495	glClearColor 0, 0, 0, 1;
445	$self->{w}, $self->{h}, sub { $self->child->draw }	496	glClear GL_COLOR_BUFFER_BIT;
446	);	497	$self->child->draw;
		498	};
447	}	499	}
448		500
449	sub size_allocate {	501	sub size_allocate {
450	my ($self, $x, $y, $w, $h) = @_;	502	my ($self, $w, $h) = @_;
451		503
452	$self->_size_allocate ($x, $y, $w, $h) or return;
453
454	$self->child->size_allocate (0, 0, $w, $h);	504	$self->child->configure (0, 0, $w, $h);
455		505
456	$self->render_chld;	506	$self->render_chld;
457	}	507	}
458		508
459	sub _draw {	509	sub _draw {
…		…
475	glDisable GL_TEXTURE_2D;	525	glDisable GL_TEXTURE_2D;
476	}	526	}
477		527
478	#############################################################################	528	#############################################################################
479		529
		530	package CFClient::UI::ViewPort;
		531
		532	our @ISA = CFClient::UI::Window::;
		533
		534	sub new { die }
		535
		536	sub size_request {
		537	my ($self) = @_;
		538
		539	@$self{qw(child_w child_h)} = $self->child->size_request;
		540	$self->child->size_allocate (0, 0, @$self{qw(child_w child_h)});
		541
		542	@$self{qw(child_w child_h)}
		543	}
		544
		545	sub _draw {
		546	my ($self) = @_;
		547
		548	$self->{children}[1]->draw;
		549	}
		550
		551
		552	#############################################################################
		553
480	package CFClient::UI::Frame;	554	package CFClient::UI::Frame;
481		555
482	our @ISA = CFClient::UI::Bin::;	556	our @ISA = CFClient::UI::Bin::;
483		557
484	use SDL::OpenGL;	558	use SDL::OpenGL;
…		…
494	}	568	}
495		569
496	sub size_allocate {	570	sub size_allocate {
497	my ($self, $x, $y, $w, $h) = @_;	571	my ($self, $x, $y, $w, $h) = @_;
498		572
499	$self->_size_allocate ($x, $y, $w, $h) or return;
500
501	$self->child->size_allocate (2, 2, $w - 4, $h - 4);	573	$self->child->configure (2, 2, $w - 4, $h - 4);
502	}	574	}
503		575
504	sub _draw {	576	sub _draw {
505	my ($self) = @_;	577	my ($self) = @_;
506		578
…		…
529		601
530	my @tex =	602	my @tex =
531	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }	603	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);	604	qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
533		605
		606	sub new {
		607	my $class = shift;
		608
		609	# TODO: user_x, user_y, overwrite moveto?
		610
		611	$class->SUPER::new (
		612	bg => [1, 1, 1, 1],
		613	border_bg => [1, 1, 1, 1],
		614	border => int $::FONTSIZE * 0.8,
		615	@_
		616	)
		617	}
		618
534	sub size_request {	619	sub size_request {
535	my ($self) = @_;	620	my ($self) = @_;
536		621
537	return ($self->{user_w}, $self->{user_h}) if $self->{user_w} && $self->{user_h};	622	return ($self->{user_w}, $self->{user_h}) if $self->{user_w} && $self->{user_h};
538		623
539	my ($w, $h) = $self->SUPER::size_request;	624	my ($w, $h) = $self->SUPER::size_request;
540		625
541	$h += $tex[1]->{h};	626	(
542	$h += $tex[4]->{h};	627	$w + $self->{border} * 2,
543	$w += $tex[2]->{w};	628	$h + $self->{border} * 2,
544	$w += $tex[3]->{w};	629	)
545
546	($w, $h)
547	}	630	}
548		631
549	sub size_allocate {	632	sub size_allocate {
550	my ($self, $x, $y, $w, $h) = @_;	633	my ($self, $w, $h) = @_;
551		634
552	$self->_size_allocate ($x, $y, $w, $h) or return;	635	$h -= List::Util::max 0, $self->{border} * 2;
		636	$w -= List::Util::max 0, $self->{border} * 2;
553		637
554	$h -= $tex[1]{h};	638	$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	}	639	}
566		640
567	sub button_down {	641	sub button_down {
568	my ($self, $ev, $x, $y) = @_;	642	my ($self, $ev, $x, $y) = @_;
569		643
570	if ($x < $self->{w} && $x >= $self->{w} - $tex[2]{w}	644	if ($x < $self->{w} && $x >= $self->{w} - $self->{border}
571	&& $y < $self->{h} && $y >= $self->{h} - $tex[4]{h}) {	645	&& $y < $self->{h} && $y >= $self->{h} - $self->{border}) {
572		646
573	my ($ox, $oy) = ($ev->button_x, $ev->button_y);	647	my ($ox, $oy) = ($ev->button_x, $ev->button_y);
574	my ($bw, $bh) = ($self->{w}, $self->{h});	648	my ($bw, $bh) = ($self->{w}, $self->{h});
575		649
576	$self->{motion} = sub {	650	$self->{motion} = sub {
…		…
578		652
579	($x, $y) = ($ev->motion_x, $ev->motion_y);	653	($x, $y) = ($ev->motion_x, $ev->motion_y);
580		654
581	$self->{user_w} = $bw + $x - $ox;	655	$self->{user_w} = $bw + $x - $ox;
582	$self->{user_h} = $bh + $y - $oy;	656	$self->{user_h} = $bh + $y - $oy;
583	$self->update;	657	$self->check_size;
584	};	658	};
585		659
586	} elsif ($x >= 0 && $x < $self->{w}	660	} elsif ($x >= 0 && $x < $self->{w}
587	&& $y >= 0 && $y < $tex[1]{h}) {	661	&& $y >= 0 && $y < $self->{border}) {
588		662
589	my ($ox, $oy) = ($ev->button_x, $ev->button_y);	663	my ($ox, $oy) = ($ev->button_x, $ev->button_y);
590	my ($bx, $by) = ($self->{x}, $self->{y});	664	my ($bx, $by) = ($self->{x}, $self->{y});
591		665
592	$self->{motion} = sub {	666	$self->{motion} = sub {
…		…
613	}	687	}
614		688
615	sub _draw {	689	sub _draw {
616	my ($self) = @_;	690	my ($self) = @_;
617		691
618	my ($w, $h) = ($self->{w}, $self->{h});	692	my ($w, $h ) = ($self->{w}, $self->{h});
619	my ($cw, $ch) = ($self->child->{w}, $self->child->{h});	693	my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
620		694
621	glEnable GL_BLEND;	695	glEnable GL_BLEND;
622	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	696	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
623	glEnable GL_TEXTURE_2D;	697	glEnable GL_TEXTURE_2D;
624	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	698	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
625		699
626	my $top = $tex[1];	700	glColor @{ $self->{border_bg} };
627	$top->draw_quad (0, 0, $w, $top->{h});	701	$tex[1]->draw_quad (0, 0, $w, $self->{border});
628		702	$tex[3]->draw_quad (0, $self->{border}, $self->{border}, $ch);
629	my $left = $tex[3];	703	$tex[2]->draw_quad ($w - $self->{border}, $self->{border}, $self->{border}, $ch);
630	$left->draw_quad (0, $top->{h}, $left->{w}, $ch);	704	$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		705
638	my $bg = $tex[0];	706	my $bg = $tex[0];
639		707
640	glBindTexture GL_TEXTURE_2D, $bg->{name};	708	# TODO: repeat texture not scale
641	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
642
643	my $rep_x = $cw / $bg->{w};	709	my $rep_x = $cw / $bg->{w};
644	my $rep_y = $ch / $bg->{h};	710	my $rep_y = $ch / $bg->{h};
645		711
		712	glColor @{ $self->{bg} };
		713
		714	$bg->{s} = $rep_x;
		715	$bg->{t} = $rep_y;
		716	$bg->{wrap_mode} = 1;
646	$bg->draw_quad ($left->{w}, $top->{h}, $cw, $ch);	717	$bg->draw_quad ($self->{border}, $self->{border}, $cw, $ch);
647		718
648	glDisable GL_TEXTURE_2D;	719	glDisable GL_TEXTURE_2D;
649	glDisable GL_BLEND;	720	glDisable GL_BLEND;
650		721
651	$self->child->draw;	722	$self->child->draw;
652
653	}	723	}
654		724
655	#############################################################################	725	#############################################################################
656		726
657	package CFClient::UI::Table;	727	package CFClient::UI::Table;
…		…
670	@_	740	@_
671	)	741	)
672	}	742	}
673		743
674	sub add {	744	sub add {
675	my ($self, $x, $y, $chld) = @_;	745	my ($self, $x, $y, $child) = @_;
676		746
		747	$child->set_parent ($self);
677	$self->{children}[$y][$x] = $chld;	748	$self->{children}[$y][$x] = $child;
678	$chld->set_parent ($self);
679		749
680	$self->{w} = $self->{h} = -1;	750	$self->{w} = $self->{h} = -1;
		751
		752	$child->check_size;
		753	}
		754
		755	# TODO: move to container class maybe? send childs a signal on removal?
		756	sub clear {
		757	my ($self) = @_;
		758
		759	delete $self->{children};
681	$self->update;	760	$self->update;
682	}	761	}
683		762
684	sub get_wh {	763	sub get_wh {
685	my ($self) = @_;	764	my ($self) = @_;
…		…
713	(sum @$hs),	792	(sum @$hs),
714	)	793	)
715	}	794	}
716		795
717	sub size_allocate {	796	sub size_allocate {
718	my ($self, $x, $y, $w, $h) = @_;	797	my ($self, $w, $h) = @_;
719
720	$self->_size_allocate ($x, $y, $w, $h) or return;
721		798
722	my ($ws, $hs) = $self->get_wh;	799	my ($ws, $hs) = $self->get_wh;
723		800
724	my $req_w = sum @$ws;	801	my $req_w = sum @$ws;
725	my $req_h = sum @$hs;	802	my $req_h = sum @$hs;
…		…
730	my $col_expand = (sum @col_expand) || 1;	807	my $col_expand = (sum @col_expand) || 1;
731		808
732	# linearly scale sizes	809	# linearly scale sizes
733	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;	810	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
734	$hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;	811	$hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
		812
		813	CFClient::UI::harmonize $ws;
		814	CFClient::UI::harmonize $hs;
735		815
736	my $y;	816	my $y;
737		817
738	for my $r (0 .. $#{$self->{children}}) {	818	for my $r (0 .. $#{$self->{children}}) {
739	my $row = $self->{children}[$r]	819	my $row = $self->{children}[$r]
…		…
744		824
745	for my $c (0 .. $#$row) {	825	for my $c (0 .. $#$row) {
746	my $col_w = $ws->[$c];	826	my $col_w = $ws->[$c];
747		827
748	if (my $widget = $row->[$c]) {	828	if (my $widget = $row->[$c]) {
749	$widget->size_allocate ($x, $y, $col_w, $row_h);	829	$widget->configure ($x, $y, $col_w, $row_h);
750	}	830	}
751		831
752	$x += $col_w;	832	$x += $col_w;
753	}	833	}
754		834
…		…
799	(List::Util::max map $_->[1], @alloc),	879	(List::Util::max map $_->[1], @alloc),
800	)	880	)
801	}	881	}
802		882
803	sub size_allocate {	883	sub size_allocate {
804	my ($self, $x, $y, $w, $h) = @_;	884	my ($self, $w, $h) = @_;
805
806	$self->_size_allocate ($x, $y, $w, $h) or return;
807
808	return unless $self->{w};
809		885
810	($h, $w) = ($w, $h);	886	($h, $w) = ($w, $h);
811		887
812	my $children = $self->{children};	888	my $children = $self->{children};
813		889
…		…
829	$alloc_h += ($h - $req_h) * $child->{expand} / $exp;	905	$alloc_h += ($h - $req_h) * $child->{expand} / $exp;
830	$h[$_] = $alloc_h;	906	$h[$_] = $alloc_h;
831	}	907	}
832	}	908	}
833		909
		910	CFClient::UI::harmonize \@h;
		911
834	my $y = 0;	912	my $y = 0;
835	for (0 .. $#$children) {	913	for (0 .. $#$children) {
836	my $child = $children->[$_];	914	my $child = $children->[$_];
837	my $h = $h[$_];	915	my $h = $h[$_];
838	$child->size_allocate ($y, 0, $h, $w);	916	$child->configure ($y, 0, $h, $w);
839		917
840	$y += $h;	918	$y += $h;
841	}	919	}
		920
		921	1
842	}	922	}
843		923
844	#############################################################################	924	#############################################################################
845		925
846	package CFClient::UI::VBox;	926	package CFClient::UI::VBox;
…		…
859	(List::Util::sum map $_->[1], @alloc),	939	(List::Util::sum map $_->[1], @alloc),
860	)	940	)
861	}	941	}
862		942
863	sub size_allocate {	943	sub size_allocate {
864	my ($self, $x, $y, $w, $h) = @_;	944	my ($self, $w, $h) = @_;
865
866	$self->_size_allocate ($x, $y, $w, $h) or return;
867
868	return unless $self->{h};
869		945
870	my $children = $self->{children};	946	my $children = $self->{children};
871		947
872	my @h = map +($_->size_request)[1], @$children;	948	my @h = map +($_->size_request)[1], @$children;
873		949
…		…
885		961
886	$h[$_] += ($h - $req_h) * $child->{expand} / $exp;	962	$h[$_] += ($h - $req_h) * $child->{expand} / $exp;
887	}	963	}
888	}	964	}
889		965
		966	CFClient::UI::harmonize \@h;
		967
890	my $y = 0;	968	my $y = 0;
891	for (0 .. $#$children) {	969	for (0 .. $#$children) {
892	my $child = $children->[$_];	970	my $child = $children->[$_];
893	my $h = $h[$_];	971	my $h = $h[$_];
894	$child->size_allocate (0, $y, $w, $h);	972	$child->configure (0, $y, $w, $h);
895		973
896	$y += $h;	974	$y += $h;
897	}	975	}
		976
		977	1
898	}	978	}
899		979
900	#############################################################################	980	#############################################################################
901		981
902	package CFClient::UI::Label;	982	package CFClient::UI::Label;
…		…
907		987
908	sub new {	988	sub new {
909	my ($class, %arg) = @_;	989	my ($class, %arg) = @_;
910		990
911	my $self = $class->SUPER::new (	991	my $self = $class->SUPER::new (
912	fg => [1, 1, 1],	992	fg => [1, 1, 1],
913	height => $::FONTSIZE,	993	fontsize => $::FONTSIZE,
914	text => "",	994	text => "",
915	align => -1,	995	align => -1,
		996	valign => -1,
916	padding => 2,	997	padding => 2,
917	layout => new CFClient::Layout,	998	layout => new CFClient::Layout,
918	%arg	999	%arg
919	);	1000	);
920		1001
921	$self->set_text ($self->{text});	1002	$self->{xxx}++ if $self->{text} eq "Client Setup" && $self->{align};#d#
		1003
		1004	$self->set_text (delete $self->{text}) if exists $self->{text};
		1005	$self->set_markup (delete $self->{markup}) if exists $self->{markup};
922		1006
923	$self	1007	$self
924	}	1008	}
925		1009
926	sub escape_text {	1010	sub escape_text {
…		…
934	}	1018	}
935		1019
936	sub set_text {	1020	sub set_text {
937	my ($self, $text) = @_;	1021	my ($self, $text) = @_;
938		1022
939	$self->{text} = $text;
940	$self->{layout}->set_markup ($text);	1023	$self->{layout}->set_text ($text);
941		1024
942	delete $self->{texture};	1025	delete $self->{texture};
943	# $self->{w} = $self->{h} = -1;
944	$self->update;	1026	$self->update;
945	}	1027	}
946		1028
947	sub get_text {	1029	sub set_markup {
948	my ($self, $text) = @_;	1030	my ($self, $markup) = @_;
949		1031
950	$self->{text}	1032	$self->{layout}->set_markup ($markup);
		1033
		1034	delete $self->{texture};
		1035	$self->update;
951	}	1036	}
952		1037
953	sub size_request {	1038	sub size_request {
954	my ($self) = @_;	1039	my ($self) = @_;
955		1040
956	$self->{layout}->set_width;	1041	$self->{layout}->set_width;
957	$self->{layout}->set_height ($self->{height});	1042	$self->{layout}->set_height ($self->{fontsize});
		1043
958	my ($w, $h) = $self->{layout}->size;	1044	my ($w, $h) = $self->{layout}->size;
959		1045
960	(	1046	(
961	$w + $self->{padding} * 2,	1047	$w + $self->{padding} * 2,
962	$h + $self->{padding} * 2,	1048	$h + $self->{padding} * 2,
963	)	1049	)
964	}	1050	}
965		1051
966	sub size_allocate {	1052	sub size_allocate {
967	my ($self, $x, $y, $w, $h) = @_;	1053	my ($self, $w, $h) = @_;
968
969	$self->_size_allocate ($x, $y, $w, $h) or return;
970		1054
971	delete $self->{texture};	1055	delete $self->{texture};
972	}	1056	}
973		1057
974	sub update {	1058	sub update {
…		…
981	sub _draw {	1065	sub _draw {
982	my ($self) = @_;	1066	my ($self) = @_;
983		1067
984	my $tex = $self->{texture} ||= do {	1068	my $tex = $self->{texture} ||= do {
985	$self->{layout}->set_width ($self->{w});	1069	$self->{layout}->set_width ($self->{w});
986	$self->{layout}->set_height (List::Util::min $self->{h} - $self->{padding} * 2, $self->{height});	1070	$self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize});
987	new_from_layout CFClient::Texture $self->{layout}	1071	new_from_layout CFClient::Texture $self->{layout}
988	};	1072	};
989		1073
990	glEnable GL_BLEND;	1074	glEnable GL_BLEND;
991	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	1075	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
992	glEnable GL_TEXTURE_2D;	1076	glEnable GL_TEXTURE_2D;
993	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	1077	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
994		1078
995	glColor @{$self->{fg}};	1079	glColor @{$self->{fg}};
996		1080
997	my $x =	1081	$self->{ox} = int (
998	$self->{align} < 0 ? $self->{padding}	1082	$self->{align} < 0 ? $self->{padding}
999	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}	1083	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1000	: ($self->{w} - $tex->{w}) * 0.5;	1084	: ($self->{w} - $tex->{w}) * 0.5
		1085	);
1001		1086
1002	glTranslate $x, $self->{padding}, 0;	1087	$self->{oy} = int (
1003	$tex->draw_quad (0, 0);	1088	$self->{valign} < 0 ? $self->{padding}
		1089	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
		1090	: ($self->{h} - $tex->{h}) * 0.5
		1091	);
		1092
		1093	$tex->draw_quad ($self->{ox}, $self->{oy});
1004		1094
1005	glDisable GL_TEXTURE_2D;	1095	glDisable GL_TEXTURE_2D;
1006	glDisable GL_BLEND;	1096	glDisable GL_BLEND;
1007	}	1097	}
1008		1098
1009	#############################################################################	1099	#############################################################################
1010		1100
1011	package CFClient::UI::Entry;	1101	package CFClient::UI::EntryBase;
1012		1102
1013	our @ISA = CFClient::UI::Label::;	1103	our @ISA = CFClient::UI::Label::;
1014		1104
1015	use SDL;	1105	use SDL;
1016	use SDL::OpenGL;	1106	use SDL::OpenGL;
…		…
1021	$class->SUPER::new (	1111	$class->SUPER::new (
1022	fg => [1, 1, 1],	1112	fg => [1, 1, 1],
1023	bg => [0, 0, 0, 0.2],	1113	bg => [0, 0, 0, 0.2],
1024	active_bg => [1, 1, 1, 0.5],	1114	active_bg => [1, 1, 1, 0.5],
1025	active_fg => [0, 0, 0],	1115	active_fg => [0, 0, 0],
		1116	can_hover => 1,
		1117	can_focus => 1,
		1118	valign => 0,
1026	@_	1119	@_
1027	)	1120	)
1028	}	1121	}
1029		1122
1030	sub _set_text {	1123	sub _set_text {
1031	my ($self, $text) = @_;	1124	my ($self, $text) = @_;
1032		1125
		1126	delete $self->{cur_h};
		1127
		1128	return if $self->{text} eq $text;
		1129
1033	$self->{last_activity} = $::NOW;	1130	$self->{last_activity} = $::NOW;
1034
1035	$self->{text} = $text;	1131	$self->{text} = $text;
1036	$self->{layout}->set_width ($self->{w});
1037	$self->{layout}->set_height (List::Util::min $self->{h} - $self->{padding} * 2, $self->{height});
1038		1132
1039	$text =~ s/./*/g if $self->{hidden};	1133	$text =~ s/./*/g if $self->{hidden};
		1134	$self->{layout}->set_text ("$text ");
1040		1135
1041	$self->{layout}->set_markup ($self->escape_text ($text) . " ");	1136	$self->emit (changed => $self->{text});
		1137	}
1042		1138
1043	$text = substr $text, 0, $self->{cursor};	1139	sub get_text {
1044	utf8::encode $text;	1140	$_[0]{text}
1045
1046	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text);
1047	}	1141	}
1048		1142
1049	sub size_request {	1143	sub size_request {
1050	my ($self) = @_;	1144	my ($self) = @_;
1051		1145
…		…
1053		1147
1054	($w + 1, $h) # add 1 for cursor	1148	($w + 1, $h) # add 1 for cursor
1055	}	1149	}
1056		1150
1057	sub size_allocate {	1151	sub size_allocate {
1058	my ($self, $x, $y, $w, $h) = @_;	1152	my ($self, $w, $h) = @_;
1059
1060	$self->SUPER::size_allocate ($x, $y, $w, $h);
1061		1153
1062	$self->_set_text ($self->{text});	1154	$self->_set_text ($self->{text});
1063	}	1155	}
1064		1156
1065	sub set_text {	1157	sub set_text {
…		…
1090	++$self->{cursor} if $self->{cursor} < length $self->{text};	1182	++$self->{cursor} if $self->{cursor} < length $self->{text};
1091	} elsif ($sym == SDLK_HOME) {	1183	} elsif ($sym == SDLK_HOME) {
1092	$self->{cursor} = 0;	1184	$self->{cursor} = 0;
1093	} elsif ($sym == SDLK_END) {	1185	} elsif ($sym == SDLK_END) {
1094	$self->{cursor} = length $text;	1186	$self->{cursor} = length $text;
		1187	} elsif ($sym == SDLK_ESCAPE) {
		1188	$self->emit ('escape');
1095	} elsif ($uni) {	1189	} elsif ($uni) {
1096	substr $text, $self->{cursor}++, 0, chr $uni;	1190	substr $text, $self->{cursor}++, 0, chr $uni;
1097	}	1191	}
1098		1192
1099	$self->_set_text ($text);	1193	$self->_set_text ($text);
…		…
1153		1247
1154	$self->SUPER::_draw;	1248	$self->SUPER::_draw;
1155		1249
1156	#TODO: force update every cursor change :(	1250	#TODO: force update every cursor change :(
1157	if ($FOCUS == $self && (($::NOW - $self->{last_activity}) & 1023) < 600) {	1251	if ($FOCUS == $self && (($::NOW - $self->{last_activity}) & 1023) < 600) {
		1252
		1253	unless (exists $self->{cur_h}) {
		1254	my $text = substr $self->{text}, 0, $self->{cursor};
		1255	utf8::encode $text;
		1256
		1257	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
		1258	}
		1259
1158	glColor @{$self->{fg}};	1260	glColor @{$self->{fg}};
1159	glBegin GL_LINES;	1261	glBegin GL_LINES;
1160	glVertex $self->{cur_x}, $self->{cur_y};
1161	glVertex $self->{cur_x}, $self->{cur_y} + $self->{cur_h};	1262	glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};
		1263	glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1162	glEnd;	1264	glEnd;
1163	}	1265	}
1164	}	1266	}
1165		1267
1166	#############################################################################
1167
1168	package CFClient::UI::Button;	1268	package CFClient::UI::Entry;
1169		1269
1170	our @ISA = CFClient::UI::Label::;	1270	our @ISA = CFClient::UI::EntryBase::;
1171		1271
1172	use SDL;	1272	use SDL;
1173	use SDL::OpenGL;	1273	use SDL::OpenGL;
		1274
		1275	sub key_down {
		1276	my ($self, $ev) = @_;
		1277
		1278	my $sym = $ev->key_sym;
		1279
		1280	if ($sym == SDLK_RETURN) {
		1281	$self->emit (activate => $self->get_text);
		1282	$self->update;
		1283
		1284	} else {
		1285	$self->SUPER::key_down ($ev);
		1286	}
		1287
		1288	}
		1289
		1290	#############################################################################
		1291
		1292	package CFClient::UI::Button;
		1293
		1294	our @ISA = CFClient::UI::Label::;
		1295
		1296	use SDL;
		1297	use SDL::OpenGL;
		1298
		1299	my @tex =
		1300	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
		1301	qw(b1_button_active.png);
1174		1302
1175	sub new {	1303	sub new {
1176	my $class = shift;	1304	my $class = shift;
1177		1305
1178	$class->SUPER::new (	1306	$class->SUPER::new (
1179	padding => 4,	1307	padding => 4,
1180	fg => [1, 1, 1],	1308	fg => [1, 1, 1],
1181	bg => [1, 1, 1, 0.2],	1309	bg => [1, 1, 1, 0.2],
1182	active_bg => [0, 0, 0, 0.5],	1310	active_fg => [0, 0, 1],
1183	active_fg => [1, 1, 0],	1311	can_hover => 1,
1184	border_fg => [1, 1, 0],	1312	align => 0,
		1313	valign => 0,
1185	@_	1314	@_
1186	)	1315	)
1187	}	1316	}
1188		1317
1189	sub button_up {	1318	sub button_up {
…		…
1198	sub _draw {	1327	sub _draw {
1199	my ($self) = @_;	1328	my ($self) = @_;
1200		1329
1201	local $self->{fg} = $self->{fg};	1330	local $self->{fg} = $self->{fg};
1202		1331
		1332	if ($GRAB == $self) {
		1333	$self->{fg} = $self->{active_fg};
		1334	}
		1335
1203	glEnable GL_BLEND;	1336	glEnable GL_BLEND;
1204	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	1337	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
		1338	glEnable GL_TEXTURE_2D;
		1339	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		1340	glColor 0, 0, 0, 1;
1205		1341
1206	glTranslate 0.375, 0.375, 0; # make line and polyogon coordinates behave similarly	1342	$tex[0]->draw_quad (0, 0, $self->{w}, $self->{h});
1207		1343
1208	glBegin GL_LINE_LOOP;	1344	glDisable GL_TEXTURE_2D;
1209	glColor @{$self->{border_fg}};
1210	glVertex 1 , 1;
1211	glVertex 1 , $self->{h} - 2;
1212	glVertex $self->{w} - 2, $self->{h} - 2;
1213	glVertex $self->{w} - 2, 1;
1214	glEnd;
1215
1216	if ($GRAB == $self) {
1217	glColor @{$self->{active_bg}};
1218	$self->{fg} = $self->{active_fg};
1219	} else {
1220	glColor @{$self->{bg}};
1221	}
1222
1223	glBegin GL_QUADS;
1224	glVertex 2 , 2;
1225	glVertex 2 , $self->{h} - 2;
1226	glVertex $self->{w} - 2, $self->{h} - 2;
1227	glVertex $self->{w} - 2, 2;
1228	glEnd;
1229	glDisable GL_BLEND;	1345	glDisable GL_BLEND;
1230		1346
1231	$self->SUPER::_draw;	1347	$self->SUPER::_draw;
1232	}	1348	}
1233		1349
1234	#############################################################################	1350	#############################################################################
1235		1351
1236	package CFClient::UI::Slider;	1352	package CFClient::UI::CheckBox;
1237		1353
1238	use strict;	1354	our @ISA = CFClient::UI::DrawBG::;
1239		1355
		1356	my @tex =
		1357	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
		1358	qw(c1_checkbox_bg.png c1_checkbox_active.png);
		1359
		1360	use SDL;
1240	use SDL::OpenGL;	1361	use SDL::OpenGL;
1241
1242	our @ISA = CFClient::UI::DrawBG::;
1243		1362
1244	sub new {	1363	sub new {
1245	my $class = shift;	1364	my $class = shift;
1246		1365
		1366	$class->SUPER::new (
		1367	padding => 2,
		1368	fg => [1, 1, 1],
		1369	active_fg => [1, 1, 0],
		1370	state => 0,
		1371	can_hover => 1,
		1372	@_
		1373	)
		1374	}
		1375
		1376	sub size_request {
		1377	my ($self) = @_;
		1378
		1379	($self->{padding} * 2 + 6) x 2
		1380	}
		1381
		1382	sub button_down {
		1383	my ($self, $ev, $x, $y) = @_;
		1384
		1385	if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}
		1386	&& $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {
		1387	$self->{state} = !$self->{state};
		1388	$self->emit (changed => $self->{state});
		1389	}
		1390	}
		1391
		1392	sub _draw {
		1393	my ($self) = @_;
		1394
		1395	$self->SUPER::_draw;
		1396
		1397	glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0;
		1398
		1399	my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;
		1400
		1401	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
		1402
		1403	glEnable GL_BLEND;
		1404	glEnable GL_TEXTURE_2D;
		1405	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
		1406
		1407	my $tex = $self->{state} ? $tex[1] : $tex[0];
		1408
		1409	$tex->draw_quad (0, 0, $s, $s);
		1410
		1411	glDisable GL_TEXTURE_2D;
		1412	glDisable GL_BLEND;
		1413	}
		1414
		1415	#############################################################################
		1416
		1417	package CFClient::UI::VGauge;
		1418
		1419	our @ISA = CFClient::UI::Base::;
		1420
		1421	use SDL::OpenGL;
		1422
		1423	my %tex = (
		1424	food => [
		1425	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
		1426	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
		1427	],
		1428	grace => [
		1429	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
		1430	qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png/
		1431	],
		1432	hp => [
		1433	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
		1434	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
		1435	],
		1436	mana => [
		1437	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
		1438	qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png/
		1439	],
		1440	);
		1441
		1442	# eg. VGauge->new (gauge => 'food'), default gauge: food
		1443	sub new {
		1444	my $class = shift;
		1445
		1446	my $self = $class->SUPER::new (gauge => 'food', @_);
		1447
		1448	$self
		1449	}
		1450
		1451	sub size_request {
		1452	my ($self) = @_;
		1453
		1454	my $tex = $tex{$self->{gauge}}[0];
		1455
		1456	@$tex{qw(w h)}
		1457	}
		1458
		1459	sub set_max {
		1460	my ($self, $max) = @_;
		1461
		1462	$self->{max_val} = $max;
		1463	}
		1464
		1465	sub set_value {
		1466	my ($self, $val, $max) = @_;
		1467
		1468	$self->set_max ($max)
		1469	if defined $max;
		1470
		1471	$max = $self->{max_val};
		1472	$self->{val} = $val;
		1473
		1474	$self->update;
		1475	}
		1476
		1477	sub _draw {
		1478	my ($self) = @_;
		1479
		1480	my $tex = $tex{$self->{gauge}};
		1481
		1482	my ($w, $h) = ($self->{w}, $self->{h});
		1483
		1484	my $ycut = $self->{val} / ($self->{max_val} || 1);
		1485	$ycut = 1 if $self->{val} > $self->{max_val};
		1486
		1487	my $t1 = $tex->[0];
		1488	my $t2 = $tex->[1];
		1489
		1490	glEnable GL_BLEND;
		1491	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
		1492	glEnable GL_TEXTURE_2D;
		1493	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		1494
		1495	my $h1 = $self->{h} - $ycut * $self->{h};
		1496	my $h2 = $ycut * $self->{h};
		1497
		1498	my $yp = 0;
		1499
		1500	glBindTexture GL_TEXTURE_2D, $t1->{name};
		1501	glBegin GL_QUADS;
		1502	glTexCoord 0 , 0; glVertex 0 , $yp;
		1503	glTexCoord 0 , $t1->{t} * (1 - $ycut); glVertex 0 , $yp + $h1;
		1504	glTexCoord $t1->{s}, $t1->{t} * (1 - $ycut); glVertex 0 + $w, $yp + $h1;
		1505	glTexCoord $t1->{s}, 0; glVertex 0 + $w, $yp;
		1506	glEnd;
		1507
		1508	$yp += $h1;
		1509
		1510	glBindTexture GL_TEXTURE_2D, $t2->{name};
		1511	glBegin GL_QUADS;
		1512	glTexCoord 0 , $t2->{t} * (1 - $ycut); glVertex 0 , $yp;
		1513	glTexCoord 0 , $t2->{t}; glVertex 0 , $yp + $h2;
		1514	glTexCoord $t2->{s}, $t2->{t}; glVertex 0 + $w, $yp + $h2;
		1515	glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut); glVertex 0 + $w, $yp;
		1516	glEnd;
		1517
		1518	glDisable GL_BLEND;
		1519	glDisable GL_TEXTURE_2D;
		1520	}
		1521
		1522	#############################################################################
		1523
		1524	package CFClient::UI::Slider;
		1525
		1526	use strict;
		1527
		1528	use SDL::OpenGL;
		1529
		1530	our @ISA = CFClient::UI::DrawBG::;
		1531
		1532	my @tex =
		1533	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
		1534	qw(s1_slider.png s1_slider_bg.png);
		1535
		1536	sub new {
		1537	my $class = shift;
		1538
1247	# range [value, low, high, page]	1539	# range [value, low, high, page]
1248		1540
		1541	# TODO: 0-width page
		1542	# TODO: req_w/h are wrong with vertical
		1543	# TODO: calculations are off
1249	my $self = $class->SUPER::new (	1544	my $self = $class->SUPER::new (
1250	fg => [1, 1, 1],	1545	fg => [1, 1, 1],
1251	active_fg => [0, 0, 0],	1546	active_fg => [0, 0, 0],
1252	range => [0, 0, 100, 10],	1547	range => [0, 0, 100, 10],
1253	req_w => 40,	1548	req_w => 40,
1254	req_h => 10,	1549	req_h => 13,
1255	vertical => 0,	1550	vertical => 0,
		1551	can_hover => 1,
		1552	inner_pad => 5,
1256	@_	1553	@_
1257	);	1554	);
1258		1555
1259	$self	1556	$self
1260	}	1557	}
…		…
1281	if ($GRAB == $self) {	1578	if ($GRAB == $self) {
1282	my ($value, $lo, $hi, $page) = @{$self->{range}};	1579	my ($value, $lo, $hi, $page) = @{$self->{range}};
1283		1580
1284	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});	1581	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
1285		1582
		1583	my $inner_pad_px = $self->_calc_inner_pad_px ($w);
		1584	my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
		1585
		1586	$x -= $inner_pad_px; # substract the padding
1286	$x = $x * ($hi - $lo) / $w + $lo;	1587	$x = $x * ($hi - $lo) / $inner_w + $lo;
1287	$x = $lo if $x < $lo;	1588	$x = $lo if $x < $lo;
1288	$x = $hi - $page if $x > $hi - $page;	1589	$x = $hi - $page if $x > $hi - $page;
1289	$self->{range}[0] = $x;	1590	$self->{range}[0] = $x;
1290		1591
1291	$self->emit (changed => $x);	1592	$self->emit (changed => $x);
1292	$self->update;	1593	$self->update;
1293	}	1594	}
		1595	}
		1596
		1597	# the inner_* stuff is for generating a padding for the slider handle,
		1598	# so that the handle doesn't leave the texture. This calculation isn't 100%
		1599	# correct propably, but it does the job for now
		1600	sub _calc_inner_pad_px {
		1601	my ($self, $w) = @_;
		1602	($w / 100) * $self->{inner_pad} # % to pixels
1294	}	1603	}
1295		1604
1296	sub _draw {	1605	sub _draw {
1297	my ($self) = @_;	1606	my ($self) = @_;
1298		1607
…		…
1312	my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};	1621	my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
1313	my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};	1622	my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
1314		1623
1315	my ($value, $lo, $hi, $page) = @{$self->{range}};	1624	my ($value, $lo, $hi, $page) = @{$self->{range}};
1316		1625
		1626	$hi = $value + 1 if $lo == $hi;
		1627
		1628	my $inner_pad_px = $self->_calc_inner_pad_px ($w);
		1629	my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
		1630
1317	$page = int $page * $w / ($hi - $lo);	1631	$page = int $page * $inner_w / ($hi - $lo);
1318	$value = int +($value - $lo) * $w / ($hi - $lo);	1632	$value = int +($value - $lo) * $inner_w / ($hi - $lo);
1319		1633
1320	$w -= $page;	1634	$w -= $page;
1321	$page &= ~1;	1635	$page &= ~1;
1322	glTranslate $page * 0.5, 0, 0;	1636	glTranslate $page * 0.5, 0, 0;
1323	$page ||= 2;	1637	$page ||= 2;
1324		1638
1325	glColor @$fg;
1326	glBegin GL_LINES;
1327	glVertex 0, 0; glVertex 0, $h;
1328	glVertex $w - 1, 0; glVertex $w - 1, $h;
1329	glVertex 0, $h * 0.5; glVertex $w, $h * 0.5;
1330	glEnd;
1331
1332	my $knob_a = $value - $page * 0.5;	1639	my $knob_a = $inner_pad_px + ($value - $page * 0.5);
1333	my $knob_b = $value + $page * 0.5;	1640	my $knob_b = $inner_pad_px + ($value + $page * 0.5);
1334		1641
1335	glBegin GL_QUADS;	1642	glEnable GL_BLEND;
1336	glColor @$fg;	1643	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1337	glVertex $knob_a, 0;	1644	glEnable GL_TEXTURE_2D;
1338	glVertex $knob_a, $h;	1645	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1339	glVertex $knob_b, $h;
1340	glVertex $knob_b, 0;
1341		1646
1342	if ($knob_a < $knob_b - 2) {	1647	# draw background
1343	glColor @$bg;	1648	$tex[1]->draw_quad (0, 0, $w, $h);
1344	glVertex $knob_a + 1, 1;	1649
1345	glVertex $knob_a + 1, $h - 1;	1650	# draw handle
1346	glVertex $knob_b - 1, $h - 1;	1651	$tex[0]->draw_quad ($knob_a, 0, $knob_b - $knob_a, $h);
1347	glVertex $knob_b - 1, 1;	1652
		1653	glDisable GL_BLEND;
		1654	glDisable GL_TEXTURE_2D;
		1655	}
		1656
		1657	#############################################################################
		1658
		1659	package CFClient::UI::TextView;
		1660
		1661	our @ISA = CFClient::UI::HBox::;
		1662
		1663	use SDL::OpenGL;
		1664
		1665	sub new {
		1666	my $class = shift;
		1667
		1668	my $self = $class->SUPER::new (
		1669	req_w => $::WIDTH / 6,
		1670	req_h => $::HEIGHT / 6,
		1671	fontsize => $::FONTSIZE,
		1672	@_,
		1673
		1674	layout => (new CFClient::Layout),
		1675	par => [],
		1676	height => 0,
		1677	children => [
		1678	(new CFClient::UI::Empty expand => 1),
		1679	(new CFClient::UI::Slider vertical => 1),
		1680	],
		1681	);
		1682
		1683	$self->{children}[1]->connect (changed => sub {
		1684	$self->update;
		1685	});
		1686
		1687	$self
		1688	}
		1689
		1690	sub set_fontsize {
		1691	my ($self, $fontsize) = @_;
		1692
		1693	$self->{fontsize} = $fontsize;
		1694	$self->reflow;
		1695	}
		1696
		1697	sub text_height {
		1698	my ($self, $text) = @_;
		1699
		1700	my $layout = $self->{layout};
		1701
		1702	$layout->set_height ($self->{fontsize});
		1703	$layout->set_width ($self->{w});
		1704	$layout->set_text ($text);
1348	}	1705
1349	glEnd;	1706	($layout->size)[1]
		1707	}
		1708
		1709	sub reflow {
		1710	my ($self) = @_;
		1711
		1712	$self->{need_reflow}++;
		1713	$self->update;
		1714	}
		1715
		1716	sub size_request {
		1717	my ($self) = @_;
		1718
		1719	($self->{req_w}, $self->{req_h})
		1720	}
		1721
		1722	sub size_allocate {
		1723	my ($self, $w, $h) = @_;
		1724
		1725	$self->{layout}->set_height ($self->{fontsize});
		1726	$self->{layout}->set_width ($self->{w});
		1727
		1728	$self->reflow;
		1729	$self->update;
		1730	}
		1731
		1732	sub add_paragraph {
		1733	my ($self, $color, $text) = @_;
		1734
		1735	#TODO: intelligently "reformat" paragraph
		1736
		1737	my $height = $self->text_height ($text);
		1738
		1739	$self->{height} += $height;
		1740
		1741	push @{$self->{par}}, [$height, $color, $text];
		1742
		1743	$self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}];
		1744	$self->{children}[1]->update;
		1745	}
		1746
		1747	sub update {
		1748	my ($self) = @_;
		1749
		1750	$self->SUPER::update;
		1751
		1752	return unless $self->{h} > 0;
		1753
		1754	delete $self->{texture};
		1755
		1756	$ROOT->on_refresh ($self, sub {
		1757	if (delete $self->{need_reflow}) {
		1758	my $height = 0;
		1759
		1760	$height += $_->[0] = $self->text_height ($_->[2])
		1761	for @{$self->{par}};
		1762
		1763	$self->{height} = $height;
		1764
		1765	$self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];
		1766
		1767	delete $self->{texture};
		1768	}
		1769
		1770	$self->{texture} ||= new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
		1771	glClearColor 0, 0, 0, 1;
		1772	glClear GL_COLOR_BUFFER_BIT;
		1773
		1774	glEnable GL_BLEND;
		1775	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
		1776	glEnable GL_TEXTURE_2D;
		1777	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		1778
		1779	my $top = int $self->{children}[1]{range}[0];
		1780
		1781	my $y0 = $top;
		1782	my $y1 = $top + $self->{h};
		1783
		1784	my $y = 0;
		1785
		1786	my $layout = $self->{layout};
		1787
		1788	for my $par (@{$self->{par}}) {
		1789	my $h = $par->[0];
		1790
		1791	if ($y0 < $y + $h && $y < $y1) {
		1792	$layout->set_text ($par->[2]);
		1793
		1794	glColor @{ $par->[1] };
		1795	my ($W, $H) = $layout->size;
		1796	CFClient::Texture->new_from_layout ($layout)->draw_quad (0, $y - $y0);
		1797	}
		1798
		1799	$y += $h;
		1800	}
		1801
		1802	glDisable GL_TEXTURE_2D;
		1803	glDisable GL_BLEND;
		1804	};
		1805	});
		1806	}
		1807
		1808	sub _draw {
		1809	my ($self) = @_;
		1810
		1811	if ($self->{texture}) {
		1812	glEnable GL_TEXTURE_2D;
		1813	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		1814	$self->{texture}->draw_quad (0, 0, $self->{w}, $self->{h});
		1815	glDisable GL_TEXTURE_2D;
		1816	}
		1817
		1818	$self->{children}[1]->draw;
		1819
1350	}	1820	}
1351		1821
1352	#############################################################################	1822	#############################################################################
1353		1823
1354	package CFClient::UI::MapWidget;	1824	package CFClient::UI::MapWidget;
…		…
1364		1834
1365	sub new {	1835	sub new {
1366	my $class = shift;	1836	my $class = shift;
1367		1837
1368	$class->SUPER::new (	1838	$class->SUPER::new (
1369	z => -1,	1839	z => -1,
		1840	can_focus => 1,
1370	list => (glGenLists 1),	1841	list => (glGenLists 1),
1371	@_	1842	@_
1372	)	1843	)
1373	}	1844	}
1374		1845
1375	sub key_down {	1846	sub key_down {
1376	print "MAPKEYDOWN\n";	1847	print "MAPKEYDOWN\n";
1377	}	1848	}
1378		1849
1379	sub key_up {	1850	sub key_up {
		1851	}
		1852
		1853	sub button_down {
		1854	my ($self, $ev, $x, $y) = @_;
		1855
		1856	$self->focus_in;
		1857
		1858	if ($ev->button == 2) {
		1859	my ($ox, $oy) = ($ev->button_x, $ev->button_y);
		1860	my ($bw, $bh) = ($::CFG->{map_shift_x}, $::CFG->{map_shift_y});
		1861
		1862	$self->{motion} = sub {
		1863	my ($ev, $x, $y) = @_;
		1864
		1865	($x, $y) = ($ev->motion_x, $ev->motion_y);
		1866
		1867	$::CFG->{map_shift_x} = $bw + $x - $ox;
		1868	$::CFG->{map_shift_y} = $bh + $y - $oy;
		1869
		1870	$self->update;
		1871	};
		1872	}
		1873	}
		1874
		1875	sub button_up {
		1876	my ($self, $ev, $x, $y) = @_;
		1877
		1878	delete $self->{motion};
		1879	}
		1880
		1881	sub mouse_motion {
		1882	my ($self, $ev, $x, $y) = @_;
		1883
		1884	$self->{motion}->($ev, $x, $y) if $self->{motion};
1380	}	1885	}
1381		1886
1382	sub size_request {	1887	sub size_request {
1383	(	1888	(
1384	1 + 32 * int $::WIDTH / 32,	1889	1 + 32 * int $::WIDTH / 32,
…		…
1397	my ($self) = @_;	1902	my ($self) = @_;
1398		1903
1399	if (delete $self->{need_update}) {	1904	if (delete $self->{need_update}) {
1400	glNewList $self->{list}, GL_COMPILE;	1905	glNewList $self->{list}, GL_COMPILE;
1401		1906
1402	my $mx = $::CONN->{mapx};	1907	if ($::MAP) {
1403	my $my = $::CONN->{mapy};
1404
1405	my $map = $::CONN->{map};
1406
1407	my ($xofs, $yofs);
1408
1409	my $sw = 1 + int $::WIDTH / 32;	1908	my $sw = int $::WIDTH / 32;
1410	my $sh = 1 + int $::HEIGHT / 32;	1909	my $sh = int $::HEIGHT / 32;
1411		1910
1412	if ($::CONN->{mapw} > $sw) {	1911	my $sx = $::CFG->{map_shift_x}; my $sx0 = $sx & 31; $sx = ($sx - $sx0) / 32;
1413	$xofs = $mx + ($::CONN->{mapw} - $sw) * 0.5;	1912	my $sy = $::CFG->{map_shift_y}; my $sy0 = $sy & 31; $sy = ($sy - $sy0) / 32;
1414	} else {	1913
1415	$xofs = $self->{xofs} = min $mx, max $mx + $::CONN->{mapw} - $sw + 1, $self->{xofs};	1914	glTranslate $sx0 - 32, $sy0 - 32, 0;
		1915
		1916	my ($w, $h, $data) = $::MAP->draw ($sx, $sy, 0, 0, $sw + 1, $sh + 1);
		1917
		1918	if ($::CFG->{fow_enable}) {
		1919	if ($::CFG->{fow_smooth} && $CFClient::GL_VERSION >= 1.2) { # smooth fog of war
		1920	glConvolutionParameter (GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER);
		1921	glConvolutionFilter2D (
		1922	GL_CONVOLUTION_2D,
		1923	GL_ALPHA,
		1924	3, 3,
		1925	GL_ALPHA, GL_FLOAT,
		1926	pack "f*",
		1927	0.1, 0.1, 0.1,
		1928	0.1, 0.2, 0.1,
		1929	0.1, 0.1, 0.1,
		1930	);
		1931	glEnable GL_CONVOLUTION_2D;
		1932	}
		1933
		1934	$self->{fow_texture} = new CFClient::Texture
		1935	w => $w,
		1936	h => $h,
		1937	data => $data,
		1938	internalformat => GL_ALPHA,
		1939	format => GL_ALPHA;
		1940
		1941	glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth};
		1942
		1943	glEnable GL_BLEND;
		1944	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
		1945	glEnable GL_TEXTURE_2D;
		1946	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
		1947
		1948	glColor +($::CFG->{fow_intensity}) x 3, 1;
		1949	$self->{fow_texture}->draw_quad (0, 0, $w * 32, $h * 32);
		1950
		1951	glDisable GL_TEXTURE_2D;
		1952	glDisable GL_BLEND;
		1953	}
		1954
		1955	# HACK BEGIN
		1956	{
		1957	glTranslate -($sx0 - 32), -($sy0 - 32), 0;#remove
		1958	my ($w, $h) = (250, 250);
		1959
		1960	glEnable GL_BLEND;
		1961	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
		1962	glEnable GL_TEXTURE_2D;
		1963	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		1964
		1965	$self->{mapmap_texture} =
		1966	new CFClient::Texture
		1967	w => $w,
		1968	h => $h,
		1969	data => $::MAP->mapmap ($w, $h),
		1970	type => $CFClient::GL_VERSION >= 1.2 ? GL_UNSIGNED_INT_8_8_8_8_REV : GL_UNSIGNED_BYTE;
		1971
		1972	$self->{mapmap_texture}->draw_quad (100, 100);
		1973
		1974	glDisable GL_TEXTURE_2D;
		1975	glDisable GL_BLEND;
		1976	}
		1977	# HACK END
1416	}	1978	}
1417		1979
1418	if ($::CONN->{maph} > $sh) {
1419	$yofs = $my + ($::CONN->{maph} - $sh) * 0.5;
1420	} else {
1421	$yofs = $self->{yofs} = min $my, max $my + $::CONN->{maph} - $sh + 1, $self->{yofs};
1422	}
1423
1424	glEnable GL_TEXTURE_2D;
1425	glEnable GL_BLEND;
1426	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1427	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1428
1429	my $sw4 = ($sw + 3) & ~3;
1430	my $darkness = "\x00" x ($sw4 * $sh);
1431
1432	for my $x (0 .. $sw - 1) {
1433	my $row = $map->[$x + $xofs];
1434	for my $y (0 .. $sh - 1) {
1435
1436	my $cell = $row->[$y + $yofs]
1437	or next;
1438
1439	my $dark = $cell->[0];
1440	if ($dark < 0) {
1441	substr $darkness, $y * $sw4 + $x, 1, chr 224;
1442	} else {
1443	substr $darkness, $y * $sw4 + $x, 1, chr 255 - $dark;
1444	}
1445
1446	for my $num (grep $_, @$cell[1,2,3]) {
1447	my $tex = $::CONN->{face}[$num]{texture} || next;
1448
1449	my ($w, $h) = @$tex{qw(w h)};
1450
1451	$tex->draw_quad (($x + 1) * 32 - $w, ($y + 1) * 32 - $h, $w, $h);
1452	}
1453	}
1454	}
1455
1456	# if (1) { # higher quality darkness
1457	# $lighting =~ s/(.)/$1$1$1/gs;
1458	# my $pb = new_from_data Gtk2::Gdk::Pixbuf $lighting, "rgb", 0, 8, $sw4, $sh, $sw4 * 3;
1459	#
1460	# $pb = $pb->scale_simple ($sw4 * 0.5, $sh * 0.5, "bilinear");
1461	#
1462	# $lighting = $pb->get_pixels;
1463	# $lighting =~ s/(.)../$1/gs;
1464	# }
1465
1466	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1467
1468	$darkness = new CFClient::Texture
1469	w => $sw4,
1470	h => $sh,
1471	data => $darkness,
1472	internalformat => GL_ALPHA,
1473	format => GL_ALPHA;
1474
1475	glColor 0.45, 0.45, 0.45, 1;
1476	$darkness->draw_quad (0, 0, $sw4 * 32, $sh * 32);
1477
1478	glDisable GL_TEXTURE_2D;
1479	glDisable GL_BLEND;
1480
1481	glEndList;	1980	glEndList;
1482	}	1981	}
1483		1982
		1983	glPushMatrix;
1484	glCallList $self->{list};	1984	glCallList $self->{list};
		1985	glPopMatrix;
		1986
		1987	if ($FOCUS != $self) {
		1988	glColor 64/255, 64/255, 64/255;
		1989	glLogicOp GL_AND;
		1990	glEnable GL_COLOR_LOGIC_OP;
		1991	glBegin GL_QUADS;
		1992	glVertex 0, 0;
		1993	glVertex 0, $::HEIGHT;
		1994	glVertex $::WIDTH, $::HEIGHT;
		1995	glVertex $::WIDTH, 0;
		1996	glEnd;
		1997	glDisable GL_COLOR_LOGIC_OP;
		1998	}
1485	}	1999	}
1486		2000
1487	my %DIR = (	2001	my %DIR = (
1488	SDLK_KP8, [1, "north"],	2002	SDLK_KP8, [1, "north"],
1489	SDLK_KP9, [2, "northeast"],	2003	SDLK_KP9, [2, "northeast"],
…		…
1505		2019
1506	my $mod = $ev->key_mod;	2020	my $mod = $ev->key_mod;
1507	my $sym = $ev->key_sym;	2021	my $sym = $ev->key_sym;
1508		2022
1509	if ($sym == SDLK_KP5) {	2023	if ($sym == SDLK_KP5) {
1510	$::CONN->send ("command stay fire");	2024	$::CONN->user_send ("stay fire");
		2025	} elsif ($sym == SDLK_a) {
		2026	$::CONN->user_send ("apply");
		2027	} elsif ($sym == SDLK_QUOTE) {
		2028	$self->emit ('activate_console');
		2029	} elsif ($sym == SDLK_SLASH) {
		2030	$self->emit ('activate_console' => '/');
1511	} elsif (exists $DIR{$sym}) {	2031	} elsif (exists $DIR{$sym}) {
1512	if ($mod & KMOD_SHIFT) {	2032	if ($mod & KMOD_SHIFT) {
1513	$self->{shft}++;	2033	$self->{shft}++;
1514	$::CONN->send ("command fire $DIR{$sym}[0]");	2034	$::CONN->user_send ("fire $DIR{$sym}[0]");
1515	} elsif ($mod & KMOD_CTRL) {	2035	} elsif ($mod & KMOD_CTRL) {
1516	$self->{ctrl}++;	2036	$self->{ctrl}++;
1517	$::CONN->send ("command run $DIR{$sym}[0]");	2037	$::CONN->user_send ("run $DIR{$sym}[0]");
1518	} else {	2038	} else {
1519	$::CONN->send ("command $DIR{$sym}[1]");	2039	$::CONN->user_send ("$DIR{$sym}[1]");
1520	}	2040	}
1521	}	2041	}
1522	}	2042	}
1523		2043
1524	sub key_up {	2044	sub key_up {
…		…
1526		2046
1527	my $mod = $ev->key_mod;	2047	my $mod = $ev->key_mod;
1528	my $sym = $ev->key_sym;	2048	my $sym = $ev->key_sym;
1529		2049
1530	if (!($mod & KMOD_SHIFT) && delete $self->{shft}) {	2050	if (!($mod & KMOD_SHIFT) && delete $self->{shft}) {
1531	$::CONN->send ("command fire_stop");	2051	$::CONN->user_send ("fire_stop");
1532	}	2052	}
1533	if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) {	2053	if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) {
1534	$::CONN->send ("command run_stop");	2054	$::CONN->user_send ("run_stop");
1535	}	2055	}
1536	}	2056	}
1537		2057
1538	#############################################################################	2058	#############################################################################
1539		2059
…		…
1577	glPopMatrix;	2097	glPopMatrix;
1578	}	2098	}
1579		2099
1580	#############################################################################	2100	#############################################################################
1581		2101
1582	package CFClient::UI::Toplevel;	2102	package CFClient::UI::Flopper;
		2103
		2104	our @ISA = CFClient::UI::Button::;
		2105
		2106	sub new {
		2107	my $class = shift;
		2108
		2109	my $self = $class->SUPER::new (
		2110	state => 0,
		2111	connect_activate => \&toggle_flopper,
		2112	@_
		2113	);
		2114
		2115	if ($self->{state}) {
		2116	$self->{state} = 0;
		2117	$self->toggle_flopper;
		2118	}
		2119
		2120	$self
		2121	}
		2122
		2123	sub toggle_flopper {
		2124	my ($self) = @_;
		2125
		2126	# TODO: use animation
		2127	if ($self->{state} = !$self->{state}) {
		2128	$CFClient::UI::ROOT->add ($self->{other});
		2129	$self->{other}->move ($self->coord2global (0, $self->{h}));
		2130	$self->emit ("open");
		2131	} else {
		2132	$CFClient::UI::ROOT->remove ($self->{other});
		2133	$self->emit ("close");
		2134	}
		2135
		2136	$self->emit (changed => $self->{state});
		2137	}
		2138
		2139	#############################################################################
		2140
		2141	package CFClient::UI::Root;
1583		2142
1584	our @ISA = CFClient::UI::Container::;	2143	our @ISA = CFClient::UI::Container::;
		2144
		2145	use SDL::OpenGL;
		2146
		2147	sub check_size {
		2148	my ($self) = @_;
		2149
		2150	$self->configure (0, 0, $::WITH, $::HEIGHT);
		2151	}
1585		2152
1586	sub size_request {	2153	sub size_request {
1587	($::WIDTH, $::HEIGHT)	2154	($::WIDTH, $::HEIGHT)
1588	}	2155	}
1589		2156
1590	sub size_allocate {	2157	sub configure {
1591	my ($self, $x, $y, $w, $h) = @_;	2158	my ($self, $x, $y, $w, $h) = @_;
1592		2159
1593	$self->_size_allocate ($x, $y, $w, $h);	2160	$self->SUPER::configure ($x, $y, $w, $h);
1594		2161
1595	$_->size_allocate ($_->{x}, $_->{y}, $_->size_request)	2162	$_->configure ($_->{x}, $_->{y}, $_->size_request)
1596	for @{$self->{children}};	2163	for @{$self->{children}};
1597	}	2164	}
1598		2165
1599	sub translate {	2166	sub _topleft {
1600	my ($self, $x, $y) = @_;	2167	my ($self, $x, $y) = @_;
1601		2168
1602	($x, $y)	2169	($x, $y)
1603	}	2170	}
1604		2171
1605	sub update {	2172	sub update {
1606	my ($self) = @_;	2173	my ($self) = @_;
1607		2174
1608	$self->size_allocate (0, 0, $::WIDTH, $::HEIGHT);	2175	$self->check_size;
1609	::refresh ();	2176	::refresh ();
1610	}	2177	}
1611		2178
1612	sub add {	2179	sub add {
1613	my ($self, $widget) = @_;	2180	my ($self, $child) = @_;
1614		2181
1615	$self->SUPER::add ($widget);	2182	$self->SUPER::add ($child);
		2183	}
1616		2184
1617	$widget->size_allocate ($widget->{x}, $widget->{y}, $widget->size_request);	2185	sub on_refresh {
		2186	my ($self, $id, $cb) = @_;
		2187
		2188	$self->{refresh_hook}{$id} = $cb;
1618	}	2189	}
1619		2190
1620	sub draw {	2191	sub draw {
1621	my ($self) = @_;	2192	my ($self) = @_;
1622		2193
		2194	while (my $rcb = delete $self->{refresh_hook}) {
		2195	$_->() for values %$rcb;
		2196	}
		2197
		2198	glViewport 0, 0, $::WIDTH, $::HEIGHT;
		2199	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
		2200	glClear GL_COLOR_BUFFER_BIT;
		2201
		2202	glMatrixMode GL_PROJECTION;
		2203	glLoadIdentity;
		2204	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000;
		2205	glMatrixMode GL_MODELVIEW;
		2206	glLoadIdentity;
		2207
1623	$self->_draw;	2208	$self->_draw;
1624	}	2209	}
1625		2210
1626	#############################################################################	2211	#############################################################################
1627		2212
1628	package CFClient::UI;	2213	package CFClient::UI;
1629		2214
1630	$TOPLEVEL = new CFClient::UI::Toplevel;	2215	$ROOT = new CFClient::UI::Root;
1631		2216
1632	1	2217	1
1633		2218

Diff Legend

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