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.246 by root, Sun May 28 00:40:51 2006 UTC vs.
Revision 1.276 by root, Sun Jun 4 00:16:01 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->{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.]+$/;
181	$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};
182	$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};
		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
183	}	189	}
184	}	190	}
185		191
186	reconfigure_widgets;	192	reconfigure_widgets;
187	}	193	}
…		…
196		202
197	sub new {	203	sub new {
198	my $class = shift;	204	my $class = shift;
199		205
200	my $self = bless {	206	my $self = bless {
201	x => 0,	207	x => "center",
202	y => 0,	208	y => "center",
203	z => 0,	209	z => 0,
		210	w => undef,
		211	h => undef,
204	can_events => 1,	212	can_events => 1,
205	@_	213	@_
206	}, $class;	214	}, $class;
		215
		216	Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
207		217
208	for (keys %$self) {	218	for (keys %$self) {
209	if (/^on_(.*)$/) {	219	if (/^on_(.*)$/) {
210	$self->connect ($1 => delete $self->{$_});	220	$self->connect ($1 => delete $self->{$_});
211	}	221	}
212	}	222	}
213		223
214	Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
215
216	if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {	224	if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {
217	$self->{req_x} = $layout->{x} * $::WIDTH;	225	$self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x};
218	$self->{req_y} = $layout->{y} * $::HEIGHT;	226	$self->{y} = $layout->{y} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{y};
219	$self->{def_w} = ($layout->{w} != 0 ? $layout->{w} : 1) * $::WIDTH;	227	$self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{w};
220	$self->{def_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};
221	}	234	}
222		235
223	$self	236	$self
224	}
225
226	sub toggle_visibility {
227	my ($self) = @_;
228
229	if ($self->{visible}) {
230	$self->hide;
231	} else {
232	$self->show;
233	}
234	}	237	}
235		238
236	sub destroy {	239	sub destroy {
237	my ($self) = @_;	240	my ($self) = @_;
238		241
…		…
240	%$self = ();	243	%$self = ();
241	}	244	}
242		245
243	sub show {	246	sub show {
244	my ($self) = @_;	247	my ($self) = @_;
		248
245	return if $self->{parent};	249	return if $self->{parent};
246		250
247	$CFClient::UI::ROOT->add ($self);	251	$CFClient::UI::ROOT->add ($self);
248	}
249
250	sub show_centered {
251	my ($self) = @_;
252	return if $self->{parent};
253
254	$self->show;
255
256	$CFClient::UI::ROOT->on_post_alloc (
257	"centered $self" => sub {
258	$self->move (($::WIDTH - $self->{w}) * 0.5, ($::HEIGHT - $self->{h}) * 0.5);
259	},
260	);
261	}	252	}
262		253
263	sub set_visible {	254	sub set_visible {
264	my ($self) = @_;	255	my ($self) = @_;
265		256
266	return if $self->{visible};	257	return if $self->{visible};
267		258
268	$self->{root} = $self->{parent}{root};	259	$self->{root} = $self->{parent}{root};
269	$self->{visible} = $self->{parent}{visible} + 1;	260	$self->{visible} = $self->{parent}{visible} + 1;
270		261
271	$self->emit (visibility_change => 1)	262	$self->emit (visibility_change => 1);
		263
		264	$self->realloc if !exists $self->{req_w};
		265
		266	$_->set_visible for $self->children;
272	}	267	}
273		268
274	sub set_invisible {	269	sub set_invisible {
275	my ($self) = @_;	270	my ($self) = @_;
276		271
277	return unless $self->{visible};	272	return unless $self->{visible};
278		273
279	# broken show/hide model	274	$_->set_invisible for $self->children;
280		275
281	delete $self->{root};	276	delete $self->{root};
282	delete $self->{visible};	277	delete $self->{visible};
283		278
284	undef $GRAB if $GRAB == $self;	279	undef $GRAB if $GRAB == $self;
285	undef $HOVER if $HOVER == $self;	280	undef $HOVER if $HOVER == $self;
286		281
287	CFClient::UI::check_tooltip	282	CFClient::UI::check_tooltip
288	if $CFClient::UI::TOOLTIP->{owner} == $self;	283	if $TOOLTIP->{owner} == $self;
289		284
290	$self->focus_out;	285	$self->focus_out;
291		286
292	$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;
293	}	305	}
294		306
295	sub hide {	307	sub hide {
296	my ($self) = @_;	308	my ($self) = @_;
297		309
…		…
299		311
300	$self->{parent}->remove ($self)	312	$self->{parent}->remove ($self)
301	if $self->{parent};	313	if $self->{parent};
302	}	314	}
303		315
304	sub move {	316	sub move_abs {
305	my ($self, $x, $y, $z) = @_;	317	my ($self, $x, $y, $z) = @_;
306		318
307	$self->{x} = int $x;	319	$self->{x} = List::Util::max 0, int $x;
308	$self->{y} = int $y;	320	$self->{y} = List::Util::max 0, int $y;
309	$self->{z} = $z if defined $z;	321	$self->{z} = $z if defined $z;
310		322
311	$self->update;	323	$self->update;
312	}	324	}
313		325
314	sub set_size {	326	sub set_size {
315	my ($self, $w, $h) = @_;	327	my ($self, $w, $h) = @_;
316		328
317	$self->{def_w} = $w;	329	$self->{force_w} = $w;
318	$self->{def_h} = $h;	330	$self->{force_h} = $h;
319		331
320	$self->check_size;	332	$self->realloc;
321	}	333	}
322		334
323	sub size_request {	335	sub size_request {
324	require Carp;	336	require Carp;
325	Carp::confess "size_request is abstract";	337	Carp::confess "size_request is abstract";
…		…
327		339
328	sub configure {	340	sub configure {
329	my ($self, $x, $y, $w, $h) = @_;	341	my ($self, $x, $y, $w, $h) = @_;
330		342
331	if ($self->{aspect}) {	343	if ($self->{aspect}) {
		344	my ($ow, $oh) = ($w, $h);
		345
332	my $w2 = List::Util::min $w, int $h * $self->{aspect};	346	$w = List::Util::min $w, int $h * $self->{aspect};
333	my $h2 = List::Util::min $h, int $w / $self->{aspect};	347	$h = List::Util::min $h, int $w / $self->{aspect};
334		348
335	# use alignment to adjust x, y	349	# use alignment to adjust x, y
336		350
337	$x += int +($w - $w2) * 0.5;	351	$x += int 0.5 * ($ow - $w);
338	$y += int +($h - $h2) * 0.5;	352	$y += int 0.5 * ($oh - $h);
339
340	($w, $h) = ($w2, $h2);
341	}	353	}
342		354
343	if ($self->{x} != $x || $self->{y} != $y) {	355	if ($self->{x} ne $x || $self->{y} ne $y) {
344	$self->{x} = $x;	356	$self->{x} = $x;
345	$self->{y} = $y;	357	$self->{y} = $y;
346	$self->update;	358	$self->update;
347	}	359	}
348		360
349	if ($self->{w} != $w || $self->{h} != $h) {	361	if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
350	$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;
351	}	368	}
352	}	369	}
353		370
354	sub size_allocate {	371	sub size_allocate {
355	# nothing to be done	372	# nothing to be done
356	}	373	}
357		374
358	sub reconfigure {
359	my ($self) = @_;
360
361	$self->check_size (1);
362	$self->update;
363	}
364
365	sub children {	375	sub children {
		376	# nop
		377	}
		378
		379	sub visible_children {
		380	$_[0]->children
366	}	381	}
367		382
368	sub set_max_size {	383	sub set_max_size {
369	my ($self, $w, $h) = @_;	384	my ($self, $w, $h) = @_;
370		385
…		…
429		444
430	$::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
431	unless $FOCUS;	446	unless $FOCUS;
432	}	447	}
433		448
434	sub mouse_motion { }	449	sub mouse_motion { 0 }
435	sub button_up { }	450	sub button_up { 0 }
436	sub key_down { }	451	sub key_down { 0 }
437	sub key_up { }	452	sub key_up { 0 }
438		453
439	sub button_down {	454	sub button_down {
440	my ($self, $ev, $x, $y) = @_;	455	my ($self, $ev, $x, $y) = @_;
441		456
442	$self->focus_in;	457	$self->focus_in;
443	}
444		458
445	sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }	459	0
446	sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }	460	}
447	sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }	461
448	sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }	462	sub find_widget {
449	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
450		535
451	sub draw {	536	sub draw {
452	my ($self) = @_;	537	my ($self) = @_;
453		538
454	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);
455		550
456	glPushMatrix;	551	glPushMatrix;
457	glTranslate $self->{x}, $self->{y}, 0;	552	glTranslate $self->{x}, $self->{y}, 0;
458	$self->_draw;	553	$self->_draw;
459	glPopMatrix;	554	glPopMatrix;
…		…
471	glVertex $x , $y + $self->{h};	566	glVertex $x , $y + $self->{h};
472	glEnd;	567	glEnd;
473	glDisable GL_BLEND;	568	glDisable GL_BLEND;
474	}	569	}
475		570
476	if ($ENV{PCLIENT_DEBUG}) {	571	if ($ENV{CFPLUS_DEBUG} & 1) {
477	glPushMatrix;	572	glPushMatrix;
478	glColor 1, 1, 0, 1;	573	glColor 1, 1, 0, 1;
479	glTranslate $self->{x} + 0.375, $self->{y} + 0.375;	574	glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
480	glBegin GL_LINE_LOOP;	575	glBegin GL_LINE_LOOP;
481	glVertex 0 , 0;	576	glVertex 0 , 0;
…		…
492	my ($self) = @_;	587	my ($self) = @_;
493		588
494	warn "no draw defined for $self\n";	589	warn "no draw defined for $self\n";
495	}	590	}
496		591
497	sub find_widget {
498	my ($self, $x, $y) = @_;
499
500	return () unless $self->{can_events};
501
502	return $self
503	if $x >= $self->{x} && $x < $self->{x} + $self->{w}
504	&& $y >= $self->{y} && $y < $self->{y} + $self->{h};
505
506	()
507	}
508
509	sub set_parent {
510	my ($self, $parent) = @_;
511
512	Scalar::Util::weaken ($self->{parent} = $parent);
513
514	$self->set_visible;
515
516	$self->check_size;
517	$self->show;
518	}
519
520	sub check_size {
521	my ($self, $forced) = @_;
522
523	$self->{force_alloc} = 1 if $forced;
524	$CFClient::UI::ROOT->{check_size}{$self} = $self;
525	}
526
527	sub update {
528	my ($self) = @_;
529
530	$self->{parent}->update
531	if $self->{parent};
532	}
533
534	sub connect {
535	my ($self, $signal, $cb) = @_;
536
537	push @{ $self->{signal_cb}{$signal} }, $cb;
538	}
539
540	sub _emit {
541	my ($self, $signal, @args) = @_;
542
543	List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
544	}
545
546	sub emit {
547	my ($self, $signal, @args) = @_;
548
549	$self->_emit ($signal, @args)
550	|| $self->$signal (@args);
551	}
552
553	sub visibility_change {
554	#my ($self, $visible) = @_;
555	}
556
557	sub DESTROY {	592	sub DESTROY {
558	my ($self) = @_;	593	my ($self) = @_;
559		594
560	delete $WIDGET{$self+0};	595	delete $WIDGET{$self+0};
561	#$self->deactivate;	596	#$self->deactivate;
…		…
617	my ($class, %arg) = @_;	652	my ($class, %arg) = @_;
618	$class->SUPER::new (can_events => 0, %arg);	653	$class->SUPER::new (can_events => 0, %arg);
619	}	654	}
620		655
621	sub size_request {	656	sub size_request {
622	(0, 0)	657	my ($self) = @_;
		658
		659	($self->{w} + 0, $self->{h} + 0)
623	}	660	}
624		661
625	sub draw { }	662	sub draw { }
626		663
627	#############################################################################	664	#############################################################################
…		…
631	our @ISA = CFClient::UI::Base::;	668	our @ISA = CFClient::UI::Base::;
632		669
633	sub new {	670	sub new {
634	my ($class, %arg) = @_;	671	my ($class, %arg) = @_;
635		672
636	my $children = delete $arg{children} || [];	673	my $children = delete $arg{children};
637		674
638	my $self = $class->SUPER::new (	675	my $self = $class->SUPER::new (
639	children => [],	676	children => [],
640	can_events => 0,	677	can_events => 0,
641	%arg,	678	%arg,
642	);	679	);
		680
643	$self->add ($_) for @$children;	681	$self->add (@$children)
		682	if $children;
644		683
645	$self	684	$self
646	}	685	}
647		686
648	sub add {	687	sub add {
…		…
656	$self->{children} = [	695	$self->{children} = [
657	sort { $a->{z} <=> $b->{z} }	696	sort { $a->{z} <=> $b->{z} }
658	@{$self->{children}}, @widgets	697	@{$self->{children}}, @widgets
659	];	698	];
660		699
661	$self->check_size (1);	700	$self->realloc;
662	$self->update;
663	}	701	}
664		702
665	sub children {	703	sub children {
666	@{ $_[0]{children} }	704	@{ $_[0]{children} }
667	}	705	}
…		…
672	delete $child->{parent};	710	delete $child->{parent};
673	$child->hide;	711	$child->hide;
674		712
675	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];	713	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
676		714
677	$self->check_size (1);	715	$self->realloc;
678	$self->update;
679	}	716	}
680		717
681	sub clear {	718	sub clear {
682	my ($self) = @_;	719	my ($self) = @_;
683		720
…		…
687	for (@$children) {	724	for (@$children) {
688	delete $_->{parent};	725	delete $_->{parent};
689	$_->hide;	726	$_->hide;
690	}	727	}
691		728
692	$self->check_size;	729	$self->realloc;
693	$self->update;
694	}	730	}
695		731
696	sub find_widget {	732	sub find_widget {
697	my ($self, $x, $y) = @_;	733	my ($self, $x, $y) = @_;
698		734
699	$x -= $self->{x};	735	$x -= $self->{x};
700	$y -= $self->{y};	736	$y -= $self->{y};
701		737
702	my $res;	738	my $res;
703		739
704	for (reverse @{ $self->{children} }) {	740	for (reverse $self->visible_children) {
705	$res = $_->find_widget ($x, $y)	741	$res = $_->find_widget ($x, $y)
706	and return $res;	742	and return $res;
707	}	743	}
708		744
709	$self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})	745	$self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
…		…
758	$self->{children}[0]->configure (0, 0, $w, $h);	794	$self->{children}[0]->configure (0, 0, $w, $h);
759	}	795	}
760		796
761	#############################################################################	797	#############################################################################
762		798
		799	# back-buffered drawing area
		800
