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

Diff Legend

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