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

Diff Legend

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