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

Diff Legend

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