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.411 by root, Sun Jul 22 19:34:59 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 map $_+0, @widgets
705} 731}
706 732
707sub children { 733sub children {
708 @{ $_[0]{children} } 734 @{ $_[0]{children} }
709} 735}
… …
720} 746}
721 747
722sub clear { 748sub clear {
723 my ($self) = @_; 749 my ($self) = @_;
724 750
725 my $children = delete $self->{children}; 751 my $children = $self->{children};
726 $self->{children} = []; 752 $self->{children} = [];
727 753
728 for (@$children) { 754 for (@$children) {
729 delete $_->{parent}; 755 delete $_->{parent};
730 $_->hide; 756 $_->hide;
… …
755 $_->draw for @{$self->{children}}; 781 $_->draw for @{$self->{children}};
756} 782}
757 783
758############################################################################# 784#############################################################################
759 785
760package CFClient::UI::Bin; 786package CFPlus::UI::Bin;
761 787
762our @ISA = CFClient::UI::Container::; 788our @ISA = CFPlus::UI::Container::;
763 789
764sub new { 790sub new {
765 my ($class, %arg) = @_; 791 my ($class, %arg) = @_;
766 792
767 my $child = (delete $arg{child}) || new CFClient::UI::Empty::; 793 my $child = (delete $arg{child}) || new CFPlus::UI::Empty::;
768 794
769 $class->SUPER::new (children => [$child], %arg) 795 $class->SUPER::new (children => [$child], %arg)
770} 796}
771 797
772sub add { 798sub add {
… …
779sub remove { 805sub remove {
780 my ($self, $widget) = @_; 806 my ($self, $widget) = @_;
781 807
782 $self->SUPER::remove ($widget); 808 $self->SUPER::remove ($widget);
783 809
784 $self->{children} = [new CFClient::UI::Empty] 810 $self->{children} = [new CFPlus::UI::Empty]
785 unless @{$self->{children}}; 811 unless @{$self->{children}};
786} 812}
787 813
788sub child { $_[0]->{children}[0] } 814sub child { $_[0]->{children}[0] }
789 815
790sub size_request { 816sub size_request {
791 $_[0]{children}[0]->size_request 817 $_[0]{children}[0]->size_request
792} 818}
793 819
794sub size_allocate { 820sub invoke_size_allocate {
795 my ($self, $w, $h) = @_; 821 my ($self, $w, $h) = @_;
796 822
797 $self->{children}[0]->configure (0, 0, $w, $h); 823 $self->{children}[0]->configure (0, 0, $w, $h);
824
825 1
798} 826}
799 827
800############################################################################# 828#############################################################################
801 829
802# back-buffered drawing area 830# back-buffered drawing area
803 831
804package CFClient::UI::Window; 832package CFPlus::UI::Window;
805 833
806our @ISA = CFClient::UI::Bin::; 834our @ISA = CFPlus::UI::Bin::;
807 835
808use CFClient::OpenGL; 836use CFPlus::OpenGL;
809 837
810sub new { 838sub new {
811 my ($class, %arg) = @_; 839 my ($class, %arg) = @_;
812 840
813 my $self = $class->SUPER::new (%arg); 841 my $self = $class->SUPER::new (%arg);
… …
818 846
819 $ROOT->on_post_alloc ($self => sub { $self->render_child }); 847 $ROOT->on_post_alloc ($self => sub { $self->render_child });
820 $self->SUPER::update; 848 $self->SUPER::update;
821} 849}
822 850
823sub size_allocate { 851sub invoke_size_allocate {
824 my ($self, $w, $h) = @_; 852 my ($self, $w, $h) = @_;
825 853
826 $self->SUPER::size_allocate ($w, $h);
827 $self->update; 854 $self->update;
855
856 $self->SUPER::invoke_size_allocate ($w, $h)
828} 857}
829 858
830sub _render { 859sub _render {
831 my ($self) = @_; 860 my ($self) = @_;
832 861
… …
834} 863}
835 864
836sub render_child { 865sub render_child {
837 my ($self) = @_; 866 my ($self) = @_;
838 867
839 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 868 $self->{texture} = new_from_opengl CFPlus::Texture $self->{w}, $self->{h}, sub {
840 glClearColor 0, 0, 0, 0; 869 glClearColor 0, 0, 0, 0;
841 glClear GL_COLOR_BUFFER_BIT; 870 glClear GL_COLOR_BUFFER_BIT;
842 871
843 { 872 {
844 package CFClient::UI::Base; 873 package CFPlus::UI::Base;
845 874
846 ($draw_x, $draw_y, $draw_w, $draw_h) = 875 local ($draw_x, $draw_y, $draw_w, $draw_h) =
847 (0, 0, $self->{w}, $self->{h}); 876 (0, 0, $self->{w}, $self->{h});
877
878 $self->_render;
848 } 879 }
849
850 $self->_render;
851 }; 880 };
852} 881}
853 882
854sub _draw { 883sub _draw {
855 my ($self) = @_; 884 my ($self) = @_;
856
857 my ($w, $h) = @$self{qw(w h)};
858 885
859 my $tex = $self->{texture} 886 my $tex = $self->{texture}
860 or return; 887 or return;
861 888
862 glEnable GL_TEXTURE_2D; 889 glEnable GL_TEXTURE_2D;
863 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 890 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
864 glColor 0, 0, 0, 1; 891 glColor 0, 0, 0, 1;
865 892
866 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 893 $tex->draw_quad_alpha_premultiplied (0, 0);
867 894
868 glDisable GL_TEXTURE_2D; 895 glDisable GL_TEXTURE_2D;
869} 896}
870 897
871############################################################################# 898#############################################################################
872 899
873package CFClient::UI::ViewPort; 900package CFPlus::UI::ViewPort;
874 901
902use List::Util qw(min max);
903
875our @ISA = CFClient::UI::Window::; 904our @ISA = CFPlus::UI::Window::;
876 905
877sub new { 906sub new {
878 my $class = shift; 907 my $class = shift;
879 908
880 $class->SUPER::new ( 909 $class->SUPER::new (
… …
887sub size_request { 916sub size_request {
888 my ($self) = @_; 917 my ($self) = @_;
889 918
890 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 919 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
891 920
892 $w = 10 if $self->{scroll_x}; 921 $w = 1 if $self->{scroll_x};
893 $h = 10 if $self->{scroll_y}; 922 $h = 1 if $self->{scroll_y};
894 923
895 ($w, $h) 924 ($w, $h)
896} 925}
897 926
898sub size_allocate { 927sub invoke_size_allocate {
899 my ($self, $w, $h) = @_; 928 my ($self, $w, $h) = @_;
900 929
901 my $child = $self->child; 930 my $child = $self->child;
902 931
903 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w}; 932 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
904 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h}; 933 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
905 934
906 $self->child->configure (0, 0, $w, $h); 935 $self->child->configure (0, 0, $w, $h);
907 $self->update; 936 $self->update;
937
938 1
908} 939}
909 940
910sub set_offset { 941sub set_offset {
911 my ($self, $x, $y) = @_; 942 my ($self, $x, $y) = @_;
912 943
944 my $x = max 0, min $self->child->{w} - $self->{w}, int $x;
945 my $y = max 0, min $self->child->{h} - $self->{h}, int $y;
946
947 if ($x != $self->{view_x} or $y != $self->{view_y}) {
913 $self->{view_x} = int $x; 948 $self->{view_x} = $x;
914 $self->{view_y} = int $y; 949 $self->{view_y} = $y;
915 950
951 $self->emit (changed => $x, $y);
916 $self->update; 952 $self->update;
953 }
917} 954}
918 955
919# hmm, this does not work for topleft of $self... but we should not ask for that 956# hmm, this does not work for topleft of $self... but we should not ask for that
920sub coord2local { 957sub coord2local {
921 my ($self, $x, $y) = @_; 958 my ($self, $x, $y) = @_;
… …
936 my ($self, $x, $y) = @_; 973 my ($self, $x, $y) = @_;
937 974
938 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w} 975 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
939 && $y >= $self->{y} && $y < $self->{y} + $self->{h} 976 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
940 ) { 977 ) {
941 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y}) 978 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
942 } else { 979 } else {
943 $self->CFClient::UI::Base::find_widget ($x, $y) 980 $self->CFPlus::UI::Base::find_widget ($x, $y)
944 } 981 }
945} 982}
946 983
947sub _render { 984sub _render {
948 my ($self) = @_; 985 my ($self) = @_;
949 986
950 local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x}; 987 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}; 988 local $CFPlus::UI::Base::draw_y = $CFPlus::UI::Base::draw_y - $self->{view_y};
952 989
953 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 990 CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
954 991
955 $self->SUPER::_render; 992 $self->SUPER::_render;
956} 993}
957 994
958############################################################################# 995#############################################################################
959 996
960package CFClient::UI::ScrolledWindow; 997package CFPlus::UI::ScrolledWindow;
961 998
962our @ISA = CFClient::UI::HBox::; 999our @ISA = CFPlus::UI::Table::;
963 1000
964sub new { 1001sub new {
965 my ($class, %arg) = @_; 1002 my ($class, %arg) = @_;
966 1003
967 my $child = delete $arg{child}; 1004 my $child = delete $arg{child};
968 1005
969 my $self; 1006 my $self;
970 1007
971 my $slider = new CFClient::UI::Slider 1008 my $hslider = new CFPlus::UI::Slider
1009 col => 0,
1010 row => 1,
1011 vertical => 0,
1012 range => [0, 0, 1, 0.01], # HACK fix
1013 on_changed => sub {
1014 $self->{hpos} = $_[1];
1015 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1016 },
1017 ;
1018
1019 my $vslider = new CFPlus::UI::Slider
1020 col => 1,
1021 row => 0,
972 vertical => 1, 1022 vertical => 1,
973 range => [0, 0, 1, 0.01], # HACK fix 1023 range => [0, 0, 1, 0.01], # HACK fix
974 on_changed => sub { 1024 on_changed => sub {
975 $self->{vp}->set_offset (0, $_[1]); 1025 $self->{vpos} = $_[1];
1026 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
976 }, 1027 },
977 ; 1028 ;
978 1029
979 $self = $class->SUPER::new ( 1030 $self = $class->SUPER::new (
980 vp => (new CFClient::UI::ViewPort expand => 1), 1031 scroll_x => 0,
1032 scroll_y => 1,
1033 can_events => 1,
981 slider => $slider, 1034 hslider => $hslider,
1035 vslider => $vslider,
1036 col_expand => [1, 0],
1037 row_expand => [1, 0],
982 %arg, 1038 %arg,
983 ); 1039 );
984 1040
1041 $self->{vp} = new CFPlus::UI::ViewPort
1042 col => 0,
1043 row => 0,
1044 expand => 1,
1045 scroll_x => $self->{scroll_x},
1046 scroll_y => $self->{scroll_y},
1047 on_changed => sub {
1048 my ($vp, $x, $y) = @_;
1049
1050 $vp->{parent}{hslider}->set_value ($x);
1051 $vp->{parent}{vslider}->set_value ($y);
1052
1053 0
1054 },
1055 on_size_allocate => sub {
1056 my ($vp, $w, $h) = @_;
1057 $vp->{parent}->update_slider;
1058 0
1059 },
1060 ;
1061
985 $self->SUPER::add ($self->{vp}, $self->{slider}); 1062 $self->SUPER::add ($self->{vp});
1063
986 $self->add ($child) if $child; 1064 $self->add ($child) if $child;
987 1065
988 $self 1066 $self
989} 1067}
990 1068
… …
992 my ($self, $widget) = @_; 1070 my ($self, $widget) = @_;
993 1071
994 $self->{vp}->add ($self->{child} = $widget); 1072 $self->{vp}->add ($self->{child} = $widget);
995} 1073}
996 1074
997sub update { 1075sub update_slider {
1076 my ($self) = @_;
1077
1078 my $child = ($self->{vp} or return)->child;
1079
1080 if ($self->{scroll_x}) {
1081 my ($w1, $w2) = ($child->{req_w}, $self->{vp}{w});
1082 $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
1083
1084 my $visible = $w1 > $w2;
1085 if ($visible != $self->{hslider_visible}) {
1086 $self->{hslider_visible} = $visible;
1087 $visible ? $self->SUPER::add ($self->{hslider})
1088 : $self->SUPER::remove ($self->{hslider});
1089 }
1090 }
1091
1092 if ($self->{scroll_y}) {
1093 my ($h1, $h2) = ($child->{req_h}, $self->{vp}{h});
1094 $self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
1095
1096 my $visible = $h1 > $h2;
1097 if ($visible != $self->{vslider_visible}) {
1098 $self->{vslider_visible} = $visible;
1099 $visible ? $self->SUPER::add ($self->{vslider})
1100 : $self->SUPER::remove ($self->{vslider});
1101 }
1102 }
1103}
1104
1105sub start_dragging {
998 my ($self) = @_; 1106 my ($self, $ev) = @_;
999 1107
1000 $self->SUPER::update; 1108 $self->grab_focus;
1001 1109
1002 # todo: overwrite size_allocate of child 1110 my $ox = $self->{vp}{view_x};
1003 my $child = $self->{vp}->child; 1111 my $oy = $self->{vp}{view_y};
1004 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]); 1112
1005} 1113 $self->{motion} = sub {
1114 my ($ev, $x, $y) = @_;
1006 1115
1116 $ox -= $ev->{xrel};
1117 $oy -= $ev->{yrel};
1118
1119 $self->{vp}->set_offset ($ox, $oy);
1120 };
1121}
1122
1123sub invoke_mouse_wheel {
1124 my ($self, $ev) = @_;
1125
1126 $self->{vslider}->emit (mouse_wheel => $ev) if $self->{vslider_visible};
1127 $self->{hslider}->emit (mouse_wheel => $ev) if $self->{hslider_visible};
1128
1129 1
1130}
1131
1132sub invoke_button_down {
1133 my ($self, $ev, $x, $y) = @_;
1134
1135 if ($ev->{button} == 2) {
1136 $self->start_dragging ($ev);
1137 return 1;
1138 }
1139
1140 0
1141}
1142
1143sub invoke_button_up {
1144 my ($self, $ev, $x, $y) = @_;
1145
1146 if (delete $self->{motion}) {
1147 return 1;
1148 }
1149
1150 0
1151}
1152
1153sub invoke_mouse_motion {
1154 my ($self, $ev, $x, $y) = @_;
1155
1156 if ($self->{motion}) {
1157 $self->{motion}->($ev, $x, $y);
1158 return 1;
1159 }
1160
1161 0
1162}
1163
1007sub size_allocate { 1164sub invoke_size_allocate {
1008 my ($self, $w, $h) = @_; 1165 my ($self, $w, $h) = @_;
1009 1166
1167 $self->update_slider;
1010 $self->SUPER::size_allocate ($w, $h); 1168 $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} 1169}
1015
1016#TODO# update range on size_allocate depending on child
1017# update viewport offset on scroll
1018 1170
1019############################################################################# 1171#############################################################################
1020 1172
1021package CFClient::UI::Frame; 1173package CFPlus::UI::Frame;
1022 1174
1023our @ISA = CFClient::UI::Bin::; 1175our @ISA = CFPlus::UI::Bin::;
1024 1176
1025use CFClient::OpenGL; 1177use CFPlus::OpenGL;
1026 1178
1027sub new { 1179sub new {
1028 my $class = shift; 1180 my $class = shift;
1029 1181
1030 $class->SUPER::new ( 1182 $class->SUPER::new (
… …
1056 $self->SUPER::_draw; 1208 $self->SUPER::_draw;
1057} 1209}
1058 1210
1059############################################################################# 1211#############################################################################
1060 1212
1061package CFClient::UI::FancyFrame; 1213package CFPlus::UI::FancyFrame;
1062 1214
1063our @ISA = CFClient::UI::Bin::; 1215our @ISA = CFPlus::UI::Bin::;
1064 1216
1065use CFClient::OpenGL; 1217use CFPlus::OpenGL;
1218
1219sub new {
1220 my ($class, %arg) = @_;
1221
1222 if ((exists $arg{label}) && !ref $arg{label}) {
1223 $arg{label} = new CFPlus::UI::Label
1224 align => 1,
1225 valign => 0,
1226 text => $arg{label},
1227 fontsize => ($arg{border} || 0.8) * 0.75;
1228 }
1229
1230 my $self = $class->SUPER::new (
1231 # label => "",
1232 fg => [0.6, 0.3, 0.1],
1233 border => 0.8,
1234 style => 'single',
1235 %arg,
1236 );
1237
1238 $self
1239}
1240
1241sub add {
1242 my ($self, @widgets) = @_;
1243
1244 $self->SUPER::add (@widgets);
1245 $self->CFPlus::UI::Container::add ($self->{label}) if $self->{label};
1246}
1247
1248sub border {
1249 int $_[0]{border} * $::FONTSIZE
1250}
1251
1252sub size_request {
1253 my ($self) = @_;
1254
1255 ($self->{label_w}, undef) = $self->{label}->size_request
1256 if $self->{label};
1257
1258 my ($w, $h) = $self->SUPER::size_request;
1259
1260 (
1261 $w + $self->border * 2,
1262 $h + $self->border * 2,
1263 )
1264}
1265
1266sub invoke_size_allocate {
1267 my ($self, $w, $h) = @_;
1268
1269 my $border = $self->border;
1270
1271 $w -= List::Util::max 0, $border * 2;
1272 $h -= List::Util::max 0, $border * 2;
1273
1274 if (my $label = $self->{label}) {
1275 $label->{w} = List::Util::max 0, List::Util::min $self->{label_w}, $w - $border * 2;
1276 $label->{h} = List::Util::min $h, $border;
1277 $label->invoke_size_allocate ($label->{w}, $label->{h});
1278 }
1279
1280 $self->child->configure ($border, $border, $w, $h);
1281
1282 1
1283}
1284
1285sub _draw {
1286 my ($self) = @_;
1287
1288 my $child = $self->{children}[0];
1289
1290 my $border = $self->border;
1291 my ($w, $h) = ($self->{w}, $self->{h});
1292
1293 $child->draw;
1294
1295 glColor @{$self->{fg}};
1296 glBegin GL_LINE_STRIP;
1297 glVertex $border * 1.5 , $border * 0.5 + 0.5;
1298 glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1299 glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1300 glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1301 glVertex $w - $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1302 glVertex $self->{label} ? $border * 2 + $self->{label}{w} : $border * 1.5, $border * 0.5 + 0.5;
1303 glEnd;
1304
1305 if ($self->{label}) {
1306 glTranslate $border * 2, 0;
1307 $self->{label}->_draw;
1308 }
1309}
1310
1311#############################################################################
1312
1313package CFPlus::UI::Toplevel;
1314
1315our @ISA = CFPlus::UI::Bin::;
1316
1317use CFPlus::OpenGL;
1066 1318
1067my $bg = 1319my $bg =
1068 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png", 1320 new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1069 mipmap => 1, wrap => 1; 1321 mipmap => 1, wrap => 1;
1070 1322
1071my @border = 1323my @border =
1072 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1324 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); 1325 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1326
1327my @icon =
1328 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1329 qw(x1_move.png x1_resize.png);
1074 1330
1075sub new { 1331sub new {
1076 my ($class, %arg) = @_; 1332 my ($class, %arg) = @_;
1077 1333
1078 my $self = $class->SUPER::new ( 1334 my $self = $class->SUPER::new (
1079 bg => [1, 1, 1, 1], 1335 bg => [1, 1, 1, 1],
1080 border_bg => [1, 1, 1, 1], 1336 border_bg => [1, 1, 1, 1],
1081 border => 0.6, 1337 border => 0.6,
1082 can_events => 1, 1338 can_events => 1,
1083 min_w => 16, 1339 min_w => 64,
1084 min_h => 16, 1340 min_h => 32,
1085 %arg, 1341 %arg,
1086 ); 1342 );
1087 1343
1088 $self->{title_widget} = new CFClient::UI::Label 1344 $self->{title_widget} = new CFPlus::UI::Label
1089 align => 0, 1345 align => 0,
1090 valign => 1, 1346 valign => 1,
1091 text => $self->{title}, 1347 text => $self->{title},
1092 fontsize => $self->{border}, 1348 fontsize => $self->{border},
1093 if exists $self->{title}; 1349 if exists $self->{title};
1094 1350
1351 if ($self->{has_close_button}) {
1352 $self->{close_button} =
1353 new CFPlus::UI::ImageButton
1354 path => 'x1_close.png',
1355 on_activate => sub { $self->emit ("delete") };
1356
1357 $self->CFPlus::UI::Container::add ($self->{close_button});
1358 }
1359
1095 $self 1360 $self
1096} 1361}
1097 1362
1098sub add { 1363sub add {
1099 my ($self, @widgets) = @_; 1364 my ($self, @widgets) = @_;
1100 1365
1101 $self->SUPER::add (@widgets); 1366 $self->SUPER::add (@widgets);
1367 $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}; 1368 $self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1103} 1369}
1104 1370
1105sub border { 1371sub border {
1106 int $_[0]{border} * $::FONTSIZE 1372 int $_[0]{border} * $::FONTSIZE
1107} 1373}
… …
1109sub size_request { 1375sub size_request {
1110 my ($self) = @_; 1376 my ($self) = @_;
1111 1377
1112 $self->{title_widget}->size_request 1378 $self->{title_widget}->size_request
1113 if $self->{title_widget}; 1379 if $self->{title_widget};
1380
1381 $self->{close_button}->size_request
1382 if $self->{close_button};
1114 1383
1115 my ($w, $h) = $self->SUPER::size_request; 1384 my ($w, $h) = $self->SUPER::size_request;
1116 1385
1117 ( 1386 (
1118 $w + $self->border * 2, 1387 $w + $self->border * 2,
1119 $h + $self->border * 2, 1388 $h + $self->border * 2,
1120 ) 1389 )
1121} 1390}
1122 1391
1123sub size_allocate { 1392sub invoke_size_allocate {
1124 my ($self, $w, $h) = @_; 1393 my ($self, $w, $h) = @_;
1125 1394
1126 if ($self->{title_widget}) { 1395 if ($self->{title_widget}) {
1127 $self->{title_widget}{w} = $w; 1396 $self->{title_widget}{w} = $w;
1128 $self->{title_widget}{h} = $h; 1397 $self->{title_widget}{h} = $h;
1129 $self->{title_widget}->size_allocate ($w, $h); 1398 $self->{title_widget}->invoke_size_allocate ($w, $h);
1130 } 1399 }
1131 1400
1132 my $border = $self->border; 1401 my $border = $self->border;
1133 1402
1134 $h -= List::Util::max 0, $border * 2; 1403 $h -= List::Util::max 0, $border * 2;
1135 $w -= List::Util::max 0, $border * 2; 1404 $w -= List::Util::max 0, $border * 2;
1405
1406 $self->child->configure ($border, $border, $w, $h);
1407
1408 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1409 if $self->{close_button};
1410
1411 1
1412}
1413
1414sub invoke_delete {
1415 my ($self) = @_;
1416
1417 $self->hide;
1136 1418
1137 $self->child->configure ($border, $border, $w, $h); 1419 1
1138} 1420}
1139 1421
1140sub button_down { 1422sub invoke_button_down {
1141 my ($self, $ev, $x, $y) = @_; 1423 my ($self, $ev, $x, $y) = @_;
1142 1424
1143 my ($w, $h) = @$self{qw(w h)}; 1425 my ($w, $h) = @$self{qw(w h)};
1144 my $border = $self->border; 1426 my $border = $self->border;
1145 1427
… …
1176 1458
1177 ($x, $y) = ($ev->{x}, $ev->{y}); 1459 ($x, $y) = ($ev->{x}, $ev->{y});
1178 1460
1179 $self->move_abs ($bx + $x - $ox, $by + $y - $oy); 1461 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1180 # HACK: the next line is required to enforce placement 1462 # HACK: the next line is required to enforce placement
1181 $self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h}); 1463 $self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
1182 }; 1464 };
1183 } else { 1465 } else {
1184 return 0; 1466 return 0;
1185 } 1467 }
1186 1468
1187 1 1469 1
1188} 1470}
1189 1471
1190sub button_up { 1472sub invoke_button_up {
1191 my ($self, $ev, $x, $y) = @_; 1473 my ($self, $ev, $x, $y) = @_;
1192 1474
1193 !!delete $self->{motion} 1475 ! ! delete $self->{motion}
1194} 1476}
1195 1477
1196sub mouse_motion { 1478sub invoke_mouse_motion {
1197 my ($self, $ev, $x, $y) = @_; 1479 my ($self, $ev, $x, $y) = @_;
1198 1480
1199 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1481 $self->{motion}->($ev, $x, $y) if $self->{motion};
1200 1482
1201 !!$self->{motion} 1483 ! ! $self->{motion}
1484}
1485
1486sub invoke_visibility_change {
1487 my ($self, $visible) = @_;
1488
1489 delete $self->{motion} unless $visible;
1490
1491 0
1202} 1492}
1203 1493
1204sub _draw { 1494sub _draw {
1205 my ($self) = @_; 1495 my ($self) = @_;
1206 1496
… …
1213 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1503 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1214 1504
1215 my $border = $self->border; 1505 my $border = $self->border;
1216 1506
1217 glColor @{ $self->{border_bg} }; 1507 glColor @{ $self->{border_bg} };
1218 $border[0]->draw_quad_alpha (0, 0, $w, $border); 1508 $border[0]->draw_quad_alpha ( 0, 0, $w, $border);
1219 $border[1]->draw_quad_alpha (0, $border, $border, $ch); 1509 $border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
1220 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1510 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1221 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border); 1511 $border[3]->draw_quad_alpha ( 0, $h - $border, $w, $border);
1512
1513 # move
1514 my $w2 = ($w - $border) * .5;
1515 my $h2 = ($h - $border) * .5;
1516 $icon[0]->draw_quad_alpha ( 0, $h2, $border, $border);
1517 $icon[0]->draw_quad_alpha ($w - $border, $h2, $border, $border);
1518 $icon[0]->draw_quad_alpha ($w2 , $h - $border, $border, $border);
1519
1520 # resize
1521 $icon[1]->draw_quad_alpha ( 0, 0, $border, $border);
1522 $icon[1]->draw_quad_alpha ($w - $border, 0, $border, $border)
1523 unless $self->{has_close_button};
1524 $icon[1]->draw_quad_alpha ( 0, $h - $border, $border, $border);
1525 $icon[1]->draw_quad_alpha ($w - $border, $h - $border, $border, $border);
1222 1526
1223 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1527 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1224 glColor @{ $self->{bg} }; 1528 glColor @{ $self->{bg} };
1225 1529
1226 # TODO: repeat texture not scale 1530 # TODO: repeat texture not scale
… …
1235 $child->draw; 1539 $child->draw;
1236 1540
1237 if ($self->{title_widget}) { 1541 if ($self->{title_widget}) {
1238 glTranslate 0, $border - $self->{h}; 1542 glTranslate 0, $border - $self->{h};
1239 $self->{title_widget}->_draw; 1543 $self->{title_widget}->_draw;
1544
1545 glTranslate 0, - ($border - $self->{h});
1240 } 1546 }
1547
1548 $self->{close_button}->draw
1549 if $self->{close_button};
1241} 1550}
1242 1551
1243############################################################################# 1552#############################################################################
1244 1553
1245package CFClient::UI::Table; 1554package CFPlus::UI::Table;
1246 1555
1247our @ISA = CFClient::UI::Base::; 1556our @ISA = CFPlus::UI::Container::;
1248 1557
1249use List::Util qw(max sum); 1558use List::Util qw(max sum);
1250 1559
1251use CFClient::OpenGL; 1560use CFPlus::OpenGL;
1252 1561
1253sub new { 1562sub new {
1254 my $class = shift; 1563 my $class = shift;
1255 1564
1256 $class->SUPER::new ( 1565 $class->SUPER::new (
1257 col_expand => [], 1566 col_expand => [],
1567 row_expand => [],
1258 @_, 1568 @_,
1259 ) 1569 )
1260} 1570}
1261 1571
1262sub children {
1263 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1264}
1265
1266sub add { 1572sub add {
1267 my ($self, $x, $y, $child) = @_; 1573 my ($self, @widgets) = @_;
1268 1574
1269 $child->set_parent ($self); 1575 for my $child (@widgets) {
1270 $self->{children}[$y][$x] = $child; 1576 $child->{rowspan} ||= 1;
1577 $child->{colspan} ||= 1;
1578 }
1271 1579
1272 $self->realloc; 1580 $self->SUPER::add (@widgets);
1273} 1581}
1274 1582
1275sub remove { 1583sub add_at {
1584 my $self = shift;
1585
1586 my @widgets;
1587
1588 while (@_) {
1589 my ($col, $row, $child) = splice @_, 0, 3, ();
1590
1591 $child->{row} = $row;
1592 $child->{col} = $col;
1593
1594 push @widgets, $child;
1595 }
1596
1597 $self->add (@widgets);
1598}
1599
1600sub get_wh {
1276 my ($self, $child) = @_; 1601 my ($self) = @_;
1277 1602
1278 # TODO: not yet implemented 1603 my (@w, @h);
1279}
1280
1281# TODO: move to container class maybe? send children a signal on removal?
1282sub clear {
1283 my ($self) = @_;
1284 1604
1285 my @children = $self->children; 1605 my @children = $self->children;
1286 delete $self->{children}; 1606
1607 # first pass, columns
1608 for my $widget (sort { $a->{colspan} <=> $b->{colspan} } @children) {
1609 my ($c, $w, $cs) = @$widget{qw(col req_w colspan)};
1610
1611 my $sw = sum @w[$c .. $c + $cs - 1];
1612
1613 if ($w > $sw) {
1614 $_ += ($w - $sw) / ($sw ? $sw / $_ : $cs) for @w[$c .. $c + $cs - 1];
1615 }
1287 1616 }
1288 for (@children) {
1289 delete $_->{parent};
1290 $_->hide;
1291 }
1292 1617
1293 $self->realloc; 1618 # second pass, rows
1294} 1619 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)}; 1620 my ($r, $h, $rs) = @$widget{qw(row req_h rowspan)};
1309 1621
1310 $w[$x] = max $w[$x], $w; 1622 my $sh = sum @h[$r .. $r + $rs - 1];
1311 $h[$y] = max $h[$y], $h; 1623
1624 if ($h > $sh) {
1625 $_ += ($h - $sh) / ($sh ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1];
1312 } 1626 }
1313 } 1627 }
1314 1628
1315 (\@w, \@h) 1629 (\@w, \@h)
1316} 1630}
… …
1324 (sum @$ws), 1638 (sum @$ws),
1325 (sum @$hs), 1639 (sum @$hs),
1326 ) 1640 )
1327} 1641}
1328 1642
1329sub size_allocate { 1643sub invoke_size_allocate {
1330 my ($self, $w, $h) = @_; 1644 my ($self, $w, $h) = @_;
1331 1645
1332 my ($ws, $hs) = $self->get_wh; 1646 my ($ws, $hs) = $self->get_wh;
1333 1647
1334 my $req_w = (sum @$ws) || 1; 1648 my $req_w = (sum @$ws) || 1;
1335 my $req_h = (sum @$hs) || 1; 1649 my $req_h = (sum @$hs) || 1;
1336 1650
1337 # TODO: nicer code && do row_expand 1651 # now linearly scale the rows/columns to the allocated size
1338 my @col_expand = @{$self->{col_expand}}; 1652 my @col_expand = @{$self->{col_expand}};
1339 @col_expand = (1) x @$ws unless @col_expand; 1653 @col_expand = (1) x @$ws unless @col_expand;
1340 my $col_expand = (sum @col_expand) || 1; 1654 my $col_expand = (sum @col_expand) || 1;
1341 1655
1342 # linearly scale sizes
1343 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1656 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1344 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1345 1657
1346 CFClient::UI::harmonize $ws; 1658 CFPlus::UI::harmonize $ws;
1659
1660 my @row_expand = @{$self->{row_expand}};
1661 @row_expand = (1) x @$ws unless @row_expand;
1662 my $row_expand = (sum @row_expand) || 1;
1663
1664 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
1665
1347 CFClient::UI::harmonize $hs; 1666 CFPlus::UI::harmonize $hs;
1348 1667
1349 my $y; 1668 my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
1669 my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
1350 1670
1351 for my $r (0 .. $#{$self->{children}}) { 1671 for my $widget ($self->children) {
1352 my $row = $self->{children}[$r] 1672 my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(row col req_w req_h rowspan colspan)};
1353 or next;
1354 1673
1355 my $x = 0; 1674 $widget->configure (
1356 my $row_h = $hs->[$r]; 1675 $x[$c], $y[$r],
1676 $x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],
1357 1677 );
1358 for my $c (0 .. $#$row) { 1678 }
1359 my $col_w = $ws->[$c];
1360 1679
1361 if (my $widget = $row->[$c]) { 1680 1
1362 $widget->configure ($x, $y, $col_w, $row_h); 1681}
1363 }
1364 1682
1365 $x += $col_w; 1683#############################################################################
1684
1685package CFPlus::UI::Fixed;
1686
1687use List::Util qw(min max);
1688
1689our @ISA = CFPlus::UI::Container::;
1690
1691sub _scale($$$) {
1692 my ($rel, $val, $max) = @_;
1693
1694 $rel ? $val * $max : $val
1695}
1696
1697sub size_request {
1698 my ($self) = @_;
1699
1700 my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
1701
1702 # determine overall size by querying abs widgets
1703 for my $child ($self->visible_children) {
1704 unless ($child->{c_rel}) {
1705 my $x = $child->{c_x};
1706 my $y = $child->{c_y};
1707
1708 $x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
1709 $y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
1366 } 1710 }
1367
1368 $y += $row_h;
1369 } 1711 }
1370 1712
1371} 1713 my $W = $x2 - $x1;
1714 my $H = $y2 - $y1;
1372 1715
1373sub find_widget { 1716 # now layout remaining widgets
1717 for my $child ($self->visible_children) {
1718 if ($child->{c_rel}) {
1719 my $x = _scale $child->{c_rel}, $child->{c_x}, $W;
1720 my $y = _scale $child->{c_rel}, $child->{c_y}, $H;
1721
1722 $x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
1723 $y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
1724 }
1725 }
1726
1727 my $W = $x2 - $x1;
1728 my $H = $y2 - $y1;
1729
1730 ($W, $H)
1731}
1732
1733sub invoke_size_allocate {
1374 my ($self, $x, $y) = @_; 1734 my ($self, $W, $H) = @_;
1375 1735
1376 $x -= $self->{x}; 1736 for my $child ($self->visible_children) {
1377 $y -= $self->{y}; 1737 my $x = _scale $child->{c_rel}, $child->{c_x}, $W;
1738 my $y = _scale $child->{c_rel}, $child->{c_y}, $H;
1378 1739
1379 my $res; 1740 $x += $child->{c_halign} * $child->{req_w};
1741 $y += $child->{c_valign} * $child->{req_h};
1380 1742
1381 for (grep $_, map @$_, grep $_, @{ $self->{children} }) { 1743 $child->configure ($x, $y, $child->{req_w}, $child->{req_h});
1382 $res = $_->find_widget ($x, $y) 1744 }
1383 and return $res; 1745
1384 } 1746 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} 1747}
1396 1748
1397############################################################################# 1749#############################################################################
1398 1750
1399package CFClient::UI::Box; 1751package CFPlus::UI::Box;
1400 1752
1401our @ISA = CFClient::UI::Container::; 1753our @ISA = CFPlus::UI::Container::;
1402 1754
1403sub size_request { 1755sub size_request {
1404 my ($self) = @_; 1756 my ($self) = @_;
1405 1757
1406 $self->{vertical} 1758 $self->{vertical}
… …
1412 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1764 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1413 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1765 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1414 ) 1766 )
1415} 1767}
1416 1768
1417sub size_allocate { 1769sub invoke_size_allocate {
1418 my ($self, $w, $h) = @_; 1770 my ($self, $w, $h) = @_;
1419 1771
1420 my $space = $self->{vertical} ? $h : $w; 1772 my $space = $self->{vertical} ? $h : $w;
1421 my $children = $self->{children}; 1773 my @children = $self->visible_children;
1422 1774
1423 my @req; 1775 my @req;
1424 1776
1425 if ($self->{homogeneous}) { 1777 if ($self->{homogeneous}) {
1426 @req = ($space / (@$children || 1)) x @$children; 1778 @req = ($space / (@children || 1)) x @children;
1427 } else { 1779 } else {
1428 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children; 1780 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1429 my $req = List::Util::sum @req; 1781 my $req = List::Util::sum @req;
1430 1782
1431 if ($req > $space) { 1783 if ($req > $space) {
1432 # ah well, not enough space 1784 # ah well, not enough space
1433 $_ *= $space / $req for @req; 1785 $_ *= $space / $req for @req;
1434 } else { 1786 } else {
1435 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1; 1787 my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1436 1788
1437 $space = ($space - $req) / $expand; # remaining space to give away 1789 $space = ($space - $req) / $expand; # remaining space to give away
1438 1790
1439 $req[$_] += $space * $children->[$_]{expand} 1791 $req[$_] += $space * $children[$_]{expand}
1440 for 0 .. $#$children; 1792 for 0 .. $#children;
1441 } 1793 }
1442 } 1794 }
1443 1795
1444 CFClient::UI::harmonize \@req; 1796 CFPlus::UI::harmonize \@req;
1445 1797
1446 my $pos = 0; 1798 my $pos = 0;
1447 for (0 .. $#$children) { 1799 for (0 .. $#children) {
1448 my $alloc = $req[$_]; 1800 my $alloc = $req[$_];
1449 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h)); 1801 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1450 1802
1451 $pos += $alloc; 1803 $pos += $alloc;
1452 } 1804 }
1453 1805
1454 1 1806 1
1455} 1807}
1456 1808
1457############################################################################# 1809#############################################################################
1458 1810
1459package CFClient::UI::HBox; 1811package CFPlus::UI::HBox;
1460 1812
1461our @ISA = CFClient::UI::Box::; 1813our @ISA = CFPlus::UI::Box::;
1462 1814
1463sub new { 1815sub new {
1464 my $class = shift; 1816 my $class = shift;
1465 1817
1466 $class->SUPER::new ( 1818 $class->SUPER::new (
… …
1469 ) 1821 )
1470} 1822}
1471 1823
1472############################################################################# 1824#############################################################################
1473 1825
1474package CFClient::UI::VBox; 1826package CFPlus::UI::VBox;
1475 1827
1476our @ISA = CFClient::UI::Box::; 1828our @ISA = CFPlus::UI::Box::;
1477 1829
1478sub new { 1830sub new {
1479 my $class = shift; 1831 my $class = shift;
1480 1832
1481 $class->SUPER::new ( 1833 $class->SUPER::new (
… …
1484 ) 1836 )
1485} 1837}
1486 1838
1487############################################################################# 1839#############################################################################
1488 1840
1489package CFClient::UI::Label; 1841package CFPlus::UI::Label;
1490 1842
1491our @ISA = CFClient::UI::DrawBG::; 1843our @ISA = CFPlus::UI::DrawBG::;
1492 1844
1493use CFClient::OpenGL; 1845use CFPlus::OpenGL;
1494 1846
1495sub new { 1847sub new {
1496 my ($class, %arg) = @_; 1848 my ($class, %arg) = @_;
1497 1849
1498 my $self = $class->SUPER::new ( 1850 my $self = $class->SUPER::new (
… …
1501 #active_bg => none 1853 #active_bg => none
1502 #font => default_font 1854 #font => default_font
1503 #text => initial text 1855 #text => initial text
1504 #markup => initial narkup 1856 #markup => initial narkup
1505 #max_w => maximum pixel width 1857 #max_w => maximum pixel width
1858 #style => 0, # render flags
1506 ellipsise => 3, # end 1859 ellipsise => 3, # end
1507 layout => (new CFClient::Layout), 1860 layout => (new CFPlus::Layout),
1508 fontsize => 1, 1861 fontsize => 1,
1509 align => -1, 1862 align => -1,
1510 valign => -1, 1863 valign => -1,
1511 padding_x => 2, 1864 padding_x => 2,
1512 padding_y => 2, 1865 padding_y => 2,
1513 can_events => 0, 1866 can_events => 0,
1514 %arg 1867 %arg
1515 ); 1868 );
1516 1869
1517 if (exists $self->{template}) { 1870 if (exists $self->{template}) {
1518 my $layout = new CFClient::Layout; 1871 my $layout = new CFPlus::Layout;
1519 $layout->set_text (delete $self->{template}); 1872 $layout->set_text (delete $self->{template});
1520 $self->{template} = $layout; 1873 $self->{template} = $layout;
1521 } 1874 }
1522 1875
1523 if (exists $self->{markup}) { 1876 if (exists $self->{markup}) {
… …
1527 } 1880 }
1528 1881
1529 $self 1882 $self
1530} 1883}
1531 1884
1532sub escape($) {
1533 local $_ = $_[0];
1534
1535 s/&/&amp;/g;
1536 s/>/&gt;/g;
1537 s/</&lt;/g;
1538
1539 $_
1540}
1541
1542sub update { 1885sub update {
1543 my ($self) = @_; 1886 my ($self) = @_;
1544 1887
1545 delete $self->{texture}; 1888 delete $self->{texture};
1546 $self->SUPER::update; 1889 $self->SUPER::update;
… …
1557 my ($self, $text) = @_; 1900 my ($self, $text) = @_;
1558 1901
1559 return if $self->{text} eq "T$text"; 1902 return if $self->{text} eq "T$text";
1560 $self->{text} = "T$text"; 1903 $self->{text} = "T$text";
1561 1904
1562 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1563 $self->{layout}->set_text ($text); 1905 $self->{layout}->set_text ($text);
1564 1906
1565 delete $self->{size_req}; 1907 delete $self->{size_req};
1566 $self->realloc; 1908 $self->realloc;
1567 $self->update; 1909 $self->update;
… …
1573 return if $self->{text} eq "M$markup"; 1915 return if $self->{text} eq "M$markup";
1574 $self->{text} = "M$markup"; 1916 $self->{text} = "M$markup";
1575 1917
1576 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1918 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1577 1919
1578 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1579 $self->{layout}->set_markup ($markup); 1920 $self->{layout}->set_markup ($markup);
1580 1921
1581 delete $self->{size_req}; 1922 delete $self->{size_req};
1582 $self->realloc; 1923 $self->realloc;
1583 $self->update; 1924 $self->update;
… …
1595 1936
1596 my ($w, $h) = $self->{layout}->size; 1937 my ($w, $h) = $self->{layout}->size;
1597 1938
1598 if (exists $self->{template}) { 1939 if (exists $self->{template}) {
1599 $self->{template}->set_font ($self->{font}) if $self->{font}; 1940 $self->{template}->set_font ($self->{font}) if $self->{font};
1941 $self->{template}->set_width ($self->{max_w} || -1);
1600 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1942 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1601 1943
1602 my ($w2, $h2) = $self->{template}->size; 1944 my ($w2, $h2) = $self->{template}->size;
1603 1945
1604 $w = List::Util::max $w, $w2; 1946 $w = List::Util::max $w, $w2;
… …
1609 }; 1951 };
1610 1952
1611 @{ $self->{size_req} } 1953 @{ $self->{size_req} }
1612} 1954}
1613 1955
1956sub baseline_shift {
1957 $_[0]{layout}->descent
1958}
1959
1614sub size_allocate { 1960sub invoke_size_allocate {
1615 my ($self, $w, $h) = @_; 1961 my ($self, $w, $h) = @_;
1616 1962
1617 delete $self->{ox}; 1963 delete $self->{ox};
1618 1964
1619 delete $self->{texture} 1965 delete $self->{texture}
1620 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w}; 1966 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1967
1968 1
1621} 1969}
1622 1970
1623sub set_fontsize { 1971sub set_fontsize {
1624 my ($self, $fontsize) = @_; 1972 my ($self, $fontsize) = @_;
1625 1973
1626 $self->{fontsize} = $fontsize; 1974 $self->{fontsize} = $fontsize;
1975 delete $self->{size_req};
1627 delete $self->{texture}; 1976 delete $self->{texture};
1628 1977
1629 $self->realloc; 1978 $self->realloc;
1630} 1979}
1631 1980
1632sub reconfigure { 1981sub reconfigure {
1633 my ($self) = @_; 1982 my ($self) = @_;
1634 1983
1635 delete $self->{size_req}; 1984 delete $self->{size_req};
1985 delete $self->{texture};
1636 1986
1637 $self->SUPER::reconfigure; 1987 $self->SUPER::reconfigure;
1638} 1988}
1639 1989
1640sub _draw { 1990sub _draw {
1641 my ($self) = @_; 1991 my ($self) = @_;
1642 1992
1643 $self->SUPER::_draw; # draw background, if applicable 1993 $self->SUPER::_draw; # draw background, if applicable
1644 1994
1645 my $tex = $self->{texture} ||= do { 1995 my $size = $self->{texture} ||= do {
1646 $self->{layout}->set_foreground (@{$self->{fg}}); 1996 $self->{layout}->set_foreground (@{$self->{fg}});
1647 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1997 $self->{layout}->set_font ($self->{font}) if $self->{font};
1648 $self->{layout}->set_width ($self->{w}); 1998 $self->{layout}->set_width ($self->{w});
1649 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1999 $self->{layout}->set_ellipsise ($self->{ellipsise});
1650 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 2000 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1651 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2001 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1652 2002
1653 new_from_layout CFClient::Texture $self->{layout} 2003 [$self->{layout}->size]
1654 }; 2004 };
1655 2005
1656 unless (exists $self->{ox}) { 2006 unless (exists $self->{ox}) {
1657 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 2007 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1658 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x} 2008 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1659 : ($self->{w} - $tex->{w}) * 0.5); 2009 : ($self->{w} - $size->[0]) * 0.5);
1660 2010
1661 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 2011 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1662 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 2012 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1663 : ($self->{h} - $tex->{h}) * 0.5); 2013 : ($self->{h} - $size->[1]) * 0.5);
1664 }; 2014 };
1665 2015
1666 glEnable GL_TEXTURE_2D; 2016# unless ($self->{list}) {
1667 2017# $self->{list} = CFPlus::OpenGL::glGenList;
1668 my $w = List::Util::min $self->{w} + 4, $tex->{w}; 2018# CFPlus::OpenGL::glNewList $self->{list};
1669 my $h = List::Util::min $self->{h} + 2, $tex->{h}; 2019# $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1670 2020# 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 } 2021# }
2022#
2023# CFPlus::OpenGL::glCallList $self->{list};
1679 2024
1680 glDisable GL_TEXTURE_2D; 2025 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1681} 2026}
2027
2028#sub destroy {
2029# my ($self) = @_;
2030#
2031# CFPlus::OpenGL::glDeleteList delete $self->{list} if $self->{list};
2032#
2033# $self->SUPER::destroy;
2034#}
1682 2035
1683############################################################################# 2036#############################################################################
1684 2037
1685package CFClient::UI::EntryBase; 2038package CFPlus::UI::EntryBase;
1686 2039
1687our @ISA = CFClient::UI::Label::; 2040our @ISA = CFPlus::UI::Label::;
1688 2041
1689use CFClient::OpenGL; 2042use CFPlus::OpenGL;
1690 2043
1691sub new { 2044sub new {
1692 my $class = shift; 2045 my $class = shift;
1693 2046
1694 $class->SUPER::new ( 2047 $class->SUPER::new (
… …
1698 active_fg => [0, 0, 0], 2051 active_fg => [0, 0, 0],
1699 can_hover => 1, 2052 can_hover => 1,
1700 can_focus => 1, 2053 can_focus => 1,
1701 valign => 0, 2054 valign => 0,
1702 can_events => 1, 2055 can_events => 1,
2056 ellipsise => 0,
1703 #text => ... 2057 #text => ...
1704 #hidden => "*", 2058 #hidden => "*",
1705 @_ 2059 @_
1706 ) 2060 )
1707} 2061}
… …
1718 2072
1719 $text =~ s/./*/g if $self->{hidden}; 2073 $text =~ s/./*/g if $self->{hidden};
1720 $self->{layout}->set_text ("$text "); 2074 $self->{layout}->set_text ("$text ");
1721 delete $self->{size_req}; 2075 delete $self->{size_req};
1722 2076
1723 $self->_emit (changed => $self->{text}); 2077 $self->emit (changed => $self->{text});
1724 2078
1725 $self->realloc; 2079 $self->realloc;
1726 $self->update; 2080 $self->update;
1727} 2081}
1728 2082
… …
1743 my ($w, $h) = $self->SUPER::size_request; 2097 my ($w, $h) = $self->SUPER::size_request;
1744 2098
1745 ($w + 1, $h) # add 1 for cursor 2099 ($w + 1, $h) # add 1 for cursor
1746} 2100}
1747 2101
1748sub key_down { 2102sub invoke_key_down {
1749 my ($self, $ev) = @_; 2103 my ($self, $ev) = @_;
1750 2104
1751 my $mod = $ev->{mod}; 2105 my $mod = $ev->{mod};
1752 my $sym = $ev->{sym}; 2106 my $sym = $ev->{sym};
1753 my $uni = $ev->{unicode}; 2107 my $uni = $ev->{unicode};
1754 2108
1755 my $text = $self->get_text; 2109 my $text = $self->get_text;
2110
2111 $self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
1756 2112
1757 if ($uni == 8) { 2113 if ($uni == 8) {
1758 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 2114 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1759 } elsif ($uni == 127) { 2115 } elsif ($uni == 127) {
1760 substr $text, $self->{cursor}, 1, ""; 2116 substr $text, $self->{cursor}, 1, "";
1761 } elsif ($sym == CFClient::SDLK_LEFT) { 2117 } elsif ($sym == CFPlus::SDLK_LEFT) {
1762 --$self->{cursor} if $self->{cursor}; 2118 --$self->{cursor} if $self->{cursor};
1763 } elsif ($sym == CFClient::SDLK_RIGHT) { 2119 } elsif ($sym == CFPlus::SDLK_RIGHT) {
1764 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 2120 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1765 } elsif ($sym == CFClient::SDLK_HOME) { 2121 } elsif ($sym == CFPlus::SDLK_HOME) {
2122 # what a hack
2123 $self->{cursor} =
2124 (substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
2125 ? length $1
2126 : 0;
2127 } elsif ($sym == CFPlus::SDLK_END) {
2128 # uh, again
2129 $self->{cursor} =
2130 (substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
2131 ? $self->{cursor} + length $1
2132 : length $self->{text};
2133 } elsif ($uni == 21) { # ctrl-u
2134 $text = "";
1766 $self->{cursor} = 0; 2135 $self->{cursor} = 0;
1767 } elsif ($sym == CFClient::SDLK_END) {
1768 $self->{cursor} = length $text;
1769 } elsif ($uni == 27) { 2136 } elsif ($uni == 27) {
1770 $self->_emit ('escape'); 2137 $self->emit ('escape');
1771 } elsif ($uni) { 2138 } elsif ($uni == 0x0d) {
2139 substr $text, $self->{cursor}++, 0, "\012";
2140 } elsif ($uni >= 0x20) {
1772 substr $text, $self->{cursor}++, 0, chr $uni; 2141 substr $text, $self->{cursor}++, 0, chr $uni;
1773 } else { 2142 } else {
1774 return 0; 2143 return 0;
1775 } 2144 }
1776 2145
1777 $self->_set_text ($text); 2146 $self->_set_text ($text);
1778 2147
1779 $self->realloc; 2148 $self->realloc;
2149 $self->update;
1780 2150
1781 1 2151 1
1782} 2152}
1783 2153
1784sub focus_in { 2154sub invoke_focus_in {
1785 my ($self) = @_; 2155 my ($self) = @_;
1786 2156
1787 $self->{last_activity} = $::NOW; 2157 $self->{last_activity} = $::NOW;
1788 2158
1789 $self->SUPER::focus_in; 2159 $self->SUPER::invoke_focus_in
1790} 2160}
1791 2161
1792sub button_down { 2162sub invoke_button_down {
1793 my ($self, $ev, $x, $y) = @_; 2163 my ($self, $ev, $x, $y) = @_;
1794 2164
1795 $self->SUPER::button_down ($ev, $x, $y); 2165 $self->SUPER::invoke_button_down ($ev, $x, $y);
1796 2166
1797 my $idx = $self->{layout}->xy_to_index ($x, $y); 2167 my $idx = $self->{layout}->xy_to_index ($x, $y);
1798 2168
1799 # byte-index to char-index 2169 # byte-index to char-index
1800 my $text = $self->{text}; 2170 my $text = $self->{text};
1801 utf8::encode $text; 2171 utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1802 $self->{cursor} = length substr $text, 0, $idx; 2172 $self->{cursor} = length $text;
1803 2173
1804 $self->_set_text ($self->{text}); 2174 $self->_set_text ($self->{text});
1805 $self->update; 2175 $self->update;
1806 2176
1807 1 2177 1
1808} 2178}
1809 2179
1810sub mouse_motion { 2180sub invoke_mouse_motion {
1811 my ($self, $ev, $x, $y) = @_; 2181 my ($self, $ev, $x, $y) = @_;
1812# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 2182# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1813 2183
1814 0 2184 1
1815} 2185}
1816 2186
1817sub _draw { 2187sub _draw {
1818 my ($self) = @_; 2188 my ($self) = @_;
1819 2189
… …
1846 utf8::encode $text; 2216 utf8::encode $text;
1847 2217
1848 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text) 2218 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1849 } 2219 }
1850 2220
1851 glColor @{$self->{fg}};
1852 glBegin GL_LINES; 2221 glBegin GL_LINES;
1853 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy}; 2222 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}; 2223 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1855 glEnd; 2224 glEnd;
1856 } 2225 }
1857} 2226}
1858 2227
2228#############################################################################
2229
1859package CFClient::UI::Entry; 2230package CFPlus::UI::Entry;
1860 2231
1861our @ISA = CFClient::UI::EntryBase::; 2232our @ISA = CFPlus::UI::EntryBase::;
1862 2233
1863use CFClient::OpenGL; 2234use CFPlus::OpenGL;
1864 2235
1865sub key_down { 2236sub invoke_key_down {
1866 my ($self, $ev) = @_; 2237 my ($self, $ev) = @_;
1867 2238
1868 my $sym = $ev->{sym}; 2239 my $sym = $ev->{sym};
1869 2240
1870 if ($sym == 13) { 2241 if ($ev->{uni} == 0x0d || $sym == 13) {
1871 unshift @{$self->{history}}, 2242 unshift @{$self->{history}},
1872 my $txt = $self->get_text; 2243 my $txt = $self->get_text;
2244
1873 $self->{history_pointer} = -1; 2245 $self->{history_pointer} = -1;
1874 $self->{history_saveback} = ''; 2246 $self->{history_saveback} = '';
1875 $self->_emit (activate => $txt); 2247 $self->emit (activate => $txt);
1876 $self->update; 2248 $self->update;
1877 2249
1878 } elsif ($sym == CFClient::SDLK_UP) { 2250 } elsif ($sym == CFPlus::SDLK_UP) {
1879 if ($self->{history_pointer} < 0) { 2251 if ($self->{history_pointer} < 0) {
1880 $self->{history_saveback} = $self->get_text; 2252 $self->{history_saveback} = $self->get_text;
1881 } 2253 }
1882 if (@{$self->{history} || []} > 0) { 2254 if (@{$self->{history} || []} > 0) {
1883 $self->{history_pointer}++; 2255 $self->{history_pointer}++;
… …
1885 $self->{history_pointer} = @{$self->{history} || []} - 1; 2257 $self->{history_pointer} = @{$self->{history} || []} - 1;
1886 } 2258 }
1887 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2259 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1888 } 2260 }
1889 2261
1890 } elsif ($sym == CFClient::SDLK_DOWN) { 2262 } elsif ($sym == CFPlus::SDLK_DOWN) {
1891 $self->{history_pointer}--; 2263 $self->{history_pointer}--;
1892 $self->{history_pointer} = -1 if $self->{history_pointer} < 0; 2264 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1893 2265
1894 if ($self->{history_pointer} >= 0) { 2266 if ($self->{history_pointer} >= 0) {
1895 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2267 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1896 } else { 2268 } else {
1897 $self->set_text ($self->{history_saveback}); 2269 $self->set_text ($self->{history_saveback});
1898 } 2270 }
1899 2271
1900 } else { 2272 } else {
1901 return $self->SUPER::key_down ($ev) 2273 return $self->SUPER::invoke_key_down ($ev)
1902 } 2274 }
1903 2275
1904 1 2276 1
1905} 2277}
1906 2278
1907############################################################################# 2279#############################################################################
1908 2280
2281package CFPlus::UI::TextEdit;
2282
2283our @ISA = CFPlus::UI::EntryBase::;
2284
2285use CFPlus::OpenGL;
2286
2287sub move_cursor_ver {
2288 my ($self, $dy) = @_;
2289
2290 my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
2291
2292 $y += $dy;
2293
2294 if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {
2295 $self->{cursor} = $index;
2296 delete $self->{cur_h};
2297 $self->update;
2298 return;
2299 }
2300}
2301
2302sub invoke_key_down {
2303 my ($self, $ev) = @_;
2304
2305 my $sym = $ev->{sym};
2306
2307 if ($sym == CFPlus::SDLK_UP) {
2308 $self->move_cursor_ver (-1);
2309 } elsif ($sym == CFPlus::SDLK_DOWN) {
2310 $self->move_cursor_ver (+1);
2311 } else {
2312 return $self->SUPER::invoke_key_down ($ev)
2313 }
2314
2315 1
2316}
2317
2318#############################################################################
2319
1909package CFClient::UI::Button; 2320package CFPlus::UI::Button;
1910 2321
1911our @ISA = CFClient::UI::Label::; 2322our @ISA = CFPlus::UI::Label::;
1912 2323
1913use CFClient::OpenGL; 2324use CFPlus::OpenGL;
1914 2325
1915my @tex = 2326my @tex =
1916 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2327 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1917 qw(b1_button_active.png); 2328 qw(b1_button_inactive.png b1_button_active.png);
1918 2329
1919sub new { 2330sub new {
1920 my $class = shift; 2331 my $class = shift;
1921 2332
1922 $class->SUPER::new ( 2333 $class->SUPER::new (
1923 padding_x => 4, 2334 padding_x => 4,
1924 padding_y => 4, 2335 padding_y => 4,
1925 fg => [1, 1, 1], 2336 fg => [1.0, 1.0, 1.0],
1926 active_fg => [0, 0, 1], 2337 active_fg => [0.8, 0.8, 0.8],
1927 can_hover => 1, 2338 can_hover => 1,
1928 align => 0, 2339 align => 0,
1929 valign => 0, 2340 valign => 0,
1930 can_events => 1, 2341 can_events => 1,
1931 @_ 2342 @_
1932 ) 2343 )
1933} 2344}
1934 2345
1935sub activate { }
1936
1937sub button_up { 2346sub invoke_button_up {
1938 my ($self, $ev, $x, $y) = @_; 2347 my ($self, $ev, $x, $y) = @_;
1939 2348
1940 $self->emit ("activate") 2349 $self->emit ("activate")
1941 if $x >= 0 && $x < $self->{w} 2350 if $x >= 0 && $x < $self->{w}
1942 && $y >= 0 && $y < $self->{h}; 2351 && $y >= 0 && $y < $self->{h};
… …
1951 2360
1952 glEnable GL_TEXTURE_2D; 2361 glEnable GL_TEXTURE_2D;
1953 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2362 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1954 glColor 0, 0, 0, 1; 2363 glColor 0, 0, 0, 1;
1955 2364
2365 my $tex = $tex[$GRAB == $self];
1956 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2366 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1957 2367
1958 glDisable GL_TEXTURE_2D; 2368 glDisable GL_TEXTURE_2D;
1959 2369
1960 $self->SUPER::_draw; 2370 $self->SUPER::_draw;
1961} 2371}
1962 2372
1963############################################################################# 2373#############################################################################
1964 2374
1965package CFClient::UI::CheckBox; 2375package CFPlus::UI::CheckBox;
1966 2376
1967our @ISA = CFClient::UI::DrawBG::; 2377our @ISA = CFPlus::UI::DrawBG::;
1968 2378
1969my @tex = 2379my @tex =
1970 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2380 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1971 qw(c1_checkbox_bg.png c1_checkbox_active.png); 2381 qw(c1_checkbox_bg.png c1_checkbox_active.png);
1972 2382
1973use CFClient::OpenGL; 2383use CFPlus::OpenGL;
1974 2384
1975sub new { 2385sub new {
1976 my $class = shift; 2386 my $class = shift;
1977 2387
1978 $class->SUPER::new ( 2388 $class->SUPER::new (
… …
1992 my ($self) = @_; 2402 my ($self) = @_;
1993 2403
1994 (6) x 2 2404 (6) x 2
1995} 2405}
1996 2406
2407sub toggle {
2408 my ($self) = @_;
2409
2410 $self->{state} = !$self->{state};
2411 $self->emit (changed => $self->{state});
2412 $self->update;
2413}
2414
1997sub button_down { 2415sub invoke_button_down {
1998 my ($self, $ev, $x, $y) = @_; 2416 my ($self, $ev, $x, $y) = @_;
1999 2417
2000 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x} 2418 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
2001 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) { 2419 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
2002 $self->{state} = !$self->{state}; 2420 $self->toggle;
2003 $self->_emit (changed => $self->{state});
2004 } else { 2421 } else {
2005 return 0 2422 return 0
2006 } 2423 }
2007 2424
2008 1 2425 1
… …
2028 glDisable GL_TEXTURE_2D; 2445 glDisable GL_TEXTURE_2D;
2029} 2446}
2030 2447
2031############################################################################# 2448#############################################################################
2032 2449
2033package CFClient::UI::Image; 2450package CFPlus::UI::Image;
2034 2451
2035our @ISA = CFClient::UI::Base::; 2452our @ISA = CFPlus::UI::Base::;
2036 2453
2037use CFClient::OpenGL; 2454use CFPlus::OpenGL;
2038use Carp qw/confess/;
2039 2455
2040our %loaded_images; 2456our %texture_cache;
2041 2457
2042sub new { 2458sub new {
2043 my $class = shift; 2459 my $class = shift;
2044 2460
2045 my $self = $class->SUPER::new (can_events => 0, @_); 2461 my $self = $class->SUPER::new (
2462 can_events => 0,
2463 @_,
2464 );
2046 2465
2047 $self->{image} or confess "Image has 'image' not set. This is a fatal error!"; 2466 $self->{path} || $self->{tex}
2467 or Carp::croak "'path' or 'tex' attributes required";
2048 2468
2049 $loaded_images{$self->{image}} ||= 2469 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2050 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1; 2470 new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
2051 2471
2052 my $tex = $self->{tex} = $loaded_images{$self->{image}}; 2472 CFPlus::weaken $texture_cache{$self->{path}};
2053 2473
2054 Scalar::Util::weaken $loaded_images{$self->{image}}; 2474 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2055
2056 $self->{aspect} = $tex->{w} / $tex->{h};
2057 2475
2058 $self 2476 $self
2059} 2477}
2060 2478
2479sub STORABLE_freeze {
2480 my ($self, $cloning) = @_;
2481
2482 $self->{path}
2483 or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
2484
2485 $self->{path}
2486}
2487
2488sub STORABLE_attach {
2489 my ($self, $cloning, $path) = @_;
2490
2491 $self->new (path => $path)
2492}
2493
2061sub size_request { 2494sub size_request {
2062 my ($self) = @_; 2495 my ($self) = @_;
2063 2496
2064 ($self->{tex}->{w}, $self->{tex}->{h}) 2497 ($self->{tex}{w}, $self->{tex}{h})
2065} 2498}
2066 2499
2067sub _draw { 2500sub _draw {
2068 my ($self) = @_; 2501 my ($self) = @_;
2069 2502
… …
2079 } 2512 }
2080 2513
2081 glEnable GL_TEXTURE_2D; 2514 glEnable GL_TEXTURE_2D;
2082 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2515 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2083 2516
2084 $tex->draw_quad_alpha (0, 0, $w, $h); 2517 $tex->draw_quad (0, 0, $w, $h);
2085 2518
2086 glDisable GL_TEXTURE_2D; 2519 glDisable GL_TEXTURE_2D;
2087} 2520}
2088 2521
2089############################################################################# 2522#############################################################################
2090 2523
2524package CFPlus::UI::ImageButton;
2525
2526our @ISA = CFPlus::UI::Image::;
2527
2528use CFPlus::OpenGL;
2529
2530my %textures;
2531
2532sub new {
2533 my $class = shift;
2534
2535 my $self = $class->SUPER::new (
2536 padding_x => 4,
2537 padding_y => 4,
2538 fg => [1, 1, 1],
2539 active_fg => [0, 0, 1],
2540 can_hover => 1,
2541 align => 0,
2542 valign => 0,
2543 can_events => 1,
2544 @_
2545 );
2546}
2547
2548sub invoke_button_up {
2549 my ($self, $ev, $x, $y) = @_;
2550
2551 $self->emit ("activate")
2552 if $x >= 0 && $x < $self->{w}
2553 && $y >= 0 && $y < $self->{h};
2554
2555 1
2556}
2557
2558#############################################################################
2559
2091package CFClient::UI::VGauge; 2560package CFPlus::UI::VGauge;
2092 2561
2093our @ISA = CFClient::UI::Base::; 2562our @ISA = CFPlus::UI::Base::;
2094 2563
2095use List::Util qw(min max); 2564use List::Util qw(min max);
2096 2565
2097use CFClient::OpenGL; 2566use CFPlus::OpenGL;
2098 2567
2099my %tex = ( 2568my %tex = (
2100 food => [ 2569 food => [
2101 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2570 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2102 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 2571 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2103 ], 2572 ],
2104 grace => [ 2573 grace => [
2105 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2574 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/ 2575 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2107 ], 2576 ],
2108 hp => [ 2577 hp => [
2109 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2578 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2110 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 2579 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2111 ], 2580 ],
2112 mana => [ 2581 mana => [
2113 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2582 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/ 2583 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2115 ], 2584 ],
2116); 2585);
2117 2586
2118# eg. VGauge->new (gauge => 'food'), default gauge: food 2587# eg. VGauge->new (gauge => 'food'), default gauge: food
… …
2178 my $ycut1 = max 0, min 1, $ycut; 2647 my $ycut1 = max 0, min 1, $ycut;
2179 my $ycut2 = max 0, min 1, $ycut - 1; 2648 my $ycut2 = max 0, min 1, $ycut - 1;
2180 2649
2181 my $h1 = $self->{h} * (1 - $ycut1); 2650 my $h1 = $self->{h} * (1 - $ycut1);
2182 my $h2 = $self->{h} * (1 - $ycut2); 2651 my $h2 = $self->{h} * (1 - $ycut2);
2652 my $h3 = $self->{h};
2653
2654 $_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
2183 2655
2184 glEnable GL_BLEND; 2656 glEnable GL_BLEND;
2185 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, 2657 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2186 GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2658 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2187 glEnable GL_TEXTURE_2D; 2659 glEnable GL_TEXTURE_2D;
… …
2206 2678
2207 if ($t3) { 2679 if ($t3) {
2208 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2680 glBindTexture GL_TEXTURE_2D, $t3->{name};
2209 glBegin GL_QUADS; 2681 glBegin GL_QUADS;
2210 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2682 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2211 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2683 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2212 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2684 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2213 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2685 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2214 glEnd; 2686 glEnd;
2215 } 2687 }
2216 2688
2217 glDisable GL_BLEND; 2689 glDisable GL_BLEND;
2218 glDisable GL_TEXTURE_2D; 2690 glDisable GL_TEXTURE_2D;
2219} 2691}
2220 2692
2221############################################################################# 2693#############################################################################
2222 2694
2223package CFClient::UI::Gauge; 2695package CFPlus::UI::Gauge;
2224 2696
2225our @ISA = CFClient::UI::VBox::; 2697our @ISA = CFPlus::UI::VBox::;
2226 2698
2227sub new { 2699sub new {
2228 my ($class, %arg) = @_; 2700 my ($class, %arg) = @_;
2229 2701
2230 my $self = $class->SUPER::new ( 2702 my $self = $class->SUPER::new (
… …
2232 can_hover => 1, 2704 can_hover => 1,
2233 can_events => 1, 2705 can_events => 1,
2234 %arg, 2706 %arg,
2235 ); 2707 );
2236 2708
2237 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999"); 2709 $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); 2710 $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"); 2711 $self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
2240 2712
2241 $self 2713 $self
2242} 2714}
2243 2715
2244sub set_fontsize { 2716sub set_fontsize {
… …
2265 $self->{value}->set_text ($val); 2737 $self->{value}->set_text ($val);
2266} 2738}
2267 2739
2268############################################################################# 2740#############################################################################
2269 2741
2270package CFClient::UI::Slider; 2742package CFPlus::UI::Slider;
2271 2743
2272use strict; 2744use strict;
2273 2745
2274use CFClient::OpenGL; 2746use CFPlus::OpenGL;
2275 2747
2276our @ISA = CFClient::UI::DrawBG::; 2748our @ISA = CFPlus::UI::DrawBG::;
2277 2749
2278my @tex = 2750my @tex =
2279 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 2751 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2280 qw(s1_slider.png s1_slider_bg.png); 2752 qw(s1_slider.png s1_slider_bg.png);
2281 2753
2282sub new { 2754sub new {
2283 my $class = shift; 2755 my $class = shift;
2284 2756
… …
2305 $self->update; 2777 $self->update;
2306 2778
2307 $self 2779 $self
2308} 2780}
2309 2781
2310sub changed { }
2311
2312sub set_range { 2782sub set_range {
2313 my ($self, $range) = @_; 2783 my ($self, $range) = @_;
2314 2784
2315 ($range, $self->{range}) = ($self->{range}, $range); 2785 ($range, $self->{range}) = ($self->{range}, $range);
2316 2786
… …
2336 if $unit; 2806 if $unit;
2337 2807
2338 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2808 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2339 2809
2340 if ($value != $old_value) { 2810 if ($value != $old_value) {
2341 $self->_emit (changed => $value); 2811 $self->emit (changed => $value);
2342 $self->update; 2812 $self->update;
2343 } 2813 }
2344} 2814}
2345 2815
2346sub size_request { 2816sub size_request {
2347 my ($self) = @_; 2817 my ($self) = @_;
2348 2818
2349 ($self->{req_w}, $self->{req_h}) 2819 ($self->{req_w}, $self->{req_h})
2350} 2820}
2351 2821
2352sub button_down { 2822sub invoke_button_down {
2353 my ($self, $ev, $x, $y) = @_; 2823 my ($self, $ev, $x, $y) = @_;
2354 2824
2355 $self->SUPER::button_down ($ev, $x, $y); 2825 $self->SUPER::invoke_button_down ($ev, $x, $y);
2356 2826
2357 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2827 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2358 2828
2359 $self->mouse_motion ($ev, $x, $y) 2829 $self->invoke_mouse_motion ($ev, $x, $y);
2360}
2361 2830
2831 1
2832}
2833
2362sub mouse_motion { 2834sub invoke_mouse_motion {
2363 my ($self, $ev, $x, $y) = @_; 2835 my ($self, $ev, $x, $y) = @_;
2364 2836
2365 if ($GRAB == $self) { 2837 if ($GRAB == $self) {
2366 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2838 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2367 2839
… …
2371 2843
2372 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo)); 2844 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2373 } else { 2845 } else {
2374 return 0; 2846 return 0;
2375 } 2847 }
2848
2849 1
2850}
2851
2852sub invoke_mouse_wheel {
2853 my ($self, $ev) = @_;
2854
2855 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2856
2857 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
2858
2859 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2376 2860
2377 1 2861 1
2378} 2862}
2379 2863
2380sub update { 2864sub update {
… …
2431 glDisable GL_TEXTURE_2D; 2915 glDisable GL_TEXTURE_2D;
2432} 2916}
2433 2917
2434############################################################################# 2918#############################################################################
2435 2919
2436package CFClient::UI::ValSlider; 2920package CFPlus::UI::ValSlider;
2437 2921
2438our @ISA = CFClient::UI::HBox::; 2922our @ISA = CFPlus::UI::HBox::;
2439 2923
2440sub new { 2924sub new {
2441 my ($class, %arg) = @_; 2925 my ($class, %arg) = @_;
2442 2926
2443 my $range = delete $arg{range}; 2927 my $range = delete $arg{range};
2444 2928
2445 my $self = $class->SUPER::new ( 2929 my $self = $class->SUPER::new (
2446 slider => (new CFClient::UI::Slider expand => 1, range => $range), 2930 slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2447 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}), 2931 entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2448 to_value => sub { shift }, 2932 to_value => sub { shift },
2449 from_value => sub { shift }, 2933 from_value => sub { shift },
2450 %arg, 2934 %arg,
2451 ); 2935 );
2452 2936
… …
2472sub set_range { shift->{slider}->set_range (@_) } 2956sub set_range { shift->{slider}->set_range (@_) }
2473sub set_value { shift->{slider}->set_value (@_) } 2957sub set_value { shift->{slider}->set_value (@_) }
2474 2958
2475############################################################################# 2959#############################################################################
2476 2960
2477package CFClient::UI::TextScroller; 2961package CFPlus::UI::TextScroller;
2478 2962
2479our @ISA = CFClient::UI::HBox::; 2963our @ISA = CFPlus::UI::HBox::;
2480 2964
2481use CFClient::OpenGL; 2965use CFPlus::OpenGL;
2482 2966
2483sub new { 2967sub new {
2484 my $class = shift; 2968 my $class = shift;
2485 2969
2486 my $self = $class->SUPER::new ( 2970 my $self = $class->SUPER::new (
2487 fontsize => 1, 2971 fontsize => 1,
2488 can_events => 0, 2972 can_events => 1,
2489 indent => 0, 2973 indent => 0,
2490 #font => default_font 2974 #font => default_font
2491 @_, 2975 @_,
2492 2976
2493 layout => (new CFClient::Layout 1), 2977 layout => (new CFPlus::Layout),
2494 par => [], 2978 par => [],
2979 max_par => 0,
2495 height => 0, 2980 height => 0,
2496 children => [ 2981 children => [
2497 (new CFClient::UI::Empty expand => 1), 2982 (new CFPlus::UI::Empty expand => 1),
2498 (new CFClient::UI::Slider vertical => 1), 2983 (new CFPlus::UI::Slider vertical => 1),
2499 ], 2984 ],
2500 ); 2985 );
2501 2986
2502 $self->{children}[1]->connect (changed => sub { $self->update }); 2987 $self->{children}[1]->connect (changed => sub { $self->update });
2503 2988
… …
2509 2994
2510 $self->{fontsize} = $fontsize; 2995 $self->{fontsize} = $fontsize;
2511 $self->reflow; 2996 $self->reflow;
2512} 2997}
2513 2998
2999sub size_request {
3000 my ($self) = @_;
3001
3002 my ($empty, $slider) = @{ $self->{children} };
3003
3004 local $self->{children} = [$empty, $slider];
3005 $self->SUPER::size_request
3006}
3007
2514sub size_allocate { 3008sub invoke_size_allocate {
2515 my ($self, $w, $h) = @_; 3009 my ($self, $w, $h) = @_;
2516 3010
2517 $self->SUPER::size_allocate ($w, $h); 3011 my ($empty, $slider, @other) = @{ $self->{children} };
3012 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
2518 3013
2519 $self->{layout}->set_font ($self->{font}) if $self->{font}; 3014 $self->{layout}->set_font ($self->{font}) if $self->{font};
2520 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 3015 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2521 $self->{layout}->set_width ($self->{children}[0]{w}); 3016 $self->{layout}->set_width ($empty->{w});
2522 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent}); 3017 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2523 3018
2524 $self->reflow; 3019 $self->reflow;
2525}
2526 3020
2527sub text_size { 3021 local $self->{children} = [$empty, $slider];
3022 $self->SUPER::invoke_size_allocate ($w, $h)
3023}
3024
3025sub invoke_mouse_wheel {
2528 my ($self, $text, $indent) = @_; 3026 my ($self, $ev) = @_;
3027
3028 return 0 unless $ev->{dy}; # only vertical movements
3029
3030 $self->{children}[1]->emit (mouse_wheel => $ev);
3031
3032 1
3033}
3034
3035sub get_layout {
3036 my ($self, $para) = @_;
2529 3037
2530 my $layout = $self->{layout}; 3038 my $layout = $self->{layout};
2531 3039
3040 $layout->set_font ($self->{font}) if $self->{font};
3041 $layout->set_foreground (@{$para->{fg}});
2532 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 3042 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2533 $layout->set_width ($self->{children}[0]{w} - $indent); 3043 $layout->set_width ($self->{children}[0]{w} - $para->{indent});
2534 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent}); 3044 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2535 $layout->set_markup ($text); 3045 $layout->set_markup ($para->{markup});
3046
3047 $layout->set_shapes (
3048 map
3049 +(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
3050 @{$para->{widget}}
2536 3051 );
3052
2537 $layout->size 3053 $layout
2538} 3054}
2539 3055
2540sub reflow { 3056sub reflow {
2541 my ($self) = @_; 3057 my ($self) = @_;
2542 3058
… …
2549 3065
2550 # todo: base offset on lines or so, not on pixels 3066 # todo: base offset on lines or so, not on pixels
2551 $self->{children}[1]->set_value ($offset); 3067 $self->{children}[1]->set_value ($offset);
2552} 3068}
2553 3069
3070sub current_paragraph {
3071 my ($self) = @_;
3072
3073 $self->{top_paragraph} - 1
3074}
3075
3076sub scroll_to {
3077 my ($self, $para) = @_;
3078
3079 $para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
3080
3081 $self->{scroll_to} = $para;
3082 $self->update;
3083}
3084
2554sub clear { 3085sub clear {
2555 my ($self) = @_; 3086 my ($self) = @_;
3087
3088 my (undef, undef, @other) = @{ $self->{children} };
3089 $self->remove ($_) for @other;
2556 3090
2557 $self->{par} = []; 3091 $self->{par} = [];
2558 $self->{height} = 0; 3092 $self->{height} = 0;
2559 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 3093 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2560} 3094}
2561 3095
2562sub add_paragraph { 3096sub add_paragraph {
2563 my ($self, $color, $text, $indent) = @_; 3097 my $self = shift;
2564 3098
2565 for my $line (split /\n/, $text) { 3099 for my $para (@_) {
2566 my ($w, $h) = $self->text_size ($line); 3100 $para = {
3101 fg => [1, 1, 1, 1],
3102 indent => 0,
3103 markup => "",
3104 widget => [],
3105 ref $para ? %$para : (markup => $para),
3106 w => 1e10,
3107 wrapped => 1,
3108 };
3109
3110 $self->add (@{ $para->{widget} }) if @{ $para->{widget} };
3111 push @{$self->{par}}, $para;
3112 }
3113
3114 if (my $max = $self->{max_par}) {
3115 shift @{$self->{par}} while @{$self->{par}} > $max;
3116 }
3117
3118 $self->{need_reflow}++;
3119 $self->update;
3120}
3121
3122sub scroll_to_bottom {
3123 my ($self) = @_;
3124
3125 $self->{scroll_to} = $#{$self->{par}};
3126 $self->update;
3127}
3128
3129sub force_uptodate {
3130 my ($self) = @_;
3131
3132 if (delete $self->{need_reflow}) {
3133 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
3134
3135 my $height = 0;
3136
3137 for my $para (@{$self->{par}}) {
3138 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
3139 my $layout = $self->get_layout ($para);
3140 my ($w, $h) = $layout->size;
3141
3142 $para->{w} = $w + $para->{indent};
3143 $para->{h} = $h;
3144 $para->{wrapped} = $layout->has_wrapped;
3145 }
3146
3147 $para->{y} = $height;
3148 $height += $para->{h};
3149 }
3150
2567 $self->{height} += $h; 3151 $self->{height} = $height;
2568 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line]; 3152 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2569 }
2570 3153
2571 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]); 3154 delete $self->{texture};
3155 }
3156
3157 if (my $paridx = delete $self->{scroll_to}) {
3158 $self->{children}[1]->set_value ($self->{par}[$paridx]{y});
3159 }
2572} 3160}
2573 3161
2574sub update { 3162sub update {
2575 my ($self) = @_; 3163 my ($self) = @_;
2576 3164
… …
2579 return unless $self->{h} > 0; 3167 return unless $self->{h} > 0;
2580 3168
2581 delete $self->{texture}; 3169 delete $self->{texture};
2582 3170
2583 $ROOT->on_post_alloc ($self => sub { 3171 $ROOT->on_post_alloc ($self => sub {
3172 $self->force_uptodate;
3173
2584 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 3174 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2585 3175
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 { 3176 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2614 glClearColor 0, 0, 0, 0; 3177 glClearColor 0, 0, 0, 0;
2615 glClear GL_COLOR_BUFFER_BIT; 3178 glClear GL_COLOR_BUFFER_BIT;
2616 3179
3180 package CFPlus::UI::Base;
3181 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3182 (0, 0, $self->{w}, $self->{h});
3183
3184 my $top = int $self->{children}[1]{range}[0];
3185
3186 my $paridx = 0;
3187 my $top_paragraph;
2617 my $top = int $self->{children}[1]{range}[0]; 3188 my $top = int $self->{children}[1]{range}[0];
2618 3189
2619 my $y0 = $top; 3190 my $y0 = $top;
2620 my $y1 = $top + $H; 3191 my $y1 = $top + $H;
2621 3192
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}}) { 3193 for my $para (@{$self->{par}}) {
2633 my $h = $par->[1]; 3194 my $h = $para->{h};
3195 my $y = $para->{y};
2634 3196
2635 if ($y0 < $y + $h && $y < $y1) { 3197 if ($y0 < $y + $h && $y < $y1) {
2636 $layout->set_foreground (@{ $par->[2] }); 3198 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 3199
2641 my ($w, $h, $data, $format, $internalformat) = $layout->render; 3200 $layout->render ($para->{indent}, $y - $y0);
2642 3201
2643 glRasterPos $par->[3], $y - $y0; 3202 if (my @w = @{ $para->{widget} }) {
2644 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data; 3203 my @s = $layout->get_shapes;
3204
3205 for (@w) {
3206 my ($dx, $dy) = splice @s, 0, 2, ();
3207
3208 $_->{x} = $dx + $para->{indent};
3209 $_->{y} = $dy + $y - $y0;
3210
3211 $_->draw;
3212 }
3213 }
2645 } 3214 }
2646 3215
2647 $y += $h; 3216 $paridx++;
3217 $top_paragraph ||= $paridx if $y >= $top;
2648 } 3218 }
2649 3219
2650 glDisable GL_BLEND; 3220 $self->{top_paragraph} = $top_paragraph;
2651 }; 3221 };
2652 }); 3222 });
3223}
3224
3225sub reconfigure {
3226 my ($self) = @_;
3227
3228 $self->SUPER::reconfigure;
3229
3230 $_->{w} = 1e10 for @{ $self->{par} };
3231 $self->reflow;
2653} 3232}
2654 3233
2655sub _draw { 3234sub _draw {
2656 my ($self) = @_; 3235 my ($self) = @_;
2657 3236
… …
2660 glColor 0, 0, 0, 1; 3239 glColor 0, 0, 0, 1;
2661 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 3240 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2662 glDisable GL_TEXTURE_2D; 3241 glDisable GL_TEXTURE_2D;
2663 3242
2664 $self->{children}[1]->draw; 3243 $self->{children}[1]->draw;
2665
2666} 3244}
2667 3245
2668############################################################################# 3246#############################################################################
2669 3247
2670package CFClient::UI::Animator; 3248package CFPlus::UI::Animator;
2671 3249
2672use CFClient::OpenGL; 3250use CFPlus::OpenGL;
2673 3251
2674our @ISA = CFClient::UI::Bin::; 3252our @ISA = CFPlus::UI::Bin::;
2675 3253
2676sub moveto { 3254sub moveto {
2677 my ($self, $x, $y) = @_; 3255 my ($self, $x, $y) = @_;
2678 3256
2679 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 3257 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
… …
2707 glPopMatrix; 3285 glPopMatrix;
2708} 3286}
2709 3287
2710############################################################################# 3288#############################################################################
2711 3289
2712package CFClient::UI::Flopper; 3290package CFPlus::UI::Flopper;
2713 3291
2714our @ISA = CFClient::UI::Button::; 3292our @ISA = CFPlus::UI::Button::;
2715 3293
2716sub new { 3294sub new {
2717 my $class = shift; 3295 my $class = shift;
2718 3296
2719 my $self = $class->SUPER::new ( 3297 my $self = $class->SUPER::new (
… …
2731 $self->{other}->toggle_visibility; 3309 $self->{other}->toggle_visibility;
2732} 3310}
2733 3311
2734############################################################################# 3312#############################################################################
2735 3313
2736package CFClient::UI::Tooltip; 3314package CFPlus::UI::Tooltip;
2737 3315
2738our @ISA = CFClient::UI::Bin::; 3316our @ISA = CFPlus::UI::Bin::;
2739 3317
2740use CFClient::OpenGL; 3318use CFPlus::OpenGL;
2741 3319
2742sub new { 3320sub new {
2743 my $class = shift; 3321 my $class = shift;
2744 3322
2745 $class->SUPER::new ( 3323 $class->SUPER::new (
… …
2748 ) 3326 )
2749} 3327}
2750 3328
2751sub set_tooltip_from { 3329sub set_tooltip_from {
2752 my ($self, $widget) = @_; 3330 my ($self, $widget) = @_;
3331
3332 $widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
3333 if $widget->{tooltip} =~ /^#(.*)$/;
2753 3334
2754 my $tooltip = $widget->{tooltip}; 3335 my $tooltip = $widget->{tooltip};
2755 3336
2756 if ($ENV{CFPLUS_DEBUG} & 2) { 3337 if ($ENV{CFPLUS_DEBUG} & 2) {
2757 $tooltip .= "\n\n" . (ref $widget) . "\n" 3338 $tooltip .= "\n\n" . (ref $widget) . "\n"
… …
2761 } 3342 }
2762 3343
2763 $tooltip =~ s/^\n+//; 3344 $tooltip =~ s/^\n+//;
2764 $tooltip =~ s/\n+$//; 3345 $tooltip =~ s/\n+$//;
2765 3346
2766 $self->add (new CFClient::UI::Label 3347 $self->add (new CFPlus::UI::Label
2767 markup => $tooltip, 3348 markup => $tooltip,
2768 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3349 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2769 fontsize => 0.8, 3350 fontsize => 0.8,
2770 fg => [0, 0, 0, 1], 3351 style => 1, # FLAG_INVERSE
2771 ellipsise => 0, 3352 ellipsise => 0,
2772 font => ($widget->{tooltip_font} || $::FONT_PROP), 3353 font => ($widget->{tooltip_font} || $::FONT_PROP),
2773 ); 3354 );
2774} 3355}
2775 3356
… …
2779 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 3360 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2780 3361
2781 ($w + 4, $h + 4) 3362 ($w + 4, $h + 4)
2782} 3363}
2783 3364
2784sub size_allocate { 3365sub invoke_size_allocate {
2785 my ($self, $w, $h) = @_; 3366 my ($self, $w, $h) = @_;
2786 3367
2787 $self->SUPER::size_allocate ($w - 4, $h - 4); 3368 $self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2788} 3369}
2789 3370
2790sub visibility_change { 3371sub invoke_visibility_change {
2791 my ($self, $visible) = @_; 3372 my ($self, $visible) = @_;
2792 3373
2793 return unless $visible; 3374 return unless $visible;
2794 3375
2795 $self->{root}->on_post_alloc ("move_$self" => sub { 3376 $self->{root}->on_post_alloc ("move_$self" => sub {
2796 my $widget = $self->{owner} 3377 my $widget = $self->{owner}
2797 or return; 3378 or return;
2798 3379
3380 if ($widget->{visible}) {
2799 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 3381 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2800 3382
2801 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 3383 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2802 if $x + $self->{w} > $self->{root}{w}; 3384 if $x + $self->{w} > $self->{root}{w};
2803 3385
2804 $self->move_abs ($x, $y); 3386 $self->move_abs ($x, $y);
3387 } else {
3388 $self->hide;
3389 }
2805 }); 3390 });
2806} 3391}
2807 3392
2808sub _draw { 3393sub _draw {
2809 my ($self) = @_; 3394 my ($self) = @_;
… …
2833 $self->SUPER::_draw; 3418 $self->SUPER::_draw;
2834} 3419}
2835 3420
2836############################################################################# 3421#############################################################################
2837 3422
2838package CFClient::UI::Face; 3423package CFPlus::UI::Face;
2839 3424
2840our @ISA = CFClient::UI::Base::; 3425our @ISA = CFPlus::UI::DrawBG::;
2841 3426
2842use CFClient::OpenGL; 3427use CFPlus::OpenGL;
2843 3428
2844sub new { 3429sub new {
2845 my $class = shift; 3430 my $class = shift;
2846 3431
2847 my $self = $class->SUPER::new ( 3432 my $self = $class->SUPER::new (
3433 size_w => 32,
3434 size_h => 8,
2848 aspect => 1, 3435 aspect => 1,
2849 can_events => 0, 3436 can_events => 0,
2850 @_, 3437 @_,
2851 ); 3438 );
2852 3439
2853 if ($self->{anim} && $self->{animspeed}) { 3440 if ($self->{anim} && $self->{animspeed}) {
2854 Scalar::Util::weaken (my $widget = $self); 3441 CFPlus::weaken (my $widget = $self);
2855 3442
3443 $widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
3444 $widget->{anim_start} = $self->{animspeed} * int Event::time / $self->{animspeed};
2856 $self->{timer} = Event->timer ( 3445 $self->{timer} = Event->timer (
2857 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2858 hard => 1, 3446 parked => 1,
2859 interval => $self->{animspeed},
2860 cb => sub { 3447 cb => sub {
3448 return unless $::CONN && $widget;
3449
2861 ++$widget->{frame}; 3450 ++$widget->{frame};
3451 $widget->update_face;
2862 $widget->update; 3452 $widget->update;
3453
3454 $widget->update_timer;
2863 }, 3455 },
2864 ); 3456 );
3457
3458 $self->update_face;
3459 $self->update_timer;
2865 } 3460 }
2866 3461
2867 $self 3462 $self
2868} 3463}
2869 3464
3465sub update_timer {
3466 my ($self) = @_;
3467
3468 return unless $self->{timer};
3469
3470 if ($self->{visible}) {
3471 $self->{timer}->at (
3472 $self->{anim_start}
3473 + $self->{animspeed}
3474 * int 1.5 + (Event::time - $self->{anim_start}) / $self->{animspeed}
3475 );
3476 $self->{timer}->start;
3477 } else {
3478 $self->{timer}->stop;
3479 }
3480}
3481
3482sub update_face {
3483 my ($self) = @_;
3484
3485 return unless $::CONN;
3486
3487 if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3488 if ($anim && @$anim) {
3489 delete $self->{wait_face};
3490 $self->{face} = $anim->[ $self->{frame} % @$anim ];
3491 $self->{tex} = $::CONN->{texture}[ $::CONN->{faceid}[$self->{face}] ];
3492 }
3493 }
3494}
3495
2870sub size_request { 3496sub size_request {
2871 (32, 8) 3497 my ($self) = @_;
3498
3499 if ($::CONN) {
3500 if (my $faceid = $::CONN->{faceid}[$self->{face}]) {
3501 if (my $tex = $::CONN->{texture}[$faceid]) {
3502 $self->{tex} = $tex;
3503 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
3504 } else {
3505 $self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub {
3506 $self->realloc;
3507 });
3508 }
3509 }
3510 }
3511
3512 ($self->{size_w} || 8, $self->{size_h} || 8)
2872} 3513}
2873 3514
2874sub update { 3515sub update {
2875 my ($self) = @_; 3516 my ($self) = @_;
2876 3517
2877 return unless $self->{visible}; 3518 return unless $self->{visible};
2878 3519
2879 $self->SUPER::update; 3520 $self->SUPER::update;
2880} 3521}
2881 3522
3523sub invoke_visibility_change {
3524 my ($self) = @_;
3525
3526 $self->update_timer;
3527
3528 0
3529}
3530
2882sub _draw { 3531sub _draw {
2883 my ($self) = @_; 3532 my ($self) = @_;
2884 3533
2885 return unless $::CONN; 3534 $self->SUPER::_draw;
2886 3535
2887 my $face; 3536 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; 3537 glEnable GL_TEXTURE_2D;
2900 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3538 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2901 glColor 0, 0, 0, 1; 3539 glColor 0, 0, 0, 1;
2902 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3540 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2903 glDisable GL_TEXTURE_2D; 3541 glDisable GL_TEXTURE_2D;
… …
2905} 3543}
2906 3544
2907sub destroy { 3545sub destroy {
2908 my ($self) = @_; 3546 my ($self) = @_;
2909 3547
2910 $self->{timer}->cancel 3548 (delete $self->{timer})->cancel
2911 if $self->{timer}; 3549 if $self->{timer};
2912 3550
2913 $self->SUPER::destroy; 3551 $self->SUPER::destroy;
2914} 3552}
2915 3553
2916############################################################################# 3554#############################################################################
2917 3555
2918package CFClient::UI::Buttonbar; 3556package CFPlus::UI::Buttonbar;
2919 3557
2920our @ISA = CFClient::UI::HBox::; 3558our @ISA = CFPlus::UI::HBox::;
2921 3559
2922# TODO: should actualyl wrap buttons and other goodies. 3560# TODO: should actually wrap buttons and other goodies.
2923 3561
2924############################################################################# 3562#############################################################################
2925 3563
2926package CFClient::UI::Menu; 3564package CFPlus::UI::Menu;
2927 3565
2928our @ISA = CFClient::UI::FancyFrame::; 3566our @ISA = CFPlus::UI::Toplevel::;
2929 3567
2930use CFClient::OpenGL; 3568use CFPlus::OpenGL;
2931 3569
2932sub new { 3570sub new {
2933 my $class = shift; 3571 my $class = shift;
2934 3572
2935 my $self = $class->SUPER::new ( 3573 my $self = $class->SUPER::new (
2936 items => [], 3574 items => [],
2937 z => 100, 3575 z => 100,
2938 @_, 3576 @_,
2939 ); 3577 );
2940 3578
2941 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3579 $self->add ($self->{vbox} = new CFPlus::UI::VBox);
2942 3580
2943 for my $item (@{ $self->{items} }) { 3581 for my $item (@{ $self->{items} }) {
2944 my ($widget, $cb, $tooltip) = @$item; 3582 my ($widget, $cb, $tooltip) = @$item;
2945 3583
2946 # handle various types of items, only text for now 3584 # handle various types of items, only text for now
2947 if (!ref $widget) { 3585 if (!ref $widget) {
3586 if ($widget =~ /\t/) {
3587 my ($left, $right) = split /\t/, $widget, 2;
3588
2948 $widget = new CFClient::UI::Label 3589 $widget = new CFPlus::UI::HBox
2949 can_hover => 1, 3590 can_hover => 1,
2950 can_events => 1, 3591 can_events => 1,
3592 tooltip => $tooltip,
3593 children => [
3594 (new CFPlus::UI::Label markup => $left, expand => 1),
3595 (new CFPlus::UI::Label markup => $right, align => +1),
3596 ],
3597 ;
3598
3599 } else {
3600 $widget = new CFPlus::UI::Label
3601 can_hover => 1,
3602 can_events => 1,
2951 markup => $widget, 3603 markup => $widget,
2952 tooltip => $tooltip 3604 tooltip => $tooltip;
3605 }
2953 } 3606 }
2954 3607
2955 $self->{item}{$widget} = $item; 3608 $self->{item}{$widget} = $item;
2956 3609
2957 $self->{vbox}->add ($widget); 3610 $self->{vbox}->add ($widget);
… …
2962 3615
2963# popup given the event (must be a mouse button down event currently) 3616# popup given the event (must be a mouse button down event currently)
2964sub popup { 3617sub popup {
2965 my ($self, $ev) = @_; 3618 my ($self, $ev) = @_;
2966 3619
2967 $self->_emit ("popdown"); 3620 $self->emit ("popdown");
2968 3621
2969 # maybe save $GRAB? must be careful about events... 3622 # maybe save $GRAB? must be careful about events...
2970 $GRAB = $self; 3623 $GRAB = $self;
2971 $self->{button} = $ev->{button}; 3624 $self->{button} = $ev->{button};
2972 3625
2973 $self->show; 3626 $self->show;
2974 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 3627 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2975} 3628}
2976 3629
2977sub mouse_motion { 3630sub invoke_mouse_motion {
2978 my ($self, $ev, $x, $y) = @_; 3631 my ($self, $ev, $x, $y) = @_;
2979 3632
2980 # TODO: should use vbox->find_widget or so 3633 # TODO: should use vbox->find_widget or so
2981 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3634 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2982 $self->{hover} = $self->{item}{$HOVER}; 3635 $self->{hover} = $self->{item}{$HOVER};
2983 3636
2984 0 3637 0
2985} 3638}
2986 3639
2987sub button_up { 3640sub invoke_button_up {
2988 my ($self, $ev, $x, $y) = @_; 3641 my ($self, $ev, $x, $y) = @_;
2989 3642
2990 if ($ev->{button} == $self->{button}) { 3643 if ($ev->{button} == $self->{button}) {
2991 undef $GRAB; 3644 undef $GRAB;
2992 $self->hide; 3645 $self->hide;
2993 3646
2994 $self->_emit ("popdown"); 3647 $self->emit ("popdown");
2995 $self->{hover}[1]->() if $self->{hover}; 3648 $self->{hover}[1]->() if $self->{hover};
2996 } else { 3649 } else {
2997 return 0 3650 return 0
2998 } 3651 }
2999 3652
3000 1 3653 1
3001} 3654}
3002 3655
3003############################################################################# 3656#############################################################################
3004 3657
3005package CFClient::UI::Multiplexer; 3658package CFPlus::UI::Multiplexer;
3006 3659
3007our @ISA = CFClient::UI::Container::; 3660our @ISA = CFPlus::UI::Container::;
3008 3661
3009sub new { 3662sub new {
3010 my $class = shift; 3663 my $class = shift;
3011 3664
3012 my $self = $class->SUPER::new ( 3665 my $self = $class->SUPER::new (
… …
3026 3679
3027 $self->{current} = $self->{children}[0] 3680 $self->{current} = $self->{children}[0]
3028 if @{ $self->{children} }; 3681 if @{ $self->{children} };
3029} 3682}
3030 3683
3684sub get_current_page {
3685 my ($self) = @_;
3686
3687 $self->{current}
3688}
3689
3031sub set_current_page { 3690sub set_current_page {
3032 my ($self, $page_or_widget) = @_; 3691 my ($self, $page_or_widget) = @_;
3033 3692
3034 my $widget = ref $page_or_widget 3693 my $widget = ref $page_or_widget
3035 ? $page_or_widget 3694 ? $page_or_widget
3036 : $self->{children}[$page_or_widget]; 3695 : $self->{children}[$page_or_widget];
3037 3696
3038 $self->{current} = $widget; 3697 $self->{current} = $widget;
3039 $self->{current}->configure (0, 0, $self->{w}, $self->{h}); 3698 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3040 3699
3041 $self->_emit (page_changed => $self->{current}); 3700 $self->emit (page_changed => $self->{current});
3042 3701
3043 $self->realloc; 3702 $self->realloc;
3044} 3703}
3045 3704
3046sub visible_children { 3705sub visible_children {
… …
3051 my ($self) = @_; 3710 my ($self) = @_;
3052 3711
3053 $self->{current}->size_request 3712 $self->{current}->size_request
3054} 3713}
3055 3714
3056sub size_allocate { 3715sub invoke_size_allocate {
3057 my ($self, $w, $h) = @_; 3716 my ($self, $w, $h) = @_;
3058 3717
3059 $self->{current}->configure (0, 0, $w, $h); 3718 $self->{current}->configure (0, 0, $w, $h);
3719
3720 1
3060} 3721}
3061 3722
3062sub _draw { 3723sub _draw {
3063 my ($self) = @_; 3724 my ($self) = @_;
3064 3725
3065 $self->{current}->draw; 3726 $self->{current}->draw;
3066} 3727}
3067 3728
3068############################################################################# 3729#############################################################################
3069 3730
3070package CFClient::UI::Notebook; 3731package CFPlus::UI::Notebook;
3071 3732
3072our @ISA = CFClient::UI::VBox::; 3733our @ISA = CFPlus::UI::VBox::;
3073 3734
3074sub new { 3735sub new {
3075 my $class = shift; 3736 my $class = shift;
3076 3737
3077 my $self = $class->SUPER::new ( 3738 my $self = $class->SUPER::new (
3078 buttonbar => (new CFClient::UI::Buttonbar), 3739 buttonbar => (new CFPlus::UI::Buttonbar),
3079 multiplexer => (new CFClient::UI::Multiplexer expand => 1), 3740 multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3080 # filter => # will be put between multiplexer and $self 3741 # filter => # will be put between multiplexer and $self
3081 @_, 3742 @_,
3082 ); 3743 );
3083 3744
3084 $self->{filter}->add ($self->{multiplexer}) if $self->{filter}; 3745 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
… …
3088} 3749}
3089 3750
3090sub add { 3751sub add {
3091 my ($self, $title, $widget, $tooltip) = @_; 3752 my ($self, $title, $widget, $tooltip) = @_;
3092 3753
3093 Scalar::Util::weaken $self; 3754 CFPlus::weaken $self;
3094 3755
3095 $self->{buttonbar}->add (new CFClient::UI::Button 3756 unless (ref $title) {
3757 $title = new CFPlus::UI::Button
3096 markup => $title, 3758 markup => $title,
3097 tooltip => $tooltip, 3759 tooltip => $tooltip,
3760 ;
3761 }
3762
3098 on_activate => sub { $self->set_current_page ($widget) }, 3763 $title->connect (activate => sub { $self->set_current_page ($widget) });
3099 ); 3764 $self->{buttonbar}->add ($title);
3100 3765
3101 $self->{multiplexer}->add ($widget); 3766 $self->{multiplexer}->add ($widget);
3767}
3768
3769sub get_current_page {
3770 my ($self) = @_;
3771
3772 $self->{multiplexer}->get_current_page
3102} 3773}
3103 3774
3104sub set_current_page { 3775sub set_current_page {
3105 my ($self, $page) = @_; 3776 my ($self, $page) = @_;
3106 3777
3107 $self->{multiplexer}->set_current_page ($page); 3778 $self->{multiplexer}->set_current_page ($page);
3108 $self->_emit (page_changed => $self->{multiplexer}{current}); 3779 $self->emit (page_changed => $self->{multiplexer}{current});
3109} 3780}
3110 3781
3111############################################################################# 3782#############################################################################
3112 3783
3113package CFClient::UI::Combobox; 3784package CFPlus::UI::Selector;
3114 3785
3115use utf8; 3786use utf8;
3116 3787
3117our @ISA = CFClient::UI::Button::; 3788our @ISA = CFPlus::UI::Button::;
3118 3789
3119sub new { 3790sub new {
3120 my $class = shift; 3791 my $class = shift;
3121 3792
3122 my $self = $class->SUPER::new ( 3793 my $self = $class->SUPER::new (
… …
3128 $self->_set_value ($self->{value}); 3799 $self->_set_value ($self->{value});
3129 3800
3130 $self 3801 $self
3131} 3802}
3132 3803
3133sub button_down { 3804sub invoke_button_down {
3134 my ($self, $ev) = @_; 3805 my ($self, $ev) = @_;
3135 3806
3136 my @menu_items; 3807 my @menu_items;
3137 3808
3138 for (@{ $self->{options} }) { 3809 for (@{ $self->{options} }) {
3139 my ($value, $title, $tooltip) = @$_; 3810 my ($value, $title, $tooltip) = @$_;
3140 3811
3141 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }]; 3812 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3142 } 3813 }
3143 3814
3144 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev); 3815 CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3145} 3816}
3146 3817
3147sub _set_value { 3818sub _set_value {
3148 my ($self, $value) = @_; 3819 my ($self, $value) = @_;
3149 3820
… …
3159 my ($self, $value) = @_; 3830 my ($self, $value) = @_;
3160 3831
3161 return unless $self->{value} ne $value; 3832 return unless $self->{value} ne $value;
3162 3833
3163 $self->_set_value ($value); 3834 $self->_set_value ($value);
3164 $self->_emit (changed => $value); 3835 $self->emit (changed => $value);
3165} 3836}
3166 3837
3167############################################################################# 3838#############################################################################
3168 3839
3169package CFClient::UI::Statusbox; 3840package CFPlus::UI::Statusbox;
3170 3841
3171our @ISA = CFClient::UI::VBox::; 3842our @ISA = CFPlus::UI::VBox::;
3172 3843
3173sub new { 3844sub new {
3174 my $class = shift; 3845 my $class = shift;
3175 3846
3176 my $self = $class->SUPER::new ( 3847 my $self = $class->SUPER::new (
3177 fontsize => 0.8, 3848 fontsize => 0.8,
3178 @_, 3849 @_,
3179 ); 3850 );
3180 3851
3181 Scalar::Util::weaken (my $this = $self); 3852 CFPlus::weaken (my $this = $self);
3182 3853
3183 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder }); 3854 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3184 3855
3185 $self 3856 $self
3186} 3857}
… …
3188sub reorder { 3859sub reorder {
3189 my ($self) = @_; 3860 my ($self) = @_;
3190 my $NOW = Time::HiRes::time; 3861 my $NOW = Time::HiRes::time;
3191 3862
3192 # freeze display when hovering over any label 3863 # freeze display when hovering over any label
3193 return if $CFClient::UI::TOOLTIP->{owner} 3864 return if $CFPlus::UI::TOOLTIP->{owner}
3194 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label}, 3865 && grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3195 values %{ $self->{item} }; 3866 values %{ $self->{item} };
3196 3867
3197 while (my ($k, $v) = each %{ $self->{item} }) { 3868 while (my ($k, $v) = each %{ $self->{item} }) {
3198 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3869 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3199 } 3870 }
… …
3220 for ($short) { 3891 for ($short) {
3221 s/^\s+//; 3892 s/^\s+//;
3222 s/\s+/ /g; 3893 s/\s+/ /g;
3223 } 3894 }
3224 3895
3225 new CFClient::UI::Label 3896 new CFPlus::UI::Label
3226 markup => $short, 3897 markup => $short,
3227 tooltip => $item->{tooltip}, 3898 tooltip => $item->{tooltip},
3228 tooltip_font => $::FONT_PROP, 3899 tooltip_font => $::FONT_PROP,
3229 tooltip_width => 0.67, 3900 tooltip_width => 0.67,
3230 fontsize => $item->{fontsize} || $self->{fontsize}, 3901 fontsize => $item->{fontsize} || $self->{fontsize},
… …
3284 count => 1, 3955 count => 1,
3285 %arg, 3956 %arg,
3286 }; 3957 };
3287 } 3958 }
3288 3959
3960 $ROOT->on_refresh (reorder => sub {
3289 $self->reorder; 3961 $self->reorder;
3962 });
3290} 3963}
3291 3964
3292sub reconfigure { 3965sub reconfigure {
3293 my ($self) = @_; 3966 my ($self) = @_;
3294 3967
… …
3307 $self->SUPER::destroy; 3980 $self->SUPER::destroy;
3308} 3981}
3309 3982
3310############################################################################# 3983#############################################################################
3311 3984
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; 3985package CFPlus::UI::Root;
3674 3986
3675our @ISA = CFClient::UI::Container::; 3987our @ISA = CFPlus::UI::Container::;
3676 3988
3677use List::Util qw(min max); 3989use List::Util qw(min max);
3678 3990
3679use CFClient::OpenGL; 3991use CFPlus::OpenGL;
3680 3992
3681sub new { 3993sub new {
3682 my $class = shift; 3994 my $class = shift;
3683 3995
3684 my $self = $class->SUPER::new ( 3996 my $self = $class->SUPER::new (
3685 visible => 1, 3997 visible => 1,
3686 @_, 3998 @_,
3687 ); 3999 );
3688 4000
3689 Scalar::Util::weaken ($self->{root} = $self); 4001 CFPlus::weaken ($self->{root} = $self);
3690 4002
3691 $self 4003 $self
3692} 4004}
3693 4005
3694sub size_request { 4006sub size_request {
… …
3709 $coord = $max - $size if $coord > $max - $size; 4021 $coord = $max - $size if $coord > $max - $size;
3710 4022
3711 int $coord + 0.5 4023 int $coord + 0.5
3712} 4024}
3713 4025
3714sub size_allocate { 4026sub invoke_size_allocate {
3715 my ($self, $w, $h) = @_; 4027 my ($self, $w, $h) = @_;
3716 4028
3717 for my $child ($self->children) { 4029 for my $child ($self->children) {
3718 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 4030 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3719 4031
… …
3723 $X = _to_pixel $X, $W, $self->{w}; 4035 $X = _to_pixel $X, $W, $self->{w};
3724 $Y = _to_pixel $Y, $H, $self->{h}; 4036 $Y = _to_pixel $Y, $H, $self->{h};
3725 4037
3726 $child->configure ($X, $Y, $W, $H); 4038 $child->configure ($X, $Y, $W, $H);
3727 } 4039 }
4040
4041 1
3728} 4042}
3729 4043
3730sub coord2local { 4044sub coord2local {
3731 my ($self, $x, $y) = @_; 4045 my ($self, $x, $y) = @_;
3732 4046
… …
3787 while ($self->{refresh_hook}) { 4101 while ($self->{refresh_hook}) {
3788 $_->() 4102 $_->()
3789 for values %{delete $self->{refresh_hook}}; 4103 for values %{delete $self->{refresh_hook}};
3790 } 4104 }
3791 4105
3792 if ($self->{realloc}) { 4106 while ($self->{realloc}) {
3793 my %queue; 4107 my %queue;
3794 my @queue; 4108 my @queue;
3795 my $widget; 4109 my $widget;
3796 4110
3797 outer: 4111 outer:
… …
3844 } 4158 }
3845 } 4159 }
3846 4160
3847 delete $self->{realloc}{$widget+0}; 4161 delete $self->{realloc}{$widget+0};
3848 } 4162 }
3849 }
3850 4163
3851 while (my $size_alloc = delete $self->{size_alloc}) { 4164 while (my $size_alloc = delete $self->{size_alloc}) {
3852 my @queue = sort { $b->{visible} <=> $a->{visible} } 4165 my @queue = sort { $a->{visible} <=> $b->{visible} }
3853 values %$size_alloc; 4166 values %$size_alloc;
3854 4167
3855 while () { 4168 while () {
3856 my $widget = pop @queue || last; 4169 my $widget = pop @queue || last;
3857 4170
3858 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 4171 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3859 4172
3860 $w = 0 if $w < 0; 4173 $w = max $widget->{min_w}, $w;
3861 $h = 0 if $h < 0; 4174 $h = max $widget->{min_h}, $h;
3862 4175
4176# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
4177# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
4178
4179 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
4180 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
4181
3863 $w = int $w + 0.5; 4182 $w = int $w + 0.5;
3864 $h = int $h + 0.5; 4183 $h = int $h + 0.5;
3865 4184
3866 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) { 4185 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3867 $widget->{old_w} = $widget->{w}; 4186 $widget->{old_w} = $widget->{w};
3868 $widget->{old_h} = $widget->{h}; 4187 $widget->{old_h} = $widget->{h};
3869 4188
3870 $widget->{w} = $w; 4189 $widget->{w} = $w;
3871 $widget->{h} = $h; 4190 $widget->{h} = $h;
3872 4191
3873 $widget->emit (size_allocate => $w, $h); 4192 $widget->emit (size_allocate => $w, $h);
4193 }
3874 } 4194 }
3875 } 4195 }
3876 } 4196 }
3877 4197
3878 while ($self->{post_alloc_hook}) { 4198 while ($self->{post_alloc_hook}) {
3879 $_->() 4199 $_->()
3880 for values %{delete $self->{post_alloc_hook}}; 4200 for values %{delete $self->{post_alloc_hook}};
3881 } 4201 }
3882
3883 4202
3884 glViewport 0, 0, $::WIDTH, $::HEIGHT; 4203 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3885 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 4204 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3886 glClear GL_COLOR_BUFFER_BIT; 4205 glClear GL_COLOR_BUFFER_BIT;
3887 4206
… …
3890 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 4209 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3891 glMatrixMode GL_MODELVIEW; 4210 glMatrixMode GL_MODELVIEW;
3892 glLoadIdentity; 4211 glLoadIdentity;
3893 4212
3894 { 4213 {
3895 package CFClient::UI::Base; 4214 package CFPlus::UI::Base;
3896 4215
3897 ($draw_x, $draw_y, $draw_w, $draw_h) = 4216 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3898 (0, 0, $self->{w}, $self->{h}); 4217 (0, 0, $self->{w}, $self->{h});
3899 }
3900 4218
3901 $self->_draw; 4219 $self->_draw;
4220 }
3902} 4221}
3903 4222
3904############################################################################# 4223#############################################################################
3905 4224
3906package CFClient::UI; 4225package CFPlus::UI;
3907 4226
3908$ROOT = new CFClient::UI::Root; 4227$ROOT = new CFPlus::UI::Root;
3909$TOOLTIP = new CFClient::UI::Tooltip z => 900; 4228$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
3910 4229
39111 42301
3912 4231

Diff Legend

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