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.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->{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})
…		…
785	$self->SUPER::size_allocate ($w, $h);	821	$self->SUPER::size_allocate ($w, $h);
786	$self->update;	822	$self->update;
787	}	823	}
788		824
789	sub _render {	825	sub _render {
		826	my ($self) = @_;
		827
790	$_[0]{children}[0]->draw;	828	$self->{children}[0]->draw;
791	}	829	}
792		830
793	sub render_child {	831	sub render_child {
794	my ($self) = @_;	832	my ($self) = @_;
795		833
796	$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 {
797	glClearColor 0, 0, 0, 0;	835	glClearColor 0, 0, 0, 0;
798	glClear GL_COLOR_BUFFER_BIT;	836	glClear GL_COLOR_BUFFER_BIT;
799		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
800	$self->_render;	845	$self->_render;
801	};	846	};
802	}	847	}
803		848
804	sub _draw {	849	sub _draw {
805	my ($self) = @_;	850	my ($self) = @_;
806		851
807	my ($w, $h) = ($self->w, $self->h);	852	my ($w, $h) = @$self{qw(w h)};
808		853
809	my $tex = $self->{texture}	854	my $tex = $self->{texture}
810	or return;	855	or return;
811		856
812	glEnable GL_TEXTURE_2D;	857	glEnable GL_TEXTURE_2D;
…		…
835	}	880	}
836		881
837	sub size_request {	882	sub size_request {
838	my ($self) = @_;	883	my ($self) = @_;
839		884
840	@$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};	885	my ($w, $h) = @{$self->child}{qw(req_w req_h)};
841		886
842	@$self{qw(child_w child_h)}	887	$w = 10 if $self->{scroll_x};
		888	$h = 10 if $self->{scroll_y};
		889
		890	($w, $h)
843	}	891	}
844		892
845	sub size_allocate {	893	sub size_allocate {
846	my ($self, $w, $h) = @_;	894	my ($self, $w, $h) = @_;
847		895
		896	my $child = $self->child;
		897
848	$w = $self->{child_w} if $self->{scroll_x} && $self->{child_w};	898	$w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
849	$h = $self->{child_h} if $self->{scroll_y} && $self->{child_h};	899	$h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
850		900
851	$self->child->configure (0, 0, $w, $h);	901	$self->child->configure (0, 0, $w, $h);
852	$self->update;	902	$self->update;
853	}	903	}
854		904
…		…
890	}	940	}
891		941
892	sub _render {	942	sub _render {
893	my ($self) = @_;	943	my ($self) = @_;
894		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
895	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};	948	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
896		949
897	$self->SUPER::_render;	950	$self->SUPER::_render;
898	}	951	}
899		952
…		…
902	package CFClient::UI::ScrolledWindow;	955	package CFClient::UI::ScrolledWindow;
903		956
904	our @ISA = CFClient::UI::HBox::;	957	our @ISA = CFClient::UI::HBox::;
905		958
906	sub new {	959	sub new {
907	my $class = shift;	960	my ($class, %arg) = @_;
		961
		962	my $child = delete $arg{child};
908		963
909	my $self;	964	my $self;
910		965
911	my $slider = new CFClient::UI::Slider	966	my $slider = new CFClient::UI::Slider
912	vertical => 1,	967	vertical => 1,
…		…
917	;	972	;
918		973
919	$self = $class->SUPER::new (	974	$self = $class->SUPER::new (
920	vp => (new CFClient::UI::ViewPort expand => 1),	975	vp => (new CFClient::UI::ViewPort expand => 1),
921	slider => $slider,	976	slider => $slider,
922	@_,	977	%arg,
923	);	978	);
924		979
925	$self->{vp}->add ($self->{scrolled});
926	$self->add ($self->{vp});
927	$self->add ($self->{slider});	980	$self->SUPER::add ($self->{vp}, $self->{slider});
		981	$self->add ($child) if $child;
928		982
929	$self	983	$self
		984	}
		985
		986	sub add {
		987	my ($self, $widget) = @_;
		988
		989	$self->{vp}->add ($self->{child} = $widget);
930	}	990	}
931		991
932	sub update {	992	sub update {
933	my ($self) = @_;	993	my ($self) = @_;
934		994
…		…
997		1057
998	our @ISA = CFClient::UI::Bin::;	1058	our @ISA = CFClient::UI::Bin::;
999		1059
1000	use CFClient::OpenGL;	1060	use CFClient::OpenGL;
1001		1061
1002	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 =
1003	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	1067	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);	1068	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1005		1069
1006	sub new {	1070	sub new {
1007	my $class = shift;	1071	my ($class, %arg) = @_;
		1072
		1073	my $title = delete $arg{title};
1008		1074
1009	my $self = $class->SUPER::new (	1075	my $self = $class->SUPER::new (
1010	bg => [1, 1, 1, 1],	1076	bg => [1, 1, 1, 1],
1011	border_bg => [1, 1, 1, 1],	1077	border_bg => [1, 1, 1, 1],
1012	border => 0.6,	1078	border => 0.6,
1013	is_toplevel => 1,
1014	can_events => 1,	1079	can_events => 1,
1015	@_	1080	min_w => 16,
		1081	min_h => 16,
		1082	%arg,
1016	);	1083	);
1017		1084
1018	$self->{title} &&= new CFClient::UI::Label	1085	$self->{title} = new CFClient::UI::Label
1019	align => 0,	1086	align => 0,
1020	valign => 1,	1087	valign => 1,
1021	text => $self->{title},	1088	text => $title,
1022	fontsize => $self->{border};	1089	fontsize => $self->{border}
		1090	if defined $title;
1023		1091
1024	$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};
1025	}	1100	}
1026		1101
1027	sub border {	1102	sub border {
1028	int $_[0]{border} * $::FONTSIZE	1103	int $_[0]{border} * $::FONTSIZE
1029	}	1104	}
1030		1105
1031	sub size_request {	1106	sub size_request {
1032	my ($self) = @_;	1107	my ($self) = @_;
		1108
		1109	$self->{title}->size_request
		1110	if $self->{title};
1033		1111
1034	my ($w, $h) = $self->SUPER::size_request;	1112	my ($w, $h) = $self->SUPER::size_request;
1035		1113
1036	(	1114	(
1037	$w + $self->border * 2,	1115	$w + $self->border * 2,
…		…
1040	}	1118	}
1041		1119
1042	sub size_allocate {	1120	sub size_allocate {
1043	my ($self, $w, $h) = @_;	1121	my ($self, $w, $h) = @_;
1044		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
1045	$h -= List::Util::max 0, $self->border * 2;	1131	$h -= List::Util::max 0, $border * 2;
1046	$w -= List::Util::max 0, $self->border * 2;	1132	$w -= List::Util::max 0, $border * 2;
1047		1133
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);	1134	$self->child->configure ($border, $border, $w, $h);
1052	}	1135	}
1053		1136
1054	sub button_down {	1137	sub button_down {
1055	my ($self, $ev, $x, $y) = @_;	1138	my ($self, $ev, $x, $y) = @_;
1056		1139
…		…
1072	my ($ev, $x, $y) = @_;	1155	my ($ev, $x, $y) = @_;
1073		1156
1074	my $dx = $ev->{x} - $ox;	1157	my $dx = $ev->{x} - $ox;
1075	my $dy = $ev->{y} - $oy;	1158	my $dy = $ev->{y} - $oy;
1076		1159
1077	$self->{user_x} = $wx + $dx * $mx;
1078	$self->{user_y} = $wy + $dy * $my;
1079	$self->{def_w} = $bw + $dx * ($mx ? -1 : 1);	1160	$self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1080	$self->{def_h} = $bh + $dy * ($my ? -1 : 1);	1161	$self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1081	$self->move ($self->{user_x}, $self->{user_y});	1162
1082	$self->check_size;	1163	$self->realloc;
		1164	$self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1083	};	1165	};
1084		1166
1085	} elsif ($lr ^ $td) {	1167	} elsif ($lr ^ $td) {
1086	my ($ox, $oy) = ($ev->{x}, $ev->{y});	1168	my ($ox, $oy) = ($ev->{x}, $ev->{y});
1087	my ($bx, $by) = ($self->{x}, $self->{y});	1169	my ($bx, $by) = ($self->{x}, $self->{y});
…		…
1089	$self->{motion} = sub {	1171	$self->{motion} = sub {
1090	my ($ev, $x, $y) = @_;	1172	my ($ev, $x, $y) = @_;
1091		1173
1092	($x, $y) = ($ev->{x}, $ev->{y});	1174	($x, $y) = ($ev->{x}, $ev->{y});
1093		1175
1094	$self->{user_x} = $bx + $x - $ox;	1176	$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	};	1177	};
		1178	} else {
		1179	return 0;
		1180	}
		1181
