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.270 by elmex, Fri Jun 2 09:02:49 2006 UTC vs.
Revision 1.440 by root, Sun Sep 16 18:27:48 2007 UTC

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

Diff Legend

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