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.75 by root, Tue Apr 11 20:44:49 2006 UTC vs.
Revision 1.112 by root, Sat Apr 15 12:29:46 2006 UTC

…		…
43		43
44	my $widget = $GRAB || $TOPLEVEL->find_widget ($x, $y);	44	my $widget = $GRAB || $TOPLEVEL->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->translate ($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;
…		…
61	my $widget = $GRAB || $TOPLEVEL->find_widget ($x, $y);	61	my $widget = $GRAB || $TOPLEVEL->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->translate ($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} = $x;
…		…
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	# translate global coordinates to local coordinate system
131	sub translate {	152	sub translate {
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}->translate ($x - $self->{x}, $y - $self->{y});
135	}	156	}
136		157
137	sub focus_in {	158	sub focus_in {
138	my ($self) = @_;	159	my ($self) = @_;
139		160
140	return if $FOCUS == $self;	161	return if $FOCUS == $self;
		162	return unless $self->{can_focus};
141		163
142	my $focus = $FOCUS; $FOCUS = $self;	164	my $focus = $FOCUS; $FOCUS = $self;
143	$focus->update if $focus;	165	$focus->update if $focus;
144	$FOCUS->update;	166	$FOCUS->update;
145	}	167	}
…		…
178	glPushMatrix;	200	glPushMatrix;
179	glTranslate $self->{x}, $self->{y}, 0;	201	glTranslate $self->{x}, $self->{y}, 0;
180	$self->_draw;	202	$self->_draw;
181	glPopMatrix;	203	glPopMatrix;
182		204
183	if ($self == $HOVER) {	205	if ($self == $HOVER && $self->{can_hover}) {
184	my ($x, $y) = @$self{qw(x y)};	206	my ($x, $y) = @$self{qw(x y)};
185		207
186	glColor 1, 1, 1, 0.1;	208	glColor 0, 0, 1, 0.2;
187	glEnable GL_BLEND;	209	glEnable GL_BLEND;
188	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	210	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
189	glBegin GL_QUADS;	211	glBegin GL_QUADS;
190	glVertex $x , $y;	212	glVertex $x , $y;
191	glVertex $x + $self->{w}, $y;	213	glVertex $x + $self->{w}, $y;
…		…
200	my ($self) = @_;	222	my ($self) = @_;
201		223
202	warn "no draw defined for $self\n";	224	warn "no draw defined for $self\n";
203	}	225	}
204		226
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 {	227	sub find_widget {
217	my ($self, $x, $y) = @_;	228	my ($self, $x, $y) = @_;
218		229
219	return $self	230	return $self
220	if $x >= $self->{x} && $x < $self->{x} + $self->{w}	231	if $x >= $self->{x} && $x < $self->{x} + $self->{w}
221	&& $y >= $self->{y} && $y < $self->{y} + $self->{h};	232	&& $y >= $self->{y} && $y < $self->{y} + $self->{h};
222		233
223	()	234	()
224	}	235	}
225		236
226	sub del_parent { $_[0]->{parent} = undef }
227
228	sub set_parent {	237	sub set_parent {
229	my ($self, $par) = @_;	238	my ($self, $par) = @_;
230		239
231	$self->{parent} = $par;	240	$self->{parent} = $par;
232	Scalar::Util::weaken $self->{parent};	241	Scalar::Util::weaken $self->{parent};
…		…
275	my $class = shift;	284	my $class = shift;
276		285
277	# range [value, low, high, page]	286	# range [value, low, high, page]
278		287
279	$class->SUPER::new (	288	$class->SUPER::new (
280	bg => [0, 0, 0, 0.4],	289	bg => [0, 0, 0, 0.2],
281	active_bg => [1, 1, 1],	290	active_bg => [1, 1, 1, 0.5],
282	@_	291	@_
283	)	292	)
284	}	293	}
285		294
286	sub _draw {	295	sub _draw {
287	my ($self) = @_;	296	my ($self) = @_;
288		297
289	my ($w, $h) = @$self{qw(w h)};	298	my ($w, $h) = @$self{qw(w h)};
290		299
		300	glEnable GL_BLEND;
		301	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
291	glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} };	302	glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} };
		303
292	glBegin GL_QUADS;	304	glBegin GL_QUADS;
293	glVertex 0 , 0;	305	glVertex 0 , 0;
294	glVertex 0 , $h;	306	glVertex 0 , $h;
295	glVertex $w, $h;	307	glVertex $w, $h;
296	glVertex $w, 0;	308	glVertex $w, 0;
297	glEnd;	309	glEnd;
		310
		311	glDisable GL_BLEND;
