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.242 by elmex, Sat May 27 20:00:40 2006 UTC vs.
Revision 1.272 by root, Sat Jun 3 01:47:14 2006 UTC

…		…
17	our $BUTTON_STATE;	17	our $BUTTON_STATE;
18		18
19	our %WIDGET; # all widgets, weak-referenced	19	our %WIDGET; # all widgets, weak-referenced
20		20
21	sub get_layout {	21	sub get_layout {
		22	my $layout;
		23
22	for (grep { $_->{name} } values %WIDGET) {	24	for (grep { $_->{name} } values %WIDGET) {
23	$LAYOUT->{$_->{name}} = {	25	my $win = $layout->{$_->{name}} = { };
24	x => $_->{x} / $::WIDTH,
25	y => $_->{y} / $::HEIGHT,
26	w => $_->{w} / $::WIDTH,
27	h => $_->{h} / $::HEIGHT
28	};	26
29	}	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};
30		31
31	return $LAYOUT;	32	$win->{show} = $_->{visible} && $_->{is_toplevel};
		33	}
		34
		35	$layout
32	}	36	}
33		37
34	sub set_layout {	38	sub set_layout {
35	my ($layout) = @_;	39	my ($layout) = @_;
		40
36	$LAYOUT = $layout;	41	$LAYOUT = $layout;
37	}	42	}
38		43
39	sub check_tooltip {	44	sub check_tooltip {
		45	return if $ENV{CFPLUS_DEBUG} & 8;
		46
40	if (!$GRAB) {	47	if (!$GRAB) {
41	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {	48	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
42	if (length $widget->{tooltip}) {	49	if (length $widget->{tooltip}) {
43
44	if ($TOOLTIP->{owner} != $widget) {	50	if ($TOOLTIP->{owner} != $widget) {
		51	$TOOLTIP->hide;
		52
45	$TOOLTIP->{owner} = $widget;	53	$TOOLTIP->{owner} = $widget;
46		54
47	my $tip = $widget->{tooltip};	55	my $tip = $widget->{tooltip};
48		56
49	$tip = $tip->($widget) if CODE:: eq ref $tip;	57	$tip = $tip->($widget) if CODE:: eq ref $tip;
50		58
51	$TOOLTIP->set_tooltip_from ($widget);	59	$TOOLTIP->set_tooltip_from ($widget);
52	$TOOLTIP->show;	60	$TOOLTIP->show;
53
54	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
55
56	($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0)
57	if $x + $TOOLTIP->{w} > $::WIDTH;
58
59	$TOOLTIP->move ($x, $y);
60	$TOOLTIP->check_size;
61	$TOOLTIP->update;
62	}	61	}
63		62
64	return;	63	return;
65	}	64	}
66	}	65	}
…		…
172	sub rescale_widgets {	171	sub rescale_widgets {
173	my ($sx, $sy) = @_;	172	my ($sx, $sy) = @_;
174		173
175	for my $widget (values %WIDGET) {	174	for my $widget (values %WIDGET) {
176	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
177	$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.]+$/;
178	$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};
179	$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};
180	$widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w};
181	$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.]+$/;
182	$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};
183	$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};
184	$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
185	}	189	}
186	}	190	}
187		191
188	reconfigure_widgets;	192	reconfigure_widgets;
189	}	193	}
…		…
198		202
199	sub new {	203	sub new {
200	my $class = shift;	204	my $class = shift;
201		205
202	my $self = bless {	206	my $self = bless {
203	x => 0,	207	x => "center",
204	y => 0,	208	y => "center",
205	z => 0,	209	z => 0,
		210	w => undef,
		211	h => undef,
206	can_events => 1,	212	can_events => 1,
207	@_	213	@_
208	}, $class;	214	}, $class;
209		215
		216	Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
		217
210	for (keys %$self) {	218	for (keys %$self) {
211	if (/^connect_(.*)$/) {	219	if (/^on_(.*)$/) {
212	$self->connect ($1 => delete $self->{$_});	220	$self->connect ($1 => delete $self->{$_});
213	}	221	}
214	}	222	}
215		223
216	Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
217
218	if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {	224	if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {
219	$self->{user_x} = $layout->{x} * $::WIDTH;	225	$self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x};
220	$self->{user_y} = $layout->{y} * $::HEIGHT;	226	$self->{y} = $layout->{y} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{y};
221	$self->{user_w} = ($layout->{w} != 0 ? $layout->{w} : 1) * $::WIDTH;	227	$self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{w};
222	$self->{user_h} = ($layout->{h} != 0 ? $layout->{h} : 1) * $::HEIGHT;	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};
223	}	234	}
224		235
225	$self	236	$self
226	}	237	}
227		238
…		…
232	%$self = ();	243	%$self = ();
233	}	244	}
234		245
235	sub show {	246	sub show {
236	my ($self) = @_;	247	my ($self) = @_;
		248
237	return if $self->{parent};	249	return if $self->{parent};
238		250
239	$CFClient::UI::ROOT->add ($self);	251	$CFClient::UI::ROOT->add ($self);
240	}	252	}
241		253
242	sub show_centered {	254	sub set_visible {
243	my ($self) = @_;	255	my ($self) = @_;
		256
244	return if $self->{parent};	257	return if $self->{visible};
245		258
246	$self->show;	259	$self->{root} = $self->{parent}{root};
		260	$self->{visible} = $self->{parent}{visible} + 1;
247		261
248	$CFClient::UI::ROOT->on_post_alloc (	262	$self->emit (visibility_change => 1);
249	"centered $self" => sub {	263
250	$self->move (($::WIDTH - $self->{w}) * 0.5, ($::HEIGHT - $self->{h}) * 0.5);	264	$self->realloc if !exists $self->{req_w};
251	},	265
252	);	266	$_->set_visible for $self->children;
253	}	267	}
254		268
255	sub set_invisible {	269	sub set_invisible {
256	my ($self) = @_;	270	my ($self) = @_;
257		271
258	# broken show/hide model	272	return unless $self->{visible};
		273
		274	$_->set_invisible for $self->children;
259		275
260	delete $self->{root};	276	delete $self->{root};
261	delete $self->{visible};	277	delete $self->{visible};
262		278
263	undef $GRAB if $GRAB == $self;	279	undef $GRAB if $GRAB == $self;
264	undef $HOVER if $HOVER == $self;	280	undef $HOVER if $HOVER == $self;
265		281
266	CFClient::UI::check_tooltip	282	CFClient::UI::check_tooltip
267	if $CFClient::UI::TOOLTIP->{owner} == $self;	283	if $TOOLTIP->{owner} == $self;
268		284
269	$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;
270	}	305	}
271		306
272	sub hide {	307	sub hide {
273	my ($self) = @_;	308	my ($self) = @_;
274		309
…		…
276		311
277	$self->{parent}->remove ($self)	312	$self->{parent}->remove ($self)
278	if $self->{parent};	313	if $self->{parent};
279	}	314	}
280		315
281	sub move {	316	sub move_abs {
282	my ($self, $x, $y, $z) = @_;	317	my ($self, $x, $y, $z) = @_;
283		318
284	$self->{x} = int $x;	319	$self->{x} = List::Util::max 0, int $x;
285	$self->{y} = int $y;	320	$self->{y} = List::Util::max 0, int $y;
286	$self->{z} = $z if defined $z;	321	$self->{z} = $z if defined $z;
287		322
288	$self->update;	323	$self->update;
289	}	324	}
290		325
291	sub set_size {	326	sub set_size {
292	my ($self, $w, $h) = @_;	327	my ($self, $w, $h) = @_;
293		328
294	$self->{user_w} = $w;	329	$self->{force_w} = $w;
295	$self->{user_h} = $h;	330	$self->{force_h} = $h;
296		331
297	$self->check_size;	332	$self->realloc;
298	}	333	}
299		334
300	sub size_request {	335	sub size_request {
301	require Carp;	336	require Carp;
302	Carp::confess "size_request is abstract";	337	Carp::confess "size_request is abstract";
…		…
304		339
305	sub configure {	340	sub configure {
306	my ($self, $x, $y, $w, $h) = @_;	341	my ($self, $x, $y, $w, $h) = @_;
307		342
308	if ($self->{aspect}) {	343	if ($self->{aspect}) {
		344	my ($ow, $oh) = ($w, $h);
		345
309	my $w2 = List::Util::min $w, int $h * $self->{aspect};	346	$w = List::Util::min $w, int $h * $self->{aspect};
310	my $h2 = List::Util::min $h, int $w / $self->{aspect};	347	$h = List::Util::min $h, int $w / $self->{aspect};
311		348
312	# use alignment to adjust x, y	349	# use alignment to adjust x, y
313		350
314	$x += int +($w - $w2) * 0.5;	351	$x += int 0.5 * ($ow - $w);
315	$y += int +($h - $h2) * 0.5;	352	$y += int 0.5 * ($oh - $h);
316
317	($w, $h) = ($w2, $h2);
318	}	353	}
319		354
320	if ($self->{x} != $x || $self->{y} != $y) {	355	if ($self->{x} ne $x || $self->{y} ne $y) {
321	$self->{x} = $x;	356	$self->{x} = $x;
322	$self->{y} = $y;	357	$self->{y} = $y;
323	$self->update;	358	$self->update;
324	}	359	}
325		360
326	if ($self->{w} != $w || $self->{h} != $h) {	361	if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
327	$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;
328	}	368	}
329	}	369	}
330		370
331	sub size_allocate {	371	sub size_allocate {
332	# nothing to be done	372	# nothing to be done
333	}	373	}
334		374
335	sub reconfigure {
336	my ($self) = @_;
337
338	$self->check_size (1);
339	$self->update;
340	}
341
342	sub children {	375	sub children {
		376	# nop
		377	}
		378
		379	sub visible_children {
		380	$_[0]->children
343	}	381	}
344		382
345	sub set_max_size {	383	sub set_max_size {
346	my ($self, $w, $h) = @_;	384	my ($self, $w, $h) = @_;
347		385
…		…
406		444
407	$::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
408	unless $FOCUS;	446	unless $FOCUS;
409	}	447	}
410		448
411	sub mouse_motion { }	449	sub mouse_motion { 0 }
412	sub button_up { }	450	sub button_up { 0 }
413	sub key_down { }	451	sub key_down { 0 }
414	sub key_up { }	452	sub key_up { 0 }
415		453
416	sub button_down {	454	sub button_down {
417	my ($self, $ev, $x, $y) = @_;	455	my ($self, $ev, $x, $y) = @_;
418		456
419	$self->focus_in;	457	$self->focus_in;
420	}
421		458
422	sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }	459	0
423	sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }	460	}
424	sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }	461
425	sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }	462	sub find_widget {
426	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
427		535
428	sub draw {	536	sub draw {
429	my ($self) = @_;	537	my ($self) = @_;
430		538
431	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);
432		550
433	glPushMatrix;	551	glPushMatrix;
434	glTranslate $self->{x}, $self->{y}, 0;	552	glTranslate $self->{x}, $self->{y}, 0;
435	$self->_draw;	553	$self->_draw;
436	glPopMatrix;	554	glPopMatrix;
…		…
448	glVertex $x , $y + $self->{h};	566	glVertex $x , $y + $self->{h};
449	glEnd;	567	glEnd;
450	glDisable GL_BLEND;	568	glDisable GL_BLEND;
451	}	569	}
452		570
453	if ($ENV{PCLIENT_DEBUG}) {	571	if ($ENV{CFPLUS_DEBUG} & 1) {
454	glPushMatrix;	572	glPushMatrix;
455	glColor 1, 1, 0, 1;	573	glColor 1, 1, 0, 1;
456	glTranslate $self->{x} + 0.375, $self->{y} + 0.375;	574	glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
457	glBegin GL_LINE_LOOP;	575	glBegin GL_LINE_LOOP;
458	glVertex 0 , 0;	576	glVertex 0 , 0;
…		…
469	my ($self) = @_;	587	my ($self) = @_;
470		588
471	warn "no draw defined for $self\n";	589	warn "no draw defined for $self\n";
472	}	590	}
473		591
474	sub find_widget {
475	my ($self, $x, $y) = @_;
476
477	return () unless $self->{can_events};
478
479	return $self
480	if $x >= $self->{x} && $x < $self->{x} + $self->{w}
481	&& $y >= $self->{y} && $y < $self->{y} + $self->{h};
482
483	()
484	}
485
486	sub set_parent {
487	my ($self, $parent) = @_;
488
489	Scalar::Util::weaken ($self->{parent} = $parent);
490
491	$self->{root} = $parent->{root};
492	$self->{visible} = $parent->{visible} + 1;
493
494	# TODO: req_w _does_change after ->reconfigure
495	$self->check_size
496	unless exists $self->{req_w};
497
498	$self->show;
499	}
500
501	sub check_size {
502	my ($self, $forced) = @_;
503
504	$self->{force_alloc} = 1 if $forced;
505	$CFClient::UI::ROOT->{check_size}{$self} = $self;
506	}
507
508	sub update {
509	my ($self) = @_;
510
511	$self->{parent}->update
512	if $self->{parent};
513	}
514
515	sub connect {
516	my ($self, $signal, $cb) = @_;
517
518	push @{ $self->{signal_cb}{$signal} }, $cb;
519	}
520
521	sub _emit {
522	my ($self, $signal, @args) = @_;
523
524	List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
525	}
526
527	sub emit {
528	my ($self, $signal, @args) = @_;
529
530	$self->_emit ($signal, @args)
531	|| $self->$signal (@args);
532	}
533
534	sub DESTROY {	592	sub DESTROY {
535	my ($self) = @_;	593	my ($self) = @_;
536		594
537	delete $WIDGET{$self+0};	595	delete $WIDGET{$self+0};
538	#$self->deactivate;	596	#$self->deactivate;
…		…
594	my ($class, %arg) = @_;	652	my ($class, %arg) = @_;
595	$class->SUPER::new (can_events => 0, %arg);	653	$class->SUPER::new (can_events => 0, %arg);
596	}	654	}
597		655
598	sub size_request {	656	sub size_request {
599	(0, 0)	657	my ($self) = @_;
		658
		659	($self->{w} + 0, $self->{h} + 0)
600	}	660	}
601		661
602	sub draw { }	662	sub draw { }
603		663
604	#############################################################################	664	#############################################################################
…		…
608	our @ISA = CFClient::UI::Base::;	668	our @ISA = CFClient::UI::Base::;
609		669
610	sub new {	670	sub new {
611	my ($class, %arg) = @_;	671	my ($class, %arg) = @_;
612		672
613	my $children = delete $arg{children} || [];	673	my $children = delete $arg{children};
614		674
615	my $self = $class->SUPER::new (	675	my $self = $class->SUPER::new (
616	children => [],	676	children => [],
617	can_events => 0,	677	can_events => 0,
618	%arg,	678	%arg,
619	);	679	);
		680
620	$self->add ($_) for @$children;	681	$self->add (@$children)
		682	if $children;
621		683
622	$self	684	$self
623	}	685	}
624		686
625	sub add {	687	sub add {
…		…
633	$self->{children} = [	695	$self->{children} = [
634	sort { $a->{z} <=> $b->{z} }	696	sort { $a->{z} <=> $b->{z} }
635	@{$self->{children}}, @widgets	697	@{$self->{children}}, @widgets
636	];	698	];
637		699
638	$self->check_size (1);	700	$self->realloc;
639	$self->update;
640	}	701	}
641		702
642	sub children {	703	sub children {
643	@{ $_[0]{children} }	704	@{ $_[0]{children} }
644	}	705	}
…		…
649	delete $child->{parent};	710	delete $child->{parent};
650	$child->hide;	711	$child->hide;
651		712
652	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];	713	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
653		714
654	$self->check_size (1);	715	$self->realloc;
655	$self->update;
656	}	716	}
657		717
658	sub clear {	718	sub clear {
659	my ($self) = @_;	719	my ($self) = @_;
660		720
…		…
664	for (@$children) {	724	for (@$children) {
665	delete $_->{parent};	725	delete $_->{parent};
666	$_->hide;	726	$_->hide;
667	}	727	}
668		728
669	$self->check_size;	729	$self->realloc;
670	$self->update;
671	}	730	}
672		731
673	sub find_widget {	732	sub find_widget {
674	my ($self, $x, $y) = @_;	733	my ($self, $x, $y) = @_;
675		734
676	$x -= $self->{x};	735	$x -= $self->{x};
677	$y -= $self->{y};	736	$y -= $self->{y};
678		737
679	my $res;	738	my $res;
680		739
681	for (reverse @{ $self->{children} }) {	740	for (reverse $self->visible_children) {
682	$res = $_->find_widget ($x, $y)	741	$res = $_->find_widget ($x, $y)
683	and return $res;	742	and return $res;
684	}	743	}
685		744
686	$self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})	745	$self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
…		…
762	$self->SUPER::size_allocate ($w, $h);	821	$self->SUPER::size_allocate ($w, $h);
763	$self->update;	822	$self->update;
764	}	823	}
765		824
766	sub _render {	825	sub _render {
		826	my ($self) = @_;
		827
767	$_[0]{children}[0]->draw;	828	$self->{children}[0]->draw;
768	}	829	}
769		830
770	sub render_child {	831	sub render_child {
771	my ($self) = @_;	832	my ($self) = @_;
772		833
773	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {	834	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
774	glClearColor 0, 0, 0, 0;	835	glClearColor 0, 0, 0, 0;
775	glClear GL_COLOR_BUFFER_BIT;	836	glClear GL_COLOR_BUFFER_BIT;
776		837
		838	{
		839	package CFClient::UI::Base;
		840
		841	($draw_x, $draw_y, $draw_w, $draw_h) =
		842	(0, 0, $self->{w}, $self->{h});
		843	}
		844
777	$self->_render;	845	$self->_render;
778	};	846	};
779	}	847	}
780		848
781	sub _draw {	849	sub _draw {
782	my ($self) = @_;	850	my ($self) = @_;
783		851
784	my ($w, $h) = ($self->w, $self->h);	852	my ($w, $h) = @$self{qw(w h)};
785		853
786	my $tex = $self->{texture}	854	my $tex = $self->{texture}
787	or return;	855	or return;
788		856
789	glEnable GL_TEXTURE_2D;	857	glEnable GL_TEXTURE_2D;
…		…
812	}	880	}
813		881
814	sub size_request {	882	sub size_request {
815	my ($self) = @_;	883	my ($self) = @_;
816		884
817	@$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};	885	my ($w, $h) = @{$self->child}{qw(req_w req_h)};
818		886
819	@$self{qw(child_w child_h)}	887	$w = 10 if $self->{scroll_x};
		888	$h = 10 if $self->{scroll_y};
		889
		890	($w, $h)
820	}	891	}
821		892
822	sub size_allocate {	893	sub size_allocate {
823	my ($self, $w, $h) = @_;	894	my ($self, $w, $h) = @_;
824		895
		896	my $child = $self->child;
		897
825	$w = $self->{child_w} if $self->{scroll_x} && $self->{child_w};	898	$w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
826	$h = $self->{child_h} if $self->{scroll_y} && $self->{child_h};	899	$h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
827		900
828	$self->child->configure (0, 0, $w, $h);	901	$self->child->configure (0, 0, $w, $h);
829	$self->update;	902	$self->update;
830	}	903	}
831		904
…		…
867	}	940	}
868		941
869	sub _render {	942	sub _render {
870	my ($self) = @_;	943	my ($self) = @_;
871		944
		945	local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};
		946	local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y};
		947
