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

Diff Legend

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