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.236 by root, Thu May 25 16:54:29 2006 UTC vs.
Revision 1.276 by root, Sun Jun 4 00:16:01 2006 UTC

…		…
5		5
6	use Scalar::Util ();	6	use Scalar::Util ();
7	use List::Util ();	7	use List::Util ();
8		8
9	use CFClient;	9	use CFClient;
		10	use CFClient::Texture;
10		11
11	our ($FOCUS, $HOVER, $GRAB); # various widgets	12	our ($FOCUS, $HOVER, $GRAB); # various widgets
12		13
		14	our $LAYOUT;
13	our $ROOT;	15	our $ROOT;
14	our $TOOLTIP;	16	our $TOOLTIP;
15	our $BUTTON_STATE;	17	our $BUTTON_STATE;
16		18
17	our %WIDGET; # all widgets, weak-referenced	19	our %WIDGET; # all widgets, weak-referenced
18		20
		21	sub get_layout {
		22	my $layout;
		23
		24	for (grep { $_->{name} } values %WIDGET) {
		25	my $win = $layout->{$_->{name}} = { };
		26
		27	$win->{x} = ($_->{x} + $_->{w} * 0.5) / $::WIDTH if $_->{x} =~ /^[0-9.]+$/;
		28	$win->{y} = ($_->{y} + $_->{h} * 0.5) / $::HEIGHT if $_->{y} =~ /^[0-9.]+$/;
		29	$win->{w} = $_->{w} / $::WIDTH if defined $_->{w};
		30	$win->{h} = $_->{h} / $::HEIGHT if defined $_->{h};
		31
		32	$win->{show} = $_->{visible} && $_->{is_toplevel};
		33	}
		34
		35	$layout
		36	}
		37
		38	sub set_layout {
		39	my ($layout) = @_;
		40
		41	$LAYOUT = $layout;
		42	}
		43
19	sub check_tooltip {	44	sub check_tooltip {
		45	return if $ENV{CFPLUS_DEBUG} & 8;
		46
20	if (!$GRAB) {	47	if (!$GRAB) {
21	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {	48	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
22	if (length $widget->{tooltip}) {	49	if (length $widget->{tooltip}) {
23
24	if ($TOOLTIP->{owner} != $widget) {	50	if ($TOOLTIP->{owner} != $widget) {
		51	$TOOLTIP->hide;
		52
25	$TOOLTIP->{owner} = $widget;	53	$TOOLTIP->{owner} = $widget;
26		54
27	my $tip = $widget->{tooltip};	55	my $tip = $widget->{tooltip};
28		56
29	$tip = $tip->($widget) if CODE:: eq ref $tip;	57	$tip = $tip->($widget) if CODE:: eq ref $tip;
30		58
31	$TOOLTIP->set_tooltip_from ($widget);	59	$TOOLTIP->set_tooltip_from ($widget);
32	$TOOLTIP->show;	60	$TOOLTIP->show;
33
34	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
35
36	($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0)
37	if $x + $TOOLTIP->{w} > $::WIDTH;
38
39	$TOOLTIP->move ($x, $y);
40	$TOOLTIP->check_size;
41	$TOOLTIP->update;
42	}	61	}
43		62
44	return;	63	return;
45	}	64	}
46	}	65	}
…		…
152	sub rescale_widgets {	171	sub rescale_widgets {
153	my ($sx, $sy) = @_;	172	my ($sx, $sy) = @_;
154		173
155	for my $widget (values %WIDGET) {	174	for my $widget (values %WIDGET) {
156	if ($widget->{is_toplevel}) {	175	if ($widget->{is_toplevel}) {
		176	$widget->{x} += int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
		177	$widget->{y} += int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
		178
157	$widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x};	179	$widget->{x} = int 0.5 + $widget->{x} * $sx if $widget->{x} =~ /^[0-9.]+$/;
158	$widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};	180	$widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
159	$widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w};	181	$widget->{force_w} = int 0.5 + $widget->{force_w} * $sx if exists $widget->{force_w};
160	$widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w};
161	$widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y};	182	$widget->{y} = int 0.5 + $widget->{y} * $sy if $widget->{y} =~ /^[0-9.]+$/;
162	$widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};	183	$widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
163	$widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h};	184	$widget->{force_h} = int 0.5 + $widget->{force_h} * $sy if exists $widget->{force_h};
164	$widget->{user_h} = int 0.5 + $widget->{user_h} * $sy if exists $widget->{user_h};	185
		186	$widget->{x} -= int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
		187	$widget->{y} -= int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
		188
165	}	189	}
166	}	190	}
167		191
168	reconfigure_widgets;	192	reconfigure_widgets;
169	}	193	}
…		…
178		202
179	sub new {	203	sub new {
180	my $class = shift;	204	my $class = shift;
181		205
182	my $self = bless {	206	my $self = bless {
183	x => 0,	207	x => "center",
184	y => 0,	208	y => "center",
185	z => 0,	209	z => 0,
		210	w => undef,
		211	h => undef,
186	can_events => 1,	212	can_events => 1,
187	@_	213	@_
188	}, $class;	214	}, $class;
189		215
		216	Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
		217
190	for (keys %$self) {	218	for (keys %$self) {
191	if (/^connect_(.*)$/) {	219	if (/^on_(.*)$/) {
192	$self->connect ($1 => delete $self->{$_});	220	$self->connect ($1 => delete $self->{$_});
193	}	221	}
194	}	222	}
195		223
196	Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);	224	if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {
		225	$self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x};
		226	$self->{y} = $layout->{y} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{y};
		227	$self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{w};
		228	$self->{force_h} = $layout->{h} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{h};
		229
		230	$self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
		231	$self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
		232
		233	$self->show if $layout->{show};
		234	}
197		235
198	$self	236	$self
199	}	237	}
200		238
201	sub destroy {	239	sub destroy {
…		…
205	%$self = ();	243	%$self = ();
206	}	244	}
207		245
208	sub show {	246	sub show {
209	my ($self) = @_;	247	my ($self) = @_;
		248
210	return if $self->{parent};	249	return if $self->{parent};
211		250
212	$CFClient::UI::ROOT->add ($self);	251	$CFClient::UI::ROOT->add ($self);
213	}	252	}
214		253
215	sub show_centered {	254	sub set_visible {
216	my ($self) = @_;	255	my ($self) = @_;
		256
217	return if $self->{parent};	257	return if $self->{visible};
218		258
219	$self->show;	259	$self->{root} = $self->{parent}{root};
		260	$self->{visible} = $self->{parent}{visible} + 1;
220		261
221	$CFClient::UI::ROOT->on_post_alloc (	262	$self->emit (visibility_change => 1);
222	"centered $self" => sub {	263
223	$self->move (($::WIDTH - $self->{w}) * 0.5, ($::HEIGHT - $self->{h}) * 0.5);	264	$self->realloc if !exists $self->{req_w};
224	},	265
225	);	266	$_->set_visible for $self->children;
226	}	267	}
227		268
228	sub set_invisible {	269	sub set_invisible {
229	my ($self) = @_;	270	my ($self) = @_;
230		271
231	# broken show/hide model	272	return unless $self->{visible};
232		273
		274	$_->set_invisible for $self->children;
		275
		276	delete $self->{root};
233	delete $self->{visible};	277	delete $self->{visible};
234		278
235	undef $GRAB if $GRAB == $self;	279	undef $GRAB if $GRAB == $self;
236	undef $HOVER if $HOVER == $self;	280	undef $HOVER if $HOVER == $self;
237		281
238	CFClient::UI::check_tooltip	282	CFClient::UI::check_tooltip
239	if $CFClient::UI::TOOLTIP->{owner} == $self;	283	if $TOOLTIP->{owner} == $self;
240		284
241	$self->focus_out;	285	$self->focus_out;
		286
		287	$self->emit (visibility_change => 0);
		288	}
		289
		290	sub set_visibility {
		291	my ($self, $visible) = @_;
		292
		293	return if $self->{visible} == $visible;
		294
		295	$visible ? $self->hide
		296	: $self->show;
		297	}
		298
		299	sub toggle_visibility {
		300	my ($self) = @_;
		301
		302	$self->{visible}
		303	? $self->hide
		304	: $self->show;
242	}	305	}
243		306
244	sub hide {	307	sub hide {
245	my ($self) = @_;	308	my ($self) = @_;
246		309
…		…
248		311
249	$self->{parent}->remove ($self)	312	$self->{parent}->remove ($self)
250	if $self->{parent};	313	if $self->{parent};
251	}	314	}
252		315
253	sub move {	316	sub move_abs {
254	my ($self, $x, $y, $z) = @_;	317	my ($self, $x, $y, $z) = @_;
255		318
256	$self->{x} = int $x;	319	$self->{x} = List::Util::max 0, int $x;
257	$self->{y} = int $y;	320	$self->{y} = List::Util::max 0, int $y;
258	$self->{z} = $z if defined $z;	321	$self->{z} = $z if defined $z;
259		322
260	$self->update;	323	$self->update;
261	}	324	}
262		325
263	sub set_size {	326	sub set_size {
264	my ($self, $w, $h) = @_;	327	my ($self, $w, $h) = @_;
265		328
266	$self->{user_w} = $w;	329	$self->{force_w} = $w;
267	$self->{user_h} = $h;	330	$self->{force_h} = $h;
268		331
269	$self->check_size;	332	$self->realloc;
270	}	333	}
271		334
272	sub size_request {	335	sub size_request {
273	require Carp;	336	require Carp;
274	Carp::confess "size_request is abstract";	337	Carp::confess "size_request is abstract";
…		…
276		339
277	sub configure {	340	sub configure {
278	my ($self, $x, $y, $w, $h) = @_;	341	my ($self, $x, $y, $w, $h) = @_;
279		342
280	if ($self->{aspect}) {	343	if ($self->{aspect}) {
		344	my ($ow, $oh) = ($w, $h);
		345
281	my $w2 = List::Util::min $w, int $h * $self->{aspect};	346	$w = List::Util::min $w, int $h * $self->{aspect};
282	my $h2 = List::Util::min $h, int $w / $self->{aspect};	347	$h = List::Util::min $h, int $w / $self->{aspect};
283		348
284	# use alignment to adjust x, y	349	# use alignment to adjust x, y
285		350
286	$x += int +($w - $w2) * 0.5;	351	$x += int 0.5 * ($ow - $w);
287	$y += int +($h - $h2) * 0.5;	352	$y += int 0.5 * ($oh - $h);
288
289	($w, $h) = ($w2, $h2);
290	}	353	}
291		354
292	if ($self->{x} != $x || $self->{y} != $y) {	355	if ($self->{x} ne $x || $self->{y} ne $y) {
293	$self->{x} = $x;	356	$self->{x} = $x;
294	$self->{y} = $y;	357	$self->{y} = $y;
295	$self->update;	358	$self->update;
296	}	359	}
297		360
298	if ($self->{w} != $w || $self->{h} != $h) {	361	if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
299	$CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h];	362	return unless $self->{visible};
		363
		364	$self->{alloc_w} = $w;
		365	$self->{alloc_h} = $h;
		366
		367	$self->{root}{size_alloc}{$self+0} = $self;
300	}	368	}
301	}	369	}
302		370
303	sub size_allocate {	371	sub size_allocate {
304	# nothing to be done	372	# nothing to be done
305	}	373	}
306		374
307	sub reconfigure {
308	my ($self) = @_;
309
310	$self->check_size (1);
311	$self->update;
312	}
313
314	sub children {	375	sub children {
		376	# nop
		377	}
		378
		379	sub visible_children {
		380	$_[0]->children
315	}	381	}
316		382
317	sub set_max_size {	383	sub set_max_size {
318	my ($self, $w, $h) = @_;	384	my ($self, $w, $h) = @_;
319		385
…		…
378		444
379	$::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus	445	$::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus
380	unless $FOCUS;	446	unless $FOCUS;
381	}	447	}
382		448
383	sub mouse_motion { }	449	sub mouse_motion { 0 }
384	sub button_up { }	450	sub button_up { 0 }
385	sub key_down { }	451	sub key_down { 0 }
386	sub key_up { }	452	sub key_up { 0 }
387		453
388	sub button_down {	454	sub button_down {
389	my ($self, $ev, $x, $y) = @_;	455	my ($self, $ev, $x, $y) = @_;
390		456
391	$self->focus_in;	457	$self->focus_in;
392	}
393		458
394	sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }	459	0
395	sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }	460	}
396	sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }	461
397	sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }	462	sub find_widget {
398	sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} }	463	my ($self, $x, $y) = @_;
		464
		465	return () unless $self->{can_events};
		466
		467	return $self
		468	if $x >= $self->{x} && $x < $self->{x} + $self->{w}
		469	&& $y >= $self->{y} && $y < $self->{y} + $self->{h};
		470
		471	()
		472	}
		473
		474	sub set_parent {
		475	my ($self, $parent) = @_;
		476
		477	Scalar::Util::weaken ($self->{parent} = $parent);
		478	$self->set_visible if $parent->{visible};
		479	}
		480
		481	sub connect {
		482	my ($self, $signal, $cb) = @_;
		483
		484	push @{ $self->{signal_cb}{$signal} }, $cb;
		485	}
		486
		487	sub _emit {
		488	my ($self, $signal, @args) = @_;
		489
		490	List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
		491	}
		492
		493	sub emit {
		494	my ($self, $signal, @args) = @_;
		495
		496	$self->_emit ($signal, @args)
		497	|| $self->$signal (@args);
		498	}
		499
		500	sub visibility_change {
		501	#my ($self, $visible) = @_;
		502	}
		503
		504	sub realloc {
		505	my ($self) = @_;
		506
		507	if ($self->{visible}) {
		508	return if $self->{root}{realloc}{$self+0};
		509
		510	$self->{root}{realloc}{$self+0} = $self;
		511	$self->{root}->update;
		512	} else {
		513	delete $self->{req_w};
		514	delete $self->{req_h};
		515	}
		516	}
		517
		518	sub update {
		519	my ($self) = @_;
		520
		521	$self->{parent}->update
		522	if $self->{parent};
		523	}
		524
		525	sub reconfigure {
		526	my ($self) = @_;
		527
		528	$self->realloc;
		529	$self->update;
		530	}
		531
		532	# using global variables seems a bit hacky, but passing through all drawing
		533	# functions seems pointless.
		534	our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn
