ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/DC/UI.pm
(Generate patch)

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.261 by elmex, Tue May 30 14:45:56 2006 UTC vs.
Revision 1.347 by root, Mon Aug 14 03:41:28 2006 UTC

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

Diff Legend

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