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

Diff Legend

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