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

Diff Legend

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