399		535
400	sub draw {	536	sub draw {
401	my ($self) = @_;	537	my ($self) = @_;
402		538
403	return unless $self->{h} && $self->{w};	539	return unless $self->{h} && $self->{w};
		540
		541	# update screen rectangle
		542	local $draw_x = $draw_x + $self->{x};
		543	local $draw_y = $draw_y + $self->{y};
		544	local $draw_w = $draw_x + $self->{w};
		545	local $draw_h = $draw_y + $self->{h};
		546
		547	# skip widgets that are entirely outside the drawing area
		548	return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
		549	|| ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
404		550
405	glPushMatrix;	551	glPushMatrix;
406	glTranslate $self->{x}, $self->{y}, 0;	552	glTranslate $self->{x}, $self->{y}, 0;
407	$self->_draw;	553	$self->_draw;
408	glPopMatrix;	554	glPopMatrix;
…		…
420	glVertex $x , $y + $self->{h};	566	glVertex $x , $y + $self->{h};
421	glEnd;	567	glEnd;
422	glDisable GL_BLEND;	568	glDisable GL_BLEND;
423	}	569	}
424		570
425	if ($ENV{PCLIENT_DEBUG}) {	571	if ($ENV{CFPLUS_DEBUG} & 1) {
426	glPushMatrix;	572	glPushMatrix;
427	glColor 1, 1, 0, 1;	573	glColor 1, 1, 0, 1;
428	glTranslate $self->{x} + 0.375, $self->{y} + 0.375;	574	glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
429	glBegin GL_LINE_LOOP;	575	glBegin GL_LINE_LOOP;
430	glVertex 0 , 0;	576	glVertex 0 , 0;
…		…
441	my ($self) = @_;	587	my ($self) = @_;
442		588
443	warn "no draw defined for $self\n";	589	warn "no draw defined for $self\n";
444	}	590	}
445		591
446	sub find_widget {
447	my ($self, $x, $y) = @_;
448
449	return () unless $self->{can_events};
450
451	return $self
452	if $x >= $self->{x} && $x < $self->{x} + $self->{w}
453	&& $y >= $self->{y} && $y < $self->{y} + $self->{h};
454
455	()
456	}
457
458	sub set_parent {
459	my ($self, $parent) = @_;
460
461	Scalar::Util::weaken ($self->{parent} = $parent);
462
463	# TODO: req_w _does_change after ->reconfigure
464	$self->check_size
465	unless exists $self->{req_w};
466
467	$self->show;
468	}
469
470	sub check_size {
471	my ($self, $forced) = @_;
472
473	$self->{force_alloc} = 1 if $forced;
474	$CFClient::UI::ROOT->{check_size}{$self} = $self;
475	}
476
477	sub update {
478	my ($self) = @_;
479
480	$self->{parent}->update
481	if $self->{parent};
482	}
483
484	sub connect {
485	my ($self, $signal, $cb) = @_;
486
487	push @{ $self->{signal_cb}{$signal} }, $cb;
488	}
489
490	sub _emit {
491	my ($self, $signal, @args) = @_;
492
493	List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
494	}
495
496	sub emit {
497	my ($self, $signal, @args) = @_;
498
499	$self->_emit ($signal, @args)
500	|| $self->$signal (@args);
501	}
502
503	sub DESTROY {	592	sub DESTROY {
504	my ($self) = @_;	593	my ($self) = @_;
505		594
506	delete $WIDGET{$self+0};	595	delete $WIDGET{$self+0};
507	#$self->deactivate;	596	#$self->deactivate;
…		…
563	my ($class, %arg) = @_;	652	my ($class, %arg) = @_;
564	$class->SUPER::new (can_events => 0, %arg);	653	$class->SUPER::new (can_events => 0, %arg);
565	}	654	}
566		655
567	sub size_request {	656	sub size_request {
568	(0, 0)	657	my ($self) = @_;
		658
		659	($self->{w} + 0, $self->{h} + 0)
569	}	660	}
570		661
571	sub draw { }	662	sub draw { }
572		663
573	#############################################################################	664	#############################################################################
…		…
577	our @ISA = CFClient::UI::Base::;	668	our @ISA = CFClient::UI::Base::;
578		669
579	sub new {	670	sub new {
580	my ($class, %arg) = @_;	671	my ($class, %arg) = @_;
581		672
582	my $children = delete $arg{children} || [];	673	my $children = delete $arg{children};
583		674
584	my $self = $class->SUPER::new (	675	my $self = $class->SUPER::new (
585	children => [],	676	children => [],
586	can_events => 0,	677	can_events => 0,
587	%arg,	678	%arg,
588	);	679	);
		680
589	$self->add ($_) for @$children;	681	$self->add (@$children)
		682	if $children;
590		683
591	$self	684	$self
592	}	685	}
593		686
594	sub add {	687	sub add {
…		…
602	$self->{children} = [	695	$self->{children} = [
603	sort { $a->{z} <=> $b->{z} }	696	sort { $a->{z} <=> $b->{z} }
604	@{$self->{children}}, @widgets	697	@{$self->{children}}, @widgets
605	];	698	];
606		699
607	$self->check_size (1);	700	$self->realloc;
608	$self->update;
609	}	701	}
610		702
611	sub children {	703	sub children {
612	@{ $_[0]{children} }	704	@{ $_[0]{children} }
613	}	705	}
…		…
618	delete $child->{parent};	710	delete $child->{parent};
619	$child->hide;	711	$child->hide;
620		712
621	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];	713	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
622		714
623	$self->check_size (1);	715	$self->realloc;
624	$self->update;
625	}	716	}
626		717
627	sub clear {	718	sub clear {
628	my ($self) = @_;	719	my ($self) = @_;
629		720
…		…
633	for (@$children) {	724	for (@$children) {
634	delete $_->{parent};	725	delete $_->{parent};
635	$_->hide;	726	$_->hide;
636	}	727	}
637		728
638	$self->check_size;	729	$self->realloc;
639	$self->update;
640	}	730	}
641		731
642	sub find_widget {	732	sub find_widget {
643	my ($self, $x, $y) = @_;	733	my ($self, $x, $y) = @_;
644		734
645	$x -= $self->{x};	735	$x -= $self->{x};
646	$y -= $self->{y};	736	$y -= $self->{y};
647		737
648	my $res;	738	my $res;
649		739
650	for (reverse @{ $self->{children} }) {	740	for (reverse $self->visible_children) {
651	$res = $_->find_widget ($x, $y)	741	$res = $_->find_widget ($x, $y)
652	and return $res;	742	and return $res;
653	}	743	}
654		744
655	$self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})	745	$self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
…		…
704	$self->{children}[0]->configure (0, 0, $w, $h);	794	$self->{children}[0]->configure (0, 0, $w, $h);
705	}	795	}
706		796
707	#############################################################################	797	#############################################################################
708		798
		799	# back-buffered drawing area
		800
