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.244 by root, Sat May 27 21:06:09 2006 UTC vs.
Revision 1.273 by root, Sat Jun 3 02:32:35 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;
		215
		216	Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
209		217
210	for (keys %$self) {	218	for (keys %$self) {
211	if (/^on_(.*)$/) {	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	return unless $self->{visible};	272	return unless $self->{visible};
259		273
260	# broken show/hide model	274	$_->set_invisible for $self->children;
261		275
262	delete $self->{root};	276	delete $self->{root};
263	delete $self->{visible};	277	delete $self->{visible};
264		278
265	undef $GRAB if $GRAB == $self;	279	undef $GRAB if $GRAB == $self;
266	undef $HOVER if $HOVER == $self;	280	undef $HOVER if $HOVER == $self;
267		281
268	CFClient::UI::check_tooltip	282	CFClient::UI::check_tooltip
269	if $CFClient::UI::TOOLTIP->{owner} == $self;	283	if $TOOLTIP->{owner} == $self;
270		284
271	$self->focus_out;	285	$self->focus_out;
272		286
273	$self->emit (visibility_change => 0);	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;
274	}	305	}
275		306
276	sub hide {	307	sub hide {
277	my ($self) = @_;	308	my ($self) = @_;
278		309
…		…
280		311
281	$self->{parent}->remove ($self)	312	$self->{parent}->remove ($self)
282	if $self->{parent};	313	if $self->{parent};
283	}	314	}
284		315
285	sub move {	316	sub move_abs {
286	my ($self, $x, $y, $z) = @_;	317	my ($self, $x, $y, $z) = @_;
287		318
288	$self->{x} = int $x;	319	$self->{x} = List::Util::max 0, int $x;
289	$self->{y} = int $y;	320	$self->{y} = List::Util::max 0, int $y;
290	$self->{z} = $z if defined $z;	321	$self->{z} = $z if defined $z;
291		322
292	$self->update;	323	$self->update;
293	}	324	}
294		325
295	sub set_size {	326	sub set_size {
296	my ($self, $w, $h) = @_;	327	my ($self, $w, $h) = @_;
297		328
298	$self->{user_w} = $w;	329	$self->{force_w} = $w;
299	$self->{user_h} = $h;	330	$self->{force_h} = $h;
300		331
301	$self->check_size;	332	$self->realloc;
302	}	333	}
303		334
304	sub size_request {	335	sub size_request {
305	require Carp;	336	require Carp;
306	Carp::confess "size_request is abstract";	337	Carp::confess "size_request is abstract";
…		…
308		339
309	sub configure {	340	sub configure {
310	my ($self, $x, $y, $w, $h) = @_;	341	my ($self, $x, $y, $w, $h) = @_;
311		342
312	if ($self->{aspect}) {	343	if ($self->{aspect}) {
		344	my ($ow, $oh) = ($w, $h);
		345
313	my $w2 = List::Util::min $w, int $h * $self->{aspect};	346	$w = List::Util::min $w, int $h * $self->{aspect};
314	my $h2 = List::Util::min $h, int $w / $self->{aspect};	347	$h = List::Util::min $h, int $w / $self->{aspect};
315		348
316	# use alignment to adjust x, y	349	# use alignment to adjust x, y
317		350
318	$x += int +($w - $w2) * 0.5;	351	$x += int 0.5 * ($ow - $w);
319	$y += int +($h - $h2) * 0.5;	352	$y += int 0.5 * ($oh - $h);
320
321	($w, $h) = ($w2, $h2);
322	}	353	}
323		354
324	if ($self->{x} != $x || $self->{y} != $y) {	355	if ($self->{x} ne $x || $self->{y} ne $y) {
325	$self->{x} = $x;	356	$self->{x} = $x;
326	$self->{y} = $y;	357	$self->{y} = $y;
327	$self->update;	358	$self->update;
328	}	359	}
329		360
330	if ($self->{w} != $w || $self->{h} != $h) {	361	if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
331	$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;
332	}	368	}
333	}	369	}
334		370
335	sub size_allocate {	371	sub size_allocate {
336	# nothing to be done	372	# nothing to be done
337	}	373	}
338		374
339	sub reconfigure {
340	my ($self) = @_;
341
342	$self->check_size (1);
343	$self->update;
344	}
345
346	sub children {	375	sub children {
		376	# nop
		377	}
		378
		379	sub visible_children {
		380	$_[0]->children
347	}	381	}
348		382
349	sub set_max_size {	383	sub set_max_size {
350	my ($self, $w, $h) = @_;	384	my ($self, $w, $h) = @_;
351		385
…		…
410		444
411	$::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
412	unless $FOCUS;	446	unless $FOCUS;
413	}	447	}
414		448
415	sub mouse_motion { }	449	sub mouse_motion { 0 }
416	sub button_up { }	450	sub button_up { 0 }
417	sub key_down { }	451	sub key_down { 0 }
418	sub key_up { }	452	sub key_up { 0 }
419		453
420	sub button_down {	454	sub button_down {
421	my ($self, $ev, $x, $y) = @_;	455	my ($self, $ev, $x, $y) = @_;
422		456
423	$self->focus_in;	457	$self->focus_in;
424	}
425		458
426	sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }	459	0
427	sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }	460	}
428	sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }	461
429	sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }	462	sub find_widget {
430	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
431		535
432	sub draw {	536	sub draw {
433	my ($self) = @_;	537	my ($self) = @_;
434		538
435	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);
436		550
437	glPushMatrix;	551	glPushMatrix;
438	glTranslate $self->{x}, $self->{y}, 0;	552	glTranslate $self->{x}, $self->{y}, 0;
439	$self->_draw;	553	$self->_draw;
440	glPopMatrix;	554	glPopMatrix;
…		…
452	glVertex $x , $y + $self->{h};	566	glVertex $x , $y + $self->{h};
453	glEnd;	567	glEnd;
454	glDisable GL_BLEND;	568	glDisable GL_BLEND;
455	}	569	}
456		570
457	if ($ENV{PCLIENT_DEBUG}) {	571	if ($ENV{CFPLUS_DEBUG} & 1) {
458	glPushMatrix;	572	glPushMatrix;
459	glColor 1, 1, 0, 1;	573	glColor 1, 1, 0, 1;
460	glTranslate $self->{x} + 0.375, $self->{y} + 0.375;	574	glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
461	glBegin GL_LINE_LOOP;	575	glBegin GL_LINE_LOOP;
462	glVertex 0 , 0;	576	glVertex 0 , 0;
…		…
473	my ($self) = @_;	587	my ($self) = @_;
474		588
475	warn "no draw defined for $self\n";	589	warn "no draw defined for $self\n";
476	}	590	}
477		591
478	sub find_widget {
479	my ($self, $x, $y) = @_;
480
481	return () unless $self->{can_events};
482
483	return $self
484	if $x >= $self->{x} && $x < $self->{x} + $self->{w}
485	&& $y >= $self->{y} && $y < $self->{y} + $self->{h};
486
487	()
488	}
489
490	sub set_parent {
491	my ($self, $parent) = @_;
492
493	Scalar::Util::weaken ($self->{parent} = $parent);
494
495	if ($parent->{visible} || 1) {
496	$self->{root} = $parent->{root};
497	$self->{visible} = $parent->{visible} + 1;
498
499	$self->emit (visibility_change => 1)
500	unless $self->{parent}{visible};
501	}
502
503	# TODO: req_w _does_change after ->reconfigure
504	$self->check_size
505	unless exists $self->{req_w};
506
507	$self->show;
508	}
509
510	sub check_size {
511	my ($self, $forced) = @_;
512
513	$self->{force_alloc} = 1 if $forced;
514	$CFClient::UI::ROOT->{check_size}{$self} = $self;
515	}
516
517	sub update {
518	my ($self) = @_;
519
520	$self->{parent}->update
521	if $self->{parent};
522	}
523
524	sub connect {
525	my ($self, $signal, $cb) = @_;
526
527	push @{ $self->{signal_cb}{$signal} }, $cb;
528	}
529
530	sub _emit {
531	my ($self, $signal, @args) = @_;
532
533	List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
534	}
535
536	sub emit {
537	my ($self, $signal, @args) = @_;
538
539	$self->_emit ($signal, @args)
540	|| $self->$signal (@args);
541	}
542
543	sub visibility_change {
544	#my ($self, $visible) = @_;
545	}
546
547	sub DESTROY {	592	sub DESTROY {
548	my ($self) = @_;	593	my ($self) = @_;
549		594
550	delete $WIDGET{$self+0};	595	delete $WIDGET{$self+0};
551	#$self->deactivate;	596	#$self->deactivate;
…		…
607	my ($class, %arg) = @_;	652	my ($class, %arg) = @_;
608	$class->SUPER::new (can_events => 0, %arg);	653	$class->SUPER::new (can_events => 0, %arg);
609	}	654	}
610		655
611	sub size_request {	656	sub size_request {
612	(0, 0)	657	my ($self) = @_;
		658
		659	($self->{w} + 0, $self->{h} + 0)
613	}	660	}
614		661
615	sub draw { }	662	sub draw { }
616		663
617	#############################################################################	664	#############################################################################
…		…
621	our @ISA = CFClient::UI::Base::;	668	our @ISA = CFClient::UI::Base::;
622		669
623	sub new {	670	sub new {
624	my ($class, %arg) = @_;	671	my ($class, %arg) = @_;
625		672
626	my $children = delete $arg{children} || [];	673	my $children = delete $arg{children};
627		674
628	my $self = $class->SUPER::new (	675	my $self = $class->SUPER::new (
629	children => [],	676	children => [],
630	can_events => 0,	677	can_events => 0,
631	%arg,	678	%arg,
632	);	679	);
		680
633	$self->add ($_) for @$children;	681	$self->add (@$children)
		682	if $children;
634		683
635	$self	684	$self
636	}	685	}
637		686
638	sub add {	687	sub add {
…		…
646	$self->{children} = [	695	$self->{children} = [
647	sort { $a->{z} <=> $b->{z} }	696	sort { $a->{z} <=> $b->{z} }
648	@{$self->{children}}, @widgets	697	@{$self->{children}}, @widgets
649	];	698	];
650		699
651	$self->check_size (1);	700	$self->realloc;
652	$self->update;
653	}	701	}
654		702
655	sub children {	703	sub children {
656	@{ $_[0]{children} }	704	@{ $_[0]{children} }
657	}	705	}
…		…
662	delete $child->{parent};	710	delete $child->{parent};
663	$child->hide;	711	$child->hide;
664		712
665	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];	713	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
666		714
667	$self->check_size (1);	715	$self->realloc;
668	$self->update;
669	}	716	}
670		717
671	sub clear {	718	sub clear {
672	my ($self) = @_;	719	my ($self) = @_;
673		720
…		…
677	for (@$children) {	724	for (@$children) {
678	delete $_->{parent};	725	delete $_->{parent};
679	$_->hide;	726	$_->hide;
680	}	727	}
681		728
682	$self->check_size;	729	$self->realloc;
683	$self->update;
684	}	730	}
685		731
686	sub find_widget {	732	sub find_widget {
687	my ($self, $x, $y) = @_;	733	my ($self, $x, $y) = @_;
688		734
689	$x -= $self->{x};	735	$x -= $self->{x};
690	$y -= $self->{y};	736	$y -= $self->{y};
691		737
692	my $res;	738	my $res;
693		739
694	for (reverse @{ $self->{children} }) {	740	for (reverse $self->visible_children) {
695	$res = $_->find_widget ($x, $y)	741	$res = $_->find_widget ($x, $y)
696	and return $res;	742	and return $res;
697	}	743	}
698		744
699	$self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})	745	$self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
…		…
775	$self->SUPER::size_allocate ($w, $h);	821	$self->SUPER::size_allocate ($w, $h);
776	$self->update;	822	$self->update;
777	}	823	}
778		824
779	sub _render {	825	sub _render {
		826	my ($self) = @_;
		827
780	$_[0]{children}[0]->draw;	828	$self->{children}[0]->draw;
781	}	829	}
782		830
783	sub render_child {	831	sub render_child {
784	my ($self) = @_;	832	my ($self) = @_;
785		833
786	$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 {
787	glClearColor 0, 0, 0, 0;	835	glClearColor 0, 0, 0, 0;
788	glClear GL_COLOR_BUFFER_BIT;	836	glClear GL_COLOR_BUFFER_BIT;
789		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
790	$self->_render;	845	$self->_render;
791	};	846	};
792	}	847	}
793		848
794	sub _draw {	849	sub _draw {
795	my ($self) = @_;	850	my ($self) = @_;
796		851
797	my ($w, $h) = ($self->w, $self->h);	852	my ($w, $h) = @$self{qw(w h)};
798		853
799	my $tex = $self->{texture}	854	my $tex = $self->{texture}
800	or return;	855	or return;
801		856
802	glEnable GL_TEXTURE_2D;	857	glEnable GL_TEXTURE_2D;
…		…
825	}	880	}
826		881
827	sub size_request {	882	sub size_request {
828	my ($self) = @_;	883	my ($self) = @_;
829		884
830	@$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};	885	my ($w, $h) = @{$self->child}{qw(req_w req_h)};
831		886
832	@$self{qw(child_w child_h)}	887	$w = 10 if $self->{scroll_x};
		888	$h = 10 if $self->{scroll_y};
		889
		890	($w, $h)
833	}	891	}
834		892
835	sub size_allocate {	893	sub size_allocate {
836	my ($self, $w, $h) = @_;	894	my ($self, $w, $h) = @_;
837		895
		896	my $child = $self->child;
		897
838	$w = $self->{child_w} if $self->{scroll_x} && $self->{child_w};	898	$w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
839	$h = $self->{child_h} if $self->{scroll_y} && $self->{child_h};	899	$h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
840		900
841	$self->child->configure (0, 0, $w, $h);	901	$self->child->configure (0, 0, $w, $h);
842	$self->update;	902	$self->update;
843	}	903	}
844		904
…		…
880	}	940	}
881		941
882	sub _render {	942	sub _render {
883	my ($self) = @_;	943	my ($self) = @_;
884		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
885	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};	948	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
886		949
887	$self->SUPER::_render;	950	$self->SUPER::_render;
888	}	951	}
889		952
…		…
892	package CFClient::UI::ScrolledWindow;	955	package CFClient::UI::ScrolledWindow;
893		956
894	our @ISA = CFClient::UI::HBox::;	957	our @ISA = CFClient::UI::HBox::;
895		958
896	sub new {	959	sub new {
897	my $class = shift;	960	my ($class, %arg) = @_;
		961
		962	my $child = delete $arg{child};
898		963
899	my $self;	964	my $self;
900		965
901	my $slider = new CFClient::UI::Slider	966	my $slider = new CFClient::UI::Slider
902	vertical => 1,	967	vertical => 1,
…		…
907	;	972	;
908		973
909	$self = $class->SUPER::new (	974	$self = $class->SUPER::new (
910	vp => (new CFClient::UI::ViewPort expand => 1),	975	vp => (new CFClient::UI::ViewPort expand => 1),
911	slider => $slider,	976	slider => $slider,
912	@_,	977	%arg,
913	);	978	);
914		979
915	$self->{vp}->add ($self->{scrolled});
916	$self->add ($self->{vp});
917	$self->add ($self->{slider});	980	$self->SUPER::add ($self->{vp}, $self->{slider});
		981	$self->add ($child) if $child;
918		982
919	$self	983	$self
		984	}
		985
		986	sub add {
		987	my ($self, $widget) = @_;
		988
		989	$self->{vp}->add ($self->{child} = $widget);
920	}	990	}
921		991
922	sub update {	992	sub update {
923	my ($self) = @_;	993	my ($self) = @_;
924		994
…		…
987		1057
988	our @ISA = CFClient::UI::Bin::;	1058	our @ISA = CFClient::UI::Bin::;
989		1059
990	use CFClient::OpenGL;	1060	use CFClient::OpenGL;
991		1061
992	my @tex =	1062	my $bg =
		1063	new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
		1064	mipmap => 1, wrap => 1;
		1065
		1066	my @border =
993	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	1067	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
994	qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);	1068	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
995		1069
996	sub new {	1070	sub new {
997	my $class = shift;	1071	my ($class, %arg) = @_;
998		1072
999	# TODO: user_x, user_y, overwrite moveto?	1073	my $title = delete $arg{title};
1000		1074
1001	my $self = $class->SUPER::new (	1075	my $self = $class->SUPER::new (
1002	bg => [1, 1, 1, 1],	1076	bg => [1, 1, 1, 1],
1003	border_bg => [1, 1, 1, 1],	1077	border_bg => [1, 1, 1, 1],
1004	border => 0.6,	1078	border => 0.6,
1005	is_toplevel => 1,
1006	can_events => 1,	1079	can_events => 1,
1007	@_	1080	min_w => 16,
		1081	min_h => 16,
		1082	%arg,
1008	);	1083	);
1009		1084
1010	$self->{title} &&= new CFClient::UI::Label	1085	$self->{title} = new CFClient::UI::Label
1011	align => 0,	1086	align => 0,
1012	valign => 1,	1087	valign => 1,
1013	text => $self->{title},	1088	text => $title,
1014	fontsize => $self->{border};	1089	fontsize => $self->{border}
		1090	if defined $title;
1015		1091
1016	$self	1092	$self
		1093	}
		1094
		1095	sub add {
		1096	my ($self, @widgets) = @_;
		1097
		1098	$self->SUPER::add (@widgets);
		1099	$self->CFClient::UI::Container::add ($self->{title}) if $self->{title};
1017	}	1100	}
1018		1101
1019	sub border {	1102	sub border {
1020	int $_[0]{border} * $::FONTSIZE	1103	int $_[0]{border} * $::FONTSIZE
1021	}	1104	}
1022		1105
1023	sub size_request {	1106	sub size_request {
1024	my ($self) = @_;	1107	my ($self) = @_;
		1108
		1109	$self->{title}->size_request
		1110	if $self->{title};
1025		1111
1026	my ($w, $h) = $self->SUPER::size_request;	1112	my ($w, $h) = $self->SUPER::size_request;
1027		1113
1028	(	1114	(
1029	$w + $self->border * 2,	1115	$w + $self->border * 2,
…		…
1032	}	1118	}
1033		1119
1034	sub size_allocate {	1120	sub size_allocate {
1035	my ($self, $w, $h) = @_;	1121	my ($self, $w, $h) = @_;
1036		1122
		1123	if ($self->{title}) {
		1124	$self->{title}{w} = $w;
		1125	$self->{title}{h} = $h;
		1126	$self->{title}->size_allocate ($w, $h);
		1127	}
		1128
		1129	my $border = $self->border;
		1130
1037	$h -= List::Util::max 0, $self->border * 2;	1131	$h -= List::Util::max 0, $border * 2;
1038	$w -= List::Util::max 0, $self->border * 2;	1132	$w -= List::Util::max 0, $border * 2;
1039		1133
1040	$self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
1041	if $self->{title};
1042
1043	$self->child->configure ($self->border, $self->border, $w, $h);	1134	$self->child->configure ($border, $border, $w, $h);
1044	}	1135	}
1045		1136
1046	sub button_down {	1137	sub button_down {
1047	my ($self, $ev, $x, $y) = @_;	1138	my ($self, $ev, $x, $y) = @_;
1048		1139
…		…
1064	my ($ev, $x, $y) = @_;	1155	my ($ev, $x, $y) = @_;
1065		1156
1066	my $dx = $ev->{x} - $ox;	1157	my $dx = $ev->{x} - $ox;
1067	my $dy = $ev->{y} - $oy;	1158	my $dy = $ev->{y} - $oy;
1068		1159
1069	$self->{user_x} = $wx + $dx * $mx;
1070	$self->{user_y} = $wy + $dy * $my;
1071	$self->{user_w} = $bw + $dx * ($mx ? -1 : 1);	1160	$self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1072	$self->{user_h} = $bh + $dy * ($my ? -1 : 1);	1161	$self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1073	$self->move ($self->{user_x}, $self->{user_y});	1162
1074	$self->check_size;	1163	$self->realloc;
		1164	$self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1075	};	1165	};
1076		1166
1077	} elsif ($lr ^ $td) {	1167	} elsif ($lr ^ $td) {
1078	my ($ox, $oy) = ($ev->{x}, $ev->{y});	1168	my ($ox, $oy) = ($ev->{x}, $ev->{y});
1079	my ($bx, $by) = ($self->{x}, $self->{y});	1169	my ($bx, $by) = ($self->{x}, $self->{y});
…		…
1081	$self->{motion} = sub {	1171	$self->{motion} = sub {
1082	my ($ev, $x, $y) = @_;	1172	my ($ev, $x, $y) = @_;
1083		1173
1084	($x, $y) = ($ev->{x}, $ev->{y});	1174	($x, $y) = ($ev->{x}, $ev->{y});
1085		1175
1086	$self->{user_x} = $bx + $x - $ox;	1176	$self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1087	$self->{user_y} = $by + $y - $oy;
1088	$self->move ($self->{user_x}, $self->{user_y});
1089	$self->update;
1090	};	1177	};
		1178	} else {
		1179	return 0;
		1180	}
		1181
1091	}	1182	1
1092	}	1183	}
1093		1184
1094	sub button_up {	1185	sub button_up {
1095	my ($self, $ev, $x, $y) = @_;	1186	my ($self, $ev, $x, $y) = @_;
1096		1187
1097	delete $self->{motion};	1188	!!delete $self->{motion}
1098	}	1189	}
1099		1190
1100	sub mouse_motion {	1191	sub mouse_motion {
1101	my ($self, $ev, $x, $y) = @_;	1192	my ($self, $ev, $x, $y) = @_;
1102		1193
1103	$self->{motion}->($ev, $x, $y) if $self->{motion};	1194	$self->{motion}->($ev, $x, $y) if $self->{motion};
		1195
		1196	!!$self->{motion}
1104	}	1197	}
1105		1198
1106	sub _draw {	1199	sub _draw {
1107	my ($self) = @_;	1200	my ($self) = @_;
1108		1201
		1202	my $child = $self->{children}[0];
		1203
1109	my ($w, $h ) = ($self->{w}, $self->{h});	1204	my ($w, $h ) = ($self->{w}, $self->{h});
1110	my ($cw, $ch) = ($self->child->{w}, $self->child->{h});	1205	my ($cw, $ch) = ($child->{w}, $child->{h});
1111		1206
1112	glEnable GL_TEXTURE_2D;	1207	glEnable GL_TEXTURE_2D;
1113	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	1208	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1114		1209
1115	my $border = $self->border;	1210	my $border = $self->border;
1116		1211
1117	glColor @{ $self->{border_bg} };	1212	glColor @{ $self->{border_bg} };
1118	$tex[1]->draw_quad_alpha (0, 0, $w, $border);	1213	$border[0]->draw_quad_alpha (0, 0, $w, $border);
1119	$tex[3]->draw_quad_alpha (0, $border, $border, $ch);	1214	$border[1]->draw_quad_alpha (0, $border, $border, $ch);
1120	$tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);	1215	$border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1121	$tex[4]->draw_quad_alpha (0, $h - $border, $w, $border);	1216	$border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
1122		1217
1123	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {	1218	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1124	my $bg = $tex[0];	1219	glColor @{ $self->{bg} };
1125		1220
1126	# TODO: repeat texture not scale	1221	# TODO: repeat texture not scale
		1222	# solve this better(?)
1127	my $rep_x = $cw / $bg->{w};	1223	$bg->{s} = $cw / $bg->{w};
1128	my $rep_y = $ch / $bg->{h};	1224	$bg->{t} = $ch / $bg->{h};
1129
1130	glColor @{ $self->{bg} };
1131
1132	$bg->{s} = $rep_x;
1133	$bg->{t} = $rep_y;
1134	$bg->{wrap_mode} = 1;
1135	$bg->draw_quad_alpha ($border, $border, $cw, $ch);	1225	$bg->draw_quad_alpha ($border, $border, $cw, $ch);
1136	}	1226	}
1137		1227
1138	glDisable GL_TEXTURE_2D;	1228	glDisable GL_TEXTURE_2D;
1139		1229
1140	$self->{title}->draw if $self->{title};
1141
1142	$self->child->draw;	1230	$child->draw;
		1231
		1232	if ($self->{title}) {
		1233	glTranslate 0, $border - $self->{h};
		1234	$self->{title}->_draw;
		1235	}
