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

Diff Legend

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