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

Diff Legend

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