709	package CFClient::UI::Window;	801	package CFClient::UI::Window;
710		802
711	our @ISA = CFClient::UI::Bin::;	803	our @ISA = CFClient::UI::Bin::;
712		804
713	use CFClient::OpenGL;	805	use CFClient::OpenGL;
…		…
731	$self->SUPER::size_allocate ($w, $h);	823	$self->SUPER::size_allocate ($w, $h);
732	$self->update;	824	$self->update;
733	}	825	}
734		826
735	sub _render {	827	sub _render {
		828	my ($self) = @_;
		829
736	$_[0]{children}[0]->draw;	830	$self->{children}[0]->draw;
737	}	831	}
738		832
739	sub render_child {	833	sub render_child {
740	my ($self) = @_;	834	my ($self) = @_;
741		835
742	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {	836	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
743	glClearColor 0, 0, 0, 0;	837	glClearColor 0, 0, 0, 0;
744	glClear GL_COLOR_BUFFER_BIT;	838	glClear GL_COLOR_BUFFER_BIT;
745		839
		840	{
		841	package CFClient::UI::Base;
		842
		843	($draw_x, $draw_y, $draw_w, $draw_h) =
		844	(0, 0, $self->{w}, $self->{h});
		845	}
		846
746	$self->_render;	847	$self->_render;
747	};	848	};
748	}	849	}
749		850
750	sub _draw {	851	sub _draw {
751	my ($self) = @_;	852	my ($self) = @_;
752		853
753	my ($w, $h) = ($self->w, $self->h);	854	my ($w, $h) = @$self{qw(w h)};
754		855
755	my $tex = $self->{texture}	856	my $tex = $self->{texture}
756	or return;	857	or return;
757		858
758	glEnable GL_TEXTURE_2D;	859	glEnable GL_TEXTURE_2D;
…		…
781	}	882	}
782		883
783	sub size_request {	884	sub size_request {
784	my ($self) = @_;	885	my ($self) = @_;
785		886
786	@$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};	887	my ($w, $h) = @{$self->child}{qw(req_w req_h)};
787		888
788	@$self{qw(child_w child_h)}	889	$w = 10 if $self->{scroll_x};
		890	$h = 10 if $self->{scroll_y};
		891
		892	($w, $h)
789	}	893	}
790		894
791	sub size_allocate {	895	sub size_allocate {
792	my ($self, $w, $h) = @_;	896	my ($self, $w, $h) = @_;
793		897
		898	my $child = $self->child;
		899
794	$w = $self->{child_w} if $self->{scroll_x} && $self->{child_w};	900	$w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
795	$h = $self->{child_h} if $self->{scroll_y} && $self->{child_h};	901	$h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
796		902
797	$self->child->configure (0, 0, $w, $h);	903	$self->child->configure (0, 0, $w, $h);
798	$self->update;	904	$self->update;
799	}	905	}
800		906
…		…
836	}	942	}
837		943
838	sub _render {	944	sub _render {
839	my ($self) = @_;	945	my ($self) = @_;
840		946
		947	local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};
		948	local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y};
		949
841	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};	950	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
842		951
843	$self->SUPER::_render;	952	$self->SUPER::_render;
844	}	953	}
845		954
…		…
848	package CFClient::UI::ScrolledWindow;	957	package CFClient::UI::ScrolledWindow;
849		958
850	our @ISA = CFClient::UI::HBox::;	959	our @ISA = CFClient::UI::HBox::;
851		960
852	sub new {	961	sub new {
853	my $class = shift;	962	my ($class, %arg) = @_;
		963
		964	my $child = delete $arg{child};
854		965
855	my $self;	966	my $self;
856		967
857	my $slider = new CFClient::UI::Slider	968	my $slider = new CFClient::UI::Slider
858	vertical => 1,	969	vertical => 1,
859	range => [0, 0, 1, 0.01], # HACK fix	970	range => [0, 0, 1, 0.01], # HACK fix
860	connect_changed => sub {	971	on_changed => sub {
861	$self->{vp}->set_offset (0, $_[1]);	972	$self->{vp}->set_offset (0, $_[1]);
862	},	973	},
863	;	974	;
864		975
865	$self = $class->SUPER::new (	976	$self = $class->SUPER::new (
866	vp => (new CFClient::UI::ViewPort expand => 1),	977	vp => (new CFClient::UI::ViewPort expand => 1),
867	slider => $slider,	978	slider => $slider,
868	@_,	979	%arg,
869	);	980	);
870		981
871	$self->{vp}->add ($self->{scrolled});
872	$self->add ($self->{vp});
873	$self->add ($self->{slider});	982	$self->SUPER::add ($self->{vp}, $self->{slider});
		983	$self->add ($child) if $child;
874		984
875	$self	985	$self
		986	}
		987
		988	sub add {
		989	my ($self, $widget) = @_;
		990
		991	$self->{vp}->add ($self->{child} = $widget);
		992	}
		993
		994	sub update {
		995	my ($self) = @_;
		996
		997	$self->SUPER::update;
		998
		999	# todo: overwrite size_allocate of child
		1000	my $child = $self->{vp}->child;
		1001	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
876	}	1002	}
877		1003
878	sub size_allocate {	1004	sub size_allocate {
879	my ($self, $w, $h) = @_;	1005	my ($self, $w, $h) = @_;
880		1006
…		…
933		1059
934	our @ISA = CFClient::UI::Bin::;	1060	our @ISA = CFClient::UI::Bin::;
935		1061
936	use CFClient::OpenGL;	1062	use CFClient::OpenGL;
937		1063
938	my @tex =	1064	my $bg =
		1065	new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
		1066	mipmap => 1, wrap => 1;
		1067
		1068	my @border =
939	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	1069	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
940	qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);	1070	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
941		1071
942	sub new {	1072	sub new {
943	my $class = shift;	1073	my ($class, %arg) = @_;
944		1074
945	# TODO: user_x, user_y, overwrite moveto?	1075	my $title = delete $arg{title};
946		1076
947	my $self = $class->SUPER::new (	1077	my $self = $class->SUPER::new (
948	bg => [1, 1, 1, 1],	1078	bg => [1, 1, 1, 1],
949	border_bg => [1, 1, 1, 1],	1079	border_bg => [1, 1, 1, 1],
950	border => 0.6,	1080	border => 0.6,
951	is_toplevel => 1,
952	can_events => 1,	1081	can_events => 1,
953	@_	1082	min_w => 16,
		1083	min_h => 16,
		1084	%arg,
954	);	1085	);
955		1086
956	$self->{title} &&= new CFClient::UI::Label	1087	$self->{title} = new CFClient::UI::Label
957	align => 0,	1088	align => 0,
958	valign => 1,	1089	valign => 1,
959	text => $self->{title},	1090	text => $title,
960	fontsize => $self->{border};	1091	fontsize => $self->{border}
		1092	if defined $title;
961		1093
962	$self	1094	$self
		1095	}
		1096
		1097	sub add {
		1098	my ($self, @widgets) = @_;
		1099
		1100	$self->SUPER::add (@widgets);
		1101	$self->CFClient::UI::Container::add ($self->{title}) if $self->{title};
963	}	1102	}
964		1103
965	sub border {	1104	sub border {
966	int $_[0]{border} * $::FONTSIZE	1105	int $_[0]{border} * $::FONTSIZE
967	}	1106	}
968		1107
969	sub size_request {	1108	sub size_request {
970	my ($self) = @_;	1109	my ($self) = @_;
		1110
		1111	$self->{title}->size_request
		1112	if $self->{title};
971		1113
972	my ($w, $h) = $self->SUPER::size_request;	1114	my ($w, $h) = $self->SUPER::size_request;
973		1115
974	(	1116	(
975	$w + $self->border * 2,	1117	$w + $self->border * 2,
…		…
978	}	1120	}
979		1121
980	sub size_allocate {	1122	sub size_allocate {
981	my ($self, $w, $h) = @_;	1123	my ($self, $w, $h) = @_;
982		1124
		1125	if ($self->{title}) {
		1126	$self->{title}{w} = $w;
		1127	$self->{title}{h} = $h;
		1128	$self->{title}->size_allocate ($w, $h);
		1129	}
		1130
		1131	my $border = $self->border;
		1132
983	$h -= List::Util::max 0, $self->border * 2;	1133	$h -= List::Util::max 0, $border * 2;
984	$w -= List::Util::max 0, $self->border * 2;	1134	$w -= List::Util::max 0, $border * 2;
985		1135
986	$self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
987	if $self->{title};
988
989	$self->child->configure ($self->border, $self->border, $w, $h);	1136	$self->child->configure ($border, $border, $w, $h);
990	}	1137	}
991		1138
992	sub button_down {	1139	sub button_down {
993	my ($self, $ev, $x, $y) = @_;	1140	my ($self, $ev, $x, $y) = @_;
994		1141
…		…
1010	my ($ev, $x, $y) = @_;	1157	my ($ev, $x, $y) = @_;
1011		1158
1012	my $dx = $ev->{x} - $ox;	1159	my $dx = $ev->{x} - $ox;
1013	my $dy = $ev->{y} - $oy;	1160	my $dy = $ev->{y} - $oy;
1014		1161
1015	$self->{user_w} = $bw + $dx * ($mx ? -1 : 1);	1162	$self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1016	$self->{user_h} = $bh + $dy * ($my ? -1 : 1);	1163	$self->{force_h} = $bh + $dy * ($my ? -1 : 1);
		1164
		1165	$self->realloc;
1017	$self->move ($wx + $dx * $mx, $wy + $dy * $my);	1166	$self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1018	$self->check_size;
1019	};	1167	};
1020		1168
1021	} elsif ($lr ^ $td) {	1169	} elsif ($lr ^ $td) {
1022	my ($ox, $oy) = ($ev->{x}, $ev->{y});	1170	my ($ox, $oy) = ($ev->{x}, $ev->{y});
1023	my ($bx, $by) = ($self->{x}, $self->{y});	1171	my ($bx, $by) = ($self->{x}, $self->{y});
…		…
1025	$self->{motion} = sub {	1173	$self->{motion} = sub {
1026	my ($ev, $x, $y) = @_;	1174	my ($ev, $x, $y) = @_;
1027		1175
1028	($x, $y) = ($ev->{x}, $ev->{y});	1176	($x, $y) = ($ev->{x}, $ev->{y});
1029		1177
1030	$self->move ($bx + $x - $ox, $by + $y - $oy);	1178	$self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1031	$self->update;
1032	};	1179	};
		1180	} else {
		1181	return 0;
		1182	}
		1183
1033	}	1184	1
1034	}	1185	}
1035		1186
1036	sub button_up {	1187	sub button_up {
1037	my ($self, $ev, $x, $y) = @_;	1188	my ($self, $ev, $x, $y) = @_;
1038		1189
1039	delete $self->{motion};	1190	!!delete $self->{motion}
1040	}	1191	}
1041		1192
1042	sub mouse_motion {	1193	sub mouse_motion {
1043	my ($self, $ev, $x, $y) = @_;	1194	my ($self, $ev, $x, $y) = @_;
1044		1195
1045	$self->{motion}->($ev, $x, $y) if $self->{motion};	1196	$self->{motion}->($ev, $x, $y) if $self->{motion};
		1197
		1198	!!$self->{motion}
1046	}	1199	}
1047		1200
1048	sub _draw {	1201	sub _draw {
1049	my ($self) = @_;	1202	my ($self) = @_;
1050		1203
		1204	my $child = $self->{children}[0];
		1205
1051	my ($w, $h ) = ($self->{w}, $self->{h});	1206	my ($w, $h ) = ($self->{w}, $self->{h});
1052	my ($cw, $ch) = ($self->child->{w}, $self->child->{h});	1207	my ($cw, $ch) = ($child->{w}, $child->{h});
1053		1208
1054	glEnable GL_TEXTURE_2D;	1209	glEnable GL_TEXTURE_2D;
1055	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	1210	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1056		1211
1057	my $border = $self->border;	1212	my $border = $self->border;
1058		1213
1059	glColor @{ $self->{border_bg} };	1214	glColor @{ $self->{border_bg} };
1060	$tex[1]->draw_quad_alpha (0, 0, $w, $border);	1215	$border[0]->draw_quad_alpha (0, 0, $w, $border);
1061	$tex[3]->draw_quad_alpha (0, $border, $border, $ch);	1216	$border[1]->draw_quad_alpha (0, $border, $border, $ch);
1062	$tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);	1217	$border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1063	$tex[4]->draw_quad_alpha (0, $h - $border, $w, $border);	1218	$border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
1064		1219
1065	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {	1220	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1066	my $bg = $tex[0];	1221	glColor @{ $self->{bg} };
1067		1222
1068	# TODO: repeat texture not scale	1223	# TODO: repeat texture not scale
		1224	# solve this better(?)
1069	my $rep_x = $cw / $bg->{w};	1225	$bg->{s} = $cw / $bg->{w};
1070	my $rep_y = $ch / $bg->{h};	1226	$bg->{t} = $ch / $bg->{h};
1071
1072	glColor @{ $self->{bg} };
1073
1074	$bg->{s} = $rep_x;
1075	$bg->{t} = $rep_y;
1076	$bg->{wrap_mode} = 1;
1077	$bg->draw_quad_alpha ($border, $border, $cw, $ch);	1227	$bg->draw_quad_alpha ($border, $border, $cw, $ch);
1078	}	1228	}
1079		1229
1080	glDisable GL_TEXTURE_2D;	1230	glDisable GL_TEXTURE_2D;
1081		1231
1082	$self->{title}->draw if $self->{title};
1083
1084	$self->child->draw;	1232	$child->draw;
		1233
		1234	if ($self->{title}) {
		1235	glTranslate 0, $border - $self->{h};
		1236	$self->{title}->_draw;
		1237	}
