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.267 by root, Thu Jun 1 04:10:29 2006 UTC vs.
Revision 1.354 by root, Sat Nov 18 23:31:23 2006 UTC

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

Diff Legend

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