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

Diff Legend

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