763	package CFClient::UI::Window;	801	package CFClient::UI::Window;
764		802
765	our @ISA = CFClient::UI::Bin::;	803	our @ISA = CFClient::UI::Bin::;
766		804
767	use CFClient::OpenGL;	805	use CFClient::OpenGL;
…		…
785	$self->SUPER::size_allocate ($w, $h);	823	$self->SUPER::size_allocate ($w, $h);
786	$self->update;	824	$self->update;
787	}	825	}
788		826
789	sub _render {	827	sub _render {
		828	my ($self) = @_;
		829
790	$_[0]{children}[0]->draw;	830	$self->{children}[0]->draw;
791	}	831	}
792		832
793	sub render_child {	833	sub render_child {
794	my ($self) = @_;	834	my ($self) = @_;
795		835
796	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {	836	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
797	glClearColor 0, 0, 0, 0;	837	glClearColor 0, 0, 0, 0;
798	glClear GL_COLOR_BUFFER_BIT;	838	glClear GL_COLOR_BUFFER_BIT;
799		839
		840	{
		841	package CFClient::UI::Base;
		842
		843	($draw_x, $draw_y, $draw_w, $draw_h) =
		844	(0, 0, $self->{w}, $self->{h});
		845	}
		846
800	$self->_render;	847	$self->_render;
801	};	848	};
802	}	849	}
803		850
804	sub _draw {	851	sub _draw {
805	my ($self) = @_;	852	my ($self) = @_;
806		853
807	my ($w, $h) = ($self->w, $self->h);	854	my ($w, $h) = @$self{qw(w h)};
808		855
809	my $tex = $self->{texture}	856	my $tex = $self->{texture}
810	or return;	857	or return;
811		858
812	glEnable GL_TEXTURE_2D;	859	glEnable GL_TEXTURE_2D;
…		…
835	}	882	}
836		883
837	sub size_request {	884	sub size_request {
838	my ($self) = @_;	885	my ($self) = @_;
839		886
840	@$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};	887	my ($w, $h) = @{$self->child}{qw(req_w req_h)};
841		888
842	@$self{qw(child_w child_h)}	889	$w = 10 if $self->{scroll_x};
		890	$h = 10 if $self->{scroll_y};
		891
		892	($w, $h)
843	}	893	}
844		894
845	sub size_allocate {	895	sub size_allocate {
846	my ($self, $w, $h) = @_;	896	my ($self, $w, $h) = @_;
847		897
		898	my $child = $self->child;
		899
848	$w = $self->{child_w} if $self->{scroll_x} && $self->{child_w};	900	$w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
849	$h = $self->{child_h} if $self->{scroll_y} && $self->{child_h};	901	$h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
850		902
851	$self->child->configure (0, 0, $w, $h);	903	$self->child->configure (0, 0, $w, $h);
852	$self->update;	904	$self->update;
853	}	905	}
854		906
…		…
890	}	942	}
891		943
892	sub _render {	944	sub _render {
893	my ($self) = @_;	945	my ($self) = @_;
894		946
		947	local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};
		948	local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y};
		949