1085	}	1238	}
1086		1239
1087	#############################################################################	1240	#############################################################################
1088		1241
1089	package CFClient::UI::Table;	1242	package CFClient::UI::Table;
…		…
1111	my ($self, $x, $y, $child) = @_;	1264	my ($self, $x, $y, $child) = @_;
1112		1265
1113	$child->set_parent ($self);	1266	$child->set_parent ($self);
1114	$self->{children}[$y][$x] = $child;	1267	$self->{children}[$y][$x] = $child;
1115		1268
1116	$self->check_size (1);	1269	$self->realloc;
1117	}	1270	}
1118		1271
1119	# TODO: move to container class maybe? send children a signal on removal?	1272	# TODO: move to container class maybe? send children a signal on removal?
1120	sub clear {	1273	sub clear {
1121	my ($self) = @_;	1274	my ($self) = @_;
…		…
1126	for (@children) {	1279	for (@children) {
1127	delete $_->{parent};	1280	delete $_->{parent};
1128	$_->hide;	1281	$_->hide;
1129	}	1282	}
1130		1283
1131	$self->check_size (1);	1284	$self->realloc;
1132	$self->update;
1133	}	1285	}
1134		1286
1135	sub get_wh {	1287	sub get_wh {
1136	my ($self) = @_;	1288	my ($self) = @_;
1137		1289
…		…
1168	sub size_allocate {	1320	sub size_allocate {
1169	my ($self, $w, $h) = @_;	1321	my ($self, $w, $h) = @_;
1170		1322
1171	my ($ws, $hs) = $self->get_wh;	1323	my ($ws, $hs) = $self->get_wh;
1172		1324
1173	my $req_w = sum @$ws;	1325	my $req_w = (sum @$ws) || 1;
1174	my $req_h = sum @$hs;	1326	my $req_h = (sum @$hs) || 1;
1175		1327
1176	# TODO: nicer code && do row_expand	1328	# TODO: nicer code && do row_expand
1177	my @col_expand = @{$self->{col_expand}};	1329	my @col_expand = @{$self->{col_expand}};
1178	@col_expand = (1) x @$ws unless @col_expand;	1330	@col_expand = (1) x @$ws unless @col_expand;
1179	my $col_expand = (sum @col_expand) || 1;	1331	my $col_expand = (sum @col_expand) || 1;
…		…
1233	}	1385	}
1234	}	1386	}
1235		1387
1236	#############################################################################	1388	#############################################################################
1237		1389
1238	package CFClient::UI::HBox;	1390	package CFClient::UI::Box;
1239
1240	# TODO: wrap into common Box base class
1241		1391
1242	our @ISA = CFClient::UI::Container::;	1392	our @ISA = CFClient::UI::Container::;
1243		1393
1244	sub size_request {	1394	sub size_request {
1245	my ($self) = @_;	1395	my ($self) = @_;
1246		1396
1247	my @alloc = map [$_->size_request], @{$self->{children}};	1397	$self->{vertical}
1248		1398	? (
1249	(	1399	(List::Util::max map $_->{req_w}, @{$self->{children}}),
1250	(List::Util::sum map $_->[0], @alloc),	1400	(List::Util::sum map $_->{req_h}, @{$self->{children}}),
1251	(List::Util::max map $_->[1], @alloc),	1401	)
1252	)	1402	: (
		1403	(List::Util::sum map $_->{req_w}, @{$self->{children}}),
		1404	(List::Util::max map $_->{req_h}, @{$self->{children}}),
		1405	)
1253	}	1406	}
1254		1407
1255	sub size_allocate {	1408	sub size_allocate {
1256	my ($self, $w, $h) = @_;	1409	my ($self, $w, $h) = @_;
1257		1410
1258	($h, $w) = ($w, $h);	1411	my $space = $self->{vertical} ? $h : $w;
1259
1260	my $children = $self->{children};	1412	my $children = $self->{children};
1261		1413
1262	my @h = map $_->{req_w}, @$children;	1414	my @req;
1263		1415
1264	my $req_h = List::Util::sum @h;	1416	if ($self->{homogeneous}) {
1265		1417	@req = ($space / (@$children || 1)) x @$children;
1266	if ($req_h > $h) {
1267	# ah well, not enough space
1268	$_ *= $h / $req_h for @h;
1269	} else {	1418	} else {
		1419	@req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;
		1420	my $req = List::Util::sum @req;
		1421
		1422	if ($req > $space) {
		1423	# ah well, not enough space
		1424	$_ *= $space / $req for @req;
		1425	} else {
1270	my $exp = List::Util::sum map $_->{expand}, @$children;	1426	my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1271	$exp ||= 1;
1272		1427
		1428	$space = ($space - $req) / $expand; # remaining space to give away
		1429
		1430	$req[$_] += $space * $children->[$_]{expand}
1273	for (0 .. $#$children) {	1431	for 0 .. $#$children;
1274	my $child = $children->[$_];
1275
1276	my $alloc_h = $h[$_];
1277	$alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1278	$h[$_] = $alloc_h;
1279	}	1432	}
1280	}	1433	}
1281		1434
1282	CFClient::UI::harmonize \@h;	1435	CFClient::UI::harmonize \@req;
1283		1436
1284	my $y = 0;	1437	my $pos = 0;
1285	for (0 .. $#$children) {	1438	for (0 .. $#$children) {
1286	my $child = $children->[$_];
1287	my $h = $h[$_];	1439	my $alloc = $req[$_];
1288	$child->configure ($y, 0, $h, $w);	1440	$children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1289		1441
1290	$y += $h;	1442	$pos += $alloc;
1291	}	1443	}
1292		1444
1293	1	1445	1
1294	}	1446	}
1295		1447
1296	#############################################################################	1448	#############################################################################
1297		1449
		1450	package CFClient::UI::HBox;
		1451
		1452	our @ISA = CFClient::UI::Box::;
		1453
		1454	sub new {
		1455	my $class = shift;
		1456
		1457	$class->SUPER::new (
		1458	vertical => 0,
		1459	@_,
		1460	)
		1461	}
		1462
		1463	#############################################################################
		1464
1298	package CFClient::UI::VBox;	1465	package CFClient::UI::VBox;
1299		1466
1300	# TODO: wrap into common Box base class
1301
1302	our @ISA = CFClient::UI::Container::;	1467	our @ISA = CFClient::UI::Box::;
1303		1468
1304	sub size_request {	1469	sub new {
1305	my ($self) = @_;	1470	my $class = shift;
1306		1471
1307	my @alloc = map [$_->size_request], @{$self->{children}};	1472	$class->SUPER::new (
1308		1473	vertical => 1,
1309	(	1474	@_,
1310	(List::Util::max map $_->[0], @alloc),
1311	(List::Util::sum map $_->[1], @alloc),
1312	)	1475	)
1313	}
1314
1315	sub size_allocate {
1316	my ($self, $w, $h) = @_;
1317
1318	Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1319
1320	my $children = $self->{children};
1321
1322	my @h = map $_->{req_h}, @$children;
1323
1324	my $req_h = List::Util::sum @h;
1325
1326	if ($req_h > $h) {
1327	# ah well, not enough space
1328	$_ *= $h / $req_h for @h;
1329	} else {
1330	my $exp = List::Util::sum map $_->{expand}, @$children;
1331	$exp ||= 1;
1332
1333	for (0 .. $#$children) {
1334	my $child = $children->[$_];
1335
1336	$h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1337	}
1338	}
1339
1340	CFClient::UI::harmonize \@h;
1341
1342	my $y = 0;
1343	for (0 .. $#$children) {
1344	my $child = $children->[$_];
1345	my $h = $h[$_];
1346	$child->configure (0, $y, $w, $h);
1347
1348	$y += $h;
1349	}
1350
1351	1
1352	}	1476	}
1353		1477
1354	#############################################################################	1478	#############################################################################
1355		1479
1356	package CFClient::UI::Label;	1480	package CFClient::UI::Label;
…		…
1373	ellipsise => 3, # end	1497	ellipsise => 3, # end
1374	layout => (new CFClient::Layout),	1498	layout => (new CFClient::Layout),
1375	fontsize => 1,	1499	fontsize => 1,
1376	align => -1,	1500	align => -1,
1377	valign => -1,	1501	valign => -1,
1378	padding => 2,	1502	padding_x => 2,
		1503	padding_y => 2,
1379	can_events => 0,	1504	can_events => 0,
1380	%arg	1505	%arg
1381	);	1506	);
1382		1507
1383	if (exists $self->{template}) {	1508	if (exists $self->{template}) {
…		…
1419	$self->{text} = "T$text";	1544	$self->{text} = "T$text";
1420		1545
1421	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;	1546	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1422	$self->{layout}->set_text ($text);	1547	$self->{layout}->set_text ($text);
1423		1548
		1549	$self->realloc;
1424	$self->update;	1550	$self->update;
1425	$self->check_size;
1426	}	1551	}
1427		1552
1428	sub set_markup {	1553	sub set_markup {
1429	my ($self, $markup) = @_;	1554	my ($self, $markup) = @_;
1430		1555
…		…
1434	my $rgba = $markup =~ /span.*(?:foreground|background)/;	1559	my $rgba = $markup =~ /span.*(?:foreground|background)/;
1435		1560
1436	$self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;	1561	$self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1437	$self->{layout}->set_markup ($markup);	1562	$self->{layout}->set_markup ($markup);
1438		1563
		1564	$self->realloc;
1439	$self->update;	1565	$self->update;
1440	$self->check_size;
1441	}	1566	}
1442		1567
1443	sub size_request {	1568	sub size_request {
1444	my ($self) = @_;	1569	my ($self) = @_;
1445		1570
…		…
1459		1584
1460	$w = List::Util::max $w, $w2;	1585	$w = List::Util::max $w, $w2;
1461	$h = List::Util::max $h, $h2;	1586	$h = List::Util::max $h, $h2;
1462	}	1587	}
1463		1588
1464	(	1589	($w, $h)
1465	$w + $self->{padding} * 2,
1466	$h + $self->{padding} * 2,
1467	)
1468	}	1590	}
1469		1591
1470	sub size_allocate {	1592	sub size_allocate {
1471	my ($self, $w, $h) = @_;	1593	my ($self, $w, $h) = @_;
1472		1594
		1595	delete $self->{ox};
		1596
1473	delete $self->{texture};	1597	delete $self->{texture}
		1598	unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1474	}	1599	}
