ViewVC Help

View File | Revision Log | Show Annotations | Download File

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

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.76 by root, Tue Apr 11 21:24:09 2006 UTC vs.
Revision 1.125 by root, Mon Apr 17 20:52:15 2006 UTC

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

Diff Legend

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