1143	}	1236	}
1144		1237
1145	#############################################################################	1238	#############################################################################
1146		1239
1147	package CFClient::UI::Table;	1240	package CFClient::UI::Table;
…		…
1169	my ($self, $x, $y, $child) = @_;	1262	my ($self, $x, $y, $child) = @_;
1170		1263
1171	$child->set_parent ($self);	1264	$child->set_parent ($self);
1172	$self->{children}[$y][$x] = $child;	1265	$self->{children}[$y][$x] = $child;
1173		1266
1174	$self->check_size (1);	1267	$self->realloc;
1175	}	1268	}
1176		1269
1177	# TODO: move to container class maybe? send children a signal on removal?	1270	# TODO: move to container class maybe? send children a signal on removal?
1178	sub clear {	1271	sub clear {
1179	my ($self) = @_;	1272	my ($self) = @_;
…		…
1184	for (@children) {	1277	for (@children) {
1185	delete $_->{parent};	1278	delete $_->{parent};
1186	$_->hide;	1279	$_->hide;
1187	}	1280	}
1188		1281
1189	$self->check_size (1);	1282	$self->realloc;
1190	$self->update;
1191	}	1283	}
1192		1284
1193	sub get_wh {	1285	sub get_wh {
1194	my ($self) = @_;	1286	my ($self) = @_;
1195		1287
…		…
1291	}	1383	}
1292	}	1384	}
1293		1385
1294	#############################################################################	1386	#############################################################################
1295		1387
1296	package CFClient::UI::HBox;	1388	package CFClient::UI::Box;
1297
1298	# TODO: wrap into common Box base class
1299		1389
1300	our @ISA = CFClient::UI::Container::;	1390	our @ISA = CFClient::UI::Container::;
1301		1391
1302	sub size_request {	1392	sub size_request {
1303	my ($self) = @_;	1393	my ($self) = @_;
1304		1394
1305	my @alloc = map [$_->size_request], @{$self->{children}};	1395	$self->{vertical}
1306		1396	? (
1307	(	1397	(List::Util::max map $_->{req_w}, @{$self->{children}}),
1308	(List::Util::sum map $_->[0], @alloc),	1398	(List::Util::sum map $_->{req_h}, @{$self->{children}}),
1309	(List::Util::max map $_->[1], @alloc),	1399	)
1310	)	1400	: (
		1401	(List::Util::sum map $_->{req_w}, @{$self->{children}}),
		1402	(List::Util::max map $_->{req_h}, @{$self->{children}}),
		1403	)
1311	}	1404	}
1312		1405
1313	sub size_allocate {	1406	sub size_allocate {
1314	my ($self, $w, $h) = @_;	1407	my ($self, $w, $h) = @_;
1315		1408
1316	($h, $w) = ($w, $h);	1409	my $space = $self->{vertical} ? $h : $w;
1317
1318	my $children = $self->{children};	1410	my $children = $self->{children};
1319		1411
1320	my @h = map $_->{req_w}, @$children;	1412	my @req;
1321		1413
1322	my $req_h = List::Util::sum @h;	1414	if ($self->{homogeneous}) {
1323		1415	@req = ($space / (@$children || 1)) x @$children;
1324	if ($req_h > $h) {
1325	# ah well, not enough space
1326	$_ *= $h / $req_h for @h;
1327	} else {	1416	} else {
		1417	@req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;
		1418	my $req = List::Util::sum @req;
		1419
		1420	if ($req > $space) {
		1421	# ah well, not enough space
		1422	$_ *= $space / $req for @req;
		1423	} else {
1328	my $exp = List::Util::sum map $_->{expand}, @$children;	1424	my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1329	$exp ||= 1;
1330		1425
		1426	$space = ($space - $req) / $expand; # remaining space to give away
		1427
		1428	$req[$_] += $space * $children->[$_]{expand}
1331	for (0 .. $#$children) {	1429	for 0 .. $#$children;
1332	my $child = $children->[$_];
1333
1334	my $alloc_h = $h[$_];
1335	$alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1336	$h[$_] = $alloc_h;
1337	}	1430	}
1338	}	1431	}
1339		1432
1340	CFClient::UI::harmonize \@h;	1433	CFClient::UI::harmonize \@req;
1341		1434
1342	my $y = 0;	1435	my $pos = 0;
1343	for (0 .. $#$children) {	1436	for (0 .. $#$children) {
1344	my $child = $children->[$_];
1345	my $h = $h[$_];	1437	my $alloc = $req[$_];
1346	$child->configure ($y, 0, $h, $w);	1438	$children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1347		1439
1348	$y += $h;	1440	$pos += $alloc;
1349	}	1441	}
1350		1442
1351	1	1443	1
1352	}	1444	}
1353		1445
1354	#############################################################################	1446	#############################################################################
1355		1447
		1448	package CFClient::UI::HBox;
		1449
		1450	our @ISA = CFClient::UI::Box::;
		1451
		1452	sub new {
		1453	my $class = shift;
		1454
		1455	$class->SUPER::new (
		1456	vertical => 0,
		1457	@_,
		1458	)
		1459	}
		1460
		1461	#############################################################################
		1462