1100	}	1182	1
1101	}	1183	}
1102		1184
1103	sub button_up {	1185	sub button_up {
1104	my ($self, $ev, $x, $y) = @_;	1186	my ($self, $ev, $x, $y) = @_;
1105		1187
1106	delete $self->{motion};	1188	!!delete $self->{motion}
1107	}	1189	}
1108		1190
1109	sub mouse_motion {	1191	sub mouse_motion {
1110	my ($self, $ev, $x, $y) = @_;	1192	my ($self, $ev, $x, $y) = @_;
1111		1193
1112	$self->{motion}->($ev, $x, $y) if $self->{motion};	1194	$self->{motion}->($ev, $x, $y) if $self->{motion};
		1195
		1196	!!$self->{motion}
1113	}	1197	}
1114		1198
1115	sub _draw {	1199	sub _draw {
1116	my ($self) = @_;	1200	my ($self) = @_;
1117		1201
		1202	my $child = $self->{children}[0];
		1203
1118	my ($w, $h ) = ($self->{w}, $self->{h});	1204	my ($w, $h ) = ($self->{w}, $self->{h});
1119	my ($cw, $ch) = ($self->child->{w}, $self->child->{h});	1205	my ($cw, $ch) = ($child->{w}, $child->{h});
1120		1206
1121	glEnable GL_TEXTURE_2D;	1207	glEnable GL_TEXTURE_2D;
1122	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	1208	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1123		1209
1124	my $border = $self->border;	1210	my $border = $self->border;
1125		1211
1126	glColor @{ $self->{border_bg} };	1212	glColor @{ $self->{border_bg} };
1127	$tex[1]->draw_quad_alpha (0, 0, $w, $border);	1213	$border[0]->draw_quad_alpha (0, 0, $w, $border);
1128	$tex[3]->draw_quad_alpha (0, $border, $border, $ch);	1214	$border[1]->draw_quad_alpha (0, $border, $border, $ch);
1129	$tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);	1215	$border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1130	$tex[4]->draw_quad_alpha (0, $h - $border, $w, $border);	1216	$border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
1131		1217
1132	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {	1218	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1133	my $bg = $tex[0];	1219	glColor @{ $self->{bg} };
1134		1220
1135	# TODO: repeat texture not scale	1221	# TODO: repeat texture not scale
		1222	# solve this better(?)
1136	my $rep_x = $cw / $bg->{w};	1223	$bg->{s} = $cw / $bg->{w};
1137	my $rep_y = $ch / $bg->{h};	1224	$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);	1225	$bg->draw_quad_alpha ($border, $border, $cw, $ch);
1145	}	1226	}
1146		1227
1147	glDisable GL_TEXTURE_2D;	1228	glDisable GL_TEXTURE_2D;
1148		1229
1149	$self->{title}->draw if $self->{title};
1150
1151	$self->child->draw;	1230	$child->draw;
		1231
		1232	if ($self->{title}) {
		1233	glTranslate 0, $border - $self->{h};
		1234	$self->{title}->_draw;
		1235	}
