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

Diff Legend

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