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

Diff Legend

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