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

Diff Legend

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