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.272 by root, Sat Jun 3 01:47:14 2006 UTC vs.
Revision 1.375 by root, Mon Jul 16 20:12:19 2007 UTC

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

Diff Legend

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