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.308 by root, Mon Jun 19 05:18:14 2006 UTC vs.
Revision 1.380 by root, Tue Jul 17 17:39:07 2007 UTC

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

Diff Legend

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