ViewVC Help

View File | Revision Log | Show Annotations | Download File

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

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.272 by root, Sat Jun 3 01:47:14 2006 UTC vs.
Revision 1.392 by root, Sat Jul 21 13:37:09 2007 UTC

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

Diff Legend

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