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.280 by root, Mon Jun 5 01:22:08 2006 UTC vs.
Revision 1.361 by root, Sat Dec 9 02:21:25 2006 UTC

1	package CFClient::UI;	1	package CFPlus::UI;
2		2
3	use utf8;	3	use utf8;
4	use strict;	4	use strict;
5		5
6	use Scalar::Util ();	6	use Scalar::Util ();
7	use List::Util ();	7	use List::Util ();
		8	use Event;
8		9
9	use CFClient;	10	use CFPlus;
		11	use CFPlus::Pod;
10	use CFClient::Texture;	12	use CFPlus::Texture;
11		13
12	our ($FOCUS, $HOVER, $GRAB); # various widgets	14	our ($FOCUS, $HOVER, $GRAB); # various widgets
13		15
14	our $LAYOUT;	16	our $LAYOUT;
15	our $ROOT;	17	our $ROOT;
16	our $TOOLTIP;	18	our $TOOLTIP;
17	our $BUTTON_STATE;	19	our $BUTTON_STATE;
18		20
19	our %WIDGET; # all widgets, weak-referenced	21	our %WIDGET; # all widgets, weak-referenced
		22
		23	our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub {
		24	if (!$GRAB) {
		25	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
		26	if (length $widget->{tooltip}) {
		27	if ($TOOLTIP->{owner} != $widget) {
		28	$TOOLTIP->hide;
		29
		30	$TOOLTIP->{owner} = $widget;
		31
		32	return if $ENV{CFPLUS_DEBUG} & 8;
		33
		34	my $tip = $widget->{tooltip};
		35
		36	$tip = $tip->($widget) if CODE:: eq ref $tip;
		37
		38	$TOOLTIP->set_tooltip_from ($widget);
		39	$TOOLTIP->show;
		40	}
		41
		42	return;
		43	}
		44	}
		45	}
		46
		47	$TOOLTIP->hide;
		48	delete $TOOLTIP->{owner};
		49	});
20		50
21	sub get_layout {	51	sub get_layout {
22	my $layout;	52	my $layout;
23		53
24	for (grep { $_->{name} } values %WIDGET) {	54	for (grep { $_->{name} } values %WIDGET) {
…		…
39	my ($layout) = @_;	69	my ($layout) = @_;
40		70
41	$LAYOUT = $layout;	71	$LAYOUT = $layout;
42	}	72	}
43		73
44	sub check_tooltip {
45	return if $ENV{CFPLUS_DEBUG} & 8;
46
47	if (!$GRAB) {
48	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
49	if (length $widget->{tooltip}) {
50	if ($TOOLTIP->{owner} != $widget) {
51	$TOOLTIP->hide;
52
53	$TOOLTIP->{owner} = $widget;
54
55	my $tip = $widget->{tooltip};
56
57	$tip = $tip->($widget) if CODE:: eq ref $tip;
58
59	$TOOLTIP->set_tooltip_from ($widget);
60	$TOOLTIP->show;
61	}
62
63	return;
64	}
65	}
66	}
67
68	$TOOLTIP->hide;
69	delete $TOOLTIP->{owner};
70	}
71
72	# class methods for events	74	# class methods for events
73	sub feed_sdl_key_down_event {	75	sub feed_sdl_key_down_event {
74	$FOCUS->emit (key_down => $_[0])	76	$FOCUS->emit (key_down => $_[0])
75	if $FOCUS;	77	if $FOCUS;
76	}	78	}
…		…
78	sub feed_sdl_key_up_event {	80	sub feed_sdl_key_up_event {
79	$FOCUS->emit (key_up => $_[0])	81	$FOCUS->emit (key_up => $_[0])
80	if $FOCUS;	82	if $FOCUS;
81	}	83	}
82		84
		85	sub check_hover {
		86	my ($widget) = @_;
		87
		88	if ($widget != $HOVER) {
		89	my $hover = $HOVER; $HOVER = $widget;
		90
		91	$hover->update if $hover && $hover->{can_hover};
		92	$HOVER->update if $HOVER && $HOVER->{can_hover};
		93
		94	$TOOLTIP_WATCHER->start;
		95	}
		96	}
		97
83	sub feed_sdl_button_down_event {	98	sub feed_sdl_button_down_event {
84	my ($ev) = @_;	99	my ($ev) = @_;
85	my ($x, $y) = ($ev->{x}, $ev->{y});	100	my ($x, $y) = ($ev->{x}, $ev->{y});
86		101
87	if (!$BUTTON_STATE) {	102	$BUTTON_STATE |= 1 << ($ev->{button} - 1);
		103
		104	unless ($GRAB) {
88	my $widget = $ROOT->find_widget ($x, $y);	105	my $widget = $ROOT->find_widget ($x, $y);
89		106
90	$GRAB = $widget;	107	$GRAB = $widget;
91	$GRAB->update if $GRAB;	108	$GRAB->update if $GRAB;
92		109
93	check_tooltip;	110	$TOOLTIP_WATCHER->cb->();
94	}	111	}
95		112
96	$BUTTON_STATE |= 1 << ($ev->{button} - 1);	113	if ($GRAB) {
97		114	if ($ev->{button} == 4 || $ev->{button} == 5) {
98	$GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))	115	# mousewheel
99	if $GRAB;	116	$ev->{dx} = 0;
		117	$ev->{dy} = $ev->{button} * 2 - 9;
		118	$GRAB->emit (mouse_wheel => $ev);
		119	} else {
		120	$GRAB->emit (button_down => $ev)
		121	}
		122	}
100	}	123	}
101		124
102	sub feed_sdl_button_up_event {	125	sub feed_sdl_button_up_event {
103	my ($ev) = @_;	126	my ($ev) = @_;
104	my ($x, $y) = ($ev->{x}, $ev->{y});
105		127
106	my $widget = $GRAB || $ROOT->find_widget ($x, $y);	128	my $widget = $GRAB || $ROOT->find_widget ($ev->{x}, $ev->{y});
107		129
108	$BUTTON_STATE &= ~(1 << ($ev->{button} - 1));	130	$BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
109		131
110	$GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y))	132	$GRAB->emit (button_up => $ev)
111	if $GRAB;	133	if $GRAB && $ev->{button} != 4 && $ev->{button} != 5;
112		134
113	if (!$BUTTON_STATE) {	135	unless ($BUTTON_STATE) {
114	my $grab = $GRAB; undef $GRAB;	136	my $grab = $GRAB; undef $GRAB;
115	$grab->update if $grab;	137	$grab->update if $grab;
116	$GRAB->update if $GRAB;	138	$GRAB->update if $GRAB;
117		139
118	check_tooltip;	140	check_hover $widget;
		141	$TOOLTIP_WATCHER->cb->();
119	}	142	}
120	}	143	}
121		144
122	sub feed_sdl_motion_event {	145	sub feed_sdl_motion_event {
123	my ($ev) = @_;	146	my ($ev) = @_;
124	my ($x, $y) = ($ev->{x}, $ev->{y});	147	my ($x, $y) = ($ev->{x}, $ev->{y});
125		148
126	my $widget = $GRAB || $ROOT->find_widget ($x, $y);	149	my $widget = $GRAB || $ROOT->find_widget ($x, $y);
127		150
128	if ($widget != $HOVER) {	151	check_hover $widget;
129	my $hover = $HOVER; $HOVER = $widget;
130		152
131	$hover->update if $hover && $hover->{can_hover};	153	$HOVER->emit (mouse_motion => $ev)
132	$HOVER->update if $HOVER && $HOVER->{can_hover};
133
134	check_tooltip;
135	}
136
137	$HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
138	if $HOVER;	154	if $HOVER;
139	}	155	}
140		156
141	# convert position array to integers	157	# convert position array to integers
142	sub harmonize {	158	sub harmonize {
…		…
192	reconfigure_widgets;	208	reconfigure_widgets;
193	}	209	}
194		210
195	#############################################################################	211	#############################################################################
196		212
		213	package CFPlus::UI::Event;
		214
		215	sub xy {
		216	$_[1]->coord2local ($_[0]{x}, $_[0]{y})
		217	}
		218
		219	#############################################################################
		220
197	package CFClient::UI::Base;	221	package CFPlus::UI::Base;
198		222
199	use strict;	223	use strict;
200		224
201	use CFClient::OpenGL;	225	use CFPlus::OpenGL;
202		226
203	sub new {	227	sub new {
204	my $class = shift;	228	my $class = shift;
205		229
206	my $self = bless {	230	my $self = bless {
…		…
211	h => undef,	235	h => undef,
212	can_events => 1,	236	can_events => 1,
213	@_	237	@_
214	}, $class;	238	}, $class;
215		239
216	Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);	240	Scalar::Util::weaken ($CFPlus::UI::WIDGET{$self+0} = $self);
217		241
218	for (keys %$self) {	242	for (keys %$self) {
219	if (/^on_(.*)$/) {	243	if (/^on_(.*)$/) {
220	$self->connect ($1 => delete $self->{$_});	244	$self->connect ($1 => delete $self->{$_});
221	}	245	}
222	}	246	}
223		247
224	if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {	248	if (my $layout = $CFPlus::UI::LAYOUT->{$self->{name}}) {
225	$self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x};	249	$self->{x} = $layout->{x} * $CFPlus::UI::ROOT->{alloc_w} if exists $layout->{x};
226	$self->{y} = $layout->{y} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{y};	250	$self->{y} = $layout->{y} * $CFPlus::UI::ROOT->{alloc_h} if exists $layout->{y};
227	$self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{w};	251	$self->{force_w} = $layout->{w} * $CFPlus::UI::ROOT->{alloc_w} if exists $layout->{w};
228	$self->{force_h} = $layout->{h} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{h};	252	$self->{force_h} = $layout->{h} * $CFPlus::UI::ROOT->{alloc_h} if exists $layout->{h};
229		253
230	$self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};	254	$self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
231	$self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};	255	$self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
232		256
233	$self->show if $layout->{show};	257	$self->show if $layout->{show};
…		…
238		262
239	sub destroy {	263	sub destroy {
240	my ($self) = @_;	264	my ($self) = @_;
241		265
242	$self->hide;	266	$self->hide;
		267	$self->emit ("destroy");
243	%$self = ();	268	%$self = ();
244	}	269	}
245		270
246	sub show {	271	sub show {
247	my ($self) = @_;	272	my ($self) = @_;
248		273
249	return if $self->{parent};	274	return if $self->{parent};
250		275
251	$CFClient::UI::ROOT->add ($self);	276	$CFPlus::UI::ROOT->add ($self);
252	}	277	}
253		278
254	sub set_visible {	279	sub set_visible {
255	my ($self) = @_;	280	my ($self) = @_;
256		281
…		…
271		296
272	return unless $self->{visible};	297	return unless $self->{visible};
273		298
274	$_->set_invisible for $self->children;	299	$_->set_invisible for $self->children;
275		300
		301	delete $self->{visible};
276	delete $self->{root};	302	delete $self->{root};
277	delete $self->{visible};
278		303
279	undef $GRAB if $GRAB == $self;	304	undef $GRAB if $GRAB == $self;
280	undef $HOVER if $HOVER == $self;	305	undef $HOVER if $HOVER == $self;
281		306
282	CFClient::UI::check_tooltip	307	$CFPlus::UI::TOOLTIP_WATCHER->cb->()
283	if $TOOLTIP->{owner} == $self;	308	if $TOOLTIP->{owner} == $self;
284		309
285	$self->focus_out;	310	$self->emit ("focus_out");
286
287	$self->emit (visibility_change => 0);	311	$self->emit (visibility_change => 0);
288	}	312	}
289		313
290	sub set_visibility {	314	sub set_visibility {
291	my ($self, $visible) = @_;	315	my ($self, $visible) = @_;
…		…
314	}	338	}
315		339
316	sub move_abs {	340	sub move_abs {
317	my ($self, $x, $y, $z) = @_;	341	my ($self, $x, $y, $z) = @_;
318		342
319	$self->{x} = List::Util::max 0, int $x;	343	$self->{x} = List::Util::max 0, List::Util::min $self->{root}{w} - $self->{w}, int $x;
320	$self->{y} = List::Util::max 0, int $y;	344	$self->{y} = List::Util::max 0, List::Util::min $self->{root}{h} - $self->{h}, int $y;
321	$self->{z} = $z if defined $z;	345	$self->{z} = $z if defined $z;
322		346
323	$self->update;	347	$self->update;
324	}	348	}
325		349
…		…
335	sub size_request {	359	sub size_request {
336	require Carp;	360	require Carp;
337	Carp::confess "size_request is abstract";	361	Carp::confess "size_request is abstract";
338	}	362	}
339		363
		364	sub baseline_shift {
		365	0
		366	}
		367
340	sub configure {	368	sub configure {
341	my ($self, $x, $y, $w, $h) = @_;	369	my ($self, $x, $y, $w, $h) = @_;
342		370
343	if ($self->{aspect}) {	371	if ($self->{aspect}) {
344	my ($ow, $oh) = ($w, $h);	372	my ($ow, $oh) = ($w, $h);
345		373
346	$w = List::Util::min $w, int $h * $self->{aspect};	374	$w = List::Util::min $w, CFPlus::ceil $h * $self->{aspect};
347	$h = List::Util::min $h, int $w / $self->{aspect};	375	$h = List::Util::min $h, CFPlus::ceil $w / $self->{aspect};
348		376
349	# use alignment to adjust x, y	377	# use alignment to adjust x, y
350		378
351	$x += int 0.5 * ($ow - $w);	379	$x += int 0.5 * ($ow - $w);
352	$y += int 0.5 * ($oh - $h);	380	$y += int 0.5 * ($oh - $h);
…		…
366		394
367	$self->{root}{size_alloc}{$self+0} = $self;	395	$self->{root}{size_alloc}{$self+0} = $self;
368	}	396	}
369	}	397	}
370		398
371	sub size_allocate {
372	# nothing to be done
373	}
374
375	sub children {	399	sub children {
376	# nop	400	# nop
377	}	401	}
378		402
379	sub visible_children {	403	sub visible_children {
…		…
381	}	405	}
382		406
383	sub set_max_size {	407	sub set_max_size {
384	my ($self, $w, $h) = @_;	408	my ($self, $w, $h) = @_;
385		409
386	delete $self->{max_w}; $self->{max_w} = $w if $w;	410	$self->{max_w} = int $w if defined $w;
387	delete $self->{max_h}; $self->{max_h} = $h if $h;	411	$self->{max_h} = int $h if defined $h;
388		412
389	$self->realloc;	413	$self->realloc;
390	}	414	}
391		415
392	sub set_tooltip {	416	sub set_tooltip {
…		…
397		421
398	return if $self->{tooltip} eq $tooltip;	422	return if $self->{tooltip} eq $tooltip;
399		423
400	$self->{tooltip} = $tooltip;	424	$self->{tooltip} = $tooltip;
401		425
402	if ($CFClient::UI::TOOLTIP->{owner} == $self) {	426	if ($CFPlus::UI::TOOLTIP->{owner} == $self) {
403	delete $CFClient::UI::TOOLTIP->{owner};	427	delete $CFPlus::UI::TOOLTIP->{owner};
404	CFClient::UI::check_tooltip;	428	$CFPlus::UI::TOOLTIP_WATCHER->cb->();
405	}	429	}
406	}	430	}
407		431
408	# translate global coordinates to local coordinate system	432	# translate global coordinates to local coordinate system
409	sub coord2local {	433	sub coord2local {
410	my ($self, $x, $y) = @_;	434	my ($self, $x, $y) = @_;
411		435
		436	Carp::confess unless $self->{parent};#d#
		437
412	$self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})	438	$self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
413	}	439	}
414		440
415	# translate local coordinates to global coordinate system	441	# translate local coordinates to global coordinate system
416	sub coord2global {	442	sub coord2global {
417	my ($self, $x, $y) = @_;	443	my ($self, $x, $y) = @_;
418		444
		445	Carp::confess unless $self->{parent};#d#
		446
419	$self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})	447	$self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
420	}	448	}
421		449
422	sub focus_in {	450	sub invoke_focus_in {
423	my ($self) = @_;	451	my ($self) = @_;
424		452
425	return if $FOCUS == $self;	453	return if $FOCUS == $self;
426	return unless $self->{can_focus};	454	return unless $self->{can_focus};
427		455
428	my $focus = $FOCUS; $FOCUS = $self;	456	$FOCUS = $self;
429		457
430	$self->_emit (focus_in => $focus);	458	$self->update;
431		459
432	$focus->update if $focus;	460	0
433	$FOCUS->update;
434	}	461	}
435		462
436	sub focus_out {	463	sub invoke_focus_out {
437	my ($self) = @_;	464	my ($self) = @_;
438		465
439	return unless $FOCUS == $self;	466	return unless $FOCUS == $self;
440		467
441	my $focus = $FOCUS; undef $FOCUS;	468	undef $FOCUS;
442		469
443	$self->_emit (focus_out => $focus);	470	$self->update;
444		471
445	$focus->update if $focus; #?
446
447	$::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus	472	$::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus
448	unless $FOCUS;	473	unless $FOCUS;
449	}
450		474
		475	0
		476	}
		477
		478	sub grab_focus {
		479	my ($self) = @_;
		480
		481	$FOCUS->emit ("focus_out") if $FOCUS;
		482	$self->emit ("focus_in");
		483	}
		484
451	sub mouse_motion { 0 }	485	sub invoke_mouse_motion { 0 }
452	sub button_up { 0 }	486	sub invoke_button_up { 0 }
453	sub key_down { 0 }	487	sub invoke_key_down { 0 }
454	sub key_up { 0 }	488	sub invoke_key_up { 0 }
		489	sub invoke_mouse_wheel { 0 }