1152	}	1236	}
1153		1237
1154	#############################################################################	1238	#############################################################################
1155		1239
1156	package CFClient::UI::Table;	1240	package CFClient::UI::Table;
…		…
1178	my ($self, $x, $y, $child) = @_;	1262	my ($self, $x, $y, $child) = @_;
1179		1263
1180	$child->set_parent ($self);	1264	$child->set_parent ($self);
1181	$self->{children}[$y][$x] = $child;	1265	$self->{children}[$y][$x] = $child;
1182		1266
1183	$self->check_size (1);	1267	$self->realloc;
1184	}	1268	}
1185		1269
1186	# 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?
1187	sub clear {	1271	sub clear {
1188	my ($self) = @_;	1272	my ($self) = @_;
…		…
1193	for (@children) {	1277	for (@children) {
1194	delete $_->{parent};	1278	delete $_->{parent};
1195	$_->hide;	1279	$_->hide;
1196	}	1280	}
1197		1281
1198	$self->check_size (1);	1282	$self->realloc;
1199	$self->update;
1200	}	1283	}
1201		1284
1202	sub get_wh {	1285	sub get_wh {
1203	my ($self) = @_;	1286	my ($self) = @_;
1204		1287
…		…
1324	my ($self, $w, $h) = @_;	1407	my ($self, $w, $h) = @_;
1325		1408
1326	my $space = $self->{vertical} ? $h : $w;	1409	my $space = $self->{vertical} ? $h : $w;
1327	my $children = $self->{children};	1410	my $children = $self->{children};
1328		1411
1329	my @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;	1412	my @req;
1330	my $req = List::Util::sum @req;
1331		1413
1332	if ($req > $space) {	1414	if ($self->{homogeneous}) {
1333	# ah well, not enough space	1415	@req = ($space / (@$children || 1)) x @$children;
1334	$_ *= $space / $req for @req;
1335	} 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 {
1336	my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;	1424	my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1337		1425
		1426	$space = ($space - $req) / $expand; # remaining space to give away
		1427
1338	$req[$_] += ($space - $req) * $children->[$_]{expand} / $expand	1428	$req[$_] += $space * $children->[$_]{expand}
1339	for 0 .. $#$children;	1429	for 0 .. $#$children;
		1430	}
1340	}	1431	}
1341		1432
1342	CFClient::UI::harmonize \@req;	1433	CFClient::UI::harmonize \@req;
1343		1434
1344	my $pos = 0;	1435	my $pos = 0;
…		…
1404	ellipsise => 3, # end	1495	ellipsise => 3, # end
1405	layout => (new CFClient::Layout),	1496	layout => (new CFClient::Layout),
1406	fontsize => 1,	1497	fontsize => 1,
1407	align => -1,	1498	align => -1,
1408	valign => -1,	1499	valign => -1,
1409	padding => 2,	1500	padding_x => 2,
		1501	padding_y => 2,
1410	can_events => 0,	1502	can_events => 0,
1411	%arg	1503	%arg
1412	);	1504	);
1413		1505
1414	if (exists $self->{template}) {	1506	if (exists $self->{template}) {
…		…
1450	$self->{text} = "T$text";	1542	$self->{text} = "T$text";
1451		1543
1452	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;	1544	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1453	$self->{layout}->set_text ($text);	1545	$self->{layout}->set_text ($text);
1454		1546
		1547	$self->realloc;
1455	$self->update;	1548	$self->update;
1456	$self->check_size;
1457	}	1549	}
1458		1550
1459	sub set_markup {	1551	sub set_markup {
1460	my ($self, $markup) = @_;	1552	my ($self, $markup) = @_;
1461		1553
…		…
1465	my $rgba = $markup =~ /span.*(?:foreground|background)/;	1557	my $rgba = $markup =~ /span.*(?:foreground|background)/;
1466		1558
1467	$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;
1468	$self->{layout}->set_markup ($markup);	1560	$self->{layout}->set_markup ($markup);
1469		1561
		1562	$self->realloc;
1470	$self->update;	1563	$self->update;
1471	$self->check_size;
1472	}	1564	}
1473		1565
1474	sub size_request {	1566	sub size_request {
1475	my ($self) = @_;	1567	my ($self) = @_;
1476		1568
…		…
1490		1582
1491	$w = List::Util::max $w, $w2;	1583	$w = List::Util::max $w, $w2;
1492	$h = List::Util::max $h, $h2;	1584	$h = List::Util::max $h, $h2;
1493	}	1585	}
1494		1586
1495	(	1587	($w, $h)
1496	$w + $self->{padding} * 2,
1497	$h + $self->{padding} * 2,
1498	)
1499	}	1588	}
1500		1589
1501	sub size_allocate {	1590	sub size_allocate {
1502	my ($self, $w, $h) = @_;	1591	my ($self, $w, $h) = @_;
1503		1592
		1593	delete $self->{ox};
		1594
1504	delete $self->{texture};	1595	delete $self->{texture}
		1596	unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1505	}	1597	}