895	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};	950	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
896		951
897	$self->SUPER::_render;	952	$self->SUPER::_render;
898	}	953	}
899		954
…		…
902	package CFClient::UI::ScrolledWindow;	957	package CFClient::UI::ScrolledWindow;
903		958
904	our @ISA = CFClient::UI::HBox::;	959	our @ISA = CFClient::UI::HBox::;
905		960
906	sub new {	961	sub new {
907	my $class = shift;	962	my ($class, %arg) = @_;
		963
		964	my $child = delete $arg{child};
908		965
909	my $self;	966	my $self;
910		967
911	my $slider = new CFClient::UI::Slider	968	my $slider = new CFClient::UI::Slider
912	vertical => 1,	969	vertical => 1,
…		…
917	;	974	;
918		975
919	$self = $class->SUPER::new (	976	$self = $class->SUPER::new (
920	vp => (new CFClient::UI::ViewPort expand => 1),	977	vp => (new CFClient::UI::ViewPort expand => 1),
921	slider => $slider,	978	slider => $slider,
922	@_,	979	%arg,
923	);	980	);
924		981
925	$self->{vp}->add ($self->{scrolled});
926	$self->add ($self->{vp});
927	$self->add ($self->{slider});	982	$self->SUPER::add ($self->{vp}, $self->{slider});
		983	$self->add ($child) if $child;
928		984
929	$self	985	$self
		986	}
		987
		988	sub add {
		989	my ($self, $widget) = @_;
		990
		991	$self->{vp}->add ($self->{child} = $widget);
930	}	992	}
931		993
932	sub update {	994	sub update {
933	my ($self) = @_;	995	my ($self) = @_;
934		996
…		…
997		1059
998	our @ISA = CFClient::UI::Bin::;	1060	our @ISA = CFClient::UI::Bin::;
999		1061
1000	use CFClient::OpenGL;	1062	use CFClient::OpenGL;
1001		1063
1002	my @tex =	1064	my $bg =
		1065	new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
		1066	mipmap => 1, wrap => 1;
		1067
		1068	my @border =
1003	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	1069	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1004	qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);	1070	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1005		1071
1006	sub new {	1072	sub new {
1007	my $class = shift;	1073	my ($class, %arg) = @_;
		1074
		1075	my $title = delete $arg{title};
1008		1076
1009	my $self = $class->SUPER::new (	1077	my $self = $class->SUPER::new (
1010	bg => [1, 1, 1, 1],	1078	bg => [1, 1, 1, 1],
1011	border_bg => [1, 1, 1, 1],	1079	border_bg => [1, 1, 1, 1],
1012	border => 0.6,	1080	border => 0.6,
1013	is_toplevel => 1,
1014	can_events => 1,	1081	can_events => 1,
1015	@_	1082	min_w => 16,
		1083	min_h => 16,
		1084	%arg,
1016	);	1085	);
1017		1086
1018	$self->{title} &&= new CFClient::UI::Label	1087	$self->{title} = new CFClient::UI::Label
1019	align => 0,	1088	align => 0,
1020	valign => 1,	1089	valign => 1,
1021	text => $self->{title},	1090	text => $title,
1022	fontsize => $self->{border};	1091	fontsize => $self->{border}
		1092	if defined $title;
1023		1093
1024	$self	1094	$self
		1095	}
		1096
		1097	sub add {
		1098	my ($self, @widgets) = @_;
		1099
		1100	$self->SUPER::add (@widgets);
		1101	$self->CFClient::UI::Container::add ($self->{title}) if $self->{title};
1025	}	1102	}
1026		1103
1027	sub border {	1104	sub border {
1028	int $_[0]{border} * $::FONTSIZE	1105	int $_[0]{border} * $::FONTSIZE
1029	}	1106	}
1030		1107
1031	sub size_request {	1108	sub size_request {
1032	my ($self) = @_;	1109	my ($self) = @_;
		1110
		1111	$self->{title}->size_request
		1112	if $self->{title};
1033		1113
1034	my ($w, $h) = $self->SUPER::size_request;	1114	my ($w, $h) = $self->SUPER::size_request;
1035		1115
1036	(	1116	(
1037	$w + $self->border * 2,	1117	$w + $self->border * 2,
…		…
1040	}	1120	}
1041		1121
1042	sub size_allocate {	1122	sub size_allocate {
1043	my ($self, $w, $h) = @_;	1123	my ($self, $w, $h) = @_;
1044		1124
		1125	if ($self->{title}) {
		1126	$self->{title}{w} = $w;
		1127	$self->{title}{h} = $h;
		1128	$self->{title}->size_allocate ($w, $h);
		1129	}
		1130
		1131	my $border = $self->border;
		1132
1045	$h -= List::Util::max 0, $self->border * 2;	1133	$h -= List::Util::max 0, $border * 2;
1046	$w -= List::Util::max 0, $self->border * 2;	1134	$w -= List::Util::max 0, $border * 2;
1047		1135
1048	$self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
1049	if $self->{title};
1050
1051	$self->child->configure ($self->border, $self->border, $w, $h);	1136	$self->child->configure ($border, $border, $w, $h);
1052	}	1137	}
1053		1138
1054	sub button_down {	1139	sub button_down {
1055	my ($self, $ev, $x, $y) = @_;	1140	my ($self, $ev, $x, $y) = @_;
1056		1141
…		…
1072	my ($ev, $x, $y) = @_;	1157	my ($ev, $x, $y) = @_;
1073		1158
1074	my $dx = $ev->{x} - $ox;	1159	my $dx = $ev->{x} - $ox;
1075	my $dy = $ev->{y} - $oy;	1160	my $dy = $ev->{y} - $oy;
1076		1161
1077	$self->{user_x} = $wx + $dx * $mx;
1078	$self->{user_y} = $wy + $dy * $my;
1079	$self->{def_w} = $bw + $dx * ($mx ? -1 : 1);	1162	$self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1080	$self->{def_h} = $bh + $dy * ($my ? -1 : 1);	1163	$self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1081	$self->move ($self->{user_x}, $self->{user_y});	1164
1082	$self->check_size;	1165	$self->realloc;
		1166	$self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1083	};	1167	};
1084		1168
1085	} elsif ($lr ^ $td) {	1169	} elsif ($lr ^ $td) {
1086	my ($ox, $oy) = ($ev->{x}, $ev->{y});	1170	my ($ox, $oy) = ($ev->{x}, $ev->{y});
1087	my ($bx, $by) = ($self->{x}, $self->{y});	1171	my ($bx, $by) = ($self->{x}, $self->{y});
…		…
1089	$self->{motion} = sub {	1173	$self->{motion} = sub {
1090	my ($ev, $x, $y) = @_;	1174	my ($ev, $x, $y) = @_;
1091		1175
1092	($x, $y) = ($ev->{x}, $ev->{y});	1176	($x, $y) = ($ev->{x}, $ev->{y});
1093		1177
1094	$self->{user_x} = $bx + $x - $ox;	1178	$self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1095	$self->{user_y} = $by + $y - $oy;
1096
1097	$self->move ($self->{user_x}, $self->{user_y});
1098	$self->update;
1099	};	1179	};
		1180	} else {
		1181	return 0;
		1182	}
		1183
1100	}	1184	1
1101	}	1185	}
1102		1186
1103	sub button_up {	1187	sub button_up {
1104	my ($self, $ev, $x, $y) = @_;	1188	my ($self, $ev, $x, $y) = @_;
1105		1189
1106	delete $self->{motion};	1190	!!delete $self->{motion}
1107	}	1191	}
1108		1192
1109	sub mouse_motion {	1193	sub mouse_motion {
1110	my ($self, $ev, $x, $y) = @_;	1194	my ($self, $ev, $x, $y) = @_;
1111		1195
1112	$self->{motion}->($ev, $x, $y) if $self->{motion};	1196	$self->{motion}->($ev, $x, $y) if $self->{motion};
		1197
		1198	!!$self->{motion}
1113	}	1199	}
1114		1200
1115	sub _draw {	1201	sub _draw {
1116	my ($self) = @_;	1202	my ($self) = @_;
1117		1203
		1204	my $child = $self->{children}[0];
		1205
1118	my ($w, $h ) = ($self->{w}, $self->{h});	1206	my ($w, $h ) = ($self->{w}, $self->{h});
1119	my ($cw, $ch) = ($self->child->{w}, $self->child->{h});	1207	my ($cw, $ch) = ($child->{w}, $child->{h});
1120		1208
1121	glEnable GL_TEXTURE_2D;	1209	glEnable GL_TEXTURE_2D;
1122	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	1210	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1123		1211
1124	my $border = $self->border;	1212	my $border = $self->border;
1125		1213
1126	glColor @{ $self->{border_bg} };	1214	glColor @{ $self->{border_bg} };
1127	$tex[1]->draw_quad_alpha (0, 0, $w, $border);	1215	$border[0]->draw_quad_alpha (0, 0, $w, $border);
1128	$tex[3]->draw_quad_alpha (0, $border, $border, $ch);	1216	$border[1]->draw_quad_alpha (0, $border, $border, $ch);
1129	$tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);	1217	$border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1130	$tex[4]->draw_quad_alpha (0, $h - $border, $w, $border);	1218	$border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
1131		1219
1132	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {	1220	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1133	my $bg = $tex[0];	1221	glColor @{ $self->{bg} };
1134		1222
1135	# TODO: repeat texture not scale	1223	# TODO: repeat texture not scale
		1224	# solve this better(?)
1136	my $rep_x = $cw / $bg->{w};	1225	$bg->{s} = $cw / $bg->{w};
1137	my $rep_y = $ch / $bg->{h};	1226	$bg->{t} = $ch / $bg->{h};
1138
1139	glColor @{ $self->{bg} };
1140
1141	$bg->{s} = $rep_x;
1142	$bg->{t} = $rep_y;
1143	$bg->{wrap_mode} = 1;
1144	$bg->draw_quad_alpha ($border, $border, $cw, $ch);	1227	$bg->draw_quad_alpha ($border, $border, $cw, $ch);
1145	}	1228	}
1146		1229
1147	glDisable GL_TEXTURE_2D;	1230	glDisable GL_TEXTURE_2D;
1148		1231
1149	$self->{title}->draw if $self->{title};
1150
1151	$self->child->draw;	1232	$child->draw;
		1233
		1234	if ($self->{title}) {
		1235	glTranslate 0, $border - $self->{h};
		1236	$self->{title}->_draw;
		1237	}