455		490
456	sub button_down {	491	sub invoke_button_down {
457	my ($self, $ev, $x, $y) = @_;	492	my ($self, $ev, $x, $y) = @_;
458		493
459	$self->focus_in;	494	$self->grab_focus;
460		495
461	0	496	0
		497	}
		498
		499	sub connect {
		500	my ($self, $signal, $cb) = @_;
		501
		502	push @{ $self->{signal_cb}{$signal} }, $cb;
		503
		504	defined wantarray and CFPlus::guard {
		505	@{ $self->{signal_cb}{$signal} } = grep $_ != $cb,
		506	@{ $self->{signal_cb}{$signal} };
		507	}
		508	}
		509
		510	sub disconnect_all {
		511	my ($self, $signal) = @_;
		512
		513	delete $self->{signal_cb}{$signal};
		514	}
		515
		516	my %has_coords = (
		517	button_down => 1,
		518	button_up => 1,
		519	mouse_motion => 1,
		520	mouse_wheel => 1,
		521	);
		522
		523	sub emit {
		524	my ($self, $signal, @args) = @_;
		525
		526	# I do not really like this solution, but I do not like duplication
		527	# and needlessly verbose code, either.
		528	my @append
		529	= $has_coords{$signal}
		530	? $args[0]->xy ($self)
		531	: ();
		532
		533	#warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d#
		534
		535	#d##TODO# stop propagating at first true, do not use sum
		536	(List::Util::sum map $_->($self, @args, @append), @{$self->{signal_cb}{$signal} || []}) # before
		537	|| ($self->can ("invoke_$signal") || sub { 1 })->($self, @args, @append) # closure
		538	|| ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent
462	}	539	}
463		540
464	sub find_widget {	541	sub find_widget {
465	my ($self, $x, $y) = @_;	542	my ($self, $x, $y) = @_;
466		543
…		…
476	sub set_parent {	553	sub set_parent {
477	my ($self, $parent) = @_;	554	my ($self, $parent) = @_;
478		555
479	Scalar::Util::weaken ($self->{parent} = $parent);	556	Scalar::Util::weaken ($self->{parent} = $parent);
480	$self->set_visible if $parent->{visible};	557	$self->set_visible if $parent->{visible};
481	}
482
483	sub connect {
484	my ($self, $signal, $cb) = @_;
485
486	push @{ $self->{signal_cb}{$signal} }, $cb;
487	}
488
489	sub _emit {
490	my ($self, $signal, @args) = @_;
491
492	List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
493	}
494
495	sub emit {
496	my ($self, $signal, @args) = @_;
497
498	$self->_emit ($signal, @args)
499	|| $self->$signal (@args);
500	}
501
502	sub visibility_change {
503	#my ($self, $visible) = @_;
504	}	558	}
505		559
506	sub realloc {	560	sub realloc {
507	my ($self) = @_;	561	my ($self) = @_;
508		562
…		…
541	return unless $self->{h} && $self->{w};	595	return unless $self->{h} && $self->{w};
542		596
543	# update screen rectangle	597	# update screen rectangle
544	local $draw_x = $draw_x + $self->{x};	598	local $draw_x = $draw_x + $self->{x};
545	local $draw_y = $draw_y + $self->{y};	599	local $draw_y = $draw_y + $self->{y};
546	local $draw_w = $draw_x + $self->{w};
547	local $draw_h = $draw_y + $self->{h};
548		600
549	# skip widgets that are entirely outside the drawing area	601	# skip widgets that are entirely outside the drawing area
550	return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)	602	return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
551	|| ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);	603	|| ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
552		604
…		…
575	glVertex $self->{w} - 1, 0;	627	glVertex $self->{w} - 1, 0;
576	glVertex $self->{w} - 1, $self->{h} - 1;	628	glVertex $self->{w} - 1, $self->{h} - 1;
577	glVertex 0 , $self->{h} - 1;	629	glVertex 0 , $self->{h} - 1;
578	glEnd;	630	glEnd;
579	glPopMatrix;	631	glPopMatrix;
580	#CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;	632	#CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
581	}	633	}
582		634
583	$self->_draw;	635	$self->_draw;
584	glPopMatrix;	636	glPopMatrix;
585	}	637	}
…		…
591	}	643	}
592		644
593	sub DESTROY {	645	sub DESTROY {
594	my ($self) = @_;	646	my ($self) = @_;
595		647
		648	return if CFPlus::in_destruct;
		649
		650	eval { $self->destroy };
		651	warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
		652
596	delete $WIDGET{$self+0};	653	delete $WIDGET{$self+0};
597	#$self->deactivate;
598	}	654	}
599		655
600	#############################################################################	656	#############################################################################
601		657
602	package CFClient::UI::DrawBG;	658	package CFPlus::UI::DrawBG;
603		659
604	our @ISA = CFClient::UI::Base::;	660	our @ISA = CFPlus::UI::Base::;
605		661
606	use strict;	662	use strict;
607	use CFClient::OpenGL;	663	use CFPlus::OpenGL;
608		664
609	sub new {	665	sub new {
610	my $class = shift;	666	my $class = shift;
611		667
612	# range [value, low, high, page]	668	# range [value, low, high, page]
…		…
643	}	699	}
644	}	700	}
645		701
646	#############################################################################	702	#############################################################################
647		703
648	package CFClient::UI::Empty;	704	package CFPlus::UI::Empty;
649		705
650	our @ISA = CFClient::UI::Base::;	706	our @ISA = CFPlus::UI::Base::;
651		707
652	sub new {	708	sub new {
653	my ($class, %arg) = @_;	709	my ($class, %arg) = @_;
654	$class->SUPER::new (can_events => 0, %arg);	710	$class->SUPER::new (can_events => 0, %arg);
655	}	711	}
…		…
662		718
663	sub draw { }	719	sub draw { }
664		720
665	#############################################################################	721	#############################################################################
666		722
667	package CFClient::UI::Container;	723	package CFPlus::UI::Container;
668		724
669	our @ISA = CFClient::UI::Base::;	725	our @ISA = CFPlus::UI::Base::;
670		726
671	sub new {	727	sub new {
672	my ($class, %arg) = @_;	728	my ($class, %arg) = @_;
673		729
674	my $children = delete $arg{children};	730	my $children = delete $arg{children};
…		…
683	if $children;	739	if $children;
684		740
685	$self	741	$self
686	}	742	}
687		743
		744	sub realloc {
		745	my ($self) = @_;
		746
		747	$self->{force_realloc} = 1;
		748	$self->{force_size_alloc} = 1;
		749	$self->SUPER::realloc;
		750	}
		751
688	sub add {	752	sub add {
689	my ($self, @widgets) = @_;	753	my ($self, @widgets) = @_;
690		754
691	$_->set_parent ($self)	755	$_->set_parent ($self)
692	for @widgets;	756	for @widgets;
…		…
752	$_->draw for @{$self->{children}};	816	$_->draw for @{$self->{children}};
753	}	817	}
754		818
755	#############################################################################	819	#############################################################################
756		820
757	package CFClient::UI::Bin;	821	package CFPlus::UI::Bin;
758		822
759	our @ISA = CFClient::UI::Container::;	823	our @ISA = CFPlus::UI::Container::;
760		824
761	sub new {	825	sub new {
762	my ($class, %arg) = @_;	826	my ($class, %arg) = @_;
763		827
764	my $child = (delete $arg{child}) || new CFClient::UI::Empty::;	828	my $child = (delete $arg{child}) || new CFPlus::UI::Empty::;
765		829
766	$class->SUPER::new (children => [$child], %arg)	830	$class->SUPER::new (children => [$child], %arg)
767	}	831	}
768		832
769	sub add {	833	sub add {
770	my ($self, $child) = @_;	834	my ($self, $child) = @_;
771		835
772	$self->{children} = [];	836	$self->SUPER::remove ($_) for @{ $self->{children} };
773
774	$self->SUPER::add ($child);	837	$self->SUPER::add ($child);
775	}	838	}
776		839
777	sub remove {	840	sub remove {
778	my ($self, $widget) = @_;	841	my ($self, $widget) = @_;
779		842
780	$self->SUPER::remove ($widget);	843	$self->SUPER::remove ($widget);
781		844
782	$self->{children} = [new CFClient::UI::Empty]	845	$self->{children} = [new CFPlus::UI::Empty]
783	unless @{$self->{children}};	846	unless @{$self->{children}};
784	}	847	}
785		848
786	sub child { $_[0]->{children}[0] }	849	sub child { $_[0]->{children}[0] }
787		850
788	sub size_request {	851	sub size_request {
789	$_[0]{children}[0]->size_request	852	$_[0]{children}[0]->size_request
790	}	853	}
791		854
792	sub size_allocate {	855	sub invoke_size_allocate {
793	my ($self, $w, $h) = @_;	856	my ($self, $w, $h) = @_;
794		857
795	$self->{children}[0]->configure (0, 0, $w, $h);	858	$self->{children}[0]->configure (0, 0, $w, $h);
		859
		860	1
796	}	861	}
797		862
798	#############################################################################	863	#############################################################################
799		864
800	# back-buffered drawing area	865	# back-buffered drawing area
801		866
802	package CFClient::UI::Window;	867	package CFPlus::UI::Window;
803		868
804	our @ISA = CFClient::UI::Bin::;	869	our @ISA = CFPlus::UI::Bin::;
805		870
806	use CFClient::OpenGL;	871	use CFPlus::OpenGL;
807		872
808	sub new {	873	sub new {
809	my ($class, %arg) = @_;	874	my ($class, %arg) = @_;
810		875
811	my $self = $class->SUPER::new (%arg);	876	my $self = $class->SUPER::new (%arg);
…		…
816		881
817	$ROOT->on_post_alloc ($self => sub { $self->render_child });	882	$ROOT->on_post_alloc ($self => sub { $self->render_child });
818	$self->SUPER::update;	883	$self->SUPER::update;
819	}	884	}
820		885
821	sub size_allocate {	886	sub invoke_size_allocate {
822	my ($self, $w, $h) = @_;	887	my ($self, $w, $h) = @_;
823		888
824	$self->SUPER::size_allocate ($w, $h);
825	$self->update;	889	$self->update;
		890
		891	$self->SUPER::invoke_size_allocate ($w, $h)
826	}	892	}
827		893
828	sub _render {	894	sub _render {
829	my ($self) = @_;	895	my ($self) = @_;
830		896
…		…
832	}	898	}
833		899
834	sub render_child {	900	sub render_child {
835	my ($self) = @_;	901	my ($self) = @_;
836		902
837	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {	903	$self->{texture} = new_from_opengl CFPlus::Texture $self->{w}, $self->{h}, sub {
838	glClearColor 0, 0, 0, 0;	904	glClearColor 0, 0, 0, 0;
839	glClear GL_COLOR_BUFFER_BIT;	905	glClear GL_COLOR_BUFFER_BIT;
840		906
841	{	907	{
842	package CFClient::UI::Base;	908	package CFPlus::UI::Base;
843		909
844	($draw_x, $draw_y, $draw_w, $draw_h) =	910	local ($draw_x, $draw_y, $draw_w, $draw_h) =
845	(0, 0, $self->{w}, $self->{h});	911	(0, 0, $self->{w}, $self->{h});
		912
		913	$self->_render;
846	}	914	}
847
848	$self->_render;
849	};	915	};
850	}	916	}
851		917
852	sub _draw {	918	sub _draw {
853	my ($self) = @_;	919	my ($self) = @_;
854
855	my ($w, $h) = @$self{qw(w h)};
856		920
857	my $tex = $self->{texture}	921	my $tex = $self->{texture}
858	or return;	922	or return;
859		923
860	glEnable GL_TEXTURE_2D;	924	glEnable GL_TEXTURE_2D;
861	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	925	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
862	glColor 0, 0, 0, 1;	926	glColor 0, 0, 0, 1;
863		927
864	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);	928	$tex->draw_quad_alpha_premultiplied (0, 0);
865		929
866	glDisable GL_TEXTURE_2D;	930	glDisable GL_TEXTURE_2D;
867	}	931	}
868		932
869	#############################################################################	933	#############################################################################
870		934
871	package CFClient::UI::ViewPort;	935	package CFPlus::UI::ViewPort;
872		936
873	our @ISA = CFClient::UI::Window::;	937	our @ISA = CFPlus::UI::Window::;
874		938
875	sub new {	939	sub new {
876	my $class = shift;	940	my $class = shift;
877		941
878	$class->SUPER::new (	942	$class->SUPER::new (
…		…
891	$h = 10 if $self->{scroll_y};	955	$h = 10 if $self->{scroll_y};
892		956
893	($w, $h)	957	($w, $h)
894	}	958	}
895		959
896	sub size_allocate {	960	sub invoke_size_allocate {
897	my ($self, $w, $h) = @_;	961	my ($self, $w, $h) = @_;
898		962
899	my $child = $self->child;	963	my $child = $self->child;
900		964
901	$w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};	965	$w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
902	$h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};	966	$h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
903		967
904	$self->child->configure (0, 0, $w, $h);	968	$self->child->configure (0, 0, $w, $h);
905	$self->update;	969	$self->update;
		970
		971	1
906	}	972	}
907		973
908	sub set_offset {	974	sub set_offset {
909	my ($self, $x, $y) = @_;	975	my ($self, $x, $y) = @_;
910		976
…		…
936	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}	1002	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
937	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}	1003	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}
938	) {	1004	) {
939	$self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})	1005	$self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
940	} else {	1006	} else {
941	$self->CFClient::UI::Base::find_widget ($x, $y)	1007	$self->CFPlus::UI::Base::find_widget ($x, $y)
942	}	1008	}
943	}	1009	}
944		1010
945	sub _render {	1011	sub _render {
946	my ($self) = @_;	1012	my ($self) = @_;
947		1013
948	local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};	1014	local $CFPlus::UI::Base::draw_x = $CFPlus::UI::Base::draw_x - $self->{view_x};
949	local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y};	1015	local $CFPlus::UI::Base::draw_y = $CFPlus::UI::Base::draw_y - $self->{view_y};
950		1016
951	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};	1017	CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
952		1018
953	$self->SUPER::_render;	1019	$self->SUPER::_render;
954	}	1020	}
955		1021
956	#############################################################################	1022	#############################################################################
957		1023
958	package CFClient::UI::ScrolledWindow;	1024	package CFPlus::UI::ScrolledWindow;
959		1025
960	our @ISA = CFClient::UI::HBox::;	1026	our @ISA = CFPlus::UI::HBox::;
961		1027
962	sub new {	1028	sub new {
963	my ($class, %arg) = @_;	1029	my ($class, %arg) = @_;
964		1030
965	my $child = delete $arg{child};	1031	my $child = delete $arg{child};
966		1032
967	my $self;	1033	my $self;
968		1034
969	my $slider = new CFClient::UI::Slider	1035	my $slider = new CFPlus::UI::Slider
970	vertical => 1,	1036	vertical => 1,
971	range => [0, 0, 1, 0.01], # HACK fix	1037	range => [0, 0, 1, 0.01], # HACK fix
972	on_changed => sub {	1038	on_changed => sub {
973	$self->{vp}->set_offset (0, $_[1]);	1039	$self->{vp}->set_offset (0, $_[1]);
974	},	1040	},
975	;	1041	;
976		1042
977	$self = $class->SUPER::new (	1043	$self = $class->SUPER::new (
978	vp => (new CFClient::UI::ViewPort expand => 1),	1044	vp => (new CFPlus::UI::ViewPort expand => 1),
		1045	can_events => 1,
979	slider => $slider,	1046	slider => $slider,
980	%arg,	1047	%arg,
981	);	1048	);
982		1049
983	$self->SUPER::add ($self->{vp}, $self->{slider});	1050	$self->SUPER::add ($self->{vp}, $self->{slider});
984	$self->add ($child) if $child;	1051	$self->add ($child) if $child;
985		1052
986	$self	1053	$self
987	}	1054	}
988		1055
		1056	#TODO# update range on size_allocate depending on child
		1057
989	sub add {	1058	sub add {
990	my ($self, $widget) = @_;	1059	my ($self, $widget) = @_;
991		1060
992	$self->{vp}->add ($self->{child} = $widget);	1061	$self->{vp}->add ($self->{child} = $widget);
993	}	1062	}
994		1063
		1064	sub invoke_mouse_wheel {
		1065	my ($self, $ev) = @_;
		1066
		1067	return 0 unless $ev->{dy}; # only vertical movements
		1068
		1069	$self->{slider}->emit (mouse_wheel => $ev);
		1070
		1071	1
		1072	}
		1073
		1074	sub update_slider {
		1075	my ($self) = @_;
		1076
		1077	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]);
		1078	}
		1079
