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

Diff Legend

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