872	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};	948	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
873		949
874	$self->SUPER::_render;	950	$self->SUPER::_render;
875	}	951	}
876		952
…		…
884	my $class = shift;	960	my $class = shift;
885		961
886	my $self;	962	my $self;
887		963
888	my $slider = new CFClient::UI::Slider	964	my $slider = new CFClient::UI::Slider
889	vertical => 1,	965	vertical => 1,
890	range => [0, 0, 1, 0.01], # HACK fix	966	range => [0, 0, 1, 0.01], # HACK fix
891	connect_changed => sub {	967	on_changed => sub {
892	$self->{vp}->set_offset (0, $_[1]);	968	$self->{vp}->set_offset (0, $_[1]);
893	},	969	},
894	;	970	;
895		971
896	$self = $class->SUPER::new (	972	$self = $class->SUPER::new (
…		…
974		1050
975	our @ISA = CFClient::UI::Bin::;	1051	our @ISA = CFClient::UI::Bin::;
976		1052
977	use CFClient::OpenGL;	1053	use CFClient::OpenGL;
978		1054
979	my @tex =	1055	my $bg =
		1056	new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
		1057	mipmap => 1, wrap => 1;
		1058
		1059	my @border =
980	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	1060	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
981	qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);	1061	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
982		1062
983	sub new {	1063	sub new {
984	my $class = shift;	1064	my ($class, %arg) = @_;
985		1065
986	# TODO: user_x, user_y, overwrite moveto?	1066	my $title = delete $arg{title};
987		1067
988	my $self = $class->SUPER::new (	1068	my $self = $class->SUPER::new (
989	bg => [1, 1, 1, 1],	1069	bg => [1, 1, 1, 1],
990	border_bg => [1, 1, 1, 1],	1070	border_bg => [1, 1, 1, 1],
991	border => 0.6,	1071	border => 0.6,
992	is_toplevel => 1,
993	can_events => 1,	1072	can_events => 1,
994	@_	1073	min_w => 16,
		1074	min_h => 16,
		1075	%arg,
995	);	1076	);
996		1077
997	$self->{title} &&= new CFClient::UI::Label	1078	$self->{title} = new CFClient::UI::Label
998	align => 0,	1079	align => 0,
999	valign => 1,	1080	valign => 1,
1000	text => $self->{title},	1081	text => $title,
1001	fontsize => $self->{border};	1082	fontsize => $self->{border}
		1083	if defined $title;
1002		1084
1003	$self	1085	$self
		1086	}
		1087
		1088	sub add {
		1089	my ($self, @widgets) = @_;
		1090
		1091	$self->SUPER::add (@widgets);
		1092	$self->CFClient::UI::Container::add ($self->{title}) if $self->{title};
1004	}	1093	}
1005		1094
1006	sub border {	1095	sub border {
1007	int $_[0]{border} * $::FONTSIZE	1096	int $_[0]{border} * $::FONTSIZE
1008	}	1097	}
1009		1098
1010	sub size_request {	1099	sub size_request {
1011	my ($self) = @_;	1100	my ($self) = @_;
		1101
		1102	$self->{title}->size_request
		1103	if $self->{title};
1012		1104
1013	my ($w, $h) = $self->SUPER::size_request;	1105	my ($w, $h) = $self->SUPER::size_request;
1014		1106
1015	(	1107	(
1016	$w + $self->border * 2,	1108	$w + $self->border * 2,
…		…
1019	}	1111	}
1020		1112
1021	sub size_allocate {	1113	sub size_allocate {
1022	my ($self, $w, $h) = @_;	1114	my ($self, $w, $h) = @_;
1023		1115
		1116	if ($self->{title}) {
		1117	$self->{title}{w} = $w;
		1118	$self->{title}{h} = $h;
		1119	$self->{title}->size_allocate ($w, $h);
		1120	}
		1121
		1122	my $border = $self->border;
		1123
1024	$h -= List::Util::max 0, $self->border * 2;	1124	$h -= List::Util::max 0, $border * 2;
1025	$w -= List::Util::max 0, $self->border * 2;	1125	$w -= List::Util::max 0, $border * 2;
1026		1126
1027	$self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
1028	if $self->{title};
1029
1030	$self->child->configure ($self->border, $self->border, $w, $h);	1127	$self->child->configure ($border, $border, $w, $h);
1031	}	1128	}
1032		1129
1033	sub button_down {	1130	sub button_down {
1034	my ($self, $ev, $x, $y) = @_;	1131	my ($self, $ev, $x, $y) = @_;
1035		1132
…		…
1051	my ($ev, $x, $y) = @_;	1148	my ($ev, $x, $y) = @_;
1052		1149
1053	my $dx = $ev->{x} - $ox;	1150	my $dx = $ev->{x} - $ox;
1054	my $dy = $ev->{y} - $oy;	1151	my $dy = $ev->{y} - $oy;
1055		1152
1056	$self->{user_w} = $bw + $dx * ($mx ? -1 : 1);	1153	$self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1057	$self->{user_h} = $bh + $dy * ($my ? -1 : 1);	1154	$self->{force_h} = $bh + $dy * ($my ? -1 : 1);
		1155
		1156	$self->realloc;
1058	$self->move ($wx + $dx * $mx, $wy + $dy * $my);	1157	$self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1059	$self->check_size;
1060	};	1158	};
1061		1159
1062	} elsif ($lr ^ $td) {	1160	} elsif ($lr ^ $td) {
1063	my ($ox, $oy) = ($ev->{x}, $ev->{y});	1161	my ($ox, $oy) = ($ev->{x}, $ev->{y});
1064	my ($bx, $by) = ($self->{x}, $self->{y});	1162	my ($bx, $by) = ($self->{x}, $self->{y});
…		…
1066	$self->{motion} = sub {	1164	$self->{motion} = sub {
1067	my ($ev, $x, $y) = @_;	1165	my ($ev, $x, $y) = @_;
1068		1166
1069	($x, $y) = ($ev->{x}, $ev->{y});	1167	($x, $y) = ($ev->{x}, $ev->{y});
1070		1168
1071	$self->move ($bx + $x - $ox, $by + $y - $oy);	1169	$self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1072	$self->update;
1073	};	1170	};
		1171	} else {
		1172	return 0;
		1173	}
		1174
1074	}	1175	1
1075	}	1176	}
1076		1177
1077	sub button_up {	1178	sub button_up {
1078	my ($self, $ev, $x, $y) = @_;	1179	my ($self, $ev, $x, $y) = @_;
1079		1180
1080	delete $self->{motion};	1181	!!delete $self->{motion}
1081	}	1182	}
1082		1183
1083	sub mouse_motion {	1184	sub mouse_motion {
1084	my ($self, $ev, $x, $y) = @_;	1185	my ($self, $ev, $x, $y) = @_;
1085		1186
1086	$self->{motion}->($ev, $x, $y) if $self->{motion};	1187	$self->{motion}->($ev, $x, $y) if $self->{motion};
		1188
		1189	!!$self->{motion}
1087	}	1190	}
1088		1191
1089	sub _draw {	1192	sub _draw {
1090	my ($self) = @_;	1193	my ($self) = @_;
1091		1194
		1195	my $child = $self->{children}[0];
		1196
1092	my ($w, $h ) = ($self->{w}, $self->{h});	1197	my ($w, $h ) = ($self->{w}, $self->{h});
1093	my ($cw, $ch) = ($self->child->{w}, $self->child->{h});	1198	my ($cw, $ch) = ($child->{w}, $child->{h});
1094		1199
1095	glEnable GL_TEXTURE_2D;	1200	glEnable GL_TEXTURE_2D;
1096	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	1201	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1097		1202
1098	my $border = $self->border;	1203	my $border = $self->border;
1099		1204
1100	glColor @{ $self->{border_bg} };	1205	glColor @{ $self->{border_bg} };
1101	$tex[1]->draw_quad_alpha (0, 0, $w, $border);	1206	$border[0]->draw_quad_alpha (0, 0, $w, $border);
1102	$tex[3]->draw_quad_alpha (0, $border, $border, $ch);	1207	$border[1]->draw_quad_alpha (0, $border, $border, $ch);
1103	$tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);	1208	$border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1104	$tex[4]->draw_quad_alpha (0, $h - $border, $w, $border);	1209	$border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
1105		1210
1106	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {	1211	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1107	my $bg = $tex[0];	1212	glColor @{ $self->{bg} };
1108		1213
1109	# TODO: repeat texture not scale	1214	# TODO: repeat texture not scale
		1215	# solve this better(?)
1110	my $rep_x = $cw / $bg->{w};	1216	$bg->{s} = $cw / $bg->{w};
1111	my $rep_y = $ch / $bg->{h};	1217	$bg->{t} = $ch / $bg->{h};
1112
1113	glColor @{ $self->{bg} };
1114
1115	$bg->{s} = $rep_x;
1116	$bg->{t} = $rep_y;
1117	$bg->{wrap_mode} = 1;
1118	$bg->draw_quad_alpha ($border, $border, $cw, $ch);	1218	$bg->draw_quad_alpha ($border, $border, $cw, $ch);
1119	}	1219	}
1120		1220
1121	glDisable GL_TEXTURE_2D;	1221	glDisable GL_TEXTURE_2D;
1122		1222
1123	$self->{title}->draw if $self->{title};
1124
1125	$self->child->draw;	1223	$child->draw;
		1224
		1225	if ($self->{title}) {
		1226	glTranslate 0, $border - $self->{h};
		1227	$self->{title}->_draw;
		1228	}