1356	package CFClient::UI::VBox;	1463	package CFClient::UI::VBox;
1357		1464
1358	# TODO: wrap into common Box base class
1359
1360	our @ISA = CFClient::UI::Container::;	1465	our @ISA = CFClient::UI::Box::;
1361		1466
1362	sub size_request {	1467	sub new {
1363	my ($self) = @_;	1468	my $class = shift;
1364		1469
1365	my @alloc = map [$_->size_request], @{$self->{children}};	1470	$class->SUPER::new (
1366		1471	vertical => 1,
1367	(	1472	@_,
1368	(List::Util::max map $_->[0], @alloc),
1369	(List::Util::sum map $_->[1], @alloc),
1370	)	1473	)
1371	}
1372
1373	sub size_allocate {
1374	my ($self, $w, $h) = @_;
1375
1376	Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1377
1378	my $children = $self->{children};
1379
1380	my @h = map $_->{req_h}, @$children;
1381
1382	my $req_h = List::Util::sum @h;
1383
1384	if ($req_h > $h) {
1385	# ah well, not enough space
1386	$_ *= $h / $req_h for @h;
1387	} else {
1388	my $exp = List::Util::sum map $_->{expand}, @$children;
1389	$exp ||= 1;
1390
1391	for (0 .. $#$children) {
1392	my $child = $children->[$_];
1393
1394	$h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1395	}
1396	}
1397
1398	CFClient::UI::harmonize \@h;
1399
1400	my $y = 0;
1401	for (0 .. $#$children) {
1402	my $child = $children->[$_];
1403	my $h = $h[$_];
1404	$child->configure (0, $y, $w, $h);
1405
1406	$y += $h;
1407	}
1408
1409	1
1410	}	1474	}
1411		1475
1412	#############################################################################	1476	#############################################################################
1413		1477
1414	package CFClient::UI::Label;	1478	package CFClient::UI::Label;
…		…
1431	ellipsise => 3, # end	1495	ellipsise => 3, # end
1432	layout => (new CFClient::Layout),	1496	layout => (new CFClient::Layout),
1433	fontsize => 1,	1497	fontsize => 1,
1434	align => -1,	1498	align => -1,
1435	valign => -1,	1499	valign => -1,
1436	padding => 2,	1500	padding_x => 2,
		1501	padding_y => 2,