995	sub update {	1080	sub update {
996	my ($self) = @_;	1081	my ($self) = @_;
997		1082
998	$self->SUPER::update;	1083	$self->SUPER::update;
999		1084
1000	# todo: overwrite size_allocate of child	1085	$self->update_slider;
1001	my $child = $self->{vp}->child;
1002	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1003	}	1086	}
1004		1087
1005	sub size_allocate {	1088	sub invoke_size_allocate {
1006	my ($self, $w, $h) = @_;	1089	my ($self, $w, $h) = @_;
1007		1090
		1091	$self->update_slider;
		1092
1008	$self->SUPER::size_allocate ($w, $h);	1093	$self->SUPER::invoke_size_allocate ($w, $h)
1009
1010	my $child = $self->{vp}->child;
1011	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1012	}	1094	}
1013
1014	#TODO# update range on size_allocate depending on child
1015	# update viewport offset on scroll
1016		1095
1017	#############################################################################	1096	#############################################################################
1018		1097
1019	package CFClient::UI::Frame;	1098	package CFPlus::UI::Frame;
1020		1099
1021	our @ISA = CFClient::UI::Bin::;	1100	our @ISA = CFPlus::UI::Bin::;
1022		1101
1023	use CFClient::OpenGL;	1102	use CFPlus::OpenGL;
1024		1103
1025	sub new {	1104	sub new {
1026	my $class = shift;	1105	my $class = shift;
1027		1106
1028	$class->SUPER::new (	1107	$class->SUPER::new (
…		…
1054	$self->SUPER::_draw;	1133	$self->SUPER::_draw;
1055	}	1134	}
1056		1135
1057	#############################################################################	1136	#############################################################################
1058		1137
1059	package CFClient::UI::FancyFrame;	1138	package CFPlus::UI::FancyFrame;
1060		1139
1061	our @ISA = CFClient::UI::Bin::;	1140	our @ISA = CFPlus::UI::Bin::;
1062		1141
1063	use CFClient::OpenGL;	1142	use CFPlus::OpenGL;
1064
1065	my $bg =
1066	new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1067	mipmap => 1, wrap => 1;
1068
1069	my @border =
1070	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1071	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1072		1143
1073	sub new {	1144	sub new {
1074	my ($class, %arg) = @_;	1145	my ($class, %arg) = @_;
1075		1146
1076	my $title = delete $arg{title};	1147	if ((exists $arg{label}) && !ref $arg{label}) {
		1148	$arg{label} = new CFPlus::UI::Label
		1149	align => 1,
		1150	valign => 0,
		1151	text => $arg{label},
		1152	fontsize => ($arg{border} || 0.8) * 0.75;
		1153	}
		1154
		1155	my $self = $class->SUPER::new (
		1156	# label => "",
		1157	fg => [0.6, 0.3, 0.1],
		1158	border => 0.8,
		1159	style => 'single',
		1160	%arg,
		1161	);
		1162
		1163	$self
		1164	}
		1165
		1166	sub add {
		1167	my ($self, @widgets) = @_;
		1168
		1169	$self->SUPER::add (@widgets);
		1170	$self->CFPlus::UI::Container::add ($self->{label}) if $self->{label};
		1171	}
		1172
		1173	sub border {
		1174	int $_[0]{border} * $::FONTSIZE
		1175	}
		1176
		1177	sub size_request {
		1178	my ($self) = @_;
		1179
		1180	($self->{label_w}, undef) = $self->{label}->size_request
		1181	if $self->{label};
		1182
		1183	my ($w, $h) = $self->SUPER::size_request;
		1184
		1185	(
		1186	$w + $self->border * 2,
		1187	$h + $self->border * 2,
		1188	)
		1189	}
		1190
		1191	sub invoke_size_allocate {
		1192	my ($self, $w, $h) = @_;
		1193
		1194	my $border = $self->border;
		1195
		1196	$w -= List::Util::max 0, $border * 2;
		1197	$h -= List::Util::max 0, $border * 2;
		1198
		1199	if (my $label = $self->{label}) {
		1200	$label->{w} = List::Util::max 0, List::Util::min $self->{label_w}, $w - $border * 2;
		1201	$label->{h} = List::Util::min $h, $border;
		1202	$label->invoke_size_allocate ($label->{w}, $label->{h});
		1203	}
		1204
		1205	$self->child->configure ($border, $border, $w, $h);
		1206
		1207	1
		1208	}
		1209
		1210	sub _draw {
		1211	my ($self) = @_;
		1212
		1213	my $child = $self->{children}[0];
		1214
		1215	my $border = $self->border;
		1216	my ($w, $h) = ($self->{w}, $self->{h});
		1217
		1218	$child->draw;
		1219
		1220	glColor @{$self->{fg}};
		1221	glBegin GL_LINE_STRIP;
		1222	glVertex $border * 1.5 , $border * 0.5 + 0.5;
		1223	glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
		1224	glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
		1225	glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
		1226	glVertex $w - $border * 0.5 + 0.5, $border * 0.5 + 0.5;
		1227	glVertex $self->{label} ? $border * 2 + $self->{label}{w} : $border * 1.5, $border * 0.5 + 0.5;
		1228	glEnd;
		1229
		1230	if ($self->{label}) {
		1231	glTranslate $border * 2, 0;
		1232	$self->{label}->_draw;
		1233	}
		1234	}
		1235
		1236	#############################################################################
		1237
		1238	package CFPlus::UI::Toplevel;
		1239
		1240	our @ISA = CFPlus::UI::Bin::;
		1241
		1242	use CFPlus::OpenGL;
		1243
		1244	my $bg =
		1245	new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
		1246	mipmap => 1, wrap => 1;
		1247
		1248	my @border =
		1249	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
		1250	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
		1251
		1252	sub new {
		1253	my ($class, %arg) = @_;
1077		1254
1078	my $self = $class->SUPER::new (	1255	my $self = $class->SUPER::new (
1079	bg => [1, 1, 1, 1],	1256	bg => [1, 1, 1, 1],
1080	border_bg => [1, 1, 1, 1],	1257	border_bg => [1, 1, 1, 1],
1081	border => 0.6,	1258	border => 0.6,
1082	can_events => 1,	1259	can_events => 1,
1083	min_w => 16,	1260	min_w => 64,
1084	min_h => 16,	1261	min_h => 32,
1085	%arg,	1262	%arg,
1086	);	1263	);
1087		1264
1088	$self->{title} = new CFClient::UI::Label	1265	$self->{title_widget} = new CFPlus::UI::Label
1089	align => 0,	1266	align => 0,
1090	valign => 1,	1267	valign => 1,
1091	text => $title,	1268	text => $self->{title},
1092	fontsize => $self->{border}	1269	fontsize => $self->{border},
1093	if defined $title;	1270	if exists $self->{title};
		1271
		1272	if ($self->{has_close_button}) {
		1273	$self->{close_button} =
		1274	new CFPlus::UI::ImageButton
		1275	path => 'x1_close.png',
		1276	on_activate => sub { $self->emit ("delete") };
		1277
		1278	$self->CFPlus::UI::Container::add ($self->{close_button});
		1279	}
1094		1280
1095	$self	1281	$self
1096	}	1282	}
1097		1283
1098	sub add {	1284	sub add {
1099	my ($self, @widgets) = @_;	1285	my ($self, @widgets) = @_;
1100		1286
1101	$self->SUPER::add (@widgets);	1287	$self->SUPER::add (@widgets);
		1288	$self->CFPlus::UI::Container::add ($self->{close_button}) if $self->{close_button};
1102	$self->CFClient::UI::Container::add ($self->{title}) if $self->{title};	1289	$self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1103	}	1290	}
1104		1291
1105	sub border {	1292	sub border {
1106	int $_[0]{border} * $::FONTSIZE	1293	int $_[0]{border} * $::FONTSIZE
1107	}	1294	}
1108		1295
1109	sub size_request {	1296	sub size_request {
1110	my ($self) = @_;	1297	my ($self) = @_;
1111		1298
1112	$self->{title}->size_request	1299	$self->{title_widget}->size_request
1113	if $self->{title};	1300	if $self->{title_widget};
		1301
		1302	$self->{close_button}->size_request
		1303	if $self->{close_button};
1114		1304
1115	my ($w, $h) = $self->SUPER::size_request;	1305	my ($w, $h) = $self->SUPER::size_request;
1116		1306
1117	(	1307	(
1118	$w + $self->border * 2,	1308	$w + $self->border * 2,
1119	$h + $self->border * 2,	1309	$h + $self->border * 2,
1120	)	1310	)
1121	}	1311	}
1122		1312
1123	sub size_allocate {	1313	sub invoke_size_allocate {
1124	my ($self, $w, $h) = @_;	1314	my ($self, $w, $h) = @_;
1125		1315
1126	if ($self->{title}) {	1316	if ($self->{title_widget}) {
1127	$self->{title}{w} = $w;	1317	$self->{title_widget}{w} = $w;
1128	$self->{title}{h} = $h;	1318	$self->{title_widget}{h} = $h;
1129	$self->{title}->size_allocate ($w, $h);	1319	$self->{title_widget}->invoke_size_allocate ($w, $h);
1130	}	1320	}
1131		1321
1132	my $border = $self->border;	1322	my $border = $self->border;
1133		1323
1134	$h -= List::Util::max 0, $border * 2;	1324	$h -= List::Util::max 0, $border * 2;
1135	$w -= List::Util::max 0, $border * 2;	1325	$w -= List::Util::max 0, $border * 2;
		1326
		1327	$self->child->configure ($border, $border, $w, $h);
		1328
		1329	$self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
		1330	if $self->{close_button};
		1331
		1332	1
		1333	}
		1334
		1335	sub invoke_delete {
		1336	my ($self) = @_;
		1337
		1338	$self->hide;
1136		1339
1137	$self->child->configure ($border, $border, $w, $h);	1340	1
1138	}	1341	}
1139		1342
1140	sub button_down {	1343	sub invoke_button_down {
1141	my ($self, $ev, $x, $y) = @_;	1344	my ($self, $ev, $x, $y) = @_;
1142		1345
1143	my ($w, $h) = @$self{qw(w h)};	1346	my ($w, $h) = @$self{qw(w h)};
1144	my $border = $self->border;	1347	my $border = $self->border;
1145		1348
…		…
1176		1379
1177	($x, $y) = ($ev->{x}, $ev->{y});	1380	($x, $y) = ($ev->{x}, $ev->{y});
1178		1381
1179	$self->move_abs ($bx + $x - $ox, $by + $y - $oy);	1382	$self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1180	# HACK: the next line is required to enforce placement	1383	# HACK: the next line is required to enforce placement
1181	$self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h});	1384	$self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
1182	};	1385	};
1183	} else {	1386	} else {
1184	return 0;	1387	return 0;
1185	}	1388	}
1186		1389
1187	1	1390	1
1188	}	1391	}
1189		1392
1190	sub button_up {	1393	sub invoke_button_up {
1191	my ($self, $ev, $x, $y) = @_;	1394	my ($self, $ev, $x, $y) = @_;
1192		1395
1193	!!delete $self->{motion}	1396	! ! delete $self->{motion}
1194	}	1397	}
1195		1398
1196	sub mouse_motion {	1399	sub invoke_mouse_motion {
1197	my ($self, $ev, $x, $y) = @_;	1400	my ($self, $ev, $x, $y) = @_;
1198		1401
1199	$self->{motion}->($ev, $x, $y) if $self->{motion};	1402	$self->{motion}->($ev, $x, $y) if $self->{motion};
1200		1403
1201	!!$self->{motion}	1404	! ! $self->{motion}
		1405	}
		1406
		1407	sub invoke_visibility_change {
		1408	my ($self, $visible) = @_;
		1409
		1410	delete $self->{motion} unless $visible;
		1411
		1412	0
1202	}	1413	}
1203		1414
1204	sub _draw {	1415	sub _draw {
1205	my ($self) = @_;	1416	my ($self) = @_;
1206		1417
…		…
1232		1443
1233	glDisable GL_TEXTURE_2D;	1444	glDisable GL_TEXTURE_2D;
1234		1445
1235	$child->draw;	1446	$child->draw;
1236		1447
1237	if ($self->{title}) {	1448	if ($self->{title_widget}) {
1238	glTranslate 0, $border - $self->{h};	1449	glTranslate 0, $border - $self->{h};
1239	$self->{title}->_draw;	1450	$self->{title_widget}->_draw;
		1451
		1452	glTranslate 0, - ($border - $self->{h});
1240	}	1453	}
		1454
		1455	$self->{close_button}->draw
		1456	if $self->{close_button};
1241	}	1457	}
1242		1458
1243	#############################################################################	1459	#############################################################################
1244		1460
1245	package CFClient::UI::Table;	1461	package CFPlus::UI::Table;
1246		1462
1247	our @ISA = CFClient::UI::Base::;	1463	our @ISA = CFPlus::UI::Base::;
1248		1464
1249	use List::Util qw(max sum);	1465	use List::Util qw(max sum);
1250		1466
1251	use CFClient::OpenGL;	1467	use CFPlus::OpenGL;
1252		1468
1253	sub new {	1469	sub new {
1254	my $class = shift;	1470	my $class = shift;
1255		1471
1256	$class->SUPER::new (	1472	$class->SUPER::new (
…		…
1262	sub children {	1478	sub children {
1263	grep $_, map @$_, grep $_, @{ $_[0]{children} }	1479	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1264	}	1480	}
1265		1481
1266	sub add {	1482	sub add {
1267	my ($self, $x, $y, $child) = @_;	1483	my ($self) = shift;
1268		1484
		1485	while (@_) {
		1486	my ($x, $y, $child) = splice @_, 0, 3, ();
1269	$child->set_parent ($self);	1487	$child->set_parent ($self);
1270	$self->{children}[$y][$x] = $child;	1488	$self->{children}[$y][$x] = $child;
		1489	}
1271		1490
		1491	$self->{force_realloc} = 1;
		1492	$self->{force_size_alloc} = 1;
1272	$self->realloc;	1493	$self->realloc;
		1494	}
		1495
		1496	sub remove {
		1497	my ($self, $child) = @_;
		1498
		1499	# TODO: not yet implemented
1273	}	1500	}
1274		1501
1275	# TODO: move to container class maybe? send children a signal on removal?	1502	# TODO: move to container class maybe? send children a signal on removal?
1276	sub clear {	1503	sub clear {
1277	my ($self) = @_;	1504	my ($self) = @_;
…		…
1318	(sum @$ws),	1545	(sum @$ws),
1319	(sum @$hs),	1546	(sum @$hs),
1320	)	1547	)
1321	}	1548	}
1322		1549
1323	sub size_allocate {	1550	sub invoke_size_allocate {
1324	my ($self, $w, $h) = @_;	1551	my ($self, $w, $h) = @_;
1325		1552
1326	my ($ws, $hs) = $self->get_wh;	1553	my ($ws, $hs) = $self->get_wh;
1327		1554
1328	my $req_w = (sum @$ws) || 1;	1555	my $req_w = (sum @$ws) || 1;
…		…
1335		1562
1336	# linearly scale sizes	1563	# linearly scale sizes
1337	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;	1564	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1338	$hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;	1565	$hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1339		1566
1340	CFClient::UI::harmonize $ws;	1567	CFPlus::UI::harmonize $ws;
1341	CFClient::UI::harmonize $hs;	1568	CFPlus::UI::harmonize $hs;
1342		1569
1343	my $y;	1570	my $y;
1344		1571
1345	for my $r (0 .. $#{$self->{children}}) {	1572	for my $r (0 .. $#{$self->{children}}) {
1346	my $row = $self->{children}[$r]	1573	my $row = $self->{children}[$r]
…		…
1360	}	1587	}
1361		1588
1362	$y += $row_h;	1589	$y += $row_h;
1363	}	1590	}
1364		1591
		1592	1
1365	}	1593	}
1366		1594
1367	sub find_widget {	1595	sub find_widget {
1368	my ($self, $x, $y) = @_;	1596	my ($self, $x, $y) = @_;
1369		1597
…		…
1388	}	1616	}
1389	}	1617	}
1390		1618
1391	#############################################################################	1619	#############################################################################
1392		1620
1393	package CFClient::UI::Box;	1621	package CFPlus::UI::Box;
1394		1622
1395	our @ISA = CFClient::UI::Container::;	1623	our @ISA = CFPlus::UI::Container::;
1396		1624
1397	sub size_request {	1625	sub size_request {
1398	my ($self) = @_;	1626	my ($self) = @_;
1399		1627
1400	$self->{vertical}	1628	$self->{vertical}
…		…
1406	(List::Util::sum map $_->{req_w}, @{$self->{children}}),	1634	(List::Util::sum map $_->{req_w}, @{$self->{children}}),
1407	(List::Util::max map $_->{req_h}, @{$self->{children}}),	1635	(List::Util::max map $_->{req_h}, @{$self->{children}}),
1408	)	1636	)
1409	}	1637	}
1410		1638
1411	sub size_allocate {	1639	sub invoke_size_allocate {
1412	my ($self, $w, $h) = @_;	1640	my ($self, $w, $h) = @_;
1413		1641
1414	my $space = $self->{vertical} ? $h : $w;	1642	my $space = $self->{vertical} ? $h : $w;
1415	my $children = $self->{children};	1643	my @children = $self->visible_children;
1416		1644
1417	my @req;	1645	my @req;
1418		1646
1419	if ($self->{homogeneous}) {	1647	if ($self->{homogeneous}) {
1420	@req = ($space / (@$children || 1)) x @$children;	1648	@req = ($space / (@children || 1)) x @children;
1421	} else {	1649	} else {
1422	@req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;	1650	@req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1423	my $req = List::Util::sum @req;	1651	my $req = List::Util::sum @req;
1424		1652
1425	if ($req > $space) {	1653	if ($req > $space) {
1426	# ah well, not enough space	1654	# ah well, not enough space
1427	$_ *= $space / $req for @req;	1655	$_ *= $space / $req for @req;
1428	} else {	1656	} else {
1429	my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;	1657	my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1430		1658
1431	$space = ($space - $req) / $expand; # remaining space to give away	1659	$space = ($space - $req) / $expand; # remaining space to give away
1432		1660
1433	$req[$_] += $space * $children->[$_]{expand}	1661	$req[$_] += $space * $children[$_]{expand}
1434	for 0 .. $#$children;	1662	for 0 .. $#children;
1435	}	1663	}
1436	}	1664	}
1437		1665
1438	CFClient::UI::harmonize \@req;	1666	CFPlus::UI::harmonize \@req;
1439		1667
1440	my $pos = 0;	1668	my $pos = 0;
1441	for (0 .. $#$children) {	1669	for (0 .. $#children) {
1442	my $alloc = $req[$_];	1670	my $alloc = $req[$_];
1443	$children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));	1671	$children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1444		1672
1445	$pos += $alloc;	1673	$pos += $alloc;
1446	}	1674	}
1447		1675
1448	1	1676	1
1449	}	1677	}
1450		1678
1451	#############################################################################	1679	#############################################################################
1452		1680
1453	package CFClient::UI::HBox;	1681	package CFPlus::UI::HBox;
1454		1682
1455	our @ISA = CFClient::UI::Box::;	1683	our @ISA = CFPlus::UI::Box::;
1456		1684
1457	sub new {	1685	sub new {
1458	my $class = shift;	1686	my $class = shift;
1459		1687
1460	$class->SUPER::new (	1688	$class->SUPER::new (
…		…
1463	)	1691	)
1464	}	1692	}
1465		1693
1466	#############################################################################	1694	#############################################################################
1467		1695
1468	package CFClient::UI::VBox;	1696	package CFPlus::UI::VBox;
1469		1697
1470	our @ISA = CFClient::UI::Box::;	1698	our @ISA = CFPlus::UI::Box::;
1471		1699
1472	sub new {	1700	sub new {
1473	my $class = shift;	1701	my $class = shift;
1474		1702
1475	$class->SUPER::new (	1703	$class->SUPER::new (
…		…
1478	)	1706	)
1479	}	1707	}
1480		1708
1481	#############################################################################	1709	#############################################################################
1482		1710
1483	package CFClient::UI::Label;	1711	package CFPlus::UI::Label;
1484		1712
1485	our @ISA = CFClient::UI::DrawBG::;	1713	our @ISA = CFPlus::UI::DrawBG::;
1486		1714
1487	use CFClient::OpenGL;	1715	use CFPlus::OpenGL;
1488		1716
1489	sub new {	1717	sub new {
1490	my ($class, %arg) = @_;	1718	my ($class, %arg) = @_;
1491		1719
1492	my $self = $class->SUPER::new (	1720	my $self = $class->SUPER::new (
…		…
1495	#active_bg => none	1723	#active_bg => none
1496	#font => default_font	1724	#font => default_font
1497	#text => initial text	1725	#text => initial text
1498	#markup => initial narkup	1726	#markup => initial narkup
1499	#max_w => maximum pixel width	1727	#max_w => maximum pixel width
		1728	#style => 0, # render flags
1500	ellipsise => 3, # end	1729	ellipsise => 3, # end
1501	layout => (new CFClient::Layout),	1730	layout => (new CFPlus::Layout),
1502	fontsize => 1,	1731	fontsize => 1,
1503	align => -1,	1732	align => -1,
1504	valign => -1,	1733	valign => -1,
1505	padding_x => 2,	1734	padding_x => 2,
1506	padding_y => 2,	1735	padding_y => 2,
1507	can_events => 0,	1736	can_events => 0,
1508	%arg	1737	%arg
1509	);	1738	);
1510		1739
1511	if (exists $self->{template}) {	1740	if (exists $self->{template}) {
1512	my $layout = new CFClient::Layout;	1741	my $layout = new CFPlus::Layout;
1513	$layout->set_text (delete $self->{template});	1742	$layout->set_text (delete $self->{template});
1514	$self->{template} = $layout;	1743	$self->{template} = $layout;
1515	}	1744	}
1516		1745
1517	if (exists $self->{markup}) {	1746	if (exists $self->{markup}) {
…		…
1521	}	1750	}
1522		1751
1523	$self	1752	$self
1524	}	1753	}
1525		1754
1526	sub escape($) {
1527	local $_ = $_[0];
1528
1529	s/&/&amp;/g;
1530	s/>/&gt;/g;
1531	s/</&lt;/g;
1532
1533	$_
1534	}
1535
1536	sub update {	1755	sub update {
1537	my ($self) = @_;	1756	my ($self) = @_;
1538		1757
1539	delete $self->{texture};	1758	delete $self->{texture};
1540	$self->SUPER::update;	1759	$self->SUPER::update;
1541	}	1760	}
1542		1761
		1762	sub realloc {
		1763	my ($self) = @_;
		1764
		1765	delete $self->{ox};
		1766	$self->SUPER::realloc;
		1767	}
		1768