1475		1600
1476	sub set_fontsize {	1601	sub set_fontsize {
1477	my ($self, $fontsize) = @_;	1602	my ($self, $fontsize) = @_;
1478		1603
1479	$self->{fontsize} = $fontsize;	1604	$self->{fontsize} = $fontsize;
1480	delete $self->{texture};	1605	delete $self->{texture};
1481		1606
1482	$self->update;	1607	$self->realloc;
1483	$self->check_size;
1484	}	1608	}
1485		1609
1486	sub _draw {	1610	sub _draw {
1487	my ($self) = @_;	1611	my ($self) = @_;
1488		1612
…		…
1494	$self->{layout}->set_width ($self->{w});	1618	$self->{layout}->set_width ($self->{w});
1495	$self->{layout}->set_ellipsise ($self->{ellipsise});	1619	$self->{layout}->set_ellipsise ($self->{ellipsise});
1496	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});	1620	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1497	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1621	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1498		1622
1499	my $tex = new_from_layout CFClient::Texture $self->{layout};	1623	new_from_layout CFClient::Texture $self->{layout}
		1624	};
1500		1625
		1626	unless (exists $self->{ox}) {
1501	$self->{ox} = int ($self->{align} < 0 ? $self->{padding}	1627	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1502	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}	1628	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1503	: ($self->{w} - $tex->{w}) * 0.5);	1629	: ($self->{w} - $tex->{w}) * 0.5);
1504		1630
1505	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding}	1631	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1506	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}	1632	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1507	: ($self->{h} - $tex->{h}) * 0.5);	1633	: ($self->{h} - $tex->{h}) * 0.5);
1508
1509	$tex
1510	};	1634	};
1511		1635
1512	glEnable GL_TEXTURE_2D;	1636	glEnable GL_TEXTURE_2D;
1513	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1637	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1514		1638
…		…
1552		1676
1553	delete $self->{cur_h};	1677	delete $self->{cur_h};
1554		1678
1555	return if $self->{text} eq $text;	1679	return if $self->{text} eq $text;
1556		1680
1557	delete $self->{texture};
1558
1559	$self->{last_activity} = $::NOW;	1681	$self->{last_activity} = $::NOW;
1560	$self->{text} = $text;	1682	$self->{text} = $text;
1561		1683
1562	$text =~ s/./*/g if $self->{hidden};	1684	$text =~ s/./*/g if $self->{hidden};
1563	$self->{layout}->set_text ("$text ");	1685	$self->{layout}->set_text ("$text ");
1564		1686
1565	$self->_emit (changed => $self->{text});	1687	$self->_emit (changed => $self->{text});
		1688	$self->update;
1566	}	1689	}
1567		1690
1568	sub set_text {	1691	sub set_text {
1569	my ($self, $text) = @_;	1692	my ($self, $text) = @_;
1570		1693
1571	$self->{cursor} = length $text;	1694	$self->{cursor} = length $text;
1572	$self->_set_text ($text);	1695	$self->_set_text ($text);
1573	$self->update;	1696
1574	$self->check_size;	1697	$self->realloc;
1575	}	1698	}
1576		1699
1577	sub get_text {	1700	sub get_text {
1578	$_[0]{text}	1701	$_[0]{text}
1579	}	1702	}
…		…
1609	$self->{cursor} = length $text;	1732	$self->{cursor} = length $text;
1610	} elsif ($uni == 27) {	1733	} elsif ($uni == 27) {
1611	$self->_emit ('escape');	1734	$self->_emit ('escape');
1612	} elsif ($uni) {	1735	} elsif ($uni) {
1613	substr $text, $self->{cursor}++, 0, chr $uni;	1736	substr $text, $self->{cursor}++, 0, chr $uni;
		1737	} else {
		1738	return 0;
1614	}	1739	}
1615		1740
1616	$self->_set_text ($text);	1741	$self->_set_text ($text);
1617	$self->update;	1742
1618	$self->check_size;	1743	$self->realloc;
		1744
		1745	1
1619	}	1746	}
1620		1747
1621	sub focus_in {	1748	sub focus_in {
1622	my ($self) = @_;	1749	my ($self) = @_;
1623		1750
…		…
1638	utf8::encode $text;	1765	utf8::encode $text;
1639	$self->{cursor} = length substr $text, 0, $idx;	1766	$self->{cursor} = length substr $text, 0, $idx;
1640		1767
1641	$self->_set_text ($self->{text});	1768	$self->_set_text ($self->{text});
1642	$self->update;	1769	$self->update;
		1770
		1771	1
1643	}	1772	}
1644		1773
1645	sub mouse_motion {	1774	sub mouse_motion {
1646	my ($self, $ev, $x, $y) = @_;	1775	my ($self, $ev, $x, $y) = @_;
1647	# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#	1776	# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
		1777
		1778	0
1648	}	1779	}
1649		1780
1650	sub _draw {	1781	sub _draw {
1651	my ($self) = @_;	1782	my ($self) = @_;
1652		1783
…		…
1729	} else {	1860	} else {
1730	$self->set_text ($self->{history_saveback});	1861	$self->set_text ($self->{history_saveback});
1731	}	1862	}
1732		1863
1733	} else {	1864	} else {
1734	$self->SUPER::key_down ($ev);	1865	return $self->SUPER::key_down ($ev)
		1866	}
		1867
1735	}	1868	1
1736
1737	}	1869	}
1738		1870
1739	#############################################################################	1871	#############################################################################
1740		1872
1741	package CFClient::UI::Button;	1873	package CFClient::UI::Button;
…		…
1750		1882
1751	sub new {	1883	sub new {
1752	my $class = shift;	1884	my $class = shift;
1753		1885
1754	$class->SUPER::new (	1886	$class->SUPER::new (
1755	padding => 4,	1887	padding_x => 4,
		1888	padding_y => 4,
1756	fg => [1, 1, 1],	1889	fg => [1, 1, 1],
1757	active_fg => [0, 0, 1],	1890	active_fg => [0, 0, 1],
1758	can_hover => 1,	1891	can_hover => 1,
1759	align => 0,	1892	align => 0,
1760	valign => 0,	1893	valign => 0,
…		…
1769	my ($self, $ev, $x, $y) = @_;	1902	my ($self, $ev, $x, $y) = @_;
1770		1903
1771	$self->emit ("activate")	1904	$self->emit ("activate")
1772	if $x >= 0 && $x < $self->{w}	1905	if $x >= 0 && $x < $self->{w}
1773	&& $y >= 0 && $y < $self->{h};	1906	&& $y >= 0 && $y < $self->{h};
		1907
		1908	1
1774	}	1909	}
1775		1910
1776	sub _draw {	1911	sub _draw {
1777	my ($self) = @_;	1912	my ($self) = @_;
1778		1913
…		…
1807		1942
1808	sub new {	1943	sub new {
1809	my $class = shift;	1944	my $class = shift;
1810		1945
1811	$class->SUPER::new (	1946	$class->SUPER::new (
1812	padding => 2,	1947	padding_x => 2,
		1948	padding_y => 2,
1813	fg => [1, 1, 1],	1949	fg => [1, 1, 1],
1814	active_fg => [1, 1, 0],	1950	active_fg => [1, 1, 0],
1815	bg => [0, 0, 0, 0.2],	1951	bg => [0, 0, 0, 0.2],
1816	active_bg => [1, 1, 1, 0.5],	1952	active_bg => [1, 1, 1, 0.5],
1817	state => 0,	1953	state => 0,
…		…
1821	}	1957	}
1822		1958
1823	sub size_request {	1959	sub size_request {
1824	my ($self) = @_;	1960	my ($self) = @_;
1825		1961
1826	($self->{padding} * 2 + 6) x 2	1962	(6) x 2
1827	}	1963	}
1828		1964
1829	sub button_down {	1965	sub button_down {
1830	my ($self, $ev, $x, $y) = @_;	1966	my ($self, $ev, $x, $y) = @_;
1831		1967
1832	if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}	1968	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1833	&& $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {	1969	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1834	$self->{state} = !$self->{state};	1970	$self->{state} = !$self->{state};
1835	$self->_emit (changed => $self->{state});	1971	$self->_emit (changed => $self->{state});
		1972	} else {
		1973	return 0
		1974	}
		1975
1836	}	1976	1
1837	}	1977	}
1838		1978
1839	sub _draw {	1979	sub _draw {
1840	my ($self) = @_;	1980	my ($self) = @_;
1841		1981
1842	$self->SUPER::_draw;	1982	$self->SUPER::_draw;
1843		1983
1844	glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0;	1984	glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1845		1985
1846	my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;	1986	my ($w, $h) = @$self{qw(w h)};
		1987
		1988	my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1847		1989
1848	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };	1990	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1849		1991
1850	my $tex = $self->{state} ? $tex[1] : $tex[0];	1992	my $tex = $self->{state} ? $tex[1] : $tex[0];
1851		1993
…		…
2116	fg => [1, 1, 1],	2258	fg => [1, 1, 1],
2117	active_fg => [0, 0, 0],	2259	active_fg => [0, 0, 0],
2118	bg => [0, 0, 0, 0.2],	2260	bg => [0, 0, 0, 0.2],
2119	active_bg => [1, 1, 1, 0.5],	2261	active_bg => [1, 1, 1, 0.5],
2120	range => [0, 0, 100, 10, 0],	2262	range => [0, 0, 100, 10, 0],
2121	req_w => $::WIDTH / 80,	2263	min_w => $::WIDTH / 80,
2122	req_h => $::WIDTH / 80,	2264	min_h => $::WIDTH / 80,
2123	vertical => 0,	2265	vertical => 0,
2124	can_hover => 1,	2266	can_hover => 1,
2125	inner_pad => 0.02,	2267	inner_pad => 0.02,
2126	@_	2268	@_
2127	);	2269	);
…		…
2130	$self->update;	2272	$self->update;
2131		2273
2132	$self	2274	$self
2133	}	2275	}
2134		2276
		2277	sub changed { }
		2278
2135	sub set_range {	2279	sub set_range {
2136	my ($self, $range) = @_;	2280	my ($self, $range) = @_;
2137		2281
2138	$self->{range} = $range;	2282	($range, $self->{range}) = ($self->{range}, $range);
2139		2283
2140	$self->update;	2284	$self->update
		2285	if "@$range" ne "@{$self->{range}}";
2141	}	2286	}
2142		2287
2143	sub set_value {	2288	sub set_value {
2144	my ($self, $value) = @_;	2289	my ($self, $value) = @_;
2145		2290
…		…
2164	}	2309	}
2165		2310
2166	sub size_request {	2311	sub size_request {
2167	my ($self) = @_;	2312	my ($self) = @_;
2168		2313
2169	my $w = $self->{req_w};	2314	($self->{req_w}, $self->{req_h})
2170	my $h = $self->{req_h};
2171
2172	$self->{vertical} ? ($h, $w) : ($w, $h)
2173	}	2315	}
2174		2316
2175	sub button_down {	2317	sub button_down {
2176	my ($self, $ev, $x, $y) = @_;	2318	my ($self, $ev, $x, $y) = @_;
2177		2319
2178	$self->SUPER::button_down ($ev, $x, $y);	2320	$self->SUPER::button_down ($ev, $x, $y);
2179		2321
2180	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];	2322	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2181		2323
2182	$self->mouse_motion ($ev, $x, $y);	2324	$self->mouse_motion ($ev, $x, $y)
2183	}	2325	}
2184		2326
2185	sub mouse_motion {	2327	sub mouse_motion {
2186	my ($self, $ev, $x, $y) = @_;	2328	my ($self, $ev, $x, $y) = @_;
2187		2329
…		…
2191	my (undef, $lo, $hi, $page) = @{$self->{range}};	2333	my (undef, $lo, $hi, $page) = @{$self->{range}};
2192		2334
2193	$x = ($x - $self->{click}[1]) / ($w * $self->{scale});	2335	$x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2194		2336
2195	$self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));	2337	$self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
		2338	} else {
		2339	return 0;
		2340	}
		2341