1437	can_events => 0,	1502	can_events => 0,
1438	%arg	1503	%arg
1439	);	1504	);
1440		1505
1441	if (exists $self->{template}) {	1506	if (exists $self->{template}) {
…		…
1477	$self->{text} = "T$text";	1542	$self->{text} = "T$text";
1478		1543
1479	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;	1544	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1480	$self->{layout}->set_text ($text);	1545	$self->{layout}->set_text ($text);
1481		1546
		1547	$self->realloc;
1482	$self->update;	1548	$self->update;
1483	$self->check_size;
1484	}	1549	}
1485		1550
1486	sub set_markup {	1551	sub set_markup {
1487	my ($self, $markup) = @_;	1552	my ($self, $markup) = @_;
1488		1553
…		…
1492	my $rgba = $markup =~ /span.*(?:foreground|background)/;	1557	my $rgba = $markup =~ /span.*(?:foreground|background)/;
1493		1558
1494	$self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;	1559	$self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1495	$self->{layout}->set_markup ($markup);	1560	$self->{layout}->set_markup ($markup);
1496		1561
		1562	$self->realloc;
1497	$self->update;	1563	$self->update;
1498	$self->check_size;
1499	}	1564	}
1500		1565
1501	sub size_request {	1566	sub size_request {
1502	my ($self) = @_;	1567	my ($self) = @_;
1503		1568
…		…
1517		1582
1518	$w = List::Util::max $w, $w2;	1583	$w = List::Util::max $w, $w2;
1519	$h = List::Util::max $h, $h2;	1584	$h = List::Util::max $h, $h2;
1520	}	1585	}
1521		1586
1522	(	1587	($w, $h)
1523	$w + $self->{padding} * 2,
1524	$h + $self->{padding} * 2,
1525	)
1526	}	1588	}
1527		1589
1528	sub size_allocate {	1590	sub size_allocate {
1529	my ($self, $w, $h) = @_;	1591	my ($self, $w, $h) = @_;
1530		1592
		1593	delete $self->{ox};
		1594
1531	delete $self->{texture};	1595	delete $self->{texture}
		1596	unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1532	}	1597	}
1533		1598
1534	sub set_fontsize {	1599	sub set_fontsize {
1535	my ($self, $fontsize) = @_;	1600	my ($self, $fontsize) = @_;
1536		1601
1537	$self->{fontsize} = $fontsize;	1602	$self->{fontsize} = $fontsize;
1538	delete $self->{texture};	1603	delete $self->{texture};
1539		1604
1540	$self->update;	1605	$self->realloc;
1541	$self->check_size;
1542	}	1606	}
1543		1607
1544	sub _draw {	1608	sub _draw {
1545	my ($self) = @_;	1609	my ($self) = @_;
1546		1610
…		…
1552	$self->{layout}->set_width ($self->{w});	1616	$self->{layout}->set_width ($self->{w});
1553	$self->{layout}->set_ellipsise ($self->{ellipsise});	1617	$self->{layout}->set_ellipsise ($self->{ellipsise});
1554	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});	1618	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1555	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1619	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1556		1620
1557	my $tex = new_from_layout CFClient::Texture $self->{layout};	1621	new_from_layout CFClient::Texture $self->{layout}
		1622	};
1558		1623
		1624	unless (exists $self->{ox}) {
1559	$self->{ox} = int ($self->{align} < 0 ? $self->{padding}	1625	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1560	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}	1626	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1561	: ($self->{w} - $tex->{w}) * 0.5);	1627	: ($self->{w} - $tex->{w}) * 0.5);
1562		1628
1563	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding}	1629	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1564	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}	1630	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1565	: ($self->{h} - $tex->{h}) * 0.5);	1631	: ($self->{h} - $tex->{h}) * 0.5);
1566
1567	$tex
1568	};	1632	};
1569		1633
1570	glEnable GL_TEXTURE_2D;	1634	glEnable GL_TEXTURE_2D;
1571	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1635	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1572		1636
…		…
1626	sub set_text {	1690	sub set_text {
1627	my ($self, $text) = @_;	1691	my ($self, $text) = @_;
1628		1692
1629	$self->{cursor} = length $text;	1693	$self->{cursor} = length $text;
1630	$self->_set_text ($text);	1694	$self->_set_text ($text);
1631	$self->update;	1695
1632	$self->check_size;	1696	$self->realloc;
1633	}	1697	}
1634		1698
1635	sub get_text {	1699	sub get_text {
1636	$_[0]{text}	1700	$_[0]{text}
1637	}	1701	}
…		…
1667	$self->{cursor} = length $text;	1731	$self->{cursor} = length $text;
1668	} elsif ($uni == 27) {	1732	} elsif ($uni == 27) {
1669	$self->_emit ('escape');	1733	$self->_emit ('escape');
1670	} elsif ($uni) {	1734	} elsif ($uni) {
1671	substr $text, $self->{cursor}++, 0, chr $uni;	1735	substr $text, $self->{cursor}++, 0, chr $uni;
		1736	} else {
		1737	return 0;
1672	}	1738	}
1673		1739
1674	$self->_set_text ($text);	1740	$self->_set_text ($text);
1675	$self->update;	1741
1676	$self->check_size;	1742	$self->realloc;
		1743
		1744	1