1126	}	1229	}
1127		1230
1128	#############################################################################	1231	#############################################################################
1129		1232
1130	package CFClient::UI::Table;	1233	package CFClient::UI::Table;
…		…
1152	my ($self, $x, $y, $child) = @_;	1255	my ($self, $x, $y, $child) = @_;
1153		1256
1154	$child->set_parent ($self);	1257	$child->set_parent ($self);
1155	$self->{children}[$y][$x] = $child;	1258	$self->{children}[$y][$x] = $child;
1156		1259
1157	$self->check_size (1);	1260	$self->realloc;
1158	}	1261	}
1159		1262
1160	# TODO: move to container class maybe? send children a signal on removal?	1263	# TODO: move to container class maybe? send children a signal on removal?
1161	sub clear {	1264	sub clear {
1162	my ($self) = @_;	1265	my ($self) = @_;
…		…
1167	for (@children) {	1270	for (@children) {
1168	delete $_->{parent};	1271	delete $_->{parent};
1169	$_->hide;	1272	$_->hide;
1170	}	1273	}
1171		1274
1172	$self->check_size (1);	1275	$self->realloc;
1173	$self->update;
1174	}	1276	}
1175		1277
1176	sub get_wh {	1278	sub get_wh {
1177	my ($self) = @_;	1279	my ($self) = @_;
1178		1280
…		…
1274	}	1376	}
1275	}	1377	}
1276		1378
1277	#############################################################################	1379	#############################################################################
1278		1380
1279	package CFClient::UI::HBox;	1381	package CFClient::UI::Box;
1280
1281	# TODO: wrap into common Box base class
1282		1382
1283	our @ISA = CFClient::UI::Container::;	1383	our @ISA = CFClient::UI::Container::;
1284		1384
1285	sub size_request {	1385	sub size_request {
1286	my ($self) = @_;	1386	my ($self) = @_;
1287		1387
1288	my @alloc = map [$_->size_request], @{$self->{children}};	1388	$self->{vertical}
1289		1389	? (
1290	(	1390	(List::Util::max map $_->{req_w}, @{$self->{children}}),
1291	(List::Util::sum map $_->[0], @alloc),	1391	(List::Util::sum map $_->{req_h}, @{$self->{children}}),
1292	(List::Util::max map $_->[1], @alloc),	1392	)
1293	)	1393	: (
		1394	(List::Util::sum map $_->{req_w}, @{$self->{children}}),
		1395	(List::Util::max map $_->{req_h}, @{$self->{children}}),
		1396	)
1294	}	1397	}
1295		1398
1296	sub size_allocate {	1399	sub size_allocate {
1297	my ($self, $w, $h) = @_;	1400	my ($self, $w, $h) = @_;
1298		1401
1299	($h, $w) = ($w, $h);	1402	my $space = $self->{vertical} ? $h : $w;
1300
1301	my $children = $self->{children};	1403	my $children = $self->{children};
1302		1404
1303	my @h = map $_->{req_w}, @$children;	1405	my @req;
1304		1406
1305	my $req_h = List::Util::sum @h;	1407	if ($self->{homogeneous}) {
1306		1408	@req = ($space / (@$children || 1)) x @$children;
1307	if ($req_h > $h) {
1308	# ah well, not enough space
1309	$_ *= $h / $req_h for @h;
1310	} else {	1409	} else {
		1410	@req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;
		1411	my $req = List::Util::sum @req;
		1412
		1413	if ($req > $space) {
		1414	# ah well, not enough space
		1415	$_ *= $space / $req for @req;
		1416	} else {
1311	my $exp = List::Util::sum map $_->{expand}, @$children;	1417	my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1312	$exp ||= 1;
1313		1418
		1419	$space = ($space - $req) / $expand; # remaining space to give away
		1420
		1421	$req[$_] += $space * $children->[$_]{expand}
1314	for (0 .. $#$children) {	1422	for 0 .. $#$children;
1315	my $child = $children->[$_];
1316
1317	my $alloc_h = $h[$_];
1318	$alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1319	$h[$_] = $alloc_h;
1320	}	1423	}
1321	}	1424	}
1322		1425
1323	CFClient::UI::harmonize \@h;	1426	CFClient::UI::harmonize \@req;
1324		1427
1325	my $y = 0;	1428	my $pos = 0;
1326	for (0 .. $#$children) {	1429	for (0 .. $#$children) {
1327	my $child = $children->[$_];
1328	my $h = $h[$_];	1430	my $alloc = $req[$_];
1329	$child->configure ($y, 0, $h, $w);	1431	$children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1330		1432
1331	$y += $h;	1433	$pos += $alloc;
1332	}	1434	}
1333		1435
1334	1	1436	1
1335	}	1437	}
1336		1438
1337	#############################################################################	1439	#############################################################################
1338		1440
		1441	package CFClient::UI::HBox;
		1442
		1443	our @ISA = CFClient::UI::Box::;
		1444
		1445	sub new {
		1446	my $class = shift;
		1447
		1448	$class->SUPER::new (
		1449	vertical => 0,
		1450	@_,
		1451	)
		1452	}
		1453
		1454	#############################################################################
		1455