1152	}	1238	}
1153		1239
1154	#############################################################################	1240	#############################################################################
1155		1241
1156	package CFClient::UI::Table;	1242	package CFClient::UI::Table;
…		…
1178	my ($self, $x, $y, $child) = @_;	1264	my ($self, $x, $y, $child) = @_;
1179		1265
1180	$child->set_parent ($self);	1266	$child->set_parent ($self);
1181	$self->{children}[$y][$x] = $child;	1267	$self->{children}[$y][$x] = $child;
1182		1268
1183	$self->check_size (1);	1269	$self->realloc;
1184	}	1270	}
1185		1271
1186	# TODO: move to container class maybe? send children a signal on removal?	1272	# TODO: move to container class maybe? send children a signal on removal?
1187	sub clear {	1273	sub clear {
1188	my ($self) = @_;	1274	my ($self) = @_;
…		…
1193	for (@children) {	1279	for (@children) {
1194	delete $_->{parent};	1280	delete $_->{parent};
1195	$_->hide;	1281	$_->hide;
1196	}	1282	}
1197		1283
1198	$self->check_size (1);	1284	$self->realloc;
1199	$self->update;
1200	}	1285	}
1201		1286
1202	sub get_wh {	1287	sub get_wh {
1203	my ($self) = @_;	1288	my ($self) = @_;
1204		1289
…		…
1324	my ($self, $w, $h) = @_;	1409	my ($self, $w, $h) = @_;
1325		1410
1326	my $space = $self->{vertical} ? $h : $w;	1411	my $space = $self->{vertical} ? $h : $w;
1327	my $children = $self->{children};	1412	my $children = $self->{children};
1328		1413
1329	my @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;	1414	my @req;
1330	my $req = List::Util::sum @req;
1331		1415
1332	if ($req > $space) {	1416	if ($self->{homogeneous}) {
1333	# ah well, not enough space	1417	@req = ($space / (@$children || 1)) x @$children;
1334	$_ *= $space / $req for @req;
1335	} else {	1418	} else {
		1419	@req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;
		1420	my $req = List::Util::sum @req;
		1421
		1422	if ($req > $space) {
		1423	# ah well, not enough space
		1424	$_ *= $space / $req for @req;
		1425	} else {
1336	my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;	1426	my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1337		1427
		1428	$space = ($space - $req) / $expand; # remaining space to give away
		1429
1338	$req[$_] += ($space - $req) * $children->[$_]{expand} / $expand	1430	$req[$_] += $space * $children->[$_]{expand}
1339	for 0 .. $#$children;	1431	for 0 .. $#$children;
		1432	}
1340	}	1433	}
1341		1434
1342	CFClient::UI::harmonize \@req;	1435	CFClient::UI::harmonize \@req;
1343		1436
1344	my $pos = 0;	1437	my $pos = 0;
…		…
1404	ellipsise => 3, # end	1497	ellipsise => 3, # end
1405	layout => (new CFClient::Layout),	1498	layout => (new CFClient::Layout),
1406	fontsize => 1,	1499	fontsize => 1,
1407	align => -1,	1500	align => -1,
1408	valign => -1,	1501	valign => -1,
1409	padding => 2,	1502	padding_x => 2,
		1503	padding_y => 2,
1410	can_events => 0,	1504	can_events => 0,
1411	%arg	1505	%arg
1412	);	1506	);
1413		1507
1414	if (exists $self->{template}) {	1508	if (exists $self->{template}) {
…		…
1450	$self->{text} = "T$text";	1544	$self->{text} = "T$text";
1451		1545
1452	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;	1546	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1453	$self->{layout}->set_text ($text);	1547	$self->{layout}->set_text ($text);
1454		1548
		1549	$self->realloc;
1455	$self->update;	1550	$self->update;
1456	$self->check_size;
1457	}	1551	}
1458		1552
1459	sub set_markup {	1553	sub set_markup {
1460	my ($self, $markup) = @_;	1554	my ($self, $markup) = @_;
1461		1555
…		…
1465	my $rgba = $markup =~ /span.*(?:foreground|background)/;	1559	my $rgba = $markup =~ /span.*(?:foreground|background)/;
1466		1560
1467	$self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;	1561	$self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1468	$self->{layout}->set_markup ($markup);	1562	$self->{layout}->set_markup ($markup);
1469		1563
		1564	$self->realloc;
1470	$self->update;	1565	$self->update;
1471	$self->check_size;
1472	}	1566	}
1473		1567
1474	sub size_request {	1568	sub size_request {
1475	my ($self) = @_;	1569	my ($self) = @_;
1476		1570
…		…
1490		1584
1491	$w = List::Util::max $w, $w2;	1585	$w = List::Util::max $w, $w2;
1492	$h = List::Util::max $h, $h2;	1586	$h = List::Util::max $h, $h2;
1493	}	1587	}
1494		1588
1495	(	1589	($w, $h)
1496	$w + $self->{padding} * 2,
1497	$h + $self->{padding} * 2,
1498	)
1499	}	1590	}
1500		1591
1501	sub size_allocate {	1592	sub size_allocate {
1502	my ($self, $w, $h) = @_;	1593	my ($self, $w, $h) = @_;
1503		1594
		1595	delete $self->{ox};
		1596
1504	delete $self->{texture};	1597	delete $self->{texture}
		1598	unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1505	}	1599	}
1506		1600
1507	sub set_fontsize {	1601	sub set_fontsize {
1508	my ($self, $fontsize) = @_;	1602	my ($self, $fontsize) = @_;
1509		1603
1510	$self->{fontsize} = $fontsize;	1604	$self->{fontsize} = $fontsize;
1511	delete $self->{texture};	1605	delete $self->{texture};
1512		1606
1513	$self->update;	1607	$self->realloc;
1514	$self->check_size;
1515	}	1608	}
1516		1609
1517	sub _draw {	1610	sub _draw {
1518	my ($self) = @_;	1611	my ($self) = @_;
1519		1612
…		…
1525	$self->{layout}->set_width ($self->{w});	1618	$self->{layout}->set_width ($self->{w});
1526	$self->{layout}->set_ellipsise ($self->{ellipsise});	1619	$self->{layout}->set_ellipsise ($self->{ellipsise});
1527	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});	1620	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1528	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1621	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1529		1622
1530	my $tex = new_from_layout CFClient::Texture $self->{layout};	1623	new_from_layout CFClient::Texture $self->{layout}
		1624	};
1531		1625
		1626	unless (exists $self->{ox}) {
1532	$self->{ox} = int ($self->{align} < 0 ? $self->{padding}	1627	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1533	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}	1628	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1534	: ($self->{w} - $tex->{w}) * 0.5);	1629	: ($self->{w} - $tex->{w}) * 0.5);
1535		1630
1536	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding}	1631	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1537	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}	1632	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1538	: ($self->{h} - $tex->{h}) * 0.5);	1633	: ($self->{h} - $tex->{h}) * 0.5);
1539
1540	$tex
1541	};	1634	};
1542		1635
1543	glEnable GL_TEXTURE_2D;	1636	glEnable GL_TEXTURE_2D;
1544	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1637	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1545		1638
…		…
1583		1676
1584	delete $self->{cur_h};	1677	delete $self->{cur_h};
1585		1678
1586	return if $self->{text} eq $text;	1679	return if $self->{text} eq $text;
1587		1680
1588	delete $self->{texture};
1589
1590	$self->{last_activity} = $::NOW;	1681	$self->{last_activity} = $::NOW;
1591	$self->{text} = $text;	1682	$self->{text} = $text;
1592		1683
1593	$text =~ s/./*/g if $self->{hidden};	1684	$text =~ s/./*/g if $self->{hidden};
1594	$self->{layout}->set_text ("$text ");	1685	$self->{layout}->set_text ("$text ");
1595		1686
1596	$self->_emit (changed => $self->{text});	1687	$self->_emit (changed => $self->{text});
		1688	$self->update;
1597	}	1689	}
1598		1690
1599	sub set_text {	1691	sub set_text {
1600	my ($self, $text) = @_;	1692	my ($self, $text) = @_;
1601		1693
1602	$self->{cursor} = length $text;	1694	$self->{cursor} = length $text;
1603	$self->_set_text ($text);	1695	$self->_set_text ($text);
1604	$self->update;	1696
1605	$self->check_size;	1697	$self->realloc;
1606	}	1698	}
1607		1699
1608	sub get_text {	1700	sub get_text {
1609	$_[0]{text}	1701	$_[0]{text}
1610	}	1702	}
…		…
1640	$self->{cursor} = length $text;	1732	$self->{cursor} = length $text;
1641	} elsif ($uni == 27) {	1733	} elsif ($uni == 27) {
1642	$self->_emit ('escape');	1734	$self->_emit ('escape');
1643	} elsif ($uni) {	1735	} elsif ($uni) {
1644	substr $text, $self->{cursor}++, 0, chr $uni;	1736	substr $text, $self->{cursor}++, 0, chr $uni;
		1737	} else {
		1738	return 0;
1645	}	1739	}
1646		1740
1647	$self->_set_text ($text);	1741	$self->_set_text ($text);
1648	$self->update;	1742
1649	$self->check_size;	1743	$self->realloc;
		1744
		1745	1
