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

Diff Legend

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