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.126 by root, Mon Apr 17 20:59:20 2006 UTC vs.
Revision 1.149 by root, Sat Apr 22 23:11:32 2006 UTC

…		…
21	$FOCUS->key_up ($_[0]) if $FOCUS;	21	$FOCUS->key_up ($_[0]) if $FOCUS;
22	}	22	}
23		23
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->{x}, $ev->{y});
27		27
28	if (!$BUTTON_STATE) {	28	if (!$BUTTON_STATE) {
29	my $widget = $ROOT->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->coord2local ($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->{x}, $ev->{y});
43		43
44	my $widget = $GRAB || $ROOT->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->coord2local ($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;
…		…
54	}	54	}
55	}	55	}
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->{x}, $ev->{y});
60		60
61	my $widget = $GRAB || $ROOT->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;
…		…
87		87
88	package CFClient::UI::Base;	88	package CFClient::UI::Base;
89		89
90	use strict;	90	use strict;
91		91
92	use SDL::OpenGL;	92	use CFClient::OpenGL;
93		93
94	sub new {	94	sub new {
95	my $class = shift;	95	my $class = shift;
96		96
97	my $self = bless {	97	my $self = bless {
98	x => 0,	98	x => 0,
99	y => 0,	99	y => 0,
100	z => 0,	100	z => 0,
101	w => -1,
102	h => -1,
103	@_	101	@_
104	}, $class;	102	}, $class;
105		103
106	for (keys %$self) {	104	for (keys %$self) {
107	if (/^connect_(.*)$/) {	105	if (/^connect_(.*)$/) {
…		…
110	}	108	}
111		109
112	$self	110	$self
113	}	111	}
114		112
		113	sub show {
		114	my ($self) = @_;
		115
		116	return if $self->{parent};
		117
		118	$CFClient::UI::ROOT->add ($self);
		119	}
		120
		121	sub hide {
		122	my ($self) = @_;
		123
		124	return unless $self->{parent};
		125
		126	$self->{parent}->remove ($self);
		127	}
		128
115	sub move {	129	sub move {
116	my ($self, $x, $y, $z) = @_;	130	my ($self, $x, $y, $z) = @_;
		131
117	$self->{x} = int $x;	132	$self->{x} = int $x;
118	$self->{y} = int $y;	133	$self->{y} = int $y;
119	$self->{z} = $z if defined $z;	134	$self->{z} = $z if defined $z;
		135
		136	$self->update;
120	}	137	}
121		138
122	sub needs_redraw {	139	sub needs_redraw {
123	0	140	0
124	}	141	}
125		142
126	sub size_request {	143	sub size_request {
127	require Carp;	144	require Carp;
128	Carp::confess "size_request is abtract";	145	Carp::confess "size_request is abstract";
129	}	146	}
130		147
131	sub _size_allocate {	148	sub configure {
132	my ($self, $x, $y, $w, $h) = @_;	149	my ($self, $x, $y, $w, $h) = @_;
133		150
		151	if ($self->{aspect}) {
		152	my $w2 = List::Util::min $w, int $h * $self->{aspect};
		153	my $h2 = List::Util::min $h, int $w / $self->{aspect};
		154
		155	# use alignment to adjust x, y
		156
		157	$x += int +($w - $w2) * 0.5;
		158	$y += int +($h - $h2) * 0.5;
		159
		160	($w, $h) = ($w2, $h2);
		161	}
		162
		163	if ($self->{x} != $x || $self->{y} != $y) {
134	$self->{x} = $x;	164	$self->{x} = $x;
135	$self->{y} = $y;	165	$self->{y} = $y;
		166	$self->update;
		167	}
136		168
137	return unless $self->{w} != $w || $self->{h} != $h;	169	if ($self->{w} != $w || $self->{h} != $h) {
138
139	$self->{w} = $w;	170	$self->{w} = $w;
140	$self->{h} = $h;	171	$self->{h} = $h;
141		172
		173	$self->size_allocate ($w, $h);
		174	$self->update;
142	1	175	}
143	}	176	}
144		177
145	sub size_allocate {	178	sub size_allocate {
146	my ($self, $x, $y, $w, $h) = @_;	179	# nothing to be done
147
148	$self->_size_allocate ($x, $y, $w, $h);
149	}	180	}
150		181
151	# return top left coordinates	182	# return top left coordinates
152	sub _topleft {	183	sub _topleft {
153	my ($self, $x, $y) = @_;	184	my ($self, $x, $y) = @_;
…		…
263	}	294	}
264		295
265	sub check_size {	296	sub check_size {
266	my ($self) = @_;	297	my ($self) = @_;
267		298
		299	return unless $self->{parent};
		300
268	my ($w, $h) = $self->size_request;	301	my ($w, $h) = $self->size_request;
269		302
270	if ($w != $self->{req_w} || $h != $self->{req_h}) {	303	if ($w != $self->{req_w} || $h != $self->{req_h}) {
271	$self->{req_w} = $w;	304	$self->{req_w} = $w;
272	$self->{req_h} = $h;	305	$self->{req_h} = $h;
273		306
274	$self->{parent}->check_size	307	$self->{parent}->check_size;
275	if $self->{parent};
276	}	308	}
277	}	309	}
278		310
279	sub update {	311	sub update {
280	my ($self) = @_;	312	my ($self) = @_;
…		…
284	}	316	}
285		317
286	sub connect {	318	sub connect {
287	my ($self, $signal, $cb) = @_;	319	my ($self, $signal, $cb) = @_;
288		320
289	push @{ $self->{cb}{$signal} }, $cb;	321	push @{ $self->{signal_cb}{$signal} }, $cb;
290	}	322	}
291		323
292	sub emit {	324	sub emit {
293	my ($self, $signal, @args) = @_;	325	my ($self, $signal, @args) = @_;
294		326
		327	for my $cb (@{$self->{signal_cb}{$signal} || []}) {
295	$_->($self, @args)	328	$cb->($self, @args);
296	for @{$self->{cb}{$signal} || []};	329	}
297	}	330	}
298		331
299	sub DESTROY {	332	sub DESTROY {
300	my ($self) = @_;	333	my ($self) = @_;
301		334
…		…
307	package CFClient::UI::DrawBG;	340	package CFClient::UI::DrawBG;
308		341
309	our @ISA = CFClient::UI::Base::;	342	our @ISA = CFClient::UI::Base::;
310		343
311	use strict;	344	use strict;
312	use SDL::OpenGL;	345	use CFClient::OpenGL;
313		346
314	sub new {	347	sub new {
315	my $class = shift;	348	my $class = shift;
316		349
317	# range [value, low, high, page]	350	# range [value, low, high, page]
…		…
381	$self->{children} = [	414	$self->{children} = [
382	sort { $a->{z} <=> $b->{z} }	415	sort { $a->{z} <=> $b->{z} }
383	@{$self->{children}}, $child	416	@{$self->{children}}, $child
384	];	417	];
385		418
386	$self->{w} = $self->{h} = -1;
387
388	$child->check_size;	419	$child->check_size;
389	}	420	}
390		421
391	sub remove {	422	sub remove {
392	my ($self, $widget) = @_;	423	my ($self, $child) = @_;
393		424
		425	delete $child->{parent};
		426
394	$self->{children} = [ grep $_ != $widget, @{ $self->{children} } ];	427	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
395		428
396	$self->check_size;	429	$self->check_size;
397	}	430	}
398		431
399	sub find_widget {	432	sub find_widget {
…		…
431		464
432	$class->SUPER::new (children => [$child], %arg)	465	$class->SUPER::new (children => [$child], %arg)
433	}	466	}
434		467
435	sub add {	468	sub add {
436	my ($self, $widget) = @_;	469	my ($self, $child) = @_;
437		470
438	$self->{children} = [];	471	$self->{children} = [];
439		472
440	$self->SUPER::add ($widget);	473	$self->SUPER::add ($child);
441	}	474	}
442		475
443	sub remove {	476	sub remove {
444	my ($self, $widget) = @_;	477	my ($self, $widget) = @_;
445		478
…		…
454	sub size_request {	487	sub size_request {
455	$_[0]{children}[0]->size_request	488	$_[0]{children}[0]->size_request
456	}	489	}
457		490
458	sub size_allocate {	491	sub size_allocate {
459	my ($self, $x, $y, $w, $h) = @_;	492	my ($self, $w, $h) = @_;
460		493
461	$self->_size_allocate ($x, $y, $w, $h) or return;
462
463	$self->{children}[0]->size_allocate (0, 0, $w, $h);	494	$self->{children}[0]->configure (0, 0, $w, $h);
464	}	495	}
465		496
466	#############################################################################	497	#############################################################################
467		498
468	package CFClient::UI::Window;	499	package CFClient::UI::Window;
469		500
470	our @ISA = CFClient::UI::Bin::;	501	our @ISA = CFClient::UI::Bin::;
471		502
472	use SDL::OpenGL;	503	use CFClient::OpenGL;
473		504
474	sub new {	505	sub new {
475	my ($class, %arg) = @_;	506	my ($class, %arg) = @_;
476		507
477	my $self = $class->SUPER::new (%arg);	508	my $self = $class->SUPER::new (%arg);
…		…
494	$self->child->draw;	525	$self->child->draw;
495	};	526	};
496	}	527	}
497		528
498	sub size_allocate {	529	sub size_allocate {
499	my ($self, $x, $y, $w, $h) = @_;	530	my ($self, $w, $h) = @_;
500		531
501	$self->_size_allocate ($x, $y, $w, $h) or return;
502
503	$self->child->size_allocate (0, 0, $w, $h);	532	$self->child->configure (0, 0, $w, $h);
504		533
505	$self->render_chld;	534	$self->render_chld;
506	}	535	}
507		536
508	sub _draw {	537	sub _draw {
…		…
533	sub new { die }	562	sub new { die }
534		563
535	sub size_request {	564	sub size_request {
536	my ($self) = @_;	565	my ($self) = @_;
537		566
538	@$self{qw(child_w child_h)} = $self->child->size_request;	567	@$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
539	$self->child->size_allocate (0, 0, @$self{qw(child_w child_h)});	568	$self->child->size_allocate (0, 0, @$self{qw(child_w child_h)});
540		569
541	@$self{qw(child_w child_h)}	570	@$self{qw(child_w child_h)}
542	}	571	}
543		572
544	sub size_allocate {
545	my ($self, $x, $y, $w, $h) = @_;
546
547	$self->_size_allocate ($x, $y, $w, $h) or return;
548	}
549
550	sub _draw {	573	sub _draw {
551	my ($self) = @_;	574	my ($self) = @_;
552		575
553	$self->{children}[1]->draw;	576	$self->{children}[1]->draw;
554	}	577	}
…		…
558		581
559	package CFClient::UI::Frame;	582	package CFClient::UI::Frame;
560		583
561	our @ISA = CFClient::UI::Bin::;	584	our @ISA = CFClient::UI::Bin::;
562		585
563	use SDL::OpenGL;	586	use CFClient::OpenGL;
564
565	sub size_request {
566	my ($self) = @_;
567	my $chld = $self->child
568	or return (0, 0);
569
570	$chld->move (2, 2);
571
572	map { $_ + 4 } $chld->size_request;
573	}
574
575	sub size_allocate {
576	my ($self, $x, $y, $w, $h) = @_;
577
578	$self->_size_allocate ($x, $y, $w, $h) or return;
579
580	$self->child->size_allocate (2, 2, $w - 4, $h - 4);
581	}
582
583	sub _draw {
584	my ($self) = @_;
585
586	my $chld = $self->child;
587
588	my ($w, $h) = $chld->size_request;
589
590	glBegin GL_QUADS;
591	glColor 0, 0, 0;
592	glVertex 0 , 0;
593	glVertex 0 , $h + 4;
594	glVertex $w + 4 , $h + 4;
595	glVertex $w + 4 , 0;
596	glEnd;
597
598	$chld->draw;
599	}
600
601	#############################################################################
602
603	package CFClient::UI::FancyFrame;
604
605	our @ISA = CFClient::UI::Bin::;
606
607	use SDL::OpenGL;
608
609	my @tex =
610	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
611	qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
612		587
613	sub new {	588	sub new {
614	my $class = shift;	589	my $class = shift;
615		590
616	# TODO: user_x, user_y, overwrite moveto?
617
618	$class->SUPER::new (	591	my $self = $class->SUPER::new (
619	bg => [1, 1, 1, 1],	592	bg => [1, 1, 1, 1],
620	border_bg => [1, 1, 1, 1],	593	border_bg => [1, 1, 1, 1],
621	border => int $::FONTSIZE * 0.8,	594	border => 0.8,
622	@_	595	@_
		596	);
		597
		598	$self
		599	}
		600
		601	sub set_size {
		602	my ($self, $w, $h) = @_;
		603	$self->{req_w} = $w;
		604	$self->{req_h} = $h;
		605	$self->check_size;
		606	}
		607
		608	sub size_request {
		609	my ($self) = @_;
		610	($self->{req_w}, $self->{req_h})
		611	}
		612
		613	sub size_allocate {
		614	my ($self, $w, $h) = @_;
		615	$self->{w} = $w;
		616	$self->{h} = $h;
		617	$self->child->configure (0, 0, $w, $h);
		618	}
		619
		620	sub _draw {
		621	my ($self) = @_;
		622
		623	my ($w, $h) = ($self->{w}, $self->{h});
		624
		625	glEnable GL_BLEND;
		626	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
		627	glEnable GL_TEXTURE_2D;
		628	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		629
		630	# glBegin GL_QUADS;
		631	# glColor 0, 0, 0, 0;
		632	# glVertex 0 , 0;
		633	# glVertex 0 , $h;
		634	# glVertex $w, $h;
		635	# glVertex $w, 0;
		636	# glEnd;
		637
		638
		639	$self->child->draw;
		640	glDisable GL_BLEND;
		641	glDisable GL_TEXTURE_2D;
		642	}
		643
		644	#############################################################################
		645
		646	package CFClient::UI::FancyFrame;
		647
		648	our @ISA = CFClient::UI::Bin::;
		649
		650	use CFClient::OpenGL;
		651
		652	my @tex =
		653	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
		654	qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
		655
		656	sub new {
		657	my $class = shift;
		658
		659	# TODO: user_x, user_y, overwrite moveto?
		660
		661	my $self = $class->SUPER::new (
		662	bg => [1, 1, 1, 1],
		663	border_bg => [1, 1, 1, 1],
		664	border => 0.8,
		665	@_
		666	);
		667
		668	$self->{title} &&= new CFClient::UI::Label
		669	align => 0,
		670	valign => 1,
		671	text => $self->{title},
		672	fontsize => 1;
		673
		674	$self
		675	}
		676
		677	sub border {
		678	int $_[0]{border} * $::FONTSIZE
		679	}
		680
		681	sub size_request {
		682	my ($self) = @_;
		683
		684	return ($self->{user_w}, $self->{user_h}) if $self->{user_w} && $self->{user_h};
		685
		686	my ($w, $h) = $self->SUPER::size_request;
		687
		688	(
		689	$w + $self->border * 2,
		690	$h + $self->border * 2,
623	)	691	)
624	}	692	}
625		693
626	sub size_request {
627	my ($self) = @_;
628
629	return ($self->{user_w}, $self->{user_h}) if $self->{user_w} && $self->{user_h};
630
631	my ($w, $h) = $self->SUPER::size_request;
632
633	(
634	$w + $self->{border} * 2,
635	$h + $self->{border} * 2,
636	)
637	}
638
639	sub size_allocate {	694	sub size_allocate {
640	my ($self, $x, $y, $w, $h) = @_;	695	my ($self, $w, $h) = @_;
641		696
642	$self->_size_allocate ($x, $y, $w, $h) or return;
643
644	$h -= List::Util::max 0, $self->{border} * 2;	697	$h -= List::Util::max 0, $self->border * 2;
645	$w -= List::Util::max 0, $self->{border} * 2;	698	$w -= List::Util::max 0, $self->border * 2;
646		699
		700	$self->{title}->configure ($self->border, $self->border - $::FONTSIZE * 2, $w, $::FONTSIZE * 2)
		701	if $self->{title};
		702
647	$self->child->size_allocate ($self->{border}, $self->{border}, $w, $h);	703	$self->child->configure ($self->border, $self->border, $w, $h);
648	}	704	}
649		705
650	sub button_down {	706	sub button_down {
651	my ($self, $ev, $x, $y) = @_;	707	my ($self, $ev, $x, $y) = @_;
652		708
		709	my $border = $self->border;
		710
653	if ($x < $self->{w} && $x >= $self->{w} - $self->{border}	711	if ($x < $self->{w} && $x >= $self->{w} - $border
654	&& $y < $self->{h} && $y >= $self->{h} - $self->{border}) {	712	&& $y < $self->{h} && $y >= $self->{h} - $border) {
655		713
656	my ($ox, $oy) = ($ev->button_x, $ev->button_y);	714	my ($ox, $oy) = ($ev->{x}, $ev->{y});
657	my ($bw, $bh) = ($self->{w}, $self->{h});	715	my ($bw, $bh) = ($self->{w}, $self->{h});
658		716
659	$self->{motion} = sub {	717	$self->{motion} = sub {
660	my ($ev, $x, $y) = @_;	718	my ($ev, $x, $y) = @_;
661		719
662	($x, $y) = ($ev->motion_x, $ev->motion_y);	720	($x, $y) = ($ev->{x}, $ev->{y});
663		721
664	$self->{user_w} = $bw + $x - $ox;	722	$self->{user_w} = $bw + $x - $ox;
665	$self->{user_h} = $bh + $y - $oy;	723	$self->{user_h} = $bh + $y - $oy;
666	$self->update;	724	$self->check_size;
667	};	725	};
668		726
669	} elsif ($x >= 0 && $x < $self->{w}	727	} elsif ($x >= 0 && $x < $self->{w}
670	&& $y >= 0 && $y < $self->{border}) {	728	&& $y >= 0 && $y < $border) {
671		729
672	my ($ox, $oy) = ($ev->button_x, $ev->button_y);	730	my ($ox, $oy) = ($ev->{x}, $ev->{y});
673	my ($bx, $by) = ($self->{x}, $self->{y});	731	my ($bx, $by) = ($self->{x}, $self->{y});
674		732
675	$self->{motion} = sub {	733	$self->{motion} = sub {
676	my ($ev, $x, $y) = @_;	734	my ($ev, $x, $y) = @_;
677		735
678	($x, $y) = ($ev->motion_x, $ev->motion_y);	736	($x, $y) = ($ev->{x}, $ev->{y});
679		737
680	$self->move ($bx + $x - $ox, $by + $y - $oy);	738	$self->move ($bx + $x - $ox, $by + $y - $oy);
681	$self->update;	739	$self->update;
682	};	740	};
683	}	741	}
…		…
704	glEnable GL_BLEND;	762	glEnable GL_BLEND;
705	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	763	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
706	glEnable GL_TEXTURE_2D;	764	glEnable GL_TEXTURE_2D;
707	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	765	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
708		766
		767	my $border = $self->border;
		768
709	glColor @{ $self->{border_bg} };	769	glColor @{ $self->{border_bg} };
710	$tex[1]->draw_quad (0, 0, $w, $self->{border});	770	$tex[1]->draw_quad (0, 0, $w, $border);
711	$tex[3]->draw_quad (0, $self->{border}, $self->{border}, $ch);	771	$tex[3]->draw_quad (0, $border, $border, $ch);
712	$tex[2]->draw_quad ($w - $self->{border}, $self->{border}, $self->{border}, $ch);	772	$tex[2]->draw_quad ($w - $border, $border, $border, $ch);
713	$tex[4]->draw_quad (0, $h - $self->{border}, $w, $self->{border});	773	$tex[4]->draw_quad (0, $h - $border, $w, $border);
714		774
715	my $bg = $tex[0];	775	my $bg = $tex[0];
716		776
717	# TODO: repeat texture not scale	777	# TODO: repeat texture not scale
718	my $rep_x = $cw / $bg->{w};	778	my $rep_x = $cw / $bg->{w};
…		…
721	glColor @{ $self->{bg} };	781	glColor @{ $self->{bg} };
722		782
723	$bg->{s} = $rep_x;	783	$bg->{s} = $rep_x;
724	$bg->{t} = $rep_y;	784	$bg->{t} = $rep_y;
725	$bg->{wrap_mode} = 1;	785	$bg->{wrap_mode} = 1;
726	$bg->draw_quad ($self->{border}, $self->{border}, $cw, $ch);	786	$bg->draw_quad ($border, $border, $cw, $ch);
727		787
728	glDisable GL_TEXTURE_2D;	788	glDisable GL_TEXTURE_2D;
729	glDisable GL_BLEND;	789	glDisable GL_BLEND;
730		790
		791	$self->{title}->draw if $self->{title};
731	$self->child->draw;	792	$self->child->draw;
732	}	793	}
733		794
734	#############################################################################	795	#############################################################################
735		796
…		…
737		798
738	our @ISA = CFClient::UI::Base::;	799	our @ISA = CFClient::UI::Base::;
739		800
740	use List::Util qw(max sum);	801	use List::Util qw(max sum);
741		802
742	use SDL::OpenGL;	803	use CFClient::OpenGL;
743		804
744	sub new {	805	sub new {
745	my $class = shift;	806	my $class = shift;
746		807
747	$class->SUPER::new (	808	$class->SUPER::new (
…		…
754	my ($self, $x, $y, $child) = @_;	815	my ($self, $x, $y, $child) = @_;
755		816
756	$child->set_parent ($self);	817	$child->set_parent ($self);
757	$self->{children}[$y][$x] = $child;	818	$self->{children}[$y][$x] = $child;
758		819
759	$self->{w} = $self->{h} = -1;
760
761	$child->check_size;	820	$child->check_size;
762	}	821	}
763		822
764	# TODO: move to container class maybe? send childs a signal on removal?	823	# TODO: move to container class maybe? send childs a signal on removal?
765	sub clear {	824	sub clear {
…		…
779	or next;	838	or next;
780		839
781	for my $x (0 .. $#$row) {	840	for my $x (0 .. $#$row) {
782	my $widget = $row->[$x]	841	my $widget = $row->[$x]
783	or next;	842	or next;
784	my ($w, $h) = $widget->size_request;	843	my ($w, $h) = @$widget{qw(req_w req_h)};
785		844
786	$w[$x] = max $w[$x], $w;	845	$w[$x] = max $w[$x], $w;
787	$h[$y] = max $h[$y], $h;	846	$h[$y] = max $h[$y], $h;
788	}	847	}
789	}	848	}
…		…
801	(sum @$hs),	860	(sum @$hs),
802	)	861	)
803	}	862	}
804		863
805	sub size_allocate {	864	sub size_allocate {
806	my ($self, $x, $y, $w, $h) = @_;	865	my ($self, $w, $h) = @_;
807
808	$self->_size_allocate ($x, $y, $w, $h) or return;
809		866
810	my ($ws, $hs) = $self->get_wh;	867	my ($ws, $hs) = $self->get_wh;
811		868
812	my $req_w = sum @$ws;	869	my $req_w = sum @$ws;
813	my $req_h = sum @$hs;	870	my $req_h = sum @$hs;
…		…
835		892
836	for my $c (0 .. $#$row) {	893	for my $c (0 .. $#$row) {
837	my $col_w = $ws->[$c];	894	my $col_w = $ws->[$c];
838		895
839	if (my $widget = $row->[$c]) {	896	if (my $widget = $row->[$c]) {
840	$widget->size_allocate ($x, $y, $col_w, $row_h);	897	$widget->configure ($x, $y, $col_w, $row_h);
841	}	898	}
842		899
843	$x += $col_w;	900	$x += $col_w;
844	}	901	}
845		902
…		…
890	(List::Util::max map $_->[1], @alloc),	947	(List::Util::max map $_->[1], @alloc),
891	)	948	)
892	}	949	}
893		950
894	sub size_allocate {	951	sub size_allocate {
895	my ($self, $x, $y, $w, $h) = @_;	952	my ($self, $w, $h) = @_;
896
897	$self->_size_allocate ($x, $y, $w, $h) or return;
898		953
899	($h, $w) = ($w, $h);	954	($h, $w) = ($w, $h);
900		955
901	my $children = $self->{children};	956	my $children = $self->{children};
902		957
903	my @h = map +($_->size_request)[0], @$children;	958	my @h = map $_->{req_w}, @$children;
904		959
905	my $req_h = List::Util::sum @h;	960	my $req_h = List::Util::sum @h;
906		961
907	if ($req_h > $h) {	962	if ($req_h > $h) {
908	# ah well, not enough space	963	# ah well, not enough space
…		…
924		979
925	my $y = 0;	980	my $y = 0;
926	for (0 .. $#$children) {	981	for (0 .. $#$children) {
927	my $child = $children->[$_];	982	my $child = $children->[$_];
928	my $h = $h[$_];	983	my $h = $h[$_];
929	$child->size_allocate ($y, 0, $h, $w);	984	$child->configure ($y, 0, $h, $w);
930		985
931	$y += $h;	986	$y += $h;
932	}	987	}
933		988
934	1	989	1
…		…
952	(List::Util::sum map $_->[1], @alloc),	1007	(List::Util::sum map $_->[1], @alloc),
953	)	1008	)
954	}	1009	}
955		1010
956	sub size_allocate {	1011	sub size_allocate {
957	my ($self, $x, $y, $w, $h) = @_;	1012	my ($self, $w, $h) = @_;
958
959	$self->_size_allocate ($x, $y, $w, $h) or return;
960		1013
961	my $children = $self->{children};	1014	my $children = $self->{children};
962		1015
963	my @h = map +($_->size_request)[1], @$children;	1016	my @h = map $_->{req_h}, @$children;
964		1017
965	my $req_h = List::Util::sum @h;	1018	my $req_h = List::Util::sum @h;
966		1019
967	if ($req_h > $h) {	1020	if ($req_h > $h) {
968	# ah well, not enough space	1021	# ah well, not enough space
…		…
982		1035
983	my $y = 0;	1036	my $y = 0;
984	for (0 .. $#$children) {	1037	for (0 .. $#$children) {
985	my $child = $children->[$_];	1038	my $child = $children->[$_];
986	my $h = $h[$_];	1039	my $h = $h[$_];
987	$child->size_allocate (0, $y, $w, $h);	1040	$child->configure (0, $y, $w, $h);
988		1041
989	$y += $h;	1042	$y += $h;
990	}	1043	}
991		1044
992	1	1045	1
…		…
996		1049
997	package CFClient::UI::Label;	1050	package CFClient::UI::Label;
998		1051
999	our @ISA = CFClient::UI::Base::;	1052	our @ISA = CFClient::UI::Base::;
1000		1053
1001	use SDL::OpenGL;	1054	use CFClient::OpenGL;
1002		1055
1003	sub new {	1056	sub new {
1004	my ($class, %arg) = @_;	1057	my ($class, %arg) = @_;
1005		1058
1006	my $self = $class->SUPER::new (	1059	my $self = $class->SUPER::new (
1007	fg => [1, 1, 1],	1060	fg => [1, 1, 1],
1008	fontsize => $::FONTSIZE,	1061	fontsize => 1,
1009	text => "",	1062	text => "",
1010	align => -1,	1063	align => -1,
1011	valign => -1,	1064	valign => -1,
1012	padding => 2,	1065	padding => 2,
1013	layout => new CFClient::Layout,	1066	layout => new CFClient::Layout,
1014	%arg	1067	%arg
1015	);	1068	);
1016		1069
1017	$self->{xxx}++ if $self->{text} eq "Client Setup" && $self->{align};#d#	1070	if (exists $self->{template}) {
		1071	my $layout = new CFClient::Layout;
		1072	$layout->set_text (delete $self->{template});
		1073	$self->{template} = $layout;
		1074	}
1018		1075
1019	$self->set_text (delete $self->{text}) if exists $self->{text};	1076	$self->set_text (delete $self->{text}) if exists $self->{text};
1020	$self->set_markup (delete $self->{markup}) if exists $self->{markup};	1077	$self->set_markup (delete $self->{markup}) if exists $self->{markup};
1021		1078
1022	$self	1079	$self
…		…
1036	my ($self, $text) = @_;	1093	my ($self, $text) = @_;
1037		1094
1038	$self->{layout}->set_text ($text);	1095	$self->{layout}->set_text ($text);
1039		1096
1040	delete $self->{texture};	1097	delete $self->{texture};
		1098	$self->check_size;
1041	$self->update;	1099	$self->update;
1042	}	1100	}
1043		1101
1044	sub set_markup {	1102	sub set_markup {
1045	my ($self, $markup) = @_;	1103	my ($self, $markup) = @_;
1046		1104
1047	$self->{layout}->set_markup ($markup);	1105	$self->{layout}->set_markup ($markup);
1048		1106
1049	delete $self->{texture};	1107	delete $self->{texture};
		1108	$self->check_size;
1050	$self->update;	1109	$self->update;
1051	}	1110	}
1052		1111
1053	sub size_request {	1112	sub size_request {
1054	my ($self) = @_;	1113	my ($self) = @_;
1055		1114
1056	$self->{layout}->set_width;	1115	$self->{layout}->set_width;
1057	$self->{layout}->set_height ($self->{fontsize});	1116	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1058		1117
1059	my ($w, $h) = $self->{layout}->size;	1118	my ($w, $h) = $self->{layout}->size;
		1119
		1120	if (exists $self->{template}) {
		1121	$self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
		1122
		1123	my ($w2, $h2) = $self->{template}->size;
		1124
		1125	$w = List::Util::max $w, $w2;
		1126	$h = List::Util::max $h, $h2;
		1127	}
1060		1128
1061	(	1129	(
1062	$w + $self->{padding} * 2,	1130	$w + $self->{padding} * 2,
1063	$h + $self->{padding} * 2,	1131	$h + $self->{padding} * 2,
1064	)	1132	)
1065	}	1133	}
1066		1134
1067	sub size_allocate {	1135	sub size_allocate {
1068	my ($self, $x, $y, $w, $h) = @_;	1136	my ($self, $w, $h) = @_;
1069
1070	$self->_size_allocate ($x, $y, $w, $h) or return;
1071		1137
1072	delete $self->{texture};	1138	delete $self->{texture};
1073	}	1139	}
1074		1140
1075	sub update {	1141	sub set_fontsize {
1076	my ($self) = @_;	1142	my ($self, $fontsize) = @_;
1077		1143
1078	delete $self->{texture};	1144	$self->{fontsize} = $fontsize;
1079	$self->SUPER::update;	1145	$self->check_size;
1080	}	1146	}
1081		1147
1082	sub _draw {	1148	sub _draw {
1083	my ($self) = @_;	1149	my ($self) = @_;
1084		1150
1085	my $tex = $self->{texture} ||= do {	1151	my $tex = $self->{texture} ||= do {
1086	$self->{layout}->set_width ($self->{w});	1152	$self->{layout}->set_width ($self->{w});
1087	$self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize});	1153	$self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE);
1088	new_from_layout CFClient::Texture $self->{layout}	1154	new_from_layout CFClient::Texture $self->{layout}
1089	};	1155	};
1090		1156
1091	glEnable GL_BLEND;	1157	glEnable GL_BLEND;
1092	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	1158	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
…		…
1117		1183
1118	package CFClient::UI::EntryBase;	1184	package CFClient::UI::EntryBase;
1119		1185
1120	our @ISA = CFClient::UI::Label::;	1186	our @ISA = CFClient::UI::Label::;
1121		1187
1122	use SDL;	1188	use CFClient::OpenGL;
1123	use SDL::OpenGL;
1124		1189
1125	sub new {	1190	sub new {
1126	my $class = shift;	1191	my $class = shift;
1127		1192
1128	$class->SUPER::new (	1193	$class->SUPER::new (
…		…
1142		1207
1143	delete $self->{cur_h};	1208	delete $self->{cur_h};
1144		1209
1145	return if $self->{text} eq $text;	1210	return if $self->{text} eq $text;
1146		1211
		1212	delete $self->{texture};
		1213
1147	$self->{last_activity} = $::NOW;	1214	$self->{last_activity} = $::NOW;
1148	$self->{text} = $text;	1215	$self->{text} = $text;
1149		1216
1150	$text =~ s/./*/g if $self->{hidden};	1217	$text =~ s/./*/g if $self->{hidden};
1151	$self->{layout}->set_text ("$text ");	1218	$self->{layout}->set_text ("$text ");
…		…
1164		1231
1165	($w + 1, $h) # add 1 for cursor	1232	($w + 1, $h) # add 1 for cursor
1166	}	1233	}
1167		1234
1168	sub size_allocate {	1235	sub size_allocate {
1169	my ($self, $x, $y, $w, $h) = @_;	1236	my ($self, $w, $h) = @_;
1170		1237
1171	$self->SUPER::size_allocate ($x, $y, $w, $h) or return;	1238	$self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1172
1173	$self->_set_text ($self->{text});
1174	}	1239	}
1175		1240
1176	sub set_text {	1241	sub set_text {
1177	my ($self, $text) = @_;	1242	my ($self, $text) = @_;
1178		1243
…		…
1182	}	1247	}
1183		1248
1184	sub key_down {	1249	sub key_down {
1185	my ($self, $ev) = @_;	1250	my ($self, $ev) = @_;
1186		1251
1187	my $mod = $ev->key_mod;	1252	my $mod = $ev->{mod};
1188	my $sym = $ev->key_sym;	1253	my $sym = $ev->{sym};
1189
1190	my $uni = $ev->key_unicode;	1254	my $uni = $ev->{unicode};
1191		1255
1192	my $text = $self->get_text;	1256	my $text = $self->get_text;
1193		1257
1194	if ($sym == SDLK_BACKSPACE) {	1258	if ($sym == 8) {
1195	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};	1259	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1196	} elsif ($sym == SDLK_DELETE) {	1260	} elsif ($sym == 127) {
1197	substr $text, $self->{cursor}, 1, "";	1261	substr $text, $self->{cursor}, 1, "";
1198	} elsif ($sym == SDLK_LEFT) {	1262	} elsif ($sym == CFClient::SDLK_LEFT) {
1199	--$self->{cursor} if $self->{cursor};	1263	--$self->{cursor} if $self->{cursor};
1200	} elsif ($sym == SDLK_RIGHT) {	1264	} elsif ($sym == CFClient::SDLK_RIGHT) {
1201	++$self->{cursor} if $self->{cursor} < length $self->{text};	1265	++$self->{cursor} if $self->{cursor} < length $self->{text};
1202	} elsif ($sym == SDLK_HOME) {	1266	} elsif ($sym == CFClient::SDLK_HOME) {
1203	$self->{cursor} = 0;	1267	$self->{cursor} = 0;
1204	} elsif ($sym == SDLK_END) {	1268	} elsif ($sym == CFClient::SDLK_END) {
1205	$self->{cursor} = length $text;	1269	$self->{cursor} = length $text;
1206	} elsif ($sym == SDLK_ESCAPE) {	1270	} elsif ($sym == 27) {
1207	$self->emit ('escape');	1271	$self->emit ('escape');
1208	} elsif ($uni) {	1272	} elsif ($uni) {
1209	substr $text, $self->{cursor}++, 0, chr $uni;	1273	substr $text, $self->{cursor}++, 0, chr $uni;
1210	}	1274	}
1211		1275
…		…
1286		1350
1287	package CFClient::UI::Entry;	1351	package CFClient::UI::Entry;
1288		1352
1289	our @ISA = CFClient::UI::EntryBase::;	1353	our @ISA = CFClient::UI::EntryBase::;
1290		1354
1291	use SDL;	1355	use CFClient::OpenGL;
1292	use SDL::OpenGL;
1293		1356
1294	sub key_down {	1357	sub key_down {
1295	my ($self, $ev) = @_;	1358	my ($self, $ev) = @_;
1296		1359
1297	my $sym = $ev->key_sym;	1360	my $sym = $ev->{sym};
1298		1361
1299	if ($sym == SDLK_RETURN) {	1362	if ($sym == 13) {
1300	$self->emit (activate => $self->get_text);	1363	$self->emit (activate => $self->get_text);
1301	$self->update;	1364	$self->update;
1302		1365
1303	} else {	1366	} else {
1304	$self->SUPER::key_down ($ev);	1367	$self->SUPER::key_down ($ev);
…		…
1310		1373
1311	package CFClient::UI::Button;	1374	package CFClient::UI::Button;
1312		1375
1313	our @ISA = CFClient::UI::Label::;	1376	our @ISA = CFClient::UI::Label::;
1314		1377
1315	use SDL;	1378	use CFClient::OpenGL;
1316	use SDL::OpenGL;
1317		1379
1318	my @tex =	1380	my @tex =
1319	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }	1381	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1320	qw(b1_button_active.png);	1382	qw(b1_button_active.png);
1321		1383
1322	sub new {	1384	sub new {
1323	my $class = shift;	1385	my $class = shift;
1324		1386
…		…
1371	package CFClient::UI::CheckBox;	1433	package CFClient::UI::CheckBox;
1372		1434
1373	our @ISA = CFClient::UI::DrawBG::;	1435	our @ISA = CFClient::UI::DrawBG::;
1374		1436
1375	my @tex =	1437	my @tex =
1376	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }	1438	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1377	qw(c1_checkbox_bg.png c1_checkbox_active.png);	1439	qw(c1_checkbox_bg.png c1_checkbox_active.png);
1378		1440
1379	use SDL;	1441	use CFClient::OpenGL;
1380	use SDL::OpenGL;
1381		1442
1382	sub new {	1443	sub new {
1383	my $class = shift;	1444	my $class = shift;
1384		1445
1385	$class->SUPER::new (	1446	$class->SUPER::new (
…		…
1396	my ($self) = @_;	1457	my ($self) = @_;
1397		1458
1398	($self->{padding} * 2 + 6) x 2	1459	($self->{padding} * 2 + 6) x 2
1399	}	1460	}
1400		1461
1401	sub size_allocate {
1402	my ($self, $x, $y, $w, $h) = @_;
1403
1404	$self->_size_allocate ($x, $y, $w, $h) or return;
1405	}
1406
1407	sub button_down {	1462	sub button_down {
1408	my ($self, $ev, $x, $y) = @_;	1463	my ($self, $ev, $x, $y) = @_;
1409		1464
1410	if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}	1465	if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}
1411	&& $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {	1466	&& $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {
…		…
1437	glDisable GL_BLEND;	1492	glDisable GL_BLEND;
1438	}	1493	}
1439		1494
1440	#############################################################################	1495	#############################################################################
1441		1496
1442	package CFClient::UI::VGauge;	1497	package CFClient::UI::Image;
1443		1498
1444	our @ISA = CFClient::UI::Base::;	1499	our @ISA = CFClient::UI::Base::;
1445		1500
1446	use SDL::OpenGL;	1501	use CFClient::OpenGL;
		1502	use Carp qw/confess/;
1447		1503
1448	my %tex = (	1504	our %loaded_images;
1449	food => [
1450	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
1451	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
1452	],
1453	grace => [
1454	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
1455	qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png/
1456	],
1457	hp => [
1458	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
1459	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
1460	],
1461	mana => [
1462	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
1463	qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png/
1464	],
1465	);
1466		1505
1467	# eg. VGauge->new (gauge => 'food'), default gauge: food
1468	sub new {	1506	sub new {
1469	my $class = shift;	1507	my $class = shift;
1470		1508
1471	my $self = $class->SUPER::new (gauge => 'food', @_);	1509	my $self = $class->SUPER::new (@_);
		1510
		1511	$self->{image} or confess "Image has 'image' not set. This is a fatal error!";
		1512
		1513	$loaded_images{$self->{image}} ||=
		1514	new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1;
		1515
		1516	my $tex = $self->{tex} = $loaded_images{$self->{image}};
		1517
		1518	Scalar::Util::weaken $loaded_images{$self->{image}};
		1519
		1520	$self->{aspect} = $tex->{w} / $tex->{h};
1472		1521
1473	$self	1522	$self
1474	}	1523	}
1475		1524
1476	sub size_request {	1525	sub size_request {
1477	my ($self) = @_;	1526	my ($self) = @_;
1478		1527
1479	(30, 100)	1528	($self->{tex}->{w}, $self->{tex}->{h})
1480	}
1481
1482	sub set_max {
1483	my ($self, $max) = @_;
1484	$self->{max_val} = $max;
1485	}
1486
1487	sub set_value {
1488	my ($self, $val, $max) = @_;
1489
1490	$self->set_max ($max)
1491	if defined $max;
1492
1493	$max = $self->{max_val};
1494	$self->{val} = $val;
1495
1496	$self->update;
1497	}	1529	}
1498		1530
1499	sub _draw {	1531	sub _draw {
1500	my ($self) = @_;	1532	my ($self) = @_;
1501		1533
1502	my $tex = $tex{$self->{gauge}};	1534	my $tex = $self->{tex};
1503		1535
1504	my ($w, $h) = ($self->{w}, $self->{h});	1536	my ($w, $h) = ($self->{w}, $self->{h});
1505		1537
1506	my $ycut = $self->{val} / ($self->{max_val} || 1);	1538	if ($self->{rot90}) {
1507	$ycut = 1 if $self->{val} > $self->{max_val};	1539	glRotate 90, 0, 0, 1;
		1540	glTranslate 0, -$self->{w}, 0;
1508		1541
1509	my $t1 = $tex->[0];	1542	($w, $h) = ($h, $w);
1510	my $t2 = $tex->[1];	1543	}
1511		1544
1512	glEnable GL_BLEND;	1545	glEnable GL_BLEND;
1513	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	1546	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1514	glEnable GL_TEXTURE_2D;	1547	glEnable GL_TEXTURE_2D;
1515	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1548	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1516		1549
		1550	$tex->draw_quad (0, 0, $w, $h);
		1551
		1552	glDisable GL_BLEND;
		1553	glDisable GL_TEXTURE_2D;
		1554	}
		1555
		1556	#############################################################################
		1557
		1558	package CFClient::UI::VGauge;
		1559
		1560	our @ISA = CFClient::UI::Base::;
		1561
		1562	use CFClient::OpenGL;
		1563
		1564	my %tex = (
		1565	food => [
		1566	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
		1567	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
		1568	],
		1569	grace => [
		1570	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
		1571	qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png/
		1572	],
		1573	hp => [
		1574	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
		1575	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
		1576	],
		1577	mana => [
		1578	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
		1579	qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png/
		1580	],
		1581	);
		1582
		1583	# eg. VGauge->new (gauge => 'food'), default gauge: food
		1584	sub new {
		1585	my $class = shift;
		1586
		1587	my $self = $class->SUPER::new (
		1588	type => 'food',
		1589	@_
		1590	);
		1591
		1592	$self->{aspect} = $tex{$self->{type}}[0]{w} / $tex{$self->{type}}[0]{h};
		1593
		1594	$self
		1595	}
		1596
		1597	sub size_request {
		1598	my ($self) = @_;
		1599
		1600	#my $tex = $tex{$self->{type}}[0];
		1601	#@$tex{qw(w h)}
		1602	(0, 0)
		1603	}
		1604
		1605	sub set_max {
		1606	my ($self, $max) = @_;
		1607
		1608	$self->{max_val} = $max;
		1609	}
		1610
		1611	sub set_value {
		1612	my ($self, $val, $max) = @_;
		1613
		1614	$self->set_max ($max)
		1615	if defined $max;
		1616
		1617	$max = $self->{max_val};
		1618	$self->{val} = $val;
		1619
		1620	$self->update;
		1621	}
		1622
		1623	sub _draw {
		1624	my ($self) = @_;
		1625
		1626	my $tex = $tex{$self->{type}};
		1627
		1628	my ($w, $h) = ($self->{w}, $self->{h});
		1629
		1630	if ($self->{vertical}) {
		1631	glRotate 90, 0, 0, 1;
		1632	glTranslate 0, -$self->{w}, 0;
		1633
		1634	($w, $h) = ($h, $w);
		1635	}
		1636
		1637	my $ycut = $self->{val} / ($self->{max_val} || 1);
		1638	$ycut = 1 if $self->{val} > $self->{max_val};
		1639
		1640	my $t1 = $tex->[0];
		1641	my $t2 = $tex->[1];
		1642
		1643	glEnable GL_BLEND;
		1644	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
		1645	glEnable GL_TEXTURE_2D;
		1646	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		1647
1517	my $h1 = $self->{h} - $ycut * $self->{h};	1648	my $h1 = $self->{h} - $ycut * $self->{h};
1518	my $h2 = $ycut * $self->{h};	1649	my $h2 = $ycut * $self->{h};
1519		1650
1520	my $yp = 0;
1521
1522	glBindTexture (GL_TEXTURE_2D, $t1->{name});	1651	glBindTexture GL_TEXTURE_2D, $t1->{name};
1523	glBegin (GL_QUADS);	1652	glBegin GL_QUADS;
1524	glTexCoord (0, 0); glVertex (0 , $yp);	1653	glTexCoord 0 , 0; glVertex 0 , 0;
1525	glTexCoord (0, (1 - $ycut)); glVertex (0 , $yp + $h1);	1654	glTexCoord 0 , $t1->{t} * (1 - $ycut); glVertex 0 , $h1;
1526	glTexCoord (1, (1 - $ycut)); glVertex (0 + $w, $yp + $h1);	1655	glTexCoord $t1->{s}, $t1->{t} * (1 - $ycut); glVertex $w, $h1;
1527	glTexCoord (1, 0); glVertex (0 + $w, $yp);	1656	glTexCoord $t1->{s}, 0; glVertex $w, 0;
1528	glEnd ();	1657	glEnd;
1529		1658
1530	$yp += $h1;
1531
1532	glBindTexture (GL_TEXTURE_2D, $t2->{name});	1659	glBindTexture GL_TEXTURE_2D, $t2->{name};
1533	glBegin (GL_QUADS);	1660	glBegin GL_QUADS;
1534	glTexCoord (0, (1 - $ycut)); glVertex (0 , $yp);	1661	glTexCoord 0 , $t2->{t} * (1 - $ycut); glVertex 0 , $h1;
1535	glTexCoord (0, 1); glVertex (0 , $yp + $h2);	1662	glTexCoord 0 , $t2->{t}; glVertex 0 , $h1 + $h2;
1536	glTexCoord (1, 1); glVertex (0 + $w, $yp + $h2);	1663	glTexCoord $t2->{s}, $t2->{t}; glVertex $w, $h1 + $h2;
1537	glTexCoord (1, (1 - $ycut)); glVertex (0 + $w, $yp);	1664	glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut); glVertex $w, $h1;
1538	glEnd ();	1665	glEnd;
1539		1666
1540	glDisable GL_BLEND;	1667	glDisable GL_BLEND;
1541	glDisable GL_TEXTURE_2D;	1668	glDisable GL_TEXTURE_2D;
1542	}	1669	}
1543		1670
1544	#############################################################################	1671	#############################################################################
1545		1672
		1673	package CFClient::UI::Gauge;
		1674
		1675	our @ISA = CFClient::UI::VBox::;
		1676
		1677	sub new {
		1678	my ($class, %arg) = shift;
		1679
		1680	my $self = $class->SUPER::new (
		1681	@_,
		1682	);
		1683
		1684	$self->add ($self->{value} = new CFClient::UI::Label valign => 1, align => 0, template => "999");
		1685	$self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1);
		1686	$self->add ($self->{max} = new CFClient::UI::Label valign => 1, align => 0, template => "999");
		1687
		1688	$self
		1689	}
		1690
		1691	sub set_fontsize {
		1692	my ($self, $fsize) = @_;
		1693
		1694	$self->{value}->set_fontsize ($fsize);
		1695	$self->{max} ->set_fontsize ($fsize);
		1696	}
		1697
		1698	sub set_value {
		1699	my ($self, $val, $max) = @_;
		1700
		1701	$self->set_max ($max)
		1702	if defined $max;
		1703
		1704	$self->{gauge}->set_value ($val, $max);
		1705	$self->{value}->set_text ($val);
		1706	}
		1707
		1708	sub set_max {
		1709	my ($self, $max) = @_;
		1710
		1711	$self->{gauge}->set_max ($max);
		1712	$self->{max}->set_text ($max);
		1713	}
		1714
		1715	#############################################################################
		1716
1546	package CFClient::UI::Slider;	1717	package CFClient::UI::Slider;
1547		1718
1548	use strict;	1719	use strict;
1549		1720
1550	use SDL::OpenGL;	1721	use CFClient::OpenGL;
1551		1722
1552	our @ISA = CFClient::UI::DrawBG::;	1723	our @ISA = CFClient::UI::DrawBG::;
1553		1724
1554	my @tex =	1725	my @tex =
1555	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }	1726	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
…		…
1565	# TODO: calculations are off	1736	# TODO: calculations are off
1566	my $self = $class->SUPER::new (	1737	my $self = $class->SUPER::new (
1567	fg => [1, 1, 1],	1738	fg => [1, 1, 1],
1568	active_fg => [0, 0, 0],	1739	active_fg => [0, 0, 0],
1569	range => [0, 0, 100, 10],	1740	range => [0, 0, 100, 10],
1570	req_w => 40,	1741	req_w => 20,
1571	req_h => 13,	1742	req_h => 20,
1572	vertical => 0,	1743	vertical => 0,
1573	can_hover => 1,	1744	can_hover => 1,
1574	inner_pad => 5,	1745	inner_pad => 5,
1575	@_	1746	@_
1576	);	1747	);
…		…
1680		1851
1681	package CFClient::UI::TextView;	1852	package CFClient::UI::TextView;
1682		1853
1683	our @ISA = CFClient::UI::HBox::;	1854	our @ISA = CFClient::UI::HBox::;
1684		1855
1685	use SDL::OpenGL;	1856	use CFClient::OpenGL;
1686		1857
1687	sub new {	1858	sub new {
1688	my $class = shift;	1859	my $class = shift;
1689		1860
1690	my $self = $class->SUPER::new (	1861	my $self = $class->SUPER::new (
1691	req_w => $::WIDTH / 6,
1692	req_h => $::HEIGHT / 6,
1693	fontsize => $::FONTSIZE,	1862	fontsize => 1,
1694	@_,	1863	@_,
1695		1864
1696	layout => (new CFClient::Layout),	1865	layout => (new CFClient::Layout),
1697	par => [],	1866	par => [],
1698	height => 0,	1867	height => 0,
…		…
1719	sub text_height {	1888	sub text_height {
1720	my ($self, $text) = @_;	1889	my ($self, $text) = @_;
1721		1890
1722	my $layout = $self->{layout};	1891	my $layout = $self->{layout};
1723		1892
1724	$layout->set_height ($self->{fontsize});	1893	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
1725	$layout->set_width ($self->{w});	1894	$layout->set_width ($self->{w});
1726	$layout->set_text ($text);	1895	$layout->set_text ($text);
1727		1896
1728	($layout->size)[1]	1897	($layout->size)[1]
1729	}	1898	}
…		…
1733		1902
1734	$self->{need_reflow}++;	1903	$self->{need_reflow}++;
1735	$self->update;	1904	$self->update;
1736	}	1905	}
1737		1906
1738	sub size_request {
1739	my ($self) = @_;
1740
1741	($self->{req_w}, $self->{req_h})
1742	}
1743
1744	sub size_allocate {	1907	sub size_allocate {
1745	my ($self, $x, $y, $w, $h) = @_;	1908	my ($self, $w, $h) = @_;
1746		1909
1747	$self->SUPER::size_allocate ($x, $y, $w, $h) or return;	1910	$self->SUPER::size_allocate ($w, $h);
1748		1911
1749	$self->{layout}->set_height ($self->{fontsize});	1912	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1750	$self->{layout}->set_width ($self->{w});	1913	$self->{layout}->set_width ($self->{children}[0]{w});
1751		1914
1752	$self->reflow;	1915	$self->reflow;
1753	$self->update;
1754	}	1916	}
1755		1917
1756	sub add_paragraph {	1918	sub add_paragraph {
1757	my ($self, $color, $text) = @_;	1919	my ($self, $color, $text) = @_;
1758		1920
…		…
1843		2005
1844	}	2006	}
1845		2007
1846	#############################################################################	2008	#############################################################################
1847		2009
1848	package CFClient::UI::MapWidget;
1849
1850	use strict;
1851
1852	use List::Util qw(min max);
1853
1854	use SDL;
1855	use SDL::OpenGL;
1856
1857	our @ISA = CFClient::UI::Base::;
1858
1859	sub new {
1860	my $class = shift;
1861
1862	$class->SUPER::new (
1863	z => -1,
1864	can_focus => 1,
1865	list => (glGenLists 1),
1866	@_
1867	)
1868	}
1869
1870	sub key_down {
1871	print "MAPKEYDOWN\n";
1872	}
1873
1874	sub key_up {
1875	}
1876
1877	sub button_down {
1878	my ($self, $ev, $x, $y) = @_;
1879
1880	$self->focus_in;
1881
1882	if ($ev->button == 2) {
1883	my ($ox, $oy) = ($ev->button_x, $ev->button_y);
1884	my ($bw, $bh) = ($::CFG->{map_shift_x}, $::CFG->{map_shift_y});
1885
1886	$self->{motion} = sub {
1887	my ($ev, $x, $y) = @_;
1888
1889	($x, $y) = ($ev->motion_x, $ev->motion_y);
1890
1891	$::CFG->{map_shift_x} = $bw + $x - $ox;
1892	$::CFG->{map_shift_y} = $bh + $y - $oy;
1893
1894	$self->update;
1895	};
1896	}
1897	}
1898
1899	sub button_up {
1900	my ($self, $ev, $x, $y) = @_;
1901
1902	delete $self->{motion};
1903	}
1904
1905	sub mouse_motion {
1906	my ($self, $ev, $x, $y) = @_;
1907
1908	$self->{motion}->($ev, $x, $y) if $self->{motion};
1909	}
1910
1911	sub size_request {
1912	(
1913	1 + 32 * int $::WIDTH / 32,
1914	1 + 32 * int $::HEIGHT / 32,
1915	)
1916	}
1917
1918	sub update {
1919	my ($self) = @_;
1920
1921	$self->{need_update} = 1;
1922	$self->SUPER::update;
1923	}
1924
1925	sub draw {
1926	my ($self) = @_;
1927
1928	if (delete $self->{need_update}) {
1929	glNewList $self->{list}, GL_COMPILE;
1930
1931	if ($::MAP) {
1932	my $sw = int $::WIDTH / 32;
1933	my $sh = int $::HEIGHT / 32;
1934
1935	my $sx = $::CFG->{map_shift_x}; my $sx0 = $sx & 31; $sx = ($sx - $sx0) / 32;
1936	my $sy = $::CFG->{map_shift_y}; my $sy0 = $sy & 31; $sy = ($sy - $sy0) / 32;
1937
1938	glTranslate $sx0 - 32, $sy0 - 32, 0;
1939
1940	my ($w, $h, $data) = $::MAP->draw ($sx, $sy, 0, 0, $sw + 1, $sh + 1);
1941
1942	if ($::CFG->{fow_enable}) {
1943	if ($::CFG->{fow_smooth}) { # smooth fog of war
1944	glConvolutionParameter GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER;
1945	glConvolutionFilter2D
1946	GL_CONVOLUTION_2D,
1947	GL_ALPHA,
1948	3, 3,
1949	GL_ALPHA, GL_FLOAT,
1950	pack "f*",
1951	0.1, 0.1, 0.1,
1952	0.1, 0.2, 0.1,
1953	0.1, 0.1, 0.1,
1954	;
1955	glEnable GL_CONVOLUTION_2D;
1956	}
1957
1958	$self->{fow_texture} = new CFClient::Texture
1959	w => $w,
1960	h => $h,
1961	data => $data,
1962	internalformat => GL_ALPHA,
1963	format => GL_ALPHA;
1964
1965	glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth};
1966
1967	glEnable GL_BLEND;
1968	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1969	glEnable GL_TEXTURE_2D;
1970	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1971
1972	glColor +($::CFG->{fow_intensity}) x 3, 1;
1973	$self->{fow_texture}->draw_quad (0, 0, $w * 32, $h * 32);
1974
1975	glDisable GL_TEXTURE_2D;
1976	glDisable GL_BLEND;
1977	}
1978
1979	# HACK BEGIN
1980	{
1981	glTranslate -($sx0 - 32), -($sy0 - 32), 0;#remove
1982	my ($w, $h) = (250, 250);
1983
1984	glEnable GL_BLEND;
1985	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1986	glEnable GL_TEXTURE_2D;
1987	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1988
1989	$self->{mapmap_texture} =
1990	new CFClient::Texture
1991	w => $w,
1992	h => $h,
1993	data => $::MAP->mapmap ($w, $h),
1994	type => GL_UNSIGNED_INT_8_8_8_8_REV;
1995
1996	$self->{mapmap_texture}->draw_quad (100, 100);
1997
1998	glDisable GL_TEXTURE_2D;
1999	glDisable GL_BLEND;
2000	}
2001	# HACK END
2002	}
2003
2004	glEndList;
2005	}
2006
2007	glPushMatrix;
2008	glCallList $self->{list};
2009	glPopMatrix;
2010
2011	if ($FOCUS != $self) {
2012	glColor 64/255, 64/255, 64/255;
2013	glLogicOp GL_AND;
2014	glEnable GL_COLOR_LOGIC_OP;
2015	glBegin GL_QUADS;
2016	glVertex 0, 0;
2017	glVertex 0, $::HEIGHT;
2018	glVertex $::WIDTH, $::HEIGHT;
2019	glVertex $::WIDTH, 0;
2020	glEnd;
2021	glDisable GL_COLOR_LOGIC_OP;
2022	}
2023	}
2024
2025	my %DIR = (
2026	SDLK_KP8, [1, "north"],
2027	SDLK_KP9, [2, "northeast"],
2028	SDLK_KP6, [3, "east"],
2029	SDLK_KP3, [4, "southeast"],
2030	SDLK_KP2, [5, "south"],
2031	SDLK_KP1, [6, "southwest"],
2032	SDLK_KP4, [7, "west"],
2033	SDLK_KP7, [8, "northwest"],
2034
2035	SDLK_UP, [1, "north"],
2036	SDLK_RIGHT, [3, "east"],
2037	SDLK_DOWN, [5, "south"],
2038	SDLK_LEFT, [7, "west"],
2039	);
2040
2041	sub key_down {
2042	my ($self, $ev) = @_;
2043
2044	my $mod = $ev->key_mod;
2045	my $sym = $ev->key_sym;
2046
2047	if ($sym == SDLK_KP5) {
2048	$::CONN->user_send ("stay fire");
2049	} elsif ($sym == SDLK_a) {
2050	$::CONN->user_send ("apply");
2051	} elsif ($sym == SDLK_QUOTE) {
2052	$self->emit ('activate_console');
2053	} elsif ($sym == SDLK_SLASH) {
2054	$self->emit ('activate_console' => '/');
2055	} elsif (exists $DIR{$sym}) {
2056	if ($mod & KMOD_SHIFT) {
2057	$self->{shft}++;
2058	$::CONN->user_send ("fire $DIR{$sym}[0]");
2059	} elsif ($mod & KMOD_CTRL) {
2060	$self->{ctrl}++;
2061	$::CONN->user_send ("run $DIR{$sym}[0]");
2062	} else {
2063	$::CONN->user_send ("$DIR{$sym}[1]");
2064	}
2065	}
2066	}
2067
2068	sub key_up {
2069	my ($self, $ev) = @_;
2070
2071	my $mod = $ev->key_mod;
2072	my $sym = $ev->key_sym;
2073
2074	if (!($mod & KMOD_SHIFT) && delete $self->{shft}) {
2075	$::CONN->user_send ("fire_stop");
2076	}
2077	if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) {
2078	$::CONN->user_send ("run_stop");
2079	}
2080	}
2081
2082	#############################################################################
2083
2084	package CFClient::UI::Animator;	2010	package CFClient::UI::Animator;
2085		2011
2086	use SDL::OpenGL;	2012	use CFClient::OpenGL;
2087		2013
2088	our @ISA = CFClient::UI::Bin::;	2014	our @ISA = CFClient::UI::Bin::;
2089		2015
2090	sub moveto {	2016	sub moveto {
2091	my ($self, $x, $y) = @_;	2017	my ($self, $x, $y) = @_;
…		…
2164		2090
2165	package CFClient::UI::Root;	2091	package CFClient::UI::Root;
2166		2092
2167	our @ISA = CFClient::UI::Container::;	2093	our @ISA = CFClient::UI::Container::;
2168		2094
2169	use SDL::OpenGL;	2095	use CFClient::OpenGL;
2170		2096
2171	sub check_size {	2097	sub check_size {
2172	my ($self) = @_;	2098	my ($self) = @_;
2173		2099
2174	$self->size_allocate (0, 0, $::WITH, $::HEIGHT);	2100	$self->configure (0, 0, $::WIDTH, $::HEIGHT);
2175	}	2101	}
2176		2102
2177	sub size_request {	2103	sub size_request {
2178	($::WIDTH, $::HEIGHT)	2104	($::WIDTH, $::HEIGHT)
2179	}	2105	}
2180		2106
2181	sub size_allocate {	2107	sub configure {
2182	my ($self, $x, $y, $w, $h) = @_;	2108	my ($self, $x, $y, $w, $h) = @_;
2183		2109
2184	$self->_size_allocate ($x, $y, $w, $h);	2110	$self->SUPER::configure ($x, $y, $w, $h);
2185		2111
2186	$_->size_allocate ($_->{x}, $_->{y}, $_->size_request)
2187	for @{$self->{children}};	2112	for my $child (@{$self->{children}}) {
		2113	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
		2114
		2115	$X = List::Util::max 0, List::Util::min $w - $W, $X;
		2116	$Y = List::Util::max 0, List::Util::min $h - $H, $Y;
		2117	$child->configure ($X, $Y, $W,$H);
		2118	}
2188	}	2119	}
2189		2120
2190	sub _topleft {	2121	sub _topleft {
2191	my ($self, $x, $y) = @_;	2122	my ($self, $x, $y) = @_;
2192		2123
…		…
2199	$self->check_size;	2130	$self->check_size;
2200	::refresh ();	2131	::refresh ();
2201	}	2132	}
2202		2133
2203	sub add {	2134	sub add {
2204	my ($self, $widget) = @_;	2135	my ($self, $child) = @_;
2205		2136
		2137	# integerize window positions
		2138	$child->{x} = int $child->{x};
		2139	$child->{y} = int $child->{y};
		2140
2206	$self->SUPER::add ($widget);	2141	$self->SUPER::add ($child);
2207
2208	$widget->size_allocate (int $widget->{x}, int $widget->{y}, $widget->size_request);
2209	}	2142	}
2210		2143
2211	sub on_refresh {	2144	sub on_refresh {
2212	my ($self, $id, $cb) = @_;	2145	my ($self, $id, $cb) = @_;
2213		2146

Diff Legend

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