1506		1598
1507	sub set_fontsize {	1599	sub set_fontsize {
1508	my ($self, $fontsize) = @_;	1600	my ($self, $fontsize) = @_;
1509		1601
1510	$self->{fontsize} = $fontsize;	1602	$self->{fontsize} = $fontsize;
1511	delete $self->{texture};	1603	delete $self->{texture};
1512		1604
1513	$self->update;	1605	$self->realloc;
1514	$self->check_size;
1515	}	1606	}
1516		1607
1517	sub _draw {	1608	sub _draw {
1518	my ($self) = @_;	1609	my ($self) = @_;
1519		1610
…		…
1525	$self->{layout}->set_width ($self->{w});	1616	$self->{layout}->set_width ($self->{w});
1526	$self->{layout}->set_ellipsise ($self->{ellipsise});	1617	$self->{layout}->set_ellipsise ($self->{ellipsise});
1527	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});	1618	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1528	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1619	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1529		1620
1530	my $tex = new_from_layout CFClient::Texture $self->{layout};	1621	new_from_layout CFClient::Texture $self->{layout}
		1622	};
1531		1623
		1624	unless (exists $self->{ox}) {
1532	$self->{ox} = int ($self->{align} < 0 ? $self->{padding}	1625	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1533	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}	1626	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1534	: ($self->{w} - $tex->{w}) * 0.5);	1627	: ($self->{w} - $tex->{w}) * 0.5);
1535		1628
1536	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding}	1629	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1537	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}	1630	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1538	: ($self->{h} - $tex->{h}) * 0.5);	1631	: ($self->{h} - $tex->{h}) * 0.5);
1539
1540	$tex
1541	};	1632	};
1542		1633
1543	glEnable GL_TEXTURE_2D;	1634	glEnable GL_TEXTURE_2D;
1544	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1635	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1545		1636
…		…
1599	sub set_text {	1690	sub set_text {
1600	my ($self, $text) = @_;	1691	my ($self, $text) = @_;
1601		1692
1602	$self->{cursor} = length $text;	1693	$self->{cursor} = length $text;
1603	$self->_set_text ($text);	1694	$self->_set_text ($text);
1604	$self->update;	1695
1605	$self->check_size;	1696	$self->realloc;
1606	}	1697	}
1607		1698
1608	sub get_text {	1699	sub get_text {
1609	$_[0]{text}	1700	$_[0]{text}
1610	}	1701	}
…		…
1640	$self->{cursor} = length $text;	1731	$self->{cursor} = length $text;
1641	} elsif ($uni == 27) {	1732	} elsif ($uni == 27) {
1642	$self->_emit ('escape');	1733	$self->_emit ('escape');
1643	} elsif ($uni) {	1734	} elsif ($uni) {
1644	substr $text, $self->{cursor}++, 0, chr $uni;	1735	substr $text, $self->{cursor}++, 0, chr $uni;
		1736	} else {
		1737	return 0;
1645	}	1738	}
1646		1739
1647	$self->_set_text ($text);	1740	$self->_set_text ($text);
1648	$self->update;	1741
1649	$self->check_size;	1742	$self->realloc;
		1743
		1744	1