298	}	312	}
299		313
300	#############################################################################	314	#############################################################################
301		315
302	package CFClient::UI::Empty;	316	package CFClient::UI::Empty;
…		…
325		339
326	$self	340	$self
327	}	341	}
328		342
329	sub add {	343	sub add {
330	my ($self, $chld, $expand) = @_;	344	my ($self, $chld) = @_;
331		345
332	$chld->{expand} = $expand;
333	$chld->set_parent ($self);	346	$chld->set_parent ($self);
334		347
335	$self->{children} = [	348	$self->{children} = [
336	sort { $a->{z} <=> $b->{z} }	349	sort { $a->{z} <=> $b->{z} }
337	@{$self->{children}}, $chld	350	@{$self->{children}}, $chld
…		…
439	}	452	}
440		453
441	sub render_chld {	454	sub render_chld {
442	my ($self) = @_;	455	my ($self) = @_;
443		456
444	$self->{texture} =	457	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
445	CFClient::Texture->new_from_opengl (	458	glClearColor 0, 0, 0, 1;
446	$self->{w}, $self->{h}, sub { $self->child->draw }	459	glClear GL_COLOR_BUFFER_BIT;
447	);	460	$self->child->draw;
		461	};
448	}	462	}
449		463
450	sub size_allocate {	464	sub size_allocate {
451	my ($self, $x, $y, $w, $h) = @_;	465	my ($self, $x, $y, $w, $h) = @_;
452		466
…		…
530		544
531	my @tex =	545	my @tex =
532	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }	546	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
533	qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);	547	qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
534		548
		549	sub new {
		550	my $class = shift;
		551
		552	# TODO: user_x, user_y, overwrite moveto?
		553
		554	$class->SUPER::new (
		555	bg => [1, 1, 1, 1],
		556	border_bg => [1, 1, 1, 1],
		557	border => $::FONTSIZE * 0.8,
		558	@_
		559	)
		560	}
		561
535	sub size_request {	562	sub size_request {
536	my ($self) = @_;	563	my ($self) = @_;
537		564
		565	return ($self->{user_w}, $self->{user_h}) if $self->{user_w} && $self->{user_h};
		566
538	my ($w, $h) = $self->SUPER::size_request;	567	my ($w, $h) = $self->SUPER::size_request;
539		568
540	$h += $tex[1]->{h};	569	(
541	$h += $tex[4]->{h};	570	$w + $self->{border} * 2,
542	$w += $tex[2]->{w};	571	$h + $self->{border} * 2,
543	$w += $tex[3]->{w};	572	)
544
545	($w, $h)
546	}	573	}
547		574
548	sub size_allocate {	575	sub size_allocate {
549	my ($self, $x, $y, $w, $h) = @_;	576	my ($self, $x, $y, $w, $h) = @_;
550		577
551	$self->_size_allocate ($x, $y, $w, $h) or return;	578	$self->_size_allocate ($x, $y, $w, $h) or return;
552		579
553	$h -= $tex[1]->{h};	580	$h -= List::Util::max 0, $self->{border} * 2;
554	$h -= $tex[4]->{h};	581	$w -= List::Util::max 0, $self->{border} * 2;
555	$w -= $tex[2]->{w};
556	$w -= $tex[3]->{w};
557		582
558	$h = $h < 0 ? 0 : $h;	583	$self->child->size_allocate ($self->{border}, $self->{border}, $w, $h);
559	$w = $w < 0 ? 0 : $w;	584	}
560		585
561	my $child = $self->child;	586	sub button_down {
		587	my ($self, $ev, $x, $y) = @_;
562		588
563	$child->size_allocate ($tex[3]->{w}, $tex[1]->{h}, $w, $h);	589	if ($x < $self->{w} && $x >= $self->{w} - $self->{border}
		590	&& $y < $self->{h} && $y >= $self->{h} - $self->{border}) {
		591
		592	my ($ox, $oy) = ($ev->button_x, $ev->button_y);
		593	my ($bw, $bh) = ($self->{w}, $self->{h});
		594
		595	$self->{motion} = sub {
		596	my ($ev, $x, $y) = @_;
		597
		598	($x, $y) = ($ev->motion_x, $ev->motion_y);
		599
		600	$self->{user_w} = $bw + $x - $ox;
		601	$self->{user_h} = $bh + $y - $oy;
		602	$self->update;
		603	};
		604
		605	} elsif ($x >= 0 && $x < $self->{w}
		606	&& $y >= 0 && $y < $self->{border}) {
		607
		608	my ($ox, $oy) = ($ev->button_x, $ev->button_y);
		609	my ($bx, $by) = ($self->{x}, $self->{y});
		610
		611	$self->{motion} = sub {
		612	my ($ev, $x, $y) = @_;
		613
		614	($x, $y) = ($ev->motion_x, $ev->motion_y);
		615
		616	$self->move ($bx + $x - $ox, $by + $y - $oy);
		617	$self->update;
		618	};
		619	}
		620	}
		621
		622	sub button_up {
		623	my ($self, $ev, $x, $y) = @_;
		624
		625	delete $self->{motion};
		626	}
		627
		628	sub mouse_motion {
		629	my ($self, $ev, $x, $y) = @_;
		630
		631	$self->{motion}->($ev, $x, $y) if $self->{motion};
564	}	632	}
565		633
566	sub _draw {	634	sub _draw {
567	my ($self) = @_;	635	my ($self) = @_;
568		636
569	my ($w, $h) = ($self->{w}, $self->{h});	637	my ($w, $h ) = ($self->{w}, $self->{h});
570	my ($cw, $ch) = ($self->child->{w}, $self->child->{h});	638	my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
571		639
572	glEnable GL_BLEND;	640	glEnable GL_BLEND;
573	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	641	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
574	glEnable GL_TEXTURE_2D;	642	glEnable GL_TEXTURE_2D;
575	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	643	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
576		644
577	my $top = $tex[1];	645	glColor @{ $self->{border_bg} };
578	$top->draw_quad (0, 0, $w, $top->{h});	646	$tex[1]->draw_quad (0, 0, $w, $self->{border});
579		647	$tex[3]->draw_quad (0, $self->{border}, $self->{border}, $ch);
580	my $left = $tex[3];	648	$tex[2]->draw_quad ($w - $self->{border}, $self->{border}, $self->{border}, $ch);
581	$left->draw_quad (0, $top->{h}, $left->{w}, $ch);	649	$tex[4]->draw_quad (0, $h - $self->{border}, $w, $self->{border});
582
583	my $right = $tex[2];
584	$right->draw_quad ($w - $right->{w}, $top->{h}, $right->{w}, $ch);
585
586	my $bottom = $tex[4];
587	$bottom->draw_quad (0, $h - $bottom->{h}, $w, $bottom->{h});
588		650
589	my $bg = $tex[0];	651	my $bg = $tex[0];
590	glBindTexture GL_TEXTURE_2D, $bg->{name};
591	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
592	glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT;
593	glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT;
594		652
		653	# TODO: repeat texture not scale
595	my $rep_x = $cw / $bg->{w};	654	my $rep_x = $cw / $bg->{w};
596	my $rep_y = $ch / $bg->{h};	655	my $rep_y = $ch / $bg->{h};
597		656
		657	glColor @{ $self->{bg} };
		658
		659	$bg->{s} = $rep_x;
		660	$bg->{t} = $rep_y;
		661	$bg->{wrap_mode} = 1;
598	$bg->draw_quad ($left->{w}, $top->{h}, $cw, $ch);	662	$bg->draw_quad ($self->{border}, $self->{border}, $cw, $ch);
599		663
		664	glDisable GL_TEXTURE_2D;
600	glDisable GL_BLEND;	665	glDisable GL_BLEND;
601	glDisable GL_TEXTURE_2D;
602		666
603	$self->child->draw;	667	$self->child->draw;
604
605	}	668	}
606		669
607	#############################################################################	670	#############################################################################
608		671
609	package CFClient::UI::Table;	672	package CFClient::UI::Table;
…		…
611	our @ISA = CFClient::UI::Base::;	674	our @ISA = CFClient::UI::Base::;
612		675
613	use List::Util qw(max sum);	676	use List::Util qw(max sum);
614		677
615	use SDL::OpenGL;	678	use SDL::OpenGL;
		679
		680	sub new {
		681	my $class = shift;
		682
		683	$class->SUPER::new (
		684	col_expand => [],
		685	@_
		686	)
		687	}
616		688
617	sub add {	689	sub add {
618	my ($self, $x, $y, $chld) = @_;	690	my ($self, $x, $y, $chld) = @_;
619		691
620	$self->{children}[$y][$x] = $chld;	692	$self->{children}[$y][$x] = $chld;
…		…
650	my ($self) = @_;	722	my ($self) = @_;
651		723
652	my ($ws, $hs) = $self->get_wh;	724	my ($ws, $hs) = $self->get_wh;
653		725
654	(	726	(
655	(List::Util::sum @$ws),	727	(sum @$ws),
656	(List::Util::sum @$hs),	728	(sum @$hs),
657	)	729	)
658	}	730	}
659		731
660	sub size_allocate {	732	sub size_allocate {
661	my ($self, $x, $y, $w, $h) = @_;	733	my ($self, $x, $y, $w, $h) = @_;
662		734
663	$self->_size_allocate ($x, $y, $w, $h) or return;	735	$self->_size_allocate ($x, $y, $w, $h) or return;
664		736
665	my ($ws, $hs) = $self->get_wh;	737	my ($ws, $hs) = $self->get_wh;
666		738
667	my $req_w = List::Util::sum @$ws;	739	my $req_w = sum @$ws;
668	my $req_h = List::Util::sum @$hs;	740	my $req_h = sum @$hs;
		741
		742	# TODO: nicer code && do row_expand
		743	my @col_expand = @{$self->{col_expand}};
		744	@col_expand = (1) x @$ws unless @col_expand;
		745	my $col_expand = (sum @col_expand) || 1;
669		746
670	# linearly scale sizes	747	# linearly scale sizes
671	$_ *= $req_w / $w for @$ws;	748	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
672	$_ *= $req_h / $h for @$hs;	749	$hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
		750
		751	CFClient::UI::harmonize $ws;
		752	CFClient::UI::harmonize $hs;
673		753
674	my $y;	754	my $y;
675		755
676	for my $r (0 .. $#{$self->{children}}) {	756	for my $r (0 .. $#{$self->{children}}) {
677	my $row = $self->{children}[$r]	757	my $row = $self->{children}[$r]
…		…
679		759
680	my $x = 0;	760	my $x = 0;
681	my $row_h = $hs->[$r];	761	my $row_h = $hs->[$r];
682		762
683	for my $c (0 .. $#$row) {	763	for my $c (0 .. $#$row) {
684	my $widget = $row->[$c]
685	or next;
686
687	my $col_w = $ws->[$c];	764	my $col_w = $ws->[$c];
688		765
		766	if (my $widget = $row->[$c]) {
689	$widget->size_allocate ($x, $y, $col_w, $row_h);	767	$widget->size_allocate ($x, $y, $col_w, $row_h);
		768	}
690		769
691	$x += $col_w;	770	$x += $col_w;
692	}	771	}
693		772
694	$y += $row_h;	773	$y += $row_h;
695	}	774	}
696		775
697	}	776	}
698		777
		778	sub find_widget {
		779	my ($self, $x, $y) = @_;
		780
		781	$x -= $self->{x};
		782	$y -= $self->{y};
		783
		784	my $res;
		785
		786	for (grep $_, map @$_, grep $_, @{ $self->{children} }) {
		787	$res = $_->find_widget ($x, $y)
		788	and return $res;
		789	}
		790
		791	$self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
		792	}
		793