1650	}	1746	}
1651		1747
1652	sub focus_in {	1748	sub focus_in {
1653	my ($self) = @_;	1749	my ($self) = @_;
1654		1750
…		…
1669	utf8::encode $text;	1765	utf8::encode $text;
1670	$self->{cursor} = length substr $text, 0, $idx;	1766	$self->{cursor} = length substr $text, 0, $idx;
1671		1767
1672	$self->_set_text ($self->{text});	1768	$self->_set_text ($self->{text});
1673	$self->update;	1769	$self->update;
		1770
		1771	1
1674	}	1772	}
1675		1773
1676	sub mouse_motion {	1774	sub mouse_motion {
1677	my ($self, $ev, $x, $y) = @_;	1775	my ($self, $ev, $x, $y) = @_;
1678	# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#	1776	# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
		1777
		1778	0
1679	}	1779	}
1680		1780
1681	sub _draw {	1781	sub _draw {
1682	my ($self) = @_;	1782	my ($self) = @_;
1683		1783
…		…
1760	} else {	1860	} else {
1761	$self->set_text ($self->{history_saveback});	1861	$self->set_text ($self->{history_saveback});
1762	}	1862	}
1763		1863
1764	} else {	1864	} else {
1765	$self->SUPER::key_down ($ev);	1865	return $self->SUPER::key_down ($ev)
		1866	}
		1867
1766	}	1868	1
1767
1768	}	1869	}
1769		1870
1770	#############################################################################	1871	#############################################################################
1771		1872
1772	package CFClient::UI::Button;	1873	package CFClient::UI::Button;
…		…
1781		1882
1782	sub new {	1883	sub new {
1783	my $class = shift;	1884	my $class = shift;
1784		1885
1785	$class->SUPER::new (	1886	$class->SUPER::new (
1786	padding => 4,	1887	padding_x => 4,
		1888	padding_y => 4,
1787	fg => [1, 1, 1],	1889	fg => [1, 1, 1],
1788	active_fg => [0, 0, 1],	1890	active_fg => [0, 0, 1],
1789	can_hover => 1,	1891	can_hover => 1,
1790	align => 0,	1892	align => 0,
1791	valign => 0,	1893	valign => 0,
…		…
1800	my ($self, $ev, $x, $y) = @_;	1902	my ($self, $ev, $x, $y) = @_;
1801		1903
1802	$self->emit ("activate")	1904	$self->emit ("activate")
1803	if $x >= 0 && $x < $self->{w}	1905	if $x >= 0 && $x < $self->{w}
1804	&& $y >= 0 && $y < $self->{h};	1906	&& $y >= 0 && $y < $self->{h};
		1907
		1908	1
1805	}	1909	}
1806		1910
1807	sub _draw {	1911	sub _draw {
1808	my ($self) = @_;	1912	my ($self) = @_;
1809		1913
…		…
1838		1942
1839	sub new {	1943	sub new {
1840	my $class = shift;	1944	my $class = shift;
1841		1945
1842	$class->SUPER::new (	1946	$class->SUPER::new (
1843	padding => 2,	1947	padding_x => 2,
		1948	padding_y => 2,
1844	fg => [1, 1, 1],	1949	fg => [1, 1, 1],
1845	active_fg => [1, 1, 0],	1950	active_fg => [1, 1, 0],
1846	bg => [0, 0, 0, 0.2],	1951	bg => [0, 0, 0, 0.2],
1847	active_bg => [1, 1, 1, 0.5],	1952	active_bg => [1, 1, 1, 0.5],
1848	state => 0,	1953	state => 0,
…		…
1852	}	1957	}
1853		1958
1854	sub size_request {	1959	sub size_request {
1855	my ($self) = @_;	1960	my ($self) = @_;
1856		1961
1857	($self->{padding} * 2 + 6) x 2	1962	(6) x 2
1858	}	1963	}
1859		1964
1860	sub button_down {	1965	sub button_down {
1861	my ($self, $ev, $x, $y) = @_;	1966	my ($self, $ev, $x, $y) = @_;
1862		1967
1863	if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}	1968	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1864	&& $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {	1969	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1865	$self->{state} = !$self->{state};	1970	$self->{state} = !$self->{state};
1866	$self->_emit (changed => $self->{state});	1971	$self->_emit (changed => $self->{state});
		1972	} else {
		1973	return 0
		1974	}
		1975
1867	}	1976	1
1868	}	1977	}
1869		1978
1870	sub _draw {	1979	sub _draw {
1871	my ($self) = @_;	1980	my ($self) = @_;
1872		1981
1873	$self->SUPER::_draw;	1982	$self->SUPER::_draw;
1874		1983
1875	glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0;	1984	glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1876		1985
1877	my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;	1986	my ($w, $h) = @$self{qw(w h)};
		1987
		1988	my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1878		1989
1879	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };	1990	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1880		1991
1881	my $tex = $self->{state} ? $tex[1] : $tex[0];	1992	my $tex = $self->{state} ? $tex[1] : $tex[0];
1882		1993
…		…
2147	fg => [1, 1, 1],	2258	fg => [1, 1, 1],
2148	active_fg => [0, 0, 0],	2259	active_fg => [0, 0, 0],
2149	bg => [0, 0, 0, 0.2],	2260	bg => [0, 0, 0, 0.2],
2150	active_bg => [1, 1, 1, 0.5],	2261	active_bg => [1, 1, 1, 0.5],
2151	range => [0, 0, 100, 10, 0],	2262	range => [0, 0, 100, 10, 0],
2152	req_w => $::WIDTH / 80,	2263	min_w => $::WIDTH / 80,
2153	req_h => $::WIDTH / 80,	2264	min_h => $::WIDTH / 80,
2154	vertical => 0,	2265	vertical => 0,
2155	can_hover => 1,	2266	can_hover => 1,
2156	inner_pad => 0.02,	2267	inner_pad => 0.02,
2157	@_	2268	@_
2158	);	2269	);
…		…
2161	$self->update;	2272	$self->update;
2162		2273
2163	$self	2274	$self
2164	}	2275	}
2165		2276
		2277	sub changed { }
		2278
2166	sub set_range {	2279	sub set_range {
2167	my ($self, $range) = @_;	2280	my ($self, $range) = @_;
2168		2281
2169	($range, $self->{range}) = ($self->{range}, $range);	2282	($range, $self->{range}) = ($self->{range}, $range);
2170		2283
…		…
2196	}	2309	}
2197		2310
2198	sub size_request {	2311	sub size_request {
2199	my ($self) = @_;	2312	my ($self) = @_;
2200		2313
2201	my $w = $self->{req_w};	2314	($self->{req_w}, $self->{req_h})
2202	my $h = $self->{req_h};
2203
2204	$self->{vertical} ? ($h, $w) : ($w, $h)
2205	}	2315	}
2206		2316
2207	sub button_down {	2317	sub button_down {
2208	my ($self, $ev, $x, $y) = @_;	2318	my ($self, $ev, $x, $y) = @_;
2209		2319
2210	$self->SUPER::button_down ($ev, $x, $y);	2320	$self->SUPER::button_down ($ev, $x, $y);
2211		2321
2212	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];	2322	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2213		2323
2214	$self->mouse_motion ($ev, $x, $y);	2324	$self->mouse_motion ($ev, $x, $y)
2215	}	2325	}
2216		2326
2217	sub mouse_motion {	2327	sub mouse_motion {
2218	my ($self, $ev, $x, $y) = @_;	2328	my ($self, $ev, $x, $y) = @_;
2219		2329
…		…
2223	my (undef, $lo, $hi, $page) = @{$self->{range}};	2333	my (undef, $lo, $hi, $page) = @{$self->{range}};
2224		2334
2225	$x = ($x - $self->{click}[1]) / ($w * $self->{scale});	2335	$x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2226		2336
2227	$self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));	2337	$self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
		2338	} else {
		2339	return 0;
		2340	}
		2341