1339	package CFClient::UI::VBox;	1456	package CFClient::UI::VBox;
1340		1457
1341	# TODO: wrap into common Box base class
1342
1343	our @ISA = CFClient::UI::Container::;	1458	our @ISA = CFClient::UI::Box::;
1344		1459
1345	sub size_request {	1460	sub new {
1346	my ($self) = @_;	1461	my $class = shift;
1347		1462
1348	my @alloc = map [$_->size_request], @{$self->{children}};	1463	$class->SUPER::new (
1349		1464	vertical => 1,
1350	(	1465	@_,
1351	(List::Util::max map $_->[0], @alloc),
1352	(List::Util::sum map $_->[1], @alloc),
1353	)	1466	)
1354	}
1355
1356	sub size_allocate {
1357	my ($self, $w, $h) = @_;
1358
1359	Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1360
1361	my $children = $self->{children};
1362
1363	my @h = map $_->{req_h}, @$children;
1364
1365	my $req_h = List::Util::sum @h;
1366
1367	if ($req_h > $h) {
1368	# ah well, not enough space
1369	$_ *= $h / $req_h for @h;
1370	} else {
1371	my $exp = List::Util::sum map $_->{expand}, @$children;
1372	$exp ||= 1;
1373
1374	for (0 .. $#$children) {
1375	my $child = $children->[$_];
1376
1377	$h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1378	}
1379	}
1380
1381	CFClient::UI::harmonize \@h;
1382
1383	my $y = 0;
1384	for (0 .. $#$children) {
1385	my $child = $children->[$_];
1386	my $h = $h[$_];
1387	$child->configure (0, $y, $w, $h);
1388
1389	$y += $h;
1390	}
1391
1392	1
1393	}	1467	}
1394		1468
1395	#############################################################################	1469	#############################################################################
1396		1470
1397	package CFClient::UI::Label;	1471	package CFClient::UI::Label;
…		…
1414	ellipsise => 3, # end	1488	ellipsise => 3, # end
1415	layout => (new CFClient::Layout),	1489	layout => (new CFClient::Layout),
1416	fontsize => 1,	1490	fontsize => 1,
1417	align => -1,	1491	align => -1,
1418	valign => -1,	1492	valign => -1,
1419	padding => 2,	1493	padding_x => 2,
		1494	padding_y => 2,
1420	can_events => 0,	1495	can_events => 0,
1421	%arg	1496	%arg
1422	);	1497	);
1423		1498
1424	if (exists $self->{template}) {	1499	if (exists $self->{template}) {
…		…
1460	$self->{text} = "T$text";	1535	$self->{text} = "T$text";
1461		1536
1462	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;	1537	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1463	$self->{layout}->set_text ($text);	1538	$self->{layout}->set_text ($text);
1464		1539
		1540	$self->realloc;
1465	$self->update;	1541	$self->update;
1466	$self->check_size;
1467	}	1542	}
1468		1543
1469	sub set_markup {	1544	sub set_markup {
1470	my ($self, $markup) = @_;	1545	my ($self, $markup) = @_;
1471		1546
…		…
1475	my $rgba = $markup =~ /span.*(?:foreground|background)/;	1550	my $rgba = $markup =~ /span.*(?:foreground|background)/;
1476		1551
1477	$self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;	1552	$self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1478	$self->{layout}->set_markup ($markup);	1553	$self->{layout}->set_markup ($markup);
1479		1554
		1555	$self->realloc;
1480	$self->update;	1556	$self->update;
1481	$self->check_size;
1482	}	1557	}
1483		1558
1484	sub size_request {	1559	sub size_request {
1485	my ($self) = @_;	1560	my ($self) = @_;
1486		1561
…		…
1500		1575
1501	$w = List::Util::max $w, $w2;	1576	$w = List::Util::max $w, $w2;
1502	$h = List::Util::max $h, $h2;	1577	$h = List::Util::max $h, $h2;
1503	}	1578	}
1504		1579
1505	(	1580	($w, $h)
1506	$w + $self->{padding} * 2,
1507	$h + $self->{padding} * 2,
1508	)
1509	}	1581	}
1510		1582
1511	sub size_allocate {	1583	sub size_allocate {
1512	my ($self, $w, $h) = @_;	1584	my ($self, $w, $h) = @_;
1513		1585
		1586	delete $self->{ox};
		1587
1514	delete $self->{texture};	1588	delete $self->{texture}
		1589	unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1515	}	1590	}
1516		1591
1517	sub set_fontsize {	1592	sub set_fontsize {
1518	my ($self, $fontsize) = @_;	1593	my ($self, $fontsize) = @_;
1519		1594
1520	$self->{fontsize} = $fontsize;	1595	$self->{fontsize} = $fontsize;
1521	delete $self->{texture};	1596	delete $self->{texture};
1522		1597
1523	$self->update;	1598	$self->realloc;
1524	$self->check_size;
1525	}	1599	}
1526		1600
1527	sub _draw {	1601	sub _draw {
1528	my ($self) = @_;	1602	my ($self) = @_;
1529		1603
…		…
1535	$self->{layout}->set_width ($self->{w});	1609	$self->{layout}->set_width ($self->{w});
1536	$self->{layout}->set_ellipsise ($self->{ellipsise});	1610	$self->{layout}->set_ellipsise ($self->{ellipsise});
1537	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});	1611	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1538	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1612	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1539		1613
1540	my $tex = new_from_layout CFClient::Texture $self->{layout};	1614	new_from_layout CFClient::Texture $self->{layout}
		1615	};
