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.374 by root, Mon Jul 16 12:36:48 2007 UTC

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

Diff Legend

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