1543	sub set_text {	1769	sub set_text {
1544	my ($self, $text) = @_;	1770	my ($self, $text) = @_;
1545		1771
1546	return if $self->{text} eq "T$text";	1772	return if $self->{text} eq "T$text";
1547	$self->{text} = "T$text";	1773	$self->{text} = "T$text";
1548		1774
1549	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1550	$self->{layout}->set_text ($text);	1775	$self->{layout}->set_text ($text);
1551		1776
		1777	delete $self->{size_req};
1552	$self->realloc;	1778	$self->realloc;
1553	$self->update;	1779	$self->update;
1554	}	1780	}
1555		1781
1556	sub set_markup {	1782	sub set_markup {
…		…
1559	return if $self->{text} eq "M$markup";	1785	return if $self->{text} eq "M$markup";
1560	$self->{text} = "M$markup";	1786	$self->{text} = "M$markup";
1561		1787
1562	my $rgba = $markup =~ /span.*(?:foreground|background)/;	1788	my $rgba = $markup =~ /span.*(?:foreground|background)/;
1563		1789
1564	$self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1565	$self->{layout}->set_markup ($markup);	1790	$self->{layout}->set_markup ($markup);
1566		1791
		1792	delete $self->{size_req};
1567	$self->realloc;	1793	$self->realloc;
1568	$self->update;	1794	$self->update;
1569	}	1795	}
1570		1796
1571	sub size_request {	1797	sub size_request {
1572	my ($self) = @_;	1798	my ($self) = @_;
1573		1799
		1800	$self->{size_req} ||= do {
1574	$self->{layout}->set_font ($self->{font}) if $self->{font};	1801	$self->{layout}->set_font ($self->{font}) if $self->{font};
1575	$self->{layout}->set_width ($self->{max_w} || -1);	1802	$self->{layout}->set_width ($self->{max_w} || -1);
1576	$self->{layout}->set_ellipsise ($self->{ellipsise});	1803	$self->{layout}->set_ellipsise ($self->{ellipsise});
1577	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});	1804	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1578	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1805	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1579		1806
1580	my ($w, $h) = $self->{layout}->size;	1807	my ($w, $h) = $self->{layout}->size;
1581		1808
1582	if (exists $self->{template}) {	1809	if (exists $self->{template}) {
1583	$self->{template}->set_font ($self->{font}) if $self->{font};	1810	$self->{template}->set_font ($self->{font}) if $self->{font};
		1811	$self->{template}->set_width ($self->{max_w} || -1);
1584	$self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);	1812	$self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1585		1813
1586	my ($w2, $h2) = $self->{template}->size;	1814	my ($w2, $h2) = $self->{template}->size;
1587		1815
1588	$w = List::Util::max $w, $w2;	1816	$w = List::Util::max $w, $w2;
1589	$h = List::Util::max $h, $h2;	1817	$h = List::Util::max $h, $h2;
		1818	}
		1819
		1820	[$w, $h]
1590	}	1821	};
1591		1822
1592	($w, $h)	1823	@{ $self->{size_req} }
1593	}	1824	}
1594		1825
		1826	sub baseline_shift {
		1827	$_[0]{layout}->descent
		1828	}
		1829
1595	sub size_allocate {	1830	sub invoke_size_allocate {
1596	my ($self, $w, $h) = @_;	1831	my ($self, $w, $h) = @_;
1597		1832
1598	delete $self->{ox};	1833	delete $self->{ox};
1599		1834
1600	delete $self->{texture}	1835	delete $self->{texture}
1601	unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};	1836	unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
		1837
		1838	1
1602	}	1839	}
1603		1840
1604	sub set_fontsize {	1841	sub set_fontsize {
1605	my ($self, $fontsize) = @_;	1842	my ($self, $fontsize) = @_;
1606		1843
1607	$self->{fontsize} = $fontsize;	1844	$self->{fontsize} = $fontsize;
		1845	delete $self->{size_req};
1608	delete $self->{texture};	1846	delete $self->{texture};
1609		1847
1610	$self->realloc;	1848	$self->realloc;
1611	}	1849	}
1612		1850
		1851	sub reconfigure {
		1852	my ($self) = @_;
		1853
		1854	delete $self->{size_req};
		1855	delete $self->{texture};
		1856
		1857	$self->SUPER::reconfigure;
		1858	}
		1859
1613	sub _draw {	1860	sub _draw {
1614	my ($self) = @_;	1861	my ($self) = @_;
1615		1862
1616	$self->SUPER::_draw; # draw background, if applicable	1863	$self->SUPER::_draw; # draw background, if applicable
1617		1864
1618	my $tex = $self->{texture} ||= do {	1865	my $size = $self->{texture} ||= do {
1619	$self->{layout}->set_foreground (@{$self->{fg}});	1866	$self->{layout}->set_foreground (@{$self->{fg}});
1620	$self->{layout}->set_font ($self->{font}) if $self->{font};	1867	$self->{layout}->set_font ($self->{font}) if $self->{font};
1621	$self->{layout}->set_width ($self->{w});	1868	$self->{layout}->set_width ($self->{w});
1622	$self->{layout}->set_ellipsise ($self->{ellipsise});	1869	$self->{layout}->set_ellipsise ($self->{ellipsise});
1623	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});	1870	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1624	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1871	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1625		1872
1626	new_from_layout CFClient::Texture $self->{layout}	1873	[$self->{layout}->size]
1627	};	1874	};
1628		1875
1629	unless (exists $self->{ox}) {	1876	unless (exists $self->{ox}) {
1630	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}	1877	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1631	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}	1878	: $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1632	: ($self->{w} - $tex->{w}) * 0.5);	1879	: ($self->{w} - $size->[0]) * 0.5);
1633		1880
1634	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}	1881	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1635	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}	1882	: $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1636	: ($self->{h} - $tex->{h}) * 0.5);	1883	: ($self->{h} - $size->[1]) * 0.5);
1637	};	1884	};
1638		1885
1639	glEnable GL_TEXTURE_2D;	1886	my $w = List::Util::min $self->{w} + 4, $size->[0];
1640	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1887	my $h = List::Util::min $self->{h} + 2, $size->[1];
1641		1888
1642	glColor_premultiply @{$self->{fg}}	1889	$self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1643	if $tex->{format} == GL_ALPHA;
1644
1645	$tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1646
1647	glDisable GL_TEXTURE_2D;
1648	}	1890	}
1649		1891
1650	#############################################################################	1892	#############################################################################
1651		1893
1652	package CFClient::UI::EntryBase;	1894	package CFPlus::UI::EntryBase;
1653		1895
1654	our @ISA = CFClient::UI::Label::;	1896	our @ISA = CFPlus::UI::Label::;
1655		1897
1656	use CFClient::OpenGL;	1898	use CFPlus::OpenGL;
1657		1899
1658	sub new {	1900	sub new {
1659	my $class = shift;	1901	my $class = shift;
1660		1902
1661	$class->SUPER::new (	1903	$class->SUPER::new (
…		…
1665	active_fg => [0, 0, 0],	1907	active_fg => [0, 0, 0],
1666	can_hover => 1,	1908	can_hover => 1,
1667	can_focus => 1,	1909	can_focus => 1,
1668	valign => 0,	1910	valign => 0,
1669	can_events => 1,	1911	can_events => 1,
		1912	ellipsise => 0,
1670	#text => ...	1913	#text => ...
		1914	#hidden => "*",
1671	@_	1915	@_
1672	)	1916	)
1673	}	1917	}
1674		1918
1675	sub _set_text {	1919	sub _set_text {
…		…
1682	$self->{last_activity} = $::NOW;	1926	$self->{last_activity} = $::NOW;
1683	$self->{text} = $text;	1927	$self->{text} = $text;
1684		1928
1685	$text =~ s/./*/g if $self->{hidden};	1929	$text =~ s/./*/g if $self->{hidden};
1686	$self->{layout}->set_text ("$text ");	1930	$self->{layout}->set_text ("$text ");
		1931	delete $self->{size_req};
1687		1932
1688	$self->_emit (changed => $self->{text});	1933	$self->emit (changed => $self->{text});
		1934
		1935	$self->realloc;
1689	$self->update;	1936	$self->update;
1690	}	1937	}
1691		1938
1692	sub set_text {	1939	sub set_text {
1693	my ($self, $text) = @_;	1940	my ($self, $text) = @_;
1694		1941
1695	$self->{cursor} = length $text;	1942	$self->{cursor} = length $text;
1696	$self->_set_text ($text);	1943	$self->_set_text ($text);
1697
1698	$self->realloc;
1699	}	1944	}
1700		1945
1701	sub get_text {	1946	sub get_text {
1702	$_[0]{text}	1947	$_[0]{text}
1703	}	1948	}
…		…
1708	my ($w, $h) = $self->SUPER::size_request;	1953	my ($w, $h) = $self->SUPER::size_request;
1709		1954
1710	($w + 1, $h) # add 1 for cursor	1955	($w + 1, $h) # add 1 for cursor
1711	}	1956	}
1712		1957
1713	sub key_down {	1958	sub invoke_key_down {
1714	my ($self, $ev) = @_;	1959	my ($self, $ev) = @_;
1715		1960
1716	my $mod = $ev->{mod};	1961	my $mod = $ev->{mod};
1717	my $sym = $ev->{sym};	1962	my $sym = $ev->{sym};
1718	my $uni = $ev->{unicode};	1963	my $uni = $ev->{unicode};
…		…
1721		1966
1722	if ($uni == 8) {	1967	if ($uni == 8) {
1723	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};	1968	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1724	} elsif ($uni == 127) {	1969	} elsif ($uni == 127) {
1725	substr $text, $self->{cursor}, 1, "";	1970	substr $text, $self->{cursor}, 1, "";
1726	} elsif ($sym == CFClient::SDLK_LEFT) {	1971	} elsif ($sym == CFPlus::SDLK_LEFT) {
1727	--$self->{cursor} if $self->{cursor};	1972	--$self->{cursor} if $self->{cursor};
1728	} elsif ($sym == CFClient::SDLK_RIGHT) {	1973	} elsif ($sym == CFPlus::SDLK_RIGHT) {
1729	++$self->{cursor} if $self->{cursor} < length $self->{text};	1974	++$self->{cursor} if $self->{cursor} < length $self->{text};
1730	} elsif ($sym == CFClient::SDLK_HOME) {	1975	} elsif ($sym == CFPlus::SDLK_HOME) {
1731	$self->{cursor} = 0;	1976	$self->{cursor} = 0;
1732	} elsif ($sym == CFClient::SDLK_END) {	1977	} elsif ($sym == CFPlus::SDLK_END) {
1733	$self->{cursor} = length $text;	1978	$self->{cursor} = length $text;
		1979	} elsif ($uni == 21) { # ctrl-u
		1980	$text = "";
		1981	$self->{cursor} = 0;
1734	} elsif ($uni == 27) {	1982	} elsif ($uni == 27) {
1735	$self->_emit ('escape');	1983	$self->emit ('escape');
1736	} elsif ($uni) {	1984	} elsif ($uni >= 0x20 || $uni == 0x0d) {
1737	substr $text, $self->{cursor}++, 0, chr $uni;	1985	substr $text, $self->{cursor}++, 0, chr $uni;
1738	} else {	1986	} else {
1739	return 0;	1987	return 0;
1740	}	1988	}
1741		1989
1742	$self->_set_text ($text);	1990	$self->_set_text ($text);
1743		1991
1744	$self->realloc;	1992	$self->realloc;
		1993	$self->update;
1745		1994
1746	1	1995	1
1747	}	1996	}
1748		1997
1749	sub focus_in {	1998	sub invoke_focus_in {
1750	my ($self) = @_;	1999	my ($self) = @_;
1751		2000
1752	$self->{last_activity} = $::NOW;	2001	$self->{last_activity} = $::NOW;
1753		2002
1754	$self->SUPER::focus_in;	2003	$self->SUPER::invoke_focus_in
1755	}	2004	}
1756		2005
1757	sub button_down {	2006	sub invoke_button_down {
1758	my ($self, $ev, $x, $y) = @_;	2007	my ($self, $ev, $x, $y) = @_;
1759		2008
1760	$self->SUPER::button_down ($ev, $x, $y);	2009	$self->SUPER::invoke_button_down ($ev, $x, $y);
1761		2010
1762	my $idx = $self->{layout}->xy_to_index ($x, $y);	2011	my $idx = $self->{layout}->xy_to_index ($x, $y);
1763		2012
1764	# byte-index to char-index	2013	# byte-index to char-index
1765	my $text = $self->{text};	2014	my $text = $self->{text};
1766	utf8::encode $text;	2015	utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1767	$self->{cursor} = length substr $text, 0, $idx;	2016	$self->{cursor} = length $text;
1768		2017
1769	$self->_set_text ($self->{text});	2018	$self->_set_text ($self->{text});
1770	$self->update;	2019	$self->update;
1771		2020
1772	1	2021	1
1773	}	2022	}
1774		2023
1775	sub mouse_motion {	2024	sub invoke_mouse_motion {
1776	my ($self, $ev, $x, $y) = @_;	2025	my ($self, $ev, $x, $y) = @_;
1777	# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#	2026	# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1778		2027
1779	0	2028	1
1780	}	2029	}
1781		2030
1782	sub _draw {	2031	sub _draw {
1783	my ($self) = @_;	2032	my ($self) = @_;
1784		2033
…		…
1811	utf8::encode $text;	2060	utf8::encode $text;
1812		2061
1813	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)	2062	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1814	}	2063	}
1815		2064
1816	glColor @{$self->{fg}};
1817	glBegin GL_LINES;	2065	glBegin GL_LINES;
1818	glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};	2066	glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};
1819	glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};	2067	glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1820	glEnd;	2068	glEnd;
1821	}	2069	}
1822	}	2070	}
1823		2071
		2072	#############################################################################
		2073