2228	}	2342	1
2229	}	2343	}
2230		2344
2231	sub update {	2345	sub update {
2232	my ($self) = @_;	2346	my ($self) = @_;
2233		2347
2234	$CFClient::UI::ROOT->on_post_alloc ($self => sub {	2348	delete $self->{knob_w};
		2349	$self->SUPER::update;
		2350	}
		2351
		2352	sub _draw {
		2353	my ($self) = @_;
		2354
		2355	unless ($self->{knob_w}) {
2235	$self->set_value ($self->{range}[0]);	2356	$self->set_value ($self->{range}[0]);
2236		2357
2237	my ($value, $lo, $hi, $page) = @{$self->{range}};	2358	my ($value, $lo, $hi, $page) = @{$self->{range}};
2238	my $range = ($hi - $page - $lo) || 1e-100;	2359	my $range = ($hi - $page - $lo) || 1e-100;
2239		2360
…		…
2245	$value = ($value - $lo) / $range;	2366	$value = ($value - $lo) / $range;
2246	$value = $value * $self->{scale} + $self->{offset};	2367	$value = $value * $self->{scale} + $self->{offset};
2247		2368
2248	$self->{knob_x} = $value - $knob_w * 0.5;	2369	$self->{knob_x} = $value - $knob_w * 0.5;
2249	$self->{knob_w} = $knob_w;	2370	$self->{knob_w} = $knob_w;
2250	});	2371	}
2251
2252	$self->SUPER::update;
2253	}
2254
2255	sub _draw {
2256	my ($self) = @_;
2257		2372
2258	$self->SUPER::_draw ();	2373	$self->SUPER::_draw ();
2259		2374
2260	glScale $self->{w}, $self->{h};	2375	glScale $self->{w}, $self->{h};
2261		2376
…		…
2594	}	2709	}
2595		2710
2596	sub set_tooltip_from {	2711	sub set_tooltip_from {
2597	my ($self, $widget) = @_;	2712	my ($self, $widget) = @_;
2598		2713
		2714	my $tooltip = $widget->{tooltip};
		2715
		2716	if ($ENV{CFPLUS_DEBUG} & 2) {
		2717	$tooltip .= "\n\n" . (ref $widget) . "\n"
		2718	. "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
		2719	. "req $widget->{req_w} $widget->{req_h}\n"
		2720	. "visible $widget->{visible}";
		2721	}
		2722
2599	$self->add (new CFClient::UI::Label	2723	$self->add (new CFClient::UI::Label
2600	markup => $widget->{tooltip},	2724	markup => $tooltip,
2601	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	2725	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2602	fontsize => 0.8,	2726	fontsize => 0.8,
2603	fg => [0, 0, 0, 1],	2727	fg => [0, 0, 0, 1],
2604	ellipsise => 0,	2728	ellipsise => 0,
2605	font => ($widget->{tooltip_font} || $::FONT_PROP),	2729	font => ($widget->{tooltip_font} || $::FONT_PROP),
…		…
2616		2740
2617	sub size_allocate {	2741	sub size_allocate {
2618	my ($self, $w, $h) = @_;	2742	my ($self, $w, $h) = @_;
2619		2743
2620	$self->SUPER::size_allocate ($w - 4, $h - 4);	2744	$self->SUPER::size_allocate ($w - 4, $h - 4);
		2745	}
		2746
		2747	sub visibility_change {
		2748	my ($self, $visible) = @_;
		2749
		2750	return unless $visible;
		2751
		2752	$self->{root}->on_post_alloc ("move_$self" => sub {
		2753	my $widget = $self->{owner}
		2754	or return;
		2755
		2756	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
		2757
		2758	($x, $y) = $widget->coord2global (-$self->{w}, 0)
		2759	if $x + $self->{w} > $::WIDTH;
		2760
		2761	$self->move_abs ($x, $y);
		2762	});
2621	}	2763	}
2622		2764
2623	sub _draw {	2765	sub _draw {
2624	my ($self) = @_;	2766	my ($self) = @_;
2625		2767
…		…
2642	glVertex $w, $h;	2784	glVertex $w, $h;
2643	glVertex $w, 0;	2785	glVertex $w, 0;
2644	glEnd;	2786	glEnd;
2645		2787
2646	glTranslate 2 - 0.375, 2 - 0.375;	2788	glTranslate 2 - 0.375, 2 - 0.375;
		2789
2647	$self->SUPER::_draw;	2790	$self->SUPER::_draw;
2648	}	2791	}
2649		2792
2650	#############################################################################	2793	#############################################################################
2651		2794
…		…
2727	$self->SUPER::DESTROY;	2870	$self->SUPER::DESTROY;
2728	}	2871	}
2729		2872
2730	#############################################################################	2873	#############################################################################
2731		2874
2732	package CFClient::UI::Inventory;	2875	package CFClient::UI::Buttonbar;
2733		2876
2734	our @ISA = CFClient::UI::ScrolledWindow::;	2877	our @ISA = CFClient::UI::HBox::;
2735		2878
2736	sub new {	2879	# TODO: should actualyl wrap buttons and other goodies.
2737	my $class = shift;
2738
2739	my $self = $class->SUPER::new (
2740	scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2741	@_,
2742	);
2743
2744	$self
2745	}
2746
2747	sub set_items {
2748	my ($self, $items) = @_;
2749
2750	$self->{scrolled}->clear;
2751	return unless $items;
2752
2753	my @items = sort {
2754	($a->{type} <=> $b->{type})
2755	or ($a->{name} cmp $b->{name})
2756	} @$items;
2757
2758	$self->{real_items} = \@items;
2759
2760	my $row = 0;
2761	for my $item (@items) {
2762	CFClient::Item::update_widgets $item;
2763
2764	$self->{scrolled}->add (0, $row, $item->{face_widget});
2765	$self->{scrolled}->add (1, $row, $item->{desc_widget});
2766	$self->{scrolled}->add (2, $row, $item->{weight_widget});
2767
2768	$row++;
2769	}
2770	}
2771		2880
2772	#############################################################################	2881	#############################################################################
2773		2882
2774	package CFClient::UI::Menu;	2883	package CFClient::UI::Menu;
2775		2884
…		…
2816	# maybe save $GRAB? must be careful about events...	2925	# maybe save $GRAB? must be careful about events...
2817	$GRAB = $self;	2926	$GRAB = $self;
2818	$self->{button} = $ev->{button};	2927	$self->{button} = $ev->{button};
2819		2928
2820	$self->show;	2929	$self->show;
2821	$self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);	2930	$self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2822	}	2931	}
2823		2932
2824	sub mouse_motion {	2933	sub mouse_motion {
2825	my ($self, $ev, $x, $y) = @_;	2934	my ($self, $ev, $x, $y) = @_;
2826		2935
2827	# TODO: should use vbox->find_widget or so	2936	# TODO: should use vbox->find_widget or so
2828	$HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});	2937	$HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2829	$self->{hover} = $self->{item}{$HOVER};	2938	$self->{hover} = $self->{item}{$HOVER};
		2939
		2940	0