2196	}	2342	1
2197	}	2343	}
2198		2344
2199	sub update {	2345	sub update {
2200	my ($self) = @_;	2346	my ($self) = @_;
2201		2347
2202	$CFClient::UI::ROOT->on_post_alloc ($self => sub {	2348	delete $self->{knob_w};
		2349	$self->SUPER::update;
		2350	}
		2351
		2352	sub _draw {
		2353	my ($self) = @_;
		2354
		2355	unless ($self->{knob_w}) {
2203	$self->set_value ($self->{range}[0]);	2356	$self->set_value ($self->{range}[0]);
2204		2357
2205	my ($value, $lo, $hi, $page) = @{$self->{range}};	2358	my ($value, $lo, $hi, $page) = @{$self->{range}};
2206	my $range = ($hi - $page - $lo) || 1e-100;	2359	my $range = ($hi - $page - $lo) || 1e-100;
2207		2360
…		…
2213	$value = ($value - $lo) / $range;	2366	$value = ($value - $lo) / $range;
2214	$value = $value * $self->{scale} + $self->{offset};	2367	$value = $value * $self->{scale} + $self->{offset};
2215		2368
2216	$self->{knob_x} = $value - $knob_w * 0.5;	2369	$self->{knob_x} = $value - $knob_w * 0.5;
2217	$self->{knob_w} = $knob_w;	2370	$self->{knob_w} = $knob_w;
2218	});	2371	}
2219
2220	$self->SUPER::update;
2221	}
2222
2223	sub _draw {
2224	my ($self) = @_;
2225		2372
2226	$self->SUPER::_draw ();	2373	$self->SUPER::_draw ();
2227		2374
2228	glScale $self->{w}, $self->{h};	2375	glScale $self->{w}, $self->{h};
2229		2376
…		…
2528		2675
2529	sub new {	2676	sub new {
2530	my $class = shift;	2677	my $class = shift;
2531		2678
2532	my $self = $class->SUPER::new (	2679	my $self = $class->SUPER::new (
2533	state => 0,	2680	state => 0,
2534	connect_activate => \&toggle_flopper,	2681	on_activate => \&toggle_flopper,
2535	@_	2682	@_
2536	);	2683	);
2537		2684
2538	if ($self->{state}) {
2539	$self->{state} = 0;
2540	$self->toggle_flopper;
2541	}
2542
2543	$self	2685	$self
2544	}	2686	}
2545		2687
2546	sub toggle_flopper {	2688	sub toggle_flopper {
2547	my ($self) = @_;	2689	my ($self) = @_;
2548		2690
2549	# TODO: use animation	2691	$self->{other}->toggle_visibility;
2550	if ($self->{state} = !$self->{state}) {
2551	$CFClient::UI::ROOT->add ($self->{other});
2552	$self->{other}->move ($self->coord2global (0, $self->{h}));
2553	$self->_emit ("open");
2554	} else {
2555	$CFClient::UI::ROOT->remove ($self->{other});
2556	$self->_emit ("close");
2557	}
2558
2559	$self->_emit (changed => $self->{state});
2560	}	2692	}
2561		2693
2562	#############################################################################	2694	#############################################################################
2563		2695
2564	package CFClient::UI::Tooltip;	2696	package CFClient::UI::Tooltip;
…		…
2577	}	2709	}
2578		2710
2579	sub set_tooltip_from {	2711	sub set_tooltip_from {
2580	my ($self, $widget) = @_;	2712	my ($self, $widget) = @_;
2581		2713
		2714	my $tooltip = $widget->{tooltip};
		2715
		2716	if ($ENV{CFPLUS_DEBUG} & 2) {
		2717	$tooltip .= "\n\n" . (ref $widget) . "\n"
		2718	. "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
		2719	. "req $widget->{req_w} $widget->{req_h}\n"
		2720	. "visible $widget->{visible}";
		2721	}
		2722
2582	$self->add (new CFClient::UI::Label	2723	$self->add (new CFClient::UI::Label
2583	markup => $widget->{tooltip},	2724	markup => $tooltip,
2584	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	2725	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2585	fontsize => 0.8,	2726	fontsize => 0.8,
2586	fg => [0, 0, 0, 1],	2727	fg => [0, 0, 0, 1],
2587	ellipsise => 0,	2728	ellipsise => 0,
2588	font => ($widget->{tooltip_font} || $::FONT_PROP),	2729	font => ($widget->{tooltip_font} || $::FONT_PROP),
…		…
2599		2740
2600	sub size_allocate {	2741	sub size_allocate {
2601	my ($self, $w, $h) = @_;	2742	my ($self, $w, $h) = @_;
2602		2743
2603	$self->SUPER::size_allocate ($w - 4, $h - 4);	2744	$self->SUPER::size_allocate ($w - 4, $h - 4);
		2745	}
		2746
		2747	sub visibility_change {
		2748	my ($self, $visible) = @_;
		2749
		2750	return unless $visible;
		2751
		2752	$self->{root}->on_post_alloc ("move_$self" => sub {
		2753	my $widget = $self->{owner}
		2754	or return;
		2755
		2756	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
		2757
		2758	($x, $y) = $widget->coord2global (-$self->{w}, 0)
		2759	if $x + $self->{w} > $::WIDTH;
		2760
		2761	$self->move_abs ($x, $y);
		2762	});
2604	}	2763	}
2605		2764
2606	sub _draw {	2765	sub _draw {
2607	my ($self) = @_;	2766	my ($self) = @_;
2608		2767
…		…
2625	glVertex $w, $h;	2784	glVertex $w, $h;
2626	glVertex $w, 0;	2785	glVertex $w, 0;
2627	glEnd;	2786	glEnd;
2628		2787
2629	glTranslate 2 - 0.375, 2 - 0.375;	2788	glTranslate 2 - 0.375, 2 - 0.375;
		2789
2630	$self->SUPER::_draw;	2790	$self->SUPER::_draw;
2631	}	2791	}
2632		2792
2633	#############################################################################	2793	#############################################################################
2634		2794
…		…
2710	$self->SUPER::DESTROY;	2870	$self->SUPER::DESTROY;
2711	}	2871	}
2712		2872
2713	#############################################################################	2873	#############################################################################
2714		2874
2715	package CFClient::UI::Inventory;	2875	package CFClient::UI::Buttonbar;
2716		2876
2717	our @ISA = CFClient::UI::ScrolledWindow::;	2877	our @ISA = CFClient::UI::HBox::;
2718		2878
2719	sub new {	2879	# TODO: should actualyl wrap buttons and other goodies.
2720	my $class = shift;
2721
2722	my $self = $class->SUPER::new (
2723	scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2724	@_,
2725	);
2726
2727	$self
2728	}
2729
2730	sub set_items {
2731	my ($self, $items) = @_;
2732
2733	$self->{scrolled}->clear;
2734	return unless $items;
2735
2736	my @items = sort {
2737	($a->{type} <=> $b->{type})
2738	or ($a->{name} cmp $b->{name})
2739	} @$items;
2740
2741	$self->{real_items} = \@items;
2742
2743	my $row = 0;
2744	for my $item (@items) {
2745	CFClient::Item::update_widgets $item;
2746
2747	$self->{scrolled}->add (0, $row, $item->{face_widget});
2748	$self->{scrolled}->add (1, $row, $item->{desc_widget});
2749	$self->{scrolled}->add (2, $row, $item->{weight_widget});
2750
2751	$row++;
2752	}
2753
2754	# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2755	}
2756
2757	sub size_request {
2758	my ($self) = @_;
2759	($self->{req_w}, $self->{req_h});
2760	}
2761		2880
2762	#############################################################################	2881	#############################################################################
2763		2882
2764	package CFClient::UI::Menu;	2883	package CFClient::UI::Menu;
2765		2884
…		…
2806	# maybe save $GRAB? must be careful about events...	2925	# maybe save $GRAB? must be careful about events...
2807	$GRAB = $self;	2926	$GRAB = $self;
2808	$self->{button} = $ev->{button};	2927	$self->{button} = $ev->{button};
2809		2928
2810	$self->show;	2929	$self->show;
2811	$self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);	2930	$self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2812	}	2931	}
2813		2932
2814	sub mouse_motion {	2933	sub mouse_motion {
2815	my ($self, $ev, $x, $y) = @_;	2934	my ($self, $ev, $x, $y) = @_;
2816		2935
2817	# TODO: should use vbox->find_widget or so	2936	# TODO: should use vbox->find_widget or so
2818	$HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});	2937	$HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2819	$self->{hover} = $self->{item}{$HOVER};	2938	$self->{hover} = $self->{item}{$HOVER};
		2939
		2940	0