1824	package CFClient::UI::Entry;	2074	package CFPlus::UI::Entry;
1825		2075
1826	our @ISA = CFClient::UI::EntryBase::;	2076	our @ISA = CFPlus::UI::EntryBase::;
1827		2077
1828	use CFClient::OpenGL;	2078	use CFPlus::OpenGL;
1829		2079
1830	sub key_down {	2080	sub invoke_key_down {
1831	my ($self, $ev) = @_;	2081	my ($self, $ev) = @_;
1832		2082
1833	my $sym = $ev->{sym};	2083	my $sym = $ev->{sym};
1834		2084
1835	if ($sym == 13) {	2085	if ($ev->{uni} == 0x0d || $sym == 13) {
1836	unshift @{$self->{history}},	2086	unshift @{$self->{history}},
1837	my $txt = $self->get_text;	2087	my $txt = $self->get_text;
		2088
1838	$self->{history_pointer} = -1;	2089	$self->{history_pointer} = -1;
1839	$self->{history_saveback} = '';	2090	$self->{history_saveback} = '';
1840	$self->_emit (activate => $txt);	2091	$self->emit (activate => $txt);
1841	$self->update;	2092	$self->update;
1842		2093
1843	} elsif ($sym == CFClient::SDLK_UP) {	2094	} elsif ($sym == CFPlus::SDLK_UP) {
1844	if ($self->{history_pointer} < 0) {	2095	if ($self->{history_pointer} < 0) {
1845	$self->{history_saveback} = $self->get_text;	2096	$self->{history_saveback} = $self->get_text;
1846	}	2097	}
1847	if (@{$self->{history} || []} > 0) {	2098	if (@{$self->{history} || []} > 0) {
1848	$self->{history_pointer}++;	2099	$self->{history_pointer}++;
…		…
1850	$self->{history_pointer} = @{$self->{history} || []} - 1;	2101	$self->{history_pointer} = @{$self->{history} || []} - 1;
1851	}	2102	}
1852	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2103	$self->set_text ($self->{history}->[$self->{history_pointer}]);
1853	}	2104	}
1854		2105
1855	} elsif ($sym == CFClient::SDLK_DOWN) {	2106	} elsif ($sym == CFPlus::SDLK_DOWN) {
1856	$self->{history_pointer}--;	2107	$self->{history_pointer}--;
1857	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;	2108	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1858		2109
1859	if ($self->{history_pointer} >= 0) {	2110	if ($self->{history_pointer} >= 0) {
1860	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2111	$self->set_text ($self->{history}->[$self->{history_pointer}]);
1861	} else {	2112	} else {
1862	$self->set_text ($self->{history_saveback});	2113	$self->set_text ($self->{history_saveback});
1863	}	2114	}
1864		2115
1865	} else {	2116	} else {
1866	return $self->SUPER::key_down ($ev)	2117	return $self->SUPER::invoke_key_down ($ev)
1867	}	2118	}
1868		2119
1869	1	2120	1
1870	}	2121	}
1871		2122
1872	#############################################################################	2123	#############################################################################
1873		2124
		2125	package CFPlus::UI::TextEdit;
		2126
		2127	our @ISA = CFPlus::UI::EntryBase::;
		2128
		2129	use CFPlus::OpenGL;
		2130
		2131	sub move_cursor_ver {
		2132	my ($self, $dy) = @_;
		2133
		2134	my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
		2135
		2136	$y += $dy;
		2137
		2138	if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {
		2139	$self->{cursor} = $index;
		2140	delete $self->{cur_h};
		2141	$self->update;
		2142	return;
		2143	}
		2144	}
		2145
		2146	sub invoke_key_down {
		2147	my ($self, $ev) = @_;
		2148
		2149	my $sym = $ev->{sym};
		2150
		2151	if ($sym == CFPlus::SDLK_UP) {
		2152	$self->move_cursor_ver (-1);
		2153	} elsif ($sym == CFPlus::SDLK_DOWN) {
		2154	$self->move_cursor_ver (+1);
		2155	} else {
		2156	return $self->SUPER::invoke_key_down ($ev)
		2157	}
		2158
		2159	1
		2160	}
		2161
		2162	#############################################################################
		2163
1874	package CFClient::UI::Button;	2164	package CFPlus::UI::Button;
1875		2165
1876	our @ISA = CFClient::UI::Label::;	2166	our @ISA = CFPlus::UI::Label::;
1877		2167
1878	use CFClient::OpenGL;	2168	use CFPlus::OpenGL;
1879		2169
1880	my @tex =	2170	my @tex =
1881	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2171	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1882	qw(b1_button_active.png);	2172	qw(b1_button_active.png);
1883		2173
1884	sub new {	2174	sub new {
1885	my $class = shift;	2175	my $class = shift;
1886		2176
…		…
1895	can_events => 1,	2185	can_events => 1,
1896	@_	2186	@_
1897	)	2187	)
1898	}	2188	}
1899		2189
1900	sub activate { }
1901
1902	sub button_up {	2190	sub invoke_button_up {
1903	my ($self, $ev, $x, $y) = @_;	2191	my ($self, $ev, $x, $y) = @_;
1904		2192
1905	$self->emit ("activate")	2193	$self->emit ("activate")
1906	if $x >= 0 && $x < $self->{w}	2194	if $x >= 0 && $x < $self->{w}
1907	&& $y >= 0 && $y < $self->{h};	2195	&& $y >= 0 && $y < $self->{h};
…		…
1925	$self->SUPER::_draw;	2213	$self->SUPER::_draw;
1926	}	2214	}
1927		2215
1928	#############################################################################	2216	#############################################################################
1929		2217
1930	package CFClient::UI::CheckBox;	2218	package CFPlus::UI::CheckBox;
1931		2219
1932	our @ISA = CFClient::UI::DrawBG::;	2220	our @ISA = CFPlus::UI::DrawBG::;
1933		2221
1934	my @tex =	2222	my @tex =
1935	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2223	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1936	qw(c1_checkbox_bg.png c1_checkbox_active.png);	2224	qw(c1_checkbox_bg.png c1_checkbox_active.png);
1937		2225
1938	use CFClient::OpenGL;	2226	use CFPlus::OpenGL;
1939		2227
1940	sub new {	2228	sub new {
1941	my $class = shift;	2229	my $class = shift;
1942		2230
1943	$class->SUPER::new (	2231	$class->SUPER::new (
…		…
1957	my ($self) = @_;	2245	my ($self) = @_;
1958		2246
1959	(6) x 2	2247	(6) x 2
1960	}	2248	}
1961		2249
		2250	sub toggle {
		2251	my ($self) = @_;
		2252
		2253	$self->{state} = !$self->{state};
		2254	$self->emit (changed => $self->{state});
		2255	$self->update;
		2256	}
		2257
1962	sub button_down {	2258	sub invoke_button_down {
1963	my ($self, $ev, $x, $y) = @_;	2259	my ($self, $ev, $x, $y) = @_;
1964		2260
1965	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}	2261	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1966	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {	2262	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1967	$self->{state} = !$self->{state};	2263	$self->toggle;
1968	$self->_emit (changed => $self->{state});
1969	} else {	2264	} else {
1970	return 0	2265	return 0
1971	}	2266	}
1972		2267
1973	1	2268	1
…		…
1993	glDisable GL_TEXTURE_2D;	2288	glDisable GL_TEXTURE_2D;
1994	}	2289	}
1995		2290
1996	#############################################################################	2291	#############################################################################
1997		2292
1998	package CFClient::UI::Image;	2293	package CFPlus::UI::Image;
1999		2294
2000	our @ISA = CFClient::UI::Base::;	2295	our @ISA = CFPlus::UI::Base::;
2001		2296
2002	use CFClient::OpenGL;	2297	use CFPlus::OpenGL;
2003	use Carp qw/confess/;
2004		2298
2005	our %loaded_images;	2299	our %texture_cache;
2006		2300
2007	sub new {	2301	sub new {
2008	my $class = shift;	2302	my $class = shift;
2009		2303
2010	my $self = $class->SUPER::new (can_events => 0, @_);	2304	my $self = $class->SUPER::new (
		2305	can_events => 0,
		2306	@_,
		2307	);
2011		2308
2012	$self->{image} or confess "Image has 'image' not set. This is a fatal error!";	2309	$self->{path} || $self->{tex}
		2310	or Carp::croak "'path' or 'tex' attributes required";
2013		2311
2014	$loaded_images{$self->{image}} ||=	2312	$self->{tex} ||= $texture_cache{$self->{path}} ||=
2015	new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1;	2313	new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
2016		2314
2017	my $tex = $self->{tex} = $loaded_images{$self->{image}};	2315	Scalar::Util::weaken $texture_cache{$self->{path}};
2018		2316
2019	Scalar::Util::weaken $loaded_images{$self->{image}};	2317	$self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2020
2021	$self->{aspect} = $tex->{w} / $tex->{h};
2022		2318
2023	$self	2319	$self
2024	}	2320	}
2025		2321
		2322	sub STORABLE_freeze {
		2323	my ($self, $cloning) = @_;
		2324
		2325	$self->{path}
		2326	or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
		2327
		2328	$self->{path}
		2329	}
		2330
		2331	sub STORABLE_attach {
		2332	my ($self, $cloning, $path) = @_;
		2333
		2334	$self->new (path => $path)
		2335	}
		2336
2026	sub size_request {	2337	sub size_request {
2027	my ($self) = @_;	2338	my ($self) = @_;
2028		2339
2029	($self->{tex}->{w}, $self->{tex}->{h})	2340	($self->{tex}{w}, $self->{tex}{h})
2030	}	2341	}
2031		2342
2032	sub _draw {	2343	sub _draw {
2033	my ($self) = @_;	2344	my ($self) = @_;
2034		2345
…		…
2044	}	2355	}
2045		2356
2046	glEnable GL_TEXTURE_2D;	2357	glEnable GL_TEXTURE_2D;
2047	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2358	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2048		2359
2049	$tex->draw_quad_alpha (0, 0, $w, $h);	2360	$tex->draw_quad (0, 0, $w, $h);
2050		2361
2051	glDisable GL_TEXTURE_2D;	2362	glDisable GL_TEXTURE_2D;
2052	}	2363	}
2053		2364
2054	#############################################################################	2365	#############################################################################
2055		2366
		2367	package CFPlus::UI::ImageButton;
		2368
		2369	our @ISA = CFPlus::UI::Image::;
		2370
		2371	use CFPlus::OpenGL;
		2372
		2373	my %textures;
		2374
		2375	sub new {
		2376	my $class = shift;
		2377
		2378	my $self = $class->SUPER::new (
		2379	padding_x => 4,
		2380	padding_y => 4,
		2381	fg => [1, 1, 1],
		2382	active_fg => [0, 0, 1],
		2383	can_hover => 1,
		2384	align => 0,
		2385	valign => 0,
		2386	can_events => 1,
		2387	@_
		2388	);
		2389	}
		2390
		2391	sub invoke_button_up {
		2392	my ($self, $ev, $x, $y) = @_;
		2393
		2394	$self->emit ("activate")
		2395	if $x >= 0 && $x < $self->{w}
		2396	&& $y >= 0 && $y < $self->{h};
		2397
		2398	1
		2399	}
		2400
		2401	#############################################################################
		2402
2056	package CFClient::UI::VGauge;	2403	package CFPlus::UI::VGauge;
2057		2404
2058	our @ISA = CFClient::UI::Base::;	2405	our @ISA = CFPlus::UI::Base::;
2059		2406
2060	use List::Util qw(min max);	2407	use List::Util qw(min max);
2061		2408
2062	use CFClient::OpenGL;	2409	use CFPlus::OpenGL;
2063		2410
2064	my %tex = (	2411	my %tex = (
2065	food => [	2412	food => [
2066	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2413	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2067	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/	2414	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2068	],	2415	],
2069	grace => [	2416	grace => [
2070	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2417	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2071	qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/	2418	qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2072	],	2419	],
2073	hp => [	2420	hp => [
2074	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2421	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2075	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/	2422	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2076	],	2423	],
2077	mana => [	2424	mana => [
2078	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2425	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2079	qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/	2426	qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2080	],	2427	],
2081	);	2428	);
2082		2429
2083	# eg. VGauge->new (gauge => 'food'), default gauge: food	2430	# eg. VGauge->new (gauge => 'food'), default gauge: food
…		…
2143	my $ycut1 = max 0, min 1, $ycut;	2490	my $ycut1 = max 0, min 1, $ycut;
2144	my $ycut2 = max 0, min 1, $ycut - 1;	2491	my $ycut2 = max 0, min 1, $ycut - 1;
2145		2492
2146	my $h1 = $self->{h} * (1 - $ycut1);	2493	my $h1 = $self->{h} * (1 - $ycut1);
2147	my $h2 = $self->{h} * (1 - $ycut2);	2494	my $h2 = $self->{h} * (1 - $ycut2);
		2495	my $h3 = $self->{h};
		2496
		2497	$_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
2148		2498
2149	glEnable GL_BLEND;	2499	glEnable GL_BLEND;
2150	glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,	2500	glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2151	GL_ONE, GL_ONE_MINUS_SRC_ALPHA;	2501	GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2152	glEnable GL_TEXTURE_2D;	2502	glEnable GL_TEXTURE_2D;
…		…
2171		2521
2172	if ($t3) {	2522	if ($t3) {
2173	glBindTexture GL_TEXTURE_2D, $t3->{name};	2523	glBindTexture GL_TEXTURE_2D, $t3->{name};
2174	glBegin GL_QUADS;	2524	glBegin GL_QUADS;
2175	glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;	2525	glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2176	glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h};	2526	glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2177	glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h};	2527	glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2178	glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;	2528	glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2179	glEnd;	2529	glEnd;
2180	}	2530	}
2181		2531
2182	glDisable GL_BLEND;	2532	glDisable GL_BLEND;
2183	glDisable GL_TEXTURE_2D;	2533	glDisable GL_TEXTURE_2D;
2184	}	2534	}
2185		2535
2186	#############################################################################	2536	#############################################################################
2187		2537
2188	package CFClient::UI::Gauge;	2538	package CFPlus::UI::Gauge;
2189		2539
2190	our @ISA = CFClient::UI::VBox::;	2540	our @ISA = CFPlus::UI::VBox::;
2191		2541
2192	sub new {	2542	sub new {
2193	my ($class, %arg) = @_;	2543	my ($class, %arg) = @_;
2194		2544
2195	my $self = $class->SUPER::new (	2545	my $self = $class->SUPER::new (
…		…
2197	can_hover => 1,	2547	can_hover => 1,
2198	can_events => 1,	2548	can_events => 1,
2199	%arg,	2549	%arg,
2200	);	2550	);
2201		2551
2202	$self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");	2552	$self->add ($self->{value} = new CFPlus::UI::Label valign => +1, align => 0, template => "999");
2203	$self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);	2553	$self->add ($self->{gauge} = new CFPlus::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
2204	$self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999");	2554	$self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
2205		2555
2206	$self	2556	$self
2207	}	2557	}
2208		2558
2209	sub set_fontsize {	2559	sub set_fontsize {
…		…
2230	$self->{value}->set_text ($val);	2580	$self->{value}->set_text ($val);
2231	}	2581	}
2232		2582
2233	#############################################################################	2583	#############################################################################
2234		2584
2235	package CFClient::UI::Slider;	2585	package CFPlus::UI::Slider;
2236		2586
2237	use strict;	2587	use strict;
2238		2588
2239	use CFClient::OpenGL;	2589	use CFPlus::OpenGL;
2240		2590
2241	our @ISA = CFClient::UI::DrawBG::;	2591	our @ISA = CFPlus::UI::DrawBG::;
2242		2592
2243	my @tex =	2593	my @tex =
2244	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }	2594	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2245	qw(s1_slider.png s1_slider_bg.png);	2595	qw(s1_slider.png s1_slider_bg.png);
2246		2596
2247	sub new {	2597	sub new {
2248	my $class = shift;	2598	my $class = shift;
2249		2599
…		…
2270	$self->update;	2620	$self->update;
2271		2621
2272	$self	2622	$self
2273	}	2623	}
2274		2624
2275	sub changed { }
2276
2277	sub set_range {	2625	sub set_range {
2278	my ($self, $range) = @_;	2626	my ($self, $range) = @_;
2279		2627
2280	($range, $self->{range}) = ($self->{range}, $range);	2628	($range, $self->{range}) = ($self->{range}, $range);
2281		2629
2282	$self->update
2283	if "@$range" ne "@{$self->{range}}";	2630	if ("@$range" ne "@{$self->{range}}") {
		2631	$self->update;
		2632	$self->set_value ($self->{range}[0]);
		2633	}
2284	}	2634	}
2285		2635
2286	sub set_value {	2636	sub set_value {
2287	my ($self, $value) = @_;	2637	my ($self, $value) = @_;
2288		2638
…		…
2299	if $unit;	2649	if $unit;
2300		2650
2301	@{$self->{range}} = ($value, $lo, $hi, $page, $unit);	2651	@{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2302		2652
2303	if ($value != $old_value) {	2653	if ($value != $old_value) {
2304	$self->_emit (changed => $value);	2654	$self->emit (changed => $value);
2305	$self->update;	2655	$self->update;
2306	}	2656	}
2307	}	2657	}
2308		2658
2309	sub size_request {	2659	sub size_request {
2310	my ($self) = @_;	2660	my ($self) = @_;
2311		2661
2312	($self->{req_w}, $self->{req_h})	2662	($self->{req_w}, $self->{req_h})
2313	}	2663	}
2314		2664
2315	sub button_down {	2665	sub invoke_button_down {
2316	my ($self, $ev, $x, $y) = @_;	2666	my ($self, $ev, $x, $y) = @_;
2317		2667
2318	$self->SUPER::button_down ($ev, $x, $y);	2668	$self->SUPER::invoke_button_down ($ev, $x, $y);
2319		2669
2320	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];	2670	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2321		2671
2322	$self->mouse_motion ($ev, $x, $y)	2672	$self->invoke_mouse_motion ($ev, $x, $y)
2323	}	2673	}
2324		2674
2325	sub mouse_motion {	2675	sub invoke_mouse_motion {
2326	my ($self, $ev, $x, $y) = @_;	2676	my ($self, $ev, $x, $y) = @_;
2327		2677
2328	if ($GRAB == $self) {	2678	if ($GRAB == $self) {
2329	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});	2679	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2330		2680
…		…
2336	} else {	2686	} else {
2337	return 0;	2687	return 0;
2338	}	2688	}
2339		2689
2340	1	2690	1
		2691	}
		2692
		2693	sub invoke_mouse_wheel {
		2694	my ($self, $ev) = @_;
		2695
		2696	my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
		2697
		2698	$self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * 0.2);
		2699
		2700	! ! $delta