1677	}	1745	}
1678		1746
1679	sub focus_in {	1747	sub focus_in {
1680	my ($self) = @_;	1748	my ($self) = @_;
1681		1749
…		…
1696	utf8::encode $text;	1764	utf8::encode $text;
1697	$self->{cursor} = length substr $text, 0, $idx;	1765	$self->{cursor} = length substr $text, 0, $idx;
1698		1766
1699	$self->_set_text ($self->{text});	1767	$self->_set_text ($self->{text});
1700	$self->update;	1768	$self->update;
		1769
		1770	1
1701	}	1771	}
1702		1772
1703	sub mouse_motion {	1773	sub mouse_motion {
1704	my ($self, $ev, $x, $y) = @_;	1774	my ($self, $ev, $x, $y) = @_;
1705	# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#	1775	# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
		1776
		1777	0
1706	}	1778	}
1707		1779
1708	sub _draw {	1780	sub _draw {
1709	my ($self) = @_;	1781	my ($self) = @_;
1710		1782
…		…
1787	} else {	1859	} else {
1788	$self->set_text ($self->{history_saveback});	1860	$self->set_text ($self->{history_saveback});
1789	}	1861	}
1790		1862
1791	} else {	1863	} else {
1792	$self->SUPER::key_down ($ev);	1864	return $self->SUPER::key_down ($ev)
		1865	}
		1866
1793	}	1867	1
1794
1795	}	1868	}
1796		1869
1797	#############################################################################	1870	#############################################################################
1798		1871
1799	package CFClient::UI::Button;	1872	package CFClient::UI::Button;
…		…
1808		1881
1809	sub new {	1882	sub new {
1810	my $class = shift;	1883	my $class = shift;
1811		1884
1812	$class->SUPER::new (	1885	$class->SUPER::new (
1813	padding => 4,	1886	padding_x => 4,
		1887	padding_y => 4,
1814	fg => [1, 1, 1],	1888	fg => [1, 1, 1],
1815	active_fg => [0, 0, 1],	1889	active_fg => [0, 0, 1],
1816	can_hover => 1,	1890	can_hover => 1,
1817	align => 0,	1891	align => 0,
1818	valign => 0,	1892	valign => 0,
…		…
1827	my ($self, $ev, $x, $y) = @_;	1901	my ($self, $ev, $x, $y) = @_;
1828		1902
1829	$self->emit ("activate")	1903	$self->emit ("activate")
1830	if $x >= 0 && $x < $self->{w}	1904	if $x >= 0 && $x < $self->{w}
1831	&& $y >= 0 && $y < $self->{h};	1905	&& $y >= 0 && $y < $self->{h};
		1906
		1907	1
1832	}	1908	}
1833		1909
1834	sub _draw {	1910	sub _draw {
1835	my ($self) = @_;	1911	my ($self) = @_;
1836		1912
…		…
1865		1941
1866	sub new {	1942	sub new {
1867	my $class = shift;	1943	my $class = shift;
1868		1944
1869	$class->SUPER::new (	1945	$class->SUPER::new (
1870	padding => 2,	1946	padding_x => 2,
		1947	padding_y => 2,
1871	fg => [1, 1, 1],	1948	fg => [1, 1, 1],
1872	active_fg => [1, 1, 0],	1949	active_fg => [1, 1, 0],
1873	bg => [0, 0, 0, 0.2],	1950	bg => [0, 0, 0, 0.2],
1874	active_bg => [1, 1, 1, 0.5],	1951	active_bg => [1, 1, 1, 0.5],
1875	state => 0,	1952	state => 0,
…		…
1879	}	1956	}
1880		1957
1881	sub size_request {	1958	sub size_request {
1882	my ($self) = @_;	1959	my ($self) = @_;
1883		1960
1884	($self->{padding} * 2 + 6) x 2	1961	(6) x 2
1885	}	1962	}
1886		1963
1887	sub button_down {	1964	sub button_down {
1888	my ($self, $ev, $x, $y) = @_;	1965	my ($self, $ev, $x, $y) = @_;
1889		1966
1890	if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}	1967	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1891	&& $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {	1968	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1892	$self->{state} = !$self->{state};	1969	$self->{state} = !$self->{state};
1893	$self->_emit (changed => $self->{state});	1970	$self->_emit (changed => $self->{state});
		1971	} else {
		1972	return 0
		1973	}
		1974
1894	}	1975	1
1895	}	1976	}
1896		1977
1897	sub _draw {	1978	sub _draw {
1898	my ($self) = @_;	1979	my ($self) = @_;
1899		1980
1900	$self->SUPER::_draw;	1981	$self->SUPER::_draw;
1901		1982
1902	glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0;	1983	glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1903		1984
1904	my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;	1985	my ($w, $h) = @$self{qw(w h)};
		1986
		1987	my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1905		1988
1906	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };	1989	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1907		1990
1908	my $tex = $self->{state} ? $tex[1] : $tex[0];	1991	my $tex = $self->{state} ? $tex[1] : $tex[0];
1909		1992
…		…
2174	fg => [1, 1, 1],	2257	fg => [1, 1, 1],
2175	active_fg => [0, 0, 0],	2258	active_fg => [0, 0, 0],
2176	bg => [0, 0, 0, 0.2],	2259	bg => [0, 0, 0, 0.2],
2177	active_bg => [1, 1, 1, 0.5],	2260	active_bg => [1, 1, 1, 0.5],
2178	range => [0, 0, 100, 10, 0],	2261	range => [0, 0, 100, 10, 0],
2179	req_w => $::WIDTH / 80,	2262	min_w => $::WIDTH / 80,
2180	req_h => $::WIDTH / 80,	2263	min_h => $::WIDTH / 80,
2181	vertical => 0,	2264	vertical => 0,
2182	can_hover => 1,	2265	can_hover => 1,
2183	inner_pad => 0.02,	2266	inner_pad => 0.02,
2184	@_	2267	@_
2185	);	2268	);
…		…
2188	$self->update;	2271	$self->update;
2189		2272
2190	$self	2273	$self
2191	}	2274	}
2192		2275
		2276	sub changed { }
		2277
2193	sub set_range {	2278	sub set_range {
2194	my ($self, $range) = @_;	2279	my ($self, $range) = @_;
2195		2280
2196	($range, $self->{range}) = ($self->{range}, $range);	2281	($range, $self->{range}) = ($self->{range}, $range);
2197		2282
…		…
2223	}	2308	}
2224		2309
2225	sub size_request {	2310	sub size_request {
2226	my ($self) = @_;	2311	my ($self) = @_;
2227		2312
2228	my $w = $self->{req_w};	2313	($self->{req_w}, $self->{req_h})
2229	my $h = $self->{req_h};
2230
2231	$self->{vertical} ? ($h, $w) : ($w, $h)
2232	}	2314	}
2233		2315
2234	sub button_down {	2316	sub button_down {
2235	my ($self, $ev, $x, $y) = @_;	2317	my ($self, $ev, $x, $y) = @_;
2236		2318
2237	$self->SUPER::button_down ($ev, $x, $y);	2319	$self->SUPER::button_down ($ev, $x, $y);
2238		2320
2239	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];	2321	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2240		2322
2241	$self->mouse_motion ($ev, $x, $y);	2323	$self->mouse_motion ($ev, $x, $y)
2242	}	2324	}
2243		2325
2244	sub mouse_motion {	2326	sub mouse_motion {
2245	my ($self, $ev, $x, $y) = @_;	2327	my ($self, $ev, $x, $y) = @_;
2246		2328
…		…
2250	my (undef, $lo, $hi, $page) = @{$self->{range}};	2332	my (undef, $lo, $hi, $page) = @{$self->{range}};
2251		2333
2252	$x = ($x - $self->{click}[1]) / ($w * $self->{scale});	2334	$x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2253		2335
2254	$self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));	2336	$self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
		2337	} else {
		2338	return 0;
		2339	}
		2340