699	sub _draw {	794	sub _draw {
700	my ($self) = @_;	795	my ($self) = @_;
701		796
702	for (grep $_, @{$self->{children}}) {	797	for (grep $_, @{$self->{children}}) {
703	$_->draw for grep $_, @$_;	798	$_->draw for grep $_, @$_;
704	}	799	}
705	}	800	}
706		801
707	#############################################################################	802	#############################################################################
708		803
		804	package CFClient::UI::HBox;
		805
		806	# TODO: wrap into common Box base class
		807
		808	our @ISA = CFClient::UI::Container::;
		809
		810	sub size_request {
		811	my ($self) = @_;
		812
		813	my @alloc = map [$_->size_request], @{$self->{children}};
		814
		815	(
		816	(List::Util::sum map $_->[0], @alloc),
		817	(List::Util::max map $_->[1], @alloc),
		818	)
		819	}
		820
		821	sub size_allocate {
		822	my ($self, $x, $y, $w, $h) = @_;
		823
		824	$self->_size_allocate ($x, $y, $w, $h);
		825
		826	($h, $w) = ($w, $h);
		827
		828	my $children = $self->{children};
		829
		830	my @h = map +($_->size_request)[0], @$children;
		831
		832	my $req_h = List::Util::sum @h;
		833
		834	if ($req_h > $h) {
		835	# ah well, not enough space
		836	$_ *= $h / $req_h for @h;
		837	} else {
		838	my $exp = List::Util::sum map $_->{expand}, @$children;
		839	$exp ||= 1;
		840
		841	for (0 .. $#$children) {
		842	my $child = $children->[$_];
		843
		844	my $alloc_h = $h[$_];
		845	$alloc_h += ($h - $req_h) * $child->{expand} / $exp;
		846	$h[$_] = $alloc_h;
		847	}
		848	}
		849
		850	CFClient::UI::harmonize \@h;
		851
		852	my $y = 0;
		853	for (0 .. $#$children) {
		854	my $child = $children->[$_];
		855	my $h = $h[$_];
		856	$child->size_allocate ($y, 0, $h, $w);
		857
		858	$y += $h;
		859	}
		860	}
		861
		862	#############################################################################
		863
709	package CFClient::UI::VBox;	864	package CFClient::UI::VBox;
710		865
		866	# TODO: wrap into common Box base class
		867
