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.288 by root, Mon Jun 5 21:14:40 2006 UTC vs.
Revision 1.389 by root, Sat Jul 21 13:02:05 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
… …
526} 585}
527 586
528sub reconfigure { 587sub reconfigure {
529 my ($self) = @_; 588 my ($self) = @_;
530 589
531 # some widgets cache req_w and req_h
532 delete $self->{req_w};
533 delete $self->{req_h};
534
535 $self->realloc; 590 $self->realloc;
536 $self->update; 591 $self->update;
537} 592}
538 593
539# using global variables seems a bit hacky, but passing through all drawing 594# using global variables seems a bit hacky, but passing through all drawing
… …
546 return unless $self->{h} && $self->{w}; 601 return unless $self->{h} && $self->{w};
547 602
548 # update screen rectangle 603 # update screen rectangle
549 local $draw_x = $draw_x + $self->{x}; 604 local $draw_x = $draw_x + $self->{x};
550 local $draw_y = $draw_y + $self->{y}; 605 local $draw_y = $draw_y + $self->{y};
551 local $draw_w = $draw_x + $self->{w};
552 local $draw_h = $draw_y + $self->{h};
553 606
554 # skip widgets that are entirely outside the drawing area 607 # skip widgets that are entirely outside the drawing area
555 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w) 608 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
556 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h); 609 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
557 610
… …
580 glVertex $self->{w} - 1, 0; 633 glVertex $self->{w} - 1, 0;
581 glVertex $self->{w} - 1, $self->{h} - 1; 634 glVertex $self->{w} - 1, $self->{h} - 1;
582 glVertex 0 , $self->{h} - 1; 635 glVertex 0 , $self->{h} - 1;
583 glEnd; 636 glEnd;
584 glPopMatrix; 637 glPopMatrix;
585 #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;
586 } 639 }
587 640
588 $self->_draw; 641 $self->_draw;
589 glPopMatrix; 642 glPopMatrix;
590} 643}
… …
593 my ($self) = @_; 646 my ($self) = @_;
594 647
595 warn "no draw defined for $self\n"; 648 warn "no draw defined for $self\n";
596} 649}
597 650
651my $cntx;#d#
598sub DESTROY { 652sub DESTROY {
599 my ($self) = @_; 653 my ($self) = @_;
600 654
655 return if CFPlus::in_destruct;
656
657 eval { $self->destroy };
658 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
659
601 delete $WIDGET{$self+0}; 660 delete $WIDGET{$self+0};
602 #$self->deactivate;
603} 661}
604 662
605############################################################################# 663#############################################################################
606 664
607package CFClient::UI::DrawBG; 665package CFPlus::UI::DrawBG;
608 666
609our @ISA = CFClient::UI::Base::; 667our @ISA = CFPlus::UI::Base::;
610 668
611use strict; 669use strict;
612use CFClient::OpenGL; 670use CFPlus::OpenGL;
613 671
614sub new { 672sub new {
615 my $class = shift; 673 my $class = shift;
616 674
617 # range [value, low, high, page] 675 # range [value, low, high, page]
… …
648 } 706 }
649} 707}
650 708
651############################################################################# 709#############################################################################
652 710
653package CFClient::UI::Empty; 711package CFPlus::UI::Empty;
654 712
655our @ISA = CFClient::UI::Base::; 713our @ISA = CFPlus::UI::Base::;
656 714
657sub new { 715sub new {
658 my ($class, %arg) = @_; 716 my ($class, %arg) = @_;
659 $class->SUPER::new (can_events => 0, %arg); 717 $class->SUPER::new (can_events => 0, %arg);
660} 718}
… …
667 725
668sub draw { } 726sub draw { }
669 727
670############################################################################# 728#############################################################################
671 729
672package CFClient::UI::Container; 730package CFPlus::UI::Container;
673 731
674our @ISA = CFClient::UI::Base::; 732our @ISA = CFPlus::UI::Base::;
675 733
676sub new { 734sub new {
677 my ($class, %arg) = @_; 735 my ($class, %arg) = @_;
678 736
679 my $children = delete $arg{children}; 737 my $children = delete $arg{children};
… …
688 if $children; 746 if $children;
689 747
690 $self 748 $self
691} 749}
692 750
751sub realloc {
752 my ($self) = @_;
753
754 $self->{force_realloc} = 1;
755 $self->{force_size_alloc} = 1;
756 $self->SUPER::realloc;
757}
758
693sub add { 759sub add {
694 my ($self, @widgets) = @_; 760 my ($self, @widgets) = @_;
695 761
696 $_->set_parent ($self) 762 $_->set_parent ($self)
697 for @widgets; 763 for @widgets;
… …
757 $_->draw for @{$self->{children}}; 823 $_->draw for @{$self->{children}};
758} 824}
759 825
760############################################################################# 826#############################################################################
761 827
762package CFClient::UI::Bin; 828package CFPlus::UI::Bin;
763 829
764our @ISA = CFClient::UI::Container::; 830our @ISA = CFPlus::UI::Container::;
765 831
766sub new { 832sub new {
767 my ($class, %arg) = @_; 833 my ($class, %arg) = @_;
768 834
769 my $child = (delete $arg{child}) || new CFClient::UI::Empty::; 835 my $child = (delete $arg{child}) || new CFPlus::UI::Empty::;
770 836
771 $class->SUPER::new (children => [$child], %arg) 837 $class->SUPER::new (children => [$child], %arg)
772} 838}
773 839
774sub add { 840sub add {
775 my ($self, $child) = @_; 841 my ($self, $child) = @_;
776 842
777 $self->{children} = []; 843 $self->SUPER::remove ($_) for @{ $self->{children} };
778
779 $self->SUPER::add ($child); 844 $self->SUPER::add ($child);
780} 845}
781 846
782sub remove { 847sub remove {
783 my ($self, $widget) = @_; 848 my ($self, $widget) = @_;
784 849
785 $self->SUPER::remove ($widget); 850 $self->SUPER::remove ($widget);
786 851
787 $self->{children} = [new CFClient::UI::Empty] 852 $self->{children} = [new CFPlus::UI::Empty]
788 unless @{$self->{children}}; 853 unless @{$self->{children}};
789} 854}
790 855
791sub child { $_[0]->{children}[0] } 856sub child { $_[0]->{children}[0] }
792 857
793sub size_request { 858sub size_request {
794 $_[0]{children}[0]->size_request 859 $_[0]{children}[0]->size_request
795} 860}
796 861
797sub size_allocate { 862sub invoke_size_allocate {
798 my ($self, $w, $h) = @_; 863 my ($self, $w, $h) = @_;
799 864
800 $self->{children}[0]->configure (0, 0, $w, $h); 865 $self->{children}[0]->configure (0, 0, $w, $h);
866
867 1
801} 868}
802 869
803############################################################################# 870#############################################################################
804 871
805# back-buffered drawing area 872# back-buffered drawing area
806 873
807package CFClient::UI::Window; 874package CFPlus::UI::Window;
808 875
809our @ISA = CFClient::UI::Bin::; 876our @ISA = CFPlus::UI::Bin::;
810 877
811use CFClient::OpenGL; 878use CFPlus::OpenGL;
812 879
813sub new { 880sub new {
814 my ($class, %arg) = @_; 881 my ($class, %arg) = @_;
815 882
816 my $self = $class->SUPER::new (%arg); 883 my $self = $class->SUPER::new (%arg);
… …
821 888
822 $ROOT->on_post_alloc ($self => sub { $self->render_child }); 889 $ROOT->on_post_alloc ($self => sub { $self->render_child });
823 $self->SUPER::update; 890 $self->SUPER::update;
824} 891}
825 892
826sub size_allocate { 893sub invoke_size_allocate {
827 my ($self, $w, $h) = @_; 894 my ($self, $w, $h) = @_;
828 895
829 $self->SUPER::size_allocate ($w, $h);
830 $self->update; 896 $self->update;
897
898 $self->SUPER::invoke_size_allocate ($w, $h)
831} 899}
832 900
833sub _render { 901sub _render {
834 my ($self) = @_; 902 my ($self) = @_;
835 903
… …
837} 905}
838 906
839sub render_child { 907sub render_child {
840 my ($self) = @_; 908 my ($self) = @_;
841 909
842 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 910 $self->{texture} = new_from_opengl CFPlus::Texture $self->{w}, $self->{h}, sub {
843 glClearColor 0, 0, 0, 0; 911 glClearColor 0, 0, 0, 0;
844 glClear GL_COLOR_BUFFER_BIT; 912 glClear GL_COLOR_BUFFER_BIT;
845 913
846 { 914 {
847 package CFClient::UI::Base; 915 package CFPlus::UI::Base;
848 916
849 ($draw_x, $draw_y, $draw_w, $draw_h) = 917 local ($draw_x, $draw_y, $draw_w, $draw_h) =
850 (0, 0, $self->{w}, $self->{h}); 918 (0, 0, $self->{w}, $self->{h});
919
920 $self->_render;
851 } 921 }
852
853 $self->_render;
854 }; 922 };
855} 923}
856 924
857sub _draw { 925sub _draw {
858 my ($self) = @_; 926 my ($self) = @_;
859
860 my ($w, $h) = @$self{qw(w h)};
861 927
862 my $tex = $self->{texture} 928 my $tex = $self->{texture}
863 or return; 929 or return;
864 930
865 glEnable GL_TEXTURE_2D; 931 glEnable GL_TEXTURE_2D;
866 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 932 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
867 glColor 0, 0, 0, 1; 933 glColor 0, 0, 0, 1;
868 934
869 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 935 $tex->draw_quad_alpha_premultiplied (0, 0);
870 936
871 glDisable GL_TEXTURE_2D; 937 glDisable GL_TEXTURE_2D;
872} 938}
873 939
874############################################################################# 940#############################################################################
875 941
876package CFClient::UI::ViewPort; 942package CFPlus::UI::ViewPort;
877 943
944use List::Util qw(min max);
945
878our @ISA = CFClient::UI::Window::; 946our @ISA = CFPlus::UI::Window::;
879 947
880sub new { 948sub new {
881 my $class = shift; 949 my $class = shift;
882 950
883 $class->SUPER::new ( 951 $class->SUPER::new (
… …
890sub size_request { 958sub size_request {
891 my ($self) = @_; 959 my ($self) = @_;
892 960
893 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 961 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
894 962
895 $w = 10 if $self->{scroll_x}; 963 $w = 1 if $self->{scroll_x};
896 $h = 10 if $self->{scroll_y}; 964 $h = 1 if $self->{scroll_y};
897 965
898 ($w, $h) 966 ($w, $h)
899} 967}
900 968
901sub size_allocate { 969sub invoke_size_allocate {
902 my ($self, $w, $h) = @_; 970 my ($self, $w, $h) = @_;
903 971
904 my $child = $self->child; 972 my $child = $self->child;
905 973
906 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w}; 974 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
907 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h}; 975 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
908 976
909 $self->child->configure (0, 0, $w, $h); 977 $self->child->configure (0, 0, $w, $h);
910 $self->update; 978 $self->update;
979
980 1
911} 981}
912 982
913sub set_offset { 983sub set_offset {
914 my ($self, $x, $y) = @_; 984 my ($self, $x, $y) = @_;
915 985
986 my $x = max 0, min $self->child->{w} - $self->{w}, int $x;
987 my $y = max 0, min $self->child->{h} - $self->{h}, int $y;
988
989 if ($x != $self->{view_x} or $y != $self->{view_y}) {
916 $self->{view_x} = int $x; 990 $self->{view_x} = $x;
917 $self->{view_y} = int $y; 991 $self->{view_y} = $y;
918 992
993 $self->emit (changed => $x, $y);
919 $self->update; 994 $self->update;
995 }
920} 996}
921 997
922# hmm, this does not work for topleft of $self... but we should not ask for that 998# hmm, this does not work for topleft of $self... but we should not ask for that
923sub coord2local { 999sub coord2local {
924 my ($self, $x, $y) = @_; 1000 my ($self, $x, $y) = @_;
… …
939 my ($self, $x, $y) = @_; 1015 my ($self, $x, $y) = @_;
940 1016
941 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w} 1017 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
942 && $y >= $self->{y} && $y < $self->{y} + $self->{h} 1018 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
943 ) { 1019 ) {
944 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y}) 1020 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
945 } else { 1021 } else {
946 $self->CFClient::UI::Base::find_widget ($x, $y) 1022 $self->CFPlus::UI::Base::find_widget ($x, $y)
947 } 1023 }
948} 1024}
949 1025
950sub _render { 1026sub _render {
951 my ($self) = @_; 1027 my ($self) = @_;
952 1028
953 local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x}; 1029 local $CFPlus::UI::Base::draw_x = $CFPlus::UI::Base::draw_x - $self->{view_x};
954 local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y}; 1030 local $CFPlus::UI::Base::draw_y = $CFPlus::UI::Base::draw_y - $self->{view_y};
955 1031
956 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 1032 CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
957 1033
958 $self->SUPER::_render; 1034 $self->SUPER::_render;
959} 1035}
960 1036
961############################################################################# 1037#############################################################################
962 1038
963package CFClient::UI::ScrolledWindow; 1039package CFPlus::UI::ScrolledWindow;
964 1040
965our @ISA = CFClient::UI::HBox::; 1041our @ISA = CFPlus::UI::Table::;
966 1042
967sub new { 1043sub new {
968 my ($class, %arg) = @_; 1044 my ($class, %arg) = @_;
969 1045
970 my $child = delete $arg{child}; 1046 my $child = delete $arg{child};
971 1047
972 my $self; 1048 my $self;
973 1049
974 my $slider = new CFClient::UI::Slider 1050 my $hslider = new CFPlus::UI::Slider
1051 vertical => 0,
1052 range => [0, 0, 1, 0.01], # HACK fix
1053 on_changed => sub {
1054 $self->{hpos} = $_[1];
1055 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1056 },
1057 ;
1058
1059 my $vslider = new CFPlus::UI::Slider
975 vertical => 1, 1060 vertical => 1,
976 range => [0, 0, 1, 0.01], # HACK fix 1061 range => [0, 0, 1, 0.01], # HACK fix
977 on_changed => sub { 1062 on_changed => sub {
978 $self->{vp}->set_offset (0, $_[1]); 1063 $self->{vpos} = $_[1];
1064 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
979 }, 1065 },
980 ; 1066 ;
981 1067
982 $self = $class->SUPER::new ( 1068 $self = $class->SUPER::new (
983 vp => (new CFClient::UI::ViewPort expand => 1), 1069 scroll_x => 0,
1070 scroll_y => 1,
1071 can_events => 1,
984 slider => $slider, 1072 hslider => $hslider,
1073 vslider => $vslider,
1074 col_expand => [1, 0],
1075 row_expand => [1, 0],
985 %arg, 1076 %arg,
986 ); 1077 );
987 1078
988 $self->SUPER::add ($self->{vp}, $self->{slider}); 1079 $self->{vp} = new CFPlus::UI::ViewPort
1080 expand => 1,
1081 scroll_x => $self->{scroll_x},
1082 scroll_y => $self->{scroll_y},
1083 on_changed => sub {
1084 my ($vp, $x, $y) = @_;
1085
1086 $vp->{parent}{hslider}->set_value ($x);
1087 $vp->{parent}{vslider}->set_value ($y);
1088
1089 0
1090 },
1091 ;
1092
1093 $self->SUPER::add_at (0, 0, $self->{vp});
1094
989 $self->add ($child) if $child; 1095 $self->add ($child) if $child;
990 1096
991 $self 1097 $self
992} 1098}
1099
1100#TODO# update range on size_allocate depending on child
993 1101
994sub add { 1102sub add {
995 my ($self, $widget) = @_; 1103 my ($self, $widget) = @_;
996 1104
997 $self->{vp}->add ($self->{child} = $widget); 1105 $self->{vp}->add ($self->{child} = $widget);
998} 1106}
999 1107
1108sub update_slider {
1109 my ($self) = @_;
1110
1111 my $child = ($self->{vp} or return)->child;
1112
1113 my ($w1, $w2) = ($child->{w}, $self->{vp}{w});
1114 $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
1115
1116 my $visible = $w1 > $w2;
1117 if ($visible != $self->{hslider}{visible}) {
1118 $visible ? $self->SUPER::add_at (0, 1, $self->{hslider})
1119 : $self->{hslider}->hide;
1120 }
1121
1122 my ($h1, $h2) = ($child->{h}, $self->{vp}{h});
1123 $self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
1124
1125 my $visible = $h1 > $h2;
1126 if ($visible != $self->{vslider}{visible}) {
1127 $visible ? $self->SUPER::add_at (1, 0, $self->{vslider})
1128 : $self->{vslider}->hide;
1129 }
1130}
1131
1000sub update { 1132sub update {
1001 my ($self) = @_; 1133 my ($self) = @_;
1002 1134
1135 $self->update_slider;
1003 $self->SUPER::update; 1136 $self->SUPER::update;
1004
1005 # todo: overwrite size_allocate of child
1006 my $child = $self->{vp}->child;
1007 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1008} 1137}
1009 1138
1139sub invoke_mouse_wheel {
1140 my ($self, $ev) = @_;
1141
1142 $self->{vslider}->emit (mouse_wheel => $ev)
1143 if $ev->{dy};
1144
1145 $self->{hslider}->emit (mouse_wheel => $ev)
1146 if $ev->{dx};
1147
1148 1
1149}
1150
1151sub invoke_button_down {
1152 my ($self, $ev, $x, $y) = @_;
1153
1154 if ($ev->{button} == 2) {
1155 $self->grab_focus;
1156
1157 my $ox = $self->{vp}{view_x} + $ev->{x};
1158 my $oy = $self->{vp}{view_y} + $ev->{y};
1159
1160 $self->{motion} = sub {
1161 my ($ev, $x, $y) = @_;
1162
1163 $self->{vp}->set_offset ($ox - $ev->{x}, $oy - $ev->{y});
1164 $self->update;
1165 };
1166
1167 return 1;
1168 }
1169
1170 0
1171}
1172
1173sub invoke_button_up {
1174 my ($self, $ev, $x, $y) = @_;
1175
1176 if (delete $self->{motion}) {
1177 return 1;
1178 }
1179
1180 0
1181}
1182
1183sub invoke_mouse_motion {
1184 my ($self, $ev, $x, $y) = @_;
1185
1186 if ($self->{motion}) {
1187 $self->{motion}->($ev, $x, $y);
1188 return 1;
1189 }
1190
1191 0
1192}
1193
1010sub size_allocate { 1194sub invoke_size_allocate {
1011 my ($self, $w, $h) = @_; 1195 my ($self, $w, $h) = @_;
1012 1196
1197 $self->update_slider;
1013 $self->SUPER::size_allocate ($w, $h); 1198 $self->SUPER::invoke_size_allocate ($w, $h)
1014
1015 my $child = $self->{vp}->child;
1016 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1017} 1199}
1018
1019#TODO# update range on size_allocate depending on child
1020# update viewport offset on scroll
1021 1200
1022############################################################################# 1201#############################################################################
1023 1202
1024package CFClient::UI::Frame; 1203package CFPlus::UI::Frame;
1025 1204
1026our @ISA = CFClient::UI::Bin::; 1205our @ISA = CFPlus::UI::Bin::;
1027 1206
1028use CFClient::OpenGL; 1207use CFPlus::OpenGL;
1029 1208
1030sub new { 1209sub new {
1031 my $class = shift; 1210 my $class = shift;
1032 1211
1033 $class->SUPER::new ( 1212 $class->SUPER::new (
… …
1059 $self->SUPER::_draw; 1238 $self->SUPER::_draw;
1060} 1239}
1061 1240
1062############################################################################# 1241#############################################################################
1063 1242
1064package CFClient::UI::FancyFrame; 1243package CFPlus::UI::FancyFrame;
1065 1244
1066our @ISA = CFClient::UI::Bin::; 1245our @ISA = CFPlus::UI::Bin::;
1067 1246
1068use CFClient::OpenGL; 1247use CFPlus::OpenGL;
1069
1070my $bg =
1071 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1072 mipmap => 1, wrap => 1;
1073
1074my @border =
1075 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1076 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1077 1248
1078sub new { 1249sub new {
1079 my ($class, %arg) = @_; 1250 my ($class, %arg) = @_;
1080 1251
1081 my $title = delete $arg{title}; 1252 if ((exists $arg{label}) && !ref $arg{label}) {
1253 $arg{label} = new CFPlus::UI::Label
1254 align => 1,
1255 valign => 0,
1256 text => $arg{label},
1257 fontsize => ($arg{border} || 0.8) * 0.75;
1258 }
1259
1260 my $self = $class->SUPER::new (
1261 # label => "",
1262 fg => [0.6, 0.3, 0.1],
1263 border => 0.8,
1264 style => 'single',
1265 %arg,
1266 );
1267
1268 $self
1269}
1270
1271sub add {
1272 my ($self, @widgets) = @_;
1273
1274 $self->SUPER::add (@widgets);
1275 $self->CFPlus::UI::Container::add ($self->{label}) if $self->{label};
1276}
1277
1278sub border {
1279 int $_[0]{border} * $::FONTSIZE
1280}
1281
1282sub size_request {
1283 my ($self) = @_;
1284
1285 ($self->{label_w}, undef) = $self->{label}->size_request
1286 if $self->{label};
1287
1288 my ($w, $h) = $self->SUPER::size_request;
1289
1290 (
1291 $w + $self->border * 2,
1292 $h + $self->border * 2,
1293 )
1294}
1295
1296sub invoke_size_allocate {
1297 my ($self, $w, $h) = @_;
1298
1299 my $border = $self->border;
1300
1301 $w -= List::Util::max 0, $border * 2;
1302 $h -= List::Util::max 0, $border * 2;
1303
1304 if (my $label = $self->{label}) {
1305 $label->{w} = List::Util::max 0, List::Util::min $self->{label_w}, $w - $border * 2;
1306 $label->{h} = List::Util::min $h, $border;
1307 $label->invoke_size_allocate ($label->{w}, $label->{h});
1308 }
1309
1310 $self->child->configure ($border, $border, $w, $h);
1311
1312 1
1313}
1314
1315sub _draw {
1316 my ($self) = @_;
1317
1318 my $child = $self->{children}[0];
1319
1320 my $border = $self->border;
1321 my ($w, $h) = ($self->{w}, $self->{h});
1322
1323 $child->draw;
1324
1325 glColor @{$self->{fg}};
1326 glBegin GL_LINE_STRIP;
1327 glVertex $border * 1.5 , $border * 0.5 + 0.5;
1328 glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1329 glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1330 glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1331 glVertex $w - $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1332 glVertex $self->{label} ? $border * 2 + $self->{label}{w} : $border * 1.5, $border * 0.5 + 0.5;
1333 glEnd;
1334
1335 if ($self->{label}) {
1336 glTranslate $border * 2, 0;
1337 $self->{label}->_draw;
1338 }
1339}
1340
1341#############################################################################
1342
1343package CFPlus::UI::Toplevel;
1344
1345our @ISA = CFPlus::UI::Bin::;
1346
1347use CFPlus::OpenGL;
1348
1349my $bg =
1350 new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1351 mipmap => 1, wrap => 1;
1352
1353my @border =
1354 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1355 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1356
1357my @icon =
1358 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1359 qw(x1_move.png x1_resize.png);
1360
1361sub new {
1362 my ($class, %arg) = @_;
1082 1363
1083 my $self = $class->SUPER::new ( 1364 my $self = $class->SUPER::new (
1084 bg => [1, 1, 1, 1], 1365 bg => [1, 1, 1, 1],
1085 border_bg => [1, 1, 1, 1], 1366 border_bg => [1, 1, 1, 1],
1086 border => 0.6, 1367 border => 0.6,
1087 can_events => 1, 1368 can_events => 1,
1088 min_w => 16, 1369 min_w => 64,
1089 min_h => 16, 1370 min_h => 32,
1090 %arg, 1371 %arg,
1091 ); 1372 );
1092 1373
1093 $self->{title} = new CFClient::UI::Label 1374 $self->{title_widget} = new CFPlus::UI::Label
1094 align => 0, 1375 align => 0,
1095 valign => 1, 1376 valign => 1,
1096 text => $title, 1377 text => $self->{title},
1097 fontsize => $self->{border} 1378 fontsize => $self->{border},
1098 if defined $title; 1379 if exists $self->{title};
1380
1381 if ($self->{has_close_button}) {
1382 $self->{close_button} =
1383 new CFPlus::UI::ImageButton
1384 path => 'x1_close.png',
1385 on_activate => sub { $self->emit ("delete") };
1386
1387 $self->CFPlus::UI::Container::add ($self->{close_button});
1388 }
1099 1389
1100 $self 1390 $self
1101} 1391}
1102 1392
1103sub add { 1393sub add {
1104 my ($self, @widgets) = @_; 1394 my ($self, @widgets) = @_;
1105 1395
1106 $self->SUPER::add (@widgets); 1396 $self->SUPER::add (@widgets);
1397 $self->CFPlus::UI::Container::add ($self->{close_button}) if $self->{close_button};
1107 $self->CFClient::UI::Container::add ($self->{title}) if $self->{title}; 1398 $self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1108} 1399}
1109 1400
1110sub border { 1401sub border {
1111 int $_[0]{border} * $::FONTSIZE 1402 int $_[0]{border} * $::FONTSIZE
1112} 1403}
1113 1404
1114sub size_request { 1405sub size_request {
1115 my ($self) = @_; 1406 my ($self) = @_;
1116 1407
1117 $self->{title}->size_request 1408 $self->{title_widget}->size_request
1118 if $self->{title}; 1409 if $self->{title_widget};
1410
1411 $self->{close_button}->size_request
1412 if $self->{close_button};
1119 1413
1120 my ($w, $h) = $self->SUPER::size_request; 1414 my ($w, $h) = $self->SUPER::size_request;
1121 1415
1122 ( 1416 (
1123 $w + $self->border * 2, 1417 $w + $self->border * 2,
1124 $h + $self->border * 2, 1418 $h + $self->border * 2,
1125 ) 1419 )
1126} 1420}
1127 1421
1128sub size_allocate { 1422sub invoke_size_allocate {
1129 my ($self, $w, $h) = @_; 1423 my ($self, $w, $h) = @_;
1130 1424
1131 if ($self->{title}) { 1425 if ($self->{title_widget}) {
1132 $self->{title}{w} = $w; 1426 $self->{title_widget}{w} = $w;
1133 $self->{title}{h} = $h; 1427 $self->{title_widget}{h} = $h;
1134 $self->{title}->size_allocate ($w, $h); 1428 $self->{title_widget}->invoke_size_allocate ($w, $h);
1135 } 1429 }
1136 1430
1137 my $border = $self->border; 1431 my $border = $self->border;
1138 1432
1139 $h -= List::Util::max 0, $border * 2; 1433 $h -= List::Util::max 0, $border * 2;
1140 $w -= List::Util::max 0, $border * 2; 1434 $w -= List::Util::max 0, $border * 2;
1435
1436 $self->child->configure ($border, $border, $w, $h);
1437
1438 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1439 if $self->{close_button};
1440
1441 1
1442}
1443
1444sub invoke_delete {
1445 my ($self) = @_;
1446
1447 $self->hide;
1141 1448
1142 $self->child->configure ($border, $border, $w, $h); 1449 1
1143} 1450}
1144 1451
1145sub button_down { 1452sub invoke_button_down {
1146 my ($self, $ev, $x, $y) = @_; 1453 my ($self, $ev, $x, $y) = @_;
1147 1454
1148 my ($w, $h) = @$self{qw(w h)}; 1455 my ($w, $h) = @$self{qw(w h)};
1149 my $border = $self->border; 1456 my $border = $self->border;
1150 1457
… …
1181 1488
1182 ($x, $y) = ($ev->{x}, $ev->{y}); 1489 ($x, $y) = ($ev->{x}, $ev->{y});
1183 1490
1184 $self->move_abs ($bx + $x - $ox, $by + $y - $oy); 1491 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1185 # HACK: the next line is required to enforce placement 1492 # HACK: the next line is required to enforce placement
1186 $self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h}); 1493 $self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
1187 }; 1494 };
1188 } else { 1495 } else {
1189 return 0; 1496 return 0;
1190 } 1497 }
1191 1498
1192 1 1499 1
1193} 1500}
1194 1501
1195sub button_up { 1502sub invoke_button_up {
1196 my ($self, $ev, $x, $y) = @_; 1503 my ($self, $ev, $x, $y) = @_;
1197 1504
1198 !!delete $self->{motion} 1505 ! ! delete $self->{motion}
1199} 1506}
1200 1507
1201sub mouse_motion { 1508sub invoke_mouse_motion {
1202 my ($self, $ev, $x, $y) = @_; 1509 my ($self, $ev, $x, $y) = @_;
1203 1510
1204 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1511 $self->{motion}->($ev, $x, $y) if $self->{motion};
1205 1512
1206 !!$self->{motion} 1513 ! ! $self->{motion}
1514}
1515
1516sub invoke_visibility_change {
1517 my ($self, $visible) = @_;
1518
1519 delete $self->{motion} unless $visible;
1520
1521 0
1207} 1522}
1208 1523
1209sub _draw { 1524sub _draw {
1210 my ($self) = @_; 1525 my ($self) = @_;
1211 1526
… …
1218 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1533 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1219 1534
1220 my $border = $self->border; 1535 my $border = $self->border;
1221 1536
1222 glColor @{ $self->{border_bg} }; 1537 glColor @{ $self->{border_bg} };
1223 $border[0]->draw_quad_alpha (0, 0, $w, $border); 1538 $border[0]->draw_quad_alpha ( 0, 0, $w, $border);
1224 $border[1]->draw_quad_alpha (0, $border, $border, $ch); 1539 $border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
1225 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1540 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1226 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border); 1541 $border[3]->draw_quad_alpha ( 0, $h - $border, $w, $border);
1542
1543 # move
1544 my $w2 = ($w - $border) * .5;
1545 my $h2 = ($h - $border) * .5;
1546 $icon[0]->draw_quad_alpha ( 0, $h2, $border, $border);
1547 $icon[0]->draw_quad_alpha ($w - $border, $h2, $border, $border);
1548 $icon[0]->draw_quad_alpha ($w2 , $h - $border, $border, $border);
1549
1550 # resize
1551 $icon[1]->draw_quad_alpha ( 0, 0, $border, $border);
1552 $icon[1]->draw_quad_alpha ($w - $border, 0, $border, $border)
1553 unless $self->{has_close_button};
1554 $icon[1]->draw_quad_alpha ( 0, $h - $border, $border, $border);
1555 $icon[1]->draw_quad_alpha ($w - $border, $h - $border, $border, $border);
1227 1556
1228 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1557 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1229 glColor @{ $self->{bg} }; 1558 glColor @{ $self->{bg} };
1230 1559
1231 # TODO: repeat texture not scale 1560 # TODO: repeat texture not scale
… …
1237 1566
1238 glDisable GL_TEXTURE_2D; 1567 glDisable GL_TEXTURE_2D;
1239 1568
1240 $child->draw; 1569 $child->draw;
1241 1570
1242 if ($self->{title}) { 1571 if ($self->{title_widget}) {
1243 glTranslate 0, $border - $self->{h}; 1572 glTranslate 0, $border - $self->{h};
1244 $self->{title}->_draw; 1573 $self->{title_widget}->_draw;
1574
1575 glTranslate 0, - ($border - $self->{h});
1245 } 1576 }
1577
1578 $self->{close_button}->draw
1579 if $self->{close_button};
1246} 1580}
1247 1581
1248############################################################################# 1582#############################################################################
1249 1583
1250package CFClient::UI::Table; 1584package CFPlus::UI::Table;
1251 1585
1252our @ISA = CFClient::UI::Base::; 1586our @ISA = CFPlus::UI::Base::;
1253 1587
1254use List::Util qw(max sum); 1588use List::Util qw(max sum);
1255 1589
1256use CFClient::OpenGL; 1590use CFPlus::OpenGL;
1257 1591
1258sub new { 1592sub new {
1259 my $class = shift; 1593 my $class = shift;
1260 1594
1261 $class->SUPER::new ( 1595 $class->SUPER::new (
1596 children => [],
1262 col_expand => [], 1597 col_expand => [],
1598 row_expand => [],
1263 @_, 1599 @_,
1264 ) 1600 )
1265} 1601}
1266 1602
1267sub children { 1603sub children {
1268 grep $_, map @$_, grep $_, @{ $_[0]{children} } 1604 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1269} 1605}
1270 1606
1607# TODO: store row/col info in child widget and use standard add/del
1271sub add { 1608sub add {
1272 my ($self, $x, $y, $child) = @_; 1609 my $self = shift;
1273 1610
1611 Carp::cluck "please use the add_at method instead of calling add, thank you.\n";#d#
1612 $self->add_at (@_);
1613}
1614
1615sub add_at {
1616 my $self = shift;
1617
1618 while (@_) {
1619 my ($col, $row, $child) = splice @_, 0, 3, ();
1620
1621 $child->{row} = $row;
1622 $child->{col} = $col;
1623
1624 $child->{rowspan} ||= 1;
1625 $child->{colspan} ||= 1;
1626
1274 $child->set_parent ($self); 1627 $child->set_parent ($self);
1275 $self->{children}[$y][$x] = $child; 1628 $self->{children}[$row][$col] = $child;
1629 }
1276 1630
1631 $self->{force_realloc} = 1;
1632 $self->{force_size_alloc} = 1;
1277 $self->realloc; 1633 $self->realloc;
1634}
1635
1636sub remove {
1637 my ($self, $child) = @_;
1638
1639 for (@{ $self->{children} }) {
1640 for (@{ $_ || [] }) {
1641 $_ = undef if $_ == $child;
1642 }
1643 }
1278} 1644}
1279 1645
1280# TODO: move to container class maybe? send children a signal on removal? 1646# TODO: move to container class maybe? send children a signal on removal?
1281sub clear { 1647sub clear {
1282 my ($self) = @_; 1648 my ($self) = @_;
… …
1295sub get_wh { 1661sub get_wh {
1296 my ($self) = @_; 1662 my ($self) = @_;
1297 1663
1298 my (@w, @h); 1664 my (@w, @h);
1299 1665
1300 for my $y (0 .. $#{$self->{children}}) { 1666 my @children = $self->children;
1301 my $row = $self->{children}[$y]
1302 or next;
1303 1667
1304 for my $x (0 .. $#$row) { 1668 for my $widget (sort { $b->{rowspan} * $b->{colspan} <=> $a->{rowspan} * $a->{colspan} } @children) {
1305 my $widget = $row->[$x] 1669 my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(row col req_w req_h rowspan colspan)};
1306 or next;
1307 my ($w, $h) = @$widget{qw(req_w req_h)};
1308 1670
1309 $w[$x] = max $w[$x], $w; 1671 my $sw = sum @w[$c .. $c + $cs - 1];
1310 $h[$y] = max $h[$y], $h; 1672 my $sh = sum @h[$r .. $r + $rs - 1];
1673
1674 if ($w > $sw) {
1675 $_ += ($w - $sw) / $cs for @w[$c .. $c + $cs - 1];
1676 }
1677
1678 if ($h > $sh) {
1679 $_ += ($h - $sh) / $rs for @h[$r .. $r + $rs - 1];
1311 } 1680 }
1312 } 1681 }
1313 1682
1314 (\@w, \@h) 1683 (\@w, \@h)
1315} 1684}
… …
1323 (sum @$ws), 1692 (sum @$ws),
1324 (sum @$hs), 1693 (sum @$hs),
1325 ) 1694 )
1326} 1695}
1327 1696
1328sub size_allocate { 1697sub invoke_size_allocate {
1329 my ($self, $w, $h) = @_; 1698 my ($self, $w, $h) = @_;
1330 1699
1331 my ($ws, $hs) = $self->get_wh; 1700 my ($ws, $hs) = $self->get_wh;
1332 1701
1333 my $req_w = (sum @$ws) || 1; 1702 my $req_w = (sum @$ws) || 1;
1334 my $req_h = (sum @$hs) || 1; 1703 my $req_h = (sum @$hs) || 1;
1335 1704
1336 # TODO: nicer code && do row_expand 1705 # now linearly scale the rows/columns to the allocated size
1337 my @col_expand = @{$self->{col_expand}}; 1706 my @col_expand = @{$self->{col_expand}};
1338 @col_expand = (1) x @$ws unless @col_expand; 1707 @col_expand = (1) x @$ws unless @col_expand;
1339 my $col_expand = (sum @col_expand) || 1; 1708 my $col_expand = (sum @col_expand) || 1;
1340 1709
1341 # linearly scale sizes
1342 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1710 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1343 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1344 1711
1345 CFClient::UI::harmonize $ws; 1712 CFPlus::UI::harmonize $ws;
1713
1714 my @row_expand = @{$self->{row_expand}};
1715 @row_expand = (1) x @$ws unless @row_expand;
1716 my $row_expand = (sum @row_expand) || 1;
1717
1718 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
1719
1346 CFClient::UI::harmonize $hs; 1720 CFPlus::UI::harmonize $hs;
1347 1721
1348 my $y; 1722 my (@x, @y);
1349 1723
1724 for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
1725 for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
1726
1350 for my $r (0 .. $#{$self->{children}}) { 1727 for my $widget ($self->children) {
1351 my $row = $self->{children}[$r] 1728 my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(row col req_w req_h rowspan colspan)};
1352 or next;
1353 1729
1354 my $x = 0; 1730 $widget->configure (
1355 my $row_h = $hs->[$r]; 1731 $x[$c], $y[$r],
1732 $x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],
1356 1733 );
1357 for my $c (0 .. $#$row) { 1734 }
1358 my $col_w = $ws->[$c];
1359 1735
1360 if (my $widget = $row->[$c]) {
1361 $widget->configure ($x, $y, $col_w, $row_h);
1362 }
1363
1364 $x += $col_w;
1365 }
1366
1367 $y += $row_h;
1368 } 1736 1
1369
1370} 1737}
1371 1738
1372sub find_widget { 1739sub find_widget {
1373 my ($self, $x, $y) = @_; 1740 my ($self, $x, $y) = @_;
1374 1741
… …
1393 } 1760 }
1394} 1761}
1395 1762
1396############################################################################# 1763#############################################################################
1397 1764
1398package CFClient::UI::Box; 1765package CFPlus::UI::Fixed;
1399 1766
1767use List::Util qw(min max);
1768
1400our @ISA = CFClient::UI::Container::; 1769our @ISA = CFPlus::UI::Container::;
1770
1771sub add {
1772 my ($self, $child, $posmode, $x, $y, $sizemode, $w, $h) = @_;
1773
1774 $child->{_fixed} = [$posmode, $x, $y, $sizemode, $w, $h];
1775 $self->SUPER::add ($child);
1776}
1777
1778sub _scale($$$) {
1779 my ($mode, $val, $max) = @_;
1780
1781 $mode eq "abs" ? $val
1782 : $mode eq "rel" ? $val * $max
1783 : 0
1784}
1785
1786sub size_request {
1787 my ($self) = @_;
1788
1789 my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
1790
1791 # determine overall size by querying abs widgets
1792 for my $child ($self->visible_children) {
1793 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1794
1795 if ($pos eq "abs") {
1796 $w = _scale $size, $w, $child->{req_w};
1797 $h = _scale $size, $h, $child->{req_h};
1798
1799 $x1 = min $x1, $x; $x2 = max $x2, $x + $w;
1800 $y1 = min $y1, $y; $y2 = max $y2, $y + $h;
1801 }
1802 }
1803
1804 my $W = $x2 - $x1;
1805 my $H = $y2 - $y1;
1806
1807 # now layout remaining widgets
1808 for my $child ($self->visible_children) {
1809 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1810
1811 if ($pos ne "abs") {
1812 $x = _scale $pos, $x, $W;
1813 $y = _scale $pos, $x, $H;
1814 $w = _scale $size, $w, $child->{req_w};
1815 $h = _scale $size, $h, $child->{req_h};
1816
1817 $x1 = min $x1, $x; $x2 = max $x2, $x + $w;
1818 $y1 = min $y1, $y; $y2 = max $y2, $y + $h;
1819 }
1820 }
1821
1822 my $W = $x2 - $x1;
1823 my $H = $y2 - $y1;
1824
1825 ($W, $H)
1826}
1827
1828sub invoke_size_allocate {
1829 my ($self, $W, $H) = @_;
1830
1831 for my $child ($self->visible_children) {
1832 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1833
1834 $x = _scale $pos, $x, $W;
1835 $y = _scale $pos, $x, $H;
1836 $w = _scale $size, $w, $child->{req_w};
1837 $h = _scale $size, $h, $child->{req_h};
1838
1839 $child->configure ($x, $y, $w, $h);
1840 }
1841
1842 1
1843}
1844
1845#############################################################################
1846
1847package CFPlus::UI::Box;
1848
1849our @ISA = CFPlus::UI::Container::;
1401 1850
1402sub size_request { 1851sub size_request {
1403 my ($self) = @_; 1852 my ($self) = @_;
1404 1853
1405 $self->{vertical} 1854 $self->{vertical}
… …
1411 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1860 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1412 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1861 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1413 ) 1862 )
1414} 1863}
1415 1864
1416sub size_allocate { 1865sub invoke_size_allocate {
1417 my ($self, $w, $h) = @_; 1866 my ($self, $w, $h) = @_;
1418 1867
1419 my $space = $self->{vertical} ? $h : $w; 1868 my $space = $self->{vertical} ? $h : $w;
1420 my $children = $self->{children}; 1869 my @children = $self->visible_children;
1421 1870
1422 my @req; 1871 my @req;
1423 1872
1424 if ($self->{homogeneous}) { 1873 if ($self->{homogeneous}) {
1425 @req = ($space / (@$children || 1)) x @$children; 1874 @req = ($space / (@children || 1)) x @children;
1426 } else { 1875 } else {
1427 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children; 1876 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1428 my $req = List::Util::sum @req; 1877 my $req = List::Util::sum @req;
1429 1878
1430 if ($req > $space) { 1879 if ($req > $space) {
1431 # ah well, not enough space 1880 # ah well, not enough space
1432 $_ *= $space / $req for @req; 1881 $_ *= $space / $req for @req;
1433 } else { 1882 } else {
1434 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1; 1883 my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1435 1884
1436 $space = ($space - $req) / $expand; # remaining space to give away 1885 $space = ($space - $req) / $expand; # remaining space to give away
1437 1886
1438 $req[$_] += $space * $children->[$_]{expand} 1887 $req[$_] += $space * $children[$_]{expand}
1439 for 0 .. $#$children; 1888 for 0 .. $#children;
1440 } 1889 }
1441 } 1890 }
1442 1891
1443 CFClient::UI::harmonize \@req; 1892 CFPlus::UI::harmonize \@req;
1444 1893
1445 my $pos = 0; 1894 my $pos = 0;
1446 for (0 .. $#$children) { 1895 for (0 .. $#children) {
1447 my $alloc = $req[$_]; 1896 my $alloc = $req[$_];
1448 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h)); 1897 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1449 1898
1450 $pos += $alloc; 1899 $pos += $alloc;
1451 } 1900 }
1452 1901
1453 1 1902 1
1454} 1903}
1455 1904
1456############################################################################# 1905#############################################################################
1457 1906
1458package CFClient::UI::HBox; 1907package CFPlus::UI::HBox;
1459 1908
1460our @ISA = CFClient::UI::Box::; 1909our @ISA = CFPlus::UI::Box::;
1461 1910
1462sub new { 1911sub new {
1463 my $class = shift; 1912 my $class = shift;
1464 1913
1465 $class->SUPER::new ( 1914 $class->SUPER::new (
… …
1468 ) 1917 )
1469} 1918}
1470 1919
1471############################################################################# 1920#############################################################################
1472 1921
1473package CFClient::UI::VBox; 1922package CFPlus::UI::VBox;
1474 1923
1475our @ISA = CFClient::UI::Box::; 1924our @ISA = CFPlus::UI::Box::;
1476 1925
1477sub new { 1926sub new {
1478 my $class = shift; 1927 my $class = shift;
1479 1928
1480 $class->SUPER::new ( 1929 $class->SUPER::new (
… …
1483 ) 1932 )
1484} 1933}
1485 1934
1486############################################################################# 1935#############################################################################
1487 1936
1488package CFClient::UI::Label; 1937package CFPlus::UI::Label;
1489 1938
1490our @ISA = CFClient::UI::DrawBG::; 1939our @ISA = CFPlus::UI::DrawBG::;
1491 1940
1492use CFClient::OpenGL; 1941use CFPlus::OpenGL;
1493 1942
1494sub new { 1943sub new {
1495 my ($class, %arg) = @_; 1944 my ($class, %arg) = @_;
1496 1945
1497 my $self = $class->SUPER::new ( 1946 my $self = $class->SUPER::new (
… …
1500 #active_bg => none 1949 #active_bg => none
1501 #font => default_font 1950 #font => default_font
1502 #text => initial text 1951 #text => initial text
1503 #markup => initial narkup 1952 #markup => initial narkup
1504 #max_w => maximum pixel width 1953 #max_w => maximum pixel width
1954 #style => 0, # render flags
1505 ellipsise => 3, # end 1955 ellipsise => 3, # end
1506 layout => (new CFClient::Layout), 1956 layout => (new CFPlus::Layout),
1507 fontsize => 1, 1957 fontsize => 1,
1508 align => -1, 1958 align => -1,
1509 valign => -1, 1959 valign => -1,
1510 padding_x => 2, 1960 padding_x => 2,
1511 padding_y => 2, 1961 padding_y => 2,
1512 can_events => 0, 1962 can_events => 0,
1513 %arg 1963 %arg
1514 ); 1964 );
1515 1965
1516 if (exists $self->{template}) { 1966 if (exists $self->{template}) {
1517 my $layout = new CFClient::Layout; 1967 my $layout = new CFPlus::Layout;
1518 $layout->set_text (delete $self->{template}); 1968 $layout->set_text (delete $self->{template});
1519 $self->{template} = $layout; 1969 $self->{template} = $layout;
1520 } 1970 }
1521 1971
1522 if (exists $self->{markup}) { 1972 if (exists $self->{markup}) {
… …
1526 } 1976 }
1527 1977
1528 $self 1978 $self
1529} 1979}
1530 1980
1531sub escape($) {
1532 local $_ = $_[0];
1533
1534 s/&/&amp;/g;
1535 s/>/&gt;/g;
1536 s/</&lt;/g;
1537
1538 $_
1539}
1540
1541sub update { 1981sub update {
1542 my ($self) = @_; 1982 my ($self) = @_;
1543 1983
1544 delete $self->{texture}; 1984 delete $self->{texture};
1545 $self->SUPER::update; 1985 $self->SUPER::update;
… …
1556 my ($self, $text) = @_; 1996 my ($self, $text) = @_;
1557 1997
1558 return if $self->{text} eq "T$text"; 1998 return if $self->{text} eq "T$text";
1559 $self->{text} = "T$text"; 1999 $self->{text} = "T$text";
1560 2000
1561 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1562 $self->{layout}->set_text ($text); 2001 $self->{layout}->set_text ($text);
1563 2002
1564 delete $self->{req_h}; 2003 delete $self->{size_req};
1565 $self->realloc; 2004 $self->realloc;
1566 $self->update; 2005 $self->update;
1567} 2006}
1568 2007
1569sub set_markup { 2008sub set_markup {
… …
1572 return if $self->{text} eq "M$markup"; 2011 return if $self->{text} eq "M$markup";
1573 $self->{text} = "M$markup"; 2012 $self->{text} = "M$markup";
1574 2013
1575 my $rgba = $markup =~ /span.*(?:foreground|background)/; 2014 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1576 2015
1577 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1578 $self->{layout}->set_markup ($markup); 2016 $self->{layout}->set_markup ($markup);
1579 2017
1580 delete $self->{req_h}; 2018 delete $self->{size_req};
1581 $self->realloc; 2019 $self->realloc;
1582 $self->update; 2020 $self->update;
1583} 2021}
1584 2022
1585sub size_request { 2023sub size_request {
1586 my ($self) = @_; 2024 my ($self) = @_;
1587 2025
1588 if (exists $self->{req_h}) { 2026 $self->{size_req} ||= do {
1589 @$self{qw(req_w req_h)}
1590 } else {
1591 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2027 $self->{layout}->set_font ($self->{font}) if $self->{font};
1592 $self->{layout}->set_width ($self->{max_w} || -1); 2028 $self->{layout}->set_width ($self->{max_w} || -1);
1593 $self->{layout}->set_ellipsise ($self->{ellipsise}); 2029 $self->{layout}->set_ellipsise ($self->{ellipsise});
1594 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 2030 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1595 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2031 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1596 2032
1597 my ($w, $h) = $self->{layout}->size; 2033 my ($w, $h) = $self->{layout}->size;
1598 2034
1599 if (exists $self->{template}) { 2035 if (exists $self->{template}) {
1600 $self->{template}->set_font ($self->{font}) if $self->{font}; 2036 $self->{template}->set_font ($self->{font}) if $self->{font};
2037 $self->{template}->set_width ($self->{max_w} || -1);
1601 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 2038 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1602 2039
1603 my ($w2, $h2) = $self->{template}->size; 2040 my ($w2, $h2) = $self->{template}->size;
1604 2041
1605 $w = List::Util::max $w, $w2; 2042 $w = List::Util::max $w, $w2;
1606 $h = List::Util::max $h, $h2; 2043 $h = List::Util::max $h, $h2;
1607 } 2044 }
1608 2045
1609 ($w, $h) 2046 [$w, $h]
1610 } 2047 };
1611}
1612 2048
2049 @{ $self->{size_req} }
2050}
2051
2052sub baseline_shift {
2053 $_[0]{layout}->descent
2054}
2055
1613sub size_allocate { 2056sub invoke_size_allocate {
1614 my ($self, $w, $h) = @_; 2057 my ($self, $w, $h) = @_;
1615 2058
1616 delete $self->{ox}; 2059 delete $self->{ox};
1617 2060
1618 delete $self->{texture} 2061 delete $self->{texture}
1619 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w}; 2062 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
2063
2064 1
1620} 2065}
1621 2066
1622sub set_fontsize { 2067sub set_fontsize {
1623 my ($self, $fontsize) = @_; 2068 my ($self, $fontsize) = @_;
1624 2069
1625 $self->{fontsize} = $fontsize; 2070 $self->{fontsize} = $fontsize;
2071 delete $self->{size_req};
1626 delete $self->{texture}; 2072 delete $self->{texture};
1627 2073
1628 $self->realloc; 2074 $self->realloc;
1629} 2075}
1630 2076
2077sub reconfigure {
2078 my ($self) = @_;
2079
2080 delete $self->{size_req};
2081 delete $self->{texture};
2082
2083 $self->SUPER::reconfigure;
2084}
2085
1631sub _draw { 2086sub _draw {
1632 my ($self) = @_; 2087 my ($self) = @_;
1633 2088
1634 $self->SUPER::_draw; # draw background, if applicable 2089 $self->SUPER::_draw; # draw background, if applicable
1635 2090
1636 my $tex = $self->{texture} ||= do { 2091 my $size = $self->{texture} ||= do {
1637 $self->{layout}->set_foreground (@{$self->{fg}}); 2092 $self->{layout}->set_foreground (@{$self->{fg}});
1638 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2093 $self->{layout}->set_font ($self->{font}) if $self->{font};
1639 $self->{layout}->set_width ($self->{w}); 2094 $self->{layout}->set_width ($self->{w});
1640 $self->{layout}->set_ellipsise ($self->{ellipsise}); 2095 $self->{layout}->set_ellipsise ($self->{ellipsise});
1641 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 2096 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1642 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2097 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1643 2098
1644 new_from_layout CFClient::Texture $self->{layout} 2099 [$self->{layout}->size]
1645 }; 2100 };
1646 2101
1647 unless (exists $self->{ox}) { 2102 unless (exists $self->{ox}) {
1648 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 2103 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1649 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x} 2104 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1650 : ($self->{w} - $tex->{w}) * 0.5); 2105 : ($self->{w} - $size->[0]) * 0.5);
1651 2106
1652 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 2107 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1653 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 2108 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1654 : ($self->{h} - $tex->{h}) * 0.5); 2109 : ($self->{h} - $size->[1]) * 0.5);
1655 }; 2110 };
1656 2111
1657 glEnable GL_TEXTURE_2D; 2112 my $w = List::Util::min $self->{w} + 4, $size->[0];
2113 my $h = List::Util::min $self->{h} + 2, $size->[1];
1658 2114
1659 if ($tex->{format} == GL_ALPHA) { 2115 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1660 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1661 glColor @{$self->{fg}};
1662 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1663 } else {
1664 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1665 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1666 }
1667
1668 glDisable GL_TEXTURE_2D;
1669} 2116}
1670 2117
1671############################################################################# 2118#############################################################################
1672 2119
1673package CFClient::UI::EntryBase; 2120package CFPlus::UI::EntryBase;
1674 2121
1675our @ISA = CFClient::UI::Label::; 2122our @ISA = CFPlus::UI::Label::;
1676 2123
1677use CFClient::OpenGL; 2124use CFPlus::OpenGL;
1678 2125
1679sub new { 2126sub new {
1680 my $class = shift; 2127 my $class = shift;
1681 2128
1682 $class->SUPER::new ( 2129 $class->SUPER::new (
… …
1686 active_fg => [0, 0, 0], 2133 active_fg => [0, 0, 0],
1687 can_hover => 1, 2134 can_hover => 1,
1688 can_focus => 1, 2135 can_focus => 1,
1689 valign => 0, 2136 valign => 0,
1690 can_events => 1, 2137 can_events => 1,
2138 ellipsise => 0,
1691 #text => ... 2139 #text => ...
2140 #hidden => "*",
1692 @_ 2141 @_
1693 ) 2142 )
1694} 2143}
1695 2144
1696sub _set_text { 2145sub _set_text {
… …
1703 $self->{last_activity} = $::NOW; 2152 $self->{last_activity} = $::NOW;
1704 $self->{text} = $text; 2153 $self->{text} = $text;
1705 2154
1706 $text =~ s/./*/g if $self->{hidden}; 2155 $text =~ s/./*/g if $self->{hidden};
1707 $self->{layout}->set_text ("$text "); 2156 $self->{layout}->set_text ("$text ");
1708 delete $self->{req_h}; 2157 delete $self->{size_req};
1709 2158
1710 $self->_emit (changed => $self->{text}); 2159 $self->emit (changed => $self->{text});
1711 2160
1712 $self->realloc; 2161 $self->realloc;
1713 $self->update; 2162 $self->update;
1714} 2163}
1715 2164
… …
1730 my ($w, $h) = $self->SUPER::size_request; 2179 my ($w, $h) = $self->SUPER::size_request;
1731 2180
1732 ($w + 1, $h) # add 1 for cursor 2181 ($w + 1, $h) # add 1 for cursor
1733} 2182}
1734 2183
1735sub key_down { 2184sub invoke_key_down {
1736 my ($self, $ev) = @_; 2185 my ($self, $ev) = @_;
1737 2186
1738 my $mod = $ev->{mod}; 2187 my $mod = $ev->{mod};
1739 my $sym = $ev->{sym}; 2188 my $sym = $ev->{sym};
1740 my $uni = $ev->{unicode}; 2189 my $uni = $ev->{unicode};
1741 2190
1742 my $text = $self->get_text; 2191 my $text = $self->get_text;
2192
2193 $self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
1743 2194
1744 if ($uni == 8) { 2195 if ($uni == 8) {
1745 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 2196 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1746 } elsif ($uni == 127) { 2197 } elsif ($uni == 127) {
1747 substr $text, $self->{cursor}, 1, ""; 2198 substr $text, $self->{cursor}, 1, "";
1748 } elsif ($sym == CFClient::SDLK_LEFT) { 2199 } elsif ($sym == CFPlus::SDLK_LEFT) {
1749 --$self->{cursor} if $self->{cursor}; 2200 --$self->{cursor} if $self->{cursor};
1750 } elsif ($sym == CFClient::SDLK_RIGHT) { 2201 } elsif ($sym == CFPlus::SDLK_RIGHT) {
1751 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 2202 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1752 } elsif ($sym == CFClient::SDLK_HOME) { 2203 } elsif ($sym == CFPlus::SDLK_HOME) {
2204 # what a hack
2205 $self->{cursor} =
2206 (substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
2207 ? length $1
2208 : 0;
2209 } elsif ($sym == CFPlus::SDLK_END) {
2210 # uh, again
2211 $self->{cursor} =
2212 (substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
2213 ? $self->{cursor} + length $1
2214 : length $self->{text};
2215 } elsif ($uni == 21) { # ctrl-u
2216 $text = "";
1753 $self->{cursor} = 0; 2217 $self->{cursor} = 0;
1754 } elsif ($sym == CFClient::SDLK_END) {
1755 $self->{cursor} = length $text;
1756 } elsif ($uni == 27) { 2218 } elsif ($uni == 27) {
1757 $self->_emit ('escape'); 2219 $self->emit ('escape');
1758 } elsif ($uni) { 2220 } elsif ($uni == 0x0d) {
2221 substr $text, $self->{cursor}++, 0, "\012";
2222 } elsif ($uni >= 0x20) {
1759 substr $text, $self->{cursor}++, 0, chr $uni; 2223 substr $text, $self->{cursor}++, 0, chr $uni;
1760 } else { 2224 } else {
1761 return 0; 2225 return 0;
1762 } 2226 }
1763 2227
1764 $self->_set_text ($text); 2228 $self->_set_text ($text);
1765 2229
1766 $self->realloc; 2230 $self->realloc;
2231 $self->update;
1767 2232
1768 1 2233 1
1769} 2234}
1770 2235
1771sub focus_in { 2236sub invoke_focus_in {
1772 my ($self) = @_; 2237 my ($self) = @_;
1773 2238
1774 $self->{last_activity} = $::NOW; 2239 $self->{last_activity} = $::NOW;
1775 2240
1776 $self->SUPER::focus_in; 2241 $self->SUPER::invoke_focus_in
1777} 2242}
1778 2243
1779sub button_down { 2244sub invoke_button_down {
1780 my ($self, $ev, $x, $y) = @_; 2245 my ($self, $ev, $x, $y) = @_;
1781 2246
1782 $self->SUPER::button_down ($ev, $x, $y); 2247 $self->SUPER::invoke_button_down ($ev, $x, $y);
1783 2248
1784 my $idx = $self->{layout}->xy_to_index ($x, $y); 2249 my $idx = $self->{layout}->xy_to_index ($x, $y);
1785 2250
1786 # byte-index to char-index 2251 # byte-index to char-index
1787 my $text = $self->{text}; 2252 my $text = $self->{text};
1788 utf8::encode $text; 2253 utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1789 $self->{cursor} = length substr $text, 0, $idx; 2254 $self->{cursor} = length $text;
1790 2255
1791 $self->_set_text ($self->{text}); 2256 $self->_set_text ($self->{text});
1792 $self->update; 2257 $self->update;
1793 2258
1794 1 2259 1
1795} 2260}
1796 2261
1797sub mouse_motion { 2262sub invoke_mouse_motion {
1798 my ($self, $ev, $x, $y) = @_; 2263 my ($self, $ev, $x, $y) = @_;
1799# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 2264# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1800 2265
1801 0 2266 1
1802} 2267}
1803 2268
1804sub _draw { 2269sub _draw {
1805 my ($self) = @_; 2270 my ($self) = @_;
1806 2271
… …
1833 utf8::encode $text; 2298 utf8::encode $text;
1834 2299
1835 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text) 2300 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1836 } 2301 }
1837 2302
1838 glColor @{$self->{fg}};
1839 glBegin GL_LINES; 2303 glBegin GL_LINES;
1840 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy}; 2304 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};
1841 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h}; 2305 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1842 glEnd; 2306 glEnd;
1843 } 2307 }
1844} 2308}
1845 2309
2310#############################################################################
2311
1846package CFClient::UI::Entry; 2312package CFPlus::UI::Entry;
1847 2313
1848our @ISA = CFClient::UI::EntryBase::; 2314our @ISA = CFPlus::UI::EntryBase::;
1849 2315
1850use CFClient::OpenGL; 2316use CFPlus::OpenGL;
1851 2317
1852sub key_down { 2318sub invoke_key_down {
1853 my ($self, $ev) = @_; 2319 my ($self, $ev) = @_;
1854 2320
1855 my $sym = $ev->{sym}; 2321 my $sym = $ev->{sym};
1856 2322
1857 if ($sym == 13) { 2323 if ($ev->{uni} == 0x0d || $sym == 13) {
1858 unshift @{$self->{history}}, 2324 unshift @{$self->{history}},
1859 my $txt = $self->get_text; 2325 my $txt = $self->get_text;
2326
1860 $self->{history_pointer} = -1; 2327 $self->{history_pointer} = -1;
1861 $self->{history_saveback} = ''; 2328 $self->{history_saveback} = '';
1862 $self->_emit (activate => $txt); 2329 $self->emit (activate => $txt);
1863 $self->update; 2330 $self->update;
1864 2331
1865 } elsif ($sym == CFClient::SDLK_UP) { 2332 } elsif ($sym == CFPlus::SDLK_UP) {
1866 if ($self->{history_pointer} < 0) { 2333 if ($self->{history_pointer} < 0) {
1867 $self->{history_saveback} = $self->get_text; 2334 $self->{history_saveback} = $self->get_text;
1868 } 2335 }
1869 if (@{$self->{history} || []} > 0) { 2336 if (@{$self->{history} || []} > 0) {
1870 $self->{history_pointer}++; 2337 $self->{history_pointer}++;
… …
1872 $self->{history_pointer} = @{$self->{history} || []} - 1; 2339 $self->{history_pointer} = @{$self->{history} || []} - 1;
1873 } 2340 }
1874 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2341 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1875 } 2342 }
1876 2343
1877 } elsif ($sym == CFClient::SDLK_DOWN) { 2344 } elsif ($sym == CFPlus::SDLK_DOWN) {
1878 $self->{history_pointer}--; 2345 $self->{history_pointer}--;
1879 $self->{history_pointer} = -1 if $self->{history_pointer} < 0; 2346 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1880 2347
1881 if ($self->{history_pointer} >= 0) { 2348 if ($self->{history_pointer} >= 0) {
1882 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2349 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1883 } else { 2350 } else {
1884 $self->set_text ($self->{history_saveback}); 2351 $self->set_text ($self->{history_saveback});
1885 } 2352 }
1886 2353
1887 } else { 2354 } else {
1888 return $self->SUPER::key_down ($ev) 2355 return $self->SUPER::invoke_key_down ($ev)
1889 } 2356 }
1890 2357
1891 1 2358 1
1892} 2359}
1893 2360
1894############################################################################# 2361#############################################################################
1895 2362
2363package CFPlus::UI::TextEdit;
2364
2365our @ISA = CFPlus::UI::EntryBase::;
2366
2367use CFPlus::OpenGL;
2368
2369sub move_cursor_ver {
2370 my ($self, $dy) = @_;
2371
2372 my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
2373
2374 $y += $dy;
2375
2376 if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {
2377 $self->{cursor} = $index;
2378 delete $self->{cur_h};
2379 $self->update;
2380 return;
2381 }
2382}
2383
2384sub invoke_key_down {
2385 my ($self, $ev) = @_;
2386
2387 my $sym = $ev->{sym};
2388
2389 if ($sym == CFPlus::SDLK_UP) {
2390 $self->move_cursor_ver (-1);
2391 } elsif ($sym == CFPlus::SDLK_DOWN) {
2392 $self->move_cursor_ver (+1);
2393 } else {
2394 return $self->SUPER::invoke_key_down ($ev)
2395 }
2396
2397 1
2398}
2399
2400#############################################################################
2401
1896package CFClient::UI::Button; 2402package CFPlus::UI::Button;
1897 2403
1898our @ISA = CFClient::UI::Label::; 2404our @ISA = CFPlus::UI::Label::;
1899 2405
1900use CFClient::OpenGL; 2406use CFPlus::OpenGL;
1901 2407
1902my @tex = 2408my @tex =
1903 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2409 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1904 qw(b1_button_active.png); 2410 qw(b1_button_inactive.png b1_button_active.png);
1905 2411
1906sub new { 2412sub new {
1907 my $class = shift; 2413 my $class = shift;
1908 2414
1909 $class->SUPER::new ( 2415 $class->SUPER::new (
1910 padding_x => 4, 2416 padding_x => 4,
1911 padding_y => 4, 2417 padding_y => 4,
1912 fg => [1, 1, 1], 2418 fg => [1.0, 1.0, 1.0],
1913 active_fg => [0, 0, 1], 2419 active_fg => [0.8, 0.8, 0.8],
1914 can_hover => 1, 2420 can_hover => 1,
1915 align => 0, 2421 align => 0,
1916 valign => 0, 2422 valign => 0,
1917 can_events => 1, 2423 can_events => 1,
1918 @_ 2424 @_
1919 ) 2425 )
1920} 2426}
1921 2427
1922sub activate { }
1923
1924sub button_up { 2428sub invoke_button_up {
1925 my ($self, $ev, $x, $y) = @_; 2429 my ($self, $ev, $x, $y) = @_;
1926 2430
1927 $self->emit ("activate") 2431 $self->emit ("activate")
1928 if $x >= 0 && $x < $self->{w} 2432 if $x >= 0 && $x < $self->{w}
1929 && $y >= 0 && $y < $self->{h}; 2433 && $y >= 0 && $y < $self->{h};
… …
1938 2442
1939 glEnable GL_TEXTURE_2D; 2443 glEnable GL_TEXTURE_2D;
1940 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2444 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1941 glColor 0, 0, 0, 1; 2445 glColor 0, 0, 0, 1;
1942 2446
2447 my $tex = $tex[$GRAB == $self];
1943 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2448 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1944 2449
1945 glDisable GL_TEXTURE_2D; 2450 glDisable GL_TEXTURE_2D;
1946 2451
1947 $self->SUPER::_draw; 2452 $self->SUPER::_draw;
1948} 2453}
1949 2454
1950############################################################################# 2455#############################################################################
1951 2456
1952package CFClient::UI::CheckBox; 2457package CFPlus::UI::CheckBox;
1953 2458
1954our @ISA = CFClient::UI::DrawBG::; 2459our @ISA = CFPlus::UI::DrawBG::;
1955 2460
1956my @tex = 2461my @tex =
1957 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2462 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1958 qw(c1_checkbox_bg.png c1_checkbox_active.png); 2463 qw(c1_checkbox_bg.png c1_checkbox_active.png);
1959 2464
1960use CFClient::OpenGL; 2465use CFPlus::OpenGL;
1961 2466
1962sub new { 2467sub new {
1963 my $class = shift; 2468 my $class = shift;
1964 2469
1965 $class->SUPER::new ( 2470 $class->SUPER::new (
… …
1979 my ($self) = @_; 2484 my ($self) = @_;
1980 2485
1981 (6) x 2 2486 (6) x 2
1982} 2487}
1983 2488
2489sub toggle {
2490 my ($self) = @_;
2491
2492 $self->{state} = !$self->{state};
2493 $self->emit (changed => $self->{state});
2494 $self->update;
2495}
2496
1984sub button_down { 2497sub invoke_button_down {
1985 my ($self, $ev, $x, $y) = @_; 2498 my ($self, $ev, $x, $y) = @_;
1986 2499
1987 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x} 2500 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1988 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) { 2501 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1989 $self->{state} = !$self->{state}; 2502 $self->toggle;
1990 $self->_emit (changed => $self->{state});
1991 } else { 2503 } else {
1992 return 0 2504 return 0
1993 } 2505 }
1994 2506
1995 1 2507 1
… …
2015 glDisable GL_TEXTURE_2D; 2527 glDisable GL_TEXTURE_2D;
2016} 2528}
2017 2529
2018############################################################################# 2530#############################################################################
2019 2531
2020package CFClient::UI::Image; 2532package CFPlus::UI::Image;
2021 2533
2022our @ISA = CFClient::UI::Base::; 2534our @ISA = CFPlus::UI::Base::;
2023 2535
2024use CFClient::OpenGL; 2536use CFPlus::OpenGL;
2025use Carp qw/confess/;
2026 2537
2027our %loaded_images; 2538our %texture_cache;
2028 2539
2029sub new { 2540sub new {
2030 my $class = shift; 2541 my $class = shift;
2031 2542
2032 my $self = $class->SUPER::new (can_events => 0, @_); 2543 my $self = $class->SUPER::new (
2544 can_events => 0,
2545 @_,
2546 );
2033 2547
2034 $self->{image} or confess "Image has 'image' not set. This is a fatal error!"; 2548 $self->{path} || $self->{tex}
2549 or Carp::croak "'path' or 'tex' attributes required";
2035 2550
2036 $loaded_images{$self->{image}} ||= 2551 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2037 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1; 2552 new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
2038 2553
2039 my $tex = $self->{tex} = $loaded_images{$self->{image}}; 2554 CFPlus::weaken $texture_cache{$self->{path}};
2040 2555
2041 Scalar::Util::weaken $loaded_images{$self->{image}}; 2556 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2042
2043 $self->{aspect} = $tex->{w} / $tex->{h};
2044 2557
2045 $self 2558 $self
2046} 2559}
2047 2560
2561sub STORABLE_freeze {
2562 my ($self, $cloning) = @_;
2563
2564 $self->{path}
2565 or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
2566
2567 $self->{path}
2568}
2569
2570sub STORABLE_attach {
2571 my ($self, $cloning, $path) = @_;
2572
2573 $self->new (path => $path)
2574}
2575
2048sub size_request { 2576sub size_request {
2049 my ($self) = @_; 2577 my ($self) = @_;
2050 2578
2051 ($self->{tex}->{w}, $self->{tex}->{h}) 2579 ($self->{tex}{w}, $self->{tex}{h})
2052} 2580}
2053 2581
2054sub _draw { 2582sub _draw {
2055 my ($self) = @_; 2583 my ($self) = @_;
2056 2584
… …
2066 } 2594 }
2067 2595
2068 glEnable GL_TEXTURE_2D; 2596 glEnable GL_TEXTURE_2D;
2069 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2597 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2070 2598
2071 $tex->draw_quad_alpha (0, 0, $w, $h); 2599 $tex->draw_quad (0, 0, $w, $h);
2072 2600
2073 glDisable GL_TEXTURE_2D; 2601 glDisable GL_TEXTURE_2D;
2074} 2602}
2075 2603
2076############################################################################# 2604#############################################################################
2077 2605
2606package CFPlus::UI::ImageButton;
2607
2608our @ISA = CFPlus::UI::Image::;
2609
2610use CFPlus::OpenGL;
2611
2612my %textures;
2613
2614sub new {
2615 my $class = shift;
2616
2617 my $self = $class->SUPER::new (
2618 padding_x => 4,
2619 padding_y => 4,
2620 fg => [1, 1, 1],
2621 active_fg => [0, 0, 1],
2622 can_hover => 1,
2623 align => 0,
2624 valign => 0,
2625 can_events => 1,
2626 @_
2627 );
2628}
2629
2630sub invoke_button_up {
2631 my ($self, $ev, $x, $y) = @_;
2632
2633 $self->emit ("activate")
2634 if $x >= 0 && $x < $self->{w}
2635 && $y >= 0 && $y < $self->{h};
2636
2637 1
2638}
2639
2640#############################################################################
2641
2078package CFClient::UI::VGauge; 2642package CFPlus::UI::VGauge;
2079 2643
2080our @ISA = CFClient::UI::Base::; 2644our @ISA = CFPlus::UI::Base::;
2081 2645
2082use List::Util qw(min max); 2646use List::Util qw(min max);
2083 2647
2084use CFClient::OpenGL; 2648use CFPlus::OpenGL;
2085 2649
2086my %tex = ( 2650my %tex = (
2087 food => [ 2651 food => [
2088 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2652 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2089 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 2653 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2090 ], 2654 ],
2091 grace => [ 2655 grace => [
2092 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2656 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2093 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/ 2657 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2094 ], 2658 ],
2095 hp => [ 2659 hp => [
2096 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2660 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2097 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 2661 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2098 ], 2662 ],
2099 mana => [ 2663 mana => [
2100 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2664 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2101 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/ 2665 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2102 ], 2666 ],
2103); 2667);
2104 2668
2105# eg. VGauge->new (gauge => 'food'), default gauge: food 2669# eg. VGauge->new (gauge => 'food'), default gauge: food
… …
2165 my $ycut1 = max 0, min 1, $ycut; 2729 my $ycut1 = max 0, min 1, $ycut;
2166 my $ycut2 = max 0, min 1, $ycut - 1; 2730 my $ycut2 = max 0, min 1, $ycut - 1;
2167 2731
2168 my $h1 = $self->{h} * (1 - $ycut1); 2732 my $h1 = $self->{h} * (1 - $ycut1);
2169 my $h2 = $self->{h} * (1 - $ycut2); 2733 my $h2 = $self->{h} * (1 - $ycut2);
2734 my $h3 = $self->{h};
2735
2736 $_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
2170 2737
2171 glEnable GL_BLEND; 2738 glEnable GL_BLEND;
2172 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, 2739 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2173 GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2740 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2174 glEnable GL_TEXTURE_2D; 2741 glEnable GL_TEXTURE_2D;
… …
2193 2760
2194 if ($t3) { 2761 if ($t3) {
2195 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2762 glBindTexture GL_TEXTURE_2D, $t3->{name};
2196 glBegin GL_QUADS; 2763 glBegin GL_QUADS;
2197 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2764 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2198 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2765 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2199 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2766 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2200 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2767 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2201 glEnd; 2768 glEnd;
2202 } 2769 }
2203 2770
2204 glDisable GL_BLEND; 2771 glDisable GL_BLEND;
2205 glDisable GL_TEXTURE_2D; 2772 glDisable GL_TEXTURE_2D;
2206} 2773}
2207 2774
2208############################################################################# 2775#############################################################################
2209 2776
2210package CFClient::UI::Gauge; 2777package CFPlus::UI::Gauge;
2211 2778
2212our @ISA = CFClient::UI::VBox::; 2779our @ISA = CFPlus::UI::VBox::;
2213 2780
2214sub new { 2781sub new {
2215 my ($class, %arg) = @_; 2782 my ($class, %arg) = @_;
2216 2783
2217 my $self = $class->SUPER::new ( 2784 my $self = $class->SUPER::new (
… …
2219 can_hover => 1, 2786 can_hover => 1,
2220 can_events => 1, 2787 can_events => 1,
2221 %arg, 2788 %arg,
2222 ); 2789 );
2223 2790
2224 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999"); 2791 $self->add ($self->{value} = new CFPlus::UI::Label valign => +1, align => 0, template => "999");
2225 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1); 2792 $self->add ($self->{gauge} = new CFPlus::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
2226 $self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999"); 2793 $self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
2227 2794
2228 $self 2795 $self
2229} 2796}
2230 2797
2231sub set_fontsize { 2798sub set_fontsize {
… …
2252 $self->{value}->set_text ($val); 2819 $self->{value}->set_text ($val);
2253} 2820}
2254 2821
2255############################################################################# 2822#############################################################################
2256 2823
2257package CFClient::UI::Slider; 2824package CFPlus::UI::Slider;
2258 2825
2259use strict; 2826use strict;
2260 2827
2261use CFClient::OpenGL; 2828use CFPlus::OpenGL;
2262 2829
2263our @ISA = CFClient::UI::DrawBG::; 2830our @ISA = CFPlus::UI::DrawBG::;
2264 2831
2265my @tex = 2832my @tex =
2266 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 2833 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2267 qw(s1_slider.png s1_slider_bg.png); 2834 qw(s1_slider.png s1_slider_bg.png);
2268 2835
2269sub new { 2836sub new {
2270 my $class = shift; 2837 my $class = shift;
2271 2838
… …
2292 $self->update; 2859 $self->update;
2293 2860
2294 $self 2861 $self
2295} 2862}
2296 2863
2297sub changed { }
2298
2299sub set_range { 2864sub set_range {
2300 my ($self, $range) = @_; 2865 my ($self, $range) = @_;
2301 2866
2302 ($range, $self->{range}) = ($self->{range}, $range); 2867 ($range, $self->{range}) = ($self->{range}, $range);
2303 2868
2304 $self->update
2305 if "@$range" ne "@{$self->{range}}"; 2869 if ("@$range" ne "@{$self->{range}}") {
2870 $self->update;
2871 $self->set_value ($self->{range}[0]);
2872 }
2306} 2873}
2307 2874
2308sub set_value { 2875sub set_value {
2309 my ($self, $value) = @_; 2876 my ($self, $value) = @_;
2310 2877
… …
2321 if $unit; 2888 if $unit;
2322 2889
2323 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2890 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2324 2891
2325 if ($value != $old_value) { 2892 if ($value != $old_value) {
2326 $self->_emit (changed => $value); 2893 $self->emit (changed => $value);
2327 $self->update; 2894 $self->update;
2328 } 2895 }
2329} 2896}
2330 2897
2331sub size_request { 2898sub size_request {
2332 my ($self) = @_; 2899 my ($self) = @_;
2333 2900
2334 ($self->{req_w}, $self->{req_h}) 2901 ($self->{req_w}, $self->{req_h})
2335} 2902}
2336 2903
2337sub button_down { 2904sub invoke_button_down {
2338 my ($self, $ev, $x, $y) = @_; 2905 my ($self, $ev, $x, $y) = @_;
2339 2906
2340 $self->SUPER::button_down ($ev, $x, $y); 2907 $self->SUPER::invoke_button_down ($ev, $x, $y);
2341 2908
2342 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2909 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2343 2910
2344 $self->mouse_motion ($ev, $x, $y) 2911 $self->invoke_mouse_motion ($ev, $x, $y)
2345} 2912}
2346 2913
2347sub mouse_motion { 2914sub invoke_mouse_motion {
2348 my ($self, $ev, $x, $y) = @_; 2915 my ($self, $ev, $x, $y) = @_;
2349 2916
2350 if ($GRAB == $self) { 2917 if ($GRAB == $self) {
2351 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2918 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2352 2919
… …
2358 } else { 2925 } else {
2359 return 0; 2926 return 0;
2360 } 2927 }
2361 2928
2362 1 2929 1
2930}
2931
2932sub invoke_mouse_wheel {
2933 my ($self, $ev) = @_;
2934
2935 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2936
2937 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
2938
2939 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2940
2941 ! ! $delta
2363} 2942}
2364 2943
2365sub update { 2944sub update {
2366 my ($self) = @_; 2945 my ($self) = @_;
2367 2946
… …
2416 glDisable GL_TEXTURE_2D; 2995 glDisable GL_TEXTURE_2D;
2417} 2996}
2418 2997
2419############################################################################# 2998#############################################################################
2420 2999
2421package CFClient::UI::ValSlider; 3000package CFPlus::UI::ValSlider;
2422 3001
2423our @ISA = CFClient::UI::HBox::; 3002our @ISA = CFPlus::UI::HBox::;
2424 3003
2425sub new { 3004sub new {
2426 my ($class, %arg) = @_; 3005 my ($class, %arg) = @_;
2427 3006
2428 my $range = delete $arg{range}; 3007 my $range = delete $arg{range};
2429 3008
2430 my $self = $class->SUPER::new ( 3009 my $self = $class->SUPER::new (
2431 slider => (new CFClient::UI::Slider expand => 1, range => $range), 3010 slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2432 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}), 3011 entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2433 to_value => sub { shift }, 3012 to_value => sub { shift },
2434 from_value => sub { shift }, 3013 from_value => sub { shift },
2435 %arg, 3014 %arg,
2436 ); 3015 );
2437 3016
… …
2457sub set_range { shift->{slider}->set_range (@_) } 3036sub set_range { shift->{slider}->set_range (@_) }
2458sub set_value { shift->{slider}->set_value (@_) } 3037sub set_value { shift->{slider}->set_value (@_) }
2459 3038
2460############################################################################# 3039#############################################################################
2461 3040
2462package CFClient::UI::TextView; 3041package CFPlus::UI::TextScroller;
2463 3042
2464our @ISA = CFClient::UI::HBox::; 3043our @ISA = CFPlus::UI::HBox::;
2465 3044
2466use CFClient::OpenGL; 3045use CFPlus::OpenGL;
2467 3046
2468sub new { 3047sub new {
2469 my $class = shift; 3048 my $class = shift;
2470 3049
2471 my $self = $class->SUPER::new ( 3050 my $self = $class->SUPER::new (
2472 fontsize => 1, 3051 fontsize => 1,
2473 can_events => 0, 3052 can_events => 1,
3053 indent => 0,
2474 #font => default_font 3054 #font => default_font
2475 @_, 3055 @_,
2476 3056
2477 layout => (new CFClient::Layout 1), 3057 layout => (new CFPlus::Layout),
2478 par => [], 3058 par => [],
3059 max_par => 0,
2479 height => 0, 3060 height => 0,
2480 children => [ 3061 children => [
2481 (new CFClient::UI::Empty expand => 1), 3062 (new CFPlus::UI::Empty expand => 1),
2482 (new CFClient::UI::Slider vertical => 1), 3063 (new CFPlus::UI::Slider vertical => 1),
2483 ], 3064 ],
2484 ); 3065 );
2485 3066
2486 $self->{children}[1]->connect (changed => sub { $self->update }); 3067 $self->{children}[1]->connect (changed => sub { $self->update });
2487 3068
… …
2493 3074
2494 $self->{fontsize} = $fontsize; 3075 $self->{fontsize} = $fontsize;
2495 $self->reflow; 3076 $self->reflow;
2496} 3077}
2497 3078
3079sub size_request {
3080 my ($self) = @_;
3081
3082 my ($empty, $slider) = @{ $self->{children} };
3083
3084 local $self->{children} = [$empty, $slider];
3085 $self->SUPER::size_request
3086}
3087
2498sub size_allocate { 3088sub invoke_size_allocate {
2499 my ($self, $w, $h) = @_; 3089 my ($self, $w, $h) = @_;
2500 3090
2501 $self->SUPER::size_allocate ($w, $h); 3091 my ($empty, $slider, @other) = @{ $self->{children} };
3092 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
2502 3093
2503 $self->{layout}->set_font ($self->{font}) if $self->{font}; 3094 $self->{layout}->set_font ($self->{font}) if $self->{font};
2504 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 3095 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2505 $self->{layout}->set_width ($self->{children}[0]{w}); 3096 $self->{layout}->set_width ($empty->{w});
3097 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2506 3098
2507 $self->reflow; 3099 $self->reflow;
2508}
2509 3100
2510sub text_size { 3101 local $self->{children} = [$empty, $slider];
3102 $self->SUPER::invoke_size_allocate ($w, $h)
3103}
3104
3105sub invoke_mouse_wheel {
2511 my ($self, $text, $indent) = @_; 3106 my ($self, $ev) = @_;
3107
3108 return 0 unless $ev->{dy}; # only vertical movements
3109
3110 $self->{children}[1]->emit (mouse_wheel => $ev);
3111
3112 1
3113}
3114
3115sub get_layout {
3116 my ($self, $para) = @_;
2512 3117
2513 my $layout = $self->{layout}; 3118 my $layout = $self->{layout};
2514 3119
3120 $layout->set_font ($self->{font}) if $self->{font};
3121 $layout->set_foreground (@{$para->{fg}});
2515 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 3122 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2516 $layout->set_width ($self->{children}[0]{w} - $indent); 3123 $layout->set_width ($self->{children}[0]{w} - $para->{indent});
3124 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2517 $layout->set_markup ($text); 3125 $layout->set_markup ($para->{markup});
3126
3127 $layout->set_shapes (
3128 map
3129 +(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
3130 @{$para->{widget}}
2518 3131 );
3132
2519 $layout->size 3133 $layout
2520} 3134}
2521 3135
2522sub reflow { 3136sub reflow {
2523 my ($self) = @_; 3137 my ($self) = @_;
2524 3138
… …
2531 3145
2532 # todo: base offset on lines or so, not on pixels 3146 # todo: base offset on lines or so, not on pixels
2533 $self->{children}[1]->set_value ($offset); 3147 $self->{children}[1]->set_value ($offset);
2534} 3148}
2535 3149
3150sub current_paragraph {
3151 my ($self) = @_;
3152
3153 $self->{top_paragraph} - 1
3154}
3155
3156sub scroll_to {
3157 my ($self, $para) = @_;
3158
3159 $para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
3160
3161 $self->{scroll_to} = $para;
3162 $self->update;
3163}
3164
2536sub clear { 3165sub clear {
2537 my ($self) = @_; 3166 my ($self) = @_;
3167
3168 my (undef, undef, @other) = @{ $self->{children} };
3169 $self->remove ($_) for @other;
2538 3170
2539 $self->{par} = []; 3171 $self->{par} = [];
2540 $self->{height} = 0; 3172 $self->{height} = 0;
2541 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 3173 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2542} 3174}
2543 3175
2544sub add_paragraph { 3176sub add_paragraph {
2545 my ($self, $color, $text, $indent) = @_; 3177 my $self = shift;
2546 3178
2547 for my $line (split /\n/, $text) { 3179 for my $para (@_) {
2548 my ($w, $h) = $self->text_size ($line); 3180 $para = {
3181 fg => [1, 1, 1, 1],
3182 indent => 0,
3183 markup => "",
3184 widget => [],
3185 ref $para ? %$para : (markup => $para),
3186 w => 1e10,
3187 wrapped => 1,
3188 };
3189
3190 $self->add (@{ $para->{widget} }) if @{ $para->{widget} };
3191 push @{$self->{par}}, $para;
3192 }
3193
3194 if (my $max = $self->{max_par}) {
3195 shift @{$self->{par}} while @{$self->{par}} > $max;
3196 }
3197
3198 $self->{need_reflow}++;
3199 $self->update;
3200}
3201
3202sub scroll_to_bottom {
3203 my ($self) = @_;
3204
3205 $self->{scroll_to} = $#{$self->{par}};
3206 $self->update;
3207}
3208
3209sub force_uptodate {
3210 my ($self) = @_;
3211
3212 if (delete $self->{need_reflow}) {
3213 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
3214
3215 my $height = 0;
3216
3217 for my $para (@{$self->{par}}) {
3218 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
3219 my $layout = $self->get_layout ($para);
3220 my ($w, $h) = $layout->size;
3221
3222 $para->{w} = $w + $para->{indent};
3223 $para->{h} = $h;
3224 $para->{wrapped} = $layout->has_wrapped;
3225 }
3226
3227 $para->{y} = $height;
3228 $height += $para->{h};
3229 }
3230
2549 $self->{height} += $h; 3231 $self->{height} = $height;
2550 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line]; 3232 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2551 }
2552 3233
2553 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]); 3234 delete $self->{texture};
3235 }
3236
3237 if (my $paridx = delete $self->{scroll_to}) {
3238 $self->{children}[1]->set_value ($self->{par}[$paridx]{y});
3239 }
2554} 3240}
2555 3241
2556sub update { 3242sub update {
2557 my ($self) = @_; 3243 my ($self) = @_;
2558 3244
… …
2560 3246
2561 return unless $self->{h} > 0; 3247 return unless $self->{h} > 0;
2562 3248
2563 delete $self->{texture}; 3249 delete $self->{texture};
2564 3250
2565 $ROOT->on_post_alloc ($self, sub { 3251 $ROOT->on_post_alloc ($self => sub {
3252 $self->force_uptodate;
3253
2566 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 3254 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2567 3255
2568 if (delete $self->{need_reflow}) {
2569 my $height = 0;
2570
2571 my $layout = $self->{layout};
2572
2573 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2574
2575 for (@{$self->{par}}) {
2576 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2577 $layout->set_width ($W - $_->[3]);
2578 $layout->set_markup ($_->[4]);
2579 my ($w, $h) = $layout->size;
2580 $_->[0] = $w + $_->[3];
2581 $_->[1] = $h;
2582 }
2583
2584 $height += $_->[1];
2585 }
2586
2587 $self->{height} = $height;
2588
2589 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2590
2591 delete $self->{texture};
2592 }
2593
2594 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 3256 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2595 glClearColor 0, 0, 0, 0; 3257 glClearColor 0, 0, 0, 0;
2596 glClear GL_COLOR_BUFFER_BIT; 3258 glClear GL_COLOR_BUFFER_BIT;
2597 3259
3260 package CFPlus::UI::Base;
3261 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3262 (0, 0, $self->{w}, $self->{h});
3263
3264 my $top = int $self->{children}[1]{range}[0];
3265
3266 my $paridx = 0;
3267 my $top_paragraph;
2598 my $top = int $self->{children}[1]{range}[0]; 3268 my $top = int $self->{children}[1]{range}[0];
2599 3269
2600 my $y0 = $top; 3270 my $y0 = $top;
2601 my $y1 = $top + $H; 3271 my $y1 = $top + $H;
2602 3272
2603 my $y = 0;
2604
2605 my $layout = $self->{layout};
2606
2607 $layout->set_font ($self->{font}) if $self->{font};
2608
2609 glEnable GL_BLEND;
2610 #TODO# not correct in windows where rgba is forced off
2611 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2612
2613 for my $par (@{$self->{par}}) { 3273 for my $para (@{$self->{par}}) {
2614 my $h = $par->[1]; 3274 my $h = $para->{h};
3275 my $y = $para->{y};
2615 3276
2616 if ($y0 < $y + $h && $y < $y1) { 3277 if ($y0 < $y + $h && $y < $y1) {
2617 $layout->set_foreground (@{ $par->[2] }); 3278 my $layout = $self->get_layout ($para);
2618 $layout->set_width ($W - $par->[3]);
2619 $layout->set_markup ($par->[4]);
2620 3279
2621 my ($w, $h, $data, $format, $internalformat) = $layout->render; 3280 $layout->render ($para->{indent}, $y - $y0);
2622 3281
2623 glRasterPos $par->[3], $y - $y0; 3282 if (my @w = @{ $para->{widget} }) {
2624 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data; 3283 my @s = $layout->get_shapes;
3284
3285 for (@w) {
3286 my ($dx, $dy) = splice @s, 0, 2, ();
3287
3288 $_->{x} = $dx + $para->{indent};
3289 $_->{y} = $dy + $y - $y0;
3290
3291 $_->draw;
3292 }
3293 }
2625 } 3294 }
2626 3295
2627 $y += $h; 3296 $paridx++;
3297 $top_paragraph ||= $paridx if $y >= $top;
2628 } 3298 }
2629 3299
2630 glDisable GL_BLEND; 3300 $self->{top_paragraph} = $top_paragraph;
2631 }; 3301 };
2632 }); 3302 });
3303}
3304
3305sub reconfigure {
3306 my ($self) = @_;
3307
3308 $self->SUPER::reconfigure;
3309
3310 $_->{w} = 1e10 for @{ $self->{par} };
3311 $self->reflow;
2633} 3312}
2634 3313
2635sub _draw { 3314sub _draw {
2636 my ($self) = @_; 3315 my ($self) = @_;
2637 3316
… …
2640 glColor 0, 0, 0, 1; 3319 glColor 0, 0, 0, 1;
2641 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 3320 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2642 glDisable GL_TEXTURE_2D; 3321 glDisable GL_TEXTURE_2D;
2643 3322
2644 $self->{children}[1]->draw; 3323 $self->{children}[1]->draw;
2645
2646} 3324}
2647 3325
2648############################################################################# 3326#############################################################################
2649 3327
2650package CFClient::UI::Animator; 3328package CFPlus::UI::Animator;
2651 3329
2652use CFClient::OpenGL; 3330use CFPlus::OpenGL;
2653 3331
2654our @ISA = CFClient::UI::Bin::; 3332our @ISA = CFPlus::UI::Bin::;
2655 3333
2656sub moveto { 3334sub moveto {
2657 my ($self, $x, $y) = @_; 3335 my ($self, $x, $y) = @_;
2658 3336
2659 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 3337 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
… …
2687 glPopMatrix; 3365 glPopMatrix;
2688} 3366}
2689 3367
2690############################################################################# 3368#############################################################################
2691 3369
2692package CFClient::UI::Flopper; 3370package CFPlus::UI::Flopper;
2693 3371
2694our @ISA = CFClient::UI::Button::; 3372our @ISA = CFPlus::UI::Button::;
2695 3373
2696sub new { 3374sub new {
2697 my $class = shift; 3375 my $class = shift;
2698 3376
2699 my $self = $class->SUPER::new ( 3377 my $self = $class->SUPER::new (
… …
2711 $self->{other}->toggle_visibility; 3389 $self->{other}->toggle_visibility;
2712} 3390}
2713 3391
2714############################################################################# 3392#############################################################################
2715 3393
2716package CFClient::UI::Tooltip; 3394package CFPlus::UI::Tooltip;
2717 3395
2718our @ISA = CFClient::UI::Bin::; 3396our @ISA = CFPlus::UI::Bin::;
2719 3397
2720use CFClient::OpenGL; 3398use CFPlus::OpenGL;
2721 3399
2722sub new { 3400sub new {
2723 my $class = shift; 3401 my $class = shift;
2724 3402
2725 $class->SUPER::new ( 3403 $class->SUPER::new (
… …
2728 ) 3406 )
2729} 3407}
2730 3408
2731sub set_tooltip_from { 3409sub set_tooltip_from {
2732 my ($self, $widget) = @_; 3410 my ($self, $widget) = @_;
3411
3412 $widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
3413 if $widget->{tooltip} =~ /^#(.*)$/;
2733 3414
2734 my $tooltip = $widget->{tooltip}; 3415 my $tooltip = $widget->{tooltip};
2735 3416
2736 if ($ENV{CFPLUS_DEBUG} & 2) { 3417 if ($ENV{CFPLUS_DEBUG} & 2) {
2737 $tooltip .= "\n\n" . (ref $widget) . "\n" 3418 $tooltip .= "\n\n" . (ref $widget) . "\n"
2738 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n" 3419 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2739 . "req $widget->{req_w} $widget->{req_h}\n" 3420 . "req $widget->{req_w} $widget->{req_h}\n"
2740 . "visible $widget->{visible}"; 3421 . "visible $widget->{visible}";
2741 } 3422 }
2742 3423
3424 $tooltip =~ s/^\n+//;
3425 $tooltip =~ s/\n+$//;
3426
2743 $self->add (new CFClient::UI::Label 3427 $self->add (new CFPlus::UI::Label
2744 markup => $tooltip, 3428 markup => $tooltip,
2745 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3429 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2746 fontsize => 0.8, 3430 fontsize => 0.8,
2747 fg => [0, 0, 0, 1], 3431 style => 1, # FLAG_INVERSE
2748 ellipsise => 0, 3432 ellipsise => 0,
2749 font => ($widget->{tooltip_font} || $::FONT_PROP), 3433 font => ($widget->{tooltip_font} || $::FONT_PROP),
2750 ); 3434 );
2751} 3435}
2752 3436
… …
2756 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 3440 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2757 3441
2758 ($w + 4, $h + 4) 3442 ($w + 4, $h + 4)
2759} 3443}
2760 3444
2761sub size_allocate { 3445sub invoke_size_allocate {
2762 my ($self, $w, $h) = @_; 3446 my ($self, $w, $h) = @_;
2763 3447
2764 $self->SUPER::size_allocate ($w - 4, $h - 4); 3448 $self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2765} 3449}
2766 3450
2767sub visibility_change { 3451sub invoke_visibility_change {
2768 my ($self, $visible) = @_; 3452 my ($self, $visible) = @_;
2769 3453
2770 return unless $visible; 3454 return unless $visible;
2771 3455
2772 $self->{root}->on_post_alloc ("move_$self" => sub { 3456 $self->{root}->on_post_alloc ("move_$self" => sub {
2773 my $widget = $self->{owner} 3457 my $widget = $self->{owner}
2774 or return; 3458 or return;
2775 3459
3460 if ($widget->{visible}) {
2776 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 3461 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2777 3462
2778 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 3463 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2779 if $x + $self->{w} > $::WIDTH; 3464 if $x + $self->{w} > $self->{root}{w};
2780 3465
2781 $self->move_abs ($x, $y); 3466 $self->move_abs ($x, $y);
3467 } else {
3468 $self->hide;
3469 }
2782 }); 3470 });
2783} 3471}
2784 3472
2785sub _draw { 3473sub _draw {
2786 my ($self) = @_; 3474 my ($self) = @_;
… …
2810 $self->SUPER::_draw; 3498 $self->SUPER::_draw;
2811} 3499}
2812 3500
2813############################################################################# 3501#############################################################################
2814 3502
2815package CFClient::UI::Face; 3503package CFPlus::UI::Face;
2816 3504
2817our @ISA = CFClient::UI::Base::; 3505our @ISA = CFPlus::UI::DrawBG::;
2818 3506
2819use CFClient::OpenGL; 3507use CFPlus::OpenGL;
2820 3508
2821sub new { 3509sub new {
2822 my $class = shift; 3510 my $class = shift;
2823 3511
2824 my $self = $class->SUPER::new ( 3512 my $self = $class->SUPER::new (
3513 size_w => 32,
3514 size_h => 8,
2825 aspect => 1, 3515 aspect => 1,
2826 can_events => 0, 3516 can_events => 0,
2827 @_, 3517 @_,
2828 ); 3518 );
2829 3519
2830 if ($self->{anim} && $self->{animspeed}) { 3520 if ($self->{anim} && $self->{animspeed}) {
2831 Scalar::Util::weaken (my $widget = $self); 3521 CFPlus::weaken (my $widget = $self);
2832 3522
3523 $widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
3524 $widget->{anim_start} = $self->{animspeed} * Event::time / $self->{animspeed};
2833 $self->{timer} = Event->timer ( 3525 $self->{timer} = Event->timer (
2834 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2835 hard => 1, 3526 parked => 1,
2836 interval => $self->{animspeed},
2837 cb => sub { 3527 cb => sub {
3528 return unless $::CONN && $widget;
3529
2838 ++$widget->{frame}; 3530 ++$widget->{frame};
3531 $widget->update_face;
2839 $widget->update; 3532 $widget->update;
3533
3534 $widget->update_timer;
2840 }, 3535 },
2841 ); 3536 );
3537
3538 $self->update_face;
3539 $self->update_timer;
2842 } 3540 }
2843 3541
2844 $self 3542 $self
2845} 3543}
2846 3544
3545sub update_timer {
3546 my ($self) = @_;
3547
3548 return unless $self->{timer};
3549
3550 if ($self->{visible}) {
3551 $self->{timer}->at (
3552 $self->{anim_start}
3553 + $self->{animspeed}
3554 * int 1.5 + (Event::time - $self->{anim_start}) / $self->{animspeed}
3555 );
3556 $self->{timer}->start;
3557 } else {
3558 $self->{timer}->stop;
3559 }
3560}
3561
3562sub update_face {
3563 my ($self) = @_;
3564
3565 return unless $::CONN;
3566
3567 if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3568 if ($anim && @$anim) {
3569 delete $self->{wait_face};
3570 $self->{face} = $anim->[ $self->{frame} % @$anim ];
3571 }
3572 }
3573}
3574
2847sub size_request { 3575sub size_request {
2848 (32, 8) 3576 my ($self) = @_;
3577
3578 if ($::CONN) {
3579 if (my $faceid = $::CONN->{faceid}[$self->{face}]) {
3580 if (my $tex = $::CONN->{texture}[$faceid]) {
3581 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
3582 } else {
3583 $self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub {
3584 $self->realloc;
3585 });
3586 }
3587 }
3588 }
3589
3590 ($self->{size_w} || 8, $self->{size_h} || 8)
2849} 3591}
2850 3592
2851sub update { 3593sub update {
2852 my ($self) = @_; 3594 my ($self) = @_;
2853 3595
2854 return unless $self->{visible}; 3596 return unless $self->{visible};
2855 3597
2856 $self->SUPER::update; 3598 $self->SUPER::update;
2857} 3599}
2858 3600
3601sub invoke_visibility_change {
3602 my ($self) = @_;
3603
3604 $self->update_timer;
3605
3606 0
3607}
3608
2859sub _draw { 3609sub _draw {
2860 my ($self) = @_; 3610 my ($self) = @_;
2861 3611
2862 return unless $::CONN; 3612 return unless $::CONN;
2863 3613
2864 my $face; 3614 $self->SUPER::_draw;
2865 3615
2866 if ($self->{frame}) {
2867 my $anim = $::CONN->{anim}[$self->{anim}]; 3616 my $faceid = $::CONN->{faceid}[$self->{face}]
2868 3617 or return;
2869 $face = $anim->[ $self->{frame} % @$anim ]
2870 if $anim && @$anim;
2871 }
2872 3618
2873 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 3619 my $tex = $::CONN->{texture}[$faceid];
2874 3620
2875 if ($tex) { 3621 if ($tex) {
2876 glEnable GL_TEXTURE_2D; 3622 glEnable GL_TEXTURE_2D;
2877 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3623 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2878 glColor 0, 0, 0, 1; 3624 glColor 0, 0, 0, 1;
2879 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3625 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2880 glDisable GL_TEXTURE_2D; 3626 glDisable GL_TEXTURE_2D;
2881 } 3627 }
2882} 3628}
2883 3629
2884sub DESTROY { 3630sub destroy {
2885 my ($self) = @_; 3631 my ($self) = @_;
2886 3632
2887 $self->{timer}->cancel 3633 (delete $self->{timer})->cancel
2888 if $self->{timer}; 3634 if $self->{timer};
2889 3635
2890 $self->SUPER::DESTROY; 3636 $self->SUPER::destroy;
2891} 3637}
2892 3638
2893############################################################################# 3639#############################################################################
2894 3640
2895package CFClient::UI::Buttonbar; 3641package CFPlus::UI::Buttonbar;
2896 3642
2897our @ISA = CFClient::UI::HBox::; 3643our @ISA = CFPlus::UI::HBox::;
2898 3644
2899# TODO: should actualyl wrap buttons and other goodies. 3645# TODO: should actually wrap buttons and other goodies.
2900 3646
2901############################################################################# 3647#############################################################################
2902 3648
2903package CFClient::UI::Menu; 3649package CFPlus::UI::Menu;
2904 3650
2905our @ISA = CFClient::UI::FancyFrame::; 3651our @ISA = CFPlus::UI::Toplevel::;
2906 3652
2907use CFClient::OpenGL; 3653use CFPlus::OpenGL;
2908 3654
2909sub new { 3655sub new {
2910 my $class = shift; 3656 my $class = shift;
2911 3657
2912 my $self = $class->SUPER::new ( 3658 my $self = $class->SUPER::new (
2913 items => [], 3659 items => [],
2914 z => 100, 3660 z => 100,
2915 @_, 3661 @_,
2916 ); 3662 );
2917 3663
2918 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3664 $self->add ($self->{vbox} = new CFPlus::UI::VBox);
2919 3665
2920 for my $item (@{ $self->{items} }) { 3666 for my $item (@{ $self->{items} }) {
2921 my ($widget, $cb) = @$item; 3667 my ($widget, $cb, $tooltip) = @$item;
2922 3668
2923 # handle various types of items, only text for now 3669 # handle various types of items, only text for now
2924 if (!ref $widget) { 3670 if (!ref $widget) {
3671 if ($widget =~ /\t/) {
3672 my ($left, $right) = split /\t/, $widget, 2;
3673
2925 $widget = new CFClient::UI::Label 3674 $widget = new CFPlus::UI::HBox
2926 can_hover => 1, 3675 can_hover => 1,
2927 can_events => 1, 3676 can_events => 1,
3677 tooltip => $tooltip,
3678 children => [
3679 (new CFPlus::UI::Label markup => $left, expand => 1),
3680 (new CFPlus::UI::Label markup => $right, align => +1),
3681 ],
3682 ;
3683
3684 } else {
3685 $widget = new CFPlus::UI::Label
3686 can_hover => 1,
3687 can_events => 1,
2928 text => $widget; 3688 markup => $widget,
3689 tooltip => $tooltip;
3690 }
2929 } 3691 }
2930 3692
2931 $self->{item}{$widget} = $item; 3693 $self->{item}{$widget} = $item;
2932 3694
2933 $self->{vbox}->add ($widget); 3695 $self->{vbox}->add ($widget);
… …
2938 3700
2939# popup given the event (must be a mouse button down event currently) 3701# popup given the event (must be a mouse button down event currently)
2940sub popup { 3702sub popup {
2941 my ($self, $ev) = @_; 3703 my ($self, $ev) = @_;
2942 3704
2943 $self->_emit ("popdown"); 3705 $self->emit ("popdown");
2944 3706
2945 # maybe save $GRAB? must be careful about events... 3707 # maybe save $GRAB? must be careful about events...
2946 $GRAB = $self; 3708 $GRAB = $self;
2947 $self->{button} = $ev->{button}; 3709 $self->{button} = $ev->{button};
2948 3710
2949 $self->show; 3711 $self->show;
2950 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 3712 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2951} 3713}
2952 3714
2953sub mouse_motion { 3715sub invoke_mouse_motion {
2954 my ($self, $ev, $x, $y) = @_; 3716 my ($self, $ev, $x, $y) = @_;
2955 3717
2956 # TODO: should use vbox->find_widget or so 3718 # TODO: should use vbox->find_widget or so
2957 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3719 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2958 $self->{hover} = $self->{item}{$HOVER}; 3720 $self->{hover} = $self->{item}{$HOVER};
2959 3721
2960 0 3722 0
2961} 3723}
2962 3724
2963sub button_up { 3725sub invoke_button_up {
2964 my ($self, $ev, $x, $y) = @_; 3726 my ($self, $ev, $x, $y) = @_;
2965 3727
2966 if ($ev->{button} == $self->{button}) { 3728 if ($ev->{button} == $self->{button}) {
2967 undef $GRAB; 3729 undef $GRAB;
2968 $self->hide; 3730 $self->hide;
2969 3731
2970 $self->_emit ("popdown"); 3732 $self->emit ("popdown");
2971 $self->{hover}[1]->() if $self->{hover}; 3733 $self->{hover}[1]->() if $self->{hover};
2972 } else { 3734 } else {
2973 return 0 3735 return 0
2974 } 3736 }
2975 3737
2976 1 3738 1
2977} 3739}
2978 3740
2979############################################################################# 3741#############################################################################
2980 3742
2981package CFClient::UI::Multiplexer; 3743package CFPlus::UI::Multiplexer;
2982 3744
2983our @ISA = CFClient::UI::Container::; 3745our @ISA = CFPlus::UI::Container::;
2984 3746
2985sub new { 3747sub new {
2986 my $class = shift; 3748 my $class = shift;
2987 3749
2988 my $self = $class->SUPER::new ( 3750 my $self = $class->SUPER::new (
… …
3002 3764
3003 $self->{current} = $self->{children}[0] 3765 $self->{current} = $self->{children}[0]
3004 if @{ $self->{children} }; 3766 if @{ $self->{children} };
3005} 3767}
3006 3768
3769sub get_current_page {
3770 my ($self) = @_;
3771
3772 $self->{current}
3773}
3774
3007sub set_current_page { 3775sub set_current_page {
3008 my ($self, $page_or_widget) = @_; 3776 my ($self, $page_or_widget) = @_;
3009 3777
3010 my $widget = ref $page_or_widget 3778 my $widget = ref $page_or_widget
3011 ? $page_or_widget 3779 ? $page_or_widget
3012 : $self->{children}[$page_or_widget]; 3780 : $self->{children}[$page_or_widget];
3013 3781
3014 $self->{current} = $widget; 3782 $self->{current} = $widget;
3015 $self->{current}->configure (0, 0, $self->{w}, $self->{h}); 3783 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3016 3784
3017 $self->_emit (page_changed => $self->{current}); 3785 $self->emit (page_changed => $self->{current});
3018 3786
3019 $self->realloc; 3787 $self->realloc;
3020} 3788}
3021 3789
3022sub visible_children { 3790sub visible_children {
… …
3027 my ($self) = @_; 3795 my ($self) = @_;
3028 3796
3029 $self->{current}->size_request 3797 $self->{current}->size_request
3030} 3798}
3031 3799
3032sub size_allocate { 3800sub invoke_size_allocate {
3033 my ($self, $w, $h) = @_; 3801 my ($self, $w, $h) = @_;
3034 3802
3035 $self->{current}->configure (0, 0, $w, $h); 3803 $self->{current}->configure (0, 0, $w, $h);
3804
3805 1
3036} 3806}
3037 3807
3038sub _draw { 3808sub _draw {
3039 my ($self) = @_; 3809 my ($self) = @_;
3040 3810
3041 $self->{current}->draw; 3811 $self->{current}->draw;
3042} 3812}
3043 3813
3044############################################################################# 3814#############################################################################
3045 3815
3046package CFClient::UI::Notebook; 3816package CFPlus::UI::Notebook;
3047 3817
3048our @ISA = CFClient::UI::VBox::; 3818our @ISA = CFPlus::UI::VBox::;
3049 3819
3050sub new { 3820sub new {
3051 my $class = shift; 3821 my $class = shift;
3052 3822
3053 my $self = $class->SUPER::new ( 3823 my $self = $class->SUPER::new (
3054 buttonbar => (new CFClient::UI::Buttonbar), 3824 buttonbar => (new CFPlus::UI::Buttonbar),
3055 multiplexer => (new CFClient::UI::Multiplexer expand => 1), 3825 multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3056 # filter => # will be put between multiplexer and $self 3826 # filter => # will be put between multiplexer and $self
3057 @_, 3827 @_,
3058 ); 3828 );
3059 3829
3060 $self->{filter}->add ($self->{multiplexer}) if $self->{filter}; 3830 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
… …
3064} 3834}
3065 3835
3066sub add { 3836sub add {
3067 my ($self, $title, $widget, $tooltip) = @_; 3837 my ($self, $title, $widget, $tooltip) = @_;
3068 3838
3069 Scalar::Util::weaken $self; 3839 CFPlus::weaken $self;
3070 3840
3071 $self->{buttonbar}->add (new CFClient::UI::Button 3841 $self->{buttonbar}->add (new CFPlus::UI::Button
3072 markup => $title, 3842 markup => $title,
3073 tooltip => $tooltip, 3843 tooltip => $tooltip,
3074 on_activate => sub { $self->set_current_page ($widget) }, 3844 on_activate => sub { $self->set_current_page ($widget) },
3075 ); 3845 );
3076 3846
3077 $self->{multiplexer}->add ($widget); 3847 $self->{multiplexer}->add ($widget);
3078} 3848}
3079 3849
3850sub get_current_page {
3851 my ($self) = @_;
3852
3853 $self->{multiplexer}->get_current_page
3854}
3855
3080sub set_current_page { 3856sub set_current_page {
3081 my ($self, $page) = @_; 3857 my ($self, $page) = @_;
3082 3858
3083 $self->{multiplexer}->set_current_page ($page); 3859 $self->{multiplexer}->set_current_page ($page);
3084 $self->_emit (page_changed => $self->{multiplexer}{current}); 3860 $self->emit (page_changed => $self->{multiplexer}{current});
3085} 3861}
3086 3862
3087############################################################################# 3863#############################################################################
3088 3864
3865package CFPlus::UI::Selector;
3866
3867use utf8;
3868
3869our @ISA = CFPlus::UI::Button::;
3870
3871sub new {
3872 my $class = shift;
3873
3874 my $self = $class->SUPER::new (
3875 options => [], # [value, title, longdesc], ...
3876 value => undef,
3877 @_,
3878 );
3879
3880 $self->_set_value ($self->{value});
3881
3882 $self
3883}
3884
3885sub invoke_button_down {
3886 my ($self, $ev) = @_;
3887
3888 my @menu_items;
3889
3890 for (@{ $self->{options} }) {
3891 my ($value, $title, $tooltip) = @$_;
3892
3893 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3894 }
3895
3896 CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3897}
3898
3899sub _set_value {
3900 my ($self, $value) = @_;
3901
3902 my ($item) = grep $_->[0] eq $value, @{ $self->{options} }
3903 or return;
3904
3905 $self->{value} = $item->[0];
3906 $self->set_markup ("$item->[1] ⇓");
3907 $self->set_tooltip ($item->[2]);
3908}
3909
3910sub set_value {
3911 my ($self, $value) = @_;
3912
3913 return unless $self->{value} ne $value;
3914
3915 $self->_set_value ($value);
3916 $self->emit (changed => $value);
3917}
3918
3919#############################################################################
3920
3089package CFClient::UI::Statusbox; 3921package CFPlus::UI::Statusbox;
3090 3922
3091our @ISA = CFClient::UI::VBox::; 3923our @ISA = CFPlus::UI::VBox::;
3092 3924
3093sub new { 3925sub new {
3094 my $class = shift; 3926 my $class = shift;
3095 3927
3096 my $self = $class->SUPER::new ( 3928 my $self = $class->SUPER::new (
3097 fontsize => 0.8, 3929 fontsize => 0.8,
3098 @_, 3930 @_,
3099 ); 3931 );
3100 3932
3101 Scalar::Util::weaken (my $this = $self); 3933 CFPlus::weaken (my $this = $self);
3102 3934
3103 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder }); 3935 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3104 3936
3105 $self 3937 $self
3106} 3938}
… …
3108sub reorder { 3940sub reorder {
3109 my ($self) = @_; 3941 my ($self) = @_;
3110 my $NOW = Time::HiRes::time; 3942 my $NOW = Time::HiRes::time;
3111 3943
3112 # freeze display when hovering over any label 3944 # freeze display when hovering over any label
3113 return if $CFClient::UI::TOOLTIP->{owner} 3945 return if $CFPlus::UI::TOOLTIP->{owner}
3114 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label}, 3946 && grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3115 values %{ $self->{item} }; 3947 values %{ $self->{item} };
3116 3948
3117 while (my ($k, $v) = each %{ $self->{item} }) { 3949 while (my ($k, $v) = each %{ $self->{item} }) {
3118 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3950 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3119 } 3951 }
… …
3140 for ($short) { 3972 for ($short) {
3141 s/^\s+//; 3973 s/^\s+//;
3142 s/\s+/ /g; 3974 s/\s+/ /g;
3143 } 3975 }
3144 3976
3145 new CFClient::UI::Label 3977 new CFPlus::UI::Label
3146 markup => $short, 3978 markup => $short,
3147 tooltip => $item->{tooltip}, 3979 tooltip => $item->{tooltip},
3148 tooltip_font => $::FONT_PROP, 3980 tooltip_font => $::FONT_PROP,
3149 tooltip_width => 0.67, 3981 tooltip_width => 0.67,
3150 fontsize => $item->{fontsize} || $self->{fontsize}, 3982 fontsize => $item->{fontsize} || $self->{fontsize},
… …
3188 $item->{count}++; 4020 $item->{count}++;
3189 } else { 4021 } else {
3190 $item->{count} = 1; 4022 $item->{count} = 1;
3191 $item->{text} = $item->{tooltip} = $text; 4023 $item->{text} = $item->{tooltip} = $text;
3192 } 4024 }
3193 $item->{id} = ++$self->{id}; 4025 $item->{id} += 0.2;#d#
3194 $item->{timeout} = $timeout; 4026 $item->{timeout} = $timeout;
3195 delete $item->{label}; 4027 delete $item->{label};
3196 } else { 4028 } else {
3197 $self->{item}{$group} = { 4029 $self->{item}{$group} = {
3198 id => ++$self->{id}, 4030 id => ++$self->{id},
… …
3204 count => 1, 4036 count => 1,
3205 %arg, 4037 %arg,
3206 }; 4038 };
3207 } 4039 }
3208 4040
4041 $ROOT->on_refresh (reorder => sub {
3209 $self->reorder; 4042 $self->reorder;
4043 });
3210} 4044}
3211 4045
3212sub reconfigure { 4046sub reconfigure {
3213 my ($self) = @_; 4047 my ($self) = @_;
3214 4048
… …
3217 4051
3218 $self->reorder; 4052 $self->reorder;
3219 $self->SUPER::reconfigure; 4053 $self->SUPER::reconfigure;
3220} 4054}
3221 4055
3222sub DESTROY { 4056sub destroy {
3223 my ($self) = @_; 4057 my ($self) = @_;
3224 4058
3225 $self->{timer}->cancel; 4059 $self->{timer}->cancel;
3226 4060
3227 $self->SUPER::DESTROY; 4061 $self->SUPER::destroy;
3228} 4062}
3229 4063
3230############################################################################# 4064#############################################################################
3231 4065
3232package CFClient::UI::Inventory;
3233
3234our @ISA = CFClient::UI::ScrolledWindow::;
3235
3236sub new {
3237 my $class = shift;
3238
3239 my $self = $class->SUPER::new (
3240 child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3241 @_,
3242 );
3243
3244 $self
3245}
3246
3247sub set_items {
3248 my ($self, $items) = @_;
3249
3250 $self->{child}->clear;
3251 return unless $items;
3252
3253 my @items = sort {
3254 ($a->{type} <=> $b->{type})
3255 or ($a->{name} cmp $b->{name})
3256 } @$items;
3257
3258 $self->{real_items} = \@items;
3259
3260 my $row = 0;
3261 for my $item (@items) {
3262 CFClient::Item::update_widgets $item;
3263
3264 $self->{child}->add (0, $row, $item->{face_widget});
3265 $self->{child}->add (1, $row, $item->{desc_widget});
3266 $self->{child}->add (2, $row, $item->{weight_widget});
3267
3268 $row++;
3269 }
3270}
3271
3272#############################################################################
3273
3274package CFClient::UI::BindEditor;
3275
3276our @ISA = CFClient::UI::FancyFrame::;
3277
3278sub new {
3279 my $class = shift;
3280
3281 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3282
3283 $self->add (my $vb = new CFClient::UI::VBox);
3284
3285
3286 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3287 text => "start recording",
3288 tooltip => "Start/Stops recording of actions."
3289 ."All subsequent actions after the recording started will be captured."
3290 ."The actions are displayed after the record was stopped."
3291 ."To bind the action you have to click on the 'Bind' button",
3292 on_activate => sub {
3293 unless ($self->{recording}) {
3294 $self->start;
3295 } else {
3296 $self->stop;
3297 }
3298 });
3299
3300 $vb->add (new CFClient::UI::Label text => "Actions:");
3301 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3302
3303 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3304 $vb->add (my $hb = new CFClient::UI::HBox);
3305 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3306 $hb->add (new CFClient::UI::Button
3307 text => "bind",
3308 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3309 on_activate => sub {
3310 $self->ask_for_bind;
3311 });
3312
3313 $vb->add (my $hb = new CFClient::UI::HBox);
3314 $hb->add (new CFClient::UI::Button
3315 text => "ok",
3316 expand => 1,
3317 tooltip => "This closes the binding editor and saves the binding",
3318 on_activate => sub {
3319 $self->hide;
3320 $self->commit;
3321 });
3322
3323 $hb->add (new CFClient::UI::Button
3324 text => "cancel",
3325 expand => 1,
3326 tooltip => "This closes the binding editor without saving",
3327 on_activate => sub {
3328 $self->hide;
3329 $self->{binding_cancel}->()
3330 if $self->{binding_cancel};
3331 });
3332
3333 $self->update_binding_widgets;
3334
3335 $self
3336}
3337
3338sub commit {
3339 my ($self) = @_;
3340 my ($mod, $sym, $cmds) = $self->get_binding;
3341 if ($sym != 0 && @$cmds > 0) {
3342 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3343 ."'. Don't forget 'Save Config'!");
3344 $self->{binding_change}->($mod, $sym, $cmds)
3345 if $self->{binding_change};
3346 } else {
3347 $::STATUSBOX->add ("No action bound, no key or action specified!");
3348 $self->{binding_cancel}->()
3349 if $self->{binding_cancel};
3350 }
3351}
3352
3353sub start {
3354 my ($self) = @_;
3355
3356 $self->{rec_btn}->set_text ("stop recording");
3357 $self->{recording} = 1;
3358 $self->clear_command_list;
3359 $::CONN->start_record if $::CONN;
3360}
3361
3362sub stop {
3363 my ($self) = @_;
3364
3365 $self->{rec_btn}->set_text ("start recording");
3366 $self->{recording} = 0;
3367
3368 my $rec;
3369 $rec = $::CONN->stop_record if $::CONN;
3370 return unless ref $rec eq 'ARRAY';
3371 $self->set_command_list ($rec);
3372}
3373
3374
3375sub ask_for_bind_and_commit {
3376 my ($self) = @_;
3377 $self->ask_for_bind (1);
3378}
3379
3380sub ask_for_bind {
3381 my ($self, $commit) = @_;
3382
3383 CFClient::Binder::open_binding_dialog (sub {
3384 my ($mod, $sym) = @_;
3385 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3386 $self->update_binding_widgets;
3387 $self->commit if $commit;
3388 });
3389}
3390
3391# $mod and $sym are the modifiers and key symbol
3392# $cmds is a array ref of strings (the commands)
3393# $cb is the callback that is executed on OK
3394# $ccb is the callback that is executed on CANCEL and
3395# when the binding was unsuccessful on OK
3396sub set_binding {
3397 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3398
3399 $self->clear_command_list;
3400 $self->{recording} = 0;
3401 $self->{rec_btn}->set_text ("start recording");
3402
3403 $self->{binding} = [$mod, $sym];
3404 $self->{commands} = $cmds;
3405
3406 $self->{binding_change} = $cb;
3407 $self->{binding_cancel} = $ccb;
3408
3409 $self->update_binding_widgets;
3410}
3411
3412# this is a shortcut method that asks for a binding
3413# and then just binds it.
3414sub do_quick_binding {
3415 my ($self, $cmds) = @_;
3416 $self->set_binding (undef, undef, $cmds, sub {
3417 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3418 });
3419 $self->ask_for_bind (1);
3420}
3421
3422sub update_binding_widgets {
3423 my ($self) = @_;
3424 my ($mod, $sym, $cmds) = $self->get_binding;
3425 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3426 $self->set_command_list ($cmds);
3427}
3428
3429sub get_binding {
3430 my ($self) = @_;
3431 return (
3432 $self->{binding}->[0],
3433 $self->{binding}->[1],
3434 [ grep { defined $_ } @{$self->{commands}} ]
3435 );
3436}
3437
3438sub clear_command_list {
3439 my ($self) = @_;
3440 $self->{cmdbox}->clear ();
3441}
3442
3443sub set_command_list {
3444 my ($self, $cmds) = @_;
3445
3446 $self->{cmdbox}->clear ();
3447 $self->{commands} = $cmds;
3448
3449 my $idx = 0;
3450
3451 for (@$cmds) {
3452 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3453
3454 my $i = $idx;
3455 $hb->add (new CFClient::UI::Label text => $_);
3456 $hb->add (new CFClient::UI::Button
3457 text => "delete",
3458 tooltip => "Deletes the action from the record",
3459 on_activate => sub {
3460 $self->{cmdbox}->remove ($hb);
3461 $cmds->[$i] = undef;
3462 });
3463
3464
3465 $idx++
3466 }
3467}
3468
3469#############################################################################
3470
3471package CFClient::UI::SpellList;
3472
3473our @ISA = CFClient::UI::Table::;
3474
3475sub new {
3476 my $class = shift;
3477
3478 my $self = $class->SUPER::new (
3479 binding => [],
3480 commands => [],
3481 @_,
3482 )
3483}
3484
3485# XXX: Do sorting? Argl...
3486sub add_spell {
3487 my ($self, $spell) = @_;
3488 $self->{spells}->{$spell->{name}} = $spell;
3489
3490 $self->add (0, $self->{tbl_idx}, new CFClient::UI::Face
3491 face => $spell->{face},
3492 can_hover => 1,
3493 can_events => 1,
3494 tooltip => $spell->{message});
3495
3496 $self->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3497 text => $spell->{name},
3498 can_hover => 1,
3499 can_events => 1,
3500 tooltip => $spell->{message},
3501 expand => 1);
3502
3503 $self->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3504 text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3505 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3506 expand => 1);
3507
3508 $self->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3509 text => "bind to key",
3510 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3511}
3512
3513sub rebuild_spell_list {
3514 my ($self) = @_;
3515 $self->{tbl_idx} = 0;
3516 $self->add_spell ($_) for values %{$self->{spells}};
3517}
3518
3519sub remove_spell {
3520 my ($self, $spell) = @_;
3521 delete $self->{spells}->{$spell->{name}};
3522 $self->rebuild_spell_list;
3523}
3524
3525#############################################################################
3526
3527package CFClient::UI::Root; 4066package CFPlus::UI::Root;
3528 4067
3529our @ISA = CFClient::UI::Container::; 4068our @ISA = CFPlus::UI::Container::;
3530 4069
3531use List::Util qw(min max); 4070use List::Util qw(min max);
3532 4071
3533use CFClient::OpenGL; 4072use CFPlus::OpenGL;
3534 4073
3535sub new { 4074sub new {
3536 my $class = shift; 4075 my $class = shift;
3537 4076
3538 my $self = $class->SUPER::new ( 4077 my $self = $class->SUPER::new (
3539 visible => 1, 4078 visible => 1,
3540 @_, 4079 @_,
3541 ); 4080 );
3542 4081
3543 Scalar::Util::weaken ($self->{root} = $self); 4082 CFPlus::weaken ($self->{root} = $self);
3544 4083
3545 $self 4084 $self
3546} 4085}
3547 4086
3548sub size_request { 4087sub size_request {
… …
3563 $coord = $max - $size if $coord > $max - $size; 4102 $coord = $max - $size if $coord > $max - $size;
3564 4103
3565 int $coord + 0.5 4104 int $coord + 0.5
3566} 4105}
3567 4106
3568sub size_allocate { 4107sub invoke_size_allocate {
3569 my ($self, $w, $h) = @_; 4108 my ($self, $w, $h) = @_;
3570 4109
3571 for my $child ($self->children) { 4110 for my $child ($self->children) {
3572 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 4111 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3573 4112
… …
3577 $X = _to_pixel $X, $W, $self->{w}; 4116 $X = _to_pixel $X, $W, $self->{w};
3578 $Y = _to_pixel $Y, $H, $self->{h}; 4117 $Y = _to_pixel $Y, $H, $self->{h};
3579 4118
3580 $child->configure ($X, $Y, $W, $H); 4119 $child->configure ($X, $Y, $W, $H);
3581 } 4120 }
4121
4122 1
3582} 4123}
3583 4124
3584sub coord2local { 4125sub coord2local {
3585 my ($self, $x, $y) = @_; 4126 my ($self, $x, $y) = @_;
3586 4127
… …
3712 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 4253 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3713 4254
3714 $w = 0 if $w < 0; 4255 $w = 0 if $w < 0;
3715 $h = 0 if $h < 0; 4256 $h = 0 if $h < 0;
3716 4257
4258 $w = max $widget->{min_w}, $w;
4259 $h = max $widget->{min_h}, $h;
4260
4261# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
4262# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
4263
4264 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
4265 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
4266
3717 $w = int $w + 0.5; 4267 $w = int $w + 0.5;
3718 $h = int $h + 0.5; 4268 $h = int $h + 0.5;
3719 4269
3720 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) { 4270 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3721 $widget->{old_w} = $widget->{w}; 4271 $widget->{old_w} = $widget->{w};
… …
3731 4281
3732 while ($self->{post_alloc_hook}) { 4282 while ($self->{post_alloc_hook}) {
3733 $_->() 4283 $_->()
3734 for values %{delete $self->{post_alloc_hook}}; 4284 for values %{delete $self->{post_alloc_hook}};
3735 } 4285 }
3736
3737 4286
3738 glViewport 0, 0, $::WIDTH, $::HEIGHT; 4287 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3739 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 4288 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3740 glClear GL_COLOR_BUFFER_BIT; 4289 glClear GL_COLOR_BUFFER_BIT;
3741 4290
… …
3744 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 4293 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3745 glMatrixMode GL_MODELVIEW; 4294 glMatrixMode GL_MODELVIEW;
3746 glLoadIdentity; 4295 glLoadIdentity;
3747 4296
3748 { 4297 {
3749 package CFClient::UI::Base; 4298 package CFPlus::UI::Base;
3750 4299
3751 ($draw_x, $draw_y, $draw_w, $draw_h) = 4300 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3752 (0, 0, $self->{w}, $self->{h}); 4301 (0, 0, $self->{w}, $self->{h});
3753 }
3754 4302
3755 $self->_draw; 4303 $self->_draw;
4304 }
3756} 4305}
3757 4306
3758############################################################################# 4307#############################################################################
3759 4308
3760package CFClient::UI; 4309package CFPlus::UI;
3761 4310
3762$ROOT = new CFClient::UI::Root; 4311$ROOT = new CFPlus::UI::Root;
3763$TOOLTIP = new CFClient::UI::Tooltip z => 900; 4312$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
3764 4313
37651 43141
3766 4315

Diff Legend

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