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.280 by root, Mon Jun 5 01:22:08 2006 UTC vs.
Revision 1.388 by root, Fri Jul 20 18:30:03 2007 UTC

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

Diff Legend

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