711	our @ISA = CFClient::UI::Container::;	868	our @ISA = CFClient::UI::Container::;
712
713	use SDL::OpenGL;
714		869
715	sub size_request {	870	sub size_request {
716	my ($self) = @_;	871	my ($self) = @_;
717		872
718	my @alloc = map [$_->size_request], @{$self->{children}};	873	my @alloc = map [$_->size_request], @{$self->{children}};
…		…
724	}	879	}
725		880
726	sub size_allocate {	881	sub size_allocate {
727	my ($self, $x, $y, $w, $h) = @_;	882	my ($self, $x, $y, $w, $h) = @_;
728		883
729	$self->_size_allocate ($x, $y, $w, $h) or return;	884	$self->_size_allocate ($x, $y, $w, $h);
730
731	return unless $self->{h};
732		885
733	my $children = $self->{children};	886	my $children = $self->{children};
734		887
735	my @h = map +($_->size_request)[1], @$children;	888	my @h = map +($_->size_request)[1], @$children;
736		889
737	my $req_h = List::Util::sum @h;	890	my $req_h = List::Util::sum @h;
738		891
739	if ($req_h > $h) {	892	if ($req_h > $h) {
740	# ah well, not enough space	893	# ah well, not enough space
741	$_ = $h[$_] * $h / $req_h for @h;	894	$_ *= $h / $req_h for @h;
742	} else {	895	} else {
743	my @exp = grep $_->{expand}, @$children;	896	my $exp = List::Util::sum map $_->{expand}, @$children;
744	@exp = @$children unless @exp;	897	$exp ||= 1;
745		898
746	my %exp = map +($_ => 1), @exp;
747
748	for (0 .. $#$children) {	899	for (0 .. $#$children) {
749	my $child = $children->[$_];	900	my $child = $children->[$_];
750		901
751	my $alloc_h = $h[$_];	902	$h[$_] += ($h - $req_h) * $child->{expand} / $exp;
752	$alloc_h += ($h - $req_h) / @exp if $exp{$child};
753	$h[$_] = $alloc_h;
754	}	903	}
755	}	904	}
		905
		906	CFClient::UI::harmonize \@h;
756		907
757	my $y = 0;	908	my $y = 0;
758	for (0 .. $#$children) {	909	for (0 .. $#$children) {
759	my $child = $children->[$_];	910	my $child = $children->[$_];
760	my $h = $h[$_];	911	my $h = $h[$_];
…		…
774		925
775	sub new {	926	sub new {
776	my ($class, %arg) = @_;	927	my ($class, %arg) = @_;
777		928
778	my $self = $class->SUPER::new (	929	my $self = $class->SUPER::new (
779	fg => [1, 1, 1],	930	fg => [1, 1, 1],
780	height => $::FONTSIZE,	931	fontsize => $::FONTSIZE,
781	text => "",	932	text => "",
782	align => -1,	933	align => -1,
		934	padding => 2,
783	layout => new CFClient::Layout,	935	layout => new CFClient::Layout,
784	%arg	936	%arg
785	);	937	);
786		938
787	$self->set_text ($self->{text});	939	$self->set_text ($self->{text});
788		940
…		…
804		956
805	$self->{text} = $text;	957	$self->{text} = $text;
806	$self->{layout}->set_markup ($text);	958	$self->{layout}->set_markup ($text);
807		959
808	delete $self->{texture};	960	delete $self->{texture};
		961	# $self->{w} = $self->{h} = -1;
809	$self->update;	962	$self->update;
810	}	963	}
811		964
812	sub get_text {	965	sub get_text {
813	my ($self, $text) = @_;	966	my ($self, $text) = @_;
…		…
817		970
818	sub size_request {	971	sub size_request {
819	my ($self) = @_;	972	my ($self) = @_;
820		973
821	$self->{layout}->set_width;	974	$self->{layout}->set_width;
822	$self->{layout}->set_height ($self->{height});	975	$self->{layout}->set_height ($self->{fontsize});
823	$self->{layout}->size	976	my ($w, $h) = $self->{layout}->size;
824	# if ($self->{texture}{w} > 1 && $self->{texture}{height} > 1) { #TODO: hack	977
825	# (	978	(
826	# $self->{texture}{w},	979	$w + $self->{padding} * 2,
827	# $self->{texture}{h},	980	$h + $self->{padding} * 2,
828	# )	981	)
829	# } else {
830	# my ($w, $h, $data) = CFClient::font_render "Yy", $self->{h};
831	#
832	# ($w, $h)
833	# }
834	}	982	}
835		983
836	sub size_allocate {	984	sub size_allocate {
837	my ($self, $x, $y, $w, $h) = @_;	985	my ($self, $x, $y, $w, $h) = @_;
838		986
…		…
851	sub _draw {	999	sub _draw {
852	my ($self) = @_;	1000	my ($self) = @_;
853		1001
854	my $tex = $self->{texture} ||= do {	1002	my $tex = $self->{texture} ||= do {
855	$self->{layout}->set_width ($self->{w});	1003	$self->{layout}->set_width ($self->{w});
		1004	$self->{layout}->set_height (List::Util::min $self->{h} - $self->{padding} * 2, $self->{fontsize});
856	new_from_layout CFClient::Texture $self->{layout}	1005	new_from_layout CFClient::Texture $self->{layout}
857	};	1006	};
858		1007
859	glEnable GL_BLEND;	1008	glEnable GL_BLEND;
860	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	1009	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
861	glEnable GL_TEXTURE_2D;	1010	glEnable GL_TEXTURE_2D;
862	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	1011	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
863		1012
864	glColor @{$self->{fg}};	1013	glColor @{$self->{fg}};
865		1014
866	my $x =	1015	my $x =
867	$self->{align} < 0 ? 0	1016	$self->{align} < 0 ? $self->{padding}
868	: $self->{align} > 0 ? $self->{w} - $tex->{w}	1017	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
869	: ($self->{w} - $tex->{w}) * 0.5;	1018	: ($self->{w} - $tex->{w}) * 0.5;
870		1019
871	$tex->draw_quad ($x, 0);	1020	$tex->draw_quad (int $x, int +($self->{h} - $tex->{h}) * 0.5);
872		1021
873	glDisable GL_TEXTURE_2D;	1022	glDisable GL_TEXTURE_2D;
874	glDisable GL_BLEND;	1023	glDisable GL_BLEND;
875	}	1024	}
876		1025
…		…
886	sub new {	1035	sub new {
887	my $class = shift;	1036	my $class = shift;
888		1037
889	$class->SUPER::new (	1038	$class->SUPER::new (
890	fg => [1, 1, 1],	1039	fg => [1, 1, 1],
891	bg => [0, 0, 0, 0.4],	1040	bg => [0, 0, 0, 0.2],
892	active_bg => [1, 1, 1],	1041	active_bg => [1, 1, 1, 0.5],
893	active_fg => [0, 0, 0],	1042	active_fg => [0, 0, 0],
		1043	can_hover => 1,
		1044	can_focus => 1,
894	@_	1045	@_
895	)	1046	)
896	}	1047	}
897		1048
898	sub _set_text {	1049	sub _set_text {
899	my ($self, $text) = @_;	1050	my ($self, $text) = @_;
900		1051
		1052	my $old_text = $self->{text};
		1053
901	$self->{last_activity} = $::NOW;	1054	$self->{last_activity} = $::NOW;
902		1055
903	$self->{text} = $text;	1056	$self->{text} = $text;
904	$self->{layout}->set_width ($self->{w});	1057	$self->{layout}->set_width ($self->{w});
		1058	$self->{layout}->set_height (List::Util::min $self->{h} - $self->{padding} * 2, $self->{fontsize});
905		1059
906	$text =~ s/./*/g if $self->{hidden};	1060	$text =~ s/./*/g if $self->{hidden};
907		1061
908
909	$self->{layout}->set_markup ($self->escape_text ($text));	1062	$self->{layout}->set_markup ($self->escape_text ($text) . " ");
910		1063
911	$text = substr $text, 0, $self->{cursor};	1064	$text = substr $text, 0, $self->{cursor};
912	utf8::encode $text;	1065	utf8::encode $text;
913		1066
914	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text);	1067	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text);
		1068
		1069	$self->emit (changed => $self->{text}) # XXX: is this the right place to do this?
		1070	if $old_text ne $self->{text};
915	}	1071	}
916		1072
917	sub size_request {	1073	sub size_request {
918	my ($self) = @_;	1074	my ($self) = @_;
919		1075
…		…
954	substr $text, $self->{cursor}, 1, "";	1110	substr $text, $self->{cursor}, 1, "";
955	} elsif ($sym == SDLK_LEFT) {	1111	} elsif ($sym == SDLK_LEFT) {
956	--$self->{cursor} if $self->{cursor};	1112	--$self->{cursor} if $self->{cursor};
957	} elsif ($sym == SDLK_RIGHT) {	1113	} elsif ($sym == SDLK_RIGHT) {
958	++$self->{cursor} if $self->{cursor} < length $self->{text};	1114	++$self->{cursor} if $self->{cursor} < length $self->{text};
		1115	} elsif ($sym == SDLK_HOME) {
		1116	$self->{cursor} = 0;
		1117	} elsif ($sym == SDLK_END) {
		1118	$self->{cursor} = length $text;
		1119	} elsif ($sym == SDLK_ESCAPE) {
		1120	$self->emit ('escape');
959	} elsif ($uni) {	1121	} elsif ($uni) {
960	substr $text, $self->{cursor}++, 0, chr $uni;	1122	substr $text, $self->{cursor}++, 0, chr $uni;
961	}	1123	}
962		1124
963	$self->_set_text ($text);	1125	$self->_set_text ($text);
…		…
978	$self->SUPER::button_down ($ev, $x, $y);	1140	$self->SUPER::button_down ($ev, $x, $y);
979		1141
980	my $idx = $self->{layout}->xy_to_index ($x, $y);	1142	my $idx = $self->{layout}->xy_to_index ($x, $y);
981		1143
982	# byte-index to char-index	1144	# byte-index to char-index
983	my $text = $self->{layout};	1145	my $text = $self->{text};
984	utf8::encode $text;	1146	utf8::encode $text;
985	$self->{cursor} = length substr $text, 0, $idx;	1147	$self->{cursor} = length substr $text, 0, $idx;
986		1148
987	$self->_set_text ($self->{text});	1149	$self->_set_text ($self->{text});
988	$self->update;	1150	$self->update;
…		…
1003	$self->{fg} = $self->{active_fg};	1165	$self->{fg} = $self->{active_fg};
1004	} else {	1166	} else {
1005	glColor @{$self->{bg}};	1167	glColor @{$self->{bg}};
1006	}	1168	}
1007		1169
		1170	glEnable GL_BLEND;
		1171	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1008	glBegin GL_QUADS;	1172	glBegin GL_QUADS;
1009	glVertex 0 , 0;	1173	glVertex 0 , 0;
1010	glVertex 0 , $self->{h};	1174	glVertex 0 , $self->{h};
1011	glVertex $self->{w}, $self->{h};	1175	glVertex $self->{w}, $self->{h};
1012	glVertex $self->{w}, 0;	1176	glVertex $self->{w}, 0;
1013	glEnd;	1177	glEnd;
		1178	glDisable GL_BLEND;
1014		1179
1015	$self->SUPER::_draw;	1180	$self->SUPER::_draw;
1016		1181
1017	#TODO: force update every cursor change :(	1182	#TODO: force update every cursor change :(
1018	if ($FOCUS == $self && (($::NOW - $self->{last_activity}) & 1023) < 600) {	1183	if ($FOCUS == $self && (($::NOW - $self->{last_activity}) & 1023) < 600) {
…		…
1022	glVertex $self->{cur_x}, $self->{cur_y} + $self->{cur_h};	1187	glVertex $self->{cur_x}, $self->{cur_y} + $self->{cur_h};
1023	glEnd;	1188	glEnd;
1024	}	1189	}
1025	}	1190	}
1026		1191
1027	#############################################################################
1028
1029	package CFClient::UI::Slider;	1192	package CFClient::UI::LineEntry;
1030		1193
1031	use strict;	1194	our @ISA = CFClient::UI::Entry::;
1032		1195
		1196	use SDL;