2830	}	2941	}
2831		2942
2832	sub button_up {	2943	sub button_up {
2833	my ($self, $ev, $x, $y) = @_;	2944	my ($self, $ev, $x, $y) = @_;
2834		2945
…		…
2836	undef $GRAB;	2947	undef $GRAB;
2837	$self->hide;	2948	$self->hide;
2838		2949
2839	$self->_emit ("popdown");	2950	$self->_emit ("popdown");
2840	$self->{hover}[1]->() if $self->{hover};	2951	$self->{hover}[1]->() if $self->{hover};
		2952	} else {
		2953	return 0
		2954	}
		2955
		2956	1
		2957	}
		2958
		2959	#############################################################################
		2960
		2961	package CFClient::UI::Multiplexer;
		2962
		2963	our @ISA = CFClient::UI::Container::;
		2964
		2965	sub new {
		2966	my $class = shift;
		2967
		2968	my $self = $class->SUPER::new (
		2969	@_,
		2970	);
		2971
		2972	$self->{current} = $self->{children}[0]
		2973	if @{ $self->{children} };
		2974
		2975	$self
		2976	}
		2977
		2978	sub add {
		2979	my ($self, @widgets) = @_;
		2980
		2981	$self->SUPER::add (@widgets);
		2982
		2983	$self->{current} = $self->{children}[0]
		2984	if @{ $self->{children} };
		2985	}
		2986
		2987	sub set_current_page {
		2988	my ($self, $page_or_widget) = @_;
		2989
		2990	my $widget = ref $page_or_widget
		2991	? $page_or_widget
		2992	: $self->{children}[$page_or_widget];
		2993
		2994	$self->{current} = $widget;
		2995	$self->{current}->configure (0, 0, $self->{w}, $self->{h});
		2996
		2997	$self->_emit (page_changed => $self->{current});
		2998
		2999	$self->realloc;
		3000	}
		3001
		3002	sub visible_children {
		3003	$_[0]{current}
		3004	}
		3005
		3006	sub size_request {
		3007	my ($self) = @_;
		3008
		3009	$self->{current}->size_request
		3010	}
		3011
		3012	sub size_allocate {
		3013	my ($self, $w, $h) = @_;
		3014
		3015	$self->{current}->configure (0, 0, $w, $h);
		3016	}
		3017
		3018	sub _draw {
		3019	my ($self) = @_;
		3020
		3021	$self->{current}->draw;
		3022	}
		3023
		3024	#############################################################################
		3025
		3026	package CFClient::UI::Notebook;
		3027
		3028	our @ISA = CFClient::UI::VBox::;
		3029
		3030	sub new {
		3031	my $class = shift;
		3032
		3033	my $self = $class->SUPER::new (
		3034	buttonbar => (new CFClient::UI::Buttonbar),
		3035	multiplexer => (new CFClient::UI::Multiplexer expand => 1),
		3036	# filter => # will be put between multiplexer and $self
		3037	@_,
		3038	);
2841	}	3039
		3040	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};
		3041	$self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
		3042
		3043	$self
		3044	}
		3045
		3046	sub add {
		3047	my ($self, $title, $widget, $tooltip) = @_;
		3048
		3049	Scalar::Util::weaken $self;
		3050
		3051	$self->{buttonbar}->add (new CFClient::UI::Button
		3052	markup => $title,
		3053	tooltip => $tooltip,
		3054	on_activate => sub { $self->set_current_page ($widget) },
		3055	);
		3056
		3057	$self->{multiplexer}->add ($widget);
		3058	}
		3059
		3060	sub set_current_page {
		3061	my ($self, $page) = @_;
		3062
		3063	$self->{multiplexer}->set_current_page ($page);
		3064	$self->_emit (page_changed => $self->{multiplexer}{current});
2842	}	3065	}
2843		3066
2844	#############################################################################	3067	#############################################################################
2845		3068
2846	package CFClient::UI::Statusbox;	3069	package CFClient::UI::Statusbox;
…		…
2951	$self->SUPER::reconfigure;	3174	$self->SUPER::reconfigure;
2952	}	3175	}
2953		3176
2954	#############################################################################	3177	#############################################################################
2955		3178
2956	package CFClient::UI::Root;	3179	package CFClient::UI::Inventory;
2957		3180
2958	our @ISA = CFClient::UI::Container::;	3181	our @ISA = CFClient::UI::ScrolledWindow::;
2959
2960	use CFClient::OpenGL;
2961		3182
2962	sub new {	3183	sub new {
2963	my $class = shift;	3184	my $class = shift;
2964		3185
2965	$class->SUPER::new (	3186	my $self = $class->SUPER::new (
		3187	child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
		3188	@_,
		3189	);
		3190
		3191	$self
		3192	}
		3193
		3194	sub set_items {
		3195	my ($self, $items) = @_;
		3196
		3197	$self->{child}->clear;
		3198	return unless $items;
		3199
		3200	my @items = sort {
		3201	($a->{type} <=> $b->{type})
		3202	or ($a->{name} cmp $b->{name})
		3203	} @$items;
		3204
		3205	$self->{real_items} = \@items;
		3206
		3207	my $row = 0;
		3208	for my $item (@items) {
		3209	CFClient::Item::update_widgets $item;
		3210
		3211	$self->{child}->add (0, $row, $item->{face_widget});
		3212	$self->{child}->add (1, $row, $item->{desc_widget});
		3213	$self->{child}->add (2, $row, $item->{weight_widget});
		3214
		3215	$row++;
		3216	}
		3217	}
		3218
		3219	#############################################################################
		3220
		3221	package CFClient::UI::BindEditor;
		3222
		3223	our @ISA = CFClient::UI::FancyFrame::;
		3224
		3225	sub new {
		3226	my $class = shift;
		3227
		3228	my $self = $class->SUPER::new (binding => [], commands => [], @_);
		3229
		3230	$self->add (my $vb = new CFClient::UI::VBox);
		3231
		3232
		3233	$vb->add ($self->{rec_btn} = new CFClient::UI::Button
		3234	text => "start recording",
		3235	tooltip => "Start/Stops recording of actions."
		3236	."All subsequent actions after the recording started will be captured."
		3237	."The actions are displayed after the record was stopped."
		3238	."To bind the action you have to click on the 'Bind' button",
		3239	on_activate => sub {
		3240	unless ($self->{recording}) {
		3241	$self->start;
		3242	} else {
		3243	$self->stop;
		3244	}
		3245	});
		3246
		3247	$vb->add (new CFClient::UI::Label text => "Actions:");
		3248	$vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
		3249
		3250	$vb->add (new CFClient::UI::Label text => "Bound to: ");
		3251	$vb->add (my $hb = new CFClient::UI::HBox);
		3252	$hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
		3253	$hb->add (new CFClient::UI::Button
		3254	text => "bind",
		3255	tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
		3256	on_activate => sub {
		3257	$self->ask_for_bind;
		3258	});
		3259
		3260	$vb->add (my $hb = new CFClient::UI::HBox);
		3261	$hb->add (new CFClient::UI::Button
		3262	text => "ok",
		3263	expand => 1,
		3264	tooltip => "This closes the binding editor and saves the binding",
		3265	on_activate => sub {
		3266	$self->hide;
		3267	$self->commit;
		3268	});
		3269
		3270	$hb->add (new CFClient::UI::Button
		3271	text => "cancel",
		3272	expand => 1,
		3273	tooltip => "This closes the binding editor without saving",
		3274	on_activate => sub {
		3275	$self->hide;
		3276	$self->{binding_cancel}->()
		3277	if $self->{binding_cancel};
		3278	});
		3279
		3280	$self->update_binding_widgets;
		3281
		3282	$self
		3283	}
		3284
		3285	sub commit {
		3286	my ($self) = @_;
		3287	my ($mod, $sym, $cmds) = $self->get_binding;
		3288	if ($sym != 0 && @$cmds > 0) {
		3289	$::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
		3290	."'. Don't forget 'Save Config'!");
		3291	$self->{binding_change}->($mod, $sym, $cmds)
		3292	if $self->{binding_change};
		3293	} else {
		3294	$::STATUSBOX->add ("No action bound, no key or action specified!");
		3295	$self->{binding_cancel}->()
		3296	if $self->{binding_cancel};
		3297	}
		3298	}
		3299
		3300	sub start {
		3301	my ($self) = @_;
		3302
		3303	$self->{rec_btn}->set_text ("stop recording");
		3304	$self->{recording} = 1;
		3305	$self->clear_command_list;
		3306	$::CONN->start_record if $::CONN;
		3307	}
		3308
		3309	sub stop {
		3310	my ($self) = @_;
		3311
		3312	$self->{rec_btn}->set_text ("start recording");
		3313	$self->{recording} = 0;
		3314
		3315	my $rec;
		3316	$rec = $::CONN->stop_record if $::CONN;
		3317	return unless ref $rec eq 'ARRAY';
		3318	$self->set_command_list ($rec);
		3319	}
		3320
		3321
		3322	sub ask_for_bind_and_commit {
		3323	my ($self) = @_;
		3324	$self->ask_for_bind (1);
		3325	}
		3326
		3327	sub ask_for_bind {
		3328	my ($self, $commit) = @_;
		3329
		3330	CFClient::Binder::open_binding_dialog (sub {
		3331	my ($mod, $sym) = @_;
		3332	$self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
		3333	$self->update_binding_widgets;
		3334	$self->commit if $commit;
		3335	});
		3336	}
		3337
		3338	# $mod and $sym are the modifiers and key symbol
		3339	# $cmds is a array ref of strings (the commands)
		3340	# $cb is the callback that is executed on OK
		3341	# $ccb is the callback that is executed on CANCEL and
		3342	# when the binding was unsuccessful on OK
		3343	sub set_binding {
		3344	my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
		3345
		3346	$self->clear_command_list;
		3347	$self->{recording} = 0;
		3348	$self->{rec_btn}->set_text ("start recording");
		3349
		3350	$self->{binding} = [$mod, $sym];
		3351	$self->{commands} = $cmds;
		3352
		3353	$self->{binding_change} = $cb;
		3354	$self->{binding_cancel} = $ccb;
		3355
		3356	$self->update_binding_widgets;
		3357	}
		3358
		3359	# this is a shortcut method that asks for a binding
		3360	# and then just binds it.
		3361	sub do_quick_binding {
		3362	my ($self, $cmds) = @_;
		3363	$self->set_binding (undef, undef, $cmds, sub {
		3364	$::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
		3365	});
		3366	$self->ask_for_bind (1);
		3367	}
		3368
		3369	sub update_binding_widgets {
		3370	my ($self) = @_;
		3371	my ($mod, $sym, $cmds) = $self->get_binding;
		3372	$self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
		3373	$self->set_command_list ($cmds);
		3374	}
		3375
		3376	sub get_binding {
		3377	my ($self) = @_;
		3378	return (
		3379	$self->{binding}->[0],
		3380	$self->{binding}->[1],
		3381	[ grep { defined $_ } @{$self->{commands}} ]
		3382	);
		3383	}
		3384
		3385	sub clear_command_list {
		3386	my ($self) = @_;
		3387	$self->{cmdbox}->clear ();
		3388	}
		3389
		3390	sub set_command_list {
		3391	my ($self, $cmds) = @_;
		3392
		3393	$self->{cmdbox}->clear ();
		3394	$self->{commands} = $cmds;
		3395
		3396	my $idx = 0;
		3397
		3398	for (@$cmds) {
		3399	$self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
		3400
		3401	my $i = $idx;
		3402	$hb->add (new CFClient::UI::Label text => $_);
		3403	$hb->add (new CFClient::UI::Button
		3404	text => "delete",
		3405	tooltip => "Deletes the action from the record",
		3406	on_activate => sub {
		3407	$self->{cmdbox}->remove ($hb);
		3408	$cmds->[$i] = undef;
		3409	});
		3410
		3411
		3412	$idx++
		3413	}
		3414	}
		3415
		3416	#############################################################################
		3417
		3418	package CFClient::UI::SpellList;
		3419
		3420	our @ISA = CFClient::UI::Table::;
		3421
		3422	sub new {
		3423	my $class = shift;
		3424
		3425	my $self = $class->SUPER::new (
		3426	binding => [],
		3427	commands => [],
		3428	@_,
		3429	)
		3430	}
		3431
		3432	# XXX: Do sorting? Argl...
		3433	sub add_spell {
		3434	my ($self, $spell) = @_;
		3435	$self->{spells}->{$spell->{name}} = $spell;
		3436
		3437	$self->add (0, $self->{tbl_idx}, new CFClient::UI::Face
		3438	face => $spell->{face},
		3439	can_hover => 1,
		3440	can_events => 1,
		3441	tooltip => $spell->{message});
		3442
		3443	$self->add (1, $self->{tbl_idx}, new CFClient::UI::Label
		3444	text => $spell->{name},
		3445	can_hover => 1,
		3446	can_events => 1,
		3447	tooltip => $spell->{message},
		3448	expand => 1);
		3449
		3450	$self->add (2, $self->{tbl_idx}, new CFClient::UI::Label
		3451	text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
		3452	$spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
		3453	expand => 1);
		3454
		3455	$self->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
		3456	text => "bind to key",
		3457	on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
		3458	}
		3459
		3460	sub rebuild_spell_list {
		3461	my ($self) = @_;
		3462	$self->{tbl_idx} = 0;
		3463	$self->add_spell ($_) for values %{$self->{spells}};
		3464	}
		3465
		3466	sub remove_spell {
		3467	my ($self, $spell) = @_;
		3468	delete $self->{spells}->{$spell->{name}};
		3469	$self->rebuild_spell_list;
		3470	}
		3471
		3472	#############################################################################
		3473
		3474	package CFClient::UI::Root;
		3475
		3476	our @ISA = CFClient::UI::Container::;
		3477
		3478	use CFClient::OpenGL;
		3479
		3480	sub new {
		3481	my $class = shift;
		3482
		3483	my $self = $class->SUPER::new (
2966	visible => 1,	3484	visible => 1,
2967	@_,	3485	@_,
2968	)	3486	);
2969	}
2970		3487
2971	sub configure {	3488	Scalar::Util::weaken ($self->{root} = $self);
2972	my ($self, $x, $y, $w, $h) = @_;
2973		3489
2974	$self->{w} = $w;	3490	$self
2975	$self->{h} = $h;
2976	}
2977
2978	sub check_size {
2979	my ($self) = @_;
2980
2981	$self->size_allocate ($self->{w}, $self->{h})
2982	if $self->{w};
2983	}	3491	}
2984		3492
2985	sub size_request {	3493	sub size_request {
2986	my ($self) = @_;	3494	my ($self) = @_;
2987		3495
2988	($self->{w}, $self->{h})	3496	($self->{w}, $self->{h})
		3497	}
		3498
		3499	sub _to_pixel {
		3500	my ($coord, $size, $max) = @_;
		3501
		3502	$coord =
		3503	$coord eq "center" ? ($max - $size) * 0.5
		3504	: $coord eq "max" ? $max
		3505	: $coord;
		3506
		3507	$coord = 0 if $coord < 0;
		3508	$coord = $max - $size if $coord > $max - $size;
		3509
		3510	int $coord + 0.5
2989	}	3511	}
2990		3512
2991	sub size_allocate {	3513	sub size_allocate {
2992	my ($self, $w, $h) = @_;	3514	my ($self, $w, $h) = @_;
2993		3515
2994	for my $child ($self->children) {	3516	for my $child ($self->children) {
2995	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};	3517	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2996		3518
2997	$X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1	3519	$X = $child->{force_x} if exists $child->{force_x};
2998	if exists $child->{req_x};	3520	$Y = $child->{force_y} if exists $child->{force_y};
2999		3521
3000	$Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1	3522	$X = _to_pixel $X, $W, $self->{w};
3001	if exists $child->{req_y};	3523	$Y = _to_pixel $Y, $H, $self->{h};
3002
3003	delete @$child{qw(req_x req_y)};
3004
3005	$X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
3006	$Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
3007		3524
3008	$child->configure ($X, $Y, $W, $H);	3525	$child->configure ($X, $Y, $W, $H);
3009	}	3526	}
3010	}	3527	}
3011		3528
…		…
3022	}	3539	}
3023		3540
3024	sub update {	3541	sub update {
3025	my ($self) = @_;	3542	my ($self) = @_;
3026		3543
3027	$self->check_size;
3028	$::WANT_REFRESH++;	3544	$::WANT_REFRESH++;
3029	}	3545	}
3030		3546
3031	sub add {	3547	sub add {
3032	my ($self, @children) = @_;	3548	my ($self, @children) = @_;
3033		3549
3034	for my $child (@children) {
3035	$child->{is_toplevel} = 1;	3550	$_->{is_toplevel} = 1
3036		3551	for @children;
3037	# integerise window positions
3038	$child->{x} = int $child->{x};
3039	$child->{y} = int $child->{y};
3040	}
3041		3552
3042	$self->SUPER::add (@children);	3553	$self->SUPER::add (@children);
3043
3044	for (my @widgets = @children; my $w = pop @widgets; ) {
3045	push @widgets, $w->children;
3046	$w->set_visible;
3047	}
3048
3049	}	3554	}
3050		3555
3051	sub remove {	3556	sub remove {
3052	my ($self, @children) = @_;	3557	my ($self, @children) = @_;
3053		3558
3054	$self->SUPER::remove (@children);	3559	$self->SUPER::remove (@children);
		3560
		3561	delete $self->{is_toplevel}
		3562	for @children;
3055		3563
3056	while (@children) {	3564	while (@children) {
3057	my $w = pop @children;	3565	my $w = pop @children;
3058	push @children, $w->children;	3566	push @children, $w->children;
3059	$w->set_invisible;	3567	$w->set_invisible;
…		…
3078	while ($self->{refresh_hook}) {	3586	while ($self->{refresh_hook}) {
3079	$_->()	3587	$_->()
3080	for values %{delete $self->{refresh_hook}};	3588	for values %{delete $self->{refresh_hook}};
3081	}	3589	}
3082		3590
3083	if ($self->{check_size}) {	3591	if ($self->{realloc}) {
		3592	my %queue;
3084	my @queue;	3593	my @queue;
		3594	my $widget;
3085		3595
3086	for (;;) {	3596	outer:
3087	if ($self->{check_size}) {	3597	while () {
3088	#TODO use array-of-depth approach	3598	if (my $realloc = delete $self->{realloc}) {
		3599	for $widget (values %$realloc) {
		3600	$widget->{visible} or next; # do not resize invisible widgets
3089		3601
3090	@queue = sort { $a->{visible} <=> $b->{visible} }	3602	$queue{$widget+0}++ and next; # duplicates are common
3091	@queue, values %{delete $self->{check_size}};	3603
		3604	push @{ $queue[$widget->{visible}] }, $widget;
		3605	}
3092	}	3606	}
3093		3607
		3608	while () {
		3609	@queue or last outer;
		3610
3094	my $widget = pop @queue || last;	3611	$widget = pop @{ $queue[-1] || [] }
3095		3612	and last;
3096	defined $widget->{visible} or last; # do not resize invisible widgets
3097
3098	my ($w, $h) = $widget->{def_w} && $widget->{def_h}
3099	? @$widget{qw(def_w def_h)}
3100	: $widget->size_request;
3101
3102	if (delete $widget->{force_alloc}
3103	or $w != $widget->{req_w} or $h != $widget->{req_h}) {
3104	Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
3105		3613
		3614	pop @queue;
		3615	}
		3616
		3617	delete $queue{$widget+0};
		3618
		3619	my ($w, $h) = $widget->size_request;
		3620
		3621	$w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2;
		3622	$h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2;
		3623
		3624	$w = $widget->{force_w} if exists $widget->{force_w};
		3625	$h = $widget->{force_h} if exists $widget->{force_h};
		3626
		3627	if ($widget->{req_w} != $w || $widget->{req_h} != $h
		3628	|| delete $widget->{force_realloc}) {
3106	$widget->{req_w} = $w;	3629	$widget->{req_w} = $w;
3107	$widget->{req_h} = $h;	3630	$widget->{req_h} = $h;
3108		3631
3109	$self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h];	3632	$self->{size_alloc}{$widget+0} = $widget;
3110		3633
3111	$widget->{parent}->check_size
3112	if $widget->{parent};	3634	if (my $parent = $widget->{parent}) {
		3635	$self->{realloc}{$parent+0} = $parent
		3636	unless $queue{$parent+0};
		3637
		3638	$parent->{force_size_alloc} = 1;
		3639	$self->{size_alloc}{$parent+0} = $parent;
		3640	}
3113	}	3641	}
		3642
		3643	delete $self->{realloc}{$widget+0};
3114	}	3644	}
3115	}	3645	}
3116		3646
3117	while ($self->{size_alloc}) {	3647	while (my $size_alloc = delete $self->{size_alloc}) {
3118	for (values %{delete $self->{size_alloc}}) {	3648	my @queue = sort { $b->{visible} <=> $a->{visible} }
3119	my ($widget, $w, $h) = @$_;	3649	values %$size_alloc;
		3650
		3651	while () {
		3652	my $widget = pop @queue || last;
		3653
		3654	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3120		3655
3121	$w = 0 if $w < 0;	3656	$w = 0 if $w < 0;
3122	$h = 0 if $h < 0;	3657	$h = 0 if $h < 0;
3123		3658
		3659	$w = int $w + 0.5;
		3660	$h = int $h + 0.5;
		3661
		3662	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
		3663	$widget->{old_w} = $widget->{w};
		3664	$widget->{old_h} = $widget->{h};
		3665
3124	$widget->{w} = $w;	3666	$widget->{w} = $w;
3125	$widget->{h} = $h;	3667	$widget->{h} = $h;
		3668
3126	$widget->emit (size_allocate => $w, $h);	3669	$widget->emit (size_allocate => $w, $h);
		3670	}
3127	}	3671	}
3128	}	3672	}
3129		3673
3130	while ($self->{post_alloc_hook}) {	3674	while ($self->{post_alloc_hook}) {
3131	$_->()	3675	$_->()
3132	for values %{delete $self->{post_alloc_hook}};	3676	for values %{delete $self->{post_alloc_hook}};
3133	}	3677	}
		3678
3134		3679
3135	glViewport 0, 0, $::WIDTH, $::HEIGHT;	3680	glViewport 0, 0, $::WIDTH, $::HEIGHT;
3136	glClearColor +($::CFG->{fow_intensity}) x 3, 1;	3681	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3137	glClear GL_COLOR_BUFFER_BIT;	3682	glClear GL_COLOR_BUFFER_BIT;
3138		3683
…		…
3140	glLoadIdentity;	3685	glLoadIdentity;
3141	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;	3686	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3142	glMatrixMode GL_MODELVIEW;	3687	glMatrixMode GL_MODELVIEW;
3143	glLoadIdentity;	3688	glLoadIdentity;
3144		3689
		3690	{
		3691	package CFClient::UI::Base;
		3692
		3693	($draw_x, $draw_y, $draw_w, $draw_h) =
		3694	(0, 0, $self->{w}, $self->{h});
		3695	}
		3696
3145	$self->_draw;	3697	$self->_draw;
3146	}	3698	}
3147		3699
3148	#############################################################################	3700	#############################################################################
3149		3701

Diff Legend

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