ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/DC/UI.pm
(Generate patch)

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.287 by root, Mon Jun 5 05:31:13 2006 UTC vs.
Revision 1.390 by root, Sat Jul 21 13:29:46 2007 UTC

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

Diff Legend

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