1033	use SDL::OpenGL;	1197	use SDL::OpenGL;
1034		1198
1035	our @ISA = CFClient::UI::DrawBG::;	1199	sub key_down {
1036
1037	sub size_request {
1038	my ($self) = @_;	1200	my ($self, $ev) = @_;
1039		1201
1040	my $w = 50;	1202	my $sym = $ev->key_sym;
1041	my $h = 10;
1042		1203
1043	$self->{vertical} ? ($h, $w) : ($w, $h)	1204	if ($sym == SDLK_RETURN) {
		1205	$self->emit (activate => $self->get_text);
		1206	$self->update;
		1207
		1208	} else {
		1209	$self->SUPER::key_down ($ev);
		1210	}
		1211
1044	}	1212	}
		1213
		1214	#############################################################################
		1215
		1216	package CFClient::UI::Button;
		1217
		1218	our @ISA = CFClient::UI::Label::;
		1219
		1220	use SDL;
		1221	use SDL::OpenGL;
		1222
		1223	my @tex =
		1224	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
		1225	qw(b1_button_active.png);
1045		1226
1046	sub new {	1227	sub new {
1047	my $class = shift;	1228	my $class = shift;
1048		1229
		1230	$class->SUPER::new (
		1231	padding => 4,
		1232	fg => [1, 1, 1],
		1233	bg => [1, 1, 1, 0.2],
		1234	active_fg => [1, 1, 0],
		1235	can_hover => 1,
		1236	@_
		1237	)
		1238	}
		1239
		1240	sub button_up {
		1241	my ($self, $ev, $x, $y) = @_;
		1242
		1243	if ($x >= 0 && $x < $self->{w}
		1244	&& $y >= 0 && $y < $self->{h}) {
		1245	$self->emit ("activate");
		1246	}
		1247	}
		1248
		1249	sub _draw {
		1250	my ($self) = @_;
		1251
		1252	local $self->{fg} = $self->{fg};
		1253	my $tex = $tex[0];
		1254
		1255	glEnable GL_BLEND;
		1256	glEnable GL_TEXTURE_2D;
		1257	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
		1258
		1259	if ($GRAB == $self) {
		1260	$self->{fg} = $self->{active_fg};
		1261	}
		1262
		1263	glBindTexture GL_TEXTURE_2D, $tex->{name};
		1264	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		1265
		1266	$tex->draw_quad (0, 0, $self->{w}, $self->{h});
		1267
		1268	glDisable GL_TEXTURE_2D;
		1269	glDisable GL_BLEND;
		1270
		1271	$self->SUPER::_draw;
		1272	}
		1273
		1274	#############################################################################
		1275
		1276	package CFClient::UI::CheckBox;
		1277
		1278	our @ISA = CFClient::UI::DrawBG::;
		1279
		1280	my @tex =
		1281	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
		1282	qw(c1_checkbox_bg.png c1_checkbox_active.png);
		1283
		1284	use SDL;
		1285	use SDL::OpenGL;
		1286
		1287	sub new {
		1288	my $class = shift;
		1289
		1290	$class->SUPER::new (
		1291	padding => 2,
		1292	fg => [1, 1, 1],
		1293	active_fg => [1, 1, 0],
		1294	state => 0,
		1295	can_hover => 1,
		1296	@_
		1297	)
		1298	}
		1299
		1300	sub size_request {
		1301	my ($self) = @_;
		1302
		1303	($self->{padding} * 2 + 6) x 2
		1304	}
		1305
		1306	sub size_allocate {
		1307	my ($self, $x, $y, $w, $h) = @_;
		1308
		1309	$self->_size_allocate ($x, $y, $w, $h);
		1310	}
		1311
		1312	sub button_down {
		1313	my ($self, $ev, $x, $y) = @_;
		1314
		1315	if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}
		1316	&& $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {
		1317	$self->{state} = !$self->{state};
		1318	$self->emit (changed => $self->{state});
		1319	}
		1320	}
		1321
		1322	sub _draw {
		1323	my ($self) = @_;
		1324
		1325	$self->SUPER::_draw;
		1326
		1327	glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0;
		1328
		1329	my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;
		1330
		1331	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
		1332
		1333	glEnable GL_BLEND;
		1334	glEnable GL_TEXTURE_2D;
		1335	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
		1336
		1337	my $tex = $self->{state} ? $tex[1] : $tex[0];
		1338
		1339	$tex->draw_quad (0, 0, $s, $s);
		1340
		1341	glDisable GL_TEXTURE_2D;
		1342	glDisable GL_BLEND;
		1343	}
		1344
		1345	#############################################################################
		1346
		1347	package CFClient::UI::Slider;
		1348
		1349	use strict;
		1350
		1351	use SDL::OpenGL;
		1352
		1353	our @ISA = CFClient::UI::DrawBG::;
		1354
		1355	my @tex =
		1356	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
		1357	qw(s1_slider.png s1_slider_bg.png);
		1358
		1359	sub new {
		1360	my $class = shift;
		1361
1049	# range [value, low, high, page]	1362	# range [value, low, high, page]
1050		1363
		1364	# TODO: 0-width page
		1365	# TODO: req_w/h are wrong with vertical
		1366	# TODO: calculations are off
1051	$class->SUPER::new (	1367	my $self = $class->SUPER::new (
1052	fg => [1, 1, 1],	1368	fg => [1, 1, 1],
1053	active_fg => [0, 0, 0],	1369	active_fg => [0, 0, 0],
1054	range => [0, 0, 100, 10],	1370	range => [0, 0, 100, 10],
		1371	req_w => 40,
		1372	req_h => 13,
1055	vertical => 1,	1373	vertical => 0,
		1374	can_hover => 1,
		1375	inner_pad => 5,
1056	@_	1376	@_
1057	)	1377	);
		1378
		1379	$self
		1380	}
		1381
		1382	sub size_request {
		1383	my ($self) = @_;
		1384
		1385	my $w = $self->{req_w};
		1386	my $h = $self->{req_h};
		1387
		1388	$self->{vertical} ? ($h, $w) : ($w, $h)
1058	}	1389	}
1059		1390
1060	sub button_down {	1391	sub button_down {
1061	my ($self, $ev, $x, $y) = @_;	1392	my ($self, $ev, $x, $y) = @_;
1062		1393
…		…
1070	if ($GRAB == $self) {	1401	if ($GRAB == $self) {
1071	my ($value, $lo, $hi, $page) = @{$self->{range}};	1402	my ($value, $lo, $hi, $page) = @{$self->{range}};
1072		1403
1073	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});	1404	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
1074		1405
		1406	my $inner_pad_px = $self->_calc_inner_pad_px ($w);
		1407	my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
		1408
		1409	$x -= $inner_pad_px; # substract the padding
1075	$x = $x * ($hi - $lo) / $w + $lo;	1410	$x = $x * ($hi - $lo) / $inner_w + $lo;
1076	$x = $lo if $x < $lo;	1411	$x = $lo if $x < $lo;
1077	$x = $hi - $page if $x > $hi - $page;	1412	$x = $hi - $page if $x > $hi - $page;
1078	$self->{range}[0] = $x;	1413	$self->{range}[0] = $x;
1079		1414
1080	$self->emit (changed => $x);	1415	$self->emit (changed => $x);
1081	$self->update;	1416	$self->update;
1082	}	1417	}
		1418	}
		1419
		1420	# the inner_* stuff is for generating a padding for the slider handle,
		1421	# so that the handle doesn't leave the texture. This calculation isn't 100%
		1422	# correct propably, but it does the job for now
		1423	sub _calc_inner_pad_px {
		1424	my ($self, $w) = @_;
		1425	($w / 100) * $self->{inner_pad} # % to pixels
1083	}	1426	}
1084		1427
1085	sub _draw {	1428	sub _draw {
1086	my ($self) = @_;	1429	my ($self) = @_;
1087		1430
…		…
1101	my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};	1444	my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
1102	my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};	1445	my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
1103		1446
1104	my ($value, $lo, $hi, $page) = @{$self->{range}};	1447	my ($value, $lo, $hi, $page) = @{$self->{range}};
1105		1448
		1449	$hi = $value + 1 if $lo == $hi;
		1450
		1451	my $inner_pad_px = $self->_calc_inner_pad_px ($w);
		1452	my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
		1453
