ViewVC Help

View File | Revision Log | Show Annotations | Download File

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

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

Diff Legend

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