2341	}	2701	}
2342		2702
2343	sub update {	2703	sub update {
2344	my ($self) = @_;	2704	my ($self) = @_;
2345		2705
…		…
2394	glDisable GL_TEXTURE_2D;	2754	glDisable GL_TEXTURE_2D;
2395	}	2755	}
2396		2756
2397	#############################################################################	2757	#############################################################################
2398		2758
2399	package CFClient::UI::ValSlider;	2759	package CFPlus::UI::ValSlider;
2400		2760
2401	our @ISA = CFClient::UI::HBox::;	2761	our @ISA = CFPlus::UI::HBox::;
2402		2762
2403	sub new {	2763	sub new {
2404	my ($class, %arg) = @_;	2764	my ($class, %arg) = @_;
2405		2765
2406	my $range = delete $arg{range};	2766	my $range = delete $arg{range};
2407		2767
2408	my $self = $class->SUPER::new (	2768	my $self = $class->SUPER::new (
2409	slider => (new CFClient::UI::Slider expand => 1, range => $range),	2769	slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2410	entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),	2770	entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2411	to_value => sub { shift },	2771	to_value => sub { shift },
2412	from_value => sub { shift },	2772	from_value => sub { shift },
2413	%arg,	2773	%arg,
2414	);	2774	);
2415		2775
…		…
2435	sub set_range { shift->{slider}->set_range (@_) }	2795	sub set_range { shift->{slider}->set_range (@_) }
2436	sub set_value { shift->{slider}->set_value (@_) }	2796	sub set_value { shift->{slider}->set_value (@_) }
2437		2797
2438	#############################################################################	2798	#############################################################################
2439		2799
2440	package CFClient::UI::TextView;	2800	package CFPlus::UI::TextScroller;
2441		2801
2442	our @ISA = CFClient::UI::HBox::;	2802	our @ISA = CFPlus::UI::HBox::;
2443		2803
2444	use CFClient::OpenGL;	2804	use CFPlus::OpenGL;
2445		2805
2446	sub new {	2806	sub new {
2447	my $class = shift;	2807	my $class = shift;
2448		2808
2449	my $self = $class->SUPER::new (	2809	my $self = $class->SUPER::new (
2450	fontsize => 1,	2810	fontsize => 1,
2451	can_events => 0,	2811	can_events => 1,
		2812	indent => 0,
2452	#font => default_font	2813	#font => default_font
2453	@_,	2814	@_,
2454		2815
2455	layout => (new CFClient::Layout 1),	2816	layout => (new CFPlus::Layout),
2456	par => [],	2817	par => [],
2457	height => 0,	2818	height => 0,
2458	children => [	2819	children => [
2459	(new CFClient::UI::Empty expand => 1),	2820	(new CFPlus::UI::Empty expand => 1),
2460	(new CFClient::UI::Slider vertical => 1),	2821	(new CFPlus::UI::Slider vertical => 1),
2461	],	2822	],
2462	);	2823	);
2463		2824
2464	$self->{children}[1]->connect (changed => sub { $self->update });	2825	$self->{children}[1]->connect (changed => sub { $self->update });
2465		2826
…		…
2471		2832
2472	$self->{fontsize} = $fontsize;	2833	$self->{fontsize} = $fontsize;
2473	$self->reflow;	2834	$self->reflow;
2474	}	2835	}
2475		2836
		2837	sub size_request {
		2838	my ($self) = @_;
		2839
		2840	my ($empty, $slider) = @{ $self->{children} };
		2841
		2842	local $self->{children} = [$empty, $slider];
		2843	$self->SUPER::size_request
		2844	}
		2845
2476	sub size_allocate {	2846	sub invoke_size_allocate {
2477	my ($self, $w, $h) = @_;	2847	my ($self, $w, $h) = @_;
2478		2848
2479	$self->SUPER::size_allocate ($w, $h);	2849	my ($empty, $slider, @other) = @{ $self->{children} };
		2850	$_->configure (@$_{qw(x y req_w req_h)}) for @other;
2480		2851
2481	$self->{layout}->set_font ($self->{font}) if $self->{font};	2852	$self->{layout}->set_font ($self->{font}) if $self->{font};
2482	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	2853	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2483	$self->{layout}->set_width ($self->{children}[0]{w});	2854	$self->{layout}->set_width ($empty->{w});
		2855	$self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2484		2856
2485	$self->reflow;	2857	$self->reflow;
2486	}
2487		2858
2488	sub text_size {	2859	local $self->{children} = [$empty, $slider];
		2860	$self->SUPER::invoke_size_allocate ($w, $h)
		2861	}
		2862
		2863	sub invoke_mouse_wheel {
2489	my ($self, $text, $indent) = @_;	2864	my ($self, $ev) = @_;
		2865
		2866	return 0 unless $ev->{dy}; # only vertical movements
		2867
		2868	$self->{children}[1]->emit (mouse_wheel => $ev);
		2869
		2870	1
		2871	}
		2872
		2873	sub get_layout {
		2874	my ($self, $para) = @_;
2490		2875
2491	my $layout = $self->{layout};	2876	my $layout = $self->{layout};
2492		2877
		2878	$layout->set_font ($self->{font}) if $self->{font};
		2879	$layout->set_foreground (@{$para->{fg}});
2493	$layout->set_height ($self->{fontsize} * $::FONTSIZE);	2880	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
2494	$layout->set_width ($self->{children}[0]{w} - $indent);	2881	$layout->set_width ($self->{children}[0]{w} - $para->{indent});
		2882	$layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2495	$layout->set_markup ($text);	2883	$layout->set_markup ($para->{markup});
		2884
		2885	$layout->set_shapes (
		2886	map
		2887	+(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
		2888	@{$para->{widget}}
2496		2889	);
		2890
2497	$layout->size	2891	$layout
2498	}	2892	}
2499		2893
2500	sub reflow {	2894	sub reflow {
2501	my ($self) = @_;	2895	my ($self) = @_;
2502		2896
…		…
2509		2903
2510	# todo: base offset on lines or so, not on pixels	2904	# todo: base offset on lines or so, not on pixels
2511	$self->{children}[1]->set_value ($offset);	2905	$self->{children}[1]->set_value ($offset);
2512	}	2906	}
2513		2907
		2908	sub current_paragraph {
		2909	my ($self) = @_;
		2910
		2911	$self->{top_paragraph} - 1
		2912	}
		2913
		2914	sub scroll_to {
		2915	my ($self, $para) = @_;
		2916
		2917	$para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
		2918
		2919	$self->{scroll_to} = $para;
		2920	$self->update;
		2921	}
		2922
2514	sub clear {	2923	sub clear {
2515	my ($self) = @_;	2924	my ($self) = @_;
		2925
		2926	my (undef, undef, @other) = @{ $self->{children} };
		2927	$self->remove ($_) for @other;
2516		2928
2517	$self->{par} = [];	2929	$self->{par} = [];
2518	$self->{height} = 0;	2930	$self->{height} = 0;
2519	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);	2931	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2520	}	2932	}
2521		2933
2522	sub add_paragraph {	2934	sub add_paragraph {
2523	my ($self, $color, $text, $indent) = @_;	2935	my $self = shift;
2524		2936
2525	for my $line (split /\n/, $text) {	2937	for my $para (@_) {
2526	my ($w, $h) = $self->text_size ($line);	2938	$para = {
		2939	fg => [1, 1, 1, 1],
		2940	indent => 0,
		2941	markup => "",
		2942	widget => [],
		2943	ref $para ? %$para : (markup => $para),
		2944	w => 1e10,
		2945	wrapped => 1,
		2946	};
		2947
		2948	$self->add (@{ $para->{widget} }) if @{ $para->{widget} };
		2949	push @{$self->{par}}, $para;
		2950	}
		2951
		2952	$self->{need_reflow}++;
		2953	$self->update;
		2954	}
		2955
		2956	sub scroll_to_bottom {
		2957	my ($self) = @_;
		2958
		2959	$self->{scroll_to} = $#{$self->{par}};
		2960	$self->update;
		2961	}
		2962
		2963	sub force_uptodate {
		2964	my ($self) = @_;
		2965
		2966	if (delete $self->{need_reflow}) {
		2967	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
		2968
		2969	my $height = 0;
		2970
		2971	for my $para (@{$self->{par}}) {
		2972	if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
		2973	my $layout = $self->get_layout ($para);
		2974	my ($w, $h) = $layout->size;
		2975
		2976	$para->{w} = $w + $para->{indent};
		2977	$para->{h} = $h;
		2978	$para->{wrapped} = $layout->has_wrapped;
		2979	}
		2980
		2981	$para->{y} = $height;
		2982	$height += $para->{h};
		2983	}
		2984
2527	$self->{height} += $h;	2985	$self->{height} = $height;
2528	push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];	2986	$self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2529	}
2530		2987
2531	$self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);	2988	delete $self->{texture};
		2989	}
		2990
		2991	if (my $paridx = delete $self->{scroll_to}) {
		2992	$self->{children}[1]->set_value ($self->{par}[$paridx]{y});
		2993	}
