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

Diff Legend

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