2255	}	2341	1
2256	}	2342	}
2257		2343
2258	sub update {	2344	sub update {
2259	my ($self) = @_;	2345	my ($self) = @_;
2260		2346
…		…
2592	state => 0,	2678	state => 0,
2593	on_activate => \&toggle_flopper,	2679	on_activate => \&toggle_flopper,
2594	@_	2680	@_
2595	);	2681	);
2596		2682
2597	if ($self->{state}) {
2598	$self->{state} = 0;
2599	$self->toggle_flopper;
2600	}
2601
2602	$self	2683	$self
2603	}	2684	}
2604		2685
2605	sub toggle_flopper {	2686	sub toggle_flopper {
2606	my ($self) = @_;	2687	my ($self) = @_;
2607		2688
2608	# TODO: use animation	2689	$self->{other}->toggle_visibility;
2609	if ($self->{state} = !$self->{state}) {
2610	$CFClient::UI::ROOT->add ($self->{other});
2611	$self->{other}->move ($self->coord2global (0, $self->{h}));
2612	$self->_emit ("open");
2613	} else {
2614	$CFClient::UI::ROOT->remove ($self->{other});
2615	$self->_emit ("close");
2616	}
2617
2618	$self->_emit (changed => $self->{state});
2619	}	2690	}
2620		2691
2621	#############################################################################	2692	#############################################################################
2622		2693
2623	package CFClient::UI::Tooltip;	2694	package CFClient::UI::Tooltip;
…		…
2636	}	2707	}
2637		2708
2638	sub set_tooltip_from {	2709	sub set_tooltip_from {
2639	my ($self, $widget) = @_;	2710	my ($self, $widget) = @_;
2640		2711
		2712	my $tooltip = $widget->{tooltip};
		2713
		2714	if ($ENV{CFPLUS_DEBUG} & 2) {
		2715	$tooltip .= "\n\n" . (ref $widget) . "\n"
		2716	. "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
		2717	. "req $widget->{req_w} $widget->{req_h}\n"
		2718	. "visible $widget->{visible}";
		2719	}
		2720
2641	$self->add (new CFClient::UI::Label	2721	$self->add (new CFClient::UI::Label
2642	markup => $widget->{tooltip},	2722	markup => $tooltip,
2643	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	2723	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2644	fontsize => 0.8,	2724	fontsize => 0.8,
2645	fg => [0, 0, 0, 1],	2725	fg => [0, 0, 0, 1],
2646	ellipsise => 0,	2726	ellipsise => 0,
2647	font => ($widget->{tooltip_font} || $::FONT_PROP),	2727	font => ($widget->{tooltip_font} || $::FONT_PROP),
…		…
2658		2738
2659	sub size_allocate {	2739	sub size_allocate {
2660	my ($self, $w, $h) = @_;	2740	my ($self, $w, $h) = @_;
2661		2741
2662	$self->SUPER::size_allocate ($w - 4, $h - 4);	2742	$self->SUPER::size_allocate ($w - 4, $h - 4);
		2743	}
		2744
		2745	sub visibility_change {
		2746	my ($self, $visible) = @_;
		2747
		2748	return unless $visible;
		2749
		2750	$self->{root}->on_post_alloc ("move_$self" => sub {
		2751	my $widget = $self->{owner}
		2752	or return;
		2753
		2754	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
		2755
		2756	($x, $y) = $widget->coord2global (-$self->{w}, 0)
		2757	if $x + $self->{w} > $::WIDTH;
		2758
		2759	$self->move_abs ($x, $y);
		2760	});
2663	}	2761	}
2664		2762
2665	sub _draw {	2763	sub _draw {
2666	my ($self) = @_;	2764	my ($self) = @_;
2667		2765
…		…
2684	glVertex $w, $h;	2782	glVertex $w, $h;
2685	glVertex $w, 0;	2783	glVertex $w, 0;
2686	glEnd;	2784	glEnd;
2687		2785
2688	glTranslate 2 - 0.375, 2 - 0.375;	2786	glTranslate 2 - 0.375, 2 - 0.375;
		2787
2689	$self->SUPER::_draw;	2788	$self->SUPER::_draw;
2690	}	2789	}
2691		2790
2692	#############################################################################	2791	#############################################################################
2693		2792
…		…
2769	$self->SUPER::DESTROY;	2868	$self->SUPER::DESTROY;
2770	}	2869	}
2771		2870
2772	#############################################################################	2871	#############################################################################
2773		2872
2774	package CFClient::UI::Inventory;	2873	package CFClient::UI::Buttonbar;
2775		2874
2776	our @ISA = CFClient::UI::ScrolledWindow::;	2875	our @ISA = CFClient::UI::HBox::;
2777		2876
2778	sub new {	2877	# TODO: should actualyl wrap buttons and other goodies.
2779	my $class = shift;
2780
2781	my $self = $class->SUPER::new (
2782	scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2783	@_,
2784	);
2785
2786	$self
2787	}
2788
2789	sub set_items {
2790	my ($self, $items) = @_;
2791
2792	$self->{scrolled}->clear;
2793	return unless $items;
2794
2795	my @items = sort {
2796	($a->{type} <=> $b->{type})
2797	or ($a->{name} cmp $b->{name})
2798	} @$items;
2799
2800	$self->{real_items} = \@items;
2801
2802	my $row = 0;
2803	for my $item (@items) {
2804	CFClient::Item::update_widgets $item;
2805
2806	$self->{scrolled}->add (0, $row, $item->{face_widget});
2807	$self->{scrolled}->add (1, $row, $item->{desc_widget});
2808	$self->{scrolled}->add (2, $row, $item->{weight_widget});
2809
2810	$row++;
2811	}
2812	}
2813
2814	sub size_request {
2815	my ($self) = @_;
2816	($self->{req_w}, $self->{req_h});
2817	}
2818		2878
2819	#############################################################################	2879	#############################################################################
2820		2880
2821	package CFClient::UI::Menu;	2881	package CFClient::UI::Menu;
2822		2882
…		…
2863	# maybe save $GRAB? must be careful about events...	2923	# maybe save $GRAB? must be careful about events...
2864	$GRAB = $self;	2924	$GRAB = $self;
2865	$self->{button} = $ev->{button};	2925	$self->{button} = $ev->{button};
2866		2926
2867	$self->show;	2927	$self->show;
2868	$self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);	2928	$self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2869	}	2929	}
2870		2930
2871	sub mouse_motion {	2931	sub mouse_motion {
2872	my ($self, $ev, $x, $y) = @_;	2932	my ($self, $ev, $x, $y) = @_;
2873		2933
2874	# TODO: should use vbox->find_widget or so	2934	# TODO: should use vbox->find_widget or so
2875	$HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});	2935	$HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2876	$self->{hover} = $self->{item}{$HOVER};	2936	$self->{hover} = $self->{item}{$HOVER};
		2937
		2938	0
