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.316 by root, Sun Jul 2 13:57:58 2006 UTC vs.
Revision 1.412 by root, Sun Jul 22 20:08:17 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->emit ("focus_out"); 320 $self->emit ("focus_out");
287 $self->emit (visibility_change => 0); 321 $self->emit (visibility_change => 0);
288} 322}
… …
290sub set_visibility { 324sub set_visibility {
291 my ($self, $visible) = @_; 325 my ($self, $visible) = @_;
292 326
293 return if $self->{visible} == $visible; 327 return if $self->{visible} == $visible;
294 328
295 $visible ? $self->hide 329 $visible ? $self->show
296 : $self->show; 330 : $self->hide;
297} 331}
298 332
299sub toggle_visibility { 333sub toggle_visibility {
300 my ($self) = @_; 334 my ($self) = @_;
301 335
… …
345 my ($self, $x, $y, $w, $h) = @_; 379 my ($self, $x, $y, $w, $h) = @_;
346 380
347 if ($self->{aspect}) { 381 if ($self->{aspect}) {
348 my ($ow, $oh) = ($w, $h); 382 my ($ow, $oh) = ($w, $h);
349 383
350 $w = List::Util::min $w, int $h * $self->{aspect}; 384 $w = List::Util::min $w, CFPlus::ceil $h * $self->{aspect};
351 $h = List::Util::min $h, int $w / $self->{aspect}; 385 $h = List::Util::min $h, CFPlus::ceil $w / $self->{aspect};
352 386
353 # use alignment to adjust x, y 387 # use alignment to adjust x, y
354 388
355 $x += int 0.5 * ($ow - $w); 389 $x += int 0.5 * ($ow - $w);
356 $y += int 0.5 * ($oh - $h); 390 $y += int 0.5 * ($oh - $h);
… …
397 431
398 return if $self->{tooltip} eq $tooltip; 432 return if $self->{tooltip} eq $tooltip;
399 433
400 $self->{tooltip} = $tooltip; 434 $self->{tooltip} = $tooltip;
401 435
402 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 436 if ($CFPlus::UI::TOOLTIP->{owner} == $self) {
403 delete $CFClient::UI::TOOLTIP->{owner}; 437 delete $CFPlus::UI::TOOLTIP->{owner};
404 $CFClient::UI::TOOLTIP_WATCHER->cb->(); 438 $CFPlus::UI::TOOLTIP_WATCHER->cb->();
405 } 439 }
406} 440}
407 441
408# translate global coordinates to local coordinate system 442# translate global coordinates to local coordinate system
409sub coord2local { 443sub coord2local {
410 my ($self, $x, $y) = @_; 444 my ($self, $x, $y) = @_;
411 445
446 Carp::confess unless $self->{parent};#d#
447
412 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y}) 448 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
413} 449}
414 450
415# translate local coordinates to global coordinate system 451# translate local coordinates to global coordinate system
416sub coord2global { 452sub coord2global {
417 my ($self, $x, $y) = @_; 453 my ($self, $x, $y) = @_;
418 454
455 Carp::confess unless $self->{parent};#d#
456
419 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y}) 457 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
420} 458}
421 459
422sub invoke_focus_in { 460sub invoke_focus_in {
423 my ($self) = @_; 461 my ($self) = @_;
424 462
425 return if $FOCUS == $self; 463 return if $FOCUS == $self;
426 return unless $self->{can_focus}; 464 return unless $self->{can_focus};
427 465
428 my $focus = $FOCUS; $FOCUS = $self; 466 $FOCUS = $self;
429 467
430 $focus->update if $focus; 468 $self->update;
431 $FOCUS->update;
432 469
433 0 470 0
434} 471}
435 472
436sub invoke_focus_out { 473sub invoke_focus_out {
437 my ($self) = @_; 474 my ($self) = @_;
438 475
439 return unless $FOCUS == $self; 476 return unless $FOCUS == $self;
440 477
441 my $focus = $FOCUS; undef $FOCUS; 478 undef $FOCUS;
442 479
443 $focus->update if $focus; #? 480 $self->update;
444 481
445 $::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus 482 $::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus
446 unless $FOCUS; 483 unless $FOCUS;
447 484
448 0 485 0
449} 486}
450 487
451sub grab_focus { 488sub grab_focus {
452 my ($self) = @_; 489 my ($self) = @_;
453 490
491 $FOCUS->emit ("focus_out") if $FOCUS;
454 $self->emit ("focus_in"); 492 $self->emit ("focus_in");
455} 493}
456 494
457sub invoke_mouse_motion { 1 } 495sub invoke_mouse_motion { 0 }
458sub invoke_button_up { 1 } 496sub invoke_button_up { 0 }
459sub invoke_key_down { 1 } 497sub invoke_key_down { 0 }
460sub invoke_key_up { 1 } 498sub invoke_key_up { 0 }
499sub invoke_mouse_wheel { 0 }
461 500
462sub invoke_button_down { 501sub invoke_button_down {
463 my ($self, $ev, $x, $y) = @_; 502 my ($self, $ev, $x, $y) = @_;
464 503
465 $self->grab_focus; 504 $self->grab_focus;
466 505
467 1 506 0
468} 507}
469 508
470sub connect { 509sub connect {
471 my ($self, $signal, $cb) = @_; 510 my ($self, $signal, $cb) = @_;
472 511
473 push @{ $self->{signal_cb}{$signal} }, $cb; 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 }
474} 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);
475 532
476sub emit { 533sub emit {
477 my ($self, $signal, @args) = @_; 534 my ($self, $signal, @args) = @_;
478 535
479 #d##TODO# stop propagating at first true, do not use sum 536 # I do not really like this solution, but I do not like duplication
480 (List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}) # before 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
481 || ($self->can ("invoke_$signal") || sub { 1 })->($self, @args) # closure 547 ($self->can ("invoke_$signal") || sub { 1 }), # closure
548 ) {
549 return $cb->($self, @args, @append) || next;
550 }
551
552 # parent
482 || ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent 553 $self->{parent} && $self->{parent}->emit ($signal, @args)
483} 554}
484 555
485sub find_widget { 556#sub find_widget {
486 my ($self, $x, $y) = @_; 557# in .xs
487
488 return () unless $self->{can_events};
489
490 return $self
491 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
492 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
493
494 ()
495}
496 558
497sub set_parent { 559sub set_parent {
498 my ($self, $parent) = @_; 560 my ($self, $parent) = @_;
499 561
500 Scalar::Util::weaken ($self->{parent} = $parent); 562 CFPlus::weaken ($self->{parent} = $parent);
501 $self->set_visible if $parent->{visible}; 563 $self->set_visible if $parent->{visible};
502} 564}
503 565
504sub realloc { 566sub realloc {
505 my ($self) = @_; 567 my ($self) = @_;
… …
531 593
532# 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
533# functions seems pointless. 595# functions seems pointless.
534our ($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
535 597
536sub draw { 598#sub draw {
537 my ($self) = @_; 599#CFPlus.xs
538
539 return unless $self->{h} && $self->{w};
540
541 # update screen rectangle
542 local $draw_x = $draw_x + $self->{x};
543 local $draw_y = $draw_y + $self->{y};
544
545 # skip widgets that are entirely outside the drawing area
546 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
547 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
548
549 glPushMatrix;
550 glTranslate $self->{x}, $self->{y}, 0;
551
552 if ($self == $HOVER && $self->{can_hover}) {
553 glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
554 glEnable GL_BLEND;
555 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
556 glBegin GL_QUADS;
557 glVertex 0 , 0;
558 glVertex $self->{w}, 0;
559 glVertex $self->{w}, $self->{h};
560 glVertex 0 , $self->{h};
561 glEnd;
562 glDisable GL_BLEND;
563 }
564
565 if ($ENV{CFPLUS_DEBUG} & 1) {
566 glPushMatrix;
567 glColor 1, 1, 0, 1;
568 glTranslate 0.375, 0.375;
569 glBegin GL_LINE_LOOP;
570 glVertex 0 , 0;
571 glVertex $self->{w} - 1, 0;
572 glVertex $self->{w} - 1, $self->{h} - 1;
573 glVertex 0 , $self->{h} - 1;
574 glEnd;
575 glPopMatrix;
576 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
577 }
578
579 $self->_draw;
580 glPopMatrix;
581}
582 600
583sub _draw { 601sub _draw {
584 my ($self) = @_; 602 my ($self) = @_;
585 603
586 warn "no draw defined for $self\n"; 604 warn "no draw defined for $self\n";
587} 605}
588 606
589sub DESTROY { 607sub DESTROY {
590 my ($self) = @_; 608 my ($self) = @_;
591 609
592 delete $WIDGET{$self+0}; 610 return if CFPlus::in_destruct;
593 611
594 eval { $self->destroy }; 612 eval { $self->destroy };
595 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};
596} 616}
597 617
598############################################################################# 618#############################################################################
599 619
600package CFClient::UI::DrawBG; 620package CFPlus::UI::DrawBG;
601 621
602our @ISA = CFClient::UI::Base::; 622our @ISA = CFPlus::UI::Base::;
603 623
604use strict; 624use strict;
605use CFClient::OpenGL; 625use CFPlus::OpenGL;
606 626
607sub new { 627sub new {
608 my $class = shift; 628 my $class = shift;
609 629
610 # range [value, low, high, page] 630 # range [value, low, high, page]
… …
641 } 661 }
642} 662}
643 663
644############################################################################# 664#############################################################################
645 665
646package CFClient::UI::Empty; 666package CFPlus::UI::Empty;
647 667
648our @ISA = CFClient::UI::Base::; 668our @ISA = CFPlus::UI::Base::;
649 669
650sub new { 670sub new {
651 my ($class, %arg) = @_; 671 my ($class, %arg) = @_;
652 $class->SUPER::new (can_events => 0, %arg); 672 $class->SUPER::new (can_events => 0, %arg);
653} 673}
… …
660 680
661sub draw { } 681sub draw { }
662 682
663############################################################################# 683#############################################################################
664 684
665package CFClient::UI::Container; 685package CFPlus::UI::Container;
666 686
667our @ISA = CFClient::UI::Base::; 687our @ISA = CFPlus::UI::Base::;
668 688
669sub new { 689sub new {
670 my ($class, %arg) = @_; 690 my ($class, %arg) = @_;
671 691
672 my $children = delete $arg{children}; 692 my $children = delete $arg{children};
… …
676 can_events => 0, 696 can_events => 0,
677 %arg, 697 %arg,
678 ); 698 );
679 699
680 $self->add (@$children) 700 $self->add (@$children)
681 if $children; 701 if $children && @$children;
682 702
683 $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;
684} 712}
685 713
686sub add { 714sub add {
687 my ($self, @widgets) = @_; 715 my ($self, @widgets) = @_;
688 716
689 $_->set_parent ($self) 717 $_->set_parent ($self)
690 for @widgets; 718 for @widgets;
691 719
720 # TODO: only do this in widgets that need it, e.g. root, fixed
692 use sort 'stable'; 721 use sort 'stable';
693 722
694 $self->{children} = [ 723 $self->{children} = [
695 sort { $a->{z} <=> $b->{z} } 724 sort { $a->{z} <=> $b->{z} }
696 @{$self->{children}}, @widgets 725 @{$self->{children}}, @widgets
697 ]; 726 ];
698 727
699 $self->realloc; 728 $self->realloc;
729
730 map $_+0, @widgets
700} 731}
701 732
702sub children { 733sub children {
703 @{ $_[0]{children} } 734 @{ $_[0]{children} }
704} 735}
… …
715} 746}
716 747
717sub clear { 748sub clear {
718 my ($self) = @_; 749 my ($self) = @_;
719 750
720 my $children = delete $self->{children}; 751 my $children = $self->{children};
721 $self->{children} = []; 752 $self->{children} = [];
722 753
723 for (@$children) { 754 for (@$children) {
724 delete $_->{parent}; 755 delete $_->{parent};
725 $_->hide; 756 $_->hide;
… …
750 $_->draw for @{$self->{children}}; 781 $_->draw for @{$self->{children}};
751} 782}
752 783
753############################################################################# 784#############################################################################
754 785
755package CFClient::UI::Bin; 786package CFPlus::UI::Bin;
756 787
757our @ISA = CFClient::UI::Container::; 788our @ISA = CFPlus::UI::Container::;
758 789
759sub new { 790sub new {
760 my ($class, %arg) = @_; 791 my ($class, %arg) = @_;
761 792
762 my $child = (delete $arg{child}) || new CFClient::UI::Empty::; 793 my $child = (delete $arg{child}) || new CFPlus::UI::Empty::;
763 794
764 $class->SUPER::new (children => [$child], %arg) 795 $class->SUPER::new (children => [$child], %arg)
765} 796}
766 797
767sub add { 798sub add {
… …
774sub remove { 805sub remove {
775 my ($self, $widget) = @_; 806 my ($self, $widget) = @_;
776 807
777 $self->SUPER::remove ($widget); 808 $self->SUPER::remove ($widget);
778 809
779 $self->{children} = [new CFClient::UI::Empty] 810 $self->{children} = [new CFPlus::UI::Empty]
780 unless @{$self->{children}}; 811 unless @{$self->{children}};
781} 812}
782 813
783sub child { $_[0]->{children}[0] } 814sub child { $_[0]->{children}[0] }
784 815
… …
796 827
797############################################################################# 828#############################################################################
798 829
799# back-buffered drawing area 830# back-buffered drawing area
800 831
801package CFClient::UI::Window; 832package CFPlus::UI::Window;
802 833
803our @ISA = CFClient::UI::Bin::; 834our @ISA = CFPlus::UI::Bin::;
804 835
805use CFClient::OpenGL; 836use CFPlus::OpenGL;
806 837
807sub new { 838sub new {
808 my ($class, %arg) = @_; 839 my ($class, %arg) = @_;
809 840
810 my $self = $class->SUPER::new (%arg); 841 my $self = $class->SUPER::new (%arg);
… …
832} 863}
833 864
834sub render_child { 865sub render_child {
835 my ($self) = @_; 866 my ($self) = @_;
836 867
837 $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 {
838 glClearColor 0, 0, 0, 0; 869 glClearColor 0, 0, 0, 0;
839 glClear GL_COLOR_BUFFER_BIT; 870 glClear GL_COLOR_BUFFER_BIT;
840 871
841 { 872 {
842 package CFClient::UI::Base; 873 package CFPlus::UI::Base;
843 874
844 ($draw_x, $draw_y, $draw_w, $draw_h) = 875 local ($draw_x, $draw_y, $draw_w, $draw_h) =
845 (0, 0, $self->{w}, $self->{h}); 876 (0, 0, $self->{w}, $self->{h});
877
878 $self->_render;
846 } 879 }
847
848 $self->_render;
849 }; 880 };
850} 881}
851 882
852sub _draw { 883sub _draw {
853 my ($self) = @_; 884 my ($self) = @_;
854
855 my ($w, $h) = @$self{qw(w h)};
856 885
857 my $tex = $self->{texture} 886 my $tex = $self->{texture}
858 or return; 887 or return;
859 888
860 glEnable GL_TEXTURE_2D; 889 glEnable GL_TEXTURE_2D;
861 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 890 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
862 glColor 0, 0, 0, 1; 891 glColor 0, 0, 0, 1;
863 892
864 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 893 $tex->draw_quad_alpha_premultiplied (0, 0);
865 894
866 glDisable GL_TEXTURE_2D; 895 glDisable GL_TEXTURE_2D;
867} 896}
868 897
869############################################################################# 898#############################################################################
870 899
871package CFClient::UI::ViewPort; 900package CFPlus::UI::ViewPort;
872 901
902use List::Util qw(min max);
903
873our @ISA = CFClient::UI::Window::; 904our @ISA = CFPlus::UI::Window::;
874 905
875sub new { 906sub new {
876 my $class = shift; 907 my $class = shift;
877 908
878 $class->SUPER::new ( 909 $class->SUPER::new (
… …
885sub size_request { 916sub size_request {
886 my ($self) = @_; 917 my ($self) = @_;
887 918
888 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 919 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
889 920
890 $w = 10 if $self->{scroll_x}; 921 $w = 1 if $self->{scroll_x};
891 $h = 10 if $self->{scroll_y}; 922 $h = 1 if $self->{scroll_y};
892 923
893 ($w, $h) 924 ($w, $h)
894} 925}
895 926
896sub invoke_size_allocate { 927sub invoke_size_allocate {
… …
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
991#TODO# update range on size_allocate depending on child
992 1068
993sub add { 1069sub add {
994 my ($self, $widget) = @_; 1070 my ($self, $widget) = @_;
995 1071
996 $self->{vp}->add ($self->{child} = $widget); 1072 $self->{vp}->add ($self->{child} = $widget);
997} 1073}
998 1074
999sub update_slider { 1075sub update_slider {
1000 my ($self) = @_; 1076 my ($self) = @_;
1001 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});
1002 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]); 1082 $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
1003}
1004 1083
1005sub update { 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 {
1006 my ($self) = @_; 1106 my ($self, $ev) = @_;
1007 1107
1008 $self->SUPER::update; 1108 $self->grab_focus;
1009 1109
1010 $self->update_slider; 1110 my $ox = $self->{vp}{view_x};
1111 my $oy = $self->{vp}{view_y};
1112
1113 $self->{motion} = sub {
1114 my ($ev, $x, $y) = @_;
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
1011} 1162}
1012 1163
1013sub invoke_size_allocate { 1164sub invoke_size_allocate {
1014 my ($self, $w, $h) = @_; 1165 my ($self, $w, $h) = @_;
1015 1166
1016 $self->update_slider; 1167 $self->update_slider;
1017
1018 $self->SUPER::invoke_size_allocate ($w, $h) 1168 $self->SUPER::invoke_size_allocate ($w, $h)
1019} 1169}
1020 1170
1021############################################################################# 1171#############################################################################
1022 1172
1023package CFClient::UI::Frame; 1173package CFPlus::UI::Frame;
1024 1174
1025our @ISA = CFClient::UI::Bin::; 1175our @ISA = CFPlus::UI::Bin::;
1026 1176
1027use CFClient::OpenGL; 1177use CFPlus::OpenGL;
1028 1178
1029sub new { 1179sub new {
1030 my $class = shift; 1180 my $class = shift;
1031 1181
1032 $class->SUPER::new ( 1182 $class->SUPER::new (
… …
1058 $self->SUPER::_draw; 1208 $self->SUPER::_draw;
1059} 1209}
1060 1210
1061############################################################################# 1211#############################################################################
1062 1212
1063package CFClient::UI::FancyFrame; 1213package CFPlus::UI::FancyFrame;
1064 1214
1065our @ISA = CFClient::UI::Bin::; 1215our @ISA = CFPlus::UI::Bin::;
1066 1216
1067use 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;
1068 1318
1069my $bg = 1319my $bg =
1070 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png", 1320 new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1071 mipmap => 1, wrap => 1; 1321 mipmap => 1, wrap => 1;
1072 1322
1073my @border = 1323my @border =
1074 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1324 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1075 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);
1076 1330
1077sub new { 1331sub new {
1078 my ($class, %arg) = @_; 1332 my ($class, %arg) = @_;
1079 1333
1080 my $self = $class->SUPER::new ( 1334 my $self = $class->SUPER::new (
1081 bg => [1, 1, 1, 1], 1335 bg => [1, 1, 1, 1],
1082 border_bg => [1, 1, 1, 1], 1336 border_bg => [1, 1, 1, 1],
1083 border => 0.6, 1337 border => 0.6,
1084 can_events => 1, 1338 can_events => 1,
1085 min_w => 16, 1339 min_w => 64,
1086 min_h => 16, 1340 min_h => 32,
1087 %arg, 1341 %arg,
1088 ); 1342 );
1089 1343
1090 $self->{title_widget} = new CFClient::UI::Label 1344 $self->{title_widget} = new CFPlus::UI::Label
1091 align => 0, 1345 align => 0,
1092 valign => 1, 1346 valign => 1,
1093 text => $self->{title}, 1347 text => $self->{title},
1094 fontsize => $self->{border}, 1348 fontsize => $self->{border},
1095 if exists $self->{title}; 1349 if exists $self->{title};
1096 1350
1097 if ($self->{has_close_button}) { 1351 if ($self->{has_close_button}) {
1098 $self->{close_button} = 1352 $self->{close_button} =
1099 new CFClient::UI::ImageButton 1353 new CFPlus::UI::ImageButton
1100 path => 'x1_close.png', 1354 path => 'x1_close.png',
1101 on_activate => sub { $self->hide }; 1355 on_activate => sub { $self->emit ("delete") };
1102 1356
1103 $self->CFClient::UI::Container::add ($self->{close_button}); 1357 $self->CFPlus::UI::Container::add ($self->{close_button});
1104 } 1358 }
1105 1359
1106 $self 1360 $self
1107} 1361}
1108 1362
1109sub add { 1363sub add {
1110 my ($self, @widgets) = @_; 1364 my ($self, @widgets) = @_;
1111 1365
1112 $self->SUPER::add (@widgets); 1366 $self->SUPER::add (@widgets);
1113 $self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button}; 1367 $self->CFPlus::UI::Container::add ($self->{close_button}) if $self->{close_button};
1114 $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};
1115} 1369}
1116 1370
1117sub border { 1371sub border {
1118 int $_[0]{border} * $::FONTSIZE 1372 int $_[0]{border} * $::FONTSIZE
1119} 1373}
… …
1152 $self->child->configure ($border, $border, $w, $h); 1406 $self->child->configure ($border, $border, $w, $h);
1153 1407
1154 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border) 1408 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1155 if $self->{close_button}; 1409 if $self->{close_button};
1156 1410
1411 1
1412}
1413
1414sub invoke_delete {
1415 my ($self) = @_;
1416
1417 $self->hide;
1418
1157 1 1419 1
1158} 1420}
1159 1421
1160sub invoke_button_down { 1422sub invoke_button_down {
1161 my ($self, $ev, $x, $y) = @_; 1423 my ($self, $ev, $x, $y) = @_;
… …
1219 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1481 $self->{motion}->($ev, $x, $y) if $self->{motion};
1220 1482
1221 ! ! $self->{motion} 1483 ! ! $self->{motion}
1222} 1484}
1223 1485
1486sub invoke_visibility_change {
1487 my ($self, $visible) = @_;
1488
1489 delete $self->{motion} unless $visible;
1490
1491 0
1492}
1493
1224sub _draw { 1494sub _draw {
1225 my ($self) = @_; 1495 my ($self) = @_;
1226 1496
1227 my $child = $self->{children}[0]; 1497 my $child = $self->{children}[0];
1228 1498
… …
1233 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1503 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1234 1504
1235 my $border = $self->border; 1505 my $border = $self->border;
1236 1506
1237 glColor @{ $self->{border_bg} }; 1507 glColor @{ $self->{border_bg} };
1238 $border[0]->draw_quad_alpha (0, 0, $w, $border); 1508 $border[0]->draw_quad_alpha ( 0, 0, $w, $border);
1239 $border[1]->draw_quad_alpha (0, $border, $border, $ch); 1509 $border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
1240 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1510 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1241 $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);
1242 1526
1243 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1527 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1244 glColor @{ $self->{bg} }; 1528 glColor @{ $self->{bg} };
1245 1529
1246 # TODO: repeat texture not scale 1530 # TODO: repeat texture not scale
… …
1265 if $self->{close_button}; 1549 if $self->{close_button};
1266} 1550}
1267 1551
1268############################################################################# 1552#############################################################################
1269 1553
1270package CFClient::UI::Table; 1554package CFPlus::UI::Table;
1271 1555
1272our @ISA = CFClient::UI::Base::; 1556our @ISA = CFPlus::UI::Container::;
1273 1557
1274use List::Util qw(max sum); 1558use List::Util qw(max sum);
1275 1559
1276use CFClient::OpenGL; 1560use CFPlus::OpenGL;
1277 1561
1278sub new { 1562sub new {
1279 my $class = shift; 1563 my $class = shift;
1280 1564
1281 $class->SUPER::new ( 1565 $class->SUPER::new (
1282 col_expand => [], 1566 col_expand => [],
1567 row_expand => [],
1283 @_, 1568 @_,
1284 ) 1569 )
1285} 1570}
1286 1571
1287sub children {
1288 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1289}
1290
1291sub add { 1572sub add {
1292 my ($self, $x, $y, $child) = @_; 1573 my ($self, @widgets) = @_;
1293 1574
1294 $child->set_parent ($self); 1575 for my $child (@widgets) {
1295 $self->{children}[$y][$x] = $child; 1576 $child->{rowspan} ||= 1;
1577 $child->{colspan} ||= 1;
1578 }
1296 1579
1297 $self->realloc; 1580 $self->SUPER::add (@widgets);
1298} 1581}
1299 1582
1300sub 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 {
1301 my ($self, $child) = @_; 1601 my ($self) = @_;
1302 1602
1303 # TODO: not yet implemented 1603 my (@w, @h);
1304}
1305
1306# TODO: move to container class maybe? send children a signal on removal?
1307sub clear {
1308 my ($self) = @_;
1309 1604
1310 my @children = $self->children; 1605 my @children = $self->children;
1311 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 }
1312 1616 }
1313 for (@children) {
1314 delete $_->{parent};
1315 $_->hide;
1316 }
1317 1617
1318 $self->realloc; 1618 # second pass, rows
1319} 1619 for my $widget (sort { $a->{rowspan} <=> $b->{rowspan} } @children) {
1320
1321sub get_wh {
1322 my ($self) = @_;
1323
1324 my (@w, @h);
1325
1326 for my $y (0 .. $#{$self->{children}}) {
1327 my $row = $self->{children}[$y]
1328 or next;
1329
1330 for my $x (0 .. $#$row) {
1331 my $widget = $row->[$x]
1332 or next;
1333 my ($w, $h) = @$widget{qw(req_w req_h)}; 1620 my ($r, $h, $rs) = @$widget{qw(row req_h rowspan)};
1334 1621
1335 $w[$x] = max $w[$x], $w; 1622 my $sh = sum @h[$r .. $r + $rs - 1];
1336 $h[$y] = max $h[$y], $h; 1623
1624 if ($h > $sh) {
1625 $_ += ($h - $sh) / ($sh ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1];
1337 } 1626 }
1338 } 1627 }
1339 1628
1340 (\@w, \@h) 1629 (\@w, \@h)
1341} 1630}
… …
1357 my ($ws, $hs) = $self->get_wh; 1646 my ($ws, $hs) = $self->get_wh;
1358 1647
1359 my $req_w = (sum @$ws) || 1; 1648 my $req_w = (sum @$ws) || 1;
1360 my $req_h = (sum @$hs) || 1; 1649 my $req_h = (sum @$hs) || 1;
1361 1650
1362 # TODO: nicer code && do row_expand 1651 # now linearly scale the rows/columns to the allocated size
1363 my @col_expand = @{$self->{col_expand}}; 1652 my @col_expand = @{$self->{col_expand}};
1364 @col_expand = (1) x @$ws unless @col_expand; 1653 @col_expand = (1) x @$ws unless @col_expand;
1365 my $col_expand = (sum @col_expand) || 1; 1654 my $col_expand = (sum @col_expand) || 1;
1366 1655
1367 # linearly scale sizes
1368 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1656 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1369 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1370 1657
1371 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
1372 CFClient::UI::harmonize $hs; 1666 CFPlus::UI::harmonize $hs;
1373 1667
1374 my $y; 1668 my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
1669 my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
1375 1670
1376 for my $r (0 .. $#{$self->{children}}) { 1671 for my $widget ($self->children) {
1377 my $row = $self->{children}[$r] 1672 my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(row col req_w req_h rowspan colspan)};
1378 or next;
1379 1673
1380 my $x = 0; 1674 $widget->configure (
1381 my $row_h = $hs->[$r]; 1675 $x[$c], $y[$r],
1676 $x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],
1382 1677 );
1383 for my $c (0 .. $#$row) { 1678 }
1384 my $col_w = $ws->[$c];
1385 1679
1386 if (my $widget = $row->[$c]) { 1680 1
1387 $widget->configure ($x, $y, $col_w, $row_h); 1681}
1388 }
1389 1682
1390 $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};
1391 } 1710 }
1711 }
1392 1712
1393 $y += $row_h; 1713 my $W = $x2 - $x1;
1714 my $H = $y2 - $y1;
1715
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 {
1734 my ($self, $W, $H) = @_;
1735
1736 for my $child ($self->visible_children) {
1737 my $x = _scale $child->{c_rel}, $child->{c_x}, $W;
1738 my $y = _scale $child->{c_rel}, $child->{c_y}, $H;
1739
1740 $x += $child->{c_halign} * $child->{req_w};
1741 $y += $child->{c_valign} * $child->{req_h};
1742
1743 $child->configure (int $x, int $y, $child->{req_w}, $child->{req_h});
1394 } 1744 }
1395 1745
1396 1 1746 1
1397} 1747}
1398 1748
1399sub find_widget {
1400 my ($self, $x, $y) = @_;
1401
1402 $x -= $self->{x};
1403 $y -= $self->{y};
1404
1405 my $res;
1406
1407 for (grep $_, map @$_, grep $_, @{ $self->{children} }) {
1408 $res = $_->find_widget ($x, $y)
1409 and return $res;
1410 }
1411
1412 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
1413}
1414
1415sub _draw {
1416 my ($self) = @_;
1417
1418 for (grep $_, @{$self->{children}}) {
1419 $_->draw for grep $_, @$_;
1420 }
1421}
1422
1423############################################################################# 1749#############################################################################
1424 1750
1425package CFClient::UI::Box; 1751package CFPlus::UI::Box;
1426 1752
1427our @ISA = CFClient::UI::Container::; 1753our @ISA = CFPlus::UI::Container::;
1428 1754
1429sub size_request { 1755sub size_request {
1430 my ($self) = @_; 1756 my ($self) = @_;
1431 1757
1432 $self->{vertical} 1758 $self->{vertical}
… …
1465 $req[$_] += $space * $children[$_]{expand} 1791 $req[$_] += $space * $children[$_]{expand}
1466 for 0 .. $#children; 1792 for 0 .. $#children;
1467 } 1793 }
1468 } 1794 }
1469 1795
1470 CFClient::UI::harmonize \@req; 1796 CFPlus::UI::harmonize \@req;
1471 1797
1472 my $pos = 0; 1798 my $pos = 0;
1473 for (0 .. $#children) { 1799 for (0 .. $#children) {
1474 my $alloc = $req[$_]; 1800 my $alloc = $req[$_];
1475 $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));
… …
1480 1 1806 1
1481} 1807}
1482 1808
1483############################################################################# 1809#############################################################################
1484 1810
1485package CFClient::UI::HBox; 1811package CFPlus::UI::HBox;
1486 1812
1487our @ISA = CFClient::UI::Box::; 1813our @ISA = CFPlus::UI::Box::;
1488 1814
1489sub new { 1815sub new {
1490 my $class = shift; 1816 my $class = shift;
1491 1817
1492 $class->SUPER::new ( 1818 $class->SUPER::new (
… …
1495 ) 1821 )
1496} 1822}
1497 1823
1498############################################################################# 1824#############################################################################
1499 1825
1500package CFClient::UI::VBox; 1826package CFPlus::UI::VBox;
1501 1827
1502our @ISA = CFClient::UI::Box::; 1828our @ISA = CFPlus::UI::Box::;
1503 1829
1504sub new { 1830sub new {
1505 my $class = shift; 1831 my $class = shift;
1506 1832
1507 $class->SUPER::new ( 1833 $class->SUPER::new (
… …
1510 ) 1836 )
1511} 1837}
1512 1838
1513############################################################################# 1839#############################################################################
1514 1840
1515package CFClient::UI::Label; 1841package CFPlus::UI::Label;
1516 1842
1517our @ISA = CFClient::UI::DrawBG::; 1843our @ISA = CFPlus::UI::DrawBG::;
1518 1844
1519use CFClient::OpenGL; 1845use CFPlus::OpenGL;
1520 1846
1521sub new { 1847sub new {
1522 my ($class, %arg) = @_; 1848 my ($class, %arg) = @_;
1523 1849
1524 my $self = $class->SUPER::new ( 1850 my $self = $class->SUPER::new (
… …
1527 #active_bg => none 1853 #active_bg => none
1528 #font => default_font 1854 #font => default_font
1529 #text => initial text 1855 #text => initial text
1530 #markup => initial narkup 1856 #markup => initial narkup
1531 #max_w => maximum pixel width 1857 #max_w => maximum pixel width
1858 #style => 0, # render flags
1532 ellipsise => 3, # end 1859 ellipsise => 3, # end
1533 layout => (new CFClient::Layout), 1860 layout => (new CFPlus::Layout),
1534 fontsize => 1, 1861 fontsize => 1,
1535 align => -1, 1862 align => -1,
1536 valign => -1, 1863 valign => -1,
1537 padding_x => 2, 1864 padding_x => 2,
1538 padding_y => 2, 1865 padding_y => 2,
1539 can_events => 0, 1866 can_events => 0,
1540 %arg 1867 %arg
1541 ); 1868 );
1542 1869
1543 if (exists $self->{template}) { 1870 if (exists $self->{template}) {
1544 my $layout = new CFClient::Layout; 1871 my $layout = new CFPlus::Layout;
1545 $layout->set_text (delete $self->{template}); 1872 $layout->set_text (delete $self->{template});
1546 $self->{template} = $layout; 1873 $self->{template} = $layout;
1547 } 1874 }
1548 1875
1549 if (exists $self->{markup}) { 1876 if (exists $self->{markup}) {
… …
1553 } 1880 }
1554 1881
1555 $self 1882 $self
1556} 1883}
1557 1884
1558sub escape($) {
1559 local $_ = $_[0];
1560
1561 s/&/&amp;/g;
1562 s/>/&gt;/g;
1563 s/</&lt;/g;
1564
1565 $_
1566}
1567
1568sub update { 1885sub update {
1569 my ($self) = @_; 1886 my ($self) = @_;
1570 1887
1571 delete $self->{texture}; 1888 delete $self->{texture};
1572 $self->SUPER::update; 1889 $self->SUPER::update;
… …
1583 my ($self, $text) = @_; 1900 my ($self, $text) = @_;
1584 1901
1585 return if $self->{text} eq "T$text"; 1902 return if $self->{text} eq "T$text";
1586 $self->{text} = "T$text"; 1903 $self->{text} = "T$text";
1587 1904
1588 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1589 $self->{layout}->set_text ($text); 1905 $self->{layout}->set_text ($text);
1590 1906
1591 delete $self->{size_req}; 1907 delete $self->{size_req};
1592 $self->realloc; 1908 $self->realloc;
1593 $self->update; 1909 $self->update;
… …
1599 return if $self->{text} eq "M$markup"; 1915 return if $self->{text} eq "M$markup";
1600 $self->{text} = "M$markup"; 1916 $self->{text} = "M$markup";
1601 1917
1602 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1918 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1603 1919
1604 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1605 $self->{layout}->set_markup ($markup); 1920 $self->{layout}->set_markup ($markup);
1606 1921
1607 delete $self->{size_req}; 1922 delete $self->{size_req};
1608 $self->realloc; 1923 $self->realloc;
1609 $self->update; 1924 $self->update;
… …
1621 1936
1622 my ($w, $h) = $self->{layout}->size; 1937 my ($w, $h) = $self->{layout}->size;
1623 1938
1624 if (exists $self->{template}) { 1939 if (exists $self->{template}) {
1625 $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);
1626 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1942 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1627 1943
1628 my ($w2, $h2) = $self->{template}->size; 1944 my ($w2, $h2) = $self->{template}->size;
1629 1945
1630 $w = List::Util::max $w, $w2; 1946 $w = List::Util::max $w, $w2;
… …
1664 1980
1665sub reconfigure { 1981sub reconfigure {
1666 my ($self) = @_; 1982 my ($self) = @_;
1667 1983
1668 delete $self->{size_req}; 1984 delete $self->{size_req};
1985 delete $self->{texture};
1669 1986
1670 $self->SUPER::reconfigure; 1987 $self->SUPER::reconfigure;
1671} 1988}
1672 1989
1673sub _draw { 1990sub _draw {
1674 my ($self) = @_; 1991 my ($self) = @_;
1675 1992
1676 $self->SUPER::_draw; # draw background, if applicable 1993 $self->SUPER::_draw; # draw background, if applicable
1677 1994
1678 my $tex = $self->{texture} ||= do { 1995 my $size = $self->{texture} ||= do {
1679 $self->{layout}->set_foreground (@{$self->{fg}}); 1996 $self->{layout}->set_foreground (@{$self->{fg}});
1680 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1997 $self->{layout}->set_font ($self->{font}) if $self->{font};
1681 $self->{layout}->set_width ($self->{w}); 1998 $self->{layout}->set_width ($self->{w});
1682 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1999 $self->{layout}->set_ellipsise ($self->{ellipsise});
1683 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 2000 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1684 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2001 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1685 2002
1686 new_from_layout CFClient::Texture $self->{layout} 2003 [$self->{layout}->size]
1687 }; 2004 };
1688 2005
1689 unless (exists $self->{ox}) { 2006 unless (exists $self->{ox}) {
1690 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 2007 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1691 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x} 2008 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1692 : ($self->{w} - $tex->{w}) * 0.5); 2009 : ($self->{w} - $size->[0]) * 0.5);
1693 2010
1694 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 2011 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1695 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 2012 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1696 : ($self->{h} - $tex->{h}) * 0.5); 2013 : ($self->{h} - $size->[1]) * 0.5);
1697 }; 2014 };
1698 2015
1699 glEnable GL_TEXTURE_2D; 2016# unless ($self->{list}) {
1700 2017# $self->{list} = CFPlus::OpenGL::glGenList;
1701 my $w = List::Util::min $self->{w} + 4, $tex->{w}; 2018# CFPlus::OpenGL::glNewList $self->{list};
1702 my $h = List::Util::min $self->{h} + 2, $tex->{h}; 2019# $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1703 2020# CFPlus::OpenGL::glEndList;
1704 if ($tex->{format} == GL_ALPHA) {
1705 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1706 glColor @{$self->{fg}};
1707 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}, $w, $h);
1708 } else {
1709 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1710 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}, $w, $h);
1711 } 2021# }
2022#
2023# CFPlus::OpenGL::glCallList $self->{list};
1712 2024
1713 glDisable GL_TEXTURE_2D; 2025 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1714} 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#}
1715 2035
1716############################################################################# 2036#############################################################################
1717 2037
1718package CFClient::UI::EntryBase; 2038package CFPlus::UI::EntryBase;
1719 2039
1720our @ISA = CFClient::UI::Label::; 2040our @ISA = CFPlus::UI::Label::;
1721 2041
1722use CFClient::OpenGL; 2042use CFPlus::OpenGL;
1723 2043
1724sub new { 2044sub new {
1725 my $class = shift; 2045 my $class = shift;
1726 2046
1727 $class->SUPER::new ( 2047 $class->SUPER::new (
… …
1731 active_fg => [0, 0, 0], 2051 active_fg => [0, 0, 0],
1732 can_hover => 1, 2052 can_hover => 1,
1733 can_focus => 1, 2053 can_focus => 1,
1734 valign => 0, 2054 valign => 0,
1735 can_events => 1, 2055 can_events => 1,
2056 ellipsise => 0,
1736 #text => ... 2057 #text => ...
1737 #hidden => "*", 2058 #hidden => "*",
1738 @_ 2059 @_
1739 ) 2060 )
1740} 2061}
… …
1785 my $sym = $ev->{sym}; 2106 my $sym = $ev->{sym};
1786 my $uni = $ev->{unicode}; 2107 my $uni = $ev->{unicode};
1787 2108
1788 my $text = $self->get_text; 2109 my $text = $self->get_text;
1789 2110
2111 $self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
2112
1790 if ($uni == 8) { 2113 if ($uni == 8) {
1791 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 2114 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1792 } elsif ($uni == 127) { 2115 } elsif ($uni == 127) {
1793 substr $text, $self->{cursor}, 1, ""; 2116 substr $text, $self->{cursor}, 1, "";
1794 } elsif ($sym == CFClient::SDLK_LEFT) { 2117 } elsif ($sym == CFPlus::SDLK_LEFT) {
1795 --$self->{cursor} if $self->{cursor}; 2118 --$self->{cursor} if $self->{cursor};
1796 } elsif ($sym == CFClient::SDLK_RIGHT) { 2119 } elsif ($sym == CFPlus::SDLK_RIGHT) {
1797 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 2120 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1798 } 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 = "";
1799 $self->{cursor} = 0; 2135 $self->{cursor} = 0;
1800 } elsif ($sym == CFClient::SDLK_END) {
1801 $self->{cursor} = length $text;
1802 } elsif ($uni == 27) { 2136 } elsif ($uni == 27) {
1803 $self->emit ('escape'); 2137 $self->emit ('escape');
1804 } elsif ($uni) { 2138 } elsif ($uni == 0x0d) {
2139 substr $text, $self->{cursor}++, 0, "\012";
2140 } elsif ($uni >= 0x20) {
1805 substr $text, $self->{cursor}++, 0, chr $uni; 2141 substr $text, $self->{cursor}++, 0, chr $uni;
1806 } else { 2142 } else {
1807 return 0; 2143 return 0;
1808 } 2144 }
1809 2145
1810 $self->_set_text ($text); 2146 $self->_set_text ($text);
1811 2147
1812 $self->realloc; 2148 $self->realloc;
2149 $self->update;
1813 2150
1814 1 2151 1
1815} 2152}
1816 2153
1817sub invoke_focus_in { 2154sub invoke_focus_in {
… …
1829 2166
1830 my $idx = $self->{layout}->xy_to_index ($x, $y); 2167 my $idx = $self->{layout}->xy_to_index ($x, $y);
1831 2168
1832 # byte-index to char-index 2169 # byte-index to char-index
1833 my $text = $self->{text}; 2170 my $text = $self->{text};
1834 utf8::encode $text; 2171 utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1835 $self->{cursor} = length substr $text, 0, $idx; 2172 $self->{cursor} = length $text;
1836 2173
1837 $self->_set_text ($self->{text}); 2174 $self->_set_text ($self->{text});
1838 $self->update; 2175 $self->update;
1839 2176
1840 1 2177 1
… …
1879 utf8::encode $text; 2216 utf8::encode $text;
1880 2217
1881 @$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)
1882 } 2219 }
1883 2220
1884 glColor @{$self->{fg}};
1885 glBegin GL_LINES; 2221 glBegin GL_LINES;
1886 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};
1887 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};
1888 glEnd; 2224 glEnd;
1889 } 2225 }
1890} 2226}
1891 2227
2228#############################################################################
2229
1892package CFClient::UI::Entry; 2230package CFPlus::UI::Entry;
1893 2231
1894our @ISA = CFClient::UI::EntryBase::; 2232our @ISA = CFPlus::UI::EntryBase::;
1895 2233
1896use CFClient::OpenGL; 2234use CFPlus::OpenGL;
1897 2235
1898sub invoke_key_down { 2236sub invoke_key_down {
1899 my ($self, $ev) = @_; 2237 my ($self, $ev) = @_;
1900 2238
1901 my $sym = $ev->{sym}; 2239 my $sym = $ev->{sym};
1902 2240
1903 if ($sym == 13) { 2241 if ($ev->{uni} == 0x0d || $sym == 13) {
1904 unshift @{$self->{history}}, 2242 unshift @{$self->{history}},
1905 my $txt = $self->get_text; 2243 my $txt = $self->get_text;
1906 2244
1907 $self->{history_pointer} = -1; 2245 $self->{history_pointer} = -1;
1908 $self->{history_saveback} = ''; 2246 $self->{history_saveback} = '';
1909 $self->emit (activate => $txt); 2247 $self->emit (activate => $txt);
1910 $self->update; 2248 $self->update;
1911 2249
1912 } elsif ($sym == CFClient::SDLK_UP) { 2250 } elsif ($sym == CFPlus::SDLK_UP) {
1913 if ($self->{history_pointer} < 0) { 2251 if ($self->{history_pointer} < 0) {
1914 $self->{history_saveback} = $self->get_text; 2252 $self->{history_saveback} = $self->get_text;
1915 } 2253 }
1916 if (@{$self->{history} || []} > 0) { 2254 if (@{$self->{history} || []} > 0) {
1917 $self->{history_pointer}++; 2255 $self->{history_pointer}++;
… …
1919 $self->{history_pointer} = @{$self->{history} || []} - 1; 2257 $self->{history_pointer} = @{$self->{history} || []} - 1;
1920 } 2258 }
1921 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2259 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1922 } 2260 }
1923 2261
1924 } elsif ($sym == CFClient::SDLK_DOWN) { 2262 } elsif ($sym == CFPlus::SDLK_DOWN) {
1925 $self->{history_pointer}--; 2263 $self->{history_pointer}--;
1926 $self->{history_pointer} = -1 if $self->{history_pointer} < 0; 2264 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1927 2265
1928 if ($self->{history_pointer} >= 0) { 2266 if ($self->{history_pointer} >= 0) {
1929 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2267 $self->set_text ($self->{history}->[$self->{history_pointer}]);
… …
1938 1 2276 1
1939} 2277}
1940 2278
1941############################################################################# 2279#############################################################################
1942 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
1943package CFClient::UI::Button; 2320package CFPlus::UI::Button;
1944 2321
1945our @ISA = CFClient::UI::Label::; 2322our @ISA = CFPlus::UI::Label::;
1946 2323
1947use CFClient::OpenGL; 2324use CFPlus::OpenGL;
1948 2325
1949my @tex = 2326my @tex =
1950 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2327 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1951 qw(b1_button_active.png); 2328 qw(b1_button_inactive.png b1_button_active.png);
1952 2329
1953sub new { 2330sub new {
1954 my $class = shift; 2331 my $class = shift;
1955 2332
1956 $class->SUPER::new ( 2333 $class->SUPER::new (
1957 padding_x => 4, 2334 padding_x => 4,
1958 padding_y => 4, 2335 padding_y => 4,
1959 fg => [1, 1, 1], 2336 fg => [1.0, 1.0, 1.0],
1960 active_fg => [0, 0, 1], 2337 active_fg => [0.8, 0.8, 0.8],
1961 can_hover => 1, 2338 can_hover => 1,
1962 align => 0, 2339 align => 0,
1963 valign => 0, 2340 valign => 0,
1964 can_events => 1, 2341 can_events => 1,
1965 @_ 2342 @_
… …
1983 2360
1984 glEnable GL_TEXTURE_2D; 2361 glEnable GL_TEXTURE_2D;
1985 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2362 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1986 glColor 0, 0, 0, 1; 2363 glColor 0, 0, 0, 1;
1987 2364
2365 my $tex = $tex[$GRAB == $self];
1988 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2366 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1989 2367
1990 glDisable GL_TEXTURE_2D; 2368 glDisable GL_TEXTURE_2D;
1991 2369
1992 $self->SUPER::_draw; 2370 $self->SUPER::_draw;
1993} 2371}
1994 2372
1995############################################################################# 2373#############################################################################
1996 2374
2375package CFPlus::UI::CheckBox;
2376
2377our @ISA = CFPlus::UI::DrawBG::;
2378
2379my @tex =
2380 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2381 qw(c1_checkbox_bg.png c1_checkbox_active.png);
2382
2383use CFPlus::OpenGL;
2384
2385sub new {
2386 my $class = shift;
2387
2388 $class->SUPER::new (
2389 padding_x => 2,
2390 padding_y => 2,
2391 fg => [1, 1, 1],
2392 active_fg => [1, 1, 0],
2393 bg => [0, 0, 0, 0.2],
2394 active_bg => [1, 1, 1, 0.5],
2395 state => 0,
2396 can_hover => 1,
2397 @_
2398 )
2399}
2400
2401sub size_request {
2402 my ($self) = @_;
2403
2404 (6) x 2
2405}
2406
2407sub toggle {
2408 my ($self) = @_;
2409
2410 $self->{state} = !$self->{state};
2411 $self->emit (changed => $self->{state});
2412 $self->update;
2413}
2414
2415sub invoke_button_down {
2416 my ($self, $ev, $x, $y) = @_;
2417
2418 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
2419 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
2420 $self->toggle;
2421 } else {
2422 return 0
2423 }
2424
2425 1
2426}
2427
2428sub _draw {
2429 my ($self) = @_;
2430
2431 $self->SUPER::_draw;
2432
2433 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
2434
2435 my ($w, $h) = @$self{qw(w h)};
2436
2437 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
2438
2439 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
2440
2441 my $tex = $self->{state} ? $tex[1] : $tex[0];
2442
2443 glEnable GL_TEXTURE_2D;
2444 $tex->draw_quad_alpha (0, 0, $s, $s);
2445 glDisable GL_TEXTURE_2D;
2446}
2447
2448#############################################################################
2449
2450package CFPlus::UI::Image;
2451
2452our @ISA = CFPlus::UI::Base::;
2453
2454use CFPlus::OpenGL;
2455
2456our %texture_cache;
2457
2458sub new {
2459 my $class = shift;
2460
2461 my $self = $class->SUPER::new (
2462 can_events => 0,
2463 @_,
2464 );
2465
2466 $self->{path} || $self->{tex}
2467 or Carp::croak "'path' or 'tex' attributes required";
2468
2469 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2470 new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
2471
2472 CFPlus::weaken $texture_cache{$self->{path}};
2473
2474 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2475
2476 $self
2477}
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
2494sub size_request {
2495 my ($self) = @_;
2496
2497 ($self->{tex}{w}, $self->{tex}{h})
2498}
2499
2500sub _draw {
2501 my ($self) = @_;
2502
2503 my $tex = $self->{tex};
2504
2505 my ($w, $h) = ($self->{w}, $self->{h});
2506
2507 if ($self->{rot90}) {
2508 glRotate 90, 0, 0, 1;
2509 glTranslate 0, -$self->{w}, 0;
2510
2511 ($w, $h) = ($h, $w);
2512 }
2513
2514 glEnable GL_TEXTURE_2D;
2515 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2516
2517 $tex->draw_quad (0, 0, $w, $h);
2518
2519 glDisable GL_TEXTURE_2D;
2520}
2521
2522#############################################################################
2523
1997package CFClient::UI::ImageButton; 2524package CFPlus::UI::ImageButton;
1998 2525
1999our @ISA = CFClient::UI::Image::; 2526our @ISA = CFPlus::UI::Image::;
2000 2527
2001use CFClient::OpenGL; 2528use CFPlus::OpenGL;
2002 2529
2003my %textures; 2530my %textures;
2004 2531
2005sub new { 2532sub new {
2006 my $class = shift; 2533 my $class = shift;
… …
2028 1 2555 1
2029} 2556}
2030 2557
2031############################################################################# 2558#############################################################################
2032 2559
2033package CFClient::UI::CheckBox;
2034
2035our @ISA = CFClient::UI::DrawBG::;
2036
2037my @tex =
2038 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
2039 qw(c1_checkbox_bg.png c1_checkbox_active.png);
2040
2041use CFClient::OpenGL;
2042
2043sub new {
2044 my $class = shift;
2045
2046 $class->SUPER::new (
2047 padding_x => 2,
2048 padding_y => 2,
2049 fg => [1, 1, 1],
2050 active_fg => [1, 1, 0],
2051 bg => [0, 0, 0, 0.2],
2052 active_bg => [1, 1, 1, 0.5],
2053 state => 0,
2054 can_hover => 1,
2055 @_
2056 )
2057}
2058
2059sub size_request {
2060 my ($self) = @_;
2061
2062 (6) x 2
2063}
2064
2065sub invoke_button_down {
2066 my ($self, $ev, $x, $y) = @_;
2067
2068 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
2069 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
2070 $self->{state} = !$self->{state};
2071 $self->emit (changed => $self->{state});
2072 } else {
2073 return 0
2074 }
2075
2076 1
2077}
2078
2079sub _draw {
2080 my ($self) = @_;
2081
2082 $self->SUPER::_draw;
2083
2084 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
2085
2086 my ($w, $h) = @$self{qw(w h)};
2087
2088 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
2089
2090 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
2091
2092 my $tex = $self->{state} ? $tex[1] : $tex[0];
2093
2094 glEnable GL_TEXTURE_2D;
2095 $tex->draw_quad_alpha (0, 0, $s, $s);
2096 glDisable GL_TEXTURE_2D;
2097}
2098
2099#############################################################################
2100
2101package CFClient::UI::Image; 2560package CFPlus::UI::VGauge;
2102 2561
2103our @ISA = CFClient::UI::Base::; 2562our @ISA = CFPlus::UI::Base::;
2104
2105use CFClient::OpenGL;
2106
2107our %texture_cache;
2108
2109sub new {
2110 my $class = shift;
2111
2112 my $self = $class->SUPER::new (
2113 can_events => 0,
2114 @_,
2115 );
2116
2117 $self->{path}
2118 or Carp::croak "required attribute 'path' not set";
2119
2120 $self->{tex} = $texture_cache{$self->{path}} ||=
2121 new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1;
2122
2123 Scalar::Util::weaken $texture_cache{$self->{path}};
2124
2125 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2126
2127 $self
2128}
2129
2130sub size_request {
2131 my ($self) = @_;
2132
2133 ($self->{tex}{w}, $self->{tex}{h})
2134}
2135
2136sub _draw {
2137 my ($self) = @_;
2138
2139 my $tex = $self->{tex};
2140
2141 my ($w, $h) = ($self->{w}, $self->{h});
2142
2143 if ($self->{rot90}) {
2144 glRotate 90, 0, 0, 1;
2145 glTranslate 0, -$self->{w}, 0;
2146
2147 ($w, $h) = ($h, $w);
2148 }
2149
2150 glEnable GL_TEXTURE_2D;
2151 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2152
2153 $tex->draw_quad_alpha (0, 0, $w, $h);
2154
2155 glDisable GL_TEXTURE_2D;
2156}
2157
2158#############################################################################
2159
2160package CFClient::UI::VGauge;
2161
2162our @ISA = CFClient::UI::Base::;
2163 2563
2164use List::Util qw(min max); 2564use List::Util qw(min max);
2165 2565
2166use CFClient::OpenGL; 2566use CFPlus::OpenGL;
2167 2567
2168my %tex = ( 2568my %tex = (
2169 food => [ 2569 food => [
2170 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2570 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2171 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 2571 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2172 ], 2572 ],
2173 grace => [ 2573 grace => [
2174 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2574 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2175 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/
2176 ], 2576 ],
2177 hp => [ 2577 hp => [
2178 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2578 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2179 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 2579 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2180 ], 2580 ],
2181 mana => [ 2581 mana => [
2182 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2582 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2183 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/
2184 ], 2584 ],
2185); 2585);
2186 2586
2187# eg. VGauge->new (gauge => 'food'), default gauge: food 2587# eg. VGauge->new (gauge => 'food'), default gauge: food
… …
2247 my $ycut1 = max 0, min 1, $ycut; 2647 my $ycut1 = max 0, min 1, $ycut;
2248 my $ycut2 = max 0, min 1, $ycut - 1; 2648 my $ycut2 = max 0, min 1, $ycut - 1;
2249 2649
2250 my $h1 = $self->{h} * (1 - $ycut1); 2650 my $h1 = $self->{h} * (1 - $ycut1);
2251 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);
2252 2655
2253 glEnable GL_BLEND; 2656 glEnable GL_BLEND;
2254 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, 2657 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2255 GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2658 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2256 glEnable GL_TEXTURE_2D; 2659 glEnable GL_TEXTURE_2D;
… …
2275 2678
2276 if ($t3) { 2679 if ($t3) {
2277 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2680 glBindTexture GL_TEXTURE_2D, $t3->{name};
2278 glBegin GL_QUADS; 2681 glBegin GL_QUADS;
2279 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2682 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2280 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2683 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2281 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2684 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2282 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2685 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2283 glEnd; 2686 glEnd;
2284 } 2687 }
2285 2688
2286 glDisable GL_BLEND; 2689 glDisable GL_BLEND;
2287 glDisable GL_TEXTURE_2D; 2690 glDisable GL_TEXTURE_2D;
2288} 2691}
2289 2692
2290############################################################################# 2693#############################################################################
2291 2694
2292package CFClient::UI::Gauge; 2695package CFPlus::UI::Gauge;
2293 2696
2294our @ISA = CFClient::UI::VBox::; 2697our @ISA = CFPlus::UI::VBox::;
2295 2698
2296sub new { 2699sub new {
2297 my ($class, %arg) = @_; 2700 my ($class, %arg) = @_;
2298 2701
2299 my $self = $class->SUPER::new ( 2702 my $self = $class->SUPER::new (
… …
2301 can_hover => 1, 2704 can_hover => 1,
2302 can_events => 1, 2705 can_events => 1,
2303 %arg, 2706 %arg,
2304 ); 2707 );
2305 2708
2306 $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");
2307 $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);
2308 $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");
2309 2712
2310 $self 2713 $self
2311} 2714}
2312 2715
2313sub set_fontsize { 2716sub set_fontsize {
… …
2334 $self->{value}->set_text ($val); 2737 $self->{value}->set_text ($val);
2335} 2738}
2336 2739
2337############################################################################# 2740#############################################################################
2338 2741
2339package CFClient::UI::Slider; 2742package CFPlus::UI::Slider;
2340 2743
2341use strict; 2744use strict;
2342 2745
2343use CFClient::OpenGL; 2746use CFPlus::OpenGL;
2344 2747
2345our @ISA = CFClient::UI::DrawBG::; 2748our @ISA = CFPlus::UI::DrawBG::;
2346 2749
2347my @tex = 2750my @tex =
2348 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 2751 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2349 qw(s1_slider.png s1_slider_bg.png); 2752 qw(s1_slider.png s1_slider_bg.png);
2350 2753
2351sub new { 2754sub new {
2352 my $class = shift; 2755 my $class = shift;
2353 2756
… …
2421 2824
2422 $self->SUPER::invoke_button_down ($ev, $x, $y); 2825 $self->SUPER::invoke_button_down ($ev, $x, $y);
2423 2826
2424 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2827 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2425 2828
2426 $self->invoke_mouse_motion ($ev, $x, $y) 2829 $self->invoke_mouse_motion ($ev, $x, $y);
2830
2831 1
2427} 2832}
2428 2833
2429sub invoke_mouse_motion { 2834sub invoke_mouse_motion {
2430 my ($self, $ev, $x, $y) = @_; 2835 my ($self, $ev, $x, $y) = @_;
2431 2836
… …
2438 2843
2439 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo)); 2844 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2440 } else { 2845 } else {
2441 return 0; 2846 return 0;
2442 } 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);
2443 2860
2444 1 2861 1
2445} 2862}
2446 2863
2447sub update { 2864sub update {
… …
2498 glDisable GL_TEXTURE_2D; 2915 glDisable GL_TEXTURE_2D;
2499} 2916}
2500 2917
2501############################################################################# 2918#############################################################################
2502 2919
2503package CFClient::UI::ValSlider; 2920package CFPlus::UI::ValSlider;
2504 2921
2505our @ISA = CFClient::UI::HBox::; 2922our @ISA = CFPlus::UI::HBox::;
2506 2923
2507sub new { 2924sub new {
2508 my ($class, %arg) = @_; 2925 my ($class, %arg) = @_;
2509 2926
2510 my $range = delete $arg{range}; 2927 my $range = delete $arg{range};
2511 2928
2512 my $self = $class->SUPER::new ( 2929 my $self = $class->SUPER::new (
2513 slider => (new CFClient::UI::Slider expand => 1, range => $range), 2930 slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2514 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}), 2931 entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2515 to_value => sub { shift }, 2932 to_value => sub { shift },
2516 from_value => sub { shift }, 2933 from_value => sub { shift },
2517 %arg, 2934 %arg,
2518 ); 2935 );
2519 2936
… …
2539sub set_range { shift->{slider}->set_range (@_) } 2956sub set_range { shift->{slider}->set_range (@_) }
2540sub set_value { shift->{slider}->set_value (@_) } 2957sub set_value { shift->{slider}->set_value (@_) }
2541 2958
2542############################################################################# 2959#############################################################################
2543 2960
2544package CFClient::UI::TextScroller; 2961package CFPlus::UI::TextScroller;
2545 2962
2546our @ISA = CFClient::UI::HBox::; 2963our @ISA = CFPlus::UI::HBox::;
2547 2964
2548use CFClient::OpenGL; 2965use CFPlus::OpenGL;
2549 2966
2550sub new { 2967sub new {
2551 my $class = shift; 2968 my $class = shift;
2552 2969
2553 my $self = $class->SUPER::new ( 2970 my $self = $class->SUPER::new (
2554 fontsize => 1, 2971 fontsize => 1,
2555 can_events => 0, 2972 can_events => 1,
2556 indent => 0, 2973 indent => 0,
2557 #font => default_font 2974 #font => default_font
2558 @_, 2975 @_,
2559 2976
2560 layout => (new CFClient::Layout 1), 2977 layout => (new CFPlus::Layout),
2561 par => [], 2978 par => [],
2979 max_par => 0,
2562 height => 0, 2980 height => 0,
2563 children => [ 2981 children => [
2564 (new CFClient::UI::Empty expand => 1), 2982 (new CFPlus::UI::Empty expand => 1),
2565 (new CFClient::UI::Slider vertical => 1), 2983 (new CFPlus::UI::Slider vertical => 1),
2566 ], 2984 ],
2567 ); 2985 );
2568 2986
2569 $self->{children}[1]->connect (changed => sub { $self->update }); 2987 $self->{children}[1]->connect (changed => sub { $self->update });
2570 2988
… …
2600 3018
2601 $self->reflow; 3019 $self->reflow;
2602 3020
2603 local $self->{children} = [$empty, $slider]; 3021 local $self->{children} = [$empty, $slider];
2604 $self->SUPER::invoke_size_allocate ($w, $h) 3022 $self->SUPER::invoke_size_allocate ($w, $h)
3023}
3024
3025sub invoke_mouse_wheel {
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
2605} 3033}
2606 3034
2607sub get_layout { 3035sub get_layout {
2608 my ($self, $para) = @_; 3036 my ($self, $para) = @_;
2609 3037
… …
2637 3065
2638 # todo: base offset on lines or so, not on pixels 3066 # todo: base offset on lines or so, not on pixels
2639 $self->{children}[1]->set_value ($offset); 3067 $self->{children}[1]->set_value ($offset);
2640} 3068}
2641 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
2642sub clear { 3085sub clear {
2643 my ($self) = @_; 3086 my ($self) = @_;
2644 3087
2645 my (undef, undef, @other) = @{ $self->{children} }; 3088 my (undef, undef, @other) = @{ $self->{children} };
2646 $self->remove ($_) for @other; 3089 $self->remove ($_) for @other;
… …
2649 $self->{height} = 0; 3092 $self->{height} = 0;
2650 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 3093 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2651} 3094}
2652 3095
2653sub add_paragraph { 3096sub add_paragraph {
2654 my ($self, $color, $para, $indent) = @_; 3097 my $self = shift;
2655 3098
2656 my ($text, @w) = ref $para ? @$para : $para; 3099 for my $para (@_) {
2657
2658 $para = { 3100 $para = {
3101 fg => [1, 1, 1, 1],
3102 indent => 0,
3103 markup => "",
3104 widget => [],
3105 ref $para ? %$para : (markup => $para),
2659 w => 1e10, 3106 w => 1e10,
2660 wrapped => 1, 3107 wrapped => 1,
2661 fg => $color,
2662 indent => $indent,
2663 markup => $text,
2664 widget => \@w,
2665 }; 3108 };
2666 3109
2667 $self->add (@w) if @w; 3110 $self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2668 push @{$self->{par}}, $para; 3111 push @{$self->{par}}, $para;
3112 }
3113
3114 if (my $max = $self->{max_par}) {
3115 shift @{$self->{par}} while @{$self->{par}} > $max;
3116 }
2669 3117
2670 $self->{need_reflow}++; 3118 $self->{need_reflow}++;
2671 $self->update; 3119 $self->update;
2672} 3120}
2673 3121
2674sub scroll_to_bottom { 3122sub scroll_to_bottom {
2675 my ($self) = @_; 3123 my ($self) = @_;
2676 3124
2677 $self->{scroll_to_bottom} = 1; 3125 $self->{scroll_to} = $#{$self->{par}};
2678 $self->update; 3126 $self->update;
2679} 3127}
2680 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
3151 $self->{height} = $height;
3152 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
3153
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 }
3160}
3161
2681sub update { 3162sub update {
2682 my ($self) = @_; 3163 my ($self) = @_;
2683 3164
2684 $self->SUPER::update; 3165 $self->SUPER::update;
2685 3166
2686 return unless $self->{h} > 0; 3167 return unless $self->{h} > 0;
2687 3168
2688 delete $self->{texture}; 3169 delete $self->{texture};
2689 3170
2690 $ROOT->on_post_alloc ($self => sub { 3171 $ROOT->on_post_alloc ($self => sub {
3172 $self->force_uptodate;
3173
2691 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 3174 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2692 3175
2693 if (delete $self->{need_reflow}) {
2694 my $height = 0;
2695
2696 for my $para (@{$self->{par}}) {
2697 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2698 my $layout = $self->get_layout ($para);
2699 my ($w, $h) = $layout->size;
2700
2701 $para->{w} = $w + $para->{indent};
2702 $para->{h} = $h;
2703 $para->{wrapped} = $layout->has_wrapped;
2704 }
2705
2706 $height += $para->{h};
2707 }
2708
2709 $self->{height} = $height;
2710
2711 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2712
2713 delete $self->{texture};
2714 }
2715
2716 if (delete $self->{scroll_to_bottom}) {
2717 $self->{children}[1]->set_value (1e10);
2718 }
2719
2720 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 3176 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2721 glClearColor 0, 0, 0, 0; 3177 glClearColor 0, 0, 0, 0;
2722 glClear GL_COLOR_BUFFER_BIT; 3178 glClear GL_COLOR_BUFFER_BIT;
2723 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;
2724 my $top = int $self->{children}[1]{range}[0]; 3188 my $top = int $self->{children}[1]{range}[0];
2725 3189
2726 my $y0 = $top; 3190 my $y0 = $top;
2727 my $y1 = $top + $H; 3191 my $y1 = $top + $H;
2728 3192
2729 my $y = 0;
2730
2731 glEnable GL_BLEND;
2732 #TODO# not correct in windows where rgba is forced off
2733 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2734
2735 for my $para (@{$self->{par}}) { 3193 for my $para (@{$self->{par}}) {
2736 my $h = $para->{h}; 3194 my $h = $para->{h};
3195 my $y = $para->{y};
2737 3196
2738 if ($y0 < $y + $h && $y < $y1) { 3197 if ($y0 < $y + $h && $y < $y1) {
2739
2740 my $layout = $self->get_layout ($para); 3198 my $layout = $self->get_layout ($para);
2741 3199
2742 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2743
2744 glRasterPos $para->{indent}, $y - $y0; 3200 $layout->render ($para->{indent}, $y - $y0);
2745 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2746 3201
2747 if (my @w = @{ $para->{widget} }) { 3202 if (my @w = @{ $para->{widget} }) {
2748 my @s = $layout->get_shapes; 3203 my @s = $layout->get_shapes;
2749 3204
2750 glDisable GL_BLEND;
2751 for (@w) { 3205 for (@w) {
2752 my ($dx, $dy) = splice @s, 0, 2, (); 3206 my ($dx, $dy) = splice @s, 0, 2, ();
2753 3207
2754 $_->{x} = $dx + $para->{indent}; 3208 $_->{x} = $dx + $para->{indent};
2755 $_->{y} = $dy + $y - $y0; 3209 $_->{y} = $dy + $y - $y0;
2756 3210
2757 $_->draw; 3211 $_->draw;
2758 } 3212 }
2759 glEnable GL_BLEND;
2760 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2761 } 3213 }
2762 } 3214 }
2763 3215
2764 $y += $h; 3216 $paridx++;
3217 $top_paragraph ||= $paridx if $y >= $top;
2765 } 3218 }
2766 3219
2767 glDisable GL_BLEND; 3220 $self->{top_paragraph} = $top_paragraph;
2768 }; 3221 };
2769 }); 3222 });
2770} 3223}
2771 3224
2772sub reconfigure { 3225sub reconfigure {
… …
2790 $self->{children}[1]->draw; 3243 $self->{children}[1]->draw;
2791} 3244}
2792 3245
2793############################################################################# 3246#############################################################################
2794 3247
2795package CFClient::UI::Animator; 3248package CFPlus::UI::Animator;
2796 3249
2797use CFClient::OpenGL; 3250use CFPlus::OpenGL;
2798 3251
2799our @ISA = CFClient::UI::Bin::; 3252our @ISA = CFPlus::UI::Bin::;
2800 3253
2801sub moveto { 3254sub moveto {
2802 my ($self, $x, $y) = @_; 3255 my ($self, $x, $y) = @_;
2803 3256
2804 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 3257 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
… …
2832 glPopMatrix; 3285 glPopMatrix;
2833} 3286}
2834 3287
2835############################################################################# 3288#############################################################################
2836 3289
2837package CFClient::UI::Flopper; 3290package CFPlus::UI::Flopper;
2838 3291
2839our @ISA = CFClient::UI::Button::; 3292our @ISA = CFPlus::UI::Button::;
2840 3293
2841sub new { 3294sub new {
2842 my $class = shift; 3295 my $class = shift;
2843 3296
2844 my $self = $class->SUPER::new ( 3297 my $self = $class->SUPER::new (
… …
2856 $self->{other}->toggle_visibility; 3309 $self->{other}->toggle_visibility;
2857} 3310}
2858 3311
2859############################################################################# 3312#############################################################################
2860 3313
2861package CFClient::UI::Tooltip; 3314package CFPlus::UI::Tooltip;
2862 3315
2863our @ISA = CFClient::UI::Bin::; 3316our @ISA = CFPlus::UI::Bin::;
2864 3317
2865use CFClient::OpenGL; 3318use CFPlus::OpenGL;
2866 3319
2867sub new { 3320sub new {
2868 my $class = shift; 3321 my $class = shift;
2869 3322
2870 $class->SUPER::new ( 3323 $class->SUPER::new (
… …
2873 ) 3326 )
2874} 3327}
2875 3328
2876sub set_tooltip_from { 3329sub set_tooltip_from {
2877 my ($self, $widget) = @_; 3330 my ($self, $widget) = @_;
3331
3332 $widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
3333 if $widget->{tooltip} =~ /^#(.*)$/;
2878 3334
2879 my $tooltip = $widget->{tooltip}; 3335 my $tooltip = $widget->{tooltip};
2880 3336
2881 if ($ENV{CFPLUS_DEBUG} & 2) { 3337 if ($ENV{CFPLUS_DEBUG} & 2) {
2882 $tooltip .= "\n\n" . (ref $widget) . "\n" 3338 $tooltip .= "\n\n" . (ref $widget) . "\n"
… …
2886 } 3342 }
2887 3343
2888 $tooltip =~ s/^\n+//; 3344 $tooltip =~ s/^\n+//;
2889 $tooltip =~ s/\n+$//; 3345 $tooltip =~ s/\n+$//;
2890 3346
2891 $self->add (new CFClient::UI::Label 3347 $self->add (new CFPlus::UI::Label
2892 markup => $tooltip, 3348 markup => $tooltip,
2893 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3349 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2894 fontsize => 0.8, 3350 fontsize => 0.8,
2895 fg => [0, 0, 0, 1], 3351 style => 1, # FLAG_INVERSE
2896 ellipsise => 0, 3352 ellipsise => 0,
2897 font => ($widget->{tooltip_font} || $::FONT_PROP), 3353 font => ($widget->{tooltip_font} || $::FONT_PROP),
2898 ); 3354 );
2899} 3355}
2900 3356
… …
2919 3375
2920 $self->{root}->on_post_alloc ("move_$self" => sub { 3376 $self->{root}->on_post_alloc ("move_$self" => sub {
2921 my $widget = $self->{owner} 3377 my $widget = $self->{owner}
2922 or return; 3378 or return;
2923 3379
3380 if ($widget->{visible}) {
2924 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 3381 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2925 3382
2926 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 3383 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2927 if $x + $self->{w} > $self->{root}{w}; 3384 if $x + $self->{w} > $self->{root}{w};
2928 3385
2929 $self->move_abs ($x, $y); 3386 $self->move_abs ($x, $y);
3387 } else {
3388 $self->hide;
3389 }
2930 }); 3390 });
2931} 3391}
2932 3392
2933sub _draw { 3393sub _draw {
2934 my ($self) = @_; 3394 my ($self) = @_;
… …
2958 $self->SUPER::_draw; 3418 $self->SUPER::_draw;
2959} 3419}
2960 3420
2961############################################################################# 3421#############################################################################
2962 3422
2963package CFClient::UI::Face; 3423package CFPlus::UI::Face;
2964 3424
2965our @ISA = CFClient::UI::Base::; 3425our @ISA = CFPlus::UI::DrawBG::;
2966 3426
2967use CFClient::OpenGL; 3427use CFPlus::OpenGL;
2968 3428
2969sub new { 3429sub new {
2970 my $class = shift; 3430 my $class = shift;
2971 3431
2972 my $self = $class->SUPER::new ( 3432 my $self = $class->SUPER::new (
3433 size_w => 32,
3434 size_h => 8,
2973 aspect => 1, 3435 aspect => 1,
2974 can_events => 0, 3436 can_events => 0,
2975 @_, 3437 @_,
2976 ); 3438 );
2977 3439
2978 if ($self->{anim} && $self->{animspeed}) { 3440 if ($self->{anim} && $self->{animspeed}) {
2979 Scalar::Util::weaken (my $widget = $self); 3441 CFPlus::weaken (my $widget = $self);
2980 3442
3443 $widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
3444 $widget->{anim_start} = $self->{animspeed} * int Event::time / $self->{animspeed};
2981 $self->{timer} = Event->timer ( 3445 $self->{timer} = Event->timer (
2982 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2983 hard => 1, 3446 parked => 1,
2984 interval => $self->{animspeed},
2985 cb => sub { 3447 cb => sub {
3448 return unless $::CONN && $widget;
3449
2986 ++$widget->{frame}; 3450 ++$widget->{frame};
3451 $widget->update_face;
2987 $widget->update; 3452 $widget->update;
3453
3454 $widget->update_timer;
2988 }, 3455 },
2989 ); 3456 );
3457
3458 $self->update_face;
3459 $self->update_timer;
2990 } 3460 }
2991 3461
2992 $self 3462 $self
2993} 3463}
2994 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
2995sub size_request { 3496sub size_request {
2996 (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)
2997} 3513}
2998 3514
2999sub update { 3515sub update {
3000 my ($self) = @_; 3516 my ($self) = @_;
3001 3517
3002 return unless $self->{visible}; 3518 return unless $self->{visible};
3003 3519
3004 $self->SUPER::update; 3520 $self->SUPER::update;
3005} 3521}
3006 3522
3523sub invoke_visibility_change {
3524 my ($self) = @_;
3525
3526 $self->update_timer;
3527
3528 0
3529}
3530
3007sub _draw { 3531sub _draw {
3008 my ($self) = @_; 3532 my ($self) = @_;
3009 3533
3010 return unless $::CONN; 3534 $self->SUPER::_draw;
3011 3535
3012 my $face; 3536 if (my $tex = $self->{tex}) {
3013
3014 if ($self->{frame}) {
3015 my $anim = $::CONN->{anim}[$self->{anim}];
3016
3017 $face = $anim->[ $self->{frame} % @$anim ]
3018 if $anim && @$anim;
3019 }
3020
3021 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
3022
3023 if ($tex) {
3024 glEnable GL_TEXTURE_2D; 3537 glEnable GL_TEXTURE_2D;
3025 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3538 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
3026 glColor 0, 0, 0, 1; 3539 glColor 0, 0, 0, 1;
3027 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3540 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
3028 glDisable GL_TEXTURE_2D; 3541 glDisable GL_TEXTURE_2D;
… …
3030} 3543}
3031 3544
3032sub destroy { 3545sub destroy {
3033 my ($self) = @_; 3546 my ($self) = @_;
3034 3547
3035 $self->{timer}->cancel 3548 (delete $self->{timer})->cancel
3036 if $self->{timer}; 3549 if $self->{timer};
3037 3550
3038 $self->SUPER::destroy; 3551 $self->SUPER::destroy;
3039} 3552}
3040 3553
3041############################################################################# 3554#############################################################################
3042 3555
3043package CFClient::UI::Buttonbar; 3556package CFPlus::UI::Buttonbar;
3044 3557
3045our @ISA = CFClient::UI::HBox::; 3558our @ISA = CFPlus::UI::HBox::;
3046 3559
3047# TODO: should actualyl wrap buttons and other goodies. 3560# TODO: should actually wrap buttons and other goodies.
3048 3561
3049############################################################################# 3562#############################################################################
3050 3563
3051package CFClient::UI::Menu; 3564package CFPlus::UI::Menu;
3052 3565
3053our @ISA = CFClient::UI::FancyFrame::; 3566our @ISA = CFPlus::UI::Toplevel::;
3054 3567
3055use CFClient::OpenGL; 3568use CFPlus::OpenGL;
3056 3569
3057sub new { 3570sub new {
3058 my $class = shift; 3571 my $class = shift;
3059 3572
3060 my $self = $class->SUPER::new ( 3573 my $self = $class->SUPER::new (
3061 items => [], 3574 items => [],
3062 z => 100, 3575 z => 100,
3063 @_, 3576 @_,
3064 ); 3577 );
3065 3578
3066 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3579 $self->add ($self->{vbox} = new CFPlus::UI::VBox);
3067 3580
3068 for my $item (@{ $self->{items} }) { 3581 for my $item (@{ $self->{items} }) {
3069 my ($widget, $cb, $tooltip) = @$item; 3582 my ($widget, $cb, $tooltip) = @$item;
3070 3583
3071 # handle various types of items, only text for now 3584 # handle various types of items, only text for now
3072 if (!ref $widget) { 3585 if (!ref $widget) {
3586 if ($widget =~ /\t/) {
3587 my ($left, $right) = split /\t/, $widget, 2;
3588
3073 $widget = new CFClient::UI::Label 3589 $widget = new CFPlus::UI::HBox
3074 can_hover => 1, 3590 can_hover => 1,
3075 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,
3076 markup => $widget, 3603 markup => $widget,
3077 tooltip => $tooltip 3604 tooltip => $tooltip;
3605 }
3078 } 3606 }
3079 3607
3080 $self->{item}{$widget} = $item; 3608 $self->{item}{$widget} = $item;
3081 3609
3082 $self->{vbox}->add ($widget); 3610 $self->{vbox}->add ($widget);
… …
3125 1 3653 1
3126} 3654}
3127 3655
3128############################################################################# 3656#############################################################################
3129 3657
3130package CFClient::UI::Multiplexer; 3658package CFPlus::UI::Multiplexer;
3131 3659
3132our @ISA = CFClient::UI::Container::; 3660our @ISA = CFPlus::UI::Container::;
3133 3661
3134sub new { 3662sub new {
3135 my $class = shift; 3663 my $class = shift;
3136 3664
3137 my $self = $class->SUPER::new ( 3665 my $self = $class->SUPER::new (
… …
3151 3679
3152 $self->{current} = $self->{children}[0] 3680 $self->{current} = $self->{children}[0]
3153 if @{ $self->{children} }; 3681 if @{ $self->{children} };
3154} 3682}
3155 3683
3684sub get_current_page {
3685 my ($self) = @_;
3686
3687 $self->{current}
3688}
3689
3156sub set_current_page { 3690sub set_current_page {
3157 my ($self, $page_or_widget) = @_; 3691 my ($self, $page_or_widget) = @_;
3158 3692
3159 my $widget = ref $page_or_widget 3693 my $widget = ref $page_or_widget
3160 ? $page_or_widget 3694 ? $page_or_widget
… …
3192 $self->{current}->draw; 3726 $self->{current}->draw;
3193} 3727}
3194 3728
3195############################################################################# 3729#############################################################################
3196 3730
3197package CFClient::UI::Notebook; 3731package CFPlus::UI::Notebook;
3198 3732
3199our @ISA = CFClient::UI::VBox::; 3733our @ISA = CFPlus::UI::VBox::;
3200 3734
3201sub new { 3735sub new {
3202 my $class = shift; 3736 my $class = shift;
3203 3737
3204 my $self = $class->SUPER::new ( 3738 my $self = $class->SUPER::new (
3205 buttonbar => (new CFClient::UI::Buttonbar), 3739 buttonbar => (new CFPlus::UI::Buttonbar),
3206 multiplexer => (new CFClient::UI::Multiplexer expand => 1), 3740 multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3207 # filter => # will be put between multiplexer and $self 3741 # filter => # will be put between multiplexer and $self
3208 @_, 3742 @_,
3209 ); 3743 );
3210 3744
3211 $self->{filter}->add ($self->{multiplexer}) if $self->{filter}; 3745 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
… …
3215} 3749}
3216 3750
3217sub add { 3751sub add {
3218 my ($self, $title, $widget, $tooltip) = @_; 3752 my ($self, $title, $widget, $tooltip) = @_;
3219 3753
3220 Scalar::Util::weaken $self; 3754 CFPlus::weaken $self;
3221 3755
3222 $self->{buttonbar}->add (new CFClient::UI::Button 3756 unless (ref $title) {
3757 $title = new CFPlus::UI::Button
3223 markup => $title, 3758 markup => $title,
3224 tooltip => $tooltip, 3759 tooltip => $tooltip,
3760 ;
3761 }
3762
3225 on_activate => sub { $self->set_current_page ($widget) }, 3763 $title->connect (activate => sub { $self->set_current_page ($widget) });
3226 ); 3764 $self->{buttonbar}->add ($title);
3227 3765
3228 $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
3229} 3773}
3230 3774
3231sub set_current_page { 3775sub set_current_page {
3232 my ($self, $page) = @_; 3776 my ($self, $page) = @_;
3233 3777
… …
3235 $self->emit (page_changed => $self->{multiplexer}{current}); 3779 $self->emit (page_changed => $self->{multiplexer}{current});
3236} 3780}
3237 3781
3238############################################################################# 3782#############################################################################
3239 3783
3240package CFClient::UI::Combobox; 3784package CFPlus::UI::Selector;
3241 3785
3242use utf8; 3786use utf8;
3243 3787
3244our @ISA = CFClient::UI::Button::; 3788our @ISA = CFPlus::UI::Button::;
3245 3789
3246sub new { 3790sub new {
3247 my $class = shift; 3791 my $class = shift;
3248 3792
3249 my $self = $class->SUPER::new ( 3793 my $self = $class->SUPER::new (
… …
3266 my ($value, $title, $tooltip) = @$_; 3810 my ($value, $title, $tooltip) = @$_;
3267 3811
3268 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }]; 3812 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3269 } 3813 }
3270 3814
3271 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev); 3815 CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3272} 3816}
3273 3817
3274sub _set_value { 3818sub _set_value {
3275 my ($self, $value) = @_; 3819 my ($self, $value) = @_;
3276 3820
… …
3291 $self->emit (changed => $value); 3835 $self->emit (changed => $value);
3292} 3836}
3293 3837
3294############################################################################# 3838#############################################################################
3295 3839
3296package CFClient::UI::Statusbox; 3840package CFPlus::UI::Statusbox;
3297 3841
3298our @ISA = CFClient::UI::VBox::; 3842our @ISA = CFPlus::UI::VBox::;
3299 3843
3300sub new { 3844sub new {
3301 my $class = shift; 3845 my $class = shift;
3302 3846
3303 my $self = $class->SUPER::new ( 3847 my $self = $class->SUPER::new (
3304 fontsize => 0.8, 3848 fontsize => 0.8,
3305 @_, 3849 @_,
3306 ); 3850 );
3307 3851
3308 Scalar::Util::weaken (my $this = $self); 3852 CFPlus::weaken (my $this = $self);
3309 3853
3310 $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 });
3311 3855
3312 $self 3856 $self
3313} 3857}
… …
3315sub reorder { 3859sub reorder {
3316 my ($self) = @_; 3860 my ($self) = @_;
3317 my $NOW = Time::HiRes::time; 3861 my $NOW = Time::HiRes::time;
3318 3862
3319 # freeze display when hovering over any label 3863 # freeze display when hovering over any label
3320 return if $CFClient::UI::TOOLTIP->{owner} 3864 return if $CFPlus::UI::TOOLTIP->{owner}
3321 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label}, 3865 && grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3322 values %{ $self->{item} }; 3866 values %{ $self->{item} };
3323 3867
3324 while (my ($k, $v) = each %{ $self->{item} }) { 3868 while (my ($k, $v) = each %{ $self->{item} }) {
3325 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3869 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3326 } 3870 }
… …
3347 for ($short) { 3891 for ($short) {
3348 s/^\s+//; 3892 s/^\s+//;
3349 s/\s+/ /g; 3893 s/\s+/ /g;
3350 } 3894 }
3351 3895
3352 new CFClient::UI::Label 3896 new CFPlus::UI::Label
3353 markup => $short, 3897 markup => $short,
3354 tooltip => $item->{tooltip}, 3898 tooltip => $item->{tooltip},
3355 tooltip_font => $::FONT_PROP, 3899 tooltip_font => $::FONT_PROP,
3356 tooltip_width => 0.67, 3900 tooltip_width => 0.67,
3357 fontsize => $item->{fontsize} || $self->{fontsize}, 3901 fontsize => $item->{fontsize} || $self->{fontsize},
… …
3436 $self->SUPER::destroy; 3980 $self->SUPER::destroy;
3437} 3981}
3438 3982
3439############################################################################# 3983#############################################################################
3440 3984
3441package CFClient::UI::Inventory;
3442
3443our @ISA = CFClient::UI::ScrolledWindow::;
3444
3445sub new {
3446 my $class = shift;
3447
3448 my $self = $class->SUPER::new (
3449 child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3450 @_,
3451 );
3452
3453 $self
3454}
3455
3456sub set_items {
3457 my ($self, $items) = @_;
3458
3459 $self->{child}->clear;
3460 return unless $items;
3461
3462 my @items = sort {
3463 ($a->{type} <=> $b->{type})
3464 or ($a->{name} cmp $b->{name})
3465 } values %$items;
3466
3467 $self->{real_items} = \@items;
3468
3469 my $row = 0;
3470 for my $item (@items) {
3471 CFClient::Item::update_widgets $item;
3472
3473 $self->{child}->add (0, $row, $item->{face_widget});
3474 $self->{child}->add (1, $row, $item->{desc_widget});
3475 $self->{child}->add (2, $row, $item->{weight_widget});
3476
3477 $row++;
3478 }
3479}
3480
3481#############################################################################
3482
3483package CFClient::UI::SpellList;
3484
3485our @ISA = CFClient::UI::Table::;
3486
3487sub new {
3488 my $class = shift;
3489
3490 my $self = $class->SUPER::new (
3491 binding => [],
3492 commands => [],
3493 @_,
3494 )
3495}
3496
3497my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3498
3499my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3500 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3501my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3502 "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3503my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3504 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3505my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3506 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3507my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3508 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3509
3510sub rebuild_spell_list {
3511 my ($self) = @_;
3512
3513 $CFClient::UI::ROOT->on_refresh ($self => sub {
3514 $self->clear;
3515
3516 return unless $::CONN;
3517
3518 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3519 $self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3520 $self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3521 $self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3522 $self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3523
3524 my $row = 0;
3525
3526 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3527 my $spell = $self->{spell}{$_};
3528
3529 $row++;
3530
3531 my $spell_cb = sub {
3532 my ($widget, $ev) = @_;
3533
3534 if ($ev->{button} == 1) {
3535 $::CONN->user_send ("cast $spell->{name}");
3536 } elsif ($ev->{button} == 2) {
3537 $::CONN->user_send ("invoke $spell->{name}");
3538 } elsif ($ev->{button} == 3) {
3539 (new CFClient::UI::Menu
3540 items => [
3541 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3542 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3543 ],
3544 )->popup ($ev);
3545 } else {
3546 return 0;
3547 }
3548
3549 1
3550 };
3551
3552 my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3553
3554 #TODO: add path info to tooltip
3555 #$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3556
3557 $self->add (0, $row, new CFClient::UI::Face
3558 face => $spell->{face},
3559 can_hover => 1,
3560 can_events => 1,
3561 tooltip => $tooltip,
3562 on_button_down => $spell_cb,
3563 );
3564
3565 $self->add (1, $row, new CFClient::UI::Label
3566 expand => 1,
3567 text => $spell->{name},
3568 can_hover => 1,
3569 can_events => 1,
3570 tooltip => $tooltip,
3571 on_button_down => $spell_cb,
3572 );
3573
3574 $self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3575 $self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3576 $self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3577 $self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3578 }
3579 });
3580}
3581
3582sub add_spell {
3583 my ($self, $spell) = @_;
3584
3585 $self->{spell}->{$spell->{name}} = $spell;
3586 $self->rebuild_spell_list;
3587}
3588
3589sub remove_spell {
3590 my ($self, $spell) = @_;
3591
3592 delete $self->{spell}->{$spell->{name}};
3593 $self->rebuild_spell_list;
3594}
3595
3596sub clear_spells {
3597 my ($self) = @_;
3598
3599 $self->{spell} = {};
3600 $self->rebuild_spell_list;
3601}
3602
3603#############################################################################
3604
3605package CFClient::UI::Root; 3985package CFPlus::UI::Root;
3606 3986
3607our @ISA = CFClient::UI::Container::; 3987our @ISA = CFPlus::UI::Container::;
3608 3988
3609use List::Util qw(min max); 3989use List::Util qw(min max);
3610 3990
3611use CFClient::OpenGL; 3991use CFPlus::OpenGL;
3612 3992
3613sub new { 3993sub new {
3614 my $class = shift; 3994 my $class = shift;
3615 3995
3616 my $self = $class->SUPER::new ( 3996 my $self = $class->SUPER::new (
3617 visible => 1, 3997 visible => 1,
3618 @_, 3998 @_,
3619 ); 3999 );
3620 4000
3621 Scalar::Util::weaken ($self->{root} = $self); 4001 CFPlus::weaken ($self->{root} = $self);
3622 4002
3623 $self 4003 $self
3624} 4004}
3625 4005
3626sub size_request { 4006sub size_request {
… …
3721 while ($self->{refresh_hook}) { 4101 while ($self->{refresh_hook}) {
3722 $_->() 4102 $_->()
3723 for values %{delete $self->{refresh_hook}}; 4103 for values %{delete $self->{refresh_hook}};
3724 } 4104 }
3725 4105
3726 if ($self->{realloc}) { 4106 while ($self->{realloc}) {
3727 my %queue; 4107 my %queue;
3728 my @queue; 4108 my @queue;
3729 my $widget; 4109 my $widget;
3730 4110
3731 outer: 4111 outer:
… …
3778 } 4158 }
3779 } 4159 }
3780 4160
3781 delete $self->{realloc}{$widget+0}; 4161 delete $self->{realloc}{$widget+0};
3782 } 4162 }
3783 }
3784 4163
3785 while (my $size_alloc = delete $self->{size_alloc}) { 4164 while (my $size_alloc = delete $self->{size_alloc}) {
3786 my @queue = sort { $b->{visible} <=> $a->{visible} } 4165 my @queue = sort { $a->{visible} <=> $b->{visible} }
3787 values %$size_alloc; 4166 values %$size_alloc;
3788 4167
3789 while () { 4168 while () {
3790 my $widget = pop @queue || last; 4169 my $widget = pop @queue || last;
3791 4170
3792 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 4171 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3793 4172
3794 $w = 0 if $w < 0; 4173 $w = max $widget->{min_w}, $w;
3795 $h = 0 if $h < 0; 4174 $h = max $widget->{min_h}, $h;
3796 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
3797 $w = int $w + 0.5; 4182 $w = int $w + 0.5;
3798 $h = int $h + 0.5; 4183 $h = int $h + 0.5;
3799 4184
3800 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}) {
3801 $widget->{old_w} = $widget->{w}; 4186 $widget->{old_w} = $widget->{w};
3802 $widget->{old_h} = $widget->{h}; 4187 $widget->{old_h} = $widget->{h};
3803 4188
3804 $widget->{w} = $w; 4189 $widget->{w} = $w;
3805 $widget->{h} = $h; 4190 $widget->{h} = $h;
3806 4191
3807 $widget->emit (size_allocate => $w, $h); 4192 $widget->emit (size_allocate => $w, $h);
4193 }
3808 } 4194 }
3809 } 4195 }
3810 } 4196 }
3811 4197
3812 while ($self->{post_alloc_hook}) { 4198 while ($self->{post_alloc_hook}) {
3813 $_->() 4199 $_->()
3814 for values %{delete $self->{post_alloc_hook}}; 4200 for values %{delete $self->{post_alloc_hook}};
3815 } 4201 }
3816
3817 4202
3818 glViewport 0, 0, $::WIDTH, $::HEIGHT; 4203 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3819 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 4204 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3820 glClear GL_COLOR_BUFFER_BIT; 4205 glClear GL_COLOR_BUFFER_BIT;
3821 4206
… …
3824 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 4209 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3825 glMatrixMode GL_MODELVIEW; 4210 glMatrixMode GL_MODELVIEW;
3826 glLoadIdentity; 4211 glLoadIdentity;
3827 4212
3828 { 4213 {
3829 package CFClient::UI::Base; 4214 package CFPlus::UI::Base;
3830 4215
3831 ($draw_x, $draw_y, $draw_w, $draw_h) = 4216 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3832 (0, 0, $self->{w}, $self->{h}); 4217 (0, 0, $self->{w}, $self->{h});
3833 }
3834 4218
3835 $self->_draw; 4219 $self->_draw;
4220 }
3836} 4221}
3837 4222
3838############################################################################# 4223#############################################################################
3839 4224
3840package CFClient::UI; 4225package CFPlus::UI;
3841 4226
3842$ROOT = new CFClient::UI::Root; 4227$ROOT = new CFPlus::UI::Root;
3843$TOOLTIP = new CFClient::UI::Tooltip z => 900; 4228$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
3844 4229
38451 42301
3846 4231

Diff Legend

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