1650	}	1745	}
1651		1746
1652	sub focus_in {	1747	sub focus_in {
1653	my ($self) = @_;	1748	my ($self) = @_;
1654		1749
…		…
1669	utf8::encode $text;	1764	utf8::encode $text;
1670	$self->{cursor} = length substr $text, 0, $idx;	1765	$self->{cursor} = length substr $text, 0, $idx;
1671		1766
1672	$self->_set_text ($self->{text});	1767	$self->_set_text ($self->{text});
1673	$self->update;	1768	$self->update;
		1769
		1770	1
1674	}	1771	}
1675		1772
1676	sub mouse_motion {	1773	sub mouse_motion {
1677	my ($self, $ev, $x, $y) = @_;	1774	my ($self, $ev, $x, $y) = @_;
1678	# 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
1679	}	1778	}
1680		1779
1681	sub _draw {	1780	sub _draw {
1682	my ($self) = @_;	1781	my ($self) = @_;
1683		1782
…		…
1760	} else {	1859	} else {
1761	$self->set_text ($self->{history_saveback});	1860	$self->set_text ($self->{history_saveback});
1762	}	1861	}
1763		1862
1764	} else {	1863	} else {
1765	$self->SUPER::key_down ($ev);	1864	return $self->SUPER::key_down ($ev)
		1865	}
		1866
