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

Diff Legend

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