2532	}	2994	}
2533		2995
2534	sub update {	2996	sub update {
2535	my ($self) = @_;	2997	my ($self) = @_;
2536		2998
…		…
2538		3000
2539	return unless $self->{h} > 0;	3001	return unless $self->{h} > 0;
2540		3002
2541	delete $self->{texture};	3003	delete $self->{texture};
2542		3004
2543	$ROOT->on_post_alloc ($self, sub {	3005	$ROOT->on_post_alloc ($self => sub {
		3006	$self->force_uptodate;
		3007
2544	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};	3008	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2545		3009
2546	if (delete $self->{need_reflow}) {
2547	my $height = 0;
2548
2549	my $layout = $self->{layout};
2550
2551	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
2552
2553	for (@{$self->{par}}) {
2554	if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2555	$layout->set_width ($W - $_->[3]);
2556	$layout->set_markup ($_->[4]);
2557	my ($w, $h) = $layout->size;
2558	$_->[0] = $w + $_->[3];
2559	$_->[1] = $h;
2560	}
2561
2562	$height += $_->[1];
2563	}
2564
2565	$self->{height} = $height;
2566
2567	$self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2568
2569	delete $self->{texture};
2570	}
2571
2572	$self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {	3010	$self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2573	glClearColor 0, 0, 0, 0;	3011	glClearColor 0, 0, 0, 0;
2574	glClear GL_COLOR_BUFFER_BIT;	3012	glClear GL_COLOR_BUFFER_BIT;
2575		3013
		3014	package CFPlus::UI::Base;
		3015	local ($draw_x, $draw_y, $draw_w, $draw_h) =
		3016	(0, 0, $self->{w}, $self->{h});
		3017
		3018	my $top = int $self->{children}[1]{range}[0];
		3019
		3020	my $paridx = 0;
		3021	my $top_paragraph;
2576	my $top = int $self->{children}[1]{range}[0];	3022	my $top = int $self->{children}[1]{range}[0];
2577		3023
2578	my $y0 = $top;	3024	my $y0 = $top;
2579	my $y1 = $top + $H;	3025	my $y1 = $top + $H;
2580		3026
2581	my $y = 0;
2582
2583	my $layout = $self->{layout};
2584
2585	$layout->set_font ($self->{font}) if $self->{font};
2586
2587	glEnable GL_BLEND;
2588	#TODO# not correct in windows where rgba is forced off
2589	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2590
2591	for my $par (@{$self->{par}}) {	3027	for my $para (@{$self->{par}}) {
2592	my $h = $par->[1];	3028	my $h = $para->{h};
		3029	my $y = $para->{y};
2593		3030
2594	if ($y0 < $y + $h && $y < $y1) {	3031	if ($y0 < $y + $h && $y < $y1) {
2595	$layout->set_foreground (@{ $par->[2] });	3032	my $layout = $self->get_layout ($para);
2596	$layout->set_width ($W - $par->[3]);
2597	$layout->set_markup ($par->[4]);
2598		3033
2599	my ($w, $h, $data, $format, $internalformat) = $layout->render;	3034	$layout->render ($para->{indent}, $y - $y0);
2600		3035
2601	glRasterPos $par->[3], $y - $y0;	3036	if (my @w = @{ $para->{widget} }) {
2602	glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;	3037	my @s = $layout->get_shapes;
		3038
		3039	for (@w) {
		3040	my ($dx, $dy) = splice @s, 0, 2, ();
		3041
		3042	$_->{x} = $dx + $para->{indent};
		3043	$_->{y} = $dy + $y - $y0;
		3044
		3045	$_->draw;
		3046	}
		3047	}
2603	}	3048	}
2604		3049
2605	$y += $h;	3050	$paridx++;
		3051	$top_paragraph ||= $paridx if $y >= $top;
2606	}	3052	}
2607		3053
2608	glDisable GL_BLEND;	3054	$self->{top_paragraph} = $top_paragraph;
2609	};	3055	};
2610	});	3056	});
		3057	}
		3058
		3059	sub reconfigure {
		3060	my ($self) = @_;
		3061
		3062	$self->SUPER::reconfigure;
		3063
		3064	$_->{w} = 1e10 for @{ $self->{par} };
		3065	$self->reflow;
2611	}	3066	}
2612		3067
2613	sub _draw {	3068	sub _draw {
2614	my ($self) = @_;	3069	my ($self) = @_;
2615		3070
…		…
2618	glColor 0, 0, 0, 1;	3073	glColor 0, 0, 0, 1;
2619	$self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});	3074	$self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2620	glDisable GL_TEXTURE_2D;	3075	glDisable GL_TEXTURE_2D;
2621		3076
2622	$self->{children}[1]->draw;	3077	$self->{children}[1]->draw;
2623
2624	}	3078	}
2625		3079
2626	#############################################################################	3080	#############################################################################
2627		3081
2628	package CFClient::UI::Animator;	3082	package CFPlus::UI::Animator;
2629		3083
2630	use CFClient::OpenGL;	3084	use CFPlus::OpenGL;
2631		3085
2632	our @ISA = CFClient::UI::Bin::;	3086	our @ISA = CFPlus::UI::Bin::;
2633		3087
2634	sub moveto {	3088	sub moveto {
2635	my ($self, $x, $y) = @_;	3089	my ($self, $x, $y) = @_;
2636		3090
2637	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];	3091	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
…		…
2665	glPopMatrix;	3119	glPopMatrix;
2666	}	3120	}
2667		3121
2668	#############################################################################	3122	#############################################################################
2669		3123
2670	package CFClient::UI::Flopper;	3124	package CFPlus::UI::Flopper;
2671		3125
2672	our @ISA = CFClient::UI::Button::;	3126	our @ISA = CFPlus::UI::Button::;
2673		3127
2674	sub new {	3128	sub new {
2675	my $class = shift;	3129	my $class = shift;
2676		3130
2677	my $self = $class->SUPER::new (	3131	my $self = $class->SUPER::new (
…		…
2689	$self->{other}->toggle_visibility;	3143	$self->{other}->toggle_visibility;
2690	}	3144	}
2691		3145
2692	#############################################################################	3146	#############################################################################
2693		3147
2694	package CFClient::UI::Tooltip;	3148	package CFPlus::UI::Tooltip;
2695		3149
2696	our @ISA = CFClient::UI::Bin::;	3150	our @ISA = CFPlus::UI::Bin::;
2697		3151
2698	use CFClient::OpenGL;	3152	use CFPlus::OpenGL;
2699		3153
2700	sub new {	3154	sub new {
2701	my $class = shift;	3155	my $class = shift;
2702		3156
2703	$class->SUPER::new (	3157	$class->SUPER::new (
…		…
2706	)	3160	)
2707	}	3161	}
2708		3162
2709	sub set_tooltip_from {	3163	sub set_tooltip_from {
2710	my ($self, $widget) = @_;	3164	my ($self, $widget) = @_;
		3165
		3166	$widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
		3167	if $widget->{tooltip} =~ /^#(.*)$/;
2711		3168
2712	my $tooltip = $widget->{tooltip};	3169	my $tooltip = $widget->{tooltip};
2713		3170
2714	if ($ENV{CFPLUS_DEBUG} & 2) {	3171	if ($ENV{CFPLUS_DEBUG} & 2) {
2715	$tooltip .= "\n\n" . (ref $widget) . "\n"	3172	$tooltip .= "\n\n" . (ref $widget) . "\n"
2716	. "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"	3173	. "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2717	. "req $widget->{req_w} $widget->{req_h}\n"	3174	. "req $widget->{req_w} $widget->{req_h}\n"
2718	. "visible $widget->{visible}";	3175	. "visible $widget->{visible}";
2719	}	3176	}
2720		3177
		3178	$tooltip =~ s/^\n+//;
		3179	$tooltip =~ s/\n+$//;
		3180
2721	$self->add (new CFClient::UI::Label	3181	$self->add (new CFPlus::UI::Label
2722	markup => $tooltip,	3182	markup => $tooltip,
2723	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	3183	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2724	fontsize => 0.8,	3184	fontsize => 0.8,
2725	fg => [0, 0, 0, 1],	3185	style => 1, # FLAG_INVERSE
2726	ellipsise => 0,	3186	ellipsise => 0,
2727	font => ($widget->{tooltip_font} || $::FONT_PROP),	3187	font => ($widget->{tooltip_font} || $::FONT_PROP),
2728	);	3188	);
2729	}	3189	}
2730		3190
…		…
2734	my ($w, $h) = @{$self->child}{qw(req_w req_h)};	3194	my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2735		3195
2736	($w + 4, $h + 4)	3196	($w + 4, $h + 4)
2737	}	3197	}
2738		3198
2739	sub size_allocate {	3199	sub invoke_size_allocate {
2740	my ($self, $w, $h) = @_;	3200	my ($self, $w, $h) = @_;
2741		3201
2742	$self->SUPER::size_allocate ($w - 4, $h - 4);	3202	$self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2743	}	3203	}
2744		3204
2745	sub visibility_change {	3205	sub invoke_visibility_change {
2746	my ($self, $visible) = @_;	3206	my ($self, $visible) = @_;
2747		3207
2748	return unless $visible;	3208	return unless $visible;
2749		3209
2750	$self->{root}->on_post_alloc ("move_$self" => sub {	3210	$self->{root}->on_post_alloc ("move_$self" => sub {
2751	my $widget = $self->{owner}	3211	my $widget = $self->{owner}
2752	or return;	3212	or return;
2753		3213
		3214	if ($widget->{visible}) {
2754	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);	3215	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2755		3216
2756	($x, $y) = $widget->coord2global (-$self->{w}, 0)	3217	($x, $y) = $widget->coord2global (-$self->{w}, 0)
2757	if $x + $self->{w} > $::WIDTH;	3218	if $x + $self->{w} > $self->{root}{w};
2758		3219
2759	$self->move_abs ($x, $y);	3220	$self->move_abs ($x, $y);
		3221	} else {
		3222	$self->hide;
		3223	}
2760	});	3224	});
2761	}	3225	}
2762		3226
2763	sub _draw {	3227	sub _draw {
2764	my ($self) = @_;	3228	my ($self) = @_;
…		…
2788	$self->SUPER::_draw;	3252	$self->SUPER::_draw;
2789	}	3253	}
2790		3254
2791	#############################################################################	3255	#############################################################################
2792		3256
2793	package CFClient::UI::Face;	3257	package CFPlus::UI::Face;
2794		3258
2795	our @ISA = CFClient::UI::Base::;	3259	our @ISA = CFPlus::UI::DrawBG::;
2796		3260
2797	use CFClient::OpenGL;	3261	use CFPlus::OpenGL;
2798		3262
2799	sub new {	3263	sub new {
2800	my $class = shift;	3264	my $class = shift;
2801		3265
2802	my $self = $class->SUPER::new (	3266	my $self = $class->SUPER::new (
…		…
2837	sub _draw {	3301	sub _draw {
2838	my ($self) = @_;	3302	my ($self) = @_;
2839		3303
2840	return unless $::CONN;	3304	return unless $::CONN;
2841		3305
		3306	$self->SUPER::_draw;
		3307
2842	my $face;	3308	my $face;
2843		3309
2844	if ($self->{frame}) {	3310	if ($self->{frame}) {
2845	my $anim = $::CONN->{anim}[$self->{anim}];	3311	my $anim = $::CONN->{anim}[$self->{anim}];
2846		3312
…		…
2857	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	3323	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2858	glDisable GL_TEXTURE_2D;	3324	glDisable GL_TEXTURE_2D;
2859	}	3325	}
2860	}	3326	}
2861		3327
2862	sub DESTROY {	3328	sub destroy {
2863	my ($self) = @_;	3329	my ($self) = @_;
2864		3330
2865	$self->{timer}->cancel	3331	$self->{timer}->cancel
2866	if $self->{timer};	3332	if $self->{timer};
2867		3333
2868	$self->SUPER::DESTROY;	3334	$self->SUPER::destroy;
2869	}	3335	}
2870		3336
2871	#############################################################################	3337	#############################################################################
2872		3338
2873	package CFClient::UI::Buttonbar;	3339	package CFPlus::UI::Buttonbar;
2874		3340
2875	our @ISA = CFClient::UI::HBox::;	3341	our @ISA = CFPlus::UI::HBox::;
2876		3342
2877	# TODO: should actualyl wrap buttons and other goodies.	3343	# TODO: should actually wrap buttons and other goodies.
2878		3344
2879	#############################################################################	3345	#############################################################################
2880		3346
2881	package CFClient::UI::Menu;	3347	package CFPlus::UI::Menu;
2882		3348
2883	our @ISA = CFClient::UI::FancyFrame::;	3349	our @ISA = CFPlus::UI::Toplevel::;
2884		3350
2885	use CFClient::OpenGL;	3351	use CFPlus::OpenGL;
2886		3352
2887	sub new {	3353	sub new {
2888	my $class = shift;	3354	my $class = shift;
2889		3355
2890	my $self = $class->SUPER::new (	3356	my $self = $class->SUPER::new (
2891	items => [],	3357	items => [],
2892	z => 100,	3358	z => 100,
2893	@_,	3359	@_,
2894	);	3360	);
2895		3361
2896	$self->add ($self->{vbox} = new CFClient::UI::VBox);	3362	$self->add ($self->{vbox} = new CFPlus::UI::VBox);
2897		3363
2898	for my $item (@{ $self->{items} }) {	3364	for my $item (@{ $self->{items} }) {
2899	my ($widget, $cb) = @$item;	3365	my ($widget, $cb, $tooltip) = @$item;
2900		3366
2901	# handle various types of items, only text for now	3367	# handle various types of items, only text for now
2902	if (!ref $widget) {	3368	if (!ref $widget) {
		3369	if ($widget =~ /\t/) {
		3370	my ($left, $right) = split /\t/, $widget, 2;
		3371
2903	$widget = new CFClient::UI::Label	3372	$widget = new CFPlus::UI::HBox
2904	can_hover => 1,	3373	can_hover => 1,
2905	can_events => 1,	3374	can_events => 1,
		3375	tooltip => $tooltip,
		3376	children => [
		3377	(new CFPlus::UI::Label markup => $left, expand => 1),
		3378	(new CFPlus::UI::Label markup => $right, align => +1),
		3379	],
		3380	;
		3381
		3382	} else {
		3383	$widget = new CFPlus::UI::Label
		3384	can_hover => 1,
		3385	can_events => 1,
2906	text => $widget;	3386	markup => $widget,
		3387	tooltip => $tooltip;
		3388	}
2907	}	3389	}
2908		3390
2909	$self->{item}{$widget} = $item;	3391	$self->{item}{$widget} = $item;
2910		3392
2911	$self->{vbox}->add ($widget);	3393	$self->{vbox}->add ($widget);
…		…
2916		3398
2917	# popup given the event (must be a mouse button down event currently)	3399	# popup given the event (must be a mouse button down event currently)
2918	sub popup {	3400	sub popup {
2919	my ($self, $ev) = @_;	3401	my ($self, $ev) = @_;
2920		3402
2921	$self->_emit ("popdown");	3403	$self->emit ("popdown");
2922		3404
2923	# maybe save $GRAB? must be careful about events...	3405	# maybe save $GRAB? must be careful about events...
2924	$GRAB = $self;	3406	$GRAB = $self;
2925	$self->{button} = $ev->{button};	3407	$self->{button} = $ev->{button};
2926		3408
2927	$self->show;	3409	$self->show;
2928	$self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);	3410	$self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2929	}	3411	}
2930		3412
2931	sub mouse_motion {	3413	sub invoke_mouse_motion {
2932	my ($self, $ev, $x, $y) = @_;	3414	my ($self, $ev, $x, $y) = @_;
2933		3415
2934	# TODO: should use vbox->find_widget or so	3416	# TODO: should use vbox->find_widget or so
2935	$HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});	3417	$HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2936	$self->{hover} = $self->{item}{$HOVER};	3418	$self->{hover} = $self->{item}{$HOVER};
2937		3419
2938	0	3420	0
2939	}	3421	}
2940		3422
2941	sub button_up {	3423	sub invoke_button_up {
2942	my ($self, $ev, $x, $y) = @_;	3424	my ($self, $ev, $x, $y) = @_;
2943		3425
2944	if ($ev->{button} == $self->{button}) {	3426	if ($ev->{button} == $self->{button}) {
2945	undef $GRAB;	3427	undef $GRAB;
2946	$self->hide;	3428	$self->hide;
2947		3429
2948	$self->_emit ("popdown");	3430	$self->emit ("popdown");
2949	$self->{hover}[1]->() if $self->{hover};	3431	$self->{hover}[1]->() if $self->{hover};
2950	} else {	3432	} else {
2951	return 0	3433	return 0
2952	}	3434	}
2953		3435
2954	1	3436	1
2955	}	3437	}
2956		3438
2957	#############################################################################	3439	#############################################################################
2958		3440
2959	package CFClient::UI::Multiplexer;	3441	package CFPlus::UI::Multiplexer;
2960		3442
2961	our @ISA = CFClient::UI::Container::;	3443	our @ISA = CFPlus::UI::Container::;
2962		3444
2963	sub new {	3445	sub new {
2964	my $class = shift;	3446	my $class = shift;
2965		3447
2966	my $self = $class->SUPER::new (	3448	my $self = $class->SUPER::new (
…		…
2980		3462
2981	$self->{current} = $self->{children}[0]	3463	$self->{current} = $self->{children}[0]
2982	if @{ $self->{children} };	3464	if @{ $self->{children} };
2983	}	3465	}
2984		3466
		3467	sub get_current_page {
		3468	my ($self) = @_;
		3469
		3470	$self->{current}
		3471	}
		3472
2985	sub set_current_page {	3473	sub set_current_page {
2986	my ($self, $page_or_widget) = @_;	3474	my ($self, $page_or_widget) = @_;
2987		3475
2988	my $widget = ref $page_or_widget	3476	my $widget = ref $page_or_widget
2989	? $page_or_widget	3477	? $page_or_widget
2990	: $self->{children}[$page_or_widget];	3478	: $self->{children}[$page_or_widget];
2991		3479
2992	$self->{current} = $widget;	3480	$self->{current} = $widget;
2993	$self->{current}->configure (0, 0, $self->{w}, $self->{h});	3481	$self->{current}->configure (0, 0, $self->{w}, $self->{h});
2994		3482
2995	$self->_emit (page_changed => $self->{current});	3483	$self->emit (page_changed => $self->{current});
2996		3484
2997	$self->realloc;	3485	$self->realloc;
2998	}	3486	}
2999		3487
3000	sub visible_children {	3488	sub visible_children {
…		…
3005	my ($self) = @_;	3493	my ($self) = @_;
3006		3494
3007	$self->{current}->size_request	3495	$self->{current}->size_request
3008	}	3496	}
3009		3497
3010	sub size_allocate {	3498	sub invoke_size_allocate {
3011	my ($self, $w, $h) = @_;	3499	my ($self, $w, $h) = @_;
3012		3500
3013	$self->{current}->configure (0, 0, $w, $h);	3501	$self->{current}->configure (0, 0, $w, $h);
		3502
		3503	1
3014	}	3504	}
3015		3505
3016	sub _draw {	3506	sub _draw {
3017	my ($self) = @_;	3507	my ($self) = @_;
3018		3508
3019	$self->{current}->draw;	3509	$self->{current}->draw;
3020	}	3510	}
3021		3511
3022	#############################################################################	3512	#############################################################################
3023		3513
3024	package CFClient::UI::Notebook;	3514	package CFPlus::UI::Notebook;
3025		3515
3026	our @ISA = CFClient::UI::VBox::;	3516	our @ISA = CFPlus::UI::VBox::;
3027		3517
3028	sub new {	3518	sub new {
3029	my $class = shift;	3519	my $class = shift;
3030		3520
3031	my $self = $class->SUPER::new (	3521	my $self = $class->SUPER::new (
3032	buttonbar => (new CFClient::UI::Buttonbar),	3522	buttonbar => (new CFPlus::UI::Buttonbar),
3033	multiplexer => (new CFClient::UI::Multiplexer expand => 1),	3523	multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3034	# filter => # will be put between multiplexer and $self	3524	# filter => # will be put between multiplexer and $self
3035	@_,	3525	@_,
3036	);	3526	);
3037		3527
3038	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};	3528	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};
…		…
3044	sub add {	3534	sub add {
3045	my ($self, $title, $widget, $tooltip) = @_;	3535	my ($self, $title, $widget, $tooltip) = @_;
3046		3536
3047	Scalar::Util::weaken $self;	3537	Scalar::Util::weaken $self;
3048		3538
3049	$self->{buttonbar}->add (new CFClient::UI::Button	3539	$self->{buttonbar}->add (new CFPlus::UI::Button
3050	markup => $title,	3540	markup => $title,
3051	tooltip => $tooltip,	3541	tooltip => $tooltip,
3052	on_activate => sub { $self->set_current_page ($widget) },	3542	on_activate => sub { $self->set_current_page ($widget) },
3053	);	3543	);
3054		3544
3055	$self->{multiplexer}->add ($widget);	3545	$self->{multiplexer}->add ($widget);
3056	}	3546	}
3057		3547
		3548	sub get_current_page {
		3549	my ($self) = @_;
		3550
		3551	$self->{multiplexer}->get_current_page
		3552	}
		3553
3058	sub set_current_page {	3554	sub set_current_page {
3059	my ($self, $page) = @_;	3555	my ($self, $page) = @_;
3060		3556
3061	$self->{multiplexer}->set_current_page ($page);	3557	$self->{multiplexer}->set_current_page ($page);
3062	$self->_emit (page_changed => $self->{multiplexer}{current});	3558	$self->emit (page_changed => $self->{multiplexer}{current});
3063	}	3559	}
3064		3560
3065	#############################################################################	3561	#############################################################################
3066		3562
		3563	package CFPlus::UI::Selector;
		3564
		3565	use utf8;
		3566
		3567	our @ISA = CFPlus::UI::Button::;
		3568
		3569	sub new {
		3570	my $class = shift;
		3571
		3572	my $self = $class->SUPER::new (
		3573	options => [], # [value, title, longdesc], ...
		3574	value => undef,
		3575	@_,
		3576	);
		3577
		3578	$self->_set_value ($self->{value});
		3579
		3580	$self
		3581	}
		3582
		3583	sub invoke_button_down {
		3584	my ($self, $ev) = @_;
		3585
		3586	my @menu_items;
		3587
		3588	for (@{ $self->{options} }) {
		3589	my ($value, $title, $tooltip) = @$_;
		3590
		3591	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
		3592	}
		3593
		3594	CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
		3595	}
		3596
		3597	sub _set_value {
		3598	my ($self, $value) = @_;
		3599
		3600	my ($item) = grep $_->[0] eq $value, @{ $self->{options} }
		3601	or return;
		3602
		3603	$self->{value} = $item->[0];
		3604	$self->set_markup ("$item->[1] ⇓");
		3605	$self->set_tooltip ($item->[2]);
		3606	}
		3607
		3608	sub set_value {
		3609	my ($self, $value) = @_;
		3610
		3611	return unless $self->{value} ne $value;
		3612
		3613	$self->_set_value ($value);
		3614	$self->emit (changed => $value);
		3615	}
		3616
		3617	#############################################################################
		3618
3067	package CFClient::UI::Statusbox;	3619	package CFPlus::UI::Statusbox;
3068		3620
3069	our @ISA = CFClient::UI::VBox::;	3621	our @ISA = CFPlus::UI::VBox::;
3070		3622
3071	sub new {	3623	sub new {
3072	my $class = shift;	3624	my $class = shift;
3073		3625
3074	my $self = $class->SUPER::new (	3626	my $self = $class->SUPER::new (
…		…
3076	@_,	3628	@_,
3077	);	3629	);
3078		3630
3079	Scalar::Util::weaken (my $this = $self);	3631	Scalar::Util::weaken (my $this = $self);
3080		3632
3081	$self->{timer} = Event->timer (after => 1, interval => 1, cb => sub {	3633	$self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3082	$this->reorder;
3083	$this->update;
3084	});
3085		3634
3086	$self	3635	$self
3087	}	3636	}
3088		3637
3089	sub reorder {	3638	sub reorder {
3090	my ($self) = @_;	3639	my ($self) = @_;
3091	my $NOW = Time::HiRes::time;	3640	my $NOW = Time::HiRes::time;
		3641
		3642	# freeze display when hovering over any label
		3643	return if $CFPlus::UI::TOOLTIP->{owner}
		3644	&& grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
		3645	values %{ $self->{item} };
3092		3646
3093	while (my ($k, $v) = each %{ $self->{item} }) {	3647	while (my ($k, $v) = each %{ $self->{item} }) {
3094	delete $self->{item}{$k} if $v->{timeout} < $NOW;	3648	delete $self->{item}{$k} if $v->{timeout} < $NOW;
3095	}	3649	}
3096		3650
…		…
3105		3659
3106	my $count = 10 + 1;	3660	my $count = 10 + 1;
3107	for my $item (@items) {	3661	for my $item (@items) {
3108	last unless --$count;	3662	last unless --$count;
3109		3663
3110	push @widgets, $item->{label} ||= do {	3664	my $label = $item->{label} ||= do {
3111	# TODO: doesn't handle markup well (read as: at all)	3665	# TODO: doesn't handle markup well (read as: at all)
3112	my $short = $item->{count} > 1	3666	my $short = $item->{count} > 1
3113	? "<b>$item->{count} ×</b> $item->{text}"	3667	? "<b>$item->{count} ×</b> $item->{text}"
3114	: $item->{text};	3668	: $item->{text};
3115		3669
3116	for ($short) {	3670	for ($short) {
3117	s/^\s+//;	3671	s/^\s+//;
3118	s/\s+/ /g;	3672	s/\s+/ /g;
3119	}	3673	}
3120		3674
3121	new CFClient::UI::Label	3675	new CFPlus::UI::Label
3122	markup => $short,	3676	markup => $short,
3123	tooltip => $item->{tooltip},	3677	tooltip => $item->{tooltip},
3124	tooltip_font => $::FONT_PROP,	3678	tooltip_font => $::FONT_PROP,
3125	tooltip_width => 0.67,	3679	tooltip_width => 0.67,
3126	fontsize => $item->{fontsize} || $self->{fontsize},	3680	fontsize => $item->{fontsize} || $self->{fontsize},
3127	max_w => $::WIDTH * 0.44,	3681	max_w => $::WIDTH * 0.44,
3128	fg => $item->{fg},	3682	fg => [@{ $item->{fg} }],
3129	orig_alpha => $item->{fg}[3] || 1,
3130	can_events => 1,	3683	can_events => 1,
3131	can_hover => 1	3684	can_hover => 1
3132	};	3685	};
3133		3686
3134	if ((my $diff = $item->{timeout} - $NOW) < 2) {	3687	if ((my $diff = $item->{timeout} - $NOW) < 2) {
3135	$item->{label}{fg}[3] = $item->{label}{orig_alpha} * $diff / 2;	3688	$label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3136	if ($diff < 1) {
3137	$item->{label}{max_h} = $item->{label}{req_h} * $diff;
3138	$item->{label}->realloc;
3139	}
3140	$item->{label}->update;	3689	$label->update;
		3690	$label->set_max_size (undef, $label->{req_h} * $diff)
		3691	if $diff < 1;
3141	$self->{timer}->interval (1/30);	3692	$self->{timer}->interval (1/30);
		3693	} else {
		3694	$label->{fg}[3] = $item->{fg}[3] || 1;
3142	}	3695	}
		3696
		3697	push @widgets, $label;
3143	}	3698	}
3144		3699
3145	$self->clear;	3700	$self->clear;
3146	$self->SUPER::add (reverse @widgets);	3701	$self->SUPER::add (reverse @widgets);
3147	}	3702	}
…		…
3163	$item->{count}++;	3718	$item->{count}++;
3164	} else {	3719	} else {
3165	$item->{count} = 1;	3720	$item->{count} = 1;
3166	$item->{text} = $item->{tooltip} = $text;	3721	$item->{text} = $item->{tooltip} = $text;
3167	}	3722	}
3168	$item->{id} = ++$self->{id};	3723	$item->{id} += 0.2;#d#
3169	$item->{timeout} = $timeout;	3724	$item->{timeout} = $timeout;
3170	delete $item->{label};	3725	delete $item->{label};
3171	} else {	3726	} else {
3172	$self->{item}{$group} = {	3727	$self->{item}{$group} = {
3173	id => ++$self->{id},	3728	id => ++$self->{id},
…		…
3179	count => 1,	3734	count => 1,
3180	%arg,	3735	%arg,
3181	};	3736	};
3182	}	3737	}
3183		3738
		3739	$ROOT->on_refresh (reorder => sub {
3184	$self->reorder;	3740	$self->reorder;
		3741	});
3185	}	3742	}
3186		3743
3187	sub reconfigure {	3744	sub reconfigure {
3188	my ($self) = @_;	3745	my ($self) = @_;
3189		3746
…		…
3192		3749
3193	$self->reorder;	3750	$self->reorder;
3194	$self->SUPER::reconfigure;	3751	$self->SUPER::reconfigure;
3195	}	3752	}
3196		3753
3197	sub DESTROY {	3754	sub destroy {
3198	my ($self) = @_;	3755	my ($self) = @_;
3199		3756
3200	$self->{timer}->cancel;	3757	$self->{timer}->cancel;
3201		3758
3202	$self->SUPER::DESTROY;	3759	$self->SUPER::destroy;
3203	}	3760	}
3204		3761
3205	#############################################################################	3762	#############################################################################
3206		3763
3207	package CFClient::UI::Inventory;
3208
3209	our @ISA = CFClient::UI::ScrolledWindow::;
3210
3211	sub new {
3212	my $class = shift;
3213
3214	my $self = $class->SUPER::new (
3215	child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3216	@_,
3217	);
3218
3219	$self
3220	}
3221
3222	sub set_items {
3223	my ($self, $items) = @_;
3224
3225	$self->{child}->clear;
3226	return unless $items;
3227
3228	my @items = sort {
3229	($a->{type} <=> $b->{type})
3230	or ($a->{name} cmp $b->{name})
3231	} @$items;
3232
3233	$self->{real_items} = \@items;
3234
3235	my $row = 0;
3236	for my $item (@items) {
3237	CFClient::Item::update_widgets $item;
3238
3239	$self->{child}->add (0, $row, $item->{face_widget});
3240	$self->{child}->add (1, $row, $item->{desc_widget});
3241	$self->{child}->add (2, $row, $item->{weight_widget});
3242
3243	$row++;
3244	}
3245	}
3246
3247	#############################################################################
3248
3249	package CFClient::UI::BindEditor;
3250
3251	our @ISA = CFClient::UI::FancyFrame::;
3252
3253	sub new {
3254	my $class = shift;
3255
3256	my $self = $class->SUPER::new (binding => [], commands => [], @_);
3257
3258	$self->add (my $vb = new CFClient::UI::VBox);
3259
3260
3261	$vb->add ($self->{rec_btn} = new CFClient::UI::Button
3262	text => "start recording",
3263	tooltip => "Start/Stops recording of actions."
3264	."All subsequent actions after the recording started will be captured."
3265	."The actions are displayed after the record was stopped."
3266	."To bind the action you have to click on the 'Bind' button",
3267	on_activate => sub {
3268	unless ($self->{recording}) {
3269	$self->start;
3270	} else {
3271	$self->stop;
3272	}
3273	});
3274
3275	$vb->add (new CFClient::UI::Label text => "Actions:");
3276	$vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3277
3278	$vb->add (new CFClient::UI::Label text => "Bound to: ");
3279	$vb->add (my $hb = new CFClient::UI::HBox);
3280	$hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3281	$hb->add (new CFClient::UI::Button
3282	text => "bind",
3283	tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3284	on_activate => sub {
3285	$self->ask_for_bind;
3286	});
3287
3288	$vb->add (my $hb = new CFClient::UI::HBox);
3289	$hb->add (new CFClient::UI::Button
3290	text => "ok",
3291	expand => 1,
3292	tooltip => "This closes the binding editor and saves the binding",
3293	on_activate => sub {
3294	$self->hide;
3295	$self->commit;
3296	});
3297
3298	$hb->add (new CFClient::UI::Button
3299	text => "cancel",
3300	expand => 1,
3301	tooltip => "This closes the binding editor without saving",
3302	on_activate => sub {
3303	$self->hide;
3304	$self->{binding_cancel}->()
3305	if $self->{binding_cancel};
3306	});
3307
3308	$self->update_binding_widgets;
3309
3310	$self
3311	}
3312
3313	sub commit {
3314	my ($self) = @_;
3315	my ($mod, $sym, $cmds) = $self->get_binding;
3316	if ($sym != 0 && @$cmds > 0) {
3317	$::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3318	."'. Don't forget 'Save Config'!");
3319	$self->{binding_change}->($mod, $sym, $cmds)
3320	if $self->{binding_change};
3321	} else {
3322	$::STATUSBOX->add ("No action bound, no key or action specified!");
3323	$self->{binding_cancel}->()
3324	if $self->{binding_cancel};
3325	}
3326	}
3327
3328	sub start {
3329	my ($self) = @_;
3330
3331	$self->{rec_btn}->set_text ("stop recording");
3332	$self->{recording} = 1;
3333	$self->clear_command_list;
3334	$::CONN->start_record if $::CONN;
3335	}
3336
3337	sub stop {
3338	my ($self) = @_;
3339
3340	$self->{rec_btn}->set_text ("start recording");
3341	$self->{recording} = 0;
3342
3343	my $rec;
3344	$rec = $::CONN->stop_record if $::CONN;
3345	return unless ref $rec eq 'ARRAY';
3346	$self->set_command_list ($rec);
3347	}
3348
3349
3350	sub ask_for_bind_and_commit {
3351	my ($self) = @_;
3352	$self->ask_for_bind (1);
3353	}
3354
3355	sub ask_for_bind {
3356	my ($self, $commit) = @_;
3357
3358	CFClient::Binder::open_binding_dialog (sub {
3359	my ($mod, $sym) = @_;
3360	$self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3361	$self->update_binding_widgets;
3362	$self->commit if $commit;
3363	});
3364	}
3365
3366	# $mod and $sym are the modifiers and key symbol
3367	# $cmds is a array ref of strings (the commands)
3368	# $cb is the callback that is executed on OK
3369	# $ccb is the callback that is executed on CANCEL and
3370	# when the binding was unsuccessful on OK
3371	sub set_binding {
3372	my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3373
3374	$self->clear_command_list;
3375	$self->{recording} = 0;
3376	$self->{rec_btn}->set_text ("start recording");
3377
3378	$self->{binding} = [$mod, $sym];
3379	$self->{commands} = $cmds;
3380
3381	$self->{binding_change} = $cb;
3382	$self->{binding_cancel} = $ccb;
3383
3384	$self->update_binding_widgets;
3385	}
3386
3387	# this is a shortcut method that asks for a binding
3388	# and then just binds it.
3389	sub do_quick_binding {
3390	my ($self, $cmds) = @_;
3391	$self->set_binding (undef, undef, $cmds, sub {
3392	$::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3393	});
3394	$self->ask_for_bind (1);
3395	}
3396
3397	sub update_binding_widgets {
3398	my ($self) = @_;
3399	my ($mod, $sym, $cmds) = $self->get_binding;
3400	$self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3401	$self->set_command_list ($cmds);
3402	}
3403
3404	sub get_binding {
3405	my ($self) = @_;
3406	return (
3407	$self->{binding}->[0],
3408	$self->{binding}->[1],
3409	[ grep { defined $_ } @{$self->{commands}} ]
3410	);
3411	}
3412
3413	sub clear_command_list {
3414	my ($self) = @_;
3415	$self->{cmdbox}->clear ();
3416	}
3417
3418	sub set_command_list {
3419	my ($self, $cmds) = @_;
3420
3421	$self->{cmdbox}->clear ();
3422	$self->{commands} = $cmds;
3423
3424	my $idx = 0;
3425
3426	for (@$cmds) {
3427	$self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3428
3429	my $i = $idx;
3430	$hb->add (new CFClient::UI::Label text => $_);
3431	$hb->add (new CFClient::UI::Button
3432	text => "delete",
3433	tooltip => "Deletes the action from the record",
3434	on_activate => sub {
3435	$self->{cmdbox}->remove ($hb);
3436	$cmds->[$i] = undef;
3437	});
3438
3439
3440	$idx++
3441	}
3442	}
3443
3444	#############################################################################
3445
3446	package CFClient::UI::SpellList;
3447
3448	our @ISA = CFClient::UI::Table::;
3449
3450	sub new {
3451	my $class = shift;
3452
3453	my $self = $class->SUPER::new (
3454	binding => [],
3455	commands => [],
3456	@_,
3457	)
3458	}
3459
3460	# XXX: Do sorting? Argl...
3461	sub add_spell {
3462	my ($self, $spell) = @_;
3463	$self->{spells}->{$spell->{name}} = $spell;
3464
3465	$self->add (0, $self->{tbl_idx}, new CFClient::UI::Face
3466	face => $spell->{face},
3467	can_hover => 1,
3468	can_events => 1,
3469	tooltip => $spell->{message});
3470
3471	$self->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3472	text => $spell->{name},
3473	can_hover => 1,
3474	can_events => 1,
3475	tooltip => $spell->{message},
3476	expand => 1);
3477
3478	$self->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3479	text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3480	$spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3481	expand => 1);
3482
3483	$self->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3484	text => "bind to key",
3485	on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3486	}
3487
3488	sub rebuild_spell_list {
3489	my ($self) = @_;
3490	$self->{tbl_idx} = 0;
3491	$self->add_spell ($_) for values %{$self->{spells}};
3492	}
3493
3494	sub remove_spell {
3495	my ($self, $spell) = @_;
3496	delete $self->{spells}->{$spell->{name}};
3497	$self->rebuild_spell_list;
3498	}
3499
3500	#############################################################################
3501
3502	package CFClient::UI::Root;	3764	package CFPlus::UI::Root;
3503		3765
3504	our @ISA = CFClient::UI::Container::;	3766	our @ISA = CFPlus::UI::Container::;
3505		3767
3506	use List::Util qw(min max);	3768	use List::Util qw(min max);
3507		3769
3508	use CFClient::OpenGL;	3770	use CFPlus::OpenGL;
3509		3771
3510	sub new {	3772	sub new {
3511	my $class = shift;	3773	my $class = shift;
3512		3774
3513	my $self = $class->SUPER::new (	3775	my $self = $class->SUPER::new (
…		…
3538	$coord = $max - $size if $coord > $max - $size;	3800	$coord = $max - $size if $coord > $max - $size;
3539		3801
3540	int $coord + 0.5	3802	int $coord + 0.5
3541	}	3803	}
3542		3804
3543	sub size_allocate {	3805	sub invoke_size_allocate {
3544	my ($self, $w, $h) = @_;	3806	my ($self, $w, $h) = @_;
3545		3807
3546	for my $child ($self->children) {	3808	for my $child ($self->children) {
3547	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};	3809	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3548		3810
…		…
3552	$X = _to_pixel $X, $W, $self->{w};	3814	$X = _to_pixel $X, $W, $self->{w};
3553	$Y = _to_pixel $Y, $H, $self->{h};	3815	$Y = _to_pixel $Y, $H, $self->{h};
3554		3816
3555	$child->configure ($X, $Y, $W, $H);	3817	$child->configure ($X, $Y, $W, $H);
3556	}	3818	}
		3819
		3820	1
3557	}	3821	}
3558		3822
3559	sub coord2local {	3823	sub coord2local {
3560	my ($self, $x, $y) = @_;	3824	my ($self, $x, $y) = @_;
3561		3825
…		…
3687	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};	3951	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3688		3952
3689	$w = 0 if $w < 0;	3953	$w = 0 if $w < 0;
3690	$h = 0 if $h < 0;	3954	$h = 0 if $h < 0;
3691		3955
		3956	$w = max $widget->{min_w}, $w;
		3957	$h = max $widget->{min_h}, $h;
		3958
		3959	# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
		3960	# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
		3961
		3962	$w = min $widget->{max_w}, $w if exists $widget->{max_w};
		3963	$h = min $widget->{max_h}, $h if exists $widget->{max_h};
		3964
3692	$w = int $w + 0.5;	3965	$w = int $w + 0.5;
3693	$h = int $h + 0.5;	3966	$h = int $h + 0.5;
3694		3967
3695	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {	3968	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3696	$widget->{old_w} = $widget->{w};	3969	$widget->{old_w} = $widget->{w};
…		…
3719	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;	3992	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3720	glMatrixMode GL_MODELVIEW;	3993	glMatrixMode GL_MODELVIEW;
3721	glLoadIdentity;	3994	glLoadIdentity;
3722		3995
3723	{	3996	{
3724	package CFClient::UI::Base;	3997	package CFPlus::UI::Base;
3725		3998
3726	($draw_x, $draw_y, $draw_w, $draw_h) =	3999	local ($draw_x, $draw_y, $draw_w, $draw_h) =
3727	(0, 0, $self->{w}, $self->{h});	4000	(0, 0, $self->{w}, $self->{h});
3728	}
3729		4001
3730	$self->_draw;	4002	$self->_draw;
		4003	}
3731	}	4004	}
3732		4005
3733	#############################################################################	4006	#############################################################################
3734		4007
3735	package CFClient::UI;	4008	package CFPlus::UI;
3736		4009
3737	$ROOT = new CFClient::UI::Root;	4010	$ROOT = new CFPlus::UI::Root;
3738	$TOOLTIP = new CFClient::UI::Tooltip z => 900;	4011	$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
3739		4012
3740	1	4013	1
3741		4014

Diff Legend

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