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

Diff Legend

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