1106	$page = int $page * $w / ($hi - $lo);	1454	$page = int $page * $inner_w / ($hi - $lo);
1107	$value = int +($value - $lo) * $w / ($hi - $lo);	1455	$value = int +($value - $lo) * $inner_w / ($hi - $lo);
1108		1456
1109	$w -= $page;	1457	$w -= $page;
1110	$page &= ~1;	1458	$page &= ~1;
1111	glTranslate $page * 0.5, 0, 0;	1459	glTranslate $page * 0.5, 0, 0;
		1460	$page ||= 2;
1112		1461
1113	glColor @$fg;
1114	glBegin GL_LINES;
1115	glVertex 0, 0; glVertex 0, $h;
1116	glVertex $w - 1, 0; glVertex $w - 1, $h;
1117	glVertex 0, $h * 0.5; glVertex $w, $h * 0.5;
1118	glEnd;
1119
1120	my $knob_a = $value - $page * 0.5;	1462	my $knob_a = $inner_pad_px + ($value - $page * 0.5);
1121	my $knob_b = $value + $page * 0.5;	1463	my $knob_b = $inner_pad_px + ($value + $page * 0.5);
1122		1464
1123	glBegin GL_QUADS;	1465	glEnable GL_BLEND;
1124	glColor @$fg;	1466	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1125	glVertex $knob_a, 0;	1467	glEnable GL_TEXTURE_2D;
1126	glVertex $knob_a, $h;	1468	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1127	glVertex $knob_b, $h;
1128	glVertex $knob_b, 0;
1129		1469
1130	if ($knob_a < $knob_b - 2) {	1470	# draw background
1131	glColor @$bg;	1471	$tex[1]->draw_quad (0, 0, $w, $h);
1132	glVertex $knob_a + 1, 1;	1472
1133	glVertex $knob_a + 1, $h - 1;	1473	# draw handle
1134	glVertex $knob_b - 1, $h - 1;	1474	$tex[0]->draw_quad ($knob_a, 0, $knob_b - $knob_a, $h);
1135	glVertex $knob_b - 1, 1;	1475
		1476	glDisable GL_BLEND;
		1477	glDisable GL_TEXTURE_2D;
		1478	}
		1479
		1480	#############################################################################
		1481
		1482	package CFClient::UI::TextView;
		1483
		1484	our @ISA = CFClient::UI::HBox::;
		1485
		1486	use SDL::OpenGL;
		1487
		1488	sub new {
		1489	my $class = shift;
		1490
		1491	my $self = $class->SUPER::new (
		1492	req_w => $::WIDTH / 6,
		1493	req_h => $::HEIGHT / 6,
		1494	fontsize => $::FONTSIZE,
		1495	@_,
		1496
		1497	layout => (new CFClient::Layout),
		1498	par => [],
		1499	height => 0,
		1500	children => [
		1501	(new CFClient::UI::Empty expand => 1),
		1502	(new CFClient::UI::Slider vertical => 1),
		1503	],
		1504	);
		1505
		1506	$self->{children}[1]->connect (changed => sub {
		1507	$self->update;
		1508	});
		1509
		1510	$self
		1511	}
		1512
		1513	sub set_fontsize {
		1514	my ($self, $fontsize) = @_;
		1515
		1516	$self->{fontsize} = $fontsize;
		1517	$self->reflow;
		1518	}
		1519
		1520	sub text_height {
		1521	my ($self, $text) = @_;
		1522
		1523	my $layout = $self->{layout};
		1524
		1525	$layout->set_height ($self->{fontsize});
		1526	$layout->set_width ($self->{w});
		1527	$layout->set_text ($text);
1136	}	1528
1137	glEnd;	1529	($layout->size)[1]
		1530	}
		1531
		1532	sub reflow {
		1533	my ($self) = @_;
		1534
		1535	$self->{need_reflow}++;
		1536	$self->update;
		1537	}
		1538
		1539	sub size_request {
		1540	my ($self) = @_;
		1541
		1542	($self->{req_w}, $self->{req_h})
		1543	}
		1544
		1545	sub size_allocate {
		1546	my ($self, $x, $y, $w, $h) = @_;
		1547
		1548	$self->SUPER::size_allocate ($x, $y, $w, $h);
		1549
		1550	$self->{layout}->set_height ($self->{fontsize});
		1551	$self->{layout}->set_width ($self->{w});
		1552
		1553	$self->reflow;
		1554	}
		1555
		1556	sub add_paragraph {
		1557	my ($self, $color, $text) = @_;
		1558
		1559	#TODO: intelligently "reformat" paragraph
		1560
		1561	my $height = $self->text_height ($text);
		1562
		1563	$self->{height} += $height;
		1564
		1565	push @{$self->{par}}, [$height, $color, $text];
		1566
		1567	$self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}];
		1568	$self->{children}[1]->update;
		1569	}
		1570
		1571	sub update {
		1572	my ($self) = @_;
		1573
		1574	$self->SUPER::update;
		1575
		1576	return unless $self->{h} > 0;
		1577
		1578	delete $self->{texture};
		1579
		1580	$TOPLEVEL->on_refresh ($self, sub {
		1581	if (delete $self->{need_reflow}) {
		1582	my $height = 0;
		1583
		1584	$height += $_->[0] = $self->text_height ($_->[2])
		1585	for @{$self->{par}};
		1586
		1587	$self->{height} = $height;
		1588
		1589	$self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];
		1590
		1591	delete $self->{texture};
		1592	}
		1593
		1594	$self->{texture} ||= new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
		1595	glClearColor 0, 0, 0, 1;
		1596	glClear GL_COLOR_BUFFER_BIT;
		1597
		1598	glEnable GL_BLEND;
		1599	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
		1600	glEnable GL_TEXTURE_2D;
		1601	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		1602
		1603	my $top = int $self->{children}[1]{range}[0];
		1604
		1605	my $y0 = $top;
		1606	my $y1 = $top + $self->{h};
		1607
		1608	my $y = 0;
		1609
		1610	my $layout = $self->{layout};
		1611
		1612	for my $par (@{$self->{par}}) {
		1613	my $h = $par->[0];
		1614
		1615	if ($y0 < $y + $h && $y < $y1) {
		1616	$layout->set_text ($par->[2]);
		1617
		1618	glColor @{ $par->[1] };
		1619	my ($W, $H) = $layout->size;
		1620	CFClient::Texture->new_from_layout ($layout)->draw_quad (0, $y - $y0);
		1621	}
		1622
		1623	$y += $h;
		1624	}
		1625
		1626	glDisable GL_TEXTURE_2D;
		1627	glDisable GL_BLEND;
		1628	};
		1629	});
		1630	}
		1631
		1632	sub _draw {
		1633	my ($self) = @_;
		1634
		1635	if ($self->{texture}) {
		1636	glEnable GL_TEXTURE_2D;
		1637	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		1638	$self->{texture}->draw_quad (0, 0, $self->{w}, $self->{h});
		1639	glDisable GL_TEXTURE_2D;
		1640	}
		1641
		1642	$self->{children}[1]->draw;
		1643
1138	}	1644	}
1139		1645
1140	#############################################################################	1646	#############################################################################
1141		1647
1142	package CFClient::UI::MapWidget;	1648	package CFClient::UI::MapWidget;
…		…
1152		1658
1153	sub new {	1659	sub new {
1154	my $class = shift;	1660	my $class = shift;
1155		1661
1156	$class->SUPER::new (	1662	$class->SUPER::new (
1157	z => -1,	1663	z => -1,
		1664	can_focus => 1,
1158	list => (glGenLists 1),	1665	list => (glGenLists 1),
1159	@_	1666	@_
1160	)	1667	)
1161	}	1668	}
1162		1669
1163	sub key_down {	1670	sub key_down {
…		…
1165	}	1672	}
1166		1673
1167	sub key_up {	1674	sub key_up {
1168	}	1675	}
1169		1676
		1677	sub button_down {
		1678	my ($self, $ev, $x, $y) = @_;
		1679
		1680	$self->focus_in;
		1681
		1682	if ($ev->button == 2) {
		1683	my ($ox, $oy) = ($ev->button_x, $ev->button_y);
		1684	my ($bw, $bh) = ($::CFG->{map_shift_x}, $::CFG->{map_shift_y});
		1685
		1686	$self->{motion} = sub {
		1687	my ($ev, $x, $y) = @_;
		1688
		1689	($x, $y) = ($ev->motion_x, $ev->motion_y);
		1690
		1691	$::CFG->{map_shift_x} = $bw + $x - $ox;
		1692	$::CFG->{map_shift_y} = $bh + $y - $oy;
		1693
		1694	$self->update;
		1695	};
		1696	}
		1697	}
		1698
		1699	sub button_up {
		1700	my ($self, $ev, $x, $y) = @_;
		1701
		1702	delete $self->{motion};
		1703	}
		1704
		1705	sub mouse_motion {
		1706	my ($self, $ev, $x, $y) = @_;
		1707
		1708	$self->{motion}->($ev, $x, $y) if $self->{motion};
		1709	}
		1710
