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

Diff Legend

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