2877	}	2939	}
2878		2940
2879	sub button_up {	2941	sub button_up {
2880	my ($self, $ev, $x, $y) = @_;	2942	my ($self, $ev, $x, $y) = @_;
2881		2943
…		…
2883	undef $GRAB;	2945	undef $GRAB;
2884	$self->hide;	2946	$self->hide;
2885		2947
2886	$self->_emit ("popdown");	2948	$self->_emit ("popdown");
2887	$self->{hover}[1]->() if $self->{hover};	2949	$self->{hover}[1]->() if $self->{hover};
		2950	} else {
		2951	return 0
		2952	}
		2953
		2954	1
		2955	}
		2956
		2957	#############################################################################
		2958
		2959	package CFClient::UI::Multiplexer;
		2960
		2961	our @ISA = CFClient::UI::Container::;
		2962
		2963	sub new {
		2964	my $class = shift;
		2965
		2966	my $self = $class->SUPER::new (
		2967	@_,
		2968	);
		2969
		2970	$self->{current} = $self->{children}[0]
		2971	if @{ $self->{children} };
		2972
		2973	$self
		2974	}
		2975
		2976	sub add {
		2977	my ($self, @widgets) = @_;
		2978
		2979	$self->SUPER::add (@widgets);
		2980
		2981	$self->{current} = $self->{children}[0]
		2982	if @{ $self->{children} };
		2983	}
		2984
		2985	sub set_current_page {
		2986	my ($self, $page_or_widget) = @_;
		2987
		2988	my $widget = ref $page_or_widget
		2989	? $page_or_widget
		2990	: $self->{children}[$page_or_widget];
		2991
		2992	$self->{current} = $widget;
		2993	$self->{current}->configure (0, 0, $self->{w}, $self->{h});
		2994
		2995	$self->_emit (page_changed => $self->{current});
		2996
		2997	$self->realloc;
		2998	}
		2999
		3000	sub visible_children {
		3001	$_[0]{current}
		3002	}
		3003
		3004	sub size_request {
		3005	my ($self) = @_;
		3006
		3007	$self->{current}->size_request
		3008	}
		3009
		3010	sub size_allocate {
		3011	my ($self, $w, $h) = @_;
		3012
		3013	$self->{current}->configure (0, 0, $w, $h);
		3014	}
		3015
		3016	sub _draw {
		3017	my ($self) = @_;
		3018
		3019	$self->{current}->draw;
		3020	}
		3021
		3022	#############################################################################
		3023
		3024	package CFClient::UI::Notebook;
		3025
		3026	our @ISA = CFClient::UI::VBox::;
		3027
		3028	sub new {
		3029	my $class = shift;
		3030
		3031	my $self = $class->SUPER::new (
		3032	buttonbar => (new CFClient::UI::Buttonbar),
		3033	multiplexer => (new CFClient::UI::Multiplexer expand => 1),
		3034	# filter => # will be put between multiplexer and $self
		3035	@_,
		3036	);
2888	}	3037
		3038	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};
		3039	$self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
		3040
		3041	$self
		3042	}
		3043
		3044	sub add {
		3045	my ($self, $title, $widget, $tooltip) = @_;
		3046
		3047	Scalar::Util::weaken $self;
		3048
		3049	$self->{buttonbar}->add (new CFClient::UI::Button
		3050	markup => $title,
		3051	tooltip => $tooltip,
		3052	on_activate => sub { $self->set_current_page ($widget) },
		3053	);
		3054
		3055	$self->{multiplexer}->add ($widget);
		3056	}
		3057
		3058	sub set_current_page {
		3059	my ($self, $page) = @_;
		3060
		3061	$self->{multiplexer}->set_current_page ($page);
		3062	$self->_emit (page_changed => $self->{multiplexer}{current});
2889	}	3063	}
2890		3064
2891	#############################################################################	3065	#############################################################################
2892		3066
2893	package CFClient::UI::Statusbox;	3067	package CFClient::UI::Statusbox;
…		…
2998	$self->SUPER::reconfigure;	3172	$self->SUPER::reconfigure;
2999	}	3173	}
3000		3174
3001	#############################################################################	3175	#############################################################################
3002		3176
3003	package CFClient::UI::Root;	3177	package CFClient::UI::Inventory;
3004		3178
3005	our @ISA = CFClient::UI::Container::;	3179	our @ISA = CFClient::UI::ScrolledWindow::;
3006
3007	use CFClient::OpenGL;
3008		3180
3009	sub new {	3181	sub new {
3010	my $class = shift;	3182	my $class = shift;
3011		3183
3012	$class->SUPER::new (	3184	my $self = $class->SUPER::new (
		3185	child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
		3186	@_,
		3187	);
		3188
		3189	$self
		3190	}
		3191
		3192	sub set_items {
		3193	my ($self, $items) = @_;
		3194
		3195	$self->{child}->clear;
		3196	return unless $items;
		3197
		3198	my @items = sort {
		3199	($a->{type} <=> $b->{type})
		3200	or ($a->{name} cmp $b->{name})
		3201	} @$items;
		3202
		3203	$self->{real_items} = \@items;
		3204
		3205	my $row = 0;
		3206	for my $item (@items) {
		3207	CFClient::Item::update_widgets $item;
		3208
		3209	$self->{child}->add (0, $row, $item->{face_widget});
		3210	$self->{child}->add (1, $row, $item->{desc_widget});
		3211	$self->{child}->add (2, $row, $item->{weight_widget});
		3212
		3213	$row++;
		3214	}
		3215	}
		3216
		3217	#############################################################################
		3218
		3219	package CFClient::UI::BindEditor;
		3220
		3221	our @ISA = CFClient::UI::FancyFrame::;
		3222
		3223	sub new {
		3224	my $class = shift;
		3225
		3226	my $self = $class->SUPER::new (binding => [], commands => [], @_);
		3227
		3228	$self->add (my $vb = new CFClient::UI::VBox);
		3229
		3230
		3231	$vb->add ($self->{rec_btn} = new CFClient::UI::Button
		3232	text => "start recording",
		3233	tooltip => "Start/Stops recording of actions."
		3234	."All subsequent actions after the recording started will be captured."
		3235	."The actions are displayed after the record was stopped."
		3236	."To bind the action you have to click on the 'Bind' button",
		3237	on_activate => sub {
		3238	unless ($self->{recording}) {
		3239	$self->start;
		3240	} else {
		3241	$self->stop;
		3242	}
		3243	});
		3244
		3245	$vb->add (new CFClient::UI::Label text => "Actions:");
		3246	$vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
		3247
		3248	$vb->add (new CFClient::UI::Label text => "Bound to: ");
		3249	$vb->add (my $hb = new CFClient::UI::HBox);
		3250	$hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
		3251	$hb->add (new CFClient::UI::Button
		3252	text => "bind",
		3253	tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
		3254	on_activate => sub {
		3255	$self->ask_for_bind;
		3256	});
		3257
		3258	$vb->add (my $hb = new CFClient::UI::HBox);
		3259	$hb->add (new CFClient::UI::Button
		3260	text => "ok",
		3261	expand => 1,
		3262	tooltip => "This closes the binding editor and saves the binding",
		3263	on_activate => sub {
		3264	$self->hide;
		3265	$self->commit;
		3266	});
		3267
		3268	$hb->add (new CFClient::UI::Button
		3269	text => "cancel",
		3270	expand => 1,
		3271	tooltip => "This closes the binding editor without saving",
		3272	on_activate => sub {
		3273	$self->hide;
		3274	$self->{binding_cancel}->()
		3275	if $self->{binding_cancel};
		3276	});
		3277
		3278	$self->update_binding_widgets;
		3279
		3280	$self
		3281	}
		3282
		3283	sub commit {
		3284	my ($self) = @_;
		3285	my ($mod, $sym, $cmds) = $self->get_binding;
		3286	if ($sym != 0 && @$cmds > 0) {
		3287	$::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
		3288	."'. Don't forget 'Save Config'!");
		3289	$self->{binding_change}->($mod, $sym, $cmds)
		3290	if $self->{binding_change};
		3291	} else {
		3292	$::STATUSBOX->add ("No action bound, no key or action specified!");
		3293	$self->{binding_cancel}->()
		3294	if $self->{binding_cancel};
		3295	}
		3296	}
		3297
		3298	sub start {
		3299	my ($self) = @_;
		3300
		3301	$self->{rec_btn}->set_text ("stop recording");
		3302	$self->{recording} = 1;
		3303	$self->clear_command_list;
		3304	$::CONN->start_record if $::CONN;
		3305	}
		3306
		3307	sub stop {
		3308	my ($self) = @_;
		3309
		3310	$self->{rec_btn}->set_text ("start recording");
		3311	$self->{recording} = 0;
		3312
		3313	my $rec;
		3314	$rec = $::CONN->stop_record if $::CONN;
		3315	return unless ref $rec eq 'ARRAY';
		3316	$self->set_command_list ($rec);
		3317	}
		3318
		3319
		3320	sub ask_for_bind_and_commit {
		3321	my ($self) = @_;
		3322	$self->ask_for_bind (1);
		3323	}
		3324
		3325	sub ask_for_bind {
		3326	my ($self, $commit) = @_;
		3327
		3328	CFClient::Binder::open_binding_dialog (sub {
		3329	my ($mod, $sym) = @_;
		3330	$self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
		3331	$self->update_binding_widgets;
		3332	$self->commit if $commit;
		3333	});
		3334	}
		3335
		3336	# $mod and $sym are the modifiers and key symbol
		3337	# $cmds is a array ref of strings (the commands)
		3338	# $cb is the callback that is executed on OK
		3339	# $ccb is the callback that is executed on CANCEL and
		3340	# when the binding was unsuccessful on OK
		3341	sub set_binding {
		3342	my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
		3343
		3344	$self->clear_command_list;
		3345	$self->{recording} = 0;
		3346	$self->{rec_btn}->set_text ("start recording");
		3347
		3348	$self->{binding} = [$mod, $sym];
		3349	$self->{commands} = $cmds;
		3350
		3351	$self->{binding_change} = $cb;
		3352	$self->{binding_cancel} = $ccb;
		3353
		3354	$self->update_binding_widgets;
		3355	}
		3356
		3357	# this is a shortcut method that asks for a binding
		3358	# and then just binds it.
		3359	sub do_quick_binding {
		3360	my ($self, $cmds) = @_;
		3361	$self->set_binding (undef, undef, $cmds, sub {
		3362	$::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
		3363	});
		3364	$self->ask_for_bind (1);
		3365	}
		3366
		3367	sub update_binding_widgets {
		3368	my ($self) = @_;
		3369	my ($mod, $sym, $cmds) = $self->get_binding;
		3370	$self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
		3371	$self->set_command_list ($cmds);
		3372	}
		3373
		3374	sub get_binding {
		3375	my ($self) = @_;
		3376	return (
		3377	$self->{binding}->[0],
		3378	$self->{binding}->[1],
		3379	[ grep { defined $_ } @{$self->{commands}} ]
		3380	);
		3381	}
		3382
		3383	sub clear_command_list {
		3384	my ($self) = @_;
		3385	$self->{cmdbox}->clear ();
		3386	}
		3387
		3388	sub set_command_list {
		3389	my ($self, $cmds) = @_;
		3390
		3391	$self->{cmdbox}->clear ();
		3392	$self->{commands} = $cmds;
		3393
		3394	my $idx = 0;
		3395
		3396	for (@$cmds) {
		3397	$self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
		3398
		3399	my $i = $idx;
		3400	$hb->add (new CFClient::UI::Label text => $_);
		3401	$hb->add (new CFClient::UI::Button
		3402	text => "delete",
		3403	tooltip => "Deletes the action from the record",
		3404	on_activate => sub {
		3405	$self->{cmdbox}->remove ($hb);
		3406	$cmds->[$i] = undef;
		3407	});
		3408
		3409
		3410	$idx++
		3411	}
		3412	}
		3413
		3414	#############################################################################
		3415
		3416	package CFClient::UI::SpellList;
		3417
		3418	our @ISA = CFClient::UI::Table::;
		3419
		3420	sub new {
		3421	my $class = shift;
		3422
		3423	my $self = $class->SUPER::new (
		3424	binding => [],
		3425	commands => [],
		3426	@_,
		3427	)
		3428	}
		3429
		3430	# XXX: Do sorting? Argl...
		3431	sub add_spell {
		3432	my ($self, $spell) = @_;
		3433	$self->{spells}->{$spell->{name}} = $spell;
		3434
		3435	$self->add (0, $self->{tbl_idx}, new CFClient::UI::Face
		3436	face => $spell->{face},
		3437	can_hover => 1,
		3438	can_events => 1,
		3439	tooltip => $spell->{message});
		3440
		3441	$self->add (1, $self->{tbl_idx}, new CFClient::UI::Label
		3442	text => $spell->{name},
		3443	can_hover => 1,
		3444	can_events => 1,
		3445	tooltip => $spell->{message},
		3446	expand => 1);
		3447
		3448	$self->add (2, $self->{tbl_idx}, new CFClient::UI::Label
		3449	text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
		3450	$spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
		3451	expand => 1);
		3452
		3453	$self->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
		3454	text => "bind to key",
		3455	on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
		3456	}
		3457
		3458	sub rebuild_spell_list {
		3459	my ($self) = @_;
		3460	$self->{tbl_idx} = 0;
		3461	$self->add_spell ($_) for values %{$self->{spells}};
		3462	}
		3463
		3464	sub remove_spell {
		3465	my ($self, $spell) = @_;
		3466	delete $self->{spells}->{$spell->{name}};
		3467	$self->rebuild_spell_list;
		3468	}
		3469
		3470	#############################################################################
		3471
		3472	package CFClient::UI::Root;
		3473
		3474	our @ISA = CFClient::UI::Container::;
		3475
		3476	use CFClient::OpenGL;
		3477
		3478	sub new {
		3479	my $class = shift;
		3480
		3481	my $self = $class->SUPER::new (
3013	visible => 1,	3482	visible => 1,
3014	@_,	3483	@_,
3015	)	3484	);
3016	}
3017		3485
3018	sub configure {	3486	Scalar::Util::weaken ($self->{root} = $self);
3019	my ($self, $x, $y, $w, $h) = @_;
3020		3487
3021	$self->{w} = $w;	3488	$self
3022	$self->{h} = $h;
3023	}
3024
3025	sub check_size {
3026	my ($self) = @_;
3027
3028	$self->size_allocate ($self->{w}, $self->{h})
3029	if $self->{w};
3030	}	3489	}
3031		3490
3032	sub size_request {	3491	sub size_request {
3033	my ($self) = @_;	3492	my ($self) = @_;
3034		3493
3035	($self->{w}, $self->{h})	3494	($self->{w}, $self->{h})
		3495	}
		3496
		3497	sub _to_pixel {
		3498	my ($coord, $size, $max) = @_;
		3499
		3500	$coord =
		3501	$coord eq "center" ? ($max - $size) * 0.5
		3502	: $coord eq "max" ? $max
		3503	: $coord;
		3504
		3505	$coord = 0 if $coord < 0;
		3506	$coord = $max - $size if $coord > $max - $size;
		3507
		3508	int $coord + 0.5
3036	}	3509	}
3037		3510
3038	sub size_allocate {	3511	sub size_allocate {
3039	my ($self, $w, $h) = @_;	3512	my ($self, $w, $h) = @_;
3040		3513
3041	for my $child ($self->children) {	3514	for my $child ($self->children) {
3042	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};	3515	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3043		3516
3044	$X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1	3517	$X = $child->{force_x} if exists $child->{force_x};
3045	if exists $child->{req_x};	3518	$Y = $child->{force_y} if exists $child->{force_y};
3046		3519
3047	$Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1	3520	$X = _to_pixel $X, $W, $self->{w};
3048	if exists $child->{req_y};	3521	$Y = _to_pixel $Y, $H, $self->{h};
3049
3050	$X = $self->{user_x} if exists $self->{user_x};
3051	$Y = $self->{user_y} if exists $self->{user_y};
3052
3053	$X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
3054	$Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
3055		3522
3056	$child->configure ($X, $Y, $W, $H);	3523	$child->configure ($X, $Y, $W, $H);
3057	}	3524	}
3058	}	3525	}
3059		3526
…		…
3070	}	3537	}
3071		3538
3072	sub update {	3539	sub update {
3073	my ($self) = @_;	3540	my ($self) = @_;
3074		3541
3075	$self->check_size;
3076	$::WANT_REFRESH++;	3542	$::WANT_REFRESH++;
3077	}	3543	}
3078		3544
3079	sub add {	3545	sub add {
3080	my ($self, @children) = @_;	3546	my ($self, @children) = @_;
3081		3547
3082	for (my @widgets = @children; my $w = pop @widgets; ) {
3083	push @widgets, $w->children;
3084	$w->{root} = $self;
3085	$w->{visible} = $self->{visible} + 1;
3086	}
3087
3088	for my $child (@children) {
3089	$child->{is_toplevel} = 1;	3548	$_->{is_toplevel} = 1
3090		3549	for @children;
3091	# integerise window positions
3092	$child->{x} = int $child->{x};
3093	$child->{y} = int $child->{y};
3094	}
3095		3550
3096	$self->SUPER::add (@children);	3551	$self->SUPER::add (@children);
3097	}	3552	}
3098		3553
3099	sub remove {	3554	sub remove {
3100	my ($self, @children) = @_;	3555	my ($self, @children) = @_;
3101		3556
3102	$self->SUPER::remove (@children);	3557	$self->SUPER::remove (@children);
		3558
		3559	delete $self->{is_toplevel}
		3560	for @children;
3103		3561
3104	while (@children) {	3562	while (@children) {
3105	my $w = pop @children;	3563	my $w = pop @children;
3106	push @children, $w->children;	3564	push @children, $w->children;
3107	$w->set_invisible;	3565	$w->set_invisible;
…		…
3126	while ($self->{refresh_hook}) {	3584	while ($self->{refresh_hook}) {
3127	$_->()	3585	$_->()
3128	for values %{delete $self->{refresh_hook}};	3586	for values %{delete $self->{refresh_hook}};
3129	}	3587	}
3130		3588
3131	if ($self->{check_size}) {	3589	if ($self->{realloc}) {
		3590	my %queue;
3132	my @queue;	3591	my @queue;
		3592	my $widget;
3133		3593
3134	for (;;) {	3594	outer:
3135	if ($self->{check_size}) {	3595	while () {
3136	#TODO use array-of-depth approach	3596	if (my $realloc = delete $self->{realloc}) {
		3597	for $widget (values %$realloc) {
		3598	$widget->{visible} or next; # do not resize invisible widgets
3137		3599
3138	@queue = sort { $a->{visible} <=> $b->{visible} }	3600	$queue{$widget+0}++ and next; # duplicates are common
3139	@queue, values %{delete $self->{check_size}};	3601
		3602	push @{ $queue[$widget->{visible}] }, $widget;
		3603	}
3140	}	3604	}
3141		3605
		3606	while () {
		3607	@queue or last outer;
		3608
3142	my $widget = pop @queue || last;	3609	$widget = pop @{ $queue[-1] || [] }
3143		3610	and last;
3144	defined $widget->{visible} or last; # do not resize invisible widgets
3145
3146	my ($w, $h) = $widget->{user_w} && $widget->{user_h}
3147	? @$widget{qw(user_w user_h)}
3148	: $widget->size_request;
3149
3150	if (delete $widget->{force_alloc}
3151	or $w != $widget->{req_w} or $h != $widget->{req_h}) {
3152	Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
3153		3611
		3612	pop @queue;
		3613	}
		3614
		3615	delete $queue{$widget+0};
		3616
		3617	my ($w, $h) = $widget->size_request;
		3618
		3619	$w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2;
		3620	$h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2;
		3621
		3622	$w = $widget->{force_w} if exists $widget->{force_w};
		3623	$h = $widget->{force_h} if exists $widget->{force_h};
		3624
		3625	if ($widget->{req_w} != $w || $widget->{req_h} != $h
		3626	|| delete $widget->{force_realloc}) {
3154	$widget->{req_w} = $w;	3627	$widget->{req_w} = $w;
3155	$widget->{req_h} = $h;	3628	$widget->{req_h} = $h;
3156		3629
3157	$self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h];	3630	$self->{size_alloc}{$widget+0} = $widget;
3158		3631
3159	$widget->{parent}->check_size
3160	if $widget->{parent};	3632	if (my $parent = $widget->{parent}) {
		3633	$self->{realloc}{$parent+0} = $parent
		3634	unless $queue{$parent+0};
		3635
		3636	$parent->{force_size_alloc} = 1;
		3637	$self->{size_alloc}{$parent+0} = $parent;
		3638	}
3161	}	3639	}
		3640
		3641	delete $self->{realloc}{$widget+0};
3162	}	3642	}
3163	}	3643	}
3164		3644
3165	while ($self->{size_alloc}) {	3645	while (my $size_alloc = delete $self->{size_alloc}) {
3166	for (values %{delete $self->{size_alloc}}) {	3646	my @queue = sort { $b->{visible} <=> $a->{visible} }
3167	my ($widget, $w, $h) = @$_;	3647	values %$size_alloc;
		3648
		3649	while () {
		3650	my $widget = pop @queue || last;
		3651
		3652	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3168		3653
3169	$w = 0 if $w < 0;	3654	$w = 0 if $w < 0;
3170	$h = 0 if $h < 0;	3655	$h = 0 if $h < 0;
3171		3656
		3657	$w = int $w + 0.5;
		3658	$h = int $h + 0.5;
		3659
		3660	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
		3661	$widget->{old_w} = $widget->{w};
		3662	$widget->{old_h} = $widget->{h};
		3663
3172	$widget->{w} = $w;	3664	$widget->{w} = $w;
3173	$widget->{h} = $h;	3665	$widget->{h} = $h;
		3666
3174	$widget->emit (size_allocate => $w, $h);	3667	$widget->emit (size_allocate => $w, $h);
		3668	}
3175	}	3669	}
3176	}	3670	}
3177		3671
3178	while ($self->{post_alloc_hook}) {	3672	while ($self->{post_alloc_hook}) {
3179	$_->()	3673	$_->()
3180	for values %{delete $self->{post_alloc_hook}};	3674	for values %{delete $self->{post_alloc_hook}};
3181	}	3675	}
		3676
3182		3677
3183	glViewport 0, 0, $::WIDTH, $::HEIGHT;	3678	glViewport 0, 0, $::WIDTH, $::HEIGHT;
3184	glClearColor +($::CFG->{fow_intensity}) x 3, 1;	3679	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3185	glClear GL_COLOR_BUFFER_BIT;	3680	glClear GL_COLOR_BUFFER_BIT;
3186		3681
…		…
3188	glLoadIdentity;	3683	glLoadIdentity;
3189	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;	3684	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3190	glMatrixMode GL_MODELVIEW;	3685	glMatrixMode GL_MODELVIEW;
3191	glLoadIdentity;	3686	glLoadIdentity;
3192		3687
		3688	{
		3689	package CFClient::UI::Base;
		3690
		3691	($draw_x, $draw_y, $draw_w, $draw_h) =
		3692	(0, 0, $self->{w}, $self->{h});
		3693	}
		3694
3193	$self->_draw;	3695	$self->_draw;
3194	}	3696	}
3195		3697
3196	#############################################################################	3698	#############################################################################
3197		3699

Diff Legend

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