1170	sub size_request {	1711	sub size_request {
1171	(	1712	(
1172	1 + int $::WIDTH / 32,	1713	1 + 32 * int $::WIDTH / 32,
1173	1 + int $::HEIGHT / 32,	1714	1 + 32 * int $::HEIGHT / 32,
1174	)	1715	)
1175	}	1716	}
1176		1717
1177	sub update {	1718	sub update {
1178	my ($self) = @_;	1719	my ($self) = @_;
1179		1720
1180	$self->{need_update} = 1;	1721	$self->{need_update} = 1;
1181	$self->SUPER::update;	1722	$self->SUPER::update;
1182	}	1723	}
1183		1724
1184	sub _draw {	1725	sub draw {
1185	my ($self) = @_;	1726	my ($self) = @_;
1186		1727
1187	if (delete $self->{need_update}) {	1728	if (delete $self->{need_update}) {
1188	glNewList $self->{list}, GL_COMPILE;	1729	glNewList $self->{list}, GL_COMPILE;
1189		1730
1190	my $mx = $::CONN->{mapx};	1731	if ($::MAP) {
1191	my $my = $::CONN->{mapy};
1192
1193	my $map = $::CONN->{map};
1194
1195	my ($xofs, $yofs);
1196
1197	my $sw = 1 + int $::WIDTH / 32;	1732	my $sw = int $::WIDTH / 32;
1198	my $sh = 1 + int $::HEIGHT / 32;	1733	my $sh = int $::HEIGHT / 32;
1199		1734
1200	if ($::CONN->{mapw} > $sw) {	1735	my $sx = $::CFG->{map_shift_x}; my $sx0 = $sx & 31; $sx = ($sx - $sx0) / 32;
1201	$xofs = $mx + ($::CONN->{mapw} - $sw) * 0.5;	1736	my $sy = $::CFG->{map_shift_y}; my $sy0 = $sy & 31; $sy = ($sy - $sy0) / 32;
1202	} else {	1737
1203	$xofs = $self->{xofs} = min $mx, max $mx + $::CONN->{mapw} - $sw + 1, $self->{xofs};	1738	glTranslate $sx0 - 32, $sy0 - 32, 0;
		1739
		1740	my ($w, $h, $data) = $::MAP->draw ($sx, $sy, 0, 0, $sw + 1, $sh + 1);
		1741
		1742	if ($::CFG->{fow_enable}) {
		1743	if ($::CFG->{fow_smooth}) { # smooth fog of war
		1744	glConvolutionParameter GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER;
		1745	glConvolutionFilter2D
		1746	GL_CONVOLUTION_2D,
		1747	GL_ALPHA,
		1748	3, 3,
		1749	GL_ALPHA, GL_FLOAT,
		1750	pack "f*",
		1751	0.1, 0.1, 0.1,
		1752	0.1, 0.2, 0.1,
		1753	0.1, 0.1, 0.1,
		1754	;
		1755	glEnable GL_CONVOLUTION_2D;
		1756	}
		1757
		1758	my $tex = new CFClient::Texture
		1759	w => $w,
		1760	h => $h,
		1761	data => $data,
		1762	internalformat => GL_ALPHA,
		1763	format => GL_ALPHA;
		1764
		1765	glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth};
		1766
		1767	glEnable GL_BLEND;
		1768	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
		1769	glEnable GL_TEXTURE_2D;
		1770	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
		1771
		1772	glColor +($::CFG->{fow_intensity}) x 3, 1;
		1773	$tex->draw_quad (0, 0, $w * 32, $h * 32);
		1774
		1775	glDisable GL_TEXTURE_2D;
		1776	glDisable GL_BLEND;
		1777	}
		1778
		1779	# HACK BEGIN
		1780	{
		1781	glTranslate -($sx0 - 32), -($sy0 - 32), 0;#remove
		1782	my ($w, $h) = (250, 250);
		1783
		1784	glEnable GL_BLEND;
		1785	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
		1786	glEnable GL_TEXTURE_2D;
		1787	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		1788
		1789	CFClient::Texture->new (
		1790	w => $w,
		1791	h => $h,
		1792	data => $::MAP->mapmap ($w, $h),
		1793	type => GL_UNSIGNED_INT_8_8_8_8_REV
		1794	)->draw_quad (100, 100);
		1795
		1796	glDisable GL_TEXTURE_2D;
		1797	glDisable GL_BLEND;
		1798	}
		1799	# HACK END
1204	}	1800	}
1205		1801
1206	if ($::CONN->{maph} > $sh) {
1207	$yofs = $my + ($::CONN->{maph} - $sh) * 0.5;
1208	} else {
1209	$yofs = $self->{yofs} = min $my, max $my + $::CONN->{maph} - $sh + 1, $self->{yofs};
1210	}
1211
1212	glEnable GL_TEXTURE_2D;
1213	glEnable GL_BLEND;
1214	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1215	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1216
1217	my $sw4 = ($sw + 3) & ~3;
1218	my $darkness = "\x00" x ($sw4 * $sh);
1219
1220	for my $x (0 .. $sw - 1) {
1221	my $row = $map->[$x + $xofs];
1222	for my $y (0 .. $sh - 1) {
1223
1224	my $cell = $row->[$y + $yofs]
1225	or next;
1226
1227	my $dark = $cell->[0];
1228	if ($dark < 0) {
1229	substr $darkness, $y * $sw4 + $x, 1, chr 224;
1230	} else {
1231	substr $darkness, $y * $sw4 + $x, 1, chr 255 - $dark;
1232	}
1233
1234	for my $num (grep $_, @$cell[1,2,3]) {
1235	my $tex = $::CONN->{face}[$num]{texture} || next;
1236
1237	my ($w, $h) = @$tex{qw(w h)};
1238
1239	$tex->draw_quad (($x + 1) * 32 - $w, ($y + 1) * 32 - $h, $w, $h);
1240	}
1241	}
1242	}
1243
1244	# if (1) { # higher quality darkness
1245	# $lighting =~ s/(.)/$1$1$1/gs;
1246	# my $pb = new_from_data Gtk2::Gdk::Pixbuf $lighting, "rgb", 0, 8, $sw4, $sh, $sw4 * 3;
1247	#
1248	# $pb = $pb->scale_simple ($sw4 * 0.5, $sh * 0.5, "bilinear");
1249	#
1250	# $lighting = $pb->get_pixels;
1251	# $lighting =~ s/(.)../$1/gs;
1252	# }
1253
1254	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1255
1256	$darkness = new CFClient::Texture
1257	w => $sw4,
1258	h => $sh,
1259	data => $darkness,
1260	internalformat => GL_ALPHA,
1261	format => GL_ALPHA;
1262
1263	glColor 0.45, 0.45, 0.45, 1;
1264	$darkness->draw_quad (0, 0, $sw4 * 32, $sh * 32);
1265
1266	glDisable GL_TEXTURE_2D;
1267	glDisable GL_BLEND;
1268
1269	glEndList;	1802	glEndList;
1270	}	1803	}
1271		1804
		1805	glPushMatrix;
1272	glCallList $self->{list};	1806	glCallList $self->{list};
		1807	glPopMatrix;
		1808
		1809	if ($FOCUS != $self) {
		1810	glColor 64/255, 64/255, 64/255;
		1811	glLogicOp GL_AND;
		1812	glEnable GL_COLOR_LOGIC_OP;
		1813	glBegin GL_QUADS;
		1814	glVertex 0, 0;
		1815	glVertex 0, $::HEIGHT;
		1816	glVertex $::WIDTH, $::HEIGHT;
		1817	glVertex $::WIDTH, 0;
		1818	glEnd;
		1819	glDisable GL_COLOR_LOGIC_OP;
		1820	}
1273	}	1821	}
1274		1822
1275	my %DIR = (	1823	my %DIR = (
1276	SDLK_KP8, [1, "north"],	1824	SDLK_KP8, [1, "north"],
1277	SDLK_KP9, [2, "northeast"],	1825	SDLK_KP9, [2, "northeast"],
…		…
1293		1841
1294	my $mod = $ev->key_mod;	1842	my $mod = $ev->key_mod;
1295	my $sym = $ev->key_sym;	1843	my $sym = $ev->key_sym;
1296		1844
1297	if ($sym == SDLK_KP5) {	1845	if ($sym == SDLK_KP5) {
1298	$::CONN->send ("command stay fire");	1846	$::CONN->user_send ("command stay fire");
		1847	} elsif ($sym == SDLK_a) {
		1848	$::CONN->user_send ("command apply");
		1849	} elsif ($sym == SDLK_QUOTE) {
		1850	$self->emit ('activate_console');
		1851	} elsif ($sym == SDLK_SLASH) {
		1852	$self->emit ('activate_console' => '/');
1299	} elsif (exists $DIR{$sym}) {	1853	} elsif (exists $DIR{$sym}) {
1300	if ($mod & KMOD_SHIFT) {	1854	if ($mod & KMOD_SHIFT) {
1301	$self->{shft}++;	1855	$self->{shft}++;
1302	$::CONN->send ("command fire $DIR{$sym}[0]");	1856	$::CONN->user_send ("command fire $DIR{$sym}[0]");
1303	} elsif ($mod & KMOD_CTRL) {	1857	} elsif ($mod & KMOD_CTRL) {
1304	$self->{ctrl}++;	1858	$self->{ctrl}++;
1305	$::CONN->send ("command run $DIR{$sym}[0]");	1859	$::CONN->user_send ("command run $DIR{$sym}[0]");
1306	} else {	1860	} else {
1307	$::CONN->send ("command $DIR{$sym}[1]");	1861	$::CONN->user_send ("command $DIR{$sym}[1]");
1308	}	1862	}
1309	}	1863	}
1310	}	1864	}
1311		1865
1312	sub key_up {	1866	sub key_up {
…		…
1314		1868
1315	my $mod = $ev->key_mod;	1869	my $mod = $ev->key_mod;
1316	my $sym = $ev->key_sym;	1870	my $sym = $ev->key_sym;
1317		1871
1318	if (!($mod & KMOD_SHIFT) && delete $self->{shft}) {	1872	if (!($mod & KMOD_SHIFT) && delete $self->{shft}) {
1319	$::CONN->send ("command fire_stop");	1873	$::CONN->user_send ("command fire_stop");
1320	}	1874	}
1321	if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) {	1875	if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) {
1322	$::CONN->send ("command run_stop");	1876	$::CONN->user_send ("command run_stop");
1323	}	1877	}
1324	}	1878	}
1325		1879
1326	#############################################################################	1880	#############################################################################
1327		1881
…		…
1365	glPopMatrix;	1919	glPopMatrix;
1366	}	1920	}
1367		1921
1368	#############################################################################	1922	#############################################################################
1369		1923
		1924	package CFClient::UI::Flopper;
		1925
		1926	our @ISA = CFClient::UI::Button::;
		1927
		1928	sub new {
		1929	my $class = shift;
		1930
		1931	my $self = $class->SUPER::new (
		1932	state => 0,
		1933	connect_activate => \&toggle_flopper,
		1934	@_
		1935	);
		1936
		1937	if ($self->{state}) {
		1938	$self->{state} = 0;
		1939	$self->toggle_flopper;
		1940	}
		1941
		1942	$self
		1943	}
		1944
		1945	sub toggle_flopper {
		1946	my ($self) = @_;
		1947
		1948	# TODO: use animation
		1949	if ($self->{state} = !$self->{state}) {
		1950	$CFClient::UI::TOPLEVEL->add ($self->{other});
		1951	$self->{other}->move (
		1952	($::WIDTH - $self->{other}{w}) * 0.5,
		1953	($::HEIGHT - $self->{other}{h}) * 0.5,
		1954	);
		1955	} else {
		1956	$CFClient::UI::TOPLEVEL->remove ($self->{other});
		1957	}
		1958	}
		1959
		1960	#############################################################################
		1961
