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.286 by root, Mon Jun 5 03:48:49 2006 UTC vs.
Revision 1.392 by root, Sat Jul 21 13:37:09 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}; 1643
1644 # first pass, columns
1645 for my $widget (sort { $a->{colspan} <=> $b->{colspan} } @children) {
1646 my ($c, $w, $cs) = @$widget{qw(col req_w colspan)};
1647
1648 my $sw = sum @w[$c .. $c + $cs - 1];
1649
1650 if ($w > $sw) {
1651 $_ += ($w - $sw) / $cs for @w[$c .. $c + $cs - 1];
1652 }
1282 1653 }
1283 for (@children) {
1284 delete $_->{parent};
1285 $_->hide;
1286 }
1287 1654
1288 $self->realloc; 1655 # second pass, rows
1289} 1656 for my $widget (sort { $a->{rowspan} <=> $b->{rowspan} } @children) {
1290
1291sub get_wh {
1292 my ($self) = @_;
1293
1294 my (@w, @h);
1295
1296 for my $y (0 .. $#{$self->{children}}) {
1297 my $row = $self->{children}[$y]
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)}; 1657 my ($r, $h, $rs) = @$widget{qw(row req_h rowspan)};
1304 1658
1305 $w[$x] = max $w[$x], $w; 1659 my $sh = sum @h[$r .. $r + $rs - 1];
1306 $h[$y] = max $h[$y], $h; 1660
1661 if ($h > $sh) {
1662 $_ += ($h - $sh) / $rs for @h[$r .. $r + $rs - 1];
1307 } 1663 }
1308 } 1664 }
1309 1665
1310 (\@w, \@h) 1666 (\@w, \@h)
1311} 1667}
… …
1319 (sum @$ws), 1675 (sum @$ws),
1320 (sum @$hs), 1676 (sum @$hs),
1321 ) 1677 )
1322} 1678}
1323 1679
1324sub size_allocate { 1680sub invoke_size_allocate {
1325 my ($self, $w, $h) = @_; 1681 my ($self, $w, $h) = @_;
1326 1682
1327 my ($ws, $hs) = $self->get_wh; 1683 my ($ws, $hs) = $self->get_wh;
1328 1684
1329 my $req_w = (sum @$ws) || 1; 1685 my $req_w = (sum @$ws) || 1;
1330 my $req_h = (sum @$hs) || 1; 1686 my $req_h = (sum @$hs) || 1;
1331 1687
1332 # TODO: nicer code && do row_expand 1688 # now linearly scale the rows/columns to the allocated size
1333 my @col_expand = @{$self->{col_expand}}; 1689 my @col_expand = @{$self->{col_expand}};
1334 @col_expand = (1) x @$ws unless @col_expand; 1690 @col_expand = (1) x @$ws unless @col_expand;
1335 my $col_expand = (sum @col_expand) || 1; 1691 my $col_expand = (sum @col_expand) || 1;
1336 1692
1337 # linearly scale sizes
1338 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1693 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1339 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1340 1694
1341 CFClient::UI::harmonize $ws; 1695 CFPlus::UI::harmonize $ws;
1696
1697 my @row_expand = @{$self->{row_expand}};
1698 @row_expand = (1) x @$ws unless @row_expand;
1699 my $row_expand = (sum @row_expand) || 1;
1700
1701 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
1702
1342 CFClient::UI::harmonize $hs; 1703 CFPlus::UI::harmonize $hs;
1343 1704
1344 my $y; 1705 my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
1706 my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
1345 1707
1346 for my $r (0 .. $#{$self->{children}}) { 1708 for my $widget ($self->children) {
1347 my $row = $self->{children}[$r] 1709 my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(row col req_w req_h rowspan colspan)};
1348 or next;
1349 1710
1350 my $x = 0; 1711 $widget->configure (
1351 my $row_h = $hs->[$r]; 1712 $x[$c], $y[$r],
1713 $x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],
1352 1714 );
1353 for my $c (0 .. $#$row) { 1715 }
1354 my $col_w = $ws->[$c];
1355 1716
1356 if (my $widget = $row->[$c]) { 1717 1
1357 $widget->configure ($x, $y, $col_w, $row_h); 1718}
1358 }
1359 1719
1360 $x += $col_w; 1720#############################################################################
1721
1722package CFPlus::UI::Fixed;
1723
1724use List::Util qw(min max);
1725
1726our @ISA = CFPlus::UI::Container::;
1727
1728sub add {
1729 my ($self, $child, $posmode, $x, $y, $sizemode, $w, $h) = @_;
1730
1731 $child->{_fixed} = [$posmode, $x, $y, $sizemode, $w, $h];
1732 $self->SUPER::add ($child);
1733}
1734
1735sub _scale($$$) {
1736 my ($mode, $val, $max) = @_;
1737
1738 $mode eq "abs" ? $val
1739 : $mode eq "rel" ? $val * $max
1740 : 0
1741}
1742
1743sub size_request {
1744 my ($self) = @_;
1745
1746 my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
1747
1748 # determine overall size by querying abs widgets
1749 for my $child ($self->visible_children) {
1750 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1751
1752 if ($pos eq "abs") {
1753 $w = _scale $size, $w, $child->{req_w};
1754 $h = _scale $size, $h, $child->{req_h};
1755
1756 $x1 = min $x1, $x; $x2 = max $x2, $x + $w;
1757 $y1 = min $y1, $y; $y2 = max $y2, $y + $h;
1361 } 1758 }
1362
1363 $y += $row_h;
1364 } 1759 }
1365 1760
1366} 1761 my $W = $x2 - $x1;
1762 my $H = $y2 - $y1;
1367 1763
1368sub find_widget { 1764 # now layout remaining widgets
1765 for my $child ($self->visible_children) {
1766 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1767
1768 if ($pos ne "abs") {
1769 $x = _scale $pos, $x, $W;
1770 $y = _scale $pos, $x, $H;
1771 $w = _scale $size, $w, $child->{req_w};
1772 $h = _scale $size, $h, $child->{req_h};
1773
1774 $x1 = min $x1, $x; $x2 = max $x2, $x + $w;
1775 $y1 = min $y1, $y; $y2 = max $y2, $y + $h;
1776 }
1777 }
1778
1779 my $W = $x2 - $x1;
1780 my $H = $y2 - $y1;
1781
1782 ($W, $H)
1783}
1784
1785sub invoke_size_allocate {
1369 my ($self, $x, $y) = @_; 1786 my ($self, $W, $H) = @_;
1370 1787
1371 $x -= $self->{x}; 1788 for my $child ($self->visible_children) {
1372 $y -= $self->{y}; 1789 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1373 1790
1374 my $res; 1791 $x = _scale $pos, $x, $W;
1792 $y = _scale $pos, $x, $H;
1793 $w = _scale $size, $w, $child->{req_w};
1794 $h = _scale $size, $h, $child->{req_h};
1375 1795
1376 for (grep $_, map @$_, grep $_, @{ $self->{children} }) { 1796 $child->configure ($x, $y, $w, $h);
1377 $res = $_->find_widget ($x, $y) 1797 }
1378 and return $res; 1798
1379 } 1799 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} 1800}
1391 1801
1392############################################################################# 1802#############################################################################
1393 1803
1394package CFClient::UI::Box; 1804package CFPlus::UI::Box;
1395 1805
1396our @ISA = CFClient::UI::Container::; 1806our @ISA = CFPlus::UI::Container::;
1397 1807
1398sub size_request { 1808sub size_request {
1399 my ($self) = @_; 1809 my ($self) = @_;
1400 1810
1401 $self->{vertical} 1811 $self->{vertical}
… …
1407 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1817 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1408 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1818 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1409 ) 1819 )
1410} 1820}
1411 1821
1412sub size_allocate { 1822sub invoke_size_allocate {
1413 my ($self, $w, $h) = @_; 1823 my ($self, $w, $h) = @_;
1414 1824
1415 my $space = $self->{vertical} ? $h : $w; 1825 my $space = $self->{vertical} ? $h : $w;
1416 my $children = $self->{children}; 1826 my @children = $self->visible_children;
1417 1827
1418 my @req; 1828 my @req;
1419 1829
1420 if ($self->{homogeneous}) { 1830 if ($self->{homogeneous}) {
1421 @req = ($space / (@$children || 1)) x @$children; 1831 @req = ($space / (@children || 1)) x @children;
1422 } else { 1832 } else {
1423 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children; 1833 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1424 my $req = List::Util::sum @req; 1834 my $req = List::Util::sum @req;
1425 1835
1426 if ($req > $space) { 1836 if ($req > $space) {
1427 # ah well, not enough space 1837 # ah well, not enough space
1428 $_ *= $space / $req for @req; 1838 $_ *= $space / $req for @req;
1429 } else { 1839 } else {
1430 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1; 1840 my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1431 1841
1432 $space = ($space - $req) / $expand; # remaining space to give away 1842 $space = ($space - $req) / $expand; # remaining space to give away
1433 1843
1434 $req[$_] += $space * $children->[$_]{expand} 1844 $req[$_] += $space * $children[$_]{expand}
1435 for 0 .. $#$children; 1845 for 0 .. $#children;
1436 } 1846 }
1437 } 1847 }
1438 1848
1439 CFClient::UI::harmonize \@req; 1849 CFPlus::UI::harmonize \@req;
1440 1850
1441 my $pos = 0; 1851 my $pos = 0;
1442 for (0 .. $#$children) { 1852 for (0 .. $#children) {
1443 my $alloc = $req[$_]; 1853 my $alloc = $req[$_];
1444 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h)); 1854 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1445 1855
1446 $pos += $alloc; 1856 $pos += $alloc;
1447 } 1857 }
1448 1858
1449 1 1859 1
1450} 1860}
1451 1861
1452############################################################################# 1862#############################################################################
1453 1863
1454package CFClient::UI::HBox; 1864package CFPlus::UI::HBox;
1455 1865
1456our @ISA = CFClient::UI::Box::; 1866our @ISA = CFPlus::UI::Box::;
1457 1867
1458sub new { 1868sub new {
1459 my $class = shift; 1869 my $class = shift;
1460 1870
1461 $class->SUPER::new ( 1871 $class->SUPER::new (
… …
1464 ) 1874 )
1465} 1875}
1466 1876
1467############################################################################# 1877#############################################################################
1468 1878
1469package CFClient::UI::VBox; 1879package CFPlus::UI::VBox;
1470 1880
1471our @ISA = CFClient::UI::Box::; 1881our @ISA = CFPlus::UI::Box::;
1472 1882
1473sub new { 1883sub new {
1474 my $class = shift; 1884 my $class = shift;
1475 1885
1476 $class->SUPER::new ( 1886 $class->SUPER::new (
… …
1479 ) 1889 )
1480} 1890}
1481 1891
1482############################################################################# 1892#############################################################################
1483 1893
1484package CFClient::UI::Label; 1894package CFPlus::UI::Label;
1485 1895
1486our @ISA = CFClient::UI::DrawBG::; 1896our @ISA = CFPlus::UI::DrawBG::;
1487 1897
1488use CFClient::OpenGL; 1898use CFPlus::OpenGL;
1489 1899
1490sub new { 1900sub new {
1491 my ($class, %arg) = @_; 1901 my ($class, %arg) = @_;
1492 1902
1493 my $self = $class->SUPER::new ( 1903 my $self = $class->SUPER::new (
… …
1496 #active_bg => none 1906 #active_bg => none
1497 #font => default_font 1907 #font => default_font
1498 #text => initial text 1908 #text => initial text
1499 #markup => initial narkup 1909 #markup => initial narkup
1500 #max_w => maximum pixel width 1910 #max_w => maximum pixel width
1911 #style => 0, # render flags
1501 ellipsise => 3, # end 1912 ellipsise => 3, # end
1502 layout => (new CFClient::Layout), 1913 layout => (new CFPlus::Layout),
1503 fontsize => 1, 1914 fontsize => 1,
1504 align => -1, 1915 align => -1,
1505 valign => -1, 1916 valign => -1,
1506 padding_x => 2, 1917 padding_x => 2,
1507 padding_y => 2, 1918 padding_y => 2,
1508 can_events => 0, 1919 can_events => 0,
1509 %arg 1920 %arg
1510 ); 1921 );
1511 1922
1512 if (exists $self->{template}) { 1923 if (exists $self->{template}) {
1513 my $layout = new CFClient::Layout; 1924 my $layout = new CFPlus::Layout;
1514 $layout->set_text (delete $self->{template}); 1925 $layout->set_text (delete $self->{template});
1515 $self->{template} = $layout; 1926 $self->{template} = $layout;
1516 } 1927 }
1517 1928
1518 if (exists $self->{markup}) { 1929 if (exists $self->{markup}) {
… …
1522 } 1933 }
1523 1934
1524 $self 1935 $self
1525} 1936}
1526 1937
1527sub escape($) {
1528 local $_ = $_[0];
1529
1530 s/&/&amp;/g;
1531 s/>/&gt;/g;
1532 s/</&lt;/g;
1533
1534 $_
1535}
1536
1537sub update { 1938sub update {
1538 my ($self) = @_; 1939 my ($self) = @_;
1539 1940
1540 delete $self->{texture}; 1941 delete $self->{texture};
1541 $self->SUPER::update; 1942 $self->SUPER::update;
… …
1552 my ($self, $text) = @_; 1953 my ($self, $text) = @_;
1553 1954
1554 return if $self->{text} eq "T$text"; 1955 return if $self->{text} eq "T$text";
1555 $self->{text} = "T$text"; 1956 $self->{text} = "T$text";
1556 1957
1557 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1558 $self->{layout}->set_text ($text); 1958 $self->{layout}->set_text ($text);
1959
1559 delete $self->{req_h}; 1960 delete $self->{size_req};
1560
1561 $self->realloc; 1961 $self->realloc;
1562 $self->update; 1962 $self->update;
1563} 1963}
1564 1964
1565sub set_markup { 1965sub set_markup {
… …
1568 return if $self->{text} eq "M$markup"; 1968 return if $self->{text} eq "M$markup";
1569 $self->{text} = "M$markup"; 1969 $self->{text} = "M$markup";
1570 1970
1571 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1971 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1572 1972
1573 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1574 $self->{layout}->set_markup ($markup); 1973 $self->{layout}->set_markup ($markup);
1974
1575 delete $self->{req_h}; 1975 delete $self->{size_req};
1576
1577 $self->realloc; 1976 $self->realloc;
1578 $self->update; 1977 $self->update;
1579} 1978}
1580 1979
1581sub size_request { 1980sub size_request {
1582 my ($self) = @_; 1981 my ($self) = @_;
1583 1982
1584 if (exists $self->{req_h}) { 1983 $self->{size_req} ||= do {
1585 @$self{qw(req_w req_h)}
1586 } else {
1587 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1984 $self->{layout}->set_font ($self->{font}) if $self->{font};
1588 $self->{layout}->set_width ($self->{max_w} || -1); 1985 $self->{layout}->set_width ($self->{max_w} || -1);
1589 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1986 $self->{layout}->set_ellipsise ($self->{ellipsise});
1590 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1987 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1591 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1988 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1592 1989
1593 my ($w, $h) = $self->{layout}->size; 1990 my ($w, $h) = $self->{layout}->size;
1594 1991
1595 if (exists $self->{template}) { 1992 if (exists $self->{template}) {
1596 $self->{template}->set_font ($self->{font}) if $self->{font}; 1993 $self->{template}->set_font ($self->{font}) if $self->{font};
1994 $self->{template}->set_width ($self->{max_w} || -1);
1597 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1995 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1598 1996
1599 my ($w2, $h2) = $self->{template}->size; 1997 my ($w2, $h2) = $self->{template}->size;
1600 1998
1601 $w = List::Util::max $w, $w2; 1999 $w = List::Util::max $w, $w2;
1602 $h = List::Util::max $h, $h2; 2000 $h = List::Util::max $h, $h2;
1603 } 2001 }
1604 2002
1605 ($w, $h) 2003 [$w, $h]
1606 } 2004 };
1607}
1608 2005
2006 @{ $self->{size_req} }
2007}
2008
2009sub baseline_shift {
2010 $_[0]{layout}->descent
2011}
2012
1609sub size_allocate { 2013sub invoke_size_allocate {
1610 my ($self, $w, $h) = @_; 2014 my ($self, $w, $h) = @_;
1611 2015
1612 delete $self->{ox}; 2016 delete $self->{ox};
1613 2017
1614 delete $self->{texture} 2018 delete $self->{texture}
1615 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w}; 2019 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
2020
2021 1
1616} 2022}
1617 2023
1618sub set_fontsize { 2024sub set_fontsize {
1619 my ($self, $fontsize) = @_; 2025 my ($self, $fontsize) = @_;
1620 2026
1621 $self->{fontsize} = $fontsize; 2027 $self->{fontsize} = $fontsize;
2028 delete $self->{size_req};
1622 delete $self->{texture}; 2029 delete $self->{texture};
1623 2030
1624 $self->realloc; 2031 $self->realloc;
1625} 2032}
1626 2033
2034sub reconfigure {
2035 my ($self) = @_;
2036
2037 delete $self->{size_req};
2038 delete $self->{texture};
2039
2040 $self->SUPER::reconfigure;
2041}
2042
1627sub _draw { 2043sub _draw {
1628 my ($self) = @_; 2044 my ($self) = @_;
1629 2045
1630 $self->SUPER::_draw; # draw background, if applicable 2046 $self->SUPER::_draw; # draw background, if applicable
1631 2047
1632 my $tex = $self->{texture} ||= do { 2048 my $size = $self->{texture} ||= do {
1633 $self->{layout}->set_foreground (@{$self->{fg}}); 2049 $self->{layout}->set_foreground (@{$self->{fg}});
1634 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2050 $self->{layout}->set_font ($self->{font}) if $self->{font};
1635 $self->{layout}->set_width ($self->{w}); 2051 $self->{layout}->set_width ($self->{w});
1636 $self->{layout}->set_ellipsise ($self->{ellipsise}); 2052 $self->{layout}->set_ellipsise ($self->{ellipsise});
1637 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 2053 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1638 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2054 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1639 2055
1640 new_from_layout CFClient::Texture $self->{layout} 2056 [$self->{layout}->size]
1641 }; 2057 };
1642 2058
1643 unless (exists $self->{ox}) { 2059 unless (exists $self->{ox}) {
1644 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 2060 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1645 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x} 2061 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1646 : ($self->{w} - $tex->{w}) * 0.5); 2062 : ($self->{w} - $size->[0]) * 0.5);
1647 2063
1648 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 2064 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1649 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 2065 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1650 : ($self->{h} - $tex->{h}) * 0.5); 2066 : ($self->{h} - $size->[1]) * 0.5);
1651 }; 2067 };
1652 2068
1653 glEnable GL_TEXTURE_2D; 2069 my $w = List::Util::min $self->{w} + 4, $size->[0];
1654 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2070 my $h = List::Util::min $self->{h} + 2, $size->[1];
1655 2071
1656 if ($tex->{format} == GL_ALPHA) { 2072 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1657 glColor @{$self->{fg}};
1658 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1659 } else {
1660 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1661 }
1662
1663 glDisable GL_TEXTURE_2D;
1664} 2073}
1665 2074
1666############################################################################# 2075#############################################################################
1667 2076
1668package CFClient::UI::EntryBase; 2077package CFPlus::UI::EntryBase;
1669 2078
1670our @ISA = CFClient::UI::Label::; 2079our @ISA = CFPlus::UI::Label::;
1671 2080
1672use CFClient::OpenGL; 2081use CFPlus::OpenGL;
1673 2082
1674sub new { 2083sub new {
1675 my $class = shift; 2084 my $class = shift;
1676 2085
1677 $class->SUPER::new ( 2086 $class->SUPER::new (
… …
1681 active_fg => [0, 0, 0], 2090 active_fg => [0, 0, 0],
1682 can_hover => 1, 2091 can_hover => 1,
1683 can_focus => 1, 2092 can_focus => 1,
1684 valign => 0, 2093 valign => 0,
1685 can_events => 1, 2094 can_events => 1,
2095 ellipsise => 0,
1686 #text => ... 2096 #text => ...
2097 #hidden => "*",
1687 @_ 2098 @_
1688 ) 2099 )
1689} 2100}
1690 2101
1691sub _set_text { 2102sub _set_text {
… …
1698 $self->{last_activity} = $::NOW; 2109 $self->{last_activity} = $::NOW;
1699 $self->{text} = $text; 2110 $self->{text} = $text;
1700 2111
1701 $text =~ s/./*/g if $self->{hidden}; 2112 $text =~ s/./*/g if $self->{hidden};
1702 $self->{layout}->set_text ("$text "); 2113 $self->{layout}->set_text ("$text ");
1703 delete $self->{req_h}; 2114 delete $self->{size_req};
1704 2115
1705 $self->_emit (changed => $self->{text}); 2116 $self->emit (changed => $self->{text});
1706 2117
1707 $self->realloc; 2118 $self->realloc;
1708 $self->update; 2119 $self->update;
1709} 2120}
1710 2121
… …
1725 my ($w, $h) = $self->SUPER::size_request; 2136 my ($w, $h) = $self->SUPER::size_request;
1726 2137
1727 ($w + 1, $h) # add 1 for cursor 2138 ($w + 1, $h) # add 1 for cursor
1728} 2139}
1729 2140
1730sub key_down { 2141sub invoke_key_down {
1731 my ($self, $ev) = @_; 2142 my ($self, $ev) = @_;
1732 2143
1733 my $mod = $ev->{mod}; 2144 my $mod = $ev->{mod};
1734 my $sym = $ev->{sym}; 2145 my $sym = $ev->{sym};
1735 my $uni = $ev->{unicode}; 2146 my $uni = $ev->{unicode};
1736 2147
1737 my $text = $self->get_text; 2148 my $text = $self->get_text;
2149
2150 $self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
1738 2151
1739 if ($uni == 8) { 2152 if ($uni == 8) {
1740 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 2153 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1741 } elsif ($uni == 127) { 2154 } elsif ($uni == 127) {
1742 substr $text, $self->{cursor}, 1, ""; 2155 substr $text, $self->{cursor}, 1, "";
1743 } elsif ($sym == CFClient::SDLK_LEFT) { 2156 } elsif ($sym == CFPlus::SDLK_LEFT) {
1744 --$self->{cursor} if $self->{cursor}; 2157 --$self->{cursor} if $self->{cursor};
1745 } elsif ($sym == CFClient::SDLK_RIGHT) { 2158 } elsif ($sym == CFPlus::SDLK_RIGHT) {
1746 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 2159 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1747 } elsif ($sym == CFClient::SDLK_HOME) { 2160 } elsif ($sym == CFPlus::SDLK_HOME) {
2161 # what a hack
2162 $self->{cursor} =
2163 (substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
2164 ? length $1
2165 : 0;
2166 } elsif ($sym == CFPlus::SDLK_END) {
2167 # uh, again
2168 $self->{cursor} =
2169 (substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
2170 ? $self->{cursor} + length $1
2171 : length $self->{text};
2172 } elsif ($uni == 21) { # ctrl-u
2173 $text = "";
1748 $self->{cursor} = 0; 2174 $self->{cursor} = 0;
1749 } elsif ($sym == CFClient::SDLK_END) {
1750 $self->{cursor} = length $text;
1751 } elsif ($uni == 27) { 2175 } elsif ($uni == 27) {
1752 $self->_emit ('escape'); 2176 $self->emit ('escape');
1753 } elsif ($uni) { 2177 } elsif ($uni == 0x0d) {
2178 substr $text, $self->{cursor}++, 0, "\012";
2179 } elsif ($uni >= 0x20) {
1754 substr $text, $self->{cursor}++, 0, chr $uni; 2180 substr $text, $self->{cursor}++, 0, chr $uni;
1755 } else { 2181 } else {
1756 return 0; 2182 return 0;
1757 } 2183 }
1758 2184
1759 $self->_set_text ($text); 2185 $self->_set_text ($text);
1760 2186
1761 $self->realloc; 2187 $self->realloc;
2188 $self->update;
1762 2189
1763 1 2190 1
1764} 2191}
1765 2192
1766sub focus_in { 2193sub invoke_focus_in {
1767 my ($self) = @_; 2194 my ($self) = @_;
1768 2195
1769 $self->{last_activity} = $::NOW; 2196 $self->{last_activity} = $::NOW;
1770 2197
1771 $self->SUPER::focus_in; 2198 $self->SUPER::invoke_focus_in
1772} 2199}
1773 2200
1774sub button_down { 2201sub invoke_button_down {
1775 my ($self, $ev, $x, $y) = @_; 2202 my ($self, $ev, $x, $y) = @_;
1776 2203
1777 $self->SUPER::button_down ($ev, $x, $y); 2204 $self->SUPER::invoke_button_down ($ev, $x, $y);
1778 2205
1779 my $idx = $self->{layout}->xy_to_index ($x, $y); 2206 my $idx = $self->{layout}->xy_to_index ($x, $y);
1780 2207
1781 # byte-index to char-index 2208 # byte-index to char-index
1782 my $text = $self->{text}; 2209 my $text = $self->{text};
1783 utf8::encode $text; 2210 utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1784 $self->{cursor} = length substr $text, 0, $idx; 2211 $self->{cursor} = length $text;
1785 2212
1786 $self->_set_text ($self->{text}); 2213 $self->_set_text ($self->{text});
1787 $self->update; 2214 $self->update;
1788 2215
1789 1 2216 1
1790} 2217}
1791 2218
1792sub mouse_motion { 2219sub invoke_mouse_motion {
1793 my ($self, $ev, $x, $y) = @_; 2220 my ($self, $ev, $x, $y) = @_;
1794# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 2221# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1795 2222
1796 0 2223 1
1797} 2224}
1798 2225
1799sub _draw { 2226sub _draw {
1800 my ($self) = @_; 2227 my ($self) = @_;
1801 2228
… …
1828 utf8::encode $text; 2255 utf8::encode $text;
1829 2256
1830 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text) 2257 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1831 } 2258 }
1832 2259
1833 glColor @{$self->{fg}};
1834 glBegin GL_LINES; 2260 glBegin GL_LINES;
1835 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy}; 2261 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};
1836 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h}; 2262 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1837 glEnd; 2263 glEnd;
1838 } 2264 }
1839} 2265}
1840 2266
2267#############################################################################
2268
1841package CFClient::UI::Entry; 2269package CFPlus::UI::Entry;
1842 2270
1843our @ISA = CFClient::UI::EntryBase::; 2271our @ISA = CFPlus::UI::EntryBase::;
1844 2272
1845use CFClient::OpenGL; 2273use CFPlus::OpenGL;
1846 2274
1847sub key_down { 2275sub invoke_key_down {
1848 my ($self, $ev) = @_; 2276 my ($self, $ev) = @_;
1849 2277
1850 my $sym = $ev->{sym}; 2278 my $sym = $ev->{sym};
1851 2279
1852 if ($sym == 13) { 2280 if ($ev->{uni} == 0x0d || $sym == 13) {
1853 unshift @{$self->{history}}, 2281 unshift @{$self->{history}},
1854 my $txt = $self->get_text; 2282 my $txt = $self->get_text;
2283
1855 $self->{history_pointer} = -1; 2284 $self->{history_pointer} = -1;
1856 $self->{history_saveback} = ''; 2285 $self->{history_saveback} = '';
1857 $self->_emit (activate => $txt); 2286 $self->emit (activate => $txt);
1858 $self->update; 2287 $self->update;
1859 2288
1860 } elsif ($sym == CFClient::SDLK_UP) { 2289 } elsif ($sym == CFPlus::SDLK_UP) {
1861 if ($self->{history_pointer} < 0) { 2290 if ($self->{history_pointer} < 0) {
1862 $self->{history_saveback} = $self->get_text; 2291 $self->{history_saveback} = $self->get_text;
1863 } 2292 }
1864 if (@{$self->{history} || []} > 0) { 2293 if (@{$self->{history} || []} > 0) {
1865 $self->{history_pointer}++; 2294 $self->{history_pointer}++;
… …
1867 $self->{history_pointer} = @{$self->{history} || []} - 1; 2296 $self->{history_pointer} = @{$self->{history} || []} - 1;
1868 } 2297 }
1869 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2298 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1870 } 2299 }
1871 2300
1872 } elsif ($sym == CFClient::SDLK_DOWN) { 2301 } elsif ($sym == CFPlus::SDLK_DOWN) {
1873 $self->{history_pointer}--; 2302 $self->{history_pointer}--;
1874 $self->{history_pointer} = -1 if $self->{history_pointer} < 0; 2303 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1875 2304
1876 if ($self->{history_pointer} >= 0) { 2305 if ($self->{history_pointer} >= 0) {
1877 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2306 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1878 } else { 2307 } else {
1879 $self->set_text ($self->{history_saveback}); 2308 $self->set_text ($self->{history_saveback});
1880 } 2309 }
1881 2310
1882 } else { 2311 } else {
1883 return $self->SUPER::key_down ($ev) 2312 return $self->SUPER::invoke_key_down ($ev)
1884 } 2313 }
1885 2314
1886 1 2315 1
1887} 2316}
1888 2317
1889############################################################################# 2318#############################################################################
1890 2319
2320package CFPlus::UI::TextEdit;
2321
2322our @ISA = CFPlus::UI::EntryBase::;
2323
2324use CFPlus::OpenGL;
2325
2326sub move_cursor_ver {
2327 my ($self, $dy) = @_;
2328
2329 my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
2330
2331 $y += $dy;
2332
2333 if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {
2334 $self->{cursor} = $index;
2335 delete $self->{cur_h};
2336 $self->update;
2337 return;
2338 }
2339}
2340
2341sub invoke_key_down {
2342 my ($self, $ev) = @_;
2343
2344 my $sym = $ev->{sym};
2345
2346 if ($sym == CFPlus::SDLK_UP) {
2347 $self->move_cursor_ver (-1);
2348 } elsif ($sym == CFPlus::SDLK_DOWN) {
2349 $self->move_cursor_ver (+1);
2350 } else {
2351 return $self->SUPER::invoke_key_down ($ev)
2352 }
2353
2354 1
2355}
2356
2357#############################################################################
2358
1891package CFClient::UI::Button; 2359package CFPlus::UI::Button;
1892 2360
1893our @ISA = CFClient::UI::Label::; 2361our @ISA = CFPlus::UI::Label::;
1894 2362
1895use CFClient::OpenGL; 2363use CFPlus::OpenGL;
1896 2364
1897my @tex = 2365my @tex =
1898 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2366 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1899 qw(b1_button_active.png); 2367 qw(b1_button_inactive.png b1_button_active.png);
1900 2368
1901sub new { 2369sub new {
1902 my $class = shift; 2370 my $class = shift;
1903 2371
1904 $class->SUPER::new ( 2372 $class->SUPER::new (
1905 padding_x => 4, 2373 padding_x => 4,
1906 padding_y => 4, 2374 padding_y => 4,
1907 fg => [1, 1, 1], 2375 fg => [1.0, 1.0, 1.0],
1908 active_fg => [0, 0, 1], 2376 active_fg => [0.8, 0.8, 0.8],
1909 can_hover => 1, 2377 can_hover => 1,
1910 align => 0, 2378 align => 0,
1911 valign => 0, 2379 valign => 0,
1912 can_events => 1, 2380 can_events => 1,
1913 @_ 2381 @_
1914 ) 2382 )
1915} 2383}
1916 2384
1917sub activate { }
1918
1919sub button_up { 2385sub invoke_button_up {
1920 my ($self, $ev, $x, $y) = @_; 2386 my ($self, $ev, $x, $y) = @_;
1921 2387
1922 $self->emit ("activate") 2388 $self->emit ("activate")
1923 if $x >= 0 && $x < $self->{w} 2389 if $x >= 0 && $x < $self->{w}
1924 && $y >= 0 && $y < $self->{h}; 2390 && $y >= 0 && $y < $self->{h};
… …
1933 2399
1934 glEnable GL_TEXTURE_2D; 2400 glEnable GL_TEXTURE_2D;
1935 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2401 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1936 glColor 0, 0, 0, 1; 2402 glColor 0, 0, 0, 1;
1937 2403
2404 my $tex = $tex[$GRAB == $self];
1938 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2405 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1939 2406
1940 glDisable GL_TEXTURE_2D; 2407 glDisable GL_TEXTURE_2D;
1941 2408
1942 $self->SUPER::_draw; 2409 $self->SUPER::_draw;
1943} 2410}
1944 2411
1945############################################################################# 2412#############################################################################
1946 2413
1947package CFClient::UI::CheckBox; 2414package CFPlus::UI::CheckBox;
1948 2415
1949our @ISA = CFClient::UI::DrawBG::; 2416our @ISA = CFPlus::UI::DrawBG::;
1950 2417
1951my @tex = 2418my @tex =
1952 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2419 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1953 qw(c1_checkbox_bg.png c1_checkbox_active.png); 2420 qw(c1_checkbox_bg.png c1_checkbox_active.png);
1954 2421
1955use CFClient::OpenGL; 2422use CFPlus::OpenGL;
1956 2423
1957sub new { 2424sub new {
1958 my $class = shift; 2425 my $class = shift;
1959 2426
1960 $class->SUPER::new ( 2427 $class->SUPER::new (
… …
1974 my ($self) = @_; 2441 my ($self) = @_;
1975 2442
1976 (6) x 2 2443 (6) x 2
1977} 2444}
1978 2445
2446sub toggle {
2447 my ($self) = @_;
2448
2449 $self->{state} = !$self->{state};
2450 $self->emit (changed => $self->{state});
2451 $self->update;
2452}
2453
1979sub button_down { 2454sub invoke_button_down {
1980 my ($self, $ev, $x, $y) = @_; 2455 my ($self, $ev, $x, $y) = @_;
1981 2456
1982 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x} 2457 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1983 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) { 2458 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1984 $self->{state} = !$self->{state}; 2459 $self->toggle;
1985 $self->_emit (changed => $self->{state});
1986 } else { 2460 } else {
1987 return 0 2461 return 0
1988 } 2462 }
1989 2463
1990 1 2464 1
… …
2010 glDisable GL_TEXTURE_2D; 2484 glDisable GL_TEXTURE_2D;
2011} 2485}
2012 2486
2013############################################################################# 2487#############################################################################
2014 2488
2015package CFClient::UI::Image; 2489package CFPlus::UI::Image;
2016 2490
2017our @ISA = CFClient::UI::Base::; 2491our @ISA = CFPlus::UI::Base::;
2018 2492
2019use CFClient::OpenGL; 2493use CFPlus::OpenGL;
2020use Carp qw/confess/;
2021 2494
2022our %loaded_images; 2495our %texture_cache;
2023 2496
2024sub new { 2497sub new {
2025 my $class = shift; 2498 my $class = shift;
2026 2499
2027 my $self = $class->SUPER::new (can_events => 0, @_); 2500 my $self = $class->SUPER::new (
2501 can_events => 0,
2502 @_,
2503 );
2028 2504
2029 $self->{image} or confess "Image has 'image' not set. This is a fatal error!"; 2505 $self->{path} || $self->{tex}
2506 or Carp::croak "'path' or 'tex' attributes required";
2030 2507
2031 $loaded_images{$self->{image}} ||= 2508 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2032 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1; 2509 new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
2033 2510
2034 my $tex = $self->{tex} = $loaded_images{$self->{image}}; 2511 CFPlus::weaken $texture_cache{$self->{path}};
2035 2512
2036 Scalar::Util::weaken $loaded_images{$self->{image}}; 2513 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2037
2038 $self->{aspect} = $tex->{w} / $tex->{h};
2039 2514
2040 $self 2515 $self
2041} 2516}
2042 2517
2518sub STORABLE_freeze {
2519 my ($self, $cloning) = @_;
2520
2521 $self->{path}
2522 or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
2523
2524 $self->{path}
2525}
2526
2527sub STORABLE_attach {
2528 my ($self, $cloning, $path) = @_;
2529
2530 $self->new (path => $path)
2531}
2532
2043sub size_request { 2533sub size_request {
2044 my ($self) = @_; 2534 my ($self) = @_;
2045 2535
2046 ($self->{tex}->{w}, $self->{tex}->{h}) 2536 ($self->{tex}{w}, $self->{tex}{h})
2047} 2537}
2048 2538
2049sub _draw { 2539sub _draw {
2050 my ($self) = @_; 2540 my ($self) = @_;
2051 2541
… …
2061 } 2551 }
2062 2552
2063 glEnable GL_TEXTURE_2D; 2553 glEnable GL_TEXTURE_2D;
2064 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2554 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2065 2555
2066 $tex->draw_quad_alpha (0, 0, $w, $h); 2556 $tex->draw_quad (0, 0, $w, $h);
2067 2557
2068 glDisable GL_TEXTURE_2D; 2558 glDisable GL_TEXTURE_2D;
2069} 2559}
2070 2560
2071############################################################################# 2561#############################################################################
2072 2562
2563package CFPlus::UI::ImageButton;
2564
2565our @ISA = CFPlus::UI::Image::;
2566
2567use CFPlus::OpenGL;
2568
2569my %textures;
2570
2571sub new {
2572 my $class = shift;
2573
2574 my $self = $class->SUPER::new (
2575 padding_x => 4,
2576 padding_y => 4,
2577 fg => [1, 1, 1],
2578 active_fg => [0, 0, 1],
2579 can_hover => 1,
2580 align => 0,
2581 valign => 0,
2582 can_events => 1,
2583 @_
2584 );
2585}
2586
2587sub invoke_button_up {
2588 my ($self, $ev, $x, $y) = @_;
2589
2590 $self->emit ("activate")
2591 if $x >= 0 && $x < $self->{w}
2592 && $y >= 0 && $y < $self->{h};
2593
2594 1
2595}
2596
2597#############################################################################
2598
2073package CFClient::UI::VGauge; 2599package CFPlus::UI::VGauge;
2074 2600
2075our @ISA = CFClient::UI::Base::; 2601our @ISA = CFPlus::UI::Base::;
2076 2602
2077use List::Util qw(min max); 2603use List::Util qw(min max);
2078 2604
2079use CFClient::OpenGL; 2605use CFPlus::OpenGL;
2080 2606
2081my %tex = ( 2607my %tex = (
2082 food => [ 2608 food => [
2083 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2609 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2084 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 2610 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2085 ], 2611 ],
2086 grace => [ 2612 grace => [
2087 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2613 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2088 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/ 2614 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2089 ], 2615 ],
2090 hp => [ 2616 hp => [
2091 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2617 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2092 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 2618 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2093 ], 2619 ],
2094 mana => [ 2620 mana => [
2095 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2621 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2096 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/ 2622 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2097 ], 2623 ],
2098); 2624);
2099 2625
2100# eg. VGauge->new (gauge => 'food'), default gauge: food 2626# eg. VGauge->new (gauge => 'food'), default gauge: food
… …
2160 my $ycut1 = max 0, min 1, $ycut; 2686 my $ycut1 = max 0, min 1, $ycut;
2161 my $ycut2 = max 0, min 1, $ycut - 1; 2687 my $ycut2 = max 0, min 1, $ycut - 1;
2162 2688
2163 my $h1 = $self->{h} * (1 - $ycut1); 2689 my $h1 = $self->{h} * (1 - $ycut1);
2164 my $h2 = $self->{h} * (1 - $ycut2); 2690 my $h2 = $self->{h} * (1 - $ycut2);
2691 my $h3 = $self->{h};
2692
2693 $_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
2165 2694
2166 glEnable GL_BLEND; 2695 glEnable GL_BLEND;
2167 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, 2696 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2168 GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2697 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2169 glEnable GL_TEXTURE_2D; 2698 glEnable GL_TEXTURE_2D;
… …
2188 2717
2189 if ($t3) { 2718 if ($t3) {
2190 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2719 glBindTexture GL_TEXTURE_2D, $t3->{name};
2191 glBegin GL_QUADS; 2720 glBegin GL_QUADS;
2192 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2721 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2193 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2722 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2194 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2723 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2195 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2724 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2196 glEnd; 2725 glEnd;
2197 } 2726 }
2198 2727
2199 glDisable GL_BLEND; 2728 glDisable GL_BLEND;
2200 glDisable GL_TEXTURE_2D; 2729 glDisable GL_TEXTURE_2D;
2201} 2730}
2202 2731
2203############################################################################# 2732#############################################################################
2204 2733
2205package CFClient::UI::Gauge; 2734package CFPlus::UI::Gauge;
2206 2735
2207our @ISA = CFClient::UI::VBox::; 2736our @ISA = CFPlus::UI::VBox::;
2208 2737
2209sub new { 2738sub new {
2210 my ($class, %arg) = @_; 2739 my ($class, %arg) = @_;
2211 2740
2212 my $self = $class->SUPER::new ( 2741 my $self = $class->SUPER::new (
… …
2214 can_hover => 1, 2743 can_hover => 1,
2215 can_events => 1, 2744 can_events => 1,
2216 %arg, 2745 %arg,
2217 ); 2746 );
2218 2747
2219 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999"); 2748 $self->add ($self->{value} = new CFPlus::UI::Label valign => +1, align => 0, template => "999");
2220 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1); 2749 $self->add ($self->{gauge} = new CFPlus::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
2221 $self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999"); 2750 $self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
2222 2751
2223 $self 2752 $self
2224} 2753}
2225 2754
2226sub set_fontsize { 2755sub set_fontsize {
… …
2247 $self->{value}->set_text ($val); 2776 $self->{value}->set_text ($val);
2248} 2777}
2249 2778
2250############################################################################# 2779#############################################################################
2251 2780
2252package CFClient::UI::Slider; 2781package CFPlus::UI::Slider;
2253 2782
2254use strict; 2783use strict;
2255 2784
2256use CFClient::OpenGL; 2785use CFPlus::OpenGL;
2257 2786
2258our @ISA = CFClient::UI::DrawBG::; 2787our @ISA = CFPlus::UI::DrawBG::;
2259 2788
2260my @tex = 2789my @tex =
2261 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 2790 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2262 qw(s1_slider.png s1_slider_bg.png); 2791 qw(s1_slider.png s1_slider_bg.png);
2263 2792
2264sub new { 2793sub new {
2265 my $class = shift; 2794 my $class = shift;
2266 2795
… …
2287 $self->update; 2816 $self->update;
2288 2817
2289 $self 2818 $self
2290} 2819}
2291 2820
2292sub changed { }
2293
2294sub set_range { 2821sub set_range {
2295 my ($self, $range) = @_; 2822 my ($self, $range) = @_;
2296 2823
2297 ($range, $self->{range}) = ($self->{range}, $range); 2824 ($range, $self->{range}) = ($self->{range}, $range);
2298 2825
2299 $self->update
2300 if "@$range" ne "@{$self->{range}}"; 2826 if ("@$range" ne "@{$self->{range}}") {
2827 $self->update;
2828 $self->set_value ($self->{range}[0]);
2829 }
2301} 2830}
2302 2831
2303sub set_value { 2832sub set_value {
2304 my ($self, $value) = @_; 2833 my ($self, $value) = @_;
2305 2834
… …
2316 if $unit; 2845 if $unit;
2317 2846
2318 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2847 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2319 2848
2320 if ($value != $old_value) { 2849 if ($value != $old_value) {
2321 $self->_emit (changed => $value); 2850 $self->emit (changed => $value);
2322 $self->update; 2851 $self->update;
2323 } 2852 }
2324} 2853}
2325 2854
2326sub size_request { 2855sub size_request {
2327 my ($self) = @_; 2856 my ($self) = @_;
2328 2857
2329 ($self->{req_w}, $self->{req_h}) 2858 ($self->{req_w}, $self->{req_h})
2330} 2859}
2331 2860
2332sub button_down { 2861sub invoke_button_down {
2333 my ($self, $ev, $x, $y) = @_; 2862 my ($self, $ev, $x, $y) = @_;
2334 2863
2335 $self->SUPER::button_down ($ev, $x, $y); 2864 $self->SUPER::invoke_button_down ($ev, $x, $y);
2336 2865
2337 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2866 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2338 2867
2339 $self->mouse_motion ($ev, $x, $y) 2868 $self->invoke_mouse_motion ($ev, $x, $y)
2340} 2869}
2341 2870
2342sub mouse_motion { 2871sub invoke_mouse_motion {
2343 my ($self, $ev, $x, $y) = @_; 2872 my ($self, $ev, $x, $y) = @_;
2344 2873
2345 if ($GRAB == $self) { 2874 if ($GRAB == $self) {
2346 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2875 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2347 2876
… …
2353 } else { 2882 } else {
2354 return 0; 2883 return 0;
2355 } 2884 }
2356 2885
2357 1 2886 1
2887}
2888
2889sub invoke_mouse_wheel {
2890 my ($self, $ev) = @_;
2891
2892 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2893
2894 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
2895
2896 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2897
2898 ! ! $delta
2358} 2899}
2359 2900
2360sub update { 2901sub update {
2361 my ($self) = @_; 2902 my ($self) = @_;
2362 2903
… …
2411 glDisable GL_TEXTURE_2D; 2952 glDisable GL_TEXTURE_2D;
2412} 2953}
2413 2954
2414############################################################################# 2955#############################################################################
2415 2956
2416package CFClient::UI::ValSlider; 2957package CFPlus::UI::ValSlider;
2417 2958
2418our @ISA = CFClient::UI::HBox::; 2959our @ISA = CFPlus::UI::HBox::;
2419 2960
2420sub new { 2961sub new {
2421 my ($class, %arg) = @_; 2962 my ($class, %arg) = @_;
2422 2963
2423 my $range = delete $arg{range}; 2964 my $range = delete $arg{range};
2424 2965
2425 my $self = $class->SUPER::new ( 2966 my $self = $class->SUPER::new (
2426 slider => (new CFClient::UI::Slider expand => 1, range => $range), 2967 slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2427 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}), 2968 entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2428 to_value => sub { shift }, 2969 to_value => sub { shift },
2429 from_value => sub { shift }, 2970 from_value => sub { shift },
2430 %arg, 2971 %arg,
2431 ); 2972 );
2432 2973
… …
2452sub set_range { shift->{slider}->set_range (@_) } 2993sub set_range { shift->{slider}->set_range (@_) }
2453sub set_value { shift->{slider}->set_value (@_) } 2994sub set_value { shift->{slider}->set_value (@_) }
2454 2995
2455############################################################################# 2996#############################################################################
2456 2997
2457package CFClient::UI::TextView; 2998package CFPlus::UI::TextScroller;
2458 2999
2459our @ISA = CFClient::UI::HBox::; 3000our @ISA = CFPlus::UI::HBox::;
2460 3001
2461use CFClient::OpenGL; 3002use CFPlus::OpenGL;
2462 3003
2463sub new { 3004sub new {
2464 my $class = shift; 3005 my $class = shift;
2465 3006
2466 my $self = $class->SUPER::new ( 3007 my $self = $class->SUPER::new (
2467 fontsize => 1, 3008 fontsize => 1,
2468 can_events => 0, 3009 can_events => 1,
3010 indent => 0,
2469 #font => default_font 3011 #font => default_font
2470 @_, 3012 @_,
2471 3013
2472 layout => (new CFClient::Layout 1), 3014 layout => (new CFPlus::Layout),
2473 par => [], 3015 par => [],
3016 max_par => 0,
2474 height => 0, 3017 height => 0,
2475 children => [ 3018 children => [
2476 (new CFClient::UI::Empty expand => 1), 3019 (new CFPlus::UI::Empty expand => 1),
2477 (new CFClient::UI::Slider vertical => 1), 3020 (new CFPlus::UI::Slider vertical => 1),
2478 ], 3021 ],
2479 ); 3022 );
2480 3023
2481 $self->{children}[1]->connect (changed => sub { $self->update }); 3024 $self->{children}[1]->connect (changed => sub { $self->update });
2482 3025
… …
2488 3031
2489 $self->{fontsize} = $fontsize; 3032 $self->{fontsize} = $fontsize;
2490 $self->reflow; 3033 $self->reflow;
2491} 3034}
2492 3035
3036sub size_request {
3037 my ($self) = @_;
3038
3039 my ($empty, $slider) = @{ $self->{children} };
3040
3041 local $self->{children} = [$empty, $slider];
3042 $self->SUPER::size_request
3043}
3044
2493sub size_allocate { 3045sub invoke_size_allocate {
2494 my ($self, $w, $h) = @_; 3046 my ($self, $w, $h) = @_;
2495 3047
2496 $self->SUPER::size_allocate ($w, $h); 3048 my ($empty, $slider, @other) = @{ $self->{children} };
3049 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
2497 3050
2498 $self->{layout}->set_font ($self->{font}) if $self->{font}; 3051 $self->{layout}->set_font ($self->{font}) if $self->{font};
2499 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 3052 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2500 $self->{layout}->set_width ($self->{children}[0]{w}); 3053 $self->{layout}->set_width ($empty->{w});
3054 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2501 3055
2502 $self->reflow; 3056 $self->reflow;
2503}
2504 3057
2505sub text_size { 3058 local $self->{children} = [$empty, $slider];
3059 $self->SUPER::invoke_size_allocate ($w, $h)
3060}
3061
3062sub invoke_mouse_wheel {
2506 my ($self, $text, $indent) = @_; 3063 my ($self, $ev) = @_;
3064
3065 return 0 unless $ev->{dy}; # only vertical movements
3066
3067 $self->{children}[1]->emit (mouse_wheel => $ev);
3068
3069 1
3070}
3071
3072sub get_layout {
3073 my ($self, $para) = @_;
2507 3074
2508 my $layout = $self->{layout}; 3075 my $layout = $self->{layout};
2509 3076
3077 $layout->set_font ($self->{font}) if $self->{font};
3078 $layout->set_foreground (@{$para->{fg}});
2510 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 3079 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2511 $layout->set_width ($self->{children}[0]{w} - $indent); 3080 $layout->set_width ($self->{children}[0]{w} - $para->{indent});
3081 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2512 $layout->set_markup ($text); 3082 $layout->set_markup ($para->{markup});
3083
3084 $layout->set_shapes (
3085 map
3086 +(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
3087 @{$para->{widget}}
2513 3088 );
3089
2514 $layout->size 3090 $layout
2515} 3091}
2516 3092
2517sub reflow { 3093sub reflow {
2518 my ($self) = @_; 3094 my ($self) = @_;
2519 3095
… …
2526 3102
2527 # todo: base offset on lines or so, not on pixels 3103 # todo: base offset on lines or so, not on pixels
2528 $self->{children}[1]->set_value ($offset); 3104 $self->{children}[1]->set_value ($offset);
2529} 3105}
2530 3106
3107sub current_paragraph {
3108 my ($self) = @_;
3109
3110 $self->{top_paragraph} - 1
3111}
3112
3113sub scroll_to {
3114 my ($self, $para) = @_;
3115
3116 $para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
3117
3118 $self->{scroll_to} = $para;
3119 $self->update;
3120}
3121
2531sub clear { 3122sub clear {
2532 my ($self) = @_; 3123 my ($self) = @_;
3124
3125 my (undef, undef, @other) = @{ $self->{children} };
3126 $self->remove ($_) for @other;
2533 3127
2534 $self->{par} = []; 3128 $self->{par} = [];
2535 $self->{height} = 0; 3129 $self->{height} = 0;
2536 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 3130 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2537} 3131}
2538 3132
2539sub add_paragraph { 3133sub add_paragraph {
2540 my ($self, $color, $text, $indent) = @_; 3134 my $self = shift;
2541 3135
2542 for my $line (split /\n/, $text) { 3136 for my $para (@_) {
2543 my ($w, $h) = $self->text_size ($line); 3137 $para = {
3138 fg => [1, 1, 1, 1],
3139 indent => 0,
3140 markup => "",
3141 widget => [],
3142 ref $para ? %$para : (markup => $para),
3143 w => 1e10,
3144 wrapped => 1,
3145 };
3146
3147 $self->add (@{ $para->{widget} }) if @{ $para->{widget} };
3148 push @{$self->{par}}, $para;
3149 }
3150
3151 if (my $max = $self->{max_par}) {
3152 shift @{$self->{par}} while @{$self->{par}} > $max;
3153 }
3154
3155 $self->{need_reflow}++;
3156 $self->update;
3157}
3158
3159sub scroll_to_bottom {
3160 my ($self) = @_;
3161
3162 $self->{scroll_to} = $#{$self->{par}};
3163 $self->update;
3164}
3165
3166sub force_uptodate {
3167 my ($self) = @_;
3168
3169 if (delete $self->{need_reflow}) {
3170 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
3171
3172 my $height = 0;
3173
3174 for my $para (@{$self->{par}}) {
3175 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
3176 my $layout = $self->get_layout ($para);
3177 my ($w, $h) = $layout->size;
3178
3179 $para->{w} = $w + $para->{indent};
3180 $para->{h} = $h;
3181 $para->{wrapped} = $layout->has_wrapped;
3182 }
3183
3184 $para->{y} = $height;
3185 $height += $para->{h};
3186 }
3187
2544 $self->{height} += $h; 3188 $self->{height} = $height;
2545 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line]; 3189 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2546 }
2547 3190
2548 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]); 3191 delete $self->{texture};
3192 }
3193
3194 if (my $paridx = delete $self->{scroll_to}) {
3195 $self->{children}[1]->set_value ($self->{par}[$paridx]{y});
3196 }
2549} 3197}
2550 3198
2551sub update { 3199sub update {
2552 my ($self) = @_; 3200 my ($self) = @_;
2553 3201
… …
2555 3203
2556 return unless $self->{h} > 0; 3204 return unless $self->{h} > 0;
2557 3205
2558 delete $self->{texture}; 3206 delete $self->{texture};
2559 3207
2560 $ROOT->on_post_alloc ($self, sub { 3208 $ROOT->on_post_alloc ($self => sub {
3209 $self->force_uptodate;
3210
2561 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 3211 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2562 3212
2563 if (delete $self->{need_reflow}) {
2564 my $height = 0;
2565
2566 my $layout = $self->{layout};
2567
2568 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2569
2570 for (@{$self->{par}}) {
2571 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2572 $layout->set_width ($W - $_->[3]);
2573 $layout->set_markup ($_->[4]);
2574 my ($w, $h) = $layout->size;
2575 $_->[0] = $w + $_->[3];
2576 $_->[1] = $h;
2577 }
2578
2579 $height += $_->[1];
2580 }
2581
2582 $self->{height} = $height;
2583
2584 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2585
2586 delete $self->{texture};
2587 }
2588
2589 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 3213 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2590 glClearColor 0, 0, 0, 0; 3214 glClearColor 0, 0, 0, 0;
2591 glClear GL_COLOR_BUFFER_BIT; 3215 glClear GL_COLOR_BUFFER_BIT;
2592 3216
3217 package CFPlus::UI::Base;
3218 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3219 (0, 0, $self->{w}, $self->{h});
3220
3221 my $top = int $self->{children}[1]{range}[0];
3222
3223 my $paridx = 0;
3224 my $top_paragraph;
2593 my $top = int $self->{children}[1]{range}[0]; 3225 my $top = int $self->{children}[1]{range}[0];
2594 3226
2595 my $y0 = $top; 3227 my $y0 = $top;
2596 my $y1 = $top + $H; 3228 my $y1 = $top + $H;
2597 3229
2598 my $y = 0;
2599
2600 my $layout = $self->{layout};
2601
2602 $layout->set_font ($self->{font}) if $self->{font};
2603
2604 glEnable GL_BLEND;
2605 #TODO# not correct in windows where rgba is forced off
2606 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2607
2608 for my $par (@{$self->{par}}) { 3230 for my $para (@{$self->{par}}) {
2609 my $h = $par->[1]; 3231 my $h = $para->{h};
3232 my $y = $para->{y};
2610 3233
2611 if ($y0 < $y + $h && $y < $y1) { 3234 if ($y0 < $y + $h && $y < $y1) {
2612 $layout->set_foreground (@{ $par->[2] }); 3235 my $layout = $self->get_layout ($para);
2613 $layout->set_width ($W - $par->[3]);
2614 $layout->set_markup ($par->[4]);
2615 3236
2616 my ($w, $h, $data, $format, $internalformat) = $layout->render; 3237 $layout->render ($para->{indent}, $y - $y0);
2617 3238
2618 glRasterPos $par->[3], $y - $y0; 3239 if (my @w = @{ $para->{widget} }) {
2619 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data; 3240 my @s = $layout->get_shapes;
3241
3242 for (@w) {
3243 my ($dx, $dy) = splice @s, 0, 2, ();
3244
3245 $_->{x} = $dx + $para->{indent};
3246 $_->{y} = $dy + $y - $y0;
3247
3248 $_->draw;
3249 }
3250 }
2620 } 3251 }
2621 3252
2622 $y += $h; 3253 $paridx++;
3254 $top_paragraph ||= $paridx if $y >= $top;
2623 } 3255 }
2624 3256
2625 glDisable GL_BLEND; 3257 $self->{top_paragraph} = $top_paragraph;
2626 }; 3258 };
2627 }); 3259 });
3260}
3261
3262sub reconfigure {
3263 my ($self) = @_;
3264
3265 $self->SUPER::reconfigure;
3266
3267 $_->{w} = 1e10 for @{ $self->{par} };
3268 $self->reflow;
2628} 3269}
2629 3270
2630sub _draw { 3271sub _draw {
2631 my ($self) = @_; 3272 my ($self) = @_;
2632 3273
… …
2635 glColor 0, 0, 0, 1; 3276 glColor 0, 0, 0, 1;
2636 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 3277 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2637 glDisable GL_TEXTURE_2D; 3278 glDisable GL_TEXTURE_2D;
2638 3279
2639 $self->{children}[1]->draw; 3280 $self->{children}[1]->draw;
2640
2641} 3281}
2642 3282
2643############################################################################# 3283#############################################################################
2644 3284
2645package CFClient::UI::Animator; 3285package CFPlus::UI::Animator;
2646 3286
2647use CFClient::OpenGL; 3287use CFPlus::OpenGL;
2648 3288
2649our @ISA = CFClient::UI::Bin::; 3289our @ISA = CFPlus::UI::Bin::;
2650 3290
2651sub moveto { 3291sub moveto {
2652 my ($self, $x, $y) = @_; 3292 my ($self, $x, $y) = @_;
2653 3293
2654 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 3294 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
… …
2682 glPopMatrix; 3322 glPopMatrix;
2683} 3323}
2684 3324
2685############################################################################# 3325#############################################################################
2686 3326
2687package CFClient::UI::Flopper; 3327package CFPlus::UI::Flopper;
2688 3328
2689our @ISA = CFClient::UI::Button::; 3329our @ISA = CFPlus::UI::Button::;
2690 3330
2691sub new { 3331sub new {
2692 my $class = shift; 3332 my $class = shift;
2693 3333
2694 my $self = $class->SUPER::new ( 3334 my $self = $class->SUPER::new (
… …
2706 $self->{other}->toggle_visibility; 3346 $self->{other}->toggle_visibility;
2707} 3347}
2708 3348
2709############################################################################# 3349#############################################################################
2710 3350
2711package CFClient::UI::Tooltip; 3351package CFPlus::UI::Tooltip;
2712 3352
2713our @ISA = CFClient::UI::Bin::; 3353our @ISA = CFPlus::UI::Bin::;
2714 3354
2715use CFClient::OpenGL; 3355use CFPlus::OpenGL;
2716 3356
2717sub new { 3357sub new {
2718 my $class = shift; 3358 my $class = shift;
2719 3359
2720 $class->SUPER::new ( 3360 $class->SUPER::new (
… …
2723 ) 3363 )
2724} 3364}
2725 3365
2726sub set_tooltip_from { 3366sub set_tooltip_from {
2727 my ($self, $widget) = @_; 3367 my ($self, $widget) = @_;
3368
3369 $widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
3370 if $widget->{tooltip} =~ /^#(.*)$/;
2728 3371
2729 my $tooltip = $widget->{tooltip}; 3372 my $tooltip = $widget->{tooltip};
2730 3373
2731 if ($ENV{CFPLUS_DEBUG} & 2) { 3374 if ($ENV{CFPLUS_DEBUG} & 2) {
2732 $tooltip .= "\n\n" . (ref $widget) . "\n" 3375 $tooltip .= "\n\n" . (ref $widget) . "\n"
2733 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n" 3376 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2734 . "req $widget->{req_w} $widget->{req_h}\n" 3377 . "req $widget->{req_w} $widget->{req_h}\n"
2735 . "visible $widget->{visible}"; 3378 . "visible $widget->{visible}";
2736 } 3379 }
2737 3380
3381 $tooltip =~ s/^\n+//;
3382 $tooltip =~ s/\n+$//;
3383
2738 $self->add (new CFClient::UI::Label 3384 $self->add (new CFPlus::UI::Label
2739 markup => $tooltip, 3385 markup => $tooltip,
2740 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3386 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2741 fontsize => 0.8, 3387 fontsize => 0.8,
2742 fg => [0, 0, 0, 1], 3388 style => 1, # FLAG_INVERSE
2743 ellipsise => 0, 3389 ellipsise => 0,
2744 font => ($widget->{tooltip_font} || $::FONT_PROP), 3390 font => ($widget->{tooltip_font} || $::FONT_PROP),
2745 ); 3391 );
2746} 3392}
2747 3393
… …
2751 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 3397 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2752 3398
2753 ($w + 4, $h + 4) 3399 ($w + 4, $h + 4)
2754} 3400}
2755 3401
2756sub size_allocate { 3402sub invoke_size_allocate {
2757 my ($self, $w, $h) = @_; 3403 my ($self, $w, $h) = @_;
2758 3404
2759 $self->SUPER::size_allocate ($w - 4, $h - 4); 3405 $self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2760} 3406}
2761 3407
2762sub visibility_change { 3408sub invoke_visibility_change {
2763 my ($self, $visible) = @_; 3409 my ($self, $visible) = @_;
2764 3410
2765 return unless $visible; 3411 return unless $visible;
2766 3412
2767 $self->{root}->on_post_alloc ("move_$self" => sub { 3413 $self->{root}->on_post_alloc ("move_$self" => sub {
2768 my $widget = $self->{owner} 3414 my $widget = $self->{owner}
2769 or return; 3415 or return;
2770 3416
3417 if ($widget->{visible}) {
2771 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 3418 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2772 3419
2773 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 3420 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2774 if $x + $self->{w} > $::WIDTH; 3421 if $x + $self->{w} > $self->{root}{w};
2775 3422
2776 $self->move_abs ($x, $y); 3423 $self->move_abs ($x, $y);
3424 } else {
3425 $self->hide;
3426 }
2777 }); 3427 });
2778} 3428}
2779 3429
2780sub _draw { 3430sub _draw {
2781 my ($self) = @_; 3431 my ($self) = @_;
… …
2805 $self->SUPER::_draw; 3455 $self->SUPER::_draw;
2806} 3456}
2807 3457
2808############################################################################# 3458#############################################################################
2809 3459
2810package CFClient::UI::Face; 3460package CFPlus::UI::Face;
2811 3461
2812our @ISA = CFClient::UI::Base::; 3462our @ISA = CFPlus::UI::DrawBG::;
2813 3463
2814use CFClient::OpenGL; 3464use CFPlus::OpenGL;
2815 3465
2816sub new { 3466sub new {
2817 my $class = shift; 3467 my $class = shift;
2818 3468
2819 my $self = $class->SUPER::new ( 3469 my $self = $class->SUPER::new (
3470 size_w => 32,
3471 size_h => 8,
2820 aspect => 1, 3472 aspect => 1,
2821 can_events => 0, 3473 can_events => 0,
2822 @_, 3474 @_,
2823 ); 3475 );
2824 3476
2825 if ($self->{anim} && $self->{animspeed}) { 3477 if ($self->{anim} && $self->{animspeed}) {
2826 Scalar::Util::weaken (my $widget = $self); 3478 CFPlus::weaken (my $widget = $self);
2827 3479
3480 $widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
3481 $widget->{anim_start} = $self->{animspeed} * Event::time / $self->{animspeed};
2828 $self->{timer} = Event->timer ( 3482 $self->{timer} = Event->timer (
2829 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2830 hard => 1, 3483 parked => 1,
2831 interval => $self->{animspeed},
2832 cb => sub { 3484 cb => sub {
3485 return unless $::CONN && $widget;
3486
2833 ++$widget->{frame}; 3487 ++$widget->{frame};
3488 $widget->update_face;
2834 $widget->update; 3489 $widget->update;
3490
3491 $widget->update_timer;
2835 }, 3492 },
2836 ); 3493 );
3494
3495 $self->update_face;
3496 $self->update_timer;
2837 } 3497 }
2838 3498
2839 $self 3499 $self
2840} 3500}
2841 3501
3502sub update_timer {
3503 my ($self) = @_;
3504
3505 return unless $self->{timer};
3506
3507 if ($self->{visible}) {
3508 $self->{timer}->at (
3509 $self->{anim_start}
3510 + $self->{animspeed}
3511 * int 1.5 + (Event::time - $self->{anim_start}) / $self->{animspeed}
3512 );
3513 $self->{timer}->start;
3514 } else {
3515 $self->{timer}->stop;
3516 }
3517}
3518
3519sub update_face {
3520 my ($self) = @_;
3521
3522 return unless $::CONN;
3523
3524 if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3525 if ($anim && @$anim) {
3526 delete $self->{wait_face};
3527 $self->{face} = $anim->[ $self->{frame} % @$anim ];
3528 }
3529 }
3530}
3531
2842sub size_request { 3532sub size_request {
2843 (32, 8) 3533 my ($self) = @_;
3534
3535 if ($::CONN) {
3536 if (my $faceid = $::CONN->{faceid}[$self->{face}]) {
3537 if (my $tex = $::CONN->{texture}[$faceid]) {
3538 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
3539 } else {
3540 $self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub {
3541 $self->realloc;
3542 });
3543 }
3544 }
3545 }
3546
3547 ($self->{size_w} || 8, $self->{size_h} || 8)
2844} 3548}
2845 3549
2846sub update { 3550sub update {
2847 my ($self) = @_; 3551 my ($self) = @_;
2848 3552
2849 return unless $self->{visible}; 3553 return unless $self->{visible};
2850 3554
2851 $self->SUPER::update; 3555 $self->SUPER::update;
2852} 3556}
2853 3557
3558sub invoke_visibility_change {
3559 my ($self) = @_;
3560
3561 $self->update_timer;
3562
3563 0
3564}
3565
2854sub _draw { 3566sub _draw {
2855 my ($self) = @_; 3567 my ($self) = @_;
2856 3568
2857 return unless $::CONN; 3569 return unless $::CONN;
2858 3570
2859 my $face; 3571 $self->SUPER::_draw;
2860 3572
2861 if ($self->{frame}) {
2862 my $anim = $::CONN->{anim}[$self->{anim}]; 3573 my $faceid = $::CONN->{faceid}[$self->{face}]
2863 3574 or return;
2864 $face = $anim->[ $self->{frame} % @$anim ]
2865 if $anim && @$anim;
2866 }
2867 3575
2868 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 3576 my $tex = $::CONN->{texture}[$faceid];
2869 3577
2870 if ($tex) { 3578 if ($tex) {
2871 glEnable GL_TEXTURE_2D; 3579 glEnable GL_TEXTURE_2D;
2872 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3580 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2873 glColor 0, 0, 0, 1; 3581 glColor 0, 0, 0, 1;
2874 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3582 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2875 glDisable GL_TEXTURE_2D; 3583 glDisable GL_TEXTURE_2D;
2876 } 3584 }
2877} 3585}
2878 3586
2879sub DESTROY { 3587sub destroy {
2880 my ($self) = @_; 3588 my ($self) = @_;
2881 3589
2882 $self->{timer}->cancel 3590 (delete $self->{timer})->cancel
2883 if $self->{timer}; 3591 if $self->{timer};
2884 3592
2885 $self->SUPER::DESTROY; 3593 $self->SUPER::destroy;
2886} 3594}
2887 3595
2888############################################################################# 3596#############################################################################
2889 3597
2890package CFClient::UI::Buttonbar; 3598package CFPlus::UI::Buttonbar;
2891 3599
2892our @ISA = CFClient::UI::HBox::; 3600our @ISA = CFPlus::UI::HBox::;
2893 3601
2894# TODO: should actualyl wrap buttons and other goodies. 3602# TODO: should actually wrap buttons and other goodies.
2895 3603
2896############################################################################# 3604#############################################################################
2897 3605
2898package CFClient::UI::Menu; 3606package CFPlus::UI::Menu;
2899 3607
2900our @ISA = CFClient::UI::FancyFrame::; 3608our @ISA = CFPlus::UI::Toplevel::;
2901 3609
2902use CFClient::OpenGL; 3610use CFPlus::OpenGL;
2903 3611
2904sub new { 3612sub new {
2905 my $class = shift; 3613 my $class = shift;
2906 3614
2907 my $self = $class->SUPER::new ( 3615 my $self = $class->SUPER::new (
2908 items => [], 3616 items => [],
2909 z => 100, 3617 z => 100,
2910 @_, 3618 @_,
2911 ); 3619 );
2912 3620
2913 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3621 $self->add ($self->{vbox} = new CFPlus::UI::VBox);
2914 3622
2915 for my $item (@{ $self->{items} }) { 3623 for my $item (@{ $self->{items} }) {
2916 my ($widget, $cb) = @$item; 3624 my ($widget, $cb, $tooltip) = @$item;
2917 3625
2918 # handle various types of items, only text for now 3626 # handle various types of items, only text for now
2919 if (!ref $widget) { 3627 if (!ref $widget) {
3628 if ($widget =~ /\t/) {
3629 my ($left, $right) = split /\t/, $widget, 2;
3630
2920 $widget = new CFClient::UI::Label 3631 $widget = new CFPlus::UI::HBox
2921 can_hover => 1, 3632 can_hover => 1,
2922 can_events => 1, 3633 can_events => 1,
3634 tooltip => $tooltip,
3635 children => [
3636 (new CFPlus::UI::Label markup => $left, expand => 1),
3637 (new CFPlus::UI::Label markup => $right, align => +1),
3638 ],
3639 ;
3640
3641 } else {
3642 $widget = new CFPlus::UI::Label
3643 can_hover => 1,
3644 can_events => 1,
2923 text => $widget; 3645 markup => $widget,
3646 tooltip => $tooltip;
3647 }
2924 } 3648 }
2925 3649
2926 $self->{item}{$widget} = $item; 3650 $self->{item}{$widget} = $item;
2927 3651
2928 $self->{vbox}->add ($widget); 3652 $self->{vbox}->add ($widget);
… …
2933 3657
2934# popup given the event (must be a mouse button down event currently) 3658# popup given the event (must be a mouse button down event currently)
2935sub popup { 3659sub popup {
2936 my ($self, $ev) = @_; 3660 my ($self, $ev) = @_;
2937 3661
2938 $self->_emit ("popdown"); 3662 $self->emit ("popdown");
2939 3663
2940 # maybe save $GRAB? must be careful about events... 3664 # maybe save $GRAB? must be careful about events...
2941 $GRAB = $self; 3665 $GRAB = $self;
2942 $self->{button} = $ev->{button}; 3666 $self->{button} = $ev->{button};
2943 3667
2944 $self->show; 3668 $self->show;
2945 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 3669 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2946} 3670}
2947 3671
2948sub mouse_motion { 3672sub invoke_mouse_motion {
2949 my ($self, $ev, $x, $y) = @_; 3673 my ($self, $ev, $x, $y) = @_;
2950 3674
2951 # TODO: should use vbox->find_widget or so 3675 # TODO: should use vbox->find_widget or so
2952 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3676 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2953 $self->{hover} = $self->{item}{$HOVER}; 3677 $self->{hover} = $self->{item}{$HOVER};
2954 3678
2955 0 3679 0
2956} 3680}
2957 3681
2958sub button_up { 3682sub invoke_button_up {
2959 my ($self, $ev, $x, $y) = @_; 3683 my ($self, $ev, $x, $y) = @_;
2960 3684
2961 if ($ev->{button} == $self->{button}) { 3685 if ($ev->{button} == $self->{button}) {
2962 undef $GRAB; 3686 undef $GRAB;
2963 $self->hide; 3687 $self->hide;
2964 3688
2965 $self->_emit ("popdown"); 3689 $self->emit ("popdown");
2966 $self->{hover}[1]->() if $self->{hover}; 3690 $self->{hover}[1]->() if $self->{hover};
2967 } else { 3691 } else {
2968 return 0 3692 return 0
2969 } 3693 }
2970 3694
2971 1 3695 1
2972} 3696}
2973 3697
2974############################################################################# 3698#############################################################################
2975 3699
2976package CFClient::UI::Multiplexer; 3700package CFPlus::UI::Multiplexer;
2977 3701
2978our @ISA = CFClient::UI::Container::; 3702our @ISA = CFPlus::UI::Container::;
2979 3703
2980sub new { 3704sub new {
2981 my $class = shift; 3705 my $class = shift;
2982 3706
2983 my $self = $class->SUPER::new ( 3707 my $self = $class->SUPER::new (
… …
2997 3721
2998 $self->{current} = $self->{children}[0] 3722 $self->{current} = $self->{children}[0]
2999 if @{ $self->{children} }; 3723 if @{ $self->{children} };
3000} 3724}
3001 3725
3726sub get_current_page {
3727 my ($self) = @_;
3728
3729 $self->{current}
3730}
3731
3002sub set_current_page { 3732sub set_current_page {
3003 my ($self, $page_or_widget) = @_; 3733 my ($self, $page_or_widget) = @_;
3004 3734
3005 my $widget = ref $page_or_widget 3735 my $widget = ref $page_or_widget
3006 ? $page_or_widget 3736 ? $page_or_widget
3007 : $self->{children}[$page_or_widget]; 3737 : $self->{children}[$page_or_widget];
3008 3738
3009 $self->{current} = $widget; 3739 $self->{current} = $widget;
3010 $self->{current}->configure (0, 0, $self->{w}, $self->{h}); 3740 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3011 3741
3012 $self->_emit (page_changed => $self->{current}); 3742 $self->emit (page_changed => $self->{current});
3013 3743
3014 $self->realloc; 3744 $self->realloc;
3015} 3745}
3016 3746
3017sub visible_children { 3747sub visible_children {
… …
3022 my ($self) = @_; 3752 my ($self) = @_;
3023 3753
3024 $self->{current}->size_request 3754 $self->{current}->size_request
3025} 3755}
3026 3756
3027sub size_allocate { 3757sub invoke_size_allocate {
3028 my ($self, $w, $h) = @_; 3758 my ($self, $w, $h) = @_;
3029 3759
3030 $self->{current}->configure (0, 0, $w, $h); 3760 $self->{current}->configure (0, 0, $w, $h);
3761
3762 1
3031} 3763}
3032 3764
3033sub _draw { 3765sub _draw {
3034 my ($self) = @_; 3766 my ($self) = @_;
3035 3767
3036 $self->{current}->draw; 3768 $self->{current}->draw;
3037} 3769}
3038 3770
3039############################################################################# 3771#############################################################################
3040 3772
3041package CFClient::UI::Notebook; 3773package CFPlus::UI::Notebook;
3042 3774
3043our @ISA = CFClient::UI::VBox::; 3775our @ISA = CFPlus::UI::VBox::;
3044 3776
3045sub new { 3777sub new {
3046 my $class = shift; 3778 my $class = shift;
3047 3779
3048 my $self = $class->SUPER::new ( 3780 my $self = $class->SUPER::new (
3049 buttonbar => (new CFClient::UI::Buttonbar), 3781 buttonbar => (new CFPlus::UI::Buttonbar),
3050 multiplexer => (new CFClient::UI::Multiplexer expand => 1), 3782 multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3051 # filter => # will be put between multiplexer and $self 3783 # filter => # will be put between multiplexer and $self
3052 @_, 3784 @_,
3053 ); 3785 );
3054 3786
3055 $self->{filter}->add ($self->{multiplexer}) if $self->{filter}; 3787 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
… …
3059} 3791}
3060 3792
3061sub add { 3793sub add {
3062 my ($self, $title, $widget, $tooltip) = @_; 3794 my ($self, $title, $widget, $tooltip) = @_;
3063 3795
3064 Scalar::Util::weaken $self; 3796 CFPlus::weaken $self;
3065 3797
3066 $self->{buttonbar}->add (new CFClient::UI::Button 3798 $self->{buttonbar}->add (new CFPlus::UI::Button
3067 markup => $title, 3799 markup => $title,
3068 tooltip => $tooltip, 3800 tooltip => $tooltip,
3069 on_activate => sub { $self->set_current_page ($widget) }, 3801 on_activate => sub { $self->set_current_page ($widget) },
3070 ); 3802 );
3071 3803
3072 $self->{multiplexer}->add ($widget); 3804 $self->{multiplexer}->add ($widget);
3073} 3805}
3074 3806
3807sub get_current_page {
3808 my ($self) = @_;
3809
3810 $self->{multiplexer}->get_current_page
3811}
3812
3075sub set_current_page { 3813sub set_current_page {
3076 my ($self, $page) = @_; 3814 my ($self, $page) = @_;
3077 3815
3078 $self->{multiplexer}->set_current_page ($page); 3816 $self->{multiplexer}->set_current_page ($page);
3079 $self->_emit (page_changed => $self->{multiplexer}{current}); 3817 $self->emit (page_changed => $self->{multiplexer}{current});
3080} 3818}
3081 3819
3082############################################################################# 3820#############################################################################
3083 3821
3822package CFPlus::UI::Selector;
3823
3824use utf8;
3825
3826our @ISA = CFPlus::UI::Button::;
3827
3828sub new {
3829 my $class = shift;
3830
3831 my $self = $class->SUPER::new (
3832 options => [], # [value, title, longdesc], ...
3833 value => undef,
3834 @_,
3835 );
3836
3837 $self->_set_value ($self->{value});
3838
3839 $self
3840}
3841
3842sub invoke_button_down {
3843 my ($self, $ev) = @_;
3844
3845 my @menu_items;
3846
3847 for (@{ $self->{options} }) {
3848 my ($value, $title, $tooltip) = @$_;
3849
3850 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3851 }
3852
3853 CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3854}
3855
3856sub _set_value {
3857 my ($self, $value) = @_;
3858
3859 my ($item) = grep $_->[0] eq $value, @{ $self->{options} }
3860 or return;
3861
3862 $self->{value} = $item->[0];
3863 $self->set_markup ("$item->[1] ⇓");
3864 $self->set_tooltip ($item->[2]);
3865}
3866
3867sub set_value {
3868 my ($self, $value) = @_;
3869
3870 return unless $self->{value} ne $value;
3871
3872 $self->_set_value ($value);
3873 $self->emit (changed => $value);
3874}
3875
3876#############################################################################
3877
3084package CFClient::UI::Statusbox; 3878package CFPlus::UI::Statusbox;
3085 3879
3086our @ISA = CFClient::UI::VBox::; 3880our @ISA = CFPlus::UI::VBox::;
3087 3881
3088sub new { 3882sub new {
3089 my $class = shift; 3883 my $class = shift;
3090 3884
3091 my $self = $class->SUPER::new ( 3885 my $self = $class->SUPER::new (
3092 fontsize => 0.8, 3886 fontsize => 0.8,
3093 @_, 3887 @_,
3094 ); 3888 );
3095 3889
3096 Scalar::Util::weaken (my $this = $self); 3890 CFPlus::weaken (my $this = $self);
3097 3891
3098 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder }); 3892 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3099 3893
3100 $self 3894 $self
3101} 3895}
… …
3103sub reorder { 3897sub reorder {
3104 my ($self) = @_; 3898 my ($self) = @_;
3105 my $NOW = Time::HiRes::time; 3899 my $NOW = Time::HiRes::time;
3106 3900
3107 # freeze display when hovering over any label 3901 # freeze display when hovering over any label
3108 return if $CFClient::UI::TOOLTIP->{owner} 3902 return if $CFPlus::UI::TOOLTIP->{owner}
3109 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label}, 3903 && grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3110 values %{ $self->{item} }; 3904 values %{ $self->{item} };
3111 3905
3112 while (my ($k, $v) = each %{ $self->{item} }) { 3906 while (my ($k, $v) = each %{ $self->{item} }) {
3113 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3907 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3114 } 3908 }
… …
3135 for ($short) { 3929 for ($short) {
3136 s/^\s+//; 3930 s/^\s+//;
3137 s/\s+/ /g; 3931 s/\s+/ /g;
3138 } 3932 }
3139 3933
3140 new CFClient::UI::Label 3934 new CFPlus::UI::Label
3141 markup => $short, 3935 markup => $short,
3142 tooltip => $item->{tooltip}, 3936 tooltip => $item->{tooltip},
3143 tooltip_font => $::FONT_PROP, 3937 tooltip_font => $::FONT_PROP,
3144 tooltip_width => 0.67, 3938 tooltip_width => 0.67,
3145 fontsize => $item->{fontsize} || $self->{fontsize}, 3939 fontsize => $item->{fontsize} || $self->{fontsize},
… …
3183 $item->{count}++; 3977 $item->{count}++;
3184 } else { 3978 } else {
3185 $item->{count} = 1; 3979 $item->{count} = 1;
3186 $item->{text} = $item->{tooltip} = $text; 3980 $item->{text} = $item->{tooltip} = $text;
3187 } 3981 }
3188 $item->{id} = ++$self->{id}; 3982 $item->{id} += 0.2;#d#
3189 $item->{timeout} = $timeout; 3983 $item->{timeout} = $timeout;
3190 delete $item->{label}; 3984 delete $item->{label};
3191 } else { 3985 } else {
3192 $self->{item}{$group} = { 3986 $self->{item}{$group} = {
3193 id => ++$self->{id}, 3987 id => ++$self->{id},
… …
3199 count => 1, 3993 count => 1,
3200 %arg, 3994 %arg,
3201 }; 3995 };
3202 } 3996 }
3203 3997
3998 $ROOT->on_refresh (reorder => sub {
3204 $self->reorder; 3999 $self->reorder;
4000 });
3205} 4001}
3206 4002
3207sub reconfigure { 4003sub reconfigure {
3208 my ($self) = @_; 4004 my ($self) = @_;
3209 4005
… …
3212 4008
3213 $self->reorder; 4009 $self->reorder;
3214 $self->SUPER::reconfigure; 4010 $self->SUPER::reconfigure;
3215} 4011}
3216 4012
3217sub DESTROY { 4013sub destroy {
3218 my ($self) = @_; 4014 my ($self) = @_;
3219 4015
3220 $self->{timer}->cancel; 4016 $self->{timer}->cancel;
3221 4017
3222 $self->SUPER::DESTROY; 4018 $self->SUPER::destroy;
3223} 4019}
3224 4020
3225############################################################################# 4021#############################################################################
3226 4022
3227package CFClient::UI::Inventory;
3228
3229our @ISA = CFClient::UI::ScrolledWindow::;
3230
3231sub new {
3232 my $class = shift;
3233
3234 my $self = $class->SUPER::new (
3235 child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3236 @_,
3237 );
3238
3239 $self
3240}
3241
3242sub set_items {
3243 my ($self, $items) = @_;
3244
3245 $self->{child}->clear;
3246 return unless $items;
3247
3248 my @items = sort {
3249 ($a->{type} <=> $b->{type})
3250 or ($a->{name} cmp $b->{name})
3251 } @$items;
3252
3253 $self->{real_items} = \@items;
3254
3255 my $row = 0;
3256 for my $item (@items) {
3257 CFClient::Item::update_widgets $item;
3258
3259 $self->{child}->add (0, $row, $item->{face_widget});
3260 $self->{child}->add (1, $row, $item->{desc_widget});
3261 $self->{child}->add (2, $row, $item->{weight_widget});
3262
3263 $row++;
3264 }
3265}
3266
3267#############################################################################
3268
3269package CFClient::UI::BindEditor;
3270
3271our @ISA = CFClient::UI::FancyFrame::;
3272
3273sub new {
3274 my $class = shift;
3275
3276 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3277
3278 $self->add (my $vb = new CFClient::UI::VBox);
3279
3280
3281 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3282 text => "start recording",
3283 tooltip => "Start/Stops recording of actions."
3284 ."All subsequent actions after the recording started will be captured."
3285 ."The actions are displayed after the record was stopped."
3286 ."To bind the action you have to click on the 'Bind' button",
3287 on_activate => sub {
3288 unless ($self->{recording}) {
3289 $self->start;
3290 } else {
3291 $self->stop;
3292 }
3293 });
3294
3295 $vb->add (new CFClient::UI::Label text => "Actions:");
3296 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3297
3298 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3299 $vb->add (my $hb = new CFClient::UI::HBox);
3300 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3301 $hb->add (new CFClient::UI::Button
3302 text => "bind",
3303 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3304 on_activate => sub {
3305 $self->ask_for_bind;
3306 });
3307
3308 $vb->add (my $hb = new CFClient::UI::HBox);
3309 $hb->add (new CFClient::UI::Button
3310 text => "ok",
3311 expand => 1,
3312 tooltip => "This closes the binding editor and saves the binding",
3313 on_activate => sub {
3314 $self->hide;
3315 $self->commit;
3316 });
3317
3318 $hb->add (new CFClient::UI::Button
3319 text => "cancel",
3320 expand => 1,
3321 tooltip => "This closes the binding editor without saving",
3322 on_activate => sub {
3323 $self->hide;
3324 $self->{binding_cancel}->()
3325 if $self->{binding_cancel};
3326 });
3327
3328 $self->update_binding_widgets;
3329
3330 $self
3331}
3332
3333sub commit {
3334 my ($self) = @_;
3335 my ($mod, $sym, $cmds) = $self->get_binding;
3336 if ($sym != 0 && @$cmds > 0) {
3337 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3338 ."'. Don't forget 'Save Config'!");
3339 $self->{binding_change}->($mod, $sym, $cmds)
3340 if $self->{binding_change};
3341 } else {
3342 $::STATUSBOX->add ("No action bound, no key or action specified!");
3343 $self->{binding_cancel}->()
3344 if $self->{binding_cancel};
3345 }
3346}
3347
3348sub start {
3349 my ($self) = @_;
3350
3351 $self->{rec_btn}->set_text ("stop recording");
3352 $self->{recording} = 1;
3353 $self->clear_command_list;
3354 $::CONN->start_record if $::CONN;
3355}
3356
3357sub stop {
3358 my ($self) = @_;
3359
3360 $self->{rec_btn}->set_text ("start recording");
3361 $self->{recording} = 0;
3362
3363 my $rec;
3364 $rec = $::CONN->stop_record if $::CONN;
3365 return unless ref $rec eq 'ARRAY';
3366 $self->set_command_list ($rec);
3367}
3368
3369
3370sub ask_for_bind_and_commit {
3371 my ($self) = @_;
3372 $self->ask_for_bind (1);
3373}
3374
3375sub ask_for_bind {
3376 my ($self, $commit) = @_;
3377
3378 CFClient::Binder::open_binding_dialog (sub {
3379 my ($mod, $sym) = @_;
3380 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3381 $self->update_binding_widgets;
3382 $self->commit if $commit;
3383 });
3384}
3385
3386# $mod and $sym are the modifiers and key symbol
3387# $cmds is a array ref of strings (the commands)
3388# $cb is the callback that is executed on OK
3389# $ccb is the callback that is executed on CANCEL and
3390# when the binding was unsuccessful on OK
3391sub set_binding {
3392 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3393
3394 $self->clear_command_list;
3395 $self->{recording} = 0;
3396 $self->{rec_btn}->set_text ("start recording");
3397
3398 $self->{binding} = [$mod, $sym];
3399 $self->{commands} = $cmds;
3400
3401 $self->{binding_change} = $cb;
3402 $self->{binding_cancel} = $ccb;
3403
3404 $self->update_binding_widgets;
3405}
3406
3407# this is a shortcut method that asks for a binding
3408# and then just binds it.
3409sub do_quick_binding {
3410 my ($self, $cmds) = @_;
3411 $self->set_binding (undef, undef, $cmds, sub {
3412 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3413 });
3414 $self->ask_for_bind (1);
3415}
3416
3417sub update_binding_widgets {
3418 my ($self) = @_;
3419 my ($mod, $sym, $cmds) = $self->get_binding;
3420 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3421 $self->set_command_list ($cmds);
3422}
3423
3424sub get_binding {
3425 my ($self) = @_;
3426 return (
3427 $self->{binding}->[0],
3428 $self->{binding}->[1],
3429 [ grep { defined $_ } @{$self->{commands}} ]
3430 );
3431}
3432
3433sub clear_command_list {
3434 my ($self) = @_;
3435 $self->{cmdbox}->clear ();
3436}
3437
3438sub set_command_list {
3439 my ($self, $cmds) = @_;
3440
3441 $self->{cmdbox}->clear ();
3442 $self->{commands} = $cmds;
3443
3444 my $idx = 0;
3445
3446 for (@$cmds) {
3447 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3448
3449 my $i = $idx;
3450 $hb->add (new CFClient::UI::Label text => $_);
3451 $hb->add (new CFClient::UI::Button
3452 text => "delete",
3453 tooltip => "Deletes the action from the record",
3454 on_activate => sub {
3455 $self->{cmdbox}->remove ($hb);
3456 $cmds->[$i] = undef;
3457 });
3458
3459
3460 $idx++
3461 }
3462}
3463
3464#############################################################################
3465
3466package CFClient::UI::SpellList;
3467
3468our @ISA = CFClient::UI::Table::;
3469
3470sub new {
3471 my $class = shift;
3472
3473 my $self = $class->SUPER::new (
3474 binding => [],
3475 commands => [],
3476 @_,
3477 )
3478}
3479
3480# XXX: Do sorting? Argl...
3481sub add_spell {
3482 my ($self, $spell) = @_;
3483 $self->{spells}->{$spell->{name}} = $spell;
3484
3485 $self->add (0, $self->{tbl_idx}, new CFClient::UI::Face
3486 face => $spell->{face},
3487 can_hover => 1,
3488 can_events => 1,
3489 tooltip => $spell->{message});
3490
3491 $self->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3492 text => $spell->{name},
3493 can_hover => 1,
3494 can_events => 1,
3495 tooltip => $spell->{message},
3496 expand => 1);
3497
3498 $self->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3499 text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3500 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3501 expand => 1);
3502
3503 $self->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3504 text => "bind to key",
3505 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3506}
3507
3508sub rebuild_spell_list {
3509 my ($self) = @_;
3510 $self->{tbl_idx} = 0;
3511 $self->add_spell ($_) for values %{$self->{spells}};
3512}
3513
3514sub remove_spell {
3515 my ($self, $spell) = @_;
3516 delete $self->{spells}->{$spell->{name}};
3517 $self->rebuild_spell_list;
3518}
3519
3520#############################################################################
3521
3522package CFClient::UI::Root; 4023package CFPlus::UI::Root;
3523 4024
3524our @ISA = CFClient::UI::Container::; 4025our @ISA = CFPlus::UI::Container::;
3525 4026
3526use List::Util qw(min max); 4027use List::Util qw(min max);
3527 4028
3528use CFClient::OpenGL; 4029use CFPlus::OpenGL;
3529 4030
3530sub new { 4031sub new {
3531 my $class = shift; 4032 my $class = shift;
3532 4033
3533 my $self = $class->SUPER::new ( 4034 my $self = $class->SUPER::new (
3534 visible => 1, 4035 visible => 1,
3535 @_, 4036 @_,
3536 ); 4037 );
3537 4038
3538 Scalar::Util::weaken ($self->{root} = $self); 4039 CFPlus::weaken ($self->{root} = $self);
3539 4040
3540 $self 4041 $self
3541} 4042}
3542 4043
3543sub size_request { 4044sub size_request {
… …
3558 $coord = $max - $size if $coord > $max - $size; 4059 $coord = $max - $size if $coord > $max - $size;
3559 4060
3560 int $coord + 0.5 4061 int $coord + 0.5
3561} 4062}
3562 4063
3563sub size_allocate { 4064sub invoke_size_allocate {
3564 my ($self, $w, $h) = @_; 4065 my ($self, $w, $h) = @_;
3565 4066
3566 for my $child ($self->children) { 4067 for my $child ($self->children) {
3567 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 4068 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3568 4069
… …
3572 $X = _to_pixel $X, $W, $self->{w}; 4073 $X = _to_pixel $X, $W, $self->{w};
3573 $Y = _to_pixel $Y, $H, $self->{h}; 4074 $Y = _to_pixel $Y, $H, $self->{h};
3574 4075
3575 $child->configure ($X, $Y, $W, $H); 4076 $child->configure ($X, $Y, $W, $H);
3576 } 4077 }
4078
4079 1
3577} 4080}
3578 4081
3579sub coord2local { 4082sub coord2local {
3580 my ($self, $x, $y) = @_; 4083 my ($self, $x, $y) = @_;
3581 4084
… …
3707 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 4210 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3708 4211
3709 $w = 0 if $w < 0; 4212 $w = 0 if $w < 0;
3710 $h = 0 if $h < 0; 4213 $h = 0 if $h < 0;
3711 4214
4215 $w = max $widget->{min_w}, $w;
4216 $h = max $widget->{min_h}, $h;
4217
4218# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
4219# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
4220
4221 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
4222 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
4223
3712 $w = int $w + 0.5; 4224 $w = int $w + 0.5;
3713 $h = int $h + 0.5; 4225 $h = int $h + 0.5;
3714 4226
3715 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) { 4227 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3716 $widget->{old_w} = $widget->{w}; 4228 $widget->{old_w} = $widget->{w};
… …
3726 4238
3727 while ($self->{post_alloc_hook}) { 4239 while ($self->{post_alloc_hook}) {
3728 $_->() 4240 $_->()
3729 for values %{delete $self->{post_alloc_hook}}; 4241 for values %{delete $self->{post_alloc_hook}};
3730 } 4242 }
3731
3732 4243
3733 glViewport 0, 0, $::WIDTH, $::HEIGHT; 4244 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3734 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 4245 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3735 glClear GL_COLOR_BUFFER_BIT; 4246 glClear GL_COLOR_BUFFER_BIT;
3736 4247
… …
3739 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 4250 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3740 glMatrixMode GL_MODELVIEW; 4251 glMatrixMode GL_MODELVIEW;
3741 glLoadIdentity; 4252 glLoadIdentity;
3742 4253
3743 { 4254 {
3744 package CFClient::UI::Base; 4255 package CFPlus::UI::Base;
3745 4256
3746 ($draw_x, $draw_y, $draw_w, $draw_h) = 4257 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3747 (0, 0, $self->{w}, $self->{h}); 4258 (0, 0, $self->{w}, $self->{h});
3748 }
3749 4259
3750 $self->_draw; 4260 $self->_draw;
4261 }
3751} 4262}
3752 4263
3753############################################################################# 4264#############################################################################
3754 4265
3755package CFClient::UI; 4266package CFPlus::UI;
3756 4267
3757$ROOT = new CFClient::UI::Root; 4268$ROOT = new CFPlus::UI::Root;
3758$TOOLTIP = new CFClient::UI::Tooltip z => 900; 4269$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
3759 4270
37601 42711
3761 4272

Diff Legend

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