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

Diff Legend

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