1766	}	1867	1
1767
1768	}	1868	}
1769		1869
1770	#############################################################################	1870	#############################################################################
1771		1871
1772	package CFClient::UI::Button;	1872	package CFClient::UI::Button;
…		…
1781		1881
1782	sub new {	1882	sub new {
1783	my $class = shift;	1883	my $class = shift;
1784		1884
1785	$class->SUPER::new (	1885	$class->SUPER::new (
1786	padding => 4,	1886	padding_x => 4,
		1887	padding_y => 4,
1787	fg => [1, 1, 1],	1888	fg => [1, 1, 1],
1788	active_fg => [0, 0, 1],	1889	active_fg => [0, 0, 1],
1789	can_hover => 1,	1890	can_hover => 1,
1790	align => 0,	1891	align => 0,
1791	valign => 0,	1892	valign => 0,
…		…
1800	my ($self, $ev, $x, $y) = @_;	1901	my ($self, $ev, $x, $y) = @_;
1801		1902
1802	$self->emit ("activate")	1903	$self->emit ("activate")
1803	if $x >= 0 && $x < $self->{w}	1904	if $x >= 0 && $x < $self->{w}
1804	&& $y >= 0 && $y < $self->{h};	1905	&& $y >= 0 && $y < $self->{h};
		1906
		1907	1
1805	}	1908	}
1806		1909
1807	sub _draw {	1910	sub _draw {
1808	my ($self) = @_;	1911	my ($self) = @_;
1809		1912
…		…
1838		1941
1839	sub new {	1942	sub new {
1840	my $class = shift;	1943	my $class = shift;
1841		1944
1842	$class->SUPER::new (	1945	$class->SUPER::new (
1843	padding => 2,	1946	padding_x => 2,
		1947	padding_y => 2,
1844	fg => [1, 1, 1],	1948	fg => [1, 1, 1],
1845	active_fg => [1, 1, 0],	1949	active_fg => [1, 1, 0],
1846	bg => [0, 0, 0, 0.2],	1950	bg => [0, 0, 0, 0.2],
1847	active_bg => [1, 1, 1, 0.5],	1951	active_bg => [1, 1, 1, 0.5],
1848	state => 0,	1952	state => 0,
…		…
1852	}	1956	}
1853		1957
1854	sub size_request {	1958	sub size_request {
1855	my ($self) = @_;	1959	my ($self) = @_;
1856		1960
1857	($self->{padding} * 2 + 6) x 2	1961	(6) x 2
1858	}	1962	}
1859		1963
1860	sub button_down {	1964	sub button_down {
1861	my ($self, $ev, $x, $y) = @_;	1965	my ($self, $ev, $x, $y) = @_;
1862		1966
1863	if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}	1967	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1864	&& $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {	1968	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1865	$self->{state} = !$self->{state};	1969	$self->{state} = !$self->{state};
1866	$self->_emit (changed => $self->{state});	1970	$self->_emit (changed => $self->{state});
		1971	} else {
		1972	return 0
		1973	}
		1974
1867	}	1975	1
1868	}	1976	}
1869		1977
1870	sub _draw {	1978	sub _draw {
1871	my ($self) = @_;	1979	my ($self) = @_;
1872		1980
1873	$self->SUPER::_draw;	1981	$self->SUPER::_draw;
1874		1982
1875	glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0;	1983	glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1876		1984
1877	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;
1878		1988
1879	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };	1989	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1880		1990
1881	my $tex = $self->{state} ? $tex[1] : $tex[0];	1991	my $tex = $self->{state} ? $tex[1] : $tex[0];
1882		1992
…		…
2147	fg => [1, 1, 1],	2257	fg => [1, 1, 1],
2148	active_fg => [0, 0, 0],	2258	active_fg => [0, 0, 0],
2149	bg => [0, 0, 0, 0.2],	2259	bg => [0, 0, 0, 0.2],
2150	active_bg => [1, 1, 1, 0.5],	2260	active_bg => [1, 1, 1, 0.5],
2151	range => [0, 0, 100, 10, 0],	2261	range => [0, 0, 100, 10, 0],
2152	req_w => $::WIDTH / 80,	2262	min_w => $::WIDTH / 80,
2153	req_h => $::WIDTH / 80,	2263	min_h => $::WIDTH / 80,
2154	vertical => 0,	2264	vertical => 0,
2155	can_hover => 1,	2265	can_hover => 1,
2156	inner_pad => 0.02,	2266	inner_pad => 0.02,
2157	@_	2267	@_
2158	);	2268	);
…		…
2161	$self->update;	2271	$self->update;
2162		2272
2163	$self	2273	$self
2164	}	2274	}
2165		2275
		2276	sub changed { }
		2277
2166	sub set_range {	2278	sub set_range {
2167	my ($self, $range) = @_;	2279	my ($self, $range) = @_;
2168		2280
2169	($range, $self->{range}) = ($self->{range}, $range);	2281	($range, $self->{range}) = ($self->{range}, $range);
2170		2282
…		…
2196	}	2308	}
2197		2309
2198	sub size_request {	2310	sub size_request {
2199	my ($self) = @_;	2311	my ($self) = @_;
2200		2312
2201	my $w = $self->{req_w};	2313	($self->{req_w}, $self->{req_h})
2202	my $h = $self->{req_h};
2203
2204	$self->{vertical} ? ($h, $w) : ($w, $h)
2205	}	2314	}
2206		2315
2207	sub button_down {	2316	sub button_down {
2208	my ($self, $ev, $x, $y) = @_;	2317	my ($self, $ev, $x, $y) = @_;
2209		2318
2210	$self->SUPER::button_down ($ev, $x, $y);	2319	$self->SUPER::button_down ($ev, $x, $y);
2211		2320
2212	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];	2321	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2213		2322
2214	$self->mouse_motion ($ev, $x, $y);	2323	$self->mouse_motion ($ev, $x, $y)
2215	}	2324	}
2216		2325
2217	sub mouse_motion {	2326	sub mouse_motion {
2218	my ($self, $ev, $x, $y) = @_;	2327	my ($self, $ev, $x, $y) = @_;
2219		2328
…		…
2223	my (undef, $lo, $hi, $page) = @{$self->{range}};	2332	my (undef, $lo, $hi, $page) = @{$self->{range}};
2224		2333
2225	$x = ($x - $self->{click}[1]) / ($w * $self->{scale});	2334	$x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2226		2335
2227	$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
2228	}	2341	1
2229	}	2342	}
2230		2343
2231	sub update {	2344	sub update {
2232	my ($self) = @_;	2345	my ($self) = @_;
2233		2346
…		…
2594	}	2707	}
2595		2708
2596	sub set_tooltip_from {	2709	sub set_tooltip_from {
2597	my ($self, $widget) = @_;	2710	my ($self, $widget) = @_;
2598		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
2599	$self->add (new CFClient::UI::Label	2721	$self->add (new CFClient::UI::Label
2600	markup => $widget->{tooltip},	2722	markup => $tooltip,
2601	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	2723	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2602	fontsize => 0.8,	2724	fontsize => 0.8,
2603	fg => [0, 0, 0, 1],	2725	fg => [0, 0, 0, 1],
2604	ellipsise => 0,	2726	ellipsise => 0,
2605	font => ($widget->{tooltip_font} || $::FONT_PROP),	2727	font => ($widget->{tooltip_font} || $::FONT_PROP),
…		…
2616		2738
2617	sub size_allocate {	2739	sub size_allocate {
2618	my ($self, $w, $h) = @_;	2740	my ($self, $w, $h) = @_;
2619		2741
2620	$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	});
2621	}	2761	}
2622		2762
2623	sub _draw {	2763	sub _draw {
2624	my ($self) = @_;	2764	my ($self) = @_;
2625		2765
…		…
2642	glVertex $w, $h;	2782	glVertex $w, $h;
2643	glVertex $w, 0;	2783	glVertex $w, 0;
2644	glEnd;	2784	glEnd;
2645		2785
2646	glTranslate 2 - 0.375, 2 - 0.375;	2786	glTranslate 2 - 0.375, 2 - 0.375;
		2787
2647	$self->SUPER::_draw;	2788	$self->SUPER::_draw;
2648	}	2789	}
2649		2790
2650	#############################################################################	2791	#############################################################################
2651		2792
…		…
2727	$self->SUPER::DESTROY;	2868	$self->SUPER::DESTROY;
2728	}	2869	}
2729		2870
2730	#############################################################################	2871	#############################################################################
2731		2872
2732	package CFClient::UI::Inventory;	2873	package CFClient::UI::Buttonbar;
2733		2874
2734	our @ISA = CFClient::UI::ScrolledWindow::;	2875	our @ISA = CFClient::UI::HBox::;
2735		2876
2736	sub new {	2877	# 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		2878
2772	#############################################################################	2879	#############################################################################
2773		2880
2774	package CFClient::UI::Menu;	2881	package CFClient::UI::Menu;
2775		2882
…		…
2816	# maybe save $GRAB? must be careful about events...	2923	# maybe save $GRAB? must be careful about events...
2817	$GRAB = $self;	2924	$GRAB = $self;
2818	$self->{button} = $ev->{button};	2925	$self->{button} = $ev->{button};
2819		2926
2820	$self->show;	2927	$self->show;
2821	$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);
2822	}	2929	}
2823		2930
2824	sub mouse_motion {	2931	sub mouse_motion {
2825	my ($self, $ev, $x, $y) = @_;	2932	my ($self, $ev, $x, $y) = @_;
2826		2933
2827	# TODO: should use vbox->find_widget or so	2934	# TODO: should use vbox->find_widget or so
2828	$HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});	2935	$HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2829	$self->{hover} = $self->{item}{$HOVER};	2936	$self->{hover} = $self->{item}{$HOVER};
		2937
		2938	0