1370	package CFClient::UI::Toplevel;	1962	package CFClient::UI::Toplevel;
1371		1963
1372	our @ISA = CFClient::UI::Container::;	1964	our @ISA = CFClient::UI::Container::;
		1965
		1966	use SDL::OpenGL;
1373		1967
1374	sub size_request {	1968	sub size_request {
1375	($::WIDTH, $::HEIGHT)	1969	($::WIDTH, $::HEIGHT)
1376	}	1970	}
1377		1971
…		…
1403	$self->SUPER::add ($widget);	1997	$self->SUPER::add ($widget);
1404		1998
1405	$widget->size_allocate ($widget->{x}, $widget->{y}, $widget->size_request);	1999	$widget->size_allocate ($widget->{x}, $widget->{y}, $widget->size_request);
1406	}	2000	}
1407		2001
		2002	sub on_refresh {
		2003	my ($self, $id, $cb) = @_;
		2004
		2005	$self->{refresh_hook}{$id} = $cb;
		2006	}
		2007
1408	sub draw {	2008	sub draw {
1409	my ($self) = @_;	2009	my ($self) = @_;
1410		2010
		2011	while (my $rcb = delete $self->{refresh_hook}) {
		2012	$_->() for values %$rcb;
		2013	}
		2014
		2015	glViewport 0, 0, $::WIDTH, $::HEIGHT;
		2016	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
		2017	glClear GL_COLOR_BUFFER_BIT;
		2018
		2019	glMatrixMode GL_PROJECTION;
		2020	glLoadIdentity;
		2021	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000;
		2022	glMatrixMode GL_MODELVIEW;
		2023	glLoadIdentity;
		2024
1411	$self->_draw;	2025	$self->_draw;
1412	}	2026	}
1413		2027
1414	#############################################################################	2028	#############################################################################
1415		2029

Diff Legend

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