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

Diff Legend

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