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.254 by root, Mon May 29 01:53:23 2006 UTC vs.
Revision 1.309 by elmex, Wed Jun 21 12:59:23 2006 UTC

… …
3use utf8; 3use utf8;
4use strict; 4use strict;
5 5
6use Scalar::Util (); 6use Scalar::Util ();
7use List::Util (); 7use List::Util ();
8use Event;
8 9
9use CFClient; 10use CFClient;
10use CFClient::Texture; 11use CFClient::Texture;
11 12
12our ($FOCUS, $HOVER, $GRAB); # various widgets 13our ($FOCUS, $HOVER, $GRAB); # various widgets
… …
16our $TOOLTIP; 17our $TOOLTIP;
17our $BUTTON_STATE; 18our $BUTTON_STATE;
18 19
19our %WIDGET; # all widgets, weak-referenced 20our %WIDGET; # all widgets, weak-referenced
20 21
21sub get_layout { 22our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub {
22 for (grep { $_->{name} } values %WIDGET) {
23 $LAYOUT->{$_->{name}} = {
24 x => $_->{x} / $::WIDTH,
25 y => $_->{y} / $::HEIGHT,
26 w => $_->{w} / $::WIDTH,
27 h => $_->{h} / $::HEIGHT
28 };
29 }
30
31 return $LAYOUT;
32}
33
34sub set_layout {
35 my ($layout) = @_;
36 $LAYOUT = $layout;
37}
38
39sub check_tooltip {
40 if (!$GRAB) { 23 if (!$GRAB) {
41 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 24 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
42 if (length $widget->{tooltip}) { 25 if (length $widget->{tooltip}) {
43
44 if ($TOOLTIP->{owner} != $widget) { 26 if ($TOOLTIP->{owner} != $widget) {
45 $TOOLTIP->hide; 27 $TOOLTIP->hide;
46 28
47 $TOOLTIP->{owner} = $widget; 29 $TOOLTIP->{owner} = $widget;
30
31 return if $ENV{CFPLUS_DEBUG} & 8;
48 32
49 my $tip = $widget->{tooltip}; 33 my $tip = $widget->{tooltip};
50 34
51 $tip = $tip->($widget) if CODE:: eq ref $tip; 35 $tip = $tip->($widget) if CODE:: eq ref $tip;
52 36
… …
59 } 43 }
60 } 44 }
61 45
62 $TOOLTIP->hide; 46 $TOOLTIP->hide;
63 delete $TOOLTIP->{owner}; 47 delete $TOOLTIP->{owner};
48});
49
50sub get_layout {
51 my $layout;
52
53 for (grep { $_->{name} } values %WIDGET) {
54 my $win = $layout->{$_->{name}} = { };
55
56 $win->{x} = ($_->{x} + $_->{w} * 0.5) / $::WIDTH if $_->{x} =~ /^[0-9.]+$/;
57 $win->{y} = ($_->{y} + $_->{h} * 0.5) / $::HEIGHT if $_->{y} =~ /^[0-9.]+$/;
58 $win->{w} = $_->{w} / $::WIDTH if defined $_->{w};
59 $win->{h} = $_->{h} / $::HEIGHT if defined $_->{h};
60
61 $win->{show} = $_->{visible} && $_->{is_toplevel};
62 }
63
64 $layout
65}
66
67sub set_layout {
68 my ($layout) = @_;
69
70 $LAYOUT = $layout;
64} 71}
65 72
66# class methods for events 73# class methods for events
67sub feed_sdl_key_down_event { 74sub feed_sdl_key_down_event {
68 $FOCUS->emit (key_down => $_[0]) 75 $FOCUS->emit (key_down => $_[0])
… …
82 my $widget = $ROOT->find_widget ($x, $y); 89 my $widget = $ROOT->find_widget ($x, $y);
83 90
84 $GRAB = $widget; 91 $GRAB = $widget;
85 $GRAB->update if $GRAB; 92 $GRAB->update if $GRAB;
86 93
87 check_tooltip; 94 $TOOLTIP_WATCHER->cb->();
88 } 95 }
89 96
90 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 97 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
91 98
92 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y)) 99 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
… …
107 if (!$BUTTON_STATE) { 114 if (!$BUTTON_STATE) {
108 my $grab = $GRAB; undef $GRAB; 115 my $grab = $GRAB; undef $GRAB;
109 $grab->update if $grab; 116 $grab->update if $grab;
110 $GRAB->update if $GRAB; 117 $GRAB->update if $GRAB;
111 118
112 check_tooltip; 119 $TOOLTIP_WATCHER->cb->();
113 } 120 }
114} 121}
115 122
116sub feed_sdl_motion_event { 123sub feed_sdl_motion_event {
117 my ($ev) = @_; 124 my ($ev) = @_;
… …
123 my $hover = $HOVER; $HOVER = $widget; 130 my $hover = $HOVER; $HOVER = $widget;
124 131
125 $hover->update if $hover && $hover->{can_hover}; 132 $hover->update if $hover && $hover->{can_hover};
126 $HOVER->update if $HOVER && $HOVER->{can_hover}; 133 $HOVER->update if $HOVER && $HOVER->{can_hover};
127 134
128 check_tooltip; 135 $TOOLTIP_WATCHER->start;
129 } 136 }
130 137
131 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y)) 138 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
132 if $HOVER; 139 if $HOVER;
133} 140}
… …
165sub rescale_widgets { 172sub rescale_widgets {
166 my ($sx, $sy) = @_; 173 my ($sx, $sy) = @_;
167 174
168 for my $widget (values %WIDGET) { 175 for my $widget (values %WIDGET) {
169 if ($widget->{is_toplevel}) { 176 if ($widget->{is_toplevel}) {
177 $widget->{x} += int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
178 $widget->{y} += int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
179
170 $widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x}; 180 $widget->{x} = int 0.5 + $widget->{x} * $sx if $widget->{x} =~ /^[0-9.]+$/;
171 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w}; 181 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
172 $widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w}; 182 $widget->{force_w} = int 0.5 + $widget->{force_w} * $sx if exists $widget->{force_w};
173 $widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y}; 183 $widget->{y} = int 0.5 + $widget->{y} * $sy if $widget->{y} =~ /^[0-9.]+$/;
174 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h}; 184 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
175 $widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h}; 185 $widget->{force_h} = int 0.5 + $widget->{force_h} * $sy if exists $widget->{force_h};
186
187 $widget->{x} -= int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
188 $widget->{y} -= int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
189
176 } 190 }
177 } 191 }
178 192
179 reconfigure_widgets; 193 reconfigure_widgets;
180} 194}
… …
189 203
190sub new { 204sub new {
191 my $class = shift; 205 my $class = shift;
192 206
193 my $self = bless { 207 my $self = bless {
194 x => 0, 208 x => "center",
195 y => 0, 209 y => "center",
196 z => 0, 210 z => 0,
211 w => undef,
212 h => undef,
197 can_events => 1, 213 can_events => 1,
198 @_ 214 @_
199 }, $class; 215 }, $class;
216
217 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
200 218
201 for (keys %$self) { 219 for (keys %$self) {
202 if (/^on_(.*)$/) { 220 if (/^on_(.*)$/) {
203 $self->connect ($1 => delete $self->{$_}); 221 $self->connect ($1 => delete $self->{$_});
204 } 222 }
205 } 223 }
206 224
207 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
208
209 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) { 225 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {
210 $self->{req_x} = $layout->{x} * $::WIDTH; 226 $self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x};
211 $self->{req_y} = $layout->{y} * $::HEIGHT; 227 $self->{y} = $layout->{y} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{y};
212 $self->{def_w} = ($layout->{w} != 0 ? $layout->{w} : 1) * $::WIDTH; 228 $self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{w};
213 $self->{def_h} = ($layout->{h} != 0 ? $layout->{h} : 1) * $::HEIGHT; 229 $self->{force_h} = $layout->{h} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{h};
230
231 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
232 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
233
234 $self->show if $layout->{show};
214 } 235 }
215 236
216 $self 237 $self
217} 238}
218 239
… …
229 return if $self->{parent}; 250 return if $self->{parent};
230 251
231 $CFClient::UI::ROOT->add ($self); 252 $CFClient::UI::ROOT->add ($self);
232} 253}
233 254
234sub center {
235 my ($self) = @_;
236
237 $CFClient::UI::ROOT->on_post_alloc (
238 "center_$self" => sub {
239 $self->move (($self->{parent}{w} - $self->{w}) * 0.5, ($self->{parent}{h} - $self->{h}) * 0.5);
240 },
241 );
242
243 $self->update;
244}
245
246sub set_visible { 255sub set_visible {
247 my ($self) = @_; 256 my ($self) = @_;
248 257
249 return if $self->{visible}; 258 return if $self->{visible};
250 259
… …
263 272
264 return unless $self->{visible}; 273 return unless $self->{visible};
265 274
266 $_->set_invisible for $self->children; 275 $_->set_invisible for $self->children;
267 276
277 delete $self->{visible};
268 delete $self->{root}; 278 delete $self->{root};
269 delete $self->{visible};
270 279
271 undef $GRAB if $GRAB == $self; 280 undef $GRAB if $GRAB == $self;
272 undef $HOVER if $HOVER == $self; 281 undef $HOVER if $HOVER == $self;
273 282
274 CFClient::UI::check_tooltip 283 $CFClient::UI::TOOLTIP_WATCHER->cb->()
275 if $TOOLTIP->{owner} == $self; 284 if $TOOLTIP->{owner} == $self;
276 285
277 $self->focus_out; 286 $self->emit ("focus_out");
278
279 $self->emit (visibility_change => 0); 287 $self->emit (visibility_change => 0);
280} 288}
281 289
282sub set_visibility { 290sub set_visibility {
283 my ($self, $visible) = @_; 291 my ($self, $visible) = @_;
… …
303 311
304 $self->{parent}->remove ($self) 312 $self->{parent}->remove ($self)
305 if $self->{parent}; 313 if $self->{parent};
306} 314}
307 315
308sub move { 316sub move_abs {
309 my ($self, $x, $y, $z) = @_; 317 my ($self, $x, $y, $z) = @_;
310 318
311 $self->{x} = int $x; 319 $self->{x} = List::Util::max 0, List::Util::min $self->{root}{w} - $self->{w}, int $x;
312 $self->{y} = int $y; 320 $self->{y} = List::Util::max 0, List::Util::min $self->{root}{h} - $self->{h}, int $y;
313 $self->{z} = $z if defined $z; 321 $self->{z} = $z if defined $z;
314 322
315 $self->update; 323 $self->update;
316} 324}
317 325
318sub set_size { 326sub set_size {
319 my ($self, $w, $h) = @_; 327 my ($self, $w, $h) = @_;
320 328
321 $self->{def_w} = $w; 329 $self->{force_w} = $w;
322 $self->{def_h} = $h; 330 $self->{force_h} = $h;
323 331
324 $self->realloc; 332 $self->realloc;
325} 333}
326 334
327sub size_request { 335sub size_request {
… …
331 339
332sub configure { 340sub configure {
333 my ($self, $x, $y, $w, $h) = @_; 341 my ($self, $x, $y, $w, $h) = @_;
334 342
335 if ($self->{aspect}) { 343 if ($self->{aspect}) {
344 my ($ow, $oh) = ($w, $h);
345
336 my $w2 = List::Util::min $w, int $h * $self->{aspect}; 346 $w = List::Util::min $w, int $h * $self->{aspect};
337 my $h2 = List::Util::min $h, int $w / $self->{aspect}; 347 $h = List::Util::min $h, int $w / $self->{aspect};
338 348
339 # use alignment to adjust x, y 349 # use alignment to adjust x, y
340 350
341 $x += int +($w - $w2) * 0.5; 351 $x += int 0.5 * ($ow - $w);
342 $y += int +($h - $h2) * 0.5; 352 $y += int 0.5 * ($oh - $h);
343
344 ($w, $h) = ($w2, $h2);
345 } 353 }
346 354
347 if ($self->{x} != $x || $self->{y} != $y) { 355 if ($self->{x} ne $x || $self->{y} ne $y) {
348 $self->{x} = $x; 356 $self->{x} = $x;
349 $self->{y} = $y; 357 $self->{y} = $y;
350 $self->update; 358 $self->update;
351 } 359 }
352 360
353 if ($self->{w} != $w || $self->{h} != $h) { 361 if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
354 return unless $self->{visible}; 362 return unless $self->{visible};
355 363
364 $self->{alloc_w} = $w;
365 $self->{alloc_h} = $h;
366
356 $self->{root}->{size_alloc}{$self+0} = [$self, $w, $h]; 367 $self->{root}{size_alloc}{$self+0} = $self;
357 } 368 }
358}
359
360sub size_allocate {
361 # nothing to be done
362} 369}
363 370
364sub children { 371sub children {
372 # nop
373}
374
375sub visible_children {
376 $_[0]->children
365} 377}
366 378
367sub set_max_size { 379sub set_max_size {
368 my ($self, $w, $h) = @_; 380 my ($self, $w, $h) = @_;
369 381
370 delete $self->{max_w}; $self->{max_w} = $w if $w; 382 $self->{max_w} = int $w if defined $w;
371 delete $self->{max_h}; $self->{max_h} = $h if $h; 383 $self->{max_h} = int $h if defined $h;
384
385 $self->realloc;
372} 386}
373 387
374sub set_tooltip { 388sub set_tooltip {
375 my ($self, $tooltip) = @_; 389 my ($self, $tooltip) = @_;
376 390
… …
381 395
382 $self->{tooltip} = $tooltip; 396 $self->{tooltip} = $tooltip;
383 397
384 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 398 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
385 delete $CFClient::UI::TOOLTIP->{owner}; 399 delete $CFClient::UI::TOOLTIP->{owner};
386 CFClient::UI::check_tooltip; 400 $CFClient::UI::TOOLTIP_WATCHER->cb->();
387 } 401 }
388} 402}
389 403
390# translate global coordinates to local coordinate system 404# translate global coordinates to local coordinate system
391sub coord2local { 405sub coord2local {
… …
399 my ($self, $x, $y) = @_; 413 my ($self, $x, $y) = @_;
400 414
401 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y}) 415 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
402} 416}
403 417
404sub focus_in { 418sub invoke_focus_in {
405 my ($self) = @_; 419 my ($self) = @_;
406 420
407 return if $FOCUS == $self; 421 return if $FOCUS == $self;
408 return unless $self->{can_focus}; 422 return unless $self->{can_focus};
409 423
410 my $focus = $FOCUS; $FOCUS = $self; 424 my $focus = $FOCUS; $FOCUS = $self;
411 425
412 $self->_emit (focus_in => $focus);
413
414 $focus->update if $focus; 426 $focus->update if $focus;
415 $FOCUS->update; 427 $FOCUS->update;
416}
417 428
429 0
430}
431
418sub focus_out { 432sub invoke_focus_out {
419 my ($self) = @_; 433 my ($self) = @_;
420 434
421 return unless $FOCUS == $self; 435 return unless $FOCUS == $self;
422 436
423 my $focus = $FOCUS; undef $FOCUS; 437 my $focus = $FOCUS; undef $FOCUS;
424 438
425 $self->_emit (focus_out => $focus);
426
427 $focus->update if $focus; #? 439 $focus->update if $focus; #?
428 440
429 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus 441 $::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus
430 unless $FOCUS; 442 unless $FOCUS;
431}
432 443
444 0
445}
446
447sub grab_focus {
448 my ($self) = @_;
449
450 $self->emit ("focus_in");
451}
452
433sub mouse_motion { } 453sub invoke_mouse_motion { 1 }
434sub button_up { } 454sub invoke_button_up { 1 }
435sub key_down { } 455sub invoke_key_down { 1 }
436sub key_up { } 456sub invoke_key_up { 1 }
437 457
438sub button_down { 458sub invoke_button_down {
439 my ($self, $ev, $x, $y) = @_; 459 my ($self, $ev, $x, $y) = @_;
440 460
441 $self->focus_in; 461 $self->grab_focus;
442}
443 462
444sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 463 1
445sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 464}
446sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 465
447sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 466sub connect {
448sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} } 467 my ($self, $signal, $cb) = @_;
468
469 push @{ $self->{signal_cb}{$signal} }, $cb;
470}
471
472sub emit {
473 my ($self, $signal, @args) = @_;
474
475 #d##TODO# stop propagating at first true, do not use sum
476 (List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}) # before
477 || ($self->can ("invoke_$signal") || sub { 1 })->($self, @args) # closure
478 || ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent
479}
449 480
450sub find_widget { 481sub find_widget {
451 my ($self, $x, $y) = @_; 482 my ($self, $x, $y) = @_;
452 483
453 return () unless $self->{can_events}; 484 return () unless $self->{can_events};
… …
461 492
462sub set_parent { 493sub set_parent {
463 my ($self, $parent) = @_; 494 my ($self, $parent) = @_;
464 495
465 Scalar::Util::weaken ($self->{parent} = $parent); 496 Scalar::Util::weaken ($self->{parent} = $parent);
466
467 $self->set_visible if $parent->{visible}; 497 $self->set_visible if $parent->{visible};
468} 498}
469 499
470sub connect {
471 my ($self, $signal, $cb) = @_;
472
473 push @{ $self->{signal_cb}{$signal} }, $cb;
474}
475
476sub _emit {
477 my ($self, $signal, @args) = @_;
478
479 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
480}
481
482sub emit {
483 my ($self, $signal, @args) = @_;
484
485 $self->_emit ($signal, @args)
486 || $self->$signal (@args);
487}
488
489sub visibility_change {
490 #my ($self, $visible) = @_;
491}
492
493sub realloc { 500sub realloc {
494 my ($self) = @_; 501 my ($self) = @_;
495 502
496 if ($self->{visible}) { 503 if ($self->{visible}) {
497 return if $self->{root}{realloc}{$self}; 504 return if $self->{root}{realloc}{$self+0};
498 505
499 $self->{root}{realloc}{$self} = $self; 506 $self->{root}{realloc}{$self+0} = $self;
500 $self->{root}->update; 507 $self->{root}->update;
501 } else { 508 } else {
502 delete $self->{req_w}; 509 delete $self->{req_w};
510 delete $self->{req_h};
503 } 511 }
504} 512}
505 513
506sub update { 514sub update {
507 my ($self) = @_; 515 my ($self) = @_;
508 516
509 $self->{parent}->update 517 $self->{parent}->update
510 if $self->{parent}; 518 if $self->{parent};
511} 519}
512 520
521sub reconfigure {
522 my ($self) = @_;
523
524 $self->realloc;
525 $self->update;
526}
527
528# using global variables seems a bit hacky, but passing through all drawing
529# functions seems pointless.
530our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn
531
513sub draw { 532sub draw {
514 my ($self) = @_; 533 my ($self) = @_;
515 534
516 return unless $self->{h} && $self->{w}; 535 return unless $self->{h} && $self->{w};
536
537 # update screen rectangle
538 local $draw_x = $draw_x + $self->{x};
539 local $draw_y = $draw_y + $self->{y};
540 local $draw_w = $draw_x + $self->{w};
541 local $draw_h = $draw_y + $self->{h};
542
543 # skip widgets that are entirely outside the drawing area
544 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
545 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
517 546
518 glPushMatrix; 547 glPushMatrix;
519 glTranslate $self->{x}, $self->{y}, 0; 548 glTranslate $self->{x}, $self->{y}, 0;
520 $self->_draw;
521 glPopMatrix;
522 549
523 if ($self == $HOVER && $self->{can_hover}) { 550 if ($self == $HOVER && $self->{can_hover}) {
524 my ($x, $y) = @$self{qw(x y)};
525
526 glColor 1, 0.8, 0.5, 0.2; 551 glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
527 glEnable GL_BLEND; 552 glEnable GL_BLEND;
528 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 553 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
529 glBegin GL_QUADS; 554 glBegin GL_QUADS;
530 glVertex $x , $y; 555 glVertex 0 , 0;
531 glVertex $x + $self->{w}, $y; 556 glVertex $self->{w}, 0;
532 glVertex $x + $self->{w}, $y + $self->{h}; 557 glVertex $self->{w}, $self->{h};
533 glVertex $x , $y + $self->{h}; 558 glVertex 0 , $self->{h};
534 glEnd; 559 glEnd;
535 glDisable GL_BLEND; 560 glDisable GL_BLEND;
536 } 561 }
537 562
538 if ($ENV{PCLIENT_DEBUG}) { 563 if ($ENV{CFPLUS_DEBUG} & 1) {
539 glPushMatrix; 564 glPushMatrix;
540 glColor 1, 1, 0, 1; 565 glColor 1, 1, 0, 1;
541 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 566 glTranslate 0.375, 0.375;
542 glBegin GL_LINE_LOOP; 567 glBegin GL_LINE_LOOP;
543 glVertex 0 , 0; 568 glVertex 0 , 0;
544 glVertex $self->{w} - 1, 0; 569 glVertex $self->{w} - 1, 0;
545 glVertex $self->{w} - 1, $self->{h} - 1; 570 glVertex $self->{w} - 1, $self->{h} - 1;
546 glVertex 0 , $self->{h} - 1; 571 glVertex 0 , $self->{h} - 1;
547 glEnd; 572 glEnd;
548 glPopMatrix; 573 glPopMatrix;
549 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 574 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
550 } 575 }
576
577 $self->_draw;
578 glPopMatrix;
551} 579}
552 580
553sub _draw { 581sub _draw {
554 my ($self) = @_; 582 my ($self) = @_;
555 583
… …
558 586
559sub DESTROY { 587sub DESTROY {
560 my ($self) = @_; 588 my ($self) = @_;
561 589
562 delete $WIDGET{$self+0}; 590 delete $WIDGET{$self+0};
563 #$self->deactivate; 591
592 eval { $self->destroy };
593 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
564} 594}
565 595
566############################################################################# 596#############################################################################
567 597
568package CFClient::UI::DrawBG; 598package CFClient::UI::DrawBG;
… …
593 623
594 if ($color && (@$color < 4 || $color->[3])) { 624 if ($color && (@$color < 4 || $color->[3])) {
595 my ($w, $h) = @$self{qw(w h)}; 625 my ($w, $h) = @$self{qw(w h)};
596 626
597 glEnable GL_BLEND; 627 glEnable GL_BLEND;
598 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 628 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
599 glColor @$color; 629 glColor_premultiply @$color;
600 630
601 glBegin GL_QUADS; 631 glBegin GL_QUADS;
602 glVertex 0 , 0; 632 glVertex 0 , 0;
603 glVertex 0 , $h; 633 glVertex 0 , $h;
604 glVertex $w, $h; 634 glVertex $w, $h;
… …
619 my ($class, %arg) = @_; 649 my ($class, %arg) = @_;
620 $class->SUPER::new (can_events => 0, %arg); 650 $class->SUPER::new (can_events => 0, %arg);
621} 651}
622 652
623sub size_request { 653sub size_request {
624 (0, 0) 654 my ($self) = @_;
655
656 ($self->{w} + 0, $self->{h} + 0)
625} 657}
626 658
627sub draw { } 659sub draw { }
628 660
629############################################################################# 661#############################################################################
… …
633our @ISA = CFClient::UI::Base::; 665our @ISA = CFClient::UI::Base::;
634 666
635sub new { 667sub new {
636 my ($class, %arg) = @_; 668 my ($class, %arg) = @_;
637 669
638 my $children = delete $arg{children} || []; 670 my $children = delete $arg{children};
639 671
640 my $self = $class->SUPER::new ( 672 my $self = $class->SUPER::new (
641 children => [], 673 children => [],
642 can_events => 0, 674 can_events => 0,
643 %arg, 675 %arg,
644 ); 676 );
677
645 $self->add ($_) for @$children; 678 $self->add (@$children)
679 if $children;
646 680
647 $self 681 $self
648} 682}
649 683
650sub add { 684sub add {
… …
698 $x -= $self->{x}; 732 $x -= $self->{x};
699 $y -= $self->{y}; 733 $y -= $self->{y};
700 734
701 my $res; 735 my $res;
702 736
703 for (reverse @{ $self->{children} }) { 737 for (reverse $self->visible_children) {
704 $res = $_->find_widget ($x, $y) 738 $res = $_->find_widget ($x, $y)
705 and return $res; 739 and return $res;
706 } 740 }
707 741
708 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y}) 742 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
… …
729} 763}
730 764
731sub add { 765sub add {
732 my ($self, $child) = @_; 766 my ($self, $child) = @_;
733 767
734 $self->{children} = []; 768 $self->SUPER::remove ($_) for @{ $self->{children} };
735
736 $self->SUPER::add ($child); 769 $self->SUPER::add ($child);
737} 770}
738 771
739sub remove { 772sub remove {
740 my ($self, $widget) = @_; 773 my ($self, $widget) = @_;
… …
749 782
750sub size_request { 783sub size_request {
751 $_[0]{children}[0]->size_request 784 $_[0]{children}[0]->size_request
752} 785}
753 786
754sub size_allocate { 787sub invoke_size_allocate {
755 my ($self, $w, $h, $changed) = @_; 788 my ($self, $w, $h) = @_;
756 789
757 $self->{children}[0]->configure (0, 0, $w, $h); 790 $self->{children}[0]->configure (0, 0, $w, $h);
791
792 1
758} 793}
759 794
760############################################################################# 795#############################################################################
796
797# back-buffered drawing area
761 798
762package CFClient::UI::Window; 799package CFClient::UI::Window;
763 800
764our @ISA = CFClient::UI::Bin::; 801our @ISA = CFClient::UI::Bin::;
765 802
… …
776 813
777 $ROOT->on_post_alloc ($self => sub { $self->render_child }); 814 $ROOT->on_post_alloc ($self => sub { $self->render_child });
778 $self->SUPER::update; 815 $self->SUPER::update;
779} 816}
780 817
781sub size_allocate { 818sub invoke_size_allocate {
782 my ($self, $w, $h, $changed) = @_; 819 my ($self, $w, $h) = @_;
783 820
784 $self->SUPER::size_allocate ($w, $h, $changed);
785 $self->update 821 $self->update;
786 if $changed; 822
823 $self->SUPER::invoke_size_allocate ($w, $h)
787} 824}
788 825
789sub _render { 826sub _render {
827 my ($self) = @_;
828
790 $_[0]{children}[0]->draw; 829 $self->{children}[0]->draw;
791} 830}
792 831
793sub render_child { 832sub render_child {
794 my ($self) = @_; 833 my ($self) = @_;
795 834
796 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 835 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
797 glClearColor 0, 0, 0, 0; 836 glClearColor 0, 0, 0, 0;
798 glClear GL_COLOR_BUFFER_BIT; 837 glClear GL_COLOR_BUFFER_BIT;
799 838
839 {
840 package CFClient::UI::Base;
841
842 ($draw_x, $draw_y, $draw_w, $draw_h) =
843 (0, 0, $self->{w}, $self->{h});
844 }
845
800 $self->_render; 846 $self->_render;
801 }; 847 };
802} 848}
803 849
804sub _draw { 850sub _draw {
805 my ($self) = @_; 851 my ($self) = @_;
806 852
807 my ($w, $h) = ($self->w, $self->h); 853 my ($w, $h) = @$self{qw(w h)};
808 854
809 my $tex = $self->{texture} 855 my $tex = $self->{texture}
810 or return; 856 or return;
811 857
812 glEnable GL_TEXTURE_2D; 858 glEnable GL_TEXTURE_2D;
813 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 859 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
814 glColor 1, 1, 1, 1; 860 glColor 0, 0, 0, 1;
815 861
816 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 862 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
817 863
818 glDisable GL_TEXTURE_2D; 864 glDisable GL_TEXTURE_2D;
819} 865}
… …
835} 881}
836 882
837sub size_request { 883sub size_request {
838 my ($self) = @_; 884 my ($self) = @_;
839 885
840 my ($w, $h) = @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 886 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
841 887
842 $w = 10 if $self->{scroll_x}; 888 $w = 10 if $self->{scroll_x};
843 $h = 10 if $self->{scroll_y}; 889 $h = 10 if $self->{scroll_y};
844 890
845 ($w, $h) 891 ($w, $h)
846} 892}
847 893
848sub size_allocate { 894sub invoke_size_allocate {
849 my ($self, $w, $h, $changed) = @_; 895 my ($self, $w, $h) = @_;
850 896
897 my $child = $self->child;
898
851 $w = $self->{child_w} if $self->{scroll_x} && $self->{child_w}; 899 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
852 $h = $self->{child_h} if $self->{scroll_y} && $self->{child_h}; 900 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
853 901
854 $self->child->configure (0, 0, $w, $h); 902 $self->child->configure (0, 0, $w, $h);
855 $self->update; 903 $self->update;
904
905 1
856} 906}
857 907
858sub set_offset { 908sub set_offset {
859 my ($self, $x, $y) = @_; 909 my ($self, $x, $y) = @_;
860 910
… …
893} 943}
894 944
895sub _render { 945sub _render {
896 my ($self) = @_; 946 my ($self) = @_;
897 947
948 local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};
949 local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y};
950
898 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 951 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
899 952
900 $self->SUPER::_render; 953 $self->SUPER::_render;
901} 954}
902 955
… …
905package CFClient::UI::ScrolledWindow; 958package CFClient::UI::ScrolledWindow;
906 959
907our @ISA = CFClient::UI::HBox::; 960our @ISA = CFClient::UI::HBox::;
908 961
909sub new { 962sub new {
910 my $class = shift; 963 my ($class, %arg) = @_;
964
965 my $child = delete $arg{child};
911 966
912 my $self; 967 my $self;
913 968
914 my $slider = new CFClient::UI::Slider 969 my $slider = new CFClient::UI::Slider
915 vertical => 1, 970 vertical => 1,
… …
920 ; 975 ;
921 976
922 $self = $class->SUPER::new ( 977 $self = $class->SUPER::new (
923 vp => (new CFClient::UI::ViewPort expand => 1), 978 vp => (new CFClient::UI::ViewPort expand => 1),
924 slider => $slider, 979 slider => $slider,
925 @_, 980 %arg,
926 ); 981 );
927 982
928 $self->{vp}->add ($self->{scrolled});
929 $self->add ($self->{vp});
930 $self->add ($self->{slider}); 983 $self->SUPER::add ($self->{vp}, $self->{slider});
984 $self->add ($child) if $child;
931 985
932 $self 986 $self
987}
988
989sub add {
990 my ($self, $widget) = @_;
991
992 $self->{vp}->add ($self->{child} = $widget);
933} 993}
934 994
935sub update { 995sub update {
936 my ($self) = @_; 996 my ($self) = @_;
937 997
… …
940 # todo: overwrite size_allocate of child 1000 # todo: overwrite size_allocate of child
941 my $child = $self->{vp}->child; 1001 my $child = $self->{vp}->child;
942 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]); 1002 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
943} 1003}
944 1004
945sub size_allocate { 1005sub invoke_size_allocate {
946 my ($self, $w, $h, $changed) = @_; 1006 my ($self, $w, $h) = @_;
947
948 $self->SUPER::size_allocate ($w, $h, $changed);
949 1007
950 my $child = $self->{vp}->child; 1008 my $child = $self->{vp}->child;
951 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]); 1009 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1010
1011 $self->SUPER::invoke_size_allocate ($w, $h)
952} 1012}
953 1013
954#TODO# update range on size_allocate depending on child 1014#TODO# update range on size_allocate depending on child
955# update viewport offset on scroll 1015# update viewport offset on scroll
956 1016
… …
976 1036
977 if ($self->{bg}) { 1037 if ($self->{bg}) {
978 my ($w, $h) = @$self{qw(w h)}; 1038 my ($w, $h) = @$self{qw(w h)};
979 1039
980 glEnable GL_BLEND; 1040 glEnable GL_BLEND;
981 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1041 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
982 glColor @{ $self->{bg} }; 1042 glColor_premultiply @{ $self->{bg} };
983 1043
984 glBegin GL_QUADS; 1044 glBegin GL_QUADS;
985 glVertex 0 , 0; 1045 glVertex 0 , 0;
986 glVertex 0 , $h; 1046 glVertex 0 , $h;
987 glVertex $w, $h; 1047 glVertex $w, $h;
… …
1000 1060
1001our @ISA = CFClient::UI::Bin::; 1061our @ISA = CFClient::UI::Bin::;
1002 1062
1003use CFClient::OpenGL; 1063use CFClient::OpenGL;
1004 1064
1005my @tex = 1065my $bg =
1066 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1067 mipmap => 1, wrap => 1;
1068
1069my @border =
1006 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1070 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1007 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1071 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1008 1072
1009sub new { 1073sub new {
1010 my $class = shift; 1074 my ($class, %arg) = @_;
1011 1075
1012 my $self = $class->SUPER::new ( 1076 my $self = $class->SUPER::new (
1013 bg => [1, 1, 1, 1], 1077 bg => [1, 1, 1, 1],
1014 border_bg => [1, 1, 1, 1], 1078 border_bg => [1, 1, 1, 1],
1015 border => 0.6, 1079 border => 0.6,
1016 is_toplevel => 1,
1017 can_events => 1, 1080 can_events => 1,
1018 @_ 1081 min_w => 16,
1082 min_h => 16,
1083 %arg,
1019 ); 1084 );
1020 1085
1021 $self->{title} &&= new CFClient::UI::Label 1086 $self->{title_widget} = new CFClient::UI::Label
1022 align => 0, 1087 align => 0,
1023 valign => 1, 1088 valign => 1,
1024 text => $self->{title}, 1089 text => $self->{title},
1025 fontsize => $self->{border}; 1090 fontsize => $self->{border},
1091 if exists $self->{title};
1092
1093 if ($self->{has_close_button}) {
1094 $self->{close_button} =
1095 new CFClient::UI::ImageButton
1096 image => 'x1_close.png',
1097 on_activate => sub { $self->hide };
1098
1099 $self->CFClient::UI::Container::add ($self->{close_button});
1100 }
1026 1101
1027 $self 1102 $self
1103}
1104
1105sub add {
1106 my ($self, @widgets) = @_;
1107
1108 $self->SUPER::add (@widgets);
1109 $self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button};
1110 $self->CFClient::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1028} 1111}
1029 1112
1030sub border { 1113sub border {
1031 int $_[0]{border} * $::FONTSIZE 1114 int $_[0]{border} * $::FONTSIZE
1032} 1115}
1033 1116
1034sub size_request { 1117sub size_request {
1035 my ($self) = @_; 1118 my ($self) = @_;
1119
1120 $self->{title_widget}->size_request
1121 if $self->{title_widget};
1122
1123 $self->{close_button}->size_request
1124 if $self->{close_button};
1036 1125
1037 my ($w, $h) = $self->SUPER::size_request; 1126 my ($w, $h) = $self->SUPER::size_request;
1038 1127
1039 ( 1128 (
1040 $w + $self->border * 2, 1129 $w + $self->border * 2,
1041 $h + $self->border * 2, 1130 $h + $self->border * 2,
1042 ) 1131 )
1043} 1132}
1044 1133
1045sub size_allocate { 1134sub invoke_size_allocate {
1046 my ($self, $w, $h, $changed) = @_; 1135 my ($self, $w, $h) = @_;
1047 1136
1048 return unless $changed; 1137 if ($self->{title_widget}) {
1138 $self->{title_widget}{w} = $w;
1139 $self->{title_widget}{h} = $h;
1140 $self->{title_widget}->invoke_size_allocate ($w, $h);
1141 }
1049 1142
1143 my $border = $self->border;
1144
1050 $h -= List::Util::max 0, $self->border * 2; 1145 $h -= List::Util::max 0, $border * 2;
1051 $w -= List::Util::max 0, $self->border * 2; 1146 $w -= List::Util::max 0, $border * 2;
1052 1147
1053 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
1054 if $self->{title};
1055
1056 $self->child->configure ($self->border, $self->border, $w, $h); 1148 $self->child->configure ($border, $border, $w, $h);
1057}
1058 1149
1150 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1151 if $self->{close_button};
1152
1153 1
1154}
1155
1059sub button_down { 1156sub invoke_button_down {
1060 my ($self, $ev, $x, $y) = @_; 1157 my ($self, $ev, $x, $y) = @_;
1061 1158
1062 my ($w, $h) = @$self{qw(w h)}; 1159 my ($w, $h) = @$self{qw(w h)};
1063 my $border = $self->border; 1160 my $border = $self->border;
1064 1161
… …
1077 my ($ev, $x, $y) = @_; 1174 my ($ev, $x, $y) = @_;
1078 1175
1079 my $dx = $ev->{x} - $ox; 1176 my $dx = $ev->{x} - $ox;
1080 my $dy = $ev->{y} - $oy; 1177 my $dy = $ev->{y} - $oy;
1081 1178
1082 $self->{user_x} = $wx + $dx * $mx;
1083 $self->{user_y} = $wy + $dy * $my;
1084 $self->{def_w} = $bw + $dx * ($mx ? -1 : 1); 1179 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1085 $self->{def_h} = $bh + $dy * ($my ? -1 : 1); 1180 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1086 $self->move ($self->{user_x}, $self->{user_y}); 1181
1182 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1087 $self->realloc; 1183 $self->realloc;
1088 }; 1184 };
1089 1185
1090 } elsif ($lr ^ $td) { 1186 } elsif ($lr ^ $td) {
1091 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1187 my ($ox, $oy) = ($ev->{x}, $ev->{y});
… …
1094 $self->{motion} = sub { 1190 $self->{motion} = sub {
1095 my ($ev, $x, $y) = @_; 1191 my ($ev, $x, $y) = @_;
1096 1192
1097 ($x, $y) = ($ev->{x}, $ev->{y}); 1193 ($x, $y) = ($ev->{x}, $ev->{y});
1098 1194
1099 $self->{user_x} = $bx + $x - $ox; 1195 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1100 $self->{user_y} = $by + $y - $oy; 1196 # HACK: the next line is required to enforce placement
1101 1197 $self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
1102 $self->move ($self->{user_x}, $self->{user_y});
1103 $self->realloc;
1104 }; 1198 };
1199 } else {
1200 return 0;
1201 }
1202
1105 } 1203 1
1106} 1204}
1107 1205
1108sub button_up { 1206sub invoke_button_up {
1109 my ($self, $ev, $x, $y) = @_; 1207 my ($self, $ev, $x, $y) = @_;
1110 1208
1111 delete $self->{motion}; 1209 ! ! delete $self->{motion}
1112} 1210}
1113 1211
1114sub mouse_motion { 1212sub invoke_mouse_motion {
1115 my ($self, $ev, $x, $y) = @_; 1213 my ($self, $ev, $x, $y) = @_;
1116 1214
1117 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1215 $self->{motion}->($ev, $x, $y) if $self->{motion};
1216
1217 ! ! $self->{motion}
1118} 1218}
1119 1219
1120sub _draw { 1220sub _draw {
1121 my ($self) = @_; 1221 my ($self) = @_;
1122 1222
1223 my $child = $self->{children}[0];
1224
1123 my ($w, $h ) = ($self->{w}, $self->{h}); 1225 my ($w, $h ) = ($self->{w}, $self->{h});
1124 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1226 my ($cw, $ch) = ($child->{w}, $child->{h});
1125 1227
1126 glEnable GL_TEXTURE_2D; 1228 glEnable GL_TEXTURE_2D;
1127 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1229 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1128 1230
1129 my $border = $self->border; 1231 my $border = $self->border;
1130 1232
1131 glColor @{ $self->{border_bg} }; 1233 glColor @{ $self->{border_bg} };
1132 $tex[1]->draw_quad_alpha (0, 0, $w, $border); 1234 $border[0]->draw_quad_alpha (0, 0, $w, $border);
1133 $tex[3]->draw_quad_alpha (0, $border, $border, $ch); 1235 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
1134 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1236 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1135 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border); 1237 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
1136 1238
1137 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1239 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1138 my $bg = $tex[0]; 1240 glColor @{ $self->{bg} };
1139 1241
1140 # TODO: repeat texture not scale 1242 # TODO: repeat texture not scale
1243 # solve this better(?)
1141 my $rep_x = $cw / $bg->{w}; 1244 $bg->{s} = $cw / $bg->{w};
1142 my $rep_y = $ch / $bg->{h}; 1245 $bg->{t} = $ch / $bg->{h};
1143
1144 glColor @{ $self->{bg} };
1145
1146 $bg->{s} = $rep_x;
1147 $bg->{t} = $rep_y;
1148 $bg->{wrap_mode} = 1;
1149 $bg->draw_quad_alpha ($border, $border, $cw, $ch); 1246 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1150 } 1247 }
1151 1248
1152 glDisable GL_TEXTURE_2D; 1249 glDisable GL_TEXTURE_2D;
1153 1250
1154 $self->{title}->draw if $self->{title};
1155
1156 $self->child->draw; 1251 $child->draw;
1252
1253 if ($self->{title_widget}) {
1254 glTranslate 0, $border - $self->{h};
1255 $self->{title_widget}->_draw;
1256
1257 glTranslate 0, - ($border - $self->{h});
1258 }
1259
1260 $self->{close_button}->draw
1261 if $self->{close_button};
1157} 1262}
1158 1263
1159############################################################################# 1264#############################################################################
1160 1265
1161package CFClient::UI::Table; 1266package CFClient::UI::Table;
… …
1184 1289
1185 $child->set_parent ($self); 1290 $child->set_parent ($self);
1186 $self->{children}[$y][$x] = $child; 1291 $self->{children}[$y][$x] = $child;
1187 1292
1188 $self->realloc; 1293 $self->realloc;
1294}
1295
1296sub remove {
1297 my ($self, $child) = @_;
1298
1299 # TODO: not yet implemented
1189} 1300}
1190 1301
1191# TODO: move to container class maybe? send children a signal on removal? 1302# TODO: move to container class maybe? send children a signal on removal?
1192sub clear { 1303sub clear {
1193 my ($self) = @_; 1304 my ($self) = @_;
… …
1234 (sum @$ws), 1345 (sum @$ws),
1235 (sum @$hs), 1346 (sum @$hs),
1236 ) 1347 )
1237} 1348}
1238 1349
1239sub size_allocate { 1350sub invoke_size_allocate {
1240 my ($self, $w, $h, $changed) = @_; 1351 my ($self, $w, $h) = @_;
1241 1352
1242 my ($ws, $hs) = $self->get_wh; 1353 my ($ws, $hs) = $self->get_wh;
1243 1354
1244 my $req_w = (sum @$ws) || 1; 1355 my $req_w = (sum @$ws) || 1;
1245 my $req_h = (sum @$hs) || 1; 1356 my $req_h = (sum @$hs) || 1;
… …
1276 } 1387 }
1277 1388
1278 $y += $row_h; 1389 $y += $row_h;
1279 } 1390 }
1280 1391
1392 1
1281} 1393}
1282 1394
1283sub find_widget { 1395sub find_widget {
1284 my ($self, $x, $y) = @_; 1396 my ($self, $x, $y) = @_;
1285 1397
… …
1322 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1434 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1323 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1435 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1324 ) 1436 )
1325} 1437}
1326 1438
1327sub size_allocate { 1439sub invoke_size_allocate {
1328 my ($self, $w, $h, $changed) = @_; 1440 my ($self, $w, $h) = @_;
1329 1441
1330 my $space = $self->{vertical} ? $h : $w; 1442 my $space = $self->{vertical} ? $h : $w;
1331 my $children = $self->{children}; 1443 my $children = $self->{children};
1332 1444
1333 my @req; 1445 my @req;
… …
1416 ellipsise => 3, # end 1528 ellipsise => 3, # end
1417 layout => (new CFClient::Layout), 1529 layout => (new CFClient::Layout),
1418 fontsize => 1, 1530 fontsize => 1,
1419 align => -1, 1531 align => -1,
1420 valign => -1, 1532 valign => -1,
1421 padding => 2, 1533 padding_x => 2,
1534 padding_y => 2,
1422 can_events => 0, 1535 can_events => 0,
1423 %arg 1536 %arg
1424 ); 1537 );
1425 1538
1426 if (exists $self->{template}) { 1539 if (exists $self->{template}) {
… …
1453 1566
1454 delete $self->{texture}; 1567 delete $self->{texture};
1455 $self->SUPER::update; 1568 $self->SUPER::update;
1456} 1569}
1457 1570
1571sub realloc {
1572 my ($self) = @_;
1573
1574 delete $self->{ox};
1575 $self->SUPER::realloc;
1576}
1577
1458sub set_text { 1578sub set_text {
1459 my ($self, $text) = @_; 1579 my ($self, $text) = @_;
1460 1580
1461 return if $self->{text} eq "T$text"; 1581 return if $self->{text} eq "T$text";
1462 $self->{text} = "T$text"; 1582 $self->{text} = "T$text";
1463 1583
1464 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1584 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1465 $self->{layout}->set_text ($text); 1585 $self->{layout}->set_text ($text);
1466 1586
1587 delete $self->{size_req};
1467 $self->realloc; 1588 $self->realloc;
1468 $self->update; 1589 $self->update;
1469} 1590}
1470 1591
1471sub set_markup { 1592sub set_markup {
… …
1477 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1598 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1478 1599
1479 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba; 1600 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1480 $self->{layout}->set_markup ($markup); 1601 $self->{layout}->set_markup ($markup);
1481 1602
1603 delete $self->{size_req};
1482 $self->realloc; 1604 $self->realloc;
1483 $self->update; 1605 $self->update;
1484} 1606}
1485 1607
1486sub size_request { 1608sub size_request {
1487 my ($self) = @_; 1609 my ($self) = @_;
1488 1610
1611 $self->{size_req} ||= do {
1489 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1612 $self->{layout}->set_font ($self->{font}) if $self->{font};
1490 $self->{layout}->set_width ($self->{max_w} || -1); 1613 $self->{layout}->set_width ($self->{max_w} || -1);
1491 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1614 $self->{layout}->set_ellipsise ($self->{ellipsise});
1492 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1615 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1493 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1616 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1494 1617
1495 my ($w, $h) = $self->{layout}->size; 1618 my ($w, $h) = $self->{layout}->size;
1496 1619
1497 if (exists $self->{template}) { 1620 if (exists $self->{template}) {
1498 $self->{template}->set_font ($self->{font}) if $self->{font}; 1621 $self->{template}->set_font ($self->{font}) if $self->{font};
1499 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1622 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1500 1623
1501 my ($w2, $h2) = $self->{template}->size; 1624 my ($w2, $h2) = $self->{template}->size;
1502 1625
1503 $w = List::Util::max $w, $w2; 1626 $w = List::Util::max $w, $w2;
1504 $h = List::Util::max $h, $h2; 1627 $h = List::Util::max $h, $h2;
1628 }
1629
1630 [$w, $h]
1505 } 1631 };
1506 1632
1507 ( 1633 @{ $self->{size_req} }
1508 $w + $self->{padding} * 2,
1509 $h + $self->{padding} * 2,
1510 )
1511} 1634}
1512 1635
1513sub size_allocate { 1636sub invoke_size_allocate {
1514 my ($self, $w, $h, $changed) = @_; 1637 my ($self, $w, $h) = @_;
1638
1639 delete $self->{ox};
1515 1640
1516 delete $self->{texture} 1641 delete $self->{texture}
1517 if $changed; 1642 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1643
1644 1
1518} 1645}
1519 1646
1520sub set_fontsize { 1647sub set_fontsize {
1521 my ($self, $fontsize) = @_; 1648 my ($self, $fontsize) = @_;
1522 1649
1523 $self->{fontsize} = $fontsize; 1650 $self->{fontsize} = $fontsize;
1524 delete $self->{texture}; 1651 delete $self->{texture};
1525 1652
1526 $self->realloc; 1653 $self->realloc;
1654}
1655
1656sub reconfigure {
1657 my ($self) = @_;
1658
1659 delete $self->{size_req};
1660
1661 $self->SUPER::reconfigure;
1527} 1662}
1528 1663
1529sub _draw { 1664sub _draw {
1530 my ($self) = @_; 1665 my ($self) = @_;
1531 1666
… …
1537 $self->{layout}->set_width ($self->{w}); 1672 $self->{layout}->set_width ($self->{w});
1538 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1673 $self->{layout}->set_ellipsise ($self->{ellipsise});
1539 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1674 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1540 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1675 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1541 1676
1542 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1677 new_from_layout CFClient::Texture $self->{layout}
1678 };
1543 1679
1680 unless (exists $self->{ox}) {
1544 $self->{ox} = int ($self->{align} < 0 ? $self->{padding} 1681 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1545 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1682 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1546 : ($self->{w} - $tex->{w}) * 0.5); 1683 : ($self->{w} - $tex->{w}) * 0.5);
1547 1684
1548 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding} 1685 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1549 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding} 1686 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1550 : ($self->{h} - $tex->{h}) * 0.5); 1687 : ($self->{h} - $tex->{h}) * 0.5);
1551
1552 $tex
1553 }; 1688 };
1554 1689
1555 glEnable GL_TEXTURE_2D; 1690 glEnable GL_TEXTURE_2D;
1556 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1691
1692 my $w = List::Util::min $self->{w} + 4, $tex->{w};
1693 my $h = List::Util::min $self->{h} + 2, $tex->{h};
1557 1694
1558 if ($tex->{format} == GL_ALPHA) { 1695 if ($tex->{format} == GL_ALPHA) {
1696 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1559 glColor @{$self->{fg}}; 1697 glColor @{$self->{fg}};
1560 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}); 1698 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}, $w, $h);
1561 } else { 1699 } else {
1700 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1562 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}); 1701 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}, $w, $h);
1563 } 1702 }
1564 1703
1565 glDisable GL_TEXTURE_2D; 1704 glDisable GL_TEXTURE_2D;
1566} 1705}
1567 1706
… …
1584 can_hover => 1, 1723 can_hover => 1,
1585 can_focus => 1, 1724 can_focus => 1,
1586 valign => 0, 1725 valign => 0,
1587 can_events => 1, 1726 can_events => 1,
1588 #text => ... 1727 #text => ...
1728 #hidden => "*",
1589 @_ 1729 @_
1590 ) 1730 )
1591} 1731}
1592 1732
1593sub _set_text { 1733sub _set_text {
… …
1595 1735
1596 delete $self->{cur_h}; 1736 delete $self->{cur_h};
1597 1737
1598 return if $self->{text} eq $text; 1738 return if $self->{text} eq $text;
1599 1739
1600 delete $self->{texture};
1601
1602 $self->{last_activity} = $::NOW; 1740 $self->{last_activity} = $::NOW;
1603 $self->{text} = $text; 1741 $self->{text} = $text;
1604 1742
1605 $text =~ s/./*/g if $self->{hidden}; 1743 $text =~ s/./*/g if $self->{hidden};
1606 $self->{layout}->set_text ("$text "); 1744 $self->{layout}->set_text ("$text ");
1745 delete $self->{size_req};
1607 1746
1608 $self->_emit (changed => $self->{text}); 1747 $self->emit (changed => $self->{text});
1748
1749 $self->realloc;
1750 $self->update;
1609} 1751}
1610 1752
1611sub set_text { 1753sub set_text {
1612 my ($self, $text) = @_; 1754 my ($self, $text) = @_;
1613 1755
1614 $self->{cursor} = length $text; 1756 $self->{cursor} = length $text;
1615 $self->_set_text ($text); 1757 $self->_set_text ($text);
1616
1617 $self->realloc;
1618} 1758}
1619 1759
1620sub get_text { 1760sub get_text {
1621 $_[0]{text} 1761 $_[0]{text}
1622} 1762}
… …
1627 my ($w, $h) = $self->SUPER::size_request; 1767 my ($w, $h) = $self->SUPER::size_request;
1628 1768
1629 ($w + 1, $h) # add 1 for cursor 1769 ($w + 1, $h) # add 1 for cursor
1630} 1770}
1631 1771
1632sub key_down { 1772sub invoke_key_down {
1633 my ($self, $ev) = @_; 1773 my ($self, $ev) = @_;
1634 1774
1635 my $mod = $ev->{mod}; 1775 my $mod = $ev->{mod};
1636 my $sym = $ev->{sym}; 1776 my $sym = $ev->{sym};
1637 my $uni = $ev->{unicode}; 1777 my $uni = $ev->{unicode};
… …
1649 } elsif ($sym == CFClient::SDLK_HOME) { 1789 } elsif ($sym == CFClient::SDLK_HOME) {
1650 $self->{cursor} = 0; 1790 $self->{cursor} = 0;
1651 } elsif ($sym == CFClient::SDLK_END) { 1791 } elsif ($sym == CFClient::SDLK_END) {
1652 $self->{cursor} = length $text; 1792 $self->{cursor} = length $text;
1653 } elsif ($uni == 27) { 1793 } elsif ($uni == 27) {
1654 $self->_emit ('escape'); 1794 $self->emit ('escape');
1655 } elsif ($uni) { 1795 } elsif ($uni) {
1656 substr $text, $self->{cursor}++, 0, chr $uni; 1796 substr $text, $self->{cursor}++, 0, chr $uni;
1797 } else {
1798 return 0;
1657 } 1799 }
1658 1800
1659 $self->_set_text ($text); 1801 $self->_set_text ($text);
1660 1802
1661 $self->realloc; 1803 $self->realloc;
1662}
1663 1804
1805 1
1806}
1807
1664sub focus_in { 1808sub invoke_focus_in {
1665 my ($self) = @_; 1809 my ($self) = @_;
1666 1810
1667 $self->{last_activity} = $::NOW; 1811 $self->{last_activity} = $::NOW;
1668 1812
1669 $self->SUPER::focus_in; 1813 $self->SUPER::invoke_focus_in
1670} 1814}
1671 1815
1672sub button_down { 1816sub invoke_button_down {
1673 my ($self, $ev, $x, $y) = @_; 1817 my ($self, $ev, $x, $y) = @_;
1674 1818
1675 $self->SUPER::button_down ($ev, $x, $y); 1819 $self->SUPER::invoke_button_down ($ev, $x, $y);
1676 1820
1677 my $idx = $self->{layout}->xy_to_index ($x, $y); 1821 my $idx = $self->{layout}->xy_to_index ($x, $y);
1678 1822
1679 # byte-index to char-index 1823 # byte-index to char-index
1680 my $text = $self->{text}; 1824 my $text = $self->{text};
1681 utf8::encode $text; 1825 utf8::encode $text;
1682 $self->{cursor} = length substr $text, 0, $idx; 1826 $self->{cursor} = length substr $text, 0, $idx;
1683 1827
1684 $self->_set_text ($self->{text}); 1828 $self->_set_text ($self->{text});
1685 $self->update; 1829 $self->update;
1830
1831 1
1686} 1832}
1687 1833
1688sub mouse_motion { 1834sub invoke_mouse_motion {
1689 my ($self, $ev, $x, $y) = @_; 1835 my ($self, $ev, $x, $y) = @_;
1690# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 1836# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1837
1838 1
1691} 1839}
1692 1840
1693sub _draw { 1841sub _draw {
1694 my ($self) = @_; 1842 my ($self) = @_;
1695 1843
1696 local $self->{fg} = $self->{fg}; 1844 local $self->{fg} = $self->{fg};
1697 1845
1698 if ($FOCUS == $self) { 1846 if ($FOCUS == $self) {
1699 glColor @{$self->{active_bg}}; 1847 glColor_premultiply @{$self->{active_bg}};
1700 $self->{fg} = $self->{active_fg}; 1848 $self->{fg} = $self->{active_fg};
1701 } else { 1849 } else {
1702 glColor @{$self->{bg}}; 1850 glColor_premultiply @{$self->{bg}};
1703 } 1851 }
1704 1852
1705 glEnable GL_BLEND; 1853 glEnable GL_BLEND;
1706 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1854 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1707 glBegin GL_QUADS; 1855 glBegin GL_QUADS;
1708 glVertex 0 , 0; 1856 glVertex 0 , 0;
1709 glVertex 0 , $self->{h}; 1857 glVertex 0 , $self->{h};
1710 glVertex $self->{w}, $self->{h}; 1858 glVertex $self->{w}, $self->{h};
1711 glVertex $self->{w}, 0; 1859 glVertex $self->{w}, 0;
… …
1736 1884
1737our @ISA = CFClient::UI::EntryBase::; 1885our @ISA = CFClient::UI::EntryBase::;
1738 1886
1739use CFClient::OpenGL; 1887use CFClient::OpenGL;
1740 1888
1741sub key_down { 1889sub invoke_key_down {
1742 my ($self, $ev) = @_; 1890 my ($self, $ev) = @_;
1743 1891
1744 my $sym = $ev->{sym}; 1892 my $sym = $ev->{sym};
1745 1893
1746 if ($sym == 13) { 1894 if ($sym == 13) {
1747 unshift @{$self->{history}}, 1895 unshift @{$self->{history}},
1748 my $txt = $self->get_text; 1896 my $txt = $self->get_text;
1897
1749 $self->{history_pointer} = -1; 1898 $self->{history_pointer} = -1;
1750 $self->{history_saveback} = ''; 1899 $self->{history_saveback} = '';
1751 $self->_emit (activate => $txt); 1900 $self->emit (activate => $txt);
1752 $self->update; 1901 $self->update;
1753 1902
1754 } elsif ($sym == CFClient::SDLK_UP) { 1903 } elsif ($sym == CFClient::SDLK_UP) {
1755 if ($self->{history_pointer} < 0) { 1904 if ($self->{history_pointer} < 0) {
1756 $self->{history_saveback} = $self->get_text; 1905 $self->{history_saveback} = $self->get_text;
… …
1772 } else { 1921 } else {
1773 $self->set_text ($self->{history_saveback}); 1922 $self->set_text ($self->{history_saveback});
1774 } 1923 }
1775 1924
1776 } else { 1925 } else {
1777 $self->SUPER::key_down ($ev); 1926 return $self->SUPER::invoke_key_down ($ev)
1927 }
1928
1778 } 1929 1
1779
1780} 1930}
1781 1931
1782############################################################################# 1932#############################################################################
1783 1933
1784package CFClient::UI::Button; 1934package CFClient::UI::Button;
… …
1793 1943
1794sub new { 1944sub new {
1795 my $class = shift; 1945 my $class = shift;
1796 1946
1797 $class->SUPER::new ( 1947 $class->SUPER::new (
1798 padding => 4, 1948 padding_x => 4,
1949 padding_y => 4,
1799 fg => [1, 1, 1], 1950 fg => [1, 1, 1],
1800 active_fg => [0, 0, 1], 1951 active_fg => [0, 0, 1],
1801 can_hover => 1, 1952 can_hover => 1,
1802 align => 0, 1953 align => 0,
1803 valign => 0, 1954 valign => 0,
1804 can_events => 1, 1955 can_events => 1,
1805 @_ 1956 @_
1806 ) 1957 )
1807} 1958}
1808 1959
1809sub activate { }
1810
1811sub button_up { 1960sub invoke_button_up {
1812 my ($self, $ev, $x, $y) = @_; 1961 my ($self, $ev, $x, $y) = @_;
1813 1962
1814 $self->emit ("activate") 1963 $self->emit ("activate")
1815 if $x >= 0 && $x < $self->{w} 1964 if $x >= 0 && $x < $self->{w}
1816 && $y >= 0 && $y < $self->{h}; 1965 && $y >= 0 && $y < $self->{h};
1966
1967 1
1817} 1968}
1818 1969
1819sub _draw { 1970sub _draw {
1820 my ($self) = @_; 1971 my ($self) = @_;
1821 1972
1822 local $self->{fg} = $self->{fg}; 1973 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1823
1824 if ($GRAB == $self) {
1825 $self->{fg} = $self->{active_fg};
1826 }
1827 1974
1828 glEnable GL_TEXTURE_2D; 1975 glEnable GL_TEXTURE_2D;
1829 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1976 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1830 glColor 0, 0, 0, 1; 1977 glColor 0, 0, 0, 1;
1831 1978
… …
1836 $self->SUPER::_draw; 1983 $self->SUPER::_draw;
1837} 1984}
1838 1985
1839############################################################################# 1986#############################################################################
1840 1987
1988package CFClient::UI::ImageButton;
1989
1990our @ISA = CFClient::UI::Image::;
1991
1992use CFClient::OpenGL;
1993
1994my %textures;
1995
1996sub new {
1997 my $class = shift;
1998
1999 my $self = $class->SUPER::new (
2000 padding_x => 4,
2001 padding_y => 4,
2002 fg => [1, 1, 1],
2003 active_fg => [0, 0, 1],
2004 can_hover => 1,
2005 align => 0,
2006 valign => 0,
2007 can_events => 1,
2008 @_
2009 );
2010}
2011
2012sub invoke_button_up {
2013 my ($self, $ev, $x, $y) = @_;
2014
2015 $self->emit ("activate")
2016 if $x >= 0 && $x < $self->{w}
2017 && $y >= 0 && $y < $self->{h};
2018
2019 1
2020}
2021
2022#############################################################################
2023
1841package CFClient::UI::CheckBox; 2024package CFClient::UI::CheckBox;
1842 2025
1843our @ISA = CFClient::UI::DrawBG::; 2026our @ISA = CFClient::UI::DrawBG::;
1844 2027
1845my @tex = 2028my @tex =
… …
1850 2033
1851sub new { 2034sub new {
1852 my $class = shift; 2035 my $class = shift;
1853 2036
1854 $class->SUPER::new ( 2037 $class->SUPER::new (
1855 padding => 2, 2038 padding_x => 2,
2039 padding_y => 2,
1856 fg => [1, 1, 1], 2040 fg => [1, 1, 1],
1857 active_fg => [1, 1, 0], 2041 active_fg => [1, 1, 0],
1858 bg => [0, 0, 0, 0.2], 2042 bg => [0, 0, 0, 0.2],
1859 active_bg => [1, 1, 1, 0.5], 2043 active_bg => [1, 1, 1, 0.5],
1860 state => 0, 2044 state => 0,
… …
1864} 2048}
1865 2049
1866sub size_request { 2050sub size_request {
1867 my ($self) = @_; 2051 my ($self) = @_;
1868 2052
1869 ($self->{padding} * 2 + 6) x 2 2053 (6) x 2
1870} 2054}
1871 2055
1872sub button_down { 2056sub invoke_button_down {
1873 my ($self, $ev, $x, $y) = @_; 2057 my ($self, $ev, $x, $y) = @_;
1874 2058
1875 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 2059 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1876 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 2060 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1877 $self->{state} = !$self->{state}; 2061 $self->{state} = !$self->{state};
1878 $self->_emit (changed => $self->{state}); 2062 $self->emit (changed => $self->{state});
2063 } else {
2064 return 0
2065 }
2066
1879 } 2067 1
1880} 2068}
1881 2069
1882sub _draw { 2070sub _draw {
1883 my ($self) = @_; 2071 my ($self) = @_;
1884 2072
1885 $self->SUPER::_draw; 2073 $self->SUPER::_draw;
1886 2074
1887 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 2075 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1888 2076
1889 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 2077 my ($w, $h) = @$self{qw(w h)};
2078
2079 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1890 2080
1891 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 2081 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1892 2082
1893 my $tex = $self->{state} ? $tex[1] : $tex[0]; 2083 my $tex = $self->{state} ? $tex[1] : $tex[0];
1894 2084
… …
2049 2239
2050 my $h1 = $self->{h} * (1 - $ycut1); 2240 my $h1 = $self->{h} * (1 - $ycut1);
2051 my $h2 = $self->{h} * (1 - $ycut2); 2241 my $h2 = $self->{h} * (1 - $ycut2);
2052 2242
2053 glEnable GL_BLEND; 2243 glEnable GL_BLEND;
2054 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2244 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2245 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2055 glEnable GL_TEXTURE_2D; 2246 glEnable GL_TEXTURE_2D;
2056 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2247 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2057 2248
2058 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2249 glBindTexture GL_TEXTURE_2D, $t1->{name};
2059 glBegin GL_QUADS; 2250 glBegin GL_QUADS;
… …
2159 fg => [1, 1, 1], 2350 fg => [1, 1, 1],
2160 active_fg => [0, 0, 0], 2351 active_fg => [0, 0, 0],
2161 bg => [0, 0, 0, 0.2], 2352 bg => [0, 0, 0, 0.2],
2162 active_bg => [1, 1, 1, 0.5], 2353 active_bg => [1, 1, 1, 0.5],
2163 range => [0, 0, 100, 10, 0], 2354 range => [0, 0, 100, 10, 0],
2164 req_w => $::WIDTH / 80, 2355 min_w => $::WIDTH / 80,
2165 req_h => $::WIDTH / 80, 2356 min_h => $::WIDTH / 80,
2166 vertical => 0, 2357 vertical => 0,
2167 can_hover => 1, 2358 can_hover => 1,
2168 inner_pad => 0.02, 2359 inner_pad => 0.02,
2169 @_ 2360 @_
2170 ); 2361 );
… …
2173 $self->update; 2364 $self->update;
2174 2365
2175 $self 2366 $self
2176} 2367}
2177 2368
2178sub changed { }
2179
2180sub set_range { 2369sub set_range {
2181 my ($self, $range) = @_; 2370 my ($self, $range) = @_;
2182 2371
2183 ($range, $self->{range}) = ($self->{range}, $range); 2372 ($range, $self->{range}) = ($self->{range}, $range);
2184 2373
2185 $self->update
2186 if "@$range" ne "@{$self->{range}}"; 2374 if ("@$range" ne "@{$self->{range}}") {
2375 $self->update;
2376 $self->set_value ($self->{range}[0]);
2377 }
2187} 2378}
2188 2379
2189sub set_value { 2380sub set_value {
2190 my ($self, $value) = @_; 2381 my ($self, $value) = @_;
2191 2382
… …
2202 if $unit; 2393 if $unit;
2203 2394
2204 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2395 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2205 2396
2206 if ($value != $old_value) { 2397 if ($value != $old_value) {
2207 $self->_emit (changed => $value); 2398 $self->emit (changed => $value);
2208 $self->update; 2399 $self->update;
2209 } 2400 }
2210} 2401}
2211 2402
2212sub size_request { 2403sub size_request {
2213 my ($self) = @_; 2404 my ($self) = @_;
2214 2405
2215 my $w = $self->{req_w}; 2406 ($self->{req_w}, $self->{req_h})
2216 my $h = $self->{req_h};
2217
2218 $self->{vertical} ? ($h, $w) : ($w, $h)
2219} 2407}
2220 2408
2221sub button_down { 2409sub invoke_button_down {
2222 my ($self, $ev, $x, $y) = @_; 2410 my ($self, $ev, $x, $y) = @_;
2223 2411
2224 $self->SUPER::button_down ($ev, $x, $y); 2412 $self->SUPER::invoke_button_down ($ev, $x, $y);
2225 2413
2226 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2414 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2227 2415
2228 $self->mouse_motion ($ev, $x, $y); 2416 $self->invoke_mouse_motion ($ev, $x, $y)
2229} 2417}
2230 2418
2231sub mouse_motion { 2419sub invoke_mouse_motion {
2232 my ($self, $ev, $x, $y) = @_; 2420 my ($self, $ev, $x, $y) = @_;
2233 2421
2234 if ($GRAB == $self) { 2422 if ($GRAB == $self) {
2235 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2423 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2236 2424
2237 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2425 my (undef, $lo, $hi, $page) = @{$self->{range}};
2238 2426
2239 $x = ($x - $self->{click}[1]) / ($w * $self->{scale}); 2427 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2240 2428
2241 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo)); 2429 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2430 } else {
2431 return 0;
2432 }
2433
2242 } 2434 1
2243} 2435}
2244 2436
2245sub update { 2437sub update {
2246 my ($self) = @_; 2438 my ($self) = @_;
2247 2439
2248 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 2440 delete $self->{knob_w};
2441 $self->SUPER::update;
2442}
2443
2444sub _draw {
2445 my ($self) = @_;
2446
2447 unless ($self->{knob_w}) {
2249 $self->set_value ($self->{range}[0]); 2448 $self->set_value ($self->{range}[0]);
2250 2449
2251 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2450 my ($value, $lo, $hi, $page) = @{$self->{range}};
2252 my $range = ($hi - $page - $lo) || 1e-100; 2451 my $range = ($hi - $page - $lo) || 1e-100;
2253 2452
… …
2259 $value = ($value - $lo) / $range; 2458 $value = ($value - $lo) / $range;
2260 $value = $value * $self->{scale} + $self->{offset}; 2459 $value = $value * $self->{scale} + $self->{offset};
2261 2460
2262 $self->{knob_x} = $value - $knob_w * 0.5; 2461 $self->{knob_x} = $value - $knob_w * 0.5;
2263 $self->{knob_w} = $knob_w; 2462 $self->{knob_w} = $knob_w;
2264 }); 2463 }
2265
2266 $self->SUPER::update;
2267}
2268
2269sub _draw {
2270 my ($self) = @_;
2271 2464
2272 $self->SUPER::_draw (); 2465 $self->SUPER::_draw ();
2273 2466
2274 glScale $self->{w}, $self->{h}; 2467 glScale $self->{w}, $self->{h};
2275 2468
… …
2336sub set_range { shift->{slider}->set_range (@_) } 2529sub set_range { shift->{slider}->set_range (@_) }
2337sub set_value { shift->{slider}->set_value (@_) } 2530sub set_value { shift->{slider}->set_value (@_) }
2338 2531
2339############################################################################# 2532#############################################################################
2340 2533
2341package CFClient::UI::TextView; 2534package CFClient::UI::TextScroller;
2342 2535
2343our @ISA = CFClient::UI::HBox::; 2536our @ISA = CFClient::UI::HBox::;
2344 2537
2345use CFClient::OpenGL; 2538use CFClient::OpenGL;
2346 2539
… …
2348 my $class = shift; 2541 my $class = shift;
2349 2542
2350 my $self = $class->SUPER::new ( 2543 my $self = $class->SUPER::new (
2351 fontsize => 1, 2544 fontsize => 1,
2352 can_events => 0, 2545 can_events => 0,
2546 indent => 0,
2353 #font => default_font 2547 #font => default_font
2354 @_, 2548 @_,
2355 2549
2356 layout => (new CFClient::Layout 1), 2550 layout => (new CFClient::Layout 1),
2357 par => [], 2551 par => [],
… …
2372 2566
2373 $self->{fontsize} = $fontsize; 2567 $self->{fontsize} = $fontsize;
2374 $self->reflow; 2568 $self->reflow;
2375} 2569}
2376 2570
2377sub size_allocate { 2571sub invoke_size_allocate {
2378 my ($self, $w, $h, $changed) = @_; 2572 my ($self, $w, $h) = @_;
2379
2380 $self->SUPER::size_allocate ($w, $h, $changed);
2381
2382 return unless $changed;
2383 2573
2384 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2574 $self->{layout}->set_font ($self->{font}) if $self->{font};
2385 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2575 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2386 $self->{layout}->set_width ($self->{children}[0]{w}); 2576 $self->{layout}->set_width ($self->{children}[0]{w});
2577 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2387 2578
2388 $self->reflow; 2579 $self->reflow;
2580
2581 $self->SUPER::invoke_size_allocate ($w, $h)
2389} 2582}
2390 2583
2391sub text_size { 2584sub text_size {
2392 my ($self, $text, $indent) = @_; 2585 my ($self, $text, $indent) = @_;
2393 2586
2394 my $layout = $self->{layout}; 2587 my $layout = $self->{layout};
2395 2588
2396 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2589 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2397 $layout->set_width ($self->{children}[0]{w} - $indent); 2590 $layout->set_width ($self->{children}[0]{w} - $indent);
2591 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2398 $layout->set_markup ($text); 2592 $layout->set_markup ($text);
2399 2593
2400 $layout->size 2594 $layout->size
2401} 2595}
2402 2596
… …
2441 2635
2442 return unless $self->{h} > 0; 2636 return unless $self->{h} > 0;
2443 2637
2444 delete $self->{texture}; 2638 delete $self->{texture};
2445 2639
2446 $ROOT->on_post_alloc ($self, sub { 2640 $ROOT->on_post_alloc ($self => sub {
2447 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 2641 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2448 2642
2449 if (delete $self->{need_reflow}) { 2643 if (delete $self->{need_reflow}) {
2450 my $height = 0; 2644 my $height = 0;
2451 2645
… …
2454 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2648 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2455 2649
2456 for (@{$self->{par}}) { 2650 for (@{$self->{par}}) {
2457 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support 2651 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2458 $layout->set_width ($W - $_->[3]); 2652 $layout->set_width ($W - $_->[3]);
2653 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2459 $layout->set_markup ($_->[4]); 2654 $layout->set_markup ($_->[4]);
2460 my ($w, $h) = $layout->size; 2655 my ($w, $h) = $layout->size;
2461 $_->[0] = $w + $_->[3]; 2656 $_->[0] = $w + $_->[3];
2462 $_->[1] = $h; 2657 $_->[1] = $h;
2463 } 2658 }
… …
2466 } 2661 }
2467 2662
2468 $self->{height} = $height; 2663 $self->{height} = $height;
2469 2664
2470 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]); 2665 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2471 2666
2472 delete $self->{texture}; 2667 delete $self->{texture};
2473 } 2668 }
2474 2669
2475 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2670 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2476 glClearColor 0.5, 0.5, 0.5, 0; 2671 glClearColor 0, 0, 0, 0;
2477 glClear GL_COLOR_BUFFER_BIT; 2672 glClear GL_COLOR_BUFFER_BIT;
2478 2673
2479 my $top = int $self->{children}[1]{range}[0]; 2674 my $top = int $self->{children}[1]{range}[0];
2480 2675
2481 my $y0 = $top; 2676 my $y0 = $top;
… …
2495 my $h = $par->[1]; 2690 my $h = $par->[1];
2496 2691
2497 if ($y0 < $y + $h && $y < $y1) { 2692 if ($y0 < $y + $h && $y < $y1) {
2498 $layout->set_foreground (@{ $par->[2] }); 2693 $layout->set_foreground (@{ $par->[2] });
2499 $layout->set_width ($W - $par->[3]); 2694 $layout->set_width ($W - $par->[3]);
2695 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2500 $layout->set_markup ($par->[4]); 2696 $layout->set_markup ($par->[4]);
2501 2697
2502 my ($w, $h, $data, $format, $internalformat) = $layout->render; 2698 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2503 2699
2504 glRasterPos $par->[3], $y - $y0; 2700 glRasterPos $par->[3], $y - $y0;
… …
2516sub _draw { 2712sub _draw {
2517 my ($self) = @_; 2713 my ($self) = @_;
2518 2714
2519 glEnable GL_TEXTURE_2D; 2715 glEnable GL_TEXTURE_2D;
2520 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2716 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2521 glColor 1, 1, 1, 1; 2717 glColor 0, 0, 0, 1;
2522 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2718 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2523 glDisable GL_TEXTURE_2D; 2719 glDisable GL_TEXTURE_2D;
2524 2720
2525 $self->{children}[1]->draw; 2721 $self->{children}[1]->draw;
2526 2722
2527} 2723}
… …
2610} 2806}
2611 2807
2612sub set_tooltip_from { 2808sub set_tooltip_from {
2613 my ($self, $widget) = @_; 2809 my ($self, $widget) = @_;
2614 2810
2811 my $tooltip = $widget->{tooltip};
2812
2813 if ($ENV{CFPLUS_DEBUG} & 2) {
2814 $tooltip .= "\n\n" . (ref $widget) . "\n"
2815 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2816 . "req $widget->{req_w} $widget->{req_h}\n"
2817 . "visible $widget->{visible}";
2818 }
2819
2820 $tooltip =~ s/^\n+//;
2821 $tooltip =~ s/\n+$//;
2822
2615 $self->add (new CFClient::UI::Label 2823 $self->add (new CFClient::UI::Label
2616 markup => $widget->{tooltip}, 2824 markup => $tooltip,
2617 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2825 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2618 fontsize => 0.8, 2826 fontsize => 0.8,
2619 fg => [0, 0, 0, 1], 2827 fg => [0, 0, 0, 1],
2620 ellipsise => 0, 2828 ellipsise => 0,
2621 font => ($widget->{tooltip_font} || $::FONT_PROP), 2829 font => ($widget->{tooltip_font} || $::FONT_PROP),
… …
2628 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2836 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2629 2837
2630 ($w + 4, $h + 4) 2838 ($w + 4, $h + 4)
2631} 2839}
2632 2840
2633sub size_allocate { 2841sub invoke_size_allocate {
2634 my ($self, $w, $h, $changed) = @_; 2842 my ($self, $w, $h) = @_;
2635 2843
2636 return unless $changed;
2637
2638 $self->SUPER::size_allocate ($w - 4, $h - 4, $changed); 2844 $self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2639} 2845}
2640 2846
2641sub visibility_change { 2847sub invoke_visibility_change {
2642 my ($self, $visible) = @_; 2848 my ($self, $visible) = @_;
2643 2849
2644 return unless $visible; 2850 return unless $visible;
2645 2851
2646 $self->{root}->on_post_alloc ("move_$self" => sub { 2852 $self->{root}->on_post_alloc ("move_$self" => sub {
… …
2648 or return; 2854 or return;
2649 2855
2650 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 2856 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2651 2857
2652 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 2858 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2653 if $x + $self->{w} > $::WIDTH; 2859 if $x + $self->{w} > $self->{root}{w};
2654 2860
2655 $self->move ($x, $y); 2861 $self->move_abs ($x, $y);
2656 }); 2862 });
2657} 2863}
2658 2864
2659sub _draw { 2865sub _draw {
2660 my ($self) = @_; 2866 my ($self) = @_;
… …
2747 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 2953 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2748 2954
2749 if ($tex) { 2955 if ($tex) {
2750 glEnable GL_TEXTURE_2D; 2956 glEnable GL_TEXTURE_2D;
2751 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2957 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2752 glColor 1, 1, 1, 1; 2958 glColor 0, 0, 0, 1;
2753 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2959 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2754 glDisable GL_TEXTURE_2D; 2960 glDisable GL_TEXTURE_2D;
2755 } 2961 }
2756} 2962}
2757 2963
2758sub DESTROY { 2964sub destroy {
2759 my ($self) = @_; 2965 my ($self) = @_;
2760 2966
2761 $self->{timer}->cancel 2967 $self->{timer}->cancel
2762 if $self->{timer}; 2968 if $self->{timer};
2763 2969
2764 $self->SUPER::DESTROY; 2970 $self->SUPER::destroy;
2765} 2971}
2766 2972
2767############################################################################# 2973#############################################################################
2768 2974
2769package CFClient::UI::Inventory; 2975package CFClient::UI::Buttonbar;
2770 2976
2771our @ISA = CFClient::UI::ScrolledWindow::; 2977our @ISA = CFClient::UI::HBox::;
2772 2978
2773sub new { 2979# TODO: should actualyl wrap buttons and other goodies.
2774 my $class = shift;
2775
2776 my $self = $class->SUPER::new (
2777 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2778 @_,
2779 );
2780
2781 $self
2782}
2783
2784sub set_items {
2785 my ($self, $items) = @_;
2786
2787 $self->{scrolled}->clear;
2788 return unless $items;
2789
2790 my @items = sort {
2791 ($a->{type} <=> $b->{type})
2792 or ($a->{name} cmp $b->{name})
2793 } @$items;
2794
2795 $self->{real_items} = \@items;
2796
2797 my $row = 0;
2798 for my $item (@items) {
2799 CFClient::Item::update_widgets $item;
2800
2801 $self->{scrolled}->add (0, $row, $item->{face_widget});
2802 $self->{scrolled}->add (1, $row, $item->{desc_widget});
2803 $self->{scrolled}->add (2, $row, $item->{weight_widget});
2804
2805 $row++;
2806 }
2807}
2808 2980
2809############################################################################# 2981#############################################################################
2810 2982
2811package CFClient::UI::Menu; 2983package CFClient::UI::Menu;
2812 2984
… …
2824 ); 2996 );
2825 2997
2826 $self->add ($self->{vbox} = new CFClient::UI::VBox); 2998 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2827 2999
2828 for my $item (@{ $self->{items} }) { 3000 for my $item (@{ $self->{items} }) {
2829 my ($widget, $cb) = @$item; 3001 my ($widget, $cb, $tooltip) = @$item;
2830 3002
2831 # handle various types of items, only text for now 3003 # handle various types of items, only text for now
2832 if (!ref $widget) { 3004 if (!ref $widget) {
2833 $widget = new CFClient::UI::Label 3005 $widget = new CFClient::UI::Label
2834 can_hover => 1, 3006 can_hover => 1,
2835 can_events => 1, 3007 can_events => 1,
2836 text => $widget; 3008 markup => $widget,
3009 tooltip => $tooltip
2837 } 3010 }
2838 3011
2839 $self->{item}{$widget} = $item; 3012 $self->{item}{$widget} = $item;
2840 3013
2841 $self->{vbox}->add ($widget); 3014 $self->{vbox}->add ($widget);
… …
2846 3019
2847# popup given the event (must be a mouse button down event currently) 3020# popup given the event (must be a mouse button down event currently)
2848sub popup { 3021sub popup {
2849 my ($self, $ev) = @_; 3022 my ($self, $ev) = @_;
2850 3023
2851 $self->_emit ("popdown"); 3024 $self->emit ("popdown");
2852 3025
2853 # maybe save $GRAB? must be careful about events... 3026 # maybe save $GRAB? must be careful about events...
2854 $GRAB = $self; 3027 $GRAB = $self;
2855 $self->{button} = $ev->{button}; 3028 $self->{button} = $ev->{button};
2856 3029
2857 $self->show; 3030 $self->show;
2858 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 3031 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2859} 3032}
2860 3033
2861sub mouse_motion { 3034sub invoke_mouse_motion {
2862 my ($self, $ev, $x, $y) = @_; 3035 my ($self, $ev, $x, $y) = @_;
2863 3036
2864 # TODO: should use vbox->find_widget or so 3037 # TODO: should use vbox->find_widget or so
2865 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3038 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2866 $self->{hover} = $self->{item}{$HOVER}; 3039 $self->{hover} = $self->{item}{$HOVER};
2867}
2868 3040
3041 0
3042}
3043
2869sub button_up { 3044sub invoke_button_up {
2870 my ($self, $ev, $x, $y) = @_; 3045 my ($self, $ev, $x, $y) = @_;
2871 3046
2872 if ($ev->{button} == $self->{button}) { 3047 if ($ev->{button} == $self->{button}) {
2873 undef $GRAB; 3048 undef $GRAB;
2874 $self->hide; 3049 $self->hide;
2875 3050
2876 $self->_emit ("popdown"); 3051 $self->emit ("popdown");
2877 $self->{hover}[1]->() if $self->{hover}; 3052 $self->{hover}[1]->() if $self->{hover};
3053 } else {
3054 return 0
3055 }
3056
2878 } 3057 1
2879} 3058}
2880 3059
2881############################################################################# 3060#############################################################################
2882 3061
2883package CFClient::UI::Statusbox; 3062package CFClient::UI::Multiplexer;
2884 3063
2885our @ISA = CFClient::UI::VBox::; 3064our @ISA = CFClient::UI::Container::;
2886 3065
2887sub new { 3066sub new {
2888 my $class = shift; 3067 my $class = shift;
2889 3068
2890 $class->SUPER::new ( 3069 my $self = $class->SUPER::new (
3070 @_,
3071 );
3072
3073 $self->{current} = $self->{children}[0]
3074 if @{ $self->{children} };
3075
3076 $self
3077}
3078
3079sub add {
3080 my ($self, @widgets) = @_;
3081
3082 $self->SUPER::add (@widgets);
3083
3084 $self->{current} = $self->{children}[0]
3085 if @{ $self->{children} };
3086}
3087
3088sub set_current_page {
3089 my ($self, $page_or_widget) = @_;
3090
3091 my $widget = ref $page_or_widget
3092 ? $page_or_widget
3093 : $self->{children}[$page_or_widget];
3094
3095 $self->{current} = $widget;
3096 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3097
3098 $self->emit (page_changed => $self->{current});
3099
3100 $self->realloc;
3101}
3102
3103sub visible_children {
3104 $_[0]{current}
3105}
3106
3107sub size_request {
3108 my ($self) = @_;
3109
3110 $self->{current}->size_request
3111}
3112
3113sub invoke_size_allocate {
3114 my ($self, $w, $h) = @_;
3115
3116 $self->{current}->configure (0, 0, $w, $h);
3117
3118 1
3119}
3120
3121sub _draw {
3122 my ($self) = @_;
3123
3124 $self->{current}->draw;
3125}
3126
3127#############################################################################
3128
3129package CFClient::UI::Notebook;
3130
3131our @ISA = CFClient::UI::VBox::;
3132
3133sub new {
3134 my $class = shift;
3135
3136 my $self = $class->SUPER::new (
3137 buttonbar => (new CFClient::UI::Buttonbar),
3138 multiplexer => (new CFClient::UI::Multiplexer expand => 1),
3139 # filter => # will be put between multiplexer and $self
3140 @_,
3141 );
3142
3143 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3144 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3145
3146 $self
3147}
3148
3149sub add {
3150 my ($self, $title, $widget, $tooltip) = @_;
3151
3152 Scalar::Util::weaken $self;
3153
3154 $self->{buttonbar}->add (new CFClient::UI::Button
3155 markup => $title,
3156 tooltip => $tooltip,
3157 on_activate => sub { $self->set_current_page ($widget) },
3158 );
3159
3160 $self->{multiplexer}->add ($widget);
3161}
3162
3163sub set_current_page {
3164 my ($self, $page) = @_;
3165
3166 $self->{multiplexer}->set_current_page ($page);
3167 $self->emit (page_changed => $self->{multiplexer}{current});
3168}
3169
3170#############################################################################
3171
3172package CFClient::UI::Combobox;
3173
3174use utf8;
3175
3176our @ISA = CFClient::UI::Button::;
3177
3178sub new {
3179 my $class = shift;
3180
3181 my $self = $class->SUPER::new (
3182 options => [], # [value, title, longdesc], ...
3183 value => undef,
3184 @_,
3185 );
3186
3187 $self->_set_value ($self->{value});
3188
3189 $self
3190}
3191
3192sub invoke_button_down {
3193 my ($self, $ev) = @_;
3194
3195 my @menu_items;
3196
3197 for (@{ $self->{options} }) {
3198 my ($value, $title, $tooltip) = @$_;
3199
3200 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3201 }
3202
3203 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
3204}
3205
3206sub _set_value {
3207 my ($self, $value) = @_;
3208
3209 my ($item) = grep $_->[0] eq $value, @{ $self->{options} }
3210 or return;
3211
3212 $self->{value} = $item->[0];
3213 $self->set_markup ("$item->[1] ⇓");
3214 $self->set_tooltip ($item->[2]);
3215}
3216
3217sub set_value {
3218 my ($self, $value) = @_;
3219
3220 return unless $self->{value} ne $value;
3221
3222 $self->_set_value ($value);
3223 $self->emit (changed => $value);
3224}
3225
3226#############################################################################
3227
3228package CFClient::UI::Statusbox;
3229
3230our @ISA = CFClient::UI::VBox::;
3231
3232sub new {
3233 my $class = shift;
3234
3235 my $self = $class->SUPER::new (
2891 fontsize => 0.8, 3236 fontsize => 0.8,
2892 @_, 3237 @_,
2893 ) 3238 );
3239
3240 Scalar::Util::weaken (my $this = $self);
3241
3242 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3243
3244 $self
2894} 3245}
2895 3246
2896sub reorder { 3247sub reorder {
2897 my ($self) = @_; 3248 my ($self) = @_;
2898 my $NOW = time; 3249 my $NOW = Time::HiRes::time;
3250
3251 # freeze display when hovering over any label
3252 return if $CFClient::UI::TOOLTIP->{owner}
3253 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},
3254 values %{ $self->{item} };
2899 3255
2900 while (my ($k, $v) = each %{ $self->{item} }) { 3256 while (my ($k, $v) = each %{ $self->{item} }) {
2901 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3257 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2902 } 3258 }
2903 3259
… …
2906 my @items = sort { 3262 my @items = sort {
2907 $a->{pri} <=> $b->{pri} 3263 $a->{pri} <=> $b->{pri}
2908 or $b->{id} <=> $a->{id} 3264 or $b->{id} <=> $a->{id}
2909 } values %{ $self->{item} }; 3265 } values %{ $self->{item} };
2910 3266
3267 $self->{timer}->interval (1);
3268
2911 my $count = 10 + 1; 3269 my $count = 10 + 1;
2912 for my $item (@items) { 3270 for my $item (@items) {
2913 last unless --$count; 3271 last unless --$count;
2914 3272
2915 push @widgets, $item->{label} ||= do { 3273 my $label = $item->{label} ||= do {
2916 # TODO: doesn't handle markup well (read as: at all) 3274 # TODO: doesn't handle markup well (read as: at all)
2917 my $short = $item->{count} > 1 3275 my $short = $item->{count} > 1
2918 ? "<b>$item->{count} ×</b> $item->{text}" 3276 ? "<b>$item->{count} ×</b> $item->{text}"
2919 : $item->{text}; 3277 : $item->{text};
2920 3278
… …
2928 tooltip => $item->{tooltip}, 3286 tooltip => $item->{tooltip},
2929 tooltip_font => $::FONT_PROP, 3287 tooltip_font => $::FONT_PROP,
2930 tooltip_width => 0.67, 3288 tooltip_width => 0.67,
2931 fontsize => $item->{fontsize} || $self->{fontsize}, 3289 fontsize => $item->{fontsize} || $self->{fontsize},
2932 max_w => $::WIDTH * 0.44, 3290 max_w => $::WIDTH * 0.44,
2933 fg => $item->{fg}, 3291 fg => [@{ $item->{fg} }],
2934 can_events => 1, 3292 can_events => 1,
2935 can_hover => 1 3293 can_hover => 1
2936 }; 3294 };
3295
3296 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3297 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3298 $label->update;
3299 $label->set_max_size (undef, $label->{req_h} * $diff)
3300 if $diff < 1;
3301 $self->{timer}->interval (1/30);
3302 } else {
3303 $label->{fg}[3] = $item->{fg}[3] || 1;
3304 }
3305
3306 push @widgets, $label;
2937 } 3307 }
2938 3308
2939 $self->clear; 3309 $self->clear;
2940 $self->SUPER::add (reverse @widgets); 3310 $self->SUPER::add (reverse @widgets);
2941} 3311}
… …
2946 $text =~ s/^\s+//; 3316 $text =~ s/^\s+//;
2947 $text =~ s/\s+$//; 3317 $text =~ s/\s+$//;
2948 3318
2949 return unless $text; 3319 return unless $text;
2950 3320
2951 my $timeout = time + ((delete $arg{timeout}) || 60); 3321 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
2952 3322
2953 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3323 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2954 3324
2955 if (my $item = $self->{item}{$group}) { 3325 if (my $item = $self->{item}{$group}) {
2956 if ($item->{text} eq $text) { 3326 if ($item->{text} eq $text) {
2957 $item->{count}++; 3327 $item->{count}++;
2958 } else { 3328 } else {
2959 $item->{count} = 1; 3329 $item->{count} = 1;
2960 $item->{text} = $item->{tooltip} = $text; 3330 $item->{text} = $item->{tooltip} = $text;
2961 } 3331 }
2962 $item->{id} = ++$self->{id}; 3332 $item->{id} += 0.2;#d#
2963 $item->{timeout} = $timeout; 3333 $item->{timeout} = $timeout;
2964 delete $item->{label}; 3334 delete $item->{label};
2965 } else { 3335 } else {
2966 $self->{item}{$group} = { 3336 $self->{item}{$group} = {
2967 id => ++$self->{id}, 3337 id => ++$self->{id},
… …
2986 3356
2987 $self->reorder; 3357 $self->reorder;
2988 $self->SUPER::reconfigure; 3358 $self->SUPER::reconfigure;
2989} 3359}
2990 3360
3361sub destroy {
3362 my ($self) = @_;
3363
3364 $self->{timer}->cancel;
3365
3366 $self->SUPER::destroy;
3367}
3368
2991############################################################################# 3369#############################################################################
2992 3370
3371package CFClient::UI::Inventory;
3372
3373our @ISA = CFClient::UI::ScrolledWindow::;
3374
3375sub new {
3376 my $class = shift;
3377
3378 my $self = $class->SUPER::new (
3379 child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3380 @_,
3381 );
3382
3383 $self
3384}
3385
3386sub set_items {
3387 my ($self, $items) = @_;
3388
3389 $self->{child}->clear;
3390 return unless $items;
3391
3392 my @items = sort {
3393 ($a->{type} <=> $b->{type})
3394 or ($a->{name} cmp $b->{name})
3395 } @$items;
3396
3397 $self->{real_items} = \@items;
3398
3399 my $row = 0;
3400 for my $item (@items) {
3401 CFClient::Item::update_widgets $item;
3402
3403 $self->{child}->add (0, $row, $item->{face_widget});
3404 $self->{child}->add (1, $row, $item->{desc_widget});
3405 $self->{child}->add (2, $row, $item->{weight_widget});
3406
3407 $row++;
3408 }
3409}
3410
3411#############################################################################
3412
3413package CFClient::UI::BindEditor;
3414
3415our @ISA = CFClient::UI::FancyFrame::;
3416
3417sub new {
3418 my $class = shift;
3419
3420 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3421
3422 $self->add (my $vb = new CFClient::UI::VBox);
3423
3424
3425 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3426 text => "start recording",
3427 tooltip => "Start/Stops recording of actions."
3428 ."All subsequent actions after the recording started will be captured."
3429 ."The actions are displayed after the record was stopped."
3430 ."To bind the action you have to click on the 'Bind' button",
3431 on_activate => sub {
3432 unless ($self->{recording}) {
3433 $self->start;
3434 } else {
3435 $self->stop;
3436 }
3437 });
3438
3439 $vb->add (new CFClient::UI::Label text => "Actions:");
3440 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3441
3442 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3443 $vb->add (my $hb = new CFClient::UI::HBox);
3444 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3445 $hb->add (new CFClient::UI::Button
3446 text => "bind",
3447 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3448 on_activate => sub {
3449 $self->ask_for_bind;
3450 });
3451
3452 $vb->add (my $hb = new CFClient::UI::HBox);
3453 $hb->add (new CFClient::UI::Button
3454 text => "ok",
3455 expand => 1,
3456 tooltip => "This closes the binding editor and saves the binding",
3457 on_activate => sub {
3458 $self->hide;
3459 $self->commit;
3460 });
3461
3462 $hb->add (new CFClient::UI::Button
3463 text => "cancel",
3464 expand => 1,
3465 tooltip => "This closes the binding editor without saving",
3466 on_activate => sub {
3467 $self->hide;
3468 $self->{binding_cancel}->()
3469 if $self->{binding_cancel};
3470 });
3471
3472 $self->update_binding_widgets;
3473
3474 $self
3475}
3476
3477sub cfg_bind {
3478 my ($self, $mod, $sym, $cmds) = @_;
3479 $::CFG->{profile}{default}{bindings}{$mod}{$sym} = $cmds;
3480 ::update_bindings ();
3481}
3482
3483sub cfg_unbind {
3484 my ($self, $mod, $sym, $cmds) = @_;
3485 delete $::CFG->{profile}{default}{bindings}{$mod}{$sym};
3486 ::update_bindings ();
3487}
3488
3489sub commit {
3490 my ($self) = @_;
3491 my ($mod, $sym, $cmds) = $self->get_binding;
3492 if ($sym != 0 && @$cmds > 0) {
3493 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3494 ."'. Don't forget 'Save Config'!");
3495 $self->{binding_change}->($mod, $sym, $cmds)
3496 if $self->{binding_change};
3497 } else {
3498 $::STATUSBOX->add ("No action bound, no key or action specified!");
3499 $self->{binding_cancel}->()
3500 if $self->{binding_cancel};
3501 }
3502}
3503
3504sub start {
3505 my ($self) = @_;
3506
3507 $self->{rec_btn}->set_text ("stop recording");
3508 $self->{recording} = 1;
3509 $self->clear_command_list;
3510 $::CONN->start_record if $::CONN;
3511}
3512
3513sub stop {
3514 my ($self) = @_;
3515
3516 $self->{rec_btn}->set_text ("start recording");
3517 $self->{recording} = 0;
3518
3519 my $rec;
3520 $rec = $::CONN->stop_record if $::CONN;
3521 return unless ref $rec eq 'ARRAY';
3522 $self->set_command_list ($rec);
3523}
3524
3525
3526sub ask_for_bind_and_commit {
3527 my ($self) = @_;
3528 $self->ask_for_bind (1);
3529}
3530
3531sub ask_for_bind {
3532 my ($self, $commit, $end_cb) = @_;
3533
3534 CFClient::Binder::open_binding_dialog (sub {
3535 my ($mod, $sym) = @_;
3536 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3537 $self->update_binding_widgets;
3538 $self->commit if $commit;
3539 $end_cb->() if $end_cb;
3540 });
3541}
3542
3543# $mod and $sym are the modifiers and key symbol
3544# $cmds is a array ref of strings (the commands)
3545# $cb is the callback that is executed on OK
3546# $ccb is the callback that is executed on CANCEL and
3547# when the binding was unsuccessful on OK
3548sub set_binding {
3549 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3550
3551 $self->clear_command_list;
3552 $self->{recording} = 0;
3553 $self->{rec_btn}->set_text ("start recording");
3554
3555 $self->{binding} = [$mod, $sym];
3556 $self->{commands} = $cmds;
3557
3558 $self->{binding_change} = $cb;
3559 $self->{binding_cancel} = $ccb;
3560
3561 $self->update_binding_widgets;
3562}
3563
3564# this is a shortcut method that asks for a binding
3565# and then just binds it.
3566sub do_quick_binding {
3567 my ($self, $cmds, $end_cb) = @_;
3568 $self->set_binding (undef, undef, $cmds, sub { $self->cfg_bind (@_) });
3569 $self->ask_for_bind (1, $end_cb);
3570}
3571
3572sub update_binding_widgets {
3573 my ($self) = @_;
3574 my ($mod, $sym, $cmds) = $self->get_binding;
3575 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3576 $self->set_command_list ($cmds);
3577}
3578
3579sub get_binding {
3580 my ($self) = @_;
3581 return (
3582 $self->{binding}->[0],
3583 $self->{binding}->[1],
3584 [ grep { defined $_ } @{$self->{commands}} ]
3585 );
3586}
3587
3588sub clear_command_list {
3589 my ($self) = @_;
3590 $self->{cmdbox}->clear ();
3591}
3592
3593sub set_command_list {
3594 my ($self, $cmds) = @_;
3595
3596 $self->{cmdbox}->clear ();
3597 $self->{commands} = $cmds;
3598
3599 my $idx = 0;
3600
3601 for (@$cmds) {
3602 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3603
3604 my $i = $idx;
3605 $hb->add (new CFClient::UI::Label text => $_);
3606 $hb->add (new CFClient::UI::Button
3607 text => "delete",
3608 tooltip => "Deletes the action from the record",
3609 on_activate => sub {
3610 $self->{cmdbox}->remove ($hb);
3611 $cmds->[$i] = undef;
3612 });
3613
3614
3615 $idx++
3616 }
3617}
3618
3619#############################################################################
3620
3621package CFClient::UI::SpellList;
3622
3623our @ISA = CFClient::UI::Table::;
3624
3625sub new {
3626 my $class = shift;
3627
3628 my $self = $class->SUPER::new (
3629 binding => [],
3630 commands => [],
3631 @_,
3632 )
3633}
3634
3635my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3636
3637my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3638 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3639my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3640 "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3641my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3642 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3643my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3644 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3645my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3646 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3647
3648sub rebuild_spell_list {
3649 my ($self) = @_;
3650
3651 $CFClient::UI::ROOT->on_refresh ($self => sub {
3652 $self->clear;
3653
3654 return unless $::CONN;
3655
3656 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3657 $self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3658 $self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3659 $self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3660 $self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3661
3662 my $row = 0;
3663
3664 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3665 my $spell = $self->{spell}{$_};
3666
3667 $row++;
3668
3669 my $spell_cb = sub {
3670 my ($widget, $ev) = @_;
3671
3672 if ($ev->{button} == 1) {
3673 $::CONN->user_send ("cast $spell->{name}");
3674 } elsif ($ev->{button} == 2) {
3675 $::CONN->user_send ("invoke $spell->{name}");
3676 } elsif ($ev->{button} == 3) {
3677 (new CFClient::UI::Menu
3678 items => [
3679 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3680 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3681 ],
3682 )->popup ($ev);
3683 } else {
3684 return 0;
3685 }
3686
3687 1
3688 };
3689
3690 my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3691
3692 #TODO: add path info to tooltip
3693 #$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3694
3695 $self->add (0, $row, new CFClient::UI::Face
3696 face => $spell->{face},
3697 can_hover => 1,
3698 can_events => 1,
3699 tooltip => $tooltip,
3700 on_button_down => $spell_cb,
3701 );
3702
3703 $self->add (1, $row, new CFClient::UI::Label
3704 expand => 1,
3705 text => $spell->{name},
3706 can_hover => 1,
3707 can_events => 1,
3708 tooltip => $tooltip,
3709 on_button_down => $spell_cb,
3710 );
3711
3712 $self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3713 $self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3714 $self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3715 $self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3716 }
3717 });
3718}
3719
3720sub add_spell {
3721 my ($self, $spell) = @_;
3722
3723 $self->{spell}->{$spell->{name}} = $spell;
3724 $self->rebuild_spell_list;
3725}
3726
3727sub remove_spell {
3728 my ($self, $spell) = @_;
3729
3730 delete $self->{spell}->{$spell->{name}};
3731 $self->rebuild_spell_list;
3732}
3733
3734sub clear_spells {
3735 my ($self) = @_;
3736
3737 $self->{spell} = {};
3738 $self->rebuild_spell_list;
3739}
3740
3741#############################################################################
3742
2993package CFClient::UI::Root; 3743package CFClient::UI::Root;
2994 3744
2995our @ISA = CFClient::UI::Container::; 3745our @ISA = CFClient::UI::Container::;
3746
3747use List::Util qw(min max);
2996 3748
2997use CFClient::OpenGL; 3749use CFClient::OpenGL;
2998 3750
2999sub new { 3751sub new {
3000 my $class = shift; 3752 my $class = shift;
… …
3007 Scalar::Util::weaken ($self->{root} = $self); 3759 Scalar::Util::weaken ($self->{root} = $self);
3008 3760
3009 $self 3761 $self
3010} 3762}
3011 3763
3012sub configure {
3013 my ($self, $x, $y, $w, $h) = @_;
3014
3015 $self->{w} = $w;
3016 $self->{h} = $h;
3017}
3018
3019sub reconfigure {
3020 my ($self) = @_;
3021
3022 $self->SUPER::reconfigure;
3023
3024 $self->size_allocate ($self->{w}, $self->{h}, 1)
3025 if $self->{w};
3026}
3027
3028sub size_request { 3764sub size_request {
3029 my ($self) = @_; 3765 my ($self) = @_;
3030 3766
3031 ($self->{w}, $self->{h}) 3767 ($self->{w}, $self->{h})
3032} 3768}
3033 3769
3770sub _to_pixel {
3771 my ($coord, $size, $max) = @_;
3772
3773 $coord =
3774 $coord eq "center" ? ($max - $size) * 0.5
3775 : $coord eq "max" ? $max
3776 : $coord;
3777
3778 $coord = 0 if $coord < 0;
3779 $coord = $max - $size if $coord > $max - $size;
3780
3781 int $coord + 0.5
3782}
3783
3034sub size_allocate { 3784sub invoke_size_allocate {
3035 my ($self, $w, $h, $changed) = @_; 3785 my ($self, $w, $h) = @_;
3036 3786
3037 for my $child ($self->children) { 3787 for my $child ($self->children) {
3038 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3788 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3039 3789
3040 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 3790 $X = $child->{force_x} if exists $child->{force_x};
3041 if exists $child->{req_x}; 3791 $Y = $child->{force_y} if exists $child->{force_y};
3042 3792
3043 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1 3793 $X = _to_pixel $X, $W, $self->{w};
3044 if exists $child->{req_y}; 3794 $Y = _to_pixel $Y, $H, $self->{h};
3045
3046 #delete @$child{qw(req_x req_y)};#d# def_x, def_y
3047
3048 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
3049 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
3050 3795
3051 $child->configure ($X, $Y, $W, $H); 3796 $child->configure ($X, $Y, $W, $H);
3052 } 3797 }
3798
3799 1
3053} 3800}
3054 3801
3055sub coord2local { 3802sub coord2local {
3056 my ($self, $x, $y) = @_; 3803 my ($self, $x, $y) = @_;
3057 3804
… …
3071} 3818}
3072 3819
3073sub add { 3820sub add {
3074 my ($self, @children) = @_; 3821 my ($self, @children) = @_;
3075 3822
3076 for my $child (@children) {
3077 $child->{is_toplevel} = 1; 3823 $_->{is_toplevel} = 1
3078 3824 for @children;
3079 # integerise window positions
3080 $child->{x} = int $child->{x};
3081 $child->{y} = int $child->{y};
3082 }
3083 3825
3084 $self->SUPER::add (@children); 3826 $self->SUPER::add (@children);
3085} 3827}
3086 3828
3087sub remove { 3829sub remove {
3088 my ($self, @children) = @_; 3830 my ($self, @children) = @_;
3089 3831
3090 $self->SUPER::remove (@children); 3832 $self->SUPER::remove (@children);
3833
3834 delete $self->{is_toplevel}
3835 for @children;
3091 3836
3092 while (@children) { 3837 while (@children) {
3093 my $w = pop @children; 3838 my $w = pop @children;
3094 push @children, $w->children; 3839 push @children, $w->children;
3095 $w->set_invisible; 3840 $w->set_invisible;
… …
3115 $_->() 3860 $_->()
3116 for values %{delete $self->{refresh_hook}}; 3861 for values %{delete $self->{refresh_hook}};
3117 } 3862 }
3118 3863
3119 if ($self->{realloc}) { 3864 if ($self->{realloc}) {
3865 my %queue;
3120 my @queue; 3866 my @queue;
3867 my $widget;
3121 3868
3869 outer:
3122 while () { 3870 while () {
3123 if ($self->{realloc}) { 3871 if (my $realloc = delete $self->{realloc}) {
3124 #TODO use array-of-depth approach 3872 for $widget (values %$realloc) {
3873 $widget->{visible} or next; # do not resize invisible widgets
3125 3874
3126 @queue = sort { $a->{visible} <=> $b->{visible} } 3875 $queue{$widget+0}++ and next; # duplicates are common
3127 @queue, values %{delete $self->{realloc}}; 3876
3877 push @{ $queue[$widget->{visible}] }, $widget;
3878 }
3128 } 3879 }
3129 3880
3881 while () {
3882 @queue or last outer;
3883
3884 $widget = pop @{ $queue[-1] || [] }
3885 and last;
3886
3887 pop @queue;
3888 }
3889
3890 delete $queue{$widget+0};
3891
3892 my ($w, $h) = $widget->size_request;
3893
3894 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3895 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3896
3897 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3898 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3899
3900 $w = $widget->{force_w} if exists $widget->{force_w};
3901 $h = $widget->{force_h} if exists $widget->{force_h};
3902
3903 if ($widget->{req_w} != $w || $widget->{req_h} != $h
3904 || delete $widget->{force_realloc}) {
3905 $widget->{req_w} = $w;
3906 $widget->{req_h} = $h;
3907
3908 $self->{size_alloc}{$widget+0} = $widget;
3909
3910 if (my $parent = $widget->{parent}) {
3911 $self->{realloc}{$parent+0} = $parent
3912 unless $queue{$parent+0};
3913
3914 $parent->{force_size_alloc} = 1;
3915 $self->{size_alloc}{$parent+0} = $parent;
3916 }
3917 }
3918
3919 delete $self->{realloc}{$widget+0};
3920 }
3921 }
3922
3923 while (my $size_alloc = delete $self->{size_alloc}) {
3924 my @queue = sort { $b->{visible} <=> $a->{visible} }
3925 values %$size_alloc;
3926
3927 while () {
3130 my $widget = pop @queue || last; 3928 my $widget = pop @queue || last;
3131 3929
3132 $widget->{visible} or last; # do not resize invisible widgets 3930 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3133
3134 my ($w, $h) = $widget->{def_w} && $widget->{def_h}
3135 ? @$widget{qw(def_w def_h)}
3136 : $widget->size_request;
3137
3138 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
3139
3140 $widget->{req_w} = $w;
3141 $widget->{req_h} = $h;
3142
3143 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h];
3144
3145 push @queue, $widget->{parent}
3146 if $widget->{parent};
3147 }
3148 }
3149
3150 while (my $size_alloc = delete $self->{size_alloc}) {
3151 my @queue = sort $b->[0]{visible} <=> $a->[0]{visible},
3152 values %$size_alloc;
3153
3154 while () {
3155 my ($widget, $w, $h) = @{ pop @queue or last };
3156 3931
3157 $w = 0 if $w < 0; 3932 $w = 0 if $w < 0;
3158 $h = 0 if $h < 0; 3933 $h = 0 if $h < 0;
3159 3934
3160 my $changed = $widget->{w} != $w || $widget->{h} != $h; 3935 $w = int $w + 0.5;
3936 $h = int $h + 0.5;
3161 3937
3938 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3939 $widget->{old_w} = $widget->{w};
3940 $widget->{old_h} = $widget->{h};
3941
3162 $widget->{w} = $w; 3942 $widget->{w} = $w;
3163 $widget->{h} = $h; 3943 $widget->{h} = $h;
3164 3944
3165 $widget->emit (size_allocate => $w, $h, $changed); 3945 $widget->emit (size_allocate => $w, $h);
3946 }
3166 } 3947 }
3167 } 3948 }
3168 3949
3169 while ($self->{post_alloc_hook}) { 3950 while ($self->{post_alloc_hook}) {
3170 $_->() 3951 $_->()
3171 for values %{delete $self->{post_alloc_hook}}; 3952 for values %{delete $self->{post_alloc_hook}};
3172 } 3953 }
3954
3173 3955
3174 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3956 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3175 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3957 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3176 glClear GL_COLOR_BUFFER_BIT; 3958 glClear GL_COLOR_BUFFER_BIT;
3177 3959
… …
3179 glLoadIdentity; 3961 glLoadIdentity;
3180 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 3962 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3181 glMatrixMode GL_MODELVIEW; 3963 glMatrixMode GL_MODELVIEW;
3182 glLoadIdentity; 3964 glLoadIdentity;
3183 3965
3966 {
3967 package CFClient::UI::Base;
3968
3969 ($draw_x, $draw_y, $draw_w, $draw_h) =
3970 (0, 0, $self->{w}, $self->{h});
3971 }
3972
3184 $self->_draw; 3973 $self->_draw;
3185} 3974}
3186 3975
3187############################################################################# 3976#############################################################################
3188 3977

Diff Legend

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