2820	}	2941	}
2821		2942
2822	sub button_up {	2943	sub button_up {
2823	my ($self, $ev, $x, $y) = @_;	2944	my ($self, $ev, $x, $y) = @_;
2824		2945
…		…
2826	undef $GRAB;	2947	undef $GRAB;
2827	$self->hide;	2948	$self->hide;
2828		2949
2829	$self->_emit ("popdown");	2950	$self->_emit ("popdown");
2830	$self->{hover}[1]->() if $self->{hover};	2951	$self->{hover}[1]->() if $self->{hover};
		2952	} else {
		2953	return 0
		2954	}
		2955
		2956	1
		2957	}
		2958
		2959	#############################################################################
		2960
		2961	package CFClient::UI::Multiplexer;
		2962
		2963	our @ISA = CFClient::UI::Container::;
		2964
		2965	sub new {
		2966	my $class = shift;
		2967
		2968	my $self = $class->SUPER::new (
		2969	@_,
		2970	);
		2971
		2972	$self->{current} = $self->{children}[0]
		2973	if @{ $self->{children} };
		2974
		2975	$self
		2976	}
		2977
		2978	sub add {
		2979	my ($self, @widgets) = @_;
		2980
		2981	$self->SUPER::add (@widgets);
		2982
		2983	$self->{current} = $self->{children}[0]
		2984	if @{ $self->{children} };
		2985	}
		2986
		2987	sub set_current_page {
		2988	my ($self, $page_or_widget) = @_;
		2989
		2990	my $widget = ref $page_or_widget
		2991	? $page_or_widget
		2992	: $self->{children}[$page_or_widget];
		2993
		2994	$self->{current} = $widget;
		2995	$self->{current}->configure (0, 0, $self->{w}, $self->{h});
		2996
		2997	$self->_emit (page_changed => $self->{current});
		2998
		2999	$self->realloc;
		3000	}
		3001
		3002	sub visible_children {
		3003	$_[0]{current}
		3004	}
		3005
		3006	sub size_request {
		3007	my ($self) = @_;
		3008
		3009	$self->{current}->size_request
		3010	}
		3011
		3012	sub size_allocate {
		3013	my ($self, $w, $h) = @_;
		3014
		3015	$self->{current}->configure (0, 0, $w, $h);
		3016	}
		3017
		3018	sub _draw {
		3019	my ($self) = @_;
		3020
		3021	$self->{current}->draw;
		3022	}
		3023
		3024	#############################################################################
		3025
		3026	package CFClient::UI::Notebook;
		3027
		3028	our @ISA = CFClient::UI::VBox::;
		3029
		3030	sub new {
		3031	my $class = shift;
		3032
		3033	my $self = $class->SUPER::new (
		3034	buttonbar => (new CFClient::UI::Buttonbar),
		3035	multiplexer => (new CFClient::UI::Multiplexer expand => 1),
		3036	# filter => # will be put between multiplexer and $self
		3037	@_,
		3038	);
2831	}	3039
		3040	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};
		3041	$self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
		3042
		3043	$self
		3044	}
		3045
		3046	sub add {
		3047	my ($self, $title, $widget, $tooltip) = @_;
		3048
		3049	Scalar::Util::weaken $self;
		3050
		3051	$self->{buttonbar}->add (new CFClient::UI::Button
		3052	markup => $title,
		3053	tooltip => $tooltip,
		3054	on_activate => sub { $self->set_current_page ($widget) },
		3055	);
		3056
		3057	$self->{multiplexer}->add ($widget);
		3058	}
		3059
		3060	sub set_current_page {
		3061	my ($self, $page) = @_;
		3062
		3063	$self->{multiplexer}->set_current_page ($page);
		3064	$self->_emit (page_changed => $self->{multiplexer}{current});
2832	}	3065	}
2833		3066
2834	#############################################################################	3067	#############################################################################
2835		3068
2836	package CFClient::UI::Statusbox;	3069	package CFClient::UI::Statusbox;
…		…
2941	$self->SUPER::reconfigure;	3174	$self->SUPER::reconfigure;
2942	}	3175	}
2943		3176
2944	#############################################################################	3177	#############################################################################
2945		3178
2946	package CFClient::UI::Root;	3179	package CFClient::UI::Inventory;
2947		3180
2948	our @ISA = CFClient::UI::Container::;	3181	our @ISA = CFClient::UI::ScrolledWindow::;
2949
2950	use CFClient::OpenGL;
2951		3182
2952	sub new {	3183	sub new {
2953	my $class = shift;	3184	my $class = shift;
2954		3185
2955	$class->SUPER::new (	3186	my $self = $class->SUPER::new (
		3187	child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
		3188	@_,
		3189	);
		3190
		3191	$self
		3192	}
		3193
		3194	sub set_items {
		3195	my ($self, $items) = @_;
		3196
		3197	$self->{child}->clear;
		3198	return unless $items;
		3199
		3200	my @items = sort {
		3201	($a->{type} <=> $b->{type})
		3202	or ($a->{name} cmp $b->{name})
		3203	} @$items;
		3204
		3205	$self->{real_items} = \@items;
		3206
		3207	my $row = 0;
		3208	for my $item (@items) {
		3209	CFClient::Item::update_widgets $item;
		3210
		3211	$self->{child}->add (0, $row, $item->{face_widget});
		3212	$self->{child}->add (1, $row, $item->{desc_widget});
		3213	$self->{child}->add (2, $row, $item->{weight_widget});
		3214
		3215	$row++;
		3216	}
		3217	}
		3218
		3219	#############################################################################
		3220
		3221	package CFClient::UI::BindEditor;
		3222
		3223	our @ISA = CFClient::UI::FancyFrame::;
		3224
		3225	sub new {
		3226	my $class = shift;
		3227
		3228	my $self = $class->SUPER::new (binding => [], commands => [], @_);
		3229
		3230	$self->add (my $vb = new CFClient::UI::VBox);
		3231
		3232
		3233	$vb->add ($self->{rec_btn} = new CFClient::UI::Button
		3234	text => "start recording",
		3235	tooltip => "Start/Stops recording of actions."
		3236	."All subsequent actions after the recording started will be captured."
		3237	."The actions are displayed after the record was stopped."
		3238	."To bind the action you have to click on the 'Bind' button",
		3239	on_activate => sub {
		3240	unless ($self->{recording}) {
		3241	$self->start;
		3242	} else {
		3243	$self->stop;
		3244	}
		3245	});
		3246
		3247	$vb->add (new CFClient::UI::Label text => "Actions:");
		3248	$vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
		3249
		3250	$vb->add (new CFClient::UI::Label text => "Bound to: ");
		3251	$vb->add (my $hb = new CFClient::UI::HBox);
		3252	$hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
		3253	$hb->add (new CFClient::UI::Button
		3254	text => "bind",
		3255	tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
		3256	on_activate => sub {
		3257	$self->ask_for_bind;
		3258	});
		3259
		3260	$vb->add (my $hb = new CFClient::UI::HBox);
		3261	$hb->add (new CFClient::UI::Button
		3262	text => "ok",
		3263	expand => 1,
		3264	tooltip => "This closes the binding editor and saves the binding",
		3265	on_activate => sub {
		3266	$self->hide;
		3267	$self->commit;
		3268	});
		3269
		3270	$hb->add (new CFClient::UI::Button
		3271	text => "cancel",
		3272	expand => 1,
		3273	tooltip => "This closes the binding editor without saving",
		3274	on_activate => sub {
		3275	$self->hide;
		3276	$self->{binding_cancel}->()
		3277	if $self->{binding_cancel};
		3278	});
		3279
		3280	$self->update_binding_widgets;
		3281
		3282	$self
		3283	}
		3284
		3285	sub commit {
		3286	my ($self) = @_;
		3287	my ($mod, $sym, $cmds) = $self->get_binding;
		3288	if ($sym != 0 && @$cmds > 0) {
		3289	$::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
		3290	."'. Don't forget 'Save Config'!");
		3291	$self->{binding_change}->($mod, $sym, $cmds)
		3292	if $self->{binding_change};
		3293	} else {
		3294	$::STATUSBOX->add ("No action bound, no key or action specified!");
		3295	$self->{binding_cancel}->()
		3296	if $self->{binding_cancel};
		3297	}
		3298	}
		3299
		3300	sub start {
		3301	my ($self) = @_;
		3302
		3303	$self->{rec_btn}->set_text ("stop recording");
		3304	$self->{recording} = 1;
		3305	$self->clear_command_list;
		3306	$::CONN->start_record if $::CONN;
		3307	}
		3308
		3309	sub stop {
		3310	my ($self) = @_;
		3311
		3312	$self->{rec_btn}->set_text ("start recording");
		3313	$self->{recording} = 0;
		3314
		3315	my $rec;
		3316	$rec = $::CONN->stop_record if $::CONN;
		3317	return unless ref $rec eq 'ARRAY';
		3318	$self->set_command_list ($rec);
		3319	}
		3320
		3321
		3322	sub ask_for_bind_and_commit {
		3323	my ($self) = @_;
		3324	$self->ask_for_bind (1);
		3325	}
		3326
		3327	sub ask_for_bind {
		3328	my ($self, $commit) = @_;
		3329
		3330	CFClient::Binder::open_binding_dialog (sub {
		3331	my ($mod, $sym) = @_;
		3332	$self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
		3333	$self->update_binding_widgets;
		3334	$self->commit if $commit;
		3335	});
		3336	}
		3337
		3338	# $mod and $sym are the modifiers and key symbol
		3339	# $cmds is a array ref of strings (the commands)
		3340	# $cb is the callback that is executed on OK
		3341	# $ccb is the callback that is executed on CANCEL and
		3342	# when the binding was unsuccessful on OK
		3343	sub set_binding {
		3344	my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
		3345
		3346	$self->clear_command_list;
		3347	$self->{recording} = 0;
		3348	$self->{rec_btn}->set_text ("start recording");
		3349
		3350	$self->{binding} = [$mod, $sym];
		3351	$self->{commands} = $cmds;
		3352
		3353	$self->{binding_change} = $cb;
		3354	$self->{binding_cancel} = $ccb;
		3355
		3356	$self->update_binding_widgets;
		3357	}
		3358
		3359	# this is a shortcut method that asks for a binding
		3360	# and then just binds it.
		3361	sub do_quick_binding {
		3362	my ($self, $cmds) = @_;
		3363	$self->set_binding (undef, undef, $cmds, sub {
		3364	$::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
		3365	});
		3366	$self->ask_for_bind (1);
		3367	}
		3368
		3369	sub update_binding_widgets {
		3370	my ($self) = @_;
		3371	my ($mod, $sym, $cmds) = $self->get_binding;
		3372	$self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
		3373	$self->set_command_list ($cmds);
		3374	}
		3375
		3376	sub get_binding {
		3377	my ($self) = @_;
		3378	return (
		3379	$self->{binding}->[0],
		3380	$self->{binding}->[1],
		3381	[ grep { defined $_ } @{$self->{commands}} ]
		3382	);
		3383	}
		3384
		3385	sub clear_command_list {
		3386	my ($self) = @_;
		3387	$self->{cmdbox}->clear ();
		3388	}
		3389
		3390	sub set_command_list {
		3391	my ($self, $cmds) = @_;
		3392
		3393	$self->{cmdbox}->clear ();
		3394	$self->{commands} = $cmds;
		3395
		3396	my $idx = 0;
		3397
		3398	for (@$cmds) {
		3399	$self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
		3400
		3401	my $i = $idx;
		3402	$hb->add (new CFClient::UI::Label text => $_);
		3403	$hb->add (new CFClient::UI::Button
		3404	text => "delete",
		3405	tooltip => "Deletes the action from the record",
		3406	on_activate => sub {
		3407	$self->{cmdbox}->remove ($hb);
		3408	$cmds->[$i] = undef;
		3409	});
		3410
		3411
		3412	$idx++
		3413	}
		3414	}
		3415
		3416	#############################################################################
		3417
		3418	package CFClient::UI::SpellList;
		3419
		3420	our @ISA = CFClient::UI::Table::;
		3421
		3422	sub new {
		3423	my $class = shift;
		3424
		3425	my $self = $class->SUPER::new (
		3426	binding => [],
		3427	commands => [],
2956	@_,	3428	@_,
2957	)	3429	)
2958	}	3430	}
2959		3431
2960	sub configure {	3432	# XXX: Do sorting? Argl...
2961	my ($self, $x, $y, $w, $h) = @_;	3433	sub add_spell {
2962
2963	$self->{w} = $w;
2964	$self->{h} = $h;
2965	}
2966
2967	sub check_size {
2968	my ($self) = @_;	3434	my ($self, $spell) = @_;
		3435	$self->{spells}->{$spell->{name}} = $spell;
2969		3436
2970	$self->size_allocate ($self->{w}, $self->{h})	3437	$self->add (0, $self->{tbl_idx}, new CFClient::UI::Face
2971	if $self->{w};	3438	face => $spell->{face},
		3439	can_hover => 1,
		3440	can_events => 1,
		3441	tooltip => $spell->{message});
		3442
		3443	$self->add (1, $self->{tbl_idx}, new CFClient::UI::Label
		3444	text => $spell->{name},
		3445	can_hover => 1,
		3446	can_events => 1,
		3447	tooltip => $spell->{message},
		3448	expand => 1);
		3449
		3450	$self->add (2, $self->{tbl_idx}, new CFClient::UI::Label
		3451	text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
		3452	$spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
		3453	expand => 1);
		3454
		3455	$self->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
		3456	text => "bind to key",
		3457	on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
		3458	}
		3459
		3460	sub rebuild_spell_list {
		3461	my ($self) = @_;
		3462	$self->{tbl_idx} = 0;
		3463	$self->add_spell ($_) for values %{$self->{spells}};
		3464	}
		3465
		3466	sub remove_spell {
		3467	my ($self, $spell) = @_;
		3468	delete $self->{spells}->{$spell->{name}};
		3469	$self->rebuild_spell_list;
		3470	}
		3471
		3472	#############################################################################
		3473
		3474	package CFClient::UI::Root;
		3475
		3476	our @ISA = CFClient::UI::Container::;
		3477
		3478	use CFClient::OpenGL;
		3479
		3480	sub new {
		3481	my $class = shift;
		3482
		3483	my $self = $class->SUPER::new (
		3484	visible => 1,
		3485	@_,
		3486	);
		3487
		3488	Scalar::Util::weaken ($self->{root} = $self);
		3489
		3490	$self
2972	}	3491	}
2973		3492
2974	sub size_request {	3493	sub size_request {
2975	my ($self) = @_;	3494	my ($self) = @_;
2976		3495
2977	($self->{w}, $self->{h})	3496	($self->{w}, $self->{h})
		3497	}
		3498
		3499	sub _to_pixel {
		3500	my ($coord, $size, $max) = @_;
		3501
		3502	$coord =
		3503	$coord eq "center" ? ($max - $size) * 0.5
		3504	: $coord eq "max" ? $max
		3505	: $coord;
		3506
		3507	$coord = 0 if $coord < 0;
		3508	$coord = $max - $size if $coord > $max - $size;
		3509
		3510	int $coord + 0.5
2978	}	3511	}
2979		3512
2980	sub size_allocate {	3513	sub size_allocate {
2981	my ($self, $w, $h) = @_;	3514	my ($self, $w, $h) = @_;
2982		3515
2983	for my $child ($self->children) {	3516	for my $child ($self->children) {
2984	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};	3517	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2985		3518
2986	$X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1	3519	$X = $child->{force_x} if exists $child->{force_x};
2987	if exists $child->{req_x};	3520	$Y = $child->{force_y} if exists $child->{force_y};
2988		3521
2989	$Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1	3522	$X = _to_pixel $X, $W, $self->{w};
2990	if exists $child->{req_y};	3523	$Y = _to_pixel $Y, $H, $self->{h};
2991
2992	$X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
2993	$Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
2994		3524
2995	$child->configure ($X, $Y, $W, $H);	3525	$child->configure ($X, $Y, $W, $H);
2996	}	3526	}
2997	}	3527	}
2998		3528
…		…
3009	}	3539	}
3010		3540
3011	sub update {	3541	sub update {
3012	my ($self) = @_;	3542	my ($self) = @_;
3013		3543
3014	$self->check_size;
3015	$::WANT_REFRESH++;	3544	$::WANT_REFRESH++;
3016	}	3545	}
3017		3546
3018	sub add {	3547	sub add {
3019	my ($self, @children) = @_;	3548	my ($self, @children) = @_;
3020		3549
3021	for (my @widgets = @children; my $w = pop @widgets; ) {
3022	push @widgets, $w->children;
3023	$w->{root} = $self;
3024	$w->{visible} = 1;
3025	}
3026
3027	for my $child (@children) {
3028	$child->{is_toplevel} = 1;	3550	$_->{is_toplevel} = 1
3029		3551	for @children;
3030	# integerise window positions
3031	$child->{x} = int $child->{x};
3032	$child->{y} = int $child->{y};
3033	}
3034		3552
3035	$self->SUPER::add (@children);	3553	$self->SUPER::add (@children);
3036	}	3554	}
3037		3555
3038	sub remove {	3556	sub remove {
3039	my ($self, @children) = @_;	3557	my ($self, @children) = @_;
3040		3558
3041	$self->SUPER::remove (@children);	3559	$self->SUPER::remove (@children);
		3560
		3561	delete $self->{is_toplevel}
		3562	for @children;
3042		3563
3043	while (@children) {	3564	while (@children) {
3044	my $w = pop @children;	3565	my $w = pop @children;
3045	push @children, $w->children;	3566	push @children, $w->children;
3046	$w->set_invisible;	3567	$w->set_invisible;
…		…
3065	while ($self->{refresh_hook}) {	3586	while ($self->{refresh_hook}) {
3066	$_->()	3587	$_->()
3067	for values %{delete $self->{refresh_hook}};	3588	for values %{delete $self->{refresh_hook}};
3068	}	3589	}
3069		3590
3070	if ($self->{check_size}) {	3591	if ($self->{realloc}) {
3071	my @queue = ([], []);	3592	my %queue;
		3593	my @queue;
		3594	my $widget;
3072		3595
3073	for (;;) {	3596	outer:
3074	if ($self->{check_size}) {	3597	while () {
3075	# heuristic: check containers last	3598	if (my $realloc = delete $self->{realloc}) {
3076	push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_	3599	for $widget (values %$realloc) {
3077	for values %{delete $self->{check_size}}	3600	$widget->{visible} or next; # do not resize invisible widgets
		3601
		3602	$queue{$widget+0}++ and next; # duplicates are common
		3603
		3604	push @{ $queue[$widget->{visible}] }, $widget;
		3605	}
3078	}	3606	}
3079		3607
3080	my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last;	3608	while () {
		3609	@queue or last outer;
3081		3610
3082	my ($w, $h) = $widget->{user_w} && $widget->{user_h}	3611	$widget = pop @{ $queue[-1] || [] }
3083	? @$widget{qw(user_w user_h)}	3612	and last;
3084	: $widget->size_request;
3085
3086	if (delete $widget->{force_alloc}
3087	or $w != $widget->{req_w} or $h != $widget->{req_h}) {
3088	Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
3089		3613
		3614	pop @queue;
		3615	}
		3616
		3617	delete $queue{$widget+0};
		3618
		3619	my ($w, $h) = $widget->size_request;
		3620
		3621	$w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2;
		3622	$h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2;
		3623
		3624	$w = $widget->{force_w} if exists $widget->{force_w};
		3625	$h = $widget->{force_h} if exists $widget->{force_h};
		3626
		3627	if ($widget->{req_w} != $w || $widget->{req_h} != $h
		3628	|| delete $widget->{force_realloc}) {
3090	$widget->{req_w} = $w;	3629	$widget->{req_w} = $w;
3091	$widget->{req_h} = $h;	3630	$widget->{req_h} = $h;
3092		3631
3093	$self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h];	3632	$self->{size_alloc}{$widget+0} = $widget;
3094		3633
3095	$widget->{parent}->check_size
3096	if $widget->{parent};	3634	if (my $parent = $widget->{parent}) {
		3635	$self->{realloc}{$parent+0} = $parent
		3636	unless $queue{$parent+0};
		3637
		3638	$parent->{force_size_alloc} = 1;
		3639	$self->{size_alloc}{$parent+0} = $parent;
		3640	}
3097	}	3641	}
		3642
		3643	delete $self->{realloc}{$widget+0};
3098	}	3644	}
3099	}	3645	}
3100		3646
3101	while ($self->{size_alloc}) {	3647	while (my $size_alloc = delete $self->{size_alloc}) {
3102	for (values %{delete $self->{size_alloc}}) {	3648	my @queue = sort { $b->{visible} <=> $a->{visible} }
3103	my ($widget, $w, $h) = @$_;	3649	values %$size_alloc;
		3650
		3651	while () {
		3652	my $widget = pop @queue || last;
		3653
		3654	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3104		3655
3105	$w = 0 if $w < 0;	3656	$w = 0 if $w < 0;
3106	$h = 0 if $h < 0;	3657	$h = 0 if $h < 0;
3107		3658
		3659	$w = int $w + 0.5;
		3660	$h = int $h + 0.5;
		3661
		3662	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
		3663	$widget->{old_w} = $widget->{w};
		3664	$widget->{old_h} = $widget->{h};
		3665
3108	$widget->{w} = $w;	3666	$widget->{w} = $w;
3109	$widget->{h} = $h;	3667	$widget->{h} = $h;
		3668
3110	$widget->emit (size_allocate => $w, $h);	3669	$widget->emit (size_allocate => $w, $h);
		3670	}
3111	}	3671	}
3112	}	3672	}
3113		3673
3114	while ($self->{post_alloc_hook}) {	3674	while ($self->{post_alloc_hook}) {
3115	$_->()	3675	$_->()
3116	for values %{delete $self->{post_alloc_hook}};	3676	for values %{delete $self->{post_alloc_hook}};
3117	}	3677	}
		3678
3118		3679
3119	glViewport 0, 0, $::WIDTH, $::HEIGHT;	3680	glViewport 0, 0, $::WIDTH, $::HEIGHT;
3120	glClearColor +($::CFG->{fow_intensity}) x 3, 1;	3681	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3121	glClear GL_COLOR_BUFFER_BIT;	3682	glClear GL_COLOR_BUFFER_BIT;
3122		3683
…		…
3124	glLoadIdentity;	3685	glLoadIdentity;
3125	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;	3686	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3126	glMatrixMode GL_MODELVIEW;	3687	glMatrixMode GL_MODELVIEW;
3127	glLoadIdentity;	3688	glLoadIdentity;
3128		3689
		3690	{
		3691	package CFClient::UI::Base;
		3692
		3693	($draw_x, $draw_y, $draw_w, $draw_h) =
		3694	(0, 0, $self->{w}, $self->{h});
		3695	}
		3696
3129	$self->_draw;	3697	$self->_draw;
3130	}	3698	}
3131		3699
3132	#############################################################################	3700	#############################################################################
3133		3701

Diff Legend

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