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.273 by root, Sat Jun 3 02:32:35 2006 UTC vs.
Revision 1.372 by root, Sun Jul 15 22:13:43 2007 UTC

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

Diff Legend

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