ViewVC Help

View File | Revision Log | Show Annotations | Download File

/cvs/deliantra/Deliantra-Client/DC/UI.pm

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

Diff Legend

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