1541		1616
		1617	unless (exists $self->{ox}) {
1542	$self->{ox} = int ($self->{align} < 0 ? $self->{padding}	1618	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1543	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}	1619	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1544	: ($self->{w} - $tex->{w}) * 0.5);	1620	: ($self->{w} - $tex->{w}) * 0.5);
1545		1621
1546	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding}	1622	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1547	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}	1623	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1548	: ($self->{h} - $tex->{h}) * 0.5);	1624	: ($self->{h} - $tex->{h}) * 0.5);
1549
1550	$tex
1551	};	1625	};
1552		1626
1553	glEnable GL_TEXTURE_2D;	1627	glEnable GL_TEXTURE_2D;
1554	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1628	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1555		1629
…		…
1609	sub set_text {	1683	sub set_text {
1610	my ($self, $text) = @_;	1684	my ($self, $text) = @_;
1611		1685
1612	$self->{cursor} = length $text;	1686	$self->{cursor} = length $text;
1613	$self->_set_text ($text);	1687	$self->_set_text ($text);
1614	$self->update;	1688
1615	$self->check_size;	1689	$self->realloc;
1616	}	1690	}
1617		1691
1618	sub get_text {	1692	sub get_text {
1619	$_[0]{text}	1693	$_[0]{text}
1620	}	1694	}
…		…
1650	$self->{cursor} = length $text;	1724	$self->{cursor} = length $text;
1651	} elsif ($uni == 27) {	1725	} elsif ($uni == 27) {
1652	$self->_emit ('escape');	1726	$self->_emit ('escape');
1653	} elsif ($uni) {	1727	} elsif ($uni) {
1654	substr $text, $self->{cursor}++, 0, chr $uni;	1728	substr $text, $self->{cursor}++, 0, chr $uni;
		1729	} else {
		1730	return 0;
1655	}	1731	}
1656		1732
1657	$self->_set_text ($text);	1733	$self->_set_text ($text);
1658	$self->update;	1734
1659	$self->check_size;	1735	$self->realloc;
		1736
		1737	1
1660	}	1738	}
1661		1739
1662	sub focus_in {	1740	sub focus_in {
1663	my ($self) = @_;	1741	my ($self) = @_;
1664		1742
…		…
1679	utf8::encode $text;	1757	utf8::encode $text;
1680	$self->{cursor} = length substr $text, 0, $idx;	1758	$self->{cursor} = length substr $text, 0, $idx;
1681		1759
1682	$self->_set_text ($self->{text});	1760	$self->_set_text ($self->{text});
1683	$self->update;	1761	$self->update;
		1762
		1763	1
1684	}	1764	}
1685		1765
1686	sub mouse_motion {	1766	sub mouse_motion {
1687	my ($self, $ev, $x, $y) = @_;	1767	my ($self, $ev, $x, $y) = @_;
1688	# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#	1768	# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
		1769
		1770	0
1689	}	1771	}
1690		1772
1691	sub _draw {	1773	sub _draw {
1692	my ($self) = @_;	1774	my ($self) = @_;
1693		1775
…		…
1770	} else {	1852	} else {
1771	$self->set_text ($self->{history_saveback});	1853	$self->set_text ($self->{history_saveback});
1772	}	1854	}
1773		1855
1774	} else {	1856	} else {
1775	$self->SUPER::key_down ($ev);	1857	return $self->SUPER::key_down ($ev)
		1858	}
		1859
1776	}	1860	1
1777
1778	}	1861	}
1779		1862
1780	#############################################################################	1863	#############################################################################
1781		1864
1782	package CFClient::UI::Button;	1865	package CFClient::UI::Button;
…		…
1791		1874
1792	sub new {	1875	sub new {
1793	my $class = shift;	1876	my $class = shift;
1794		1877
1795	$class->SUPER::new (	1878	$class->SUPER::new (
1796	padding => 4,	1879	padding_x => 4,
		1880	padding_y => 4,
1797	fg => [1, 1, 1],	1881	fg => [1, 1, 1],
1798	active_fg => [0, 0, 1],	1882	active_fg => [0, 0, 1],
1799	can_hover => 1,	1883	can_hover => 1,
1800	align => 0,	1884	align => 0,
1801	valign => 0,	1885	valign => 0,
…		…
1810	my ($self, $ev, $x, $y) = @_;	1894	my ($self, $ev, $x, $y) = @_;
1811		1895
1812	$self->emit ("activate")	1896	$self->emit ("activate")
1813	if $x >= 0 && $x < $self->{w}	1897	if $x >= 0 && $x < $self->{w}
1814	&& $y >= 0 && $y < $self->{h};	1898	&& $y >= 0 && $y < $self->{h};
		1899
		1900	1
1815	}	1901	}
1816		1902
1817	sub _draw {	1903	sub _draw {
1818	my ($self) = @_;	1904	my ($self) = @_;
1819		1905
…		…
1848		1934
1849	sub new {	1935	sub new {
1850	my $class = shift;	1936	my $class = shift;
1851		1937
1852	$class->SUPER::new (	1938	$class->SUPER::new (
1853	padding => 2,	1939	padding_x => 2,
		1940	padding_y => 2,
1854	fg => [1, 1, 1],	1941	fg => [1, 1, 1],
1855	active_fg => [1, 1, 0],	1942	active_fg => [1, 1, 0],
1856	bg => [0, 0, 0, 0.2],	1943	bg => [0, 0, 0, 0.2],
1857	active_bg => [1, 1, 1, 0.5],	1944	active_bg => [1, 1, 1, 0.5],
1858	state => 0,	1945	state => 0,
…		…
1862	}	1949	}
1863		1950
1864	sub size_request {	1951	sub size_request {
1865	my ($self) = @_;	1952	my ($self) = @_;
1866		1953
1867	($self->{padding} * 2 + 6) x 2	1954	(6) x 2
1868	}	1955	}
1869		1956
1870	sub button_down {	1957	sub button_down {
1871	my ($self, $ev, $x, $y) = @_;	1958	my ($self, $ev, $x, $y) = @_;
1872		1959
1873	if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}	1960	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1874	&& $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {	1961	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1875	$self->{state} = !$self->{state};	1962	$self->{state} = !$self->{state};
1876	$self->_emit (changed => $self->{state});	1963	$self->_emit (changed => $self->{state});
		1964	} else {
		1965	return 0
		1966	}
		1967
1877	}	1968	1
1878	}	1969	}
1879		1970
1880	sub _draw {	1971	sub _draw {
1881	my ($self) = @_;	1972	my ($self) = @_;
1882		1973
1883	$self->SUPER::_draw;	1974	$self->SUPER::_draw;
1884		1975
1885	glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0;	1976	glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1886		1977
1887	my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;	1978	my ($w, $h) = @$self{qw(w h)};
		1979
		1980	my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1888		1981
1889	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };	1982	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1890		1983
1891	my $tex = $self->{state} ? $tex[1] : $tex[0];	1984	my $tex = $self->{state} ? $tex[1] : $tex[0];
1892		1985
…		…
2157	fg => [1, 1, 1],	2250	fg => [1, 1, 1],
2158	active_fg => [0, 0, 0],	2251	active_fg => [0, 0, 0],
2159	bg => [0, 0, 0, 0.2],	2252	bg => [0, 0, 0, 0.2],
2160	active_bg => [1, 1, 1, 0.5],	2253	active_bg => [1, 1, 1, 0.5],
2161	range => [0, 0, 100, 10, 0],	2254	range => [0, 0, 100, 10, 0],
2162	req_w => $::WIDTH / 80,	2255	min_w => $::WIDTH / 80,
2163	req_h => $::WIDTH / 80,	2256	min_h => $::WIDTH / 80,
2164	vertical => 0,	2257	vertical => 0,
2165	can_hover => 1,	2258	can_hover => 1,
2166	inner_pad => 0.02,	2259	inner_pad => 0.02,
2167	@_	2260	@_
2168	);	2261	);
…		…
2171	$self->update;	2264	$self->update;
2172		2265
2173	$self	2266	$self
2174	}	2267	}
2175		2268
		2269	sub changed { }
		2270
2176	sub set_range {	2271	sub set_range {
2177	my ($self, $range) = @_;	2272	my ($self, $range) = @_;
2178		2273
2179	($range, $self->{range}) = ($self->{range}, $range);	2274	($range, $self->{range}) = ($self->{range}, $range);
2180		2275
…		…
2206	}	2301	}
2207		2302
2208	sub size_request {	2303	sub size_request {
2209	my ($self) = @_;	2304	my ($self) = @_;
2210		2305
2211	my $w = $self->{req_w};	2306	($self->{req_w}, $self->{req_h})
2212	my $h = $self->{req_h};
2213
2214	$self->{vertical} ? ($h, $w) : ($w, $h)
2215	}	2307	}
2216		2308
2217	sub button_down {	2309	sub button_down {
2218	my ($self, $ev, $x, $y) = @_;	2310	my ($self, $ev, $x, $y) = @_;
2219		2311
2220	$self->SUPER::button_down ($ev, $x, $y);	2312	$self->SUPER::button_down ($ev, $x, $y);
2221		2313
2222	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];	2314	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2223		2315
2224	$self->mouse_motion ($ev, $x, $y);	2316	$self->mouse_motion ($ev, $x, $y)
2225	}	2317	}
2226		2318
2227	sub mouse_motion {	2319	sub mouse_motion {
2228	my ($self, $ev, $x, $y) = @_;	2320	my ($self, $ev, $x, $y) = @_;
2229		2321
…		…
2233	my (undef, $lo, $hi, $page) = @{$self->{range}};	2325	my (undef, $lo, $hi, $page) = @{$self->{range}};
2234		2326
2235	$x = ($x - $self->{click}[1]) / ($w * $self->{scale});	2327	$x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2236		2328
2237	$self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));	2329	$self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
		2330	} else {
		2331	return 0;
		2332	}
		2333