2830	}	2939	}
2831		2940
2832	sub button_up {	2941	sub button_up {
2833	my ($self, $ev, $x, $y) = @_;	2942	my ($self, $ev, $x, $y) = @_;
2834		2943
…		…
2836	undef $GRAB;	2945	undef $GRAB;
2837	$self->hide;	2946	$self->hide;
2838		2947
2839	$self->_emit ("popdown");	2948	$self->_emit ("popdown");
2840	$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	);
2841	}	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});
2842	}	3063	}
2843		3064
2844	#############################################################################	3065	#############################################################################
2845		3066
2846	package CFClient::UI::Statusbox;	3067	package CFClient::UI::Statusbox;
…		…
2951	$self->SUPER::reconfigure;	3172	$self->SUPER::reconfigure;
2952	}	3173	}
2953		3174
2954	#############################################################################	3175	#############################################################################
2955		3176
2956	package CFClient::UI::Root;	3177	package CFClient::UI::Inventory;
2957		3178
2958	our @ISA = CFClient::UI::Container::;	3179	our @ISA = CFClient::UI::ScrolledWindow::;
2959
2960	use CFClient::OpenGL;
2961		3180
2962	sub new {	3181	sub new {
2963	my $class = shift;	3182	my $class = shift;
2964		3183
2965	$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 (
2966	visible => 1,	3482	visible => 1,
2967	@_,	3483	@_,
2968	)	3484	);
2969	}
2970		3485
2971	sub configure {	3486	Scalar::Util::weaken ($self->{root} = $self);
2972	my ($self, $x, $y, $w, $h) = @_;
2973		3487
2974	$self->{w} = $w;	3488	$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	}	3489	}
2984		3490
2985	sub size_request {	3491	sub size_request {
2986	my ($self) = @_;	3492	my ($self) = @_;
2987		3493
2988	($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
2989	}	3509	}
2990		3510
2991	sub size_allocate {	3511	sub size_allocate {
2992	my ($self, $w, $h) = @_;	3512	my ($self, $w, $h) = @_;
2993		3513
2994	for my $child ($self->children) {	3514	for my $child ($self->children) {
2995	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)};
2996		3516
2997	$X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1	3517	$X = $child->{force_x} if exists $child->{force_x};
2998	if exists $child->{req_x};	3518	$Y = $child->{force_y} if exists $child->{force_y};
2999		3519
3000	$Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1	3520	$X = _to_pixel $X, $W, $self->{w};
3001	if exists $child->{req_y};	3521	$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		3522
3008	$child->configure ($X, $Y, $W, $H);	3523	$child->configure ($X, $Y, $W, $H);
3009	}	3524	}
3010	}	3525	}
3011		3526
…		…
3022	}	3537	}
3023		3538
3024	sub update {	3539	sub update {
3025	my ($self) = @_;	3540	my ($self) = @_;
3026		3541
3027	$self->check_size;
3028	$::WANT_REFRESH++;	3542	$::WANT_REFRESH++;
3029	}	3543	}
3030		3544
3031	sub add {	3545	sub add {
3032	my ($self, @children) = @_;	3546	my ($self, @children) = @_;
3033		3547
3034	for my $child (@children) {
3035	$child->{is_toplevel} = 1;	3548	$_->{is_toplevel} = 1
3036		3549	for @children;
3037	# integerise window positions
3038	$child->{x} = int $child->{x};
3039	$child->{y} = int $child->{y};
3040	}
3041		3550
3042	$self->SUPER::add (@children);	3551	$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	}	3552	}
3050		3553
3051	sub remove {	3554	sub remove {
3052	my ($self, @children) = @_;	3555	my ($self, @children) = @_;
3053		3556
3054	$self->SUPER::remove (@children);	3557	$self->SUPER::remove (@children);
		3558
		3559	delete $self->{is_toplevel}
		3560	for @children;
3055		3561
3056	while (@children) {	3562	while (@children) {
3057	my $w = pop @children;	3563	my $w = pop @children;
3058	push @children, $w->children;	3564	push @children, $w->children;
3059	$w->set_invisible;	3565	$w->set_invisible;
…		…
3078	while ($self->{refresh_hook}) {	3584	while ($self->{refresh_hook}) {
3079	$_->()	3585	$_->()
3080	for values %{delete $self->{refresh_hook}};	3586	for values %{delete $self->{refresh_hook}};
3081	}	3587	}
3082		3588
3083	if ($self->{check_size}) {	3589	if ($self->{realloc}) {
		3590	my %queue;
3084	my @queue;	3591	my @queue;
		3592	my $widget;
3085		3593
3086	for (;;) {	3594	outer:
3087	if ($self->{check_size}) {	3595	while () {
3088	#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
3089		3599
3090	@queue = sort { $a->{visible} <=> $b->{visible} }	3600	$queue{$widget+0}++ and next; # duplicates are common
3091	@queue, values %{delete $self->{check_size}};	3601
		3602	push @{ $queue[$widget->{visible}] }, $widget;
		3603	}
3092	}	3604	}
3093		3605
		3606	while () {
		3607	@queue or last outer;
		3608
3094	my $widget = pop @queue || last;	3609	$widget = pop @{ $queue[-1] || [] }
3095		3610	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		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}) {
3106	$widget->{req_w} = $w;	3627	$widget->{req_w} = $w;
3107	$widget->{req_h} = $h;	3628	$widget->{req_h} = $h;
3108		3629
3109	$self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h];	3630	$self->{size_alloc}{$widget+0} = $widget;
3110		3631
3111	$widget->{parent}->check_size
3112	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	}
3113	}	3639	}
		3640
		3641	delete $self->{realloc}{$widget+0};
3114	}	3642	}
3115	}	3643	}
3116		3644
3117	while ($self->{size_alloc}) {	3645	while (my $size_alloc = delete $self->{size_alloc}) {
3118	for (values %{delete $self->{size_alloc}}) {	3646	my @queue = sort { $b->{visible} <=> $a->{visible} }
3119	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)};
3120		3653
3121	$w = 0 if $w < 0;	3654	$w = 0 if $w < 0;
3122	$h = 0 if $h < 0;	3655	$h = 0 if $h < 0;
3123		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
3124	$widget->{w} = $w;	3664	$widget->{w} = $w;
3125	$widget->{h} = $h;	3665	$widget->{h} = $h;
		3666
3126	$widget->emit (size_allocate => $w, $h);	3667	$widget->emit (size_allocate => $w, $h);
		3668	}
3127	}	3669	}
3128	}	3670	}
3129		3671
3130	while ($self->{post_alloc_hook}) {	3672	while ($self->{post_alloc_hook}) {
3131	$_->()	3673	$_->()
3132	for values %{delete $self->{post_alloc_hook}};	3674	for values %{delete $self->{post_alloc_hook}};
3133	}	3675	}
		3676
3134		3677
3135	glViewport 0, 0, $::WIDTH, $::HEIGHT;	3678	glViewport 0, 0, $::WIDTH, $::HEIGHT;
3136	glClearColor +($::CFG->{fow_intensity}) x 3, 1;	3679	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3137	glClear GL_COLOR_BUFFER_BIT;	3680	glClear GL_COLOR_BUFFER_BIT;
3138		3681
…		…
3140	glLoadIdentity;	3683	glLoadIdentity;
3141	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;	3684	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3142	glMatrixMode GL_MODELVIEW;	3685	glMatrixMode GL_MODELVIEW;
3143	glLoadIdentity;	3686	glLoadIdentity;
3144		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
3145	$self->_draw;	3695	$self->_draw;
3146	}	3696	}
3147		3697
3148	#############################################################################	3698	#############################################################################
3149		3699

Diff Legend

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