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

Diff Legend

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