2238	}	2334	1
2239	}	2335	}
2240		2336
2241	sub update {	2337	sub update {
2242	my ($self) = @_;	2338	my ($self) = @_;
2243		2339
…		…
2570		2666
2571	sub new {	2667	sub new {
2572	my $class = shift;	2668	my $class = shift;
2573		2669
2574	my $self = $class->SUPER::new (	2670	my $self = $class->SUPER::new (
2575	state => 0,	2671	state => 0,
2576	connect_activate => \&toggle_flopper,	2672	on_activate => \&toggle_flopper,
2577	@_	2673	@_
2578	);	2674	);
2579		2675
2580	if ($self->{state}) {
2581	$self->{state} = 0;
2582	$self->toggle_flopper;
2583	}
2584
2585	$self	2676	$self
2586	}	2677	}
2587		2678
2588	sub toggle_flopper {	2679	sub toggle_flopper {
2589	my ($self) = @_;	2680	my ($self) = @_;
2590		2681
2591	# TODO: use animation	2682	$self->{other}->toggle_visibility;
2592	if ($self->{state} = !$self->{state}) {
2593	$CFClient::UI::ROOT->add ($self->{other});
2594	$self->{other}->move ($self->coord2global (0, $self->{h}));
2595	$self->_emit ("open");
2596	} else {
2597	$CFClient::UI::ROOT->remove ($self->{other});
2598	$self->_emit ("close");
2599	}
2600
2601	$self->_emit (changed => $self->{state});
2602	}	2683	}
2603		2684
2604	#############################################################################	2685	#############################################################################
2605		2686
2606	package CFClient::UI::Tooltip;	2687	package CFClient::UI::Tooltip;
…		…
2619	}	2700	}
2620		2701
2621	sub set_tooltip_from {	2702	sub set_tooltip_from {
2622	my ($self, $widget) = @_;	2703	my ($self, $widget) = @_;
2623		2704
		2705	my $tooltip = $widget->{tooltip};
		2706
		2707	if ($ENV{CFPLUS_DEBUG} & 2) {
		2708	$tooltip .= "\n\n" . (ref $widget) . "\n"
		2709	. "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
		2710	. "req $widget->{req_w} $widget->{req_h}\n"
		2711	. "visible $widget->{visible}";
		2712	}
		2713
2624	$self->add (new CFClient::UI::Label	2714	$self->add (new CFClient::UI::Label
2625	markup => $widget->{tooltip},	2715	markup => $tooltip,
2626	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	2716	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2627	fontsize => 0.8,	2717	fontsize => 0.8,
2628	fg => [0, 0, 0, 1],	2718	fg => [0, 0, 0, 1],
2629	ellipsise => 0,	2719	ellipsise => 0,
2630	font => ($widget->{tooltip_font} || $::FONT_PROP),	2720	font => ($widget->{tooltip_font} || $::FONT_PROP),
…		…
2641		2731
2642	sub size_allocate {	2732	sub size_allocate {
2643	my ($self, $w, $h) = @_;	2733	my ($self, $w, $h) = @_;
2644		2734
2645	$self->SUPER::size_allocate ($w - 4, $h - 4);	2735	$self->SUPER::size_allocate ($w - 4, $h - 4);
		2736	}
		2737
		2738	sub visibility_change {
		2739	my ($self, $visible) = @_;
		2740
		2741	return unless $visible;
		2742
		2743	$self->{root}->on_post_alloc ("move_$self" => sub {
		2744	my $widget = $self->{owner}
		2745	or return;
		2746
		2747	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
		2748
		2749	($x, $y) = $widget->coord2global (-$self->{w}, 0)
		2750	if $x + $self->{w} > $::WIDTH;
		2751
		2752	$self->move_abs ($x, $y);
		2753	});
2646	}	2754	}
2647		2755
2648	sub _draw {	2756	sub _draw {
2649	my ($self) = @_;	2757	my ($self) = @_;
2650		2758
…		…
2667	glVertex $w, $h;	2775	glVertex $w, $h;
2668	glVertex $w, 0;	2776	glVertex $w, 0;
2669	glEnd;	2777	glEnd;
2670		2778
2671	glTranslate 2 - 0.375, 2 - 0.375;	2779	glTranslate 2 - 0.375, 2 - 0.375;
		2780
2672	$self->SUPER::_draw;	2781	$self->SUPER::_draw;
2673	}	2782	}
2674		2783
2675	#############################################################################	2784	#############################################################################
2676		2785
…		…
2752	$self->SUPER::DESTROY;	2861	$self->SUPER::DESTROY;
2753	}	2862	}
2754		2863
2755	#############################################################################	2864	#############################################################################
2756		2865
2757	package CFClient::UI::Inventory;	2866	package CFClient::UI::Buttonbar;
2758		2867
2759	our @ISA = CFClient::UI::ScrolledWindow::;	2868	our @ISA = CFClient::UI::HBox::;
2760		2869
2761	sub new {	2870	# TODO: should actualyl wrap buttons and other goodies.
2762	my $class = shift;
2763
2764	my $self = $class->SUPER::new (
2765	scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2766	@_,
2767	);
2768
2769	$self
2770	}
2771
2772	sub set_items {
2773	my ($self, $items) = @_;
2774
2775	$self->{scrolled}->clear;
2776	return unless $items;
2777
2778	my @items = sort {
2779	($a->{type} <=> $b->{type})
2780	or ($a->{name} cmp $b->{name})
2781	} @$items;
2782
2783	$self->{real_items} = \@items;
2784
2785	my $row = 0;
2786	for my $item (@items) {
2787	CFClient::Item::update_widgets $item;
2788
2789	$self->{scrolled}->add (0, $row, $item->{face_widget});
2790	$self->{scrolled}->add (1, $row, $item->{desc_widget});
2791	$self->{scrolled}->add (2, $row, $item->{weight_widget});
2792
2793	$row++;
2794	}
2795	}
2796
2797	sub size_request {
2798	my ($self) = @_;
2799	($self->{req_w}, $self->{req_h});
2800	}
2801		2871
2802	#############################################################################	2872	#############################################################################
2803		2873
2804	package CFClient::UI::Menu;	2874	package CFClient::UI::Menu;
2805		2875
…		…
2846	# maybe save $GRAB? must be careful about events...	2916	# maybe save $GRAB? must be careful about events...
2847	$GRAB = $self;	2917	$GRAB = $self;
2848	$self->{button} = $ev->{button};	2918	$self->{button} = $ev->{button};
2849		2919
2850	$self->show;	2920	$self->show;
2851	$self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);	2921	$self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2852	}	2922	}
2853		2923
2854	sub mouse_motion {	2924	sub mouse_motion {
2855	my ($self, $ev, $x, $y) = @_;	2925	my ($self, $ev, $x, $y) = @_;
2856		2926
2857	# TODO: should use vbox->find_widget or so	2927	# TODO: should use vbox->find_widget or so
2858	$HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});	2928	$HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2859	$self->{hover} = $self->{item}{$HOVER};	2929	$self->{hover} = $self->{item}{$HOVER};
		2930
		2931	0
