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

Diff Legend

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