2860	}	2932	}
2861		2933
2862	sub button_up {	2934	sub button_up {
2863	my ($self, $ev, $x, $y) = @_;	2935	my ($self, $ev, $x, $y) = @_;
2864		2936
…		…
2866	undef $GRAB;	2938	undef $GRAB;
2867	$self->hide;	2939	$self->hide;
2868		2940
2869	$self->_emit ("popdown");	2941	$self->_emit ("popdown");
2870	$self->{hover}[1]->() if $self->{hover};	2942	$self->{hover}[1]->() if $self->{hover};
		2943	} else {
		2944	return 0
		2945	}
		2946
2871	}	2947	1
		2948	}
		2949
		2950	#############################################################################
		2951
		2952	package CFClient::UI::Multiplexer;
		2953
		2954	our @ISA = CFClient::UI::Container::;
		2955
		2956	sub new {
		2957	my $class = shift;
		2958
		2959	my $self = $class->SUPER::new (
		2960	@_,
		2961	);
		2962
		2963	$self->{current} = $self->{children}[0]
		2964	if @{ $self->{children} };
		2965
		2966	$self
		2967	}
		2968
		2969	sub add {
		2970	my ($self, @widgets) = @_;
		2971
		2972	$self->SUPER::add (@widgets);
		2973
		2974	$self->{current} = $self->{children}[0]
		2975	if @{ $self->{children} };
		2976	}
		2977
		2978	sub set_current_page {
		2979	my ($self, $page_or_widget) = @_;
		2980
		2981	my $widget = ref $page_or_widget
		2982	? $page_or_widget
		2983	: $self->{children}[$page_or_widget];
		2984
		2985	$self->{current} = $widget;
		2986	$self->{current}->configure (0, 0, $self->{w}, $self->{h});
		2987
		2988	$self->_emit (page_changed => $self->{current});
		2989
		2990	$self->realloc;
		2991	}
		2992
		2993	sub visible_children {
		2994	$_[0]{current}
		2995	}
		2996
		2997	sub size_request {
		2998	my ($self) = @_;
		2999
		3000	$self->{current}->size_request
		3001	}
		3002
		3003	sub size_allocate {
		3004	my ($self, $w, $h) = @_;
		3005
		3006	$self->{current}->configure (0, 0, $w, $h);
		3007	}
		3008
		3009	sub _draw {
		3010	my ($self) = @_;
		3011
		3012	$self->{current}->draw;
		3013	}
		3014
		3015	#############################################################################
		3016
		3017	package CFClient::UI::Notebook;
		3018
		3019	our @ISA = CFClient::UI::VBox::;
		3020
		3021	sub new {
		3022	my $class = shift;
		3023
		3024	my $self = $class->SUPER::new (
		3025	buttonbar => (new CFClient::UI::Buttonbar),
		3026	multiplexer => (new CFClient::UI::Multiplexer expand => 1),
		3027	@_,
		3028	);
		3029
		3030	$self->SUPER::add ($self->{buttonbar}, $self->{multiplexer});
		3031
		3032	$self
		3033	}
		3034
		3035	sub add {
		3036	my ($self, $title, $widget, $tooltip) = @_;
		3037
		3038	Scalar::Util::weaken $self;
		3039
		3040	$self->{buttonbar}->add (new CFClient::UI::Button
		3041	markup => $title,
		3042	tooltip => $tooltip,
		3043	on_activate => sub { $self->set_current_page ($widget) },
		3044	);
		3045
		3046	$self->{multiplexer}->add ($widget);
		3047	}
		3048
		3049	sub set_current_page {
		3050	my ($self, $page) = @_;
		3051
		3052	$self->{multiplexer}->set_current_page ($page);
		3053	$self->_emit (page_changed => $self->{multiplexer}{current});
2872	}	3054	}
2873		3055
2874	#############################################################################	3056	#############################################################################
2875		3057
2876	package CFClient::UI::Statusbox;	3058	package CFClient::UI::Statusbox;
…		…
2981	$self->SUPER::reconfigure;	3163	$self->SUPER::reconfigure;
2982	}	3164	}
2983		3165
2984	#############################################################################	3166	#############################################################################
2985		3167
2986	package CFClient::UI::Root;	3168	package CFClient::UI::Inventory;
2987		3169
2988	our @ISA = CFClient::UI::Container::;	3170	our @ISA = CFClient::UI::ScrolledWindow::;
2989
2990	use CFClient::OpenGL;
2991		3171
2992	sub new {	3172	sub new {
2993	my $class = shift;	3173	my $class = shift;
2994		3174
2995	$class->SUPER::new (	3175	my $self = $class->SUPER::new (
		3176	scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
		3177	@_,
		3178	);
		3179
		3180	$self
		3181	}
		3182
		3183	sub set_items {
		3184	my ($self, $items) = @_;
		3185
		3186	$self->{scrolled}->clear;
		3187	return unless $items;
		3188
		3189	my @items = sort {
		3190	($a->{type} <=> $b->{type})
		3191	or ($a->{name} cmp $b->{name})
		3192	} @$items;
		3193
		3194	$self->{real_items} = \@items;
		3195
		3196	my $row = 0;
		3197	for my $item (@items) {
		3198	CFClient::Item::update_widgets $item;
		3199
		3200	$self->{scrolled}->add (0, $row, $item->{face_widget});
		3201	$self->{scrolled}->add (1, $row, $item->{desc_widget});
		3202	$self->{scrolled}->add (2, $row, $item->{weight_widget});
		3203
		3204	$row++;
		3205	}
		3206	}
		3207
		3208	#############################################################################
		3209
		3210	package CFClient::UI::BindEditor;
		3211
		3212	our @ISA = CFClient::UI::FancyFrame::;
		3213
		3214	sub new {
		3215	my $class = shift;
		3216
		3217	my $self = $class->SUPER::new (binding => [], commands => [], @_);
		3218
		3219	$self->add (my $vb = new CFClient::UI::VBox);
		3220
		3221
		3222	$vb->add ($self->{rec_btn} = new CFClient::UI::Button
		3223	text => "start recording",
		3224	tooltip => "Start/Stops recording of actions."
		3225	."All subsequent actions after the recording started will be captured."
		3226	."The actions are displayed after the record was stopped."
		3227	."To bind the action you have to click on the 'Bind' button",
		3228	on_activate => sub {
		3229	unless ($self->{recording}) {
		3230	$self->start;
		3231	} else {
		3232	$self->stop;
		3233	}
		3234	});
		3235
		3236	$vb->add (new CFClient::UI::Label text => "Actions:");
		3237	$vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
		3238
		3239	$vb->add (new CFClient::UI::Label text => "Bound to: ");
		3240	$vb->add (my $hb = new CFClient::UI::HBox);
		3241	$hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
		3242	$hb->add (new CFClient::UI::Button
		3243	text => "bind",
		3244	tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
		3245	on_activate => sub {
		3246	$self->ask_for_bind;
		3247	});
		3248
		3249	$vb->add (my $hb = new CFClient::UI::HBox);
		3250	$hb->add (new CFClient::UI::Button
		3251	text => "ok",
		3252	expand => 1,
		3253	tooltip => "This closes the binding editor and saves the binding",
		3254	on_activate => sub {
		3255	$self->hide;
		3256	$self->commit;
		3257	});
		3258
		3259	$hb->add (new CFClient::UI::Button
		3260	text => "cancel",
		3261	expand => 1,
		3262	tooltip => "This closes the binding editor without saving",
		3263	on_activate => sub {
		3264	$self->hide;
		3265	$self->{binding_cancel}->()
		3266	if $self->{binding_cancel};
		3267	});
		3268
		3269	$self->update_binding_widgets;
		3270
		3271	$self
		3272	}
		3273
		3274	sub commit {
		3275	my ($self) = @_;
		3276	my ($mod, $sym, $cmds) = $self->get_binding;
		3277	if ($sym != 0 && @$cmds > 0) {
		3278	$::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
		3279	."'. Don't forget 'Save Config'!");
		3280	$self->{binding_change}->($mod, $sym, $cmds)
		3281	if $self->{binding_change};
		3282	} else {
		3283	$::STATUSBOX->add ("No action bound, no key or action specified!");
		3284	$self->{binding_cancel}->()
		3285	if $self->{binding_cancel};
		3286	}
		3287	}
		3288
		3289	sub start {
		3290	my ($self) = @_;
		3291
		3292	$self->{rec_btn}->set_text ("stop recording");
		3293	$self->{recording} = 1;
		3294	$self->clear_command_list;
		3295	$::CONN->start_record if $::CONN;
		3296	}
		3297
		3298	sub stop {
		3299	my ($self) = @_;
		3300
		3301	$self->{rec_btn}->set_text ("start recording");
		3302	$self->{recording} = 0;
		3303
		3304	my $rec;
		3305	$rec = $::CONN->stop_record if $::CONN;
		3306	return unless ref $rec eq 'ARRAY';
		3307	$self->set_command_list ($rec);
		3308	}
		3309
		3310
		3311	sub ask_for_bind_and_commit {
		3312	my ($self) = @_;
		3313	$self->ask_for_bind (1);
		3314	}
		3315
		3316	sub ask_for_bind {
		3317	my ($self, $commit) = @_;
		3318
		3319	CFClient::Binder::open_binding_dialog (sub {
		3320	my ($mod, $sym) = @_;
		3321	$self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
		3322	$self->update_binding_widgets;
		3323	$self->commit if $commit;
		3324	});
		3325	}
		3326
		3327	# $mod and $sym are the modifiers and key symbol
		3328	# $cmds is a array ref of strings (the commands)
		3329	# $cb is the callback that is executed on OK
		3330	# $ccb is the callback that is executed on CANCEL and
		3331	# when the binding was unsuccessful on OK
		3332	sub set_binding {
		3333	my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
		3334
		3335	$self->clear_command_list;
		3336	$self->{recording} = 0;
		3337	$self->{rec_btn}->set_text ("start recording");
		3338
		3339	$self->{binding} = [$mod, $sym];
		3340	$self->{commands} = $cmds;
		3341
		3342	$self->{binding_change} = $cb;
		3343	$self->{binding_cancel} = $ccb;
		3344
		3345	$self->update_binding_widgets;
		3346	}
		3347
		3348	# this is a shortcut method that asks for a binding
		3349	# and then just binds it.
		3350	sub do_quick_binding {
		3351	my ($self, $cmds) = @_;
		3352	$self->set_binding (undef, undef, $cmds, sub {
		3353	$::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
		3354	});
		3355	$self->ask_for_bind (1);
		3356	}
		3357
		3358	sub update_binding_widgets {
		3359	my ($self) = @_;
		3360	my ($mod, $sym, $cmds) = $self->get_binding;
		3361	$self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
		3362	$self->set_command_list ($cmds);
		3363	}
		3364
		3365	sub get_binding {
		3366	my ($self) = @_;
		3367	return (
		3368	$self->{binding}->[0],
		3369	$self->{binding}->[1],
		3370	[ grep { defined $_ } @{$self->{commands}} ]
		3371	);
		3372	}
		3373
		3374	sub clear_command_list {
		3375	my ($self) = @_;
		3376	$self->{cmdbox}->clear ();
		3377	}
		3378
		3379	sub set_command_list {
		3380	my ($self, $cmds) = @_;
		3381
		3382	$self->{cmdbox}->clear ();
		3383	$self->{commands} = $cmds;
		3384
		3385	my $idx = 0;
		3386
		3387	for (@$cmds) {
		3388	$self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
		3389
		3390	my $i = $idx;
		3391	$hb->add (new CFClient::UI::Label text => $_);
		3392	$hb->add (new CFClient::UI::Button
		3393	text => "delete",
		3394	tooltip => "Deletes the action from the record",
		3395	on_activate => sub {
		3396	$self->{cmdbox}->remove ($hb);
		3397	$cmds->[$i] = undef;
		3398	});
		3399
		3400
		3401	$idx++
		3402	}
		3403	}
		3404
		3405	#############################################################################
		3406
		3407	package CFClient::UI::SpellList;
		3408
		3409	our @ISA = CFClient::UI::ScrolledWindow::;
		3410
		3411	sub new {
		3412	my $class = shift;
		3413
		3414	my $self = $class->SUPER::new (
		3415	binding => [],
		3416	commands => [],
		3417	scrolled => (new CFClient::UI::Table),
		3418	@_,
		3419	)
		3420	}
		3421
		3422	# XXX: Do sorting? Argl...
		3423	sub add_spell {
		3424	my ($self, $spell) = @_;
		3425	$self->{spells}->{$spell->{name}} = $spell;
		3426
		3427	$self->{scrolled}->add (0, $self->{tbl_idx}, new CFClient::UI::Face
		3428	face => $spell->{face},
		3429	can_hover => 1,
		3430	can_events => 1,
		3431	tooltip => $spell->{message});
		3432
		3433	$self->{scrolled}->add (1, $self->{tbl_idx}, new CFClient::UI::Label
		3434	text => $spell->{name},
		3435	can_hover => 1,
		3436	can_events => 1,
		3437	tooltip => $spell->{message},
		3438	expand => 1);
		3439
		3440	$self->{scrolled}->add (2, $self->{tbl_idx}, new CFClient::UI::Label
		3441	text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
		3442	$spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
		3443	expand => 1);
		3444
		3445	$self->{scrolled}->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
		3446	text => "bind to key",
		3447	on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
		3448	}
		3449
		3450	sub rebuild_spell_list {
		3451	my ($self) = @_;
		3452	$self->{tbl_idx} = 0;
		3453	$self->add_spell ($_) for values %{$self->{spells}};
		3454	}
		3455
		3456	sub remove_spell {
		3457	my ($self, $spell) = @_;
		3458	delete $self->{spells}->{$spell->{name}};
		3459	$self->rebuild_spell_list;
		3460	}
		3461
		3462	#############################################################################
		3463
		3464	package CFClient::UI::Root;
		3465
		3466	our @ISA = CFClient::UI::Container::;
		3467
		3468	use CFClient::OpenGL;
		3469
		3470	sub new {
		3471	my $class = shift;
		3472
		3473	my $self = $class->SUPER::new (
2996	visible => 1,	3474	visible => 1,
2997	@_,	3475	@_,
2998	)	3476	);
2999	}
3000		3477
3001	sub configure {	3478	Scalar::Util::weaken ($self->{root} = $self);
3002	my ($self, $x, $y, $w, $h) = @_;
3003		3479
3004	$self->{w} = $w;	3480	$self
3005	$self->{h} = $h;
3006	}
3007
3008	sub check_size {
3009	my ($self) = @_;
3010
3011	$self->size_allocate ($self->{w}, $self->{h})
3012	if $self->{w};
3013	}	3481	}
3014		3482
3015	sub size_request {	3483	sub size_request {
3016	my ($self) = @_;	3484	my ($self) = @_;
3017		3485
3018	($self->{w}, $self->{h})	3486	($self->{w}, $self->{h})
		3487	}
		3488
		3489	sub _to_pixel {
		3490	my ($coord, $size, $max) = @_;
		3491
		3492	$coord =
		3493	$coord eq "center" ? ($max - $size) * 0.5
		3494	: $coord eq "max" ? $max
		3495	: $coord;
		3496
		3497	$coord = 0 if $coord < 0;
		3498	$coord = $max - $size if $coord > $max - $size;
		3499
		3500	int $coord + 0.5
3019	}	3501	}
3020		3502
3021	sub size_allocate {	3503	sub size_allocate {
3022	my ($self, $w, $h) = @_;	3504	my ($self, $w, $h) = @_;
3023		3505
3024	for my $child ($self->children) {	3506	for my $child ($self->children) {
3025	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};	3507	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3026		3508
3027	$X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1	3509	$X = $child->{force_x} if exists $child->{force_x};
3028	if exists $child->{req_x};	3510	$Y = $child->{force_y} if exists $child->{force_y};
3029		3511
3030	$Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1	3512	$X = _to_pixel $X, $W, $self->{w};
3031	if exists $child->{req_y};	3513	$Y = _to_pixel $Y, $H, $self->{h};
3032
3033	$X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
3034	$Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
3035		3514
3036	$child->configure ($X, $Y, $W, $H);	3515	$child->configure ($X, $Y, $W, $H);
3037	}	3516	}
3038	}	3517	}
3039		3518
…		…
3050	}	3529	}
3051		3530
3052	sub update {	3531	sub update {
3053	my ($self) = @_;	3532	my ($self) = @_;
3054		3533
3055	$self->check_size;
3056	$::WANT_REFRESH++;	3534	$::WANT_REFRESH++;
3057	}	3535	}
3058		3536
3059	sub add {	3537	sub add {
3060	my ($self, @children) = @_;	3538	my ($self, @children) = @_;
3061		3539
3062	for (my @widgets = @children; my $w = pop @widgets; ) {
3063	push @widgets, $w->children;
3064	$w->{root} = $self;
3065	$w->{visible} = $self->{visible} + 1;
3066	}
3067
3068	for my $child (@children) {
3069	$child->{is_toplevel} = 1;	3540	$_->{is_toplevel} = 1
3070		3541	for @children;
3071	# integerise window positions
3072	$child->{x} = int $child->{x};
3073	$child->{y} = int $child->{y};
3074	}
3075		3542
3076	$self->SUPER::add (@children);	3543	$self->SUPER::add (@children);
3077	}	3544	}
3078		3545
3079	sub remove {	3546	sub remove {
3080	my ($self, @children) = @_;	3547	my ($self, @children) = @_;
3081		3548
3082	$self->SUPER::remove (@children);	3549	$self->SUPER::remove (@children);
		3550
		3551	delete $self->{is_toplevel}
		3552	for @children;
3083		3553
3084	while (@children) {	3554	while (@children) {
3085	my $w = pop @children;	3555	my $w = pop @children;
3086	push @children, $w->children;	3556	push @children, $w->children;
3087	$w->set_invisible;	3557	$w->set_invisible;
…		…
3106	while ($self->{refresh_hook}) {	3576	while ($self->{refresh_hook}) {
3107	$_->()	3577	$_->()
3108	for values %{delete $self->{refresh_hook}};	3578	for values %{delete $self->{refresh_hook}};
3109	}	3579	}
3110		3580
3111	if ($self->{check_size}) {	3581	if ($self->{realloc}) {
3112	my @queue = ([], []);	3582	my %queue;
		3583	my @queue;
		3584	my $widget;
3113		3585
3114	for (;;) {	3586	outer:
3115	if ($self->{check_size}) {	3587	while () {
3116	# heuristic: check containers last	3588	if (my $realloc = delete $self->{realloc}) {
3117	push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_	3589	for $widget (values %$realloc) {
3118	for values %{delete $self->{check_size}}	3590	$widget->{visible} or next; # do not resize invisible widgets
		3591
		3592	$queue{$widget+0}++ and next; # duplicates are common
		3593
		3594	push @{ $queue[$widget->{visible}] }, $widget;
		3595	}
3119	}	3596	}
3120		3597
3121	my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last;	3598	while () {
		3599	@queue or last outer;
3122		3600
3123	my ($w, $h) = $widget->{user_w} && $widget->{user_h}	3601	$widget = pop @{ $queue[-1] || [] }
3124	? @$widget{qw(user_w user_h)}	3602	and last;
3125	: $widget->size_request;
3126
3127	if (delete $widget->{force_alloc}
3128	or $w != $widget->{req_w} or $h != $widget->{req_h}) {
3129	Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
3130		3603
		3604	pop @queue;
		3605	}
		3606
		3607	delete $queue{$widget+0};
		3608
		3609	my ($w, $h) = $widget->size_request;
		3610
		3611	$w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2;
		3612	$h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2;
		3613
		3614	$w = $widget->{force_w} if exists $widget->{force_w};
		3615	$h = $widget->{force_h} if exists $widget->{force_h};
		3616
		3617	if ($widget->{req_w} != $w || $widget->{req_h} != $h
		3618	|| delete $widget->{force_realloc}) {
3131	$widget->{req_w} = $w;	3619	$widget->{req_w} = $w;
3132	$widget->{req_h} = $h;	3620	$widget->{req_h} = $h;
3133		3621
3134	$self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h];	3622	$self->{size_alloc}{$widget+0} = $widget;
3135		3623
3136	$widget->{parent}->check_size
3137	if $widget->{parent};	3624	if (my $parent = $widget->{parent}) {
		3625	$self->{realloc}{$parent+0} = $parent
		3626	unless $queue{$parent+0};
		3627
		3628	$parent->{force_size_alloc} = 1;
		3629	$self->{size_alloc}{$parent+0} = $parent;
		3630	}
3138	}	3631	}
		3632
		3633	delete $self->{realloc}{$widget+0};
3139	}	3634	}
3140	}	3635	}
3141		3636
3142	while ($self->{size_alloc}) {	3637	while (my $size_alloc = delete $self->{size_alloc}) {
3143	for (values %{delete $self->{size_alloc}}) {	3638	my @queue = sort { $b->{visible} <=> $a->{visible} }
3144	my ($widget, $w, $h) = @$_;	3639	values %$size_alloc;
		3640
		3641	while () {
		3642	my $widget = pop @queue || last;
		3643
		3644	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3145		3645
3146	$w = 0 if $w < 0;	3646	$w = 0 if $w < 0;
3147	$h = 0 if $h < 0;	3647	$h = 0 if $h < 0;
3148		3648
		3649	$w = int $w + 0.5;
		3650	$h = int $h + 0.5;
		3651
		3652	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
		3653	$widget->{old_w} = $widget->{w};
		3654	$widget->{old_h} = $widget->{h};
		3655
3149	$widget->{w} = $w;	3656	$widget->{w} = $w;
3150	$widget->{h} = $h;	3657	$widget->{h} = $h;
		3658
3151	$widget->emit (size_allocate => $w, $h);	3659	$widget->emit (size_allocate => $w, $h);
		3660	}
3152	}	3661	}
3153	}	3662	}
3154		3663
3155	while ($self->{post_alloc_hook}) {	3664	while ($self->{post_alloc_hook}) {
3156	$_->()	3665	$_->()
3157	for values %{delete $self->{post_alloc_hook}};	3666	for values %{delete $self->{post_alloc_hook}};
3158	}	3667	}
		3668
3159		3669
3160	glViewport 0, 0, $::WIDTH, $::HEIGHT;	3670	glViewport 0, 0, $::WIDTH, $::HEIGHT;
3161	glClearColor +($::CFG->{fow_intensity}) x 3, 1;	3671	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3162	glClear GL_COLOR_BUFFER_BIT;	3672	glClear GL_COLOR_BUFFER_BIT;
3163		3673
…		…
3165	glLoadIdentity;	3675	glLoadIdentity;
3166	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;	3676	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3167	glMatrixMode GL_MODELVIEW;	3677	glMatrixMode GL_MODELVIEW;
3168	glLoadIdentity;	3678	glLoadIdentity;
3169		3679
		3680	{
		3681	package CFClient::UI::Base;
		3682
		3683	($draw_x, $draw_y, $draw_w, $draw_h) =
		3684	(0, 0, $self->{w}, $self->{h});
		3685	}
		3686
3170	$self->_draw;	3687	$self->_draw;
3171	}	3688	}
3172		3689
3173	#############################################################################	3690	#############################################################################
3174		3691

Diff Legend

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