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.311 by root, Fri Jun 23 22:35:16 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 {
328 require Carp; 336 require Carp;
329 Carp::confess "size_request is abstract"; 337 Carp::confess "size_request is abstract";
330} 338}
331 339
340sub baseline_shift {
341 0
342}
343
332sub configure { 344sub configure {
333 my ($self, $x, $y, $w, $h) = @_; 345 my ($self, $x, $y, $w, $h) = @_;
334 346
335 if ($self->{aspect}) { 347 if ($self->{aspect}) {
348 my ($ow, $oh) = ($w, $h);
349
336 my $w2 = List::Util::min $w, int $h * $self->{aspect}; 350 $w = List::Util::min $w, int $h * $self->{aspect};
337 my $h2 = List::Util::min $h, int $w / $self->{aspect}; 351 $h = List::Util::min $h, int $w / $self->{aspect};
338 352
339 # use alignment to adjust x, y 353 # use alignment to adjust x, y
340 354
341 $x += int +($w - $w2) * 0.5; 355 $x += int 0.5 * ($ow - $w);
342 $y += int +($h - $h2) * 0.5; 356 $y += int 0.5 * ($oh - $h);
343
344 ($w, $h) = ($w2, $h2);
345 } 357 }
346 358
347 if ($self->{x} != $x || $self->{y} != $y) { 359 if ($self->{x} ne $x || $self->{y} ne $y) {
348 $self->{x} = $x; 360 $self->{x} = $x;
349 $self->{y} = $y; 361 $self->{y} = $y;
350 $self->update; 362 $self->update;
351 } 363 }
352 364
353 if ($self->{w} != $w || $self->{h} != $h) { 365 if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
354 return unless $self->{visible}; 366 return unless $self->{visible};
355 367
368 $self->{alloc_w} = $w;
369 $self->{alloc_h} = $h;
370
356 $self->{root}->{size_alloc}{$self+0} = [$self, $w, $h]; 371 $self->{root}{size_alloc}{$self+0} = $self;
357 } 372 }
358}
359
360sub size_allocate {
361 # nothing to be done
362} 373}
363 374
364sub children { 375sub children {
376 # nop
377}
378
379sub visible_children {
380 $_[0]->children
365} 381}
366 382
367sub set_max_size { 383sub set_max_size {
368 my ($self, $w, $h) = @_; 384 my ($self, $w, $h) = @_;
369 385
370 delete $self->{max_w}; $self->{max_w} = $w if $w; 386 $self->{max_w} = int $w if defined $w;
371 delete $self->{max_h}; $self->{max_h} = $h if $h; 387 $self->{max_h} = int $h if defined $h;
388
389 $self->realloc;
372} 390}
373 391
374sub set_tooltip { 392sub set_tooltip {
375 my ($self, $tooltip) = @_; 393 my ($self, $tooltip) = @_;
376 394
… …
381 399
382 $self->{tooltip} = $tooltip; 400 $self->{tooltip} = $tooltip;
383 401
384 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 402 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
385 delete $CFClient::UI::TOOLTIP->{owner}; 403 delete $CFClient::UI::TOOLTIP->{owner};
386 CFClient::UI::check_tooltip; 404 $CFClient::UI::TOOLTIP_WATCHER->cb->();
387 } 405 }
388} 406}
389 407
390# translate global coordinates to local coordinate system 408# translate global coordinates to local coordinate system
391sub coord2local { 409sub coord2local {
… …
399 my ($self, $x, $y) = @_; 417 my ($self, $x, $y) = @_;
400 418
401 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y}) 419 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
402} 420}
403 421
404sub focus_in { 422sub invoke_focus_in {
405 my ($self) = @_; 423 my ($self) = @_;
406 424
407 return if $FOCUS == $self; 425 return if $FOCUS == $self;
408 return unless $self->{can_focus}; 426 return unless $self->{can_focus};
409 427
410 my $focus = $FOCUS; $FOCUS = $self; 428 my $focus = $FOCUS; $FOCUS = $self;
411 429
412 $self->_emit (focus_in => $focus);
413
414 $focus->update if $focus; 430 $focus->update if $focus;
415 $FOCUS->update; 431 $FOCUS->update;
416}
417 432
433 0
434}
435
418sub focus_out { 436sub invoke_focus_out {
419 my ($self) = @_; 437 my ($self) = @_;
420 438
421 return unless $FOCUS == $self; 439 return unless $FOCUS == $self;
422 440
423 my $focus = $FOCUS; undef $FOCUS; 441 my $focus = $FOCUS; undef $FOCUS;
424 442
425 $self->_emit (focus_out => $focus);
426
427 $focus->update if $focus; #? 443 $focus->update if $focus; #?
428 444
429 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus 445 $::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus
430 unless $FOCUS; 446 unless $FOCUS;
431}
432 447
448 0
449}
450
451sub grab_focus {
452 my ($self) = @_;
453
454 $self->emit ("focus_in");
455}
456
433sub mouse_motion { } 457sub invoke_mouse_motion { 1 }
434sub button_up { } 458sub invoke_button_up { 1 }
435sub key_down { } 459sub invoke_key_down { 1 }
436sub key_up { } 460sub invoke_key_up { 1 }
437 461
438sub button_down { 462sub invoke_button_down {
439 my ($self, $ev, $x, $y) = @_; 463 my ($self, $ev, $x, $y) = @_;
440 464
441 $self->focus_in; 465 $self->grab_focus;
442}
443 466
444sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 467 1
445sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 468}
446sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 469
447sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 470sub connect {
448sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} } 471 my ($self, $signal, $cb) = @_;
472
473 push @{ $self->{signal_cb}{$signal} }, $cb;
474}
475
476sub emit {
477 my ($self, $signal, @args) = @_;
478
479 #d##TODO# stop propagating at first true, do not use sum
480 (List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}) # before
481 || ($self->can ("invoke_$signal") || sub { 1 })->($self, @args) # closure
482 || ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent
483}
449 484
450sub find_widget { 485sub find_widget {
451 my ($self, $x, $y) = @_; 486 my ($self, $x, $y) = @_;
452 487
453 return () unless $self->{can_events}; 488 return () unless $self->{can_events};
… …
461 496
462sub set_parent { 497sub set_parent {
463 my ($self, $parent) = @_; 498 my ($self, $parent) = @_;
464 499
465 Scalar::Util::weaken ($self->{parent} = $parent); 500 Scalar::Util::weaken ($self->{parent} = $parent);
466
467 $self->set_visible if $parent->{visible}; 501 $self->set_visible if $parent->{visible};
468} 502}
469 503
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 { 504sub realloc {
494 my ($self) = @_; 505 my ($self) = @_;
495 506
496 if ($self->{visible}) { 507 if ($self->{visible}) {
497 return if $self->{root}{realloc}{$self}; 508 return if $self->{root}{realloc}{$self+0};
498 509
499 $self->{root}{realloc}{$self} = $self; 510 $self->{root}{realloc}{$self+0} = $self;
500 $self->{root}->update; 511 $self->{root}->update;
501 } else { 512 } else {
502 delete $self->{req_w}; 513 delete $self->{req_w};
514 delete $self->{req_h};
503 } 515 }
504} 516}
505 517
506sub update { 518sub update {
507 my ($self) = @_; 519 my ($self) = @_;
508 520
509 $self->{parent}->update 521 $self->{parent}->update
510 if $self->{parent}; 522 if $self->{parent};
511} 523}
512 524
525sub reconfigure {
526 my ($self) = @_;
527
528 $self->realloc;
529 $self->update;
530}
531
532# using global variables seems a bit hacky, but passing through all drawing
533# functions seems pointless.
534our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn
535
513sub draw { 536sub draw {
514 my ($self) = @_; 537 my ($self) = @_;
515 538
516 return unless $self->{h} && $self->{w}; 539 return unless $self->{h} && $self->{w};
540
541 # update screen rectangle
542 local $draw_x = $draw_x + $self->{x};
543 local $draw_y = $draw_y + $self->{y};
544 local $draw_w = $draw_x + $self->{w};
545 local $draw_h = $draw_y + $self->{h};
546
547 # skip widgets that are entirely outside the drawing area
548 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
549 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
517 550
518 glPushMatrix; 551 glPushMatrix;
519 glTranslate $self->{x}, $self->{y}, 0; 552 glTranslate $self->{x}, $self->{y}, 0;
520 $self->_draw;
521 glPopMatrix;
522 553
523 if ($self == $HOVER && $self->{can_hover}) { 554 if ($self == $HOVER && $self->{can_hover}) {
524 my ($x, $y) = @$self{qw(x y)};
525
526 glColor 1, 0.8, 0.5, 0.2; 555 glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
527 glEnable GL_BLEND; 556 glEnable GL_BLEND;
528 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 557 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
529 glBegin GL_QUADS; 558 glBegin GL_QUADS;
530 glVertex $x , $y; 559 glVertex 0 , 0;
531 glVertex $x + $self->{w}, $y; 560 glVertex $self->{w}, 0;
532 glVertex $x + $self->{w}, $y + $self->{h}; 561 glVertex $self->{w}, $self->{h};
533 glVertex $x , $y + $self->{h}; 562 glVertex 0 , $self->{h};
534 glEnd; 563 glEnd;
535 glDisable GL_BLEND; 564 glDisable GL_BLEND;
536 } 565 }
537 566
538 if ($ENV{PCLIENT_DEBUG}) { 567 if ($ENV{CFPLUS_DEBUG} & 1) {
539 glPushMatrix; 568 glPushMatrix;
540 glColor 1, 1, 0, 1; 569 glColor 1, 1, 0, 1;
541 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 570 glTranslate 0.375, 0.375;
542 glBegin GL_LINE_LOOP; 571 glBegin GL_LINE_LOOP;
543 glVertex 0 , 0; 572 glVertex 0 , 0;
544 glVertex $self->{w} - 1, 0; 573 glVertex $self->{w} - 1, 0;
545 glVertex $self->{w} - 1, $self->{h} - 1; 574 glVertex $self->{w} - 1, $self->{h} - 1;
546 glVertex 0 , $self->{h} - 1; 575 glVertex 0 , $self->{h} - 1;
547 glEnd; 576 glEnd;
548 glPopMatrix; 577 glPopMatrix;
549 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 578 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
550 } 579 }
580
581 $self->_draw;
582 glPopMatrix;
551} 583}
552 584
553sub _draw { 585sub _draw {
554 my ($self) = @_; 586 my ($self) = @_;
555 587
… …
558 590
559sub DESTROY { 591sub DESTROY {
560 my ($self) = @_; 592 my ($self) = @_;
561 593
562 delete $WIDGET{$self+0}; 594 delete $WIDGET{$self+0};
563 #$self->deactivate; 595
596 eval { $self->destroy };
597 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
564} 598}
565 599
566############################################################################# 600#############################################################################
567 601
568package CFClient::UI::DrawBG; 602package CFClient::UI::DrawBG;
… …
593 627
594 if ($color && (@$color < 4 || $color->[3])) { 628 if ($color && (@$color < 4 || $color->[3])) {
595 my ($w, $h) = @$self{qw(w h)}; 629 my ($w, $h) = @$self{qw(w h)};
596 630
597 glEnable GL_BLEND; 631 glEnable GL_BLEND;
598 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 632 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
599 glColor @$color; 633 glColor_premultiply @$color;
600 634
601 glBegin GL_QUADS; 635 glBegin GL_QUADS;
602 glVertex 0 , 0; 636 glVertex 0 , 0;
603 glVertex 0 , $h; 637 glVertex 0 , $h;
604 glVertex $w, $h; 638 glVertex $w, $h;
… …
619 my ($class, %arg) = @_; 653 my ($class, %arg) = @_;
620 $class->SUPER::new (can_events => 0, %arg); 654 $class->SUPER::new (can_events => 0, %arg);
621} 655}
622 656
623sub size_request { 657sub size_request {
624 (0, 0) 658 my ($self) = @_;
659
660 ($self->{w} + 0, $self->{h} + 0)
625} 661}
626 662
627sub draw { } 663sub draw { }
628 664
629############################################################################# 665#############################################################################
… …
633our @ISA = CFClient::UI::Base::; 669our @ISA = CFClient::UI::Base::;
634 670
635sub new { 671sub new {
636 my ($class, %arg) = @_; 672 my ($class, %arg) = @_;
637 673
638 my $children = delete $arg{children} || []; 674 my $children = delete $arg{children};
639 675
640 my $self = $class->SUPER::new ( 676 my $self = $class->SUPER::new (
641 children => [], 677 children => [],
642 can_events => 0, 678 can_events => 0,
643 %arg, 679 %arg,
644 ); 680 );
681
645 $self->add ($_) for @$children; 682 $self->add (@$children)
683 if $children;
646 684
647 $self 685 $self
648} 686}
649 687
650sub add { 688sub add {
… …
698 $x -= $self->{x}; 736 $x -= $self->{x};
699 $y -= $self->{y}; 737 $y -= $self->{y};
700 738
701 my $res; 739 my $res;
702 740
703 for (reverse @{ $self->{children} }) { 741 for (reverse $self->visible_children) {
704 $res = $_->find_widget ($x, $y) 742 $res = $_->find_widget ($x, $y)
705 and return $res; 743 and return $res;
706 } 744 }
707 745
708 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y}) 746 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
… …
729} 767}
730 768
731sub add { 769sub add {
732 my ($self, $child) = @_; 770 my ($self, $child) = @_;
733 771
734 $self->{children} = []; 772 $self->SUPER::remove ($_) for @{ $self->{children} };
735
736 $self->SUPER::add ($child); 773 $self->SUPER::add ($child);
737} 774}
738 775
739sub remove { 776sub remove {
740 my ($self, $widget) = @_; 777 my ($self, $widget) = @_;
… …
749 786
750sub size_request { 787sub size_request {
751 $_[0]{children}[0]->size_request 788 $_[0]{children}[0]->size_request
752} 789}
753 790
754sub size_allocate { 791sub invoke_size_allocate {
755 my ($self, $w, $h, $changed) = @_; 792 my ($self, $w, $h) = @_;
756 793
757 $self->{children}[0]->configure (0, 0, $w, $h); 794 $self->{children}[0]->configure (0, 0, $w, $h);
795
796 1
758} 797}
759 798
760############################################################################# 799#############################################################################
800
801# back-buffered drawing area
761 802
762package CFClient::UI::Window; 803package CFClient::UI::Window;
763 804
764our @ISA = CFClient::UI::Bin::; 805our @ISA = CFClient::UI::Bin::;
765 806
… …
776 817
777 $ROOT->on_post_alloc ($self => sub { $self->render_child }); 818 $ROOT->on_post_alloc ($self => sub { $self->render_child });
778 $self->SUPER::update; 819 $self->SUPER::update;
779} 820}
780 821
781sub size_allocate { 822sub invoke_size_allocate {
782 my ($self, $w, $h, $changed) = @_; 823 my ($self, $w, $h) = @_;
783 824
784 $self->SUPER::size_allocate ($w, $h, $changed);
785 $self->update 825 $self->update;
786 if $changed; 826
827 $self->SUPER::invoke_size_allocate ($w, $h)
787} 828}
788 829
789sub _render { 830sub _render {
831 my ($self) = @_;
832
790 $_[0]{children}[0]->draw; 833 $self->{children}[0]->draw;
791} 834}
792 835
793sub render_child { 836sub render_child {
794 my ($self) = @_; 837 my ($self) = @_;
795 838
796 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 839 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
797 glClearColor 0, 0, 0, 0; 840 glClearColor 0, 0, 0, 0;
798 glClear GL_COLOR_BUFFER_BIT; 841 glClear GL_COLOR_BUFFER_BIT;
799 842
843 {
844 package CFClient::UI::Base;
845
846 ($draw_x, $draw_y, $draw_w, $draw_h) =
847 (0, 0, $self->{w}, $self->{h});
848 }
849
800 $self->_render; 850 $self->_render;
801 }; 851 };
802} 852}
803 853
804sub _draw { 854sub _draw {
805 my ($self) = @_; 855 my ($self) = @_;
806 856
807 my ($w, $h) = ($self->w, $self->h); 857 my ($w, $h) = @$self{qw(w h)};
808 858
809 my $tex = $self->{texture} 859 my $tex = $self->{texture}
810 or return; 860 or return;
811 861
812 glEnable GL_TEXTURE_2D; 862 glEnable GL_TEXTURE_2D;
813 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 863 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
814 glColor 1, 1, 1, 1; 864 glColor 0, 0, 0, 1;
815 865
816 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 866 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
817 867
818 glDisable GL_TEXTURE_2D; 868 glDisable GL_TEXTURE_2D;
819} 869}
… …
835} 885}
836 886
837sub size_request { 887sub size_request {
838 my ($self) = @_; 888 my ($self) = @_;
839 889
840 my ($w, $h) = @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 890 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
841 891
842 $w = 10 if $self->{scroll_x}; 892 $w = 10 if $self->{scroll_x};
843 $h = 10 if $self->{scroll_y}; 893 $h = 10 if $self->{scroll_y};
844 894
845 ($w, $h) 895 ($w, $h)
846} 896}
847 897
848sub size_allocate { 898sub invoke_size_allocate {
849 my ($self, $w, $h, $changed) = @_; 899 my ($self, $w, $h) = @_;
850 900
901 my $child = $self->child;
902
851 $w = $self->{child_w} if $self->{scroll_x} && $self->{child_w}; 903 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
852 $h = $self->{child_h} if $self->{scroll_y} && $self->{child_h}; 904 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
853 905
854 $self->child->configure (0, 0, $w, $h); 906 $self->child->configure (0, 0, $w, $h);
855 $self->update; 907 $self->update;
908
909 1
856} 910}
857 911
858sub set_offset { 912sub set_offset {
859 my ($self, $x, $y) = @_; 913 my ($self, $x, $y) = @_;
860 914
… …
893} 947}
894 948
895sub _render { 949sub _render {
896 my ($self) = @_; 950 my ($self) = @_;
897 951
952 local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};
953 local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y};
954
898 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 955 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
899 956
900 $self->SUPER::_render; 957 $self->SUPER::_render;
901} 958}
902 959
… …
905package CFClient::UI::ScrolledWindow; 962package CFClient::UI::ScrolledWindow;
906 963
907our @ISA = CFClient::UI::HBox::; 964our @ISA = CFClient::UI::HBox::;
908 965
909sub new { 966sub new {
910 my $class = shift; 967 my ($class, %arg) = @_;
968
969 my $child = delete $arg{child};
911 970
912 my $self; 971 my $self;
913 972
914 my $slider = new CFClient::UI::Slider 973 my $slider = new CFClient::UI::Slider
915 vertical => 1, 974 vertical => 1,
… …
920 ; 979 ;
921 980
922 $self = $class->SUPER::new ( 981 $self = $class->SUPER::new (
923 vp => (new CFClient::UI::ViewPort expand => 1), 982 vp => (new CFClient::UI::ViewPort expand => 1),
924 slider => $slider, 983 slider => $slider,
925 @_, 984 %arg,
926 ); 985 );
927 986
928 $self->{vp}->add ($self->{scrolled});
929 $self->add ($self->{vp});
930 $self->add ($self->{slider}); 987 $self->SUPER::add ($self->{vp}, $self->{slider});
988 $self->add ($child) if $child;
931 989
932 $self 990 $self
991}
992
993sub add {
994 my ($self, $widget) = @_;
995
996 $self->{vp}->add ($self->{child} = $widget);
933} 997}
934 998
935sub update { 999sub update {
936 my ($self) = @_; 1000 my ($self) = @_;
937 1001
… …
940 # todo: overwrite size_allocate of child 1004 # todo: overwrite size_allocate of child
941 my $child = $self->{vp}->child; 1005 my $child = $self->{vp}->child;
942 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]); 1006 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
943} 1007}
944 1008
945sub size_allocate { 1009sub invoke_size_allocate {
946 my ($self, $w, $h, $changed) = @_; 1010 my ($self, $w, $h) = @_;
947
948 $self->SUPER::size_allocate ($w, $h, $changed);
949 1011
950 my $child = $self->{vp}->child; 1012 my $child = $self->{vp}->child;
951 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]); 1013 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1014
1015 $self->SUPER::invoke_size_allocate ($w, $h)
952} 1016}
953 1017
954#TODO# update range on size_allocate depending on child 1018#TODO# update range on size_allocate depending on child
955# update viewport offset on scroll 1019# update viewport offset on scroll
956 1020
… …
976 1040
977 if ($self->{bg}) { 1041 if ($self->{bg}) {
978 my ($w, $h) = @$self{qw(w h)}; 1042 my ($w, $h) = @$self{qw(w h)};
979 1043
980 glEnable GL_BLEND; 1044 glEnable GL_BLEND;
981 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1045 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
982 glColor @{ $self->{bg} }; 1046 glColor_premultiply @{ $self->{bg} };
983 1047
984 glBegin GL_QUADS; 1048 glBegin GL_QUADS;
985 glVertex 0 , 0; 1049 glVertex 0 , 0;
986 glVertex 0 , $h; 1050 glVertex 0 , $h;
987 glVertex $w, $h; 1051 glVertex $w, $h;
… …
1000 1064
1001our @ISA = CFClient::UI::Bin::; 1065our @ISA = CFClient::UI::Bin::;
1002 1066
1003use CFClient::OpenGL; 1067use CFClient::OpenGL;
1004 1068
1005my @tex = 1069my $bg =
1070 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1071 mipmap => 1, wrap => 1;
1072
1073my @border =
1006 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1074 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); 1075 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1008 1076
1009sub new { 1077sub new {
1010 my $class = shift; 1078 my ($class, %arg) = @_;
1011 1079
1012 my $self = $class->SUPER::new ( 1080 my $self = $class->SUPER::new (
1013 bg => [1, 1, 1, 1], 1081 bg => [1, 1, 1, 1],
1014 border_bg => [1, 1, 1, 1], 1082 border_bg => [1, 1, 1, 1],
1015 border => 0.6, 1083 border => 0.6,
1016 is_toplevel => 1,
1017 can_events => 1, 1084 can_events => 1,
1018 @_ 1085 min_w => 16,
1086 min_h => 16,
1087 %arg,
1019 ); 1088 );
1020 1089
1021 $self->{title} &&= new CFClient::UI::Label 1090 $self->{title_widget} = new CFClient::UI::Label
1022 align => 0, 1091 align => 0,
1023 valign => 1, 1092 valign => 1,
1024 text => $self->{title}, 1093 text => $self->{title},
1025 fontsize => $self->{border}; 1094 fontsize => $self->{border},
1095 if exists $self->{title};
1096
1097 if ($self->{has_close_button}) {
1098 $self->{close_button} =
1099 new CFClient::UI::ImageButton
1100 path => 'x1_close.png',
1101 on_activate => sub { $self->hide };
1102
1103 $self->CFClient::UI::Container::add ($self->{close_button});
1104 }
1026 1105
1027 $self 1106 $self
1107}
1108
1109sub add {
1110 my ($self, @widgets) = @_;
1111
1112 $self->SUPER::add (@widgets);
1113 $self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button};
1114 $self->CFClient::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1028} 1115}
1029 1116
1030sub border { 1117sub border {
1031 int $_[0]{border} * $::FONTSIZE 1118 int $_[0]{border} * $::FONTSIZE
1032} 1119}
1033 1120
1034sub size_request { 1121sub size_request {
1035 my ($self) = @_; 1122 my ($self) = @_;
1123
1124 $self->{title_widget}->size_request
1125 if $self->{title_widget};
1126
1127 $self->{close_button}->size_request
1128 if $self->{close_button};
1036 1129
1037 my ($w, $h) = $self->SUPER::size_request; 1130 my ($w, $h) = $self->SUPER::size_request;
1038 1131
1039 ( 1132 (
1040 $w + $self->border * 2, 1133 $w + $self->border * 2,
1041 $h + $self->border * 2, 1134 $h + $self->border * 2,
1042 ) 1135 )
1043} 1136}
1044 1137
1045sub size_allocate { 1138sub invoke_size_allocate {
1046 my ($self, $w, $h, $changed) = @_; 1139 my ($self, $w, $h) = @_;
1047 1140
1048 return unless $changed; 1141 if ($self->{title_widget}) {
1142 $self->{title_widget}{w} = $w;
1143 $self->{title_widget}{h} = $h;
1144 $self->{title_widget}->invoke_size_allocate ($w, $h);
1145 }
1049 1146
1147 my $border = $self->border;
1148
1050 $h -= List::Util::max 0, $self->border * 2; 1149 $h -= List::Util::max 0, $border * 2;
1051 $w -= List::Util::max 0, $self->border * 2; 1150 $w -= List::Util::max 0, $border * 2;
1052 1151
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); 1152 $self->child->configure ($border, $border, $w, $h);
1057}
1058 1153
1154 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1155 if $self->{close_button};
1156
1157 1
1158}
1159
1059sub button_down { 1160sub invoke_button_down {
1060 my ($self, $ev, $x, $y) = @_; 1161 my ($self, $ev, $x, $y) = @_;
1061 1162
1062 my ($w, $h) = @$self{qw(w h)}; 1163 my ($w, $h) = @$self{qw(w h)};
1063 my $border = $self->border; 1164 my $border = $self->border;
1064 1165
… …
1077 my ($ev, $x, $y) = @_; 1178 my ($ev, $x, $y) = @_;
1078 1179
1079 my $dx = $ev->{x} - $ox; 1180 my $dx = $ev->{x} - $ox;
1080 my $dy = $ev->{y} - $oy; 1181 my $dy = $ev->{y} - $oy;
1081 1182
1082 $self->{user_x} = $wx + $dx * $mx;
1083 $self->{user_y} = $wy + $dy * $my;
1084 $self->{def_w} = $bw + $dx * ($mx ? -1 : 1); 1183 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1085 $self->{def_h} = $bh + $dy * ($my ? -1 : 1); 1184 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1086 $self->move ($self->{user_x}, $self->{user_y}); 1185
1186 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1087 $self->realloc; 1187 $self->realloc;
1088 }; 1188 };
1089 1189
1090 } elsif ($lr ^ $td) { 1190 } elsif ($lr ^ $td) {
1091 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1191 my ($ox, $oy) = ($ev->{x}, $ev->{y});
… …
1094 $self->{motion} = sub { 1194 $self->{motion} = sub {
1095 my ($ev, $x, $y) = @_; 1195 my ($ev, $x, $y) = @_;
1096 1196
1097 ($x, $y) = ($ev->{x}, $ev->{y}); 1197 ($x, $y) = ($ev->{x}, $ev->{y});
1098 1198
1099 $self->{user_x} = $bx + $x - $ox; 1199 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1100 $self->{user_y} = $by + $y - $oy; 1200 # HACK: the next line is required to enforce placement
1101 1201 $self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
1102 $self->move ($self->{user_x}, $self->{user_y});
1103 $self->realloc;
1104 }; 1202 };
1203 } else {
1204 return 0;
1205 }
1206
1105 } 1207 1
1106} 1208}
1107 1209
1108sub button_up { 1210sub invoke_button_up {
1109 my ($self, $ev, $x, $y) = @_; 1211 my ($self, $ev, $x, $y) = @_;
1110 1212
1111 delete $self->{motion}; 1213 ! ! delete $self->{motion}
1112} 1214}
1113 1215
1114sub mouse_motion { 1216sub invoke_mouse_motion {
1115 my ($self, $ev, $x, $y) = @_; 1217 my ($self, $ev, $x, $y) = @_;
1116 1218
1117 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1219 $self->{motion}->($ev, $x, $y) if $self->{motion};
1220
1221 ! ! $self->{motion}
1118} 1222}
1119 1223
1120sub _draw { 1224sub _draw {
1121 my ($self) = @_; 1225 my ($self) = @_;
1122 1226
1227 my $child = $self->{children}[0];
1228
1123 my ($w, $h ) = ($self->{w}, $self->{h}); 1229 my ($w, $h ) = ($self->{w}, $self->{h});
1124 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1230 my ($cw, $ch) = ($child->{w}, $child->{h});
1125 1231
1126 glEnable GL_TEXTURE_2D; 1232 glEnable GL_TEXTURE_2D;
1127 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1233 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1128 1234
1129 my $border = $self->border; 1235 my $border = $self->border;
1130 1236
1131 glColor @{ $self->{border_bg} }; 1237 glColor @{ $self->{border_bg} };
1132 $tex[1]->draw_quad_alpha (0, 0, $w, $border); 1238 $border[0]->draw_quad_alpha (0, 0, $w, $border);
1133 $tex[3]->draw_quad_alpha (0, $border, $border, $ch); 1239 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
1134 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1240 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1135 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border); 1241 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
1136 1242
1137 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1243 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1138 my $bg = $tex[0]; 1244 glColor @{ $self->{bg} };
1139 1245
1140 # TODO: repeat texture not scale 1246 # TODO: repeat texture not scale
1247 # solve this better(?)
1141 my $rep_x = $cw / $bg->{w}; 1248 $bg->{s} = $cw / $bg->{w};
1142 my $rep_y = $ch / $bg->{h}; 1249 $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); 1250 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1150 } 1251 }
1151 1252
1152 glDisable GL_TEXTURE_2D; 1253 glDisable GL_TEXTURE_2D;
1153 1254
1154 $self->{title}->draw if $self->{title};
1155
1156 $self->child->draw; 1255 $child->draw;
1256
1257 if ($self->{title_widget}) {
1258 glTranslate 0, $border - $self->{h};
1259 $self->{title_widget}->_draw;
1260
1261 glTranslate 0, - ($border - $self->{h});
1262 }
1263
1264 $self->{close_button}->draw
1265 if $self->{close_button};
1157} 1266}
1158 1267
1159############################################################################# 1268#############################################################################
1160 1269
1161package CFClient::UI::Table; 1270package CFClient::UI::Table;
… …
1184 1293
1185 $child->set_parent ($self); 1294 $child->set_parent ($self);
1186 $self->{children}[$y][$x] = $child; 1295 $self->{children}[$y][$x] = $child;
1187 1296
1188 $self->realloc; 1297 $self->realloc;
1298}
1299
1300sub remove {
1301 my ($self, $child) = @_;
1302
1303 # TODO: not yet implemented
1189} 1304}
1190 1305
1191# TODO: move to container class maybe? send children a signal on removal? 1306# TODO: move to container class maybe? send children a signal on removal?
1192sub clear { 1307sub clear {
1193 my ($self) = @_; 1308 my ($self) = @_;
… …
1234 (sum @$ws), 1349 (sum @$ws),
1235 (sum @$hs), 1350 (sum @$hs),
1236 ) 1351 )
1237} 1352}
1238 1353
1239sub size_allocate { 1354sub invoke_size_allocate {
1240 my ($self, $w, $h, $changed) = @_; 1355 my ($self, $w, $h) = @_;
1241 1356
1242 my ($ws, $hs) = $self->get_wh; 1357 my ($ws, $hs) = $self->get_wh;
1243 1358
1244 my $req_w = (sum @$ws) || 1; 1359 my $req_w = (sum @$ws) || 1;
1245 my $req_h = (sum @$hs) || 1; 1360 my $req_h = (sum @$hs) || 1;
… …
1276 } 1391 }
1277 1392
1278 $y += $row_h; 1393 $y += $row_h;
1279 } 1394 }
1280 1395
1396 1
1281} 1397}
1282 1398
1283sub find_widget { 1399sub find_widget {
1284 my ($self, $x, $y) = @_; 1400 my ($self, $x, $y) = @_;
1285 1401
… …
1322 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1438 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1323 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1439 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1324 ) 1440 )
1325} 1441}
1326 1442
1327sub size_allocate { 1443sub invoke_size_allocate {
1328 my ($self, $w, $h, $changed) = @_; 1444 my ($self, $w, $h) = @_;
1329 1445
1330 my $space = $self->{vertical} ? $h : $w; 1446 my $space = $self->{vertical} ? $h : $w;
1331 my $children = $self->{children}; 1447 my @children = $self->visible_children;
1332 1448
1333 my @req; 1449 my @req;
1334 1450
1335 if ($self->{homogeneous}) { 1451 if ($self->{homogeneous}) {
1336 @req = ($space / (@$children || 1)) x @$children; 1452 @req = ($space / (@children || 1)) x @children;
1337 } else { 1453 } else {
1338 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children; 1454 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1339 my $req = List::Util::sum @req; 1455 my $req = List::Util::sum @req;
1340 1456
1341 if ($req > $space) { 1457 if ($req > $space) {
1342 # ah well, not enough space 1458 # ah well, not enough space
1343 $_ *= $space / $req for @req; 1459 $_ *= $space / $req for @req;
1344 } else { 1460 } else {
1345 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1; 1461 my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1346 1462
1347 $space = ($space - $req) / $expand; # remaining space to give away 1463 $space = ($space - $req) / $expand; # remaining space to give away
1348 1464
1349 $req[$_] += $space * $children->[$_]{expand} 1465 $req[$_] += $space * $children[$_]{expand}
1350 for 0 .. $#$children; 1466 for 0 .. $#children;
1351 } 1467 }
1352 } 1468 }
1353 1469
1354 CFClient::UI::harmonize \@req; 1470 CFClient::UI::harmonize \@req;
1355 1471
1356 my $pos = 0; 1472 my $pos = 0;
1357 for (0 .. $#$children) { 1473 for (0 .. $#children) {
1358 my $alloc = $req[$_]; 1474 my $alloc = $req[$_];
1359 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h)); 1475 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1360 1476
1361 $pos += $alloc; 1477 $pos += $alloc;
1362 } 1478 }
1363 1479
1364 1 1480 1
… …
1416 ellipsise => 3, # end 1532 ellipsise => 3, # end
1417 layout => (new CFClient::Layout), 1533 layout => (new CFClient::Layout),
1418 fontsize => 1, 1534 fontsize => 1,
1419 align => -1, 1535 align => -1,
1420 valign => -1, 1536 valign => -1,
1421 padding => 2, 1537 padding_x => 2,
1538 padding_y => 2,
1422 can_events => 0, 1539 can_events => 0,
1423 %arg 1540 %arg
1424 ); 1541 );
1425 1542
1426 if (exists $self->{template}) { 1543 if (exists $self->{template}) {
… …
1453 1570
1454 delete $self->{texture}; 1571 delete $self->{texture};
1455 $self->SUPER::update; 1572 $self->SUPER::update;
1456} 1573}
1457 1574
1575sub realloc {
1576 my ($self) = @_;
1577
1578 delete $self->{ox};
1579 $self->SUPER::realloc;
1580}
1581
1458sub set_text { 1582sub set_text {
1459 my ($self, $text) = @_; 1583 my ($self, $text) = @_;
1460 1584
1461 return if $self->{text} eq "T$text"; 1585 return if $self->{text} eq "T$text";
1462 $self->{text} = "T$text"; 1586 $self->{text} = "T$text";
1463 1587
1464 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1588 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1465 $self->{layout}->set_text ($text); 1589 $self->{layout}->set_text ($text);
1466 1590
1591 delete $self->{size_req};
1467 $self->realloc; 1592 $self->realloc;
1468 $self->update; 1593 $self->update;
1469} 1594}
1470 1595
1471sub set_markup { 1596sub set_markup {
… …
1477 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1602 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1478 1603
1479 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba; 1604 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1480 $self->{layout}->set_markup ($markup); 1605 $self->{layout}->set_markup ($markup);
1481 1606
1607 delete $self->{size_req};
1482 $self->realloc; 1608 $self->realloc;
1483 $self->update; 1609 $self->update;
1484} 1610}
1485 1611
1486sub size_request { 1612sub size_request {
1487 my ($self) = @_; 1613 my ($self) = @_;
1488 1614
1615 $self->{size_req} ||= do {
1489 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1616 $self->{layout}->set_font ($self->{font}) if $self->{font};
1490 $self->{layout}->set_width ($self->{max_w} || -1); 1617 $self->{layout}->set_width ($self->{max_w} || -1);
1491 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1618 $self->{layout}->set_ellipsise ($self->{ellipsise});
1492 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1619 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1493 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1620 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1494 1621
1495 my ($w, $h) = $self->{layout}->size; 1622 my ($w, $h) = $self->{layout}->size;
1496 1623
1497 if (exists $self->{template}) { 1624 if (exists $self->{template}) {
1498 $self->{template}->set_font ($self->{font}) if $self->{font}; 1625 $self->{template}->set_font ($self->{font}) if $self->{font};
1499 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1626 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1500 1627
1501 my ($w2, $h2) = $self->{template}->size; 1628 my ($w2, $h2) = $self->{template}->size;
1502 1629
1503 $w = List::Util::max $w, $w2; 1630 $w = List::Util::max $w, $w2;
1504 $h = List::Util::max $h, $h2; 1631 $h = List::Util::max $h, $h2;
1632 }
1633
1634 [$w, $h]
1505 } 1635 };
1506 1636
1507 ( 1637 @{ $self->{size_req} }
1508 $w + $self->{padding} * 2,
1509 $h + $self->{padding} * 2,
1510 )
1511} 1638}
1512 1639
1640sub baseline_shift {
1641 $_[0]{layout}->descent
1642}
1643
1513sub size_allocate { 1644sub invoke_size_allocate {
1514 my ($self, $w, $h, $changed) = @_; 1645 my ($self, $w, $h) = @_;
1646
1647 delete $self->{ox};
1515 1648
1516 delete $self->{texture} 1649 delete $self->{texture}
1517 if $changed; 1650 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1651
1652 1
1518} 1653}
1519 1654
1520sub set_fontsize { 1655sub set_fontsize {
1521 my ($self, $fontsize) = @_; 1656 my ($self, $fontsize) = @_;
1522 1657
1523 $self->{fontsize} = $fontsize; 1658 $self->{fontsize} = $fontsize;
1524 delete $self->{texture}; 1659 delete $self->{texture};
1525 1660
1526 $self->realloc; 1661 $self->realloc;
1662}
1663
1664sub reconfigure {
1665 my ($self) = @_;
1666
1667 delete $self->{size_req};
1668
1669 $self->SUPER::reconfigure;
1527} 1670}
1528 1671
1529sub _draw { 1672sub _draw {
1530 my ($self) = @_; 1673 my ($self) = @_;
1531 1674
… …
1537 $self->{layout}->set_width ($self->{w}); 1680 $self->{layout}->set_width ($self->{w});
1538 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1681 $self->{layout}->set_ellipsise ($self->{ellipsise});
1539 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1682 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1540 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1683 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1541 1684
1542 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1685 new_from_layout CFClient::Texture $self->{layout}
1686 };
1543 1687
1688 unless (exists $self->{ox}) {
1544 $self->{ox} = int ($self->{align} < 0 ? $self->{padding} 1689 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1545 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1690 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1546 : ($self->{w} - $tex->{w}) * 0.5); 1691 : ($self->{w} - $tex->{w}) * 0.5);
1547 1692
1548 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding} 1693 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1549 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding} 1694 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1550 : ($self->{h} - $tex->{h}) * 0.5); 1695 : ($self->{h} - $tex->{h}) * 0.5);
1551
1552 $tex
1553 }; 1696 };
1554 1697
1555 glEnable GL_TEXTURE_2D; 1698 glEnable GL_TEXTURE_2D;
1556 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1699
1700 my $w = List::Util::min $self->{w} + 4, $tex->{w};
1701 my $h = List::Util::min $self->{h} + 2, $tex->{h};
1557 1702
1558 if ($tex->{format} == GL_ALPHA) { 1703 if ($tex->{format} == GL_ALPHA) {
1704 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1559 glColor @{$self->{fg}}; 1705 glColor @{$self->{fg}};
1560 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}); 1706 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}, $w, $h);
1561 } else { 1707 } else {
1708 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1562 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}); 1709 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}, $w, $h);
1563 } 1710 }
1564 1711
1565 glDisable GL_TEXTURE_2D; 1712 glDisable GL_TEXTURE_2D;
1566} 1713}
1567 1714
… …
1584 can_hover => 1, 1731 can_hover => 1,
1585 can_focus => 1, 1732 can_focus => 1,
1586 valign => 0, 1733 valign => 0,
1587 can_events => 1, 1734 can_events => 1,
1588 #text => ... 1735 #text => ...
1736 #hidden => "*",
1589 @_ 1737 @_
1590 ) 1738 )
1591} 1739}
1592 1740
1593sub _set_text { 1741sub _set_text {
… …
1595 1743
1596 delete $self->{cur_h}; 1744 delete $self->{cur_h};
1597 1745
1598 return if $self->{text} eq $text; 1746 return if $self->{text} eq $text;
1599 1747
1600 delete $self->{texture};
1601
1602 $self->{last_activity} = $::NOW; 1748 $self->{last_activity} = $::NOW;
1603 $self->{text} = $text; 1749 $self->{text} = $text;
1604 1750
1605 $text =~ s/./*/g if $self->{hidden}; 1751 $text =~ s/./*/g if $self->{hidden};
1606 $self->{layout}->set_text ("$text "); 1752 $self->{layout}->set_text ("$text ");
1753 delete $self->{size_req};
1607 1754
1608 $self->_emit (changed => $self->{text}); 1755 $self->emit (changed => $self->{text});
1756
1757 $self->realloc;
1758 $self->update;
1609} 1759}
1610 1760
1611sub set_text { 1761sub set_text {
1612 my ($self, $text) = @_; 1762 my ($self, $text) = @_;
1613 1763
1614 $self->{cursor} = length $text; 1764 $self->{cursor} = length $text;
1615 $self->_set_text ($text); 1765 $self->_set_text ($text);
1616
1617 $self->realloc;
1618} 1766}
1619 1767
1620sub get_text { 1768sub get_text {
1621 $_[0]{text} 1769 $_[0]{text}
1622} 1770}
… …
1627 my ($w, $h) = $self->SUPER::size_request; 1775 my ($w, $h) = $self->SUPER::size_request;
1628 1776
1629 ($w + 1, $h) # add 1 for cursor 1777 ($w + 1, $h) # add 1 for cursor
1630} 1778}
1631 1779
1632sub key_down { 1780sub invoke_key_down {
1633 my ($self, $ev) = @_; 1781 my ($self, $ev) = @_;
1634 1782
1635 my $mod = $ev->{mod}; 1783 my $mod = $ev->{mod};
1636 my $sym = $ev->{sym}; 1784 my $sym = $ev->{sym};
1637 my $uni = $ev->{unicode}; 1785 my $uni = $ev->{unicode};
… …
1649 } elsif ($sym == CFClient::SDLK_HOME) { 1797 } elsif ($sym == CFClient::SDLK_HOME) {
1650 $self->{cursor} = 0; 1798 $self->{cursor} = 0;
1651 } elsif ($sym == CFClient::SDLK_END) { 1799 } elsif ($sym == CFClient::SDLK_END) {
1652 $self->{cursor} = length $text; 1800 $self->{cursor} = length $text;
1653 } elsif ($uni == 27) { 1801 } elsif ($uni == 27) {
1654 $self->_emit ('escape'); 1802 $self->emit ('escape');
1655 } elsif ($uni) { 1803 } elsif ($uni) {
1656 substr $text, $self->{cursor}++, 0, chr $uni; 1804 substr $text, $self->{cursor}++, 0, chr $uni;
1805 } else {
1806 return 0;
1657 } 1807 }
1658 1808
1659 $self->_set_text ($text); 1809 $self->_set_text ($text);
1660 1810
1661 $self->realloc; 1811 $self->realloc;
1662}
1663 1812
1813 1
1814}
1815
1664sub focus_in { 1816sub invoke_focus_in {
1665 my ($self) = @_; 1817 my ($self) = @_;
1666 1818
1667 $self->{last_activity} = $::NOW; 1819 $self->{last_activity} = $::NOW;
1668 1820
1669 $self->SUPER::focus_in; 1821 $self->SUPER::invoke_focus_in
1670} 1822}
1671 1823
1672sub button_down { 1824sub invoke_button_down {
1673 my ($self, $ev, $x, $y) = @_; 1825 my ($self, $ev, $x, $y) = @_;
1674 1826
1675 $self->SUPER::button_down ($ev, $x, $y); 1827 $self->SUPER::invoke_button_down ($ev, $x, $y);
1676 1828
1677 my $idx = $self->{layout}->xy_to_index ($x, $y); 1829 my $idx = $self->{layout}->xy_to_index ($x, $y);
1678 1830
1679 # byte-index to char-index 1831 # byte-index to char-index
1680 my $text = $self->{text}; 1832 my $text = $self->{text};
1681 utf8::encode $text; 1833 utf8::encode $text;
1682 $self->{cursor} = length substr $text, 0, $idx; 1834 $self->{cursor} = length substr $text, 0, $idx;
1683 1835
1684 $self->_set_text ($self->{text}); 1836 $self->_set_text ($self->{text});
1685 $self->update; 1837 $self->update;
1838
1839 1
1686} 1840}
1687 1841
1688sub mouse_motion { 1842sub invoke_mouse_motion {
1689 my ($self, $ev, $x, $y) = @_; 1843 my ($self, $ev, $x, $y) = @_;
1690# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 1844# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1845
1846 1
1691} 1847}
1692 1848
1693sub _draw { 1849sub _draw {
1694 my ($self) = @_; 1850 my ($self) = @_;
1695 1851
1696 local $self->{fg} = $self->{fg}; 1852 local $self->{fg} = $self->{fg};
1697 1853
1698 if ($FOCUS == $self) { 1854 if ($FOCUS == $self) {
1699 glColor @{$self->{active_bg}}; 1855 glColor_premultiply @{$self->{active_bg}};
1700 $self->{fg} = $self->{active_fg}; 1856 $self->{fg} = $self->{active_fg};
1701 } else { 1857 } else {
1702 glColor @{$self->{bg}}; 1858 glColor_premultiply @{$self->{bg}};
1703 } 1859 }
1704 1860
1705 glEnable GL_BLEND; 1861 glEnable GL_BLEND;
1706 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1862 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1707 glBegin GL_QUADS; 1863 glBegin GL_QUADS;
1708 glVertex 0 , 0; 1864 glVertex 0 , 0;
1709 glVertex 0 , $self->{h}; 1865 glVertex 0 , $self->{h};
1710 glVertex $self->{w}, $self->{h}; 1866 glVertex $self->{w}, $self->{h};
1711 glVertex $self->{w}, 0; 1867 glVertex $self->{w}, 0;
… …
1736 1892
1737our @ISA = CFClient::UI::EntryBase::; 1893our @ISA = CFClient::UI::EntryBase::;
1738 1894
1739use CFClient::OpenGL; 1895use CFClient::OpenGL;
1740 1896
1741sub key_down { 1897sub invoke_key_down {
1742 my ($self, $ev) = @_; 1898 my ($self, $ev) = @_;
1743 1899
1744 my $sym = $ev->{sym}; 1900 my $sym = $ev->{sym};
1745 1901
1746 if ($sym == 13) { 1902 if ($sym == 13) {
1747 unshift @{$self->{history}}, 1903 unshift @{$self->{history}},
1748 my $txt = $self->get_text; 1904 my $txt = $self->get_text;
1905
1749 $self->{history_pointer} = -1; 1906 $self->{history_pointer} = -1;
1750 $self->{history_saveback} = ''; 1907 $self->{history_saveback} = '';
1751 $self->_emit (activate => $txt); 1908 $self->emit (activate => $txt);
1752 $self->update; 1909 $self->update;
1753 1910
1754 } elsif ($sym == CFClient::SDLK_UP) { 1911 } elsif ($sym == CFClient::SDLK_UP) {
1755 if ($self->{history_pointer} < 0) { 1912 if ($self->{history_pointer} < 0) {
1756 $self->{history_saveback} = $self->get_text; 1913 $self->{history_saveback} = $self->get_text;
… …
1772 } else { 1929 } else {
1773 $self->set_text ($self->{history_saveback}); 1930 $self->set_text ($self->{history_saveback});
1774 } 1931 }
1775 1932
1776 } else { 1933 } else {
1777 $self->SUPER::key_down ($ev); 1934 return $self->SUPER::invoke_key_down ($ev)
1935 }
1936
1778 } 1937 1
1779
1780} 1938}
1781 1939
1782############################################################################# 1940#############################################################################
1783 1941
1784package CFClient::UI::Button; 1942package CFClient::UI::Button;
… …
1793 1951
1794sub new { 1952sub new {
1795 my $class = shift; 1953 my $class = shift;
1796 1954
1797 $class->SUPER::new ( 1955 $class->SUPER::new (
1798 padding => 4, 1956 padding_x => 4,
1957 padding_y => 4,
1799 fg => [1, 1, 1], 1958 fg => [1, 1, 1],
1800 active_fg => [0, 0, 1], 1959 active_fg => [0, 0, 1],
1801 can_hover => 1, 1960 can_hover => 1,
1802 align => 0, 1961 align => 0,
1803 valign => 0, 1962 valign => 0,
1804 can_events => 1, 1963 can_events => 1,
1805 @_ 1964 @_
1806 ) 1965 )
1807} 1966}
1808 1967
1809sub activate { }
1810
1811sub button_up { 1968sub invoke_button_up {
1812 my ($self, $ev, $x, $y) = @_; 1969 my ($self, $ev, $x, $y) = @_;
1813 1970
1814 $self->emit ("activate") 1971 $self->emit ("activate")
1815 if $x >= 0 && $x < $self->{w} 1972 if $x >= 0 && $x < $self->{w}
1816 && $y >= 0 && $y < $self->{h}; 1973 && $y >= 0 && $y < $self->{h};
1974
1975 1
1817} 1976}
1818 1977
1819sub _draw { 1978sub _draw {
1820 my ($self) = @_; 1979 my ($self) = @_;
1821 1980
1822 local $self->{fg} = $self->{fg}; 1981 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1823
1824 if ($GRAB == $self) {
1825 $self->{fg} = $self->{active_fg};
1826 }
1827 1982
1828 glEnable GL_TEXTURE_2D; 1983 glEnable GL_TEXTURE_2D;
1829 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1984 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1830 glColor 0, 0, 0, 1; 1985 glColor 0, 0, 0, 1;
1831 1986
… …
1836 $self->SUPER::_draw; 1991 $self->SUPER::_draw;
1837} 1992}
1838 1993
1839############################################################################# 1994#############################################################################
1840 1995
1996package CFClient::UI::ImageButton;
1997
1998our @ISA = CFClient::UI::Image::;
1999
2000use CFClient::OpenGL;
2001
2002my %textures;
2003
2004sub new {
2005 my $class = shift;
2006
2007 my $self = $class->SUPER::new (
2008 padding_x => 4,
2009 padding_y => 4,
2010 fg => [1, 1, 1],
2011 active_fg => [0, 0, 1],
2012 can_hover => 1,
2013 align => 0,
2014 valign => 0,
2015 can_events => 1,
2016 @_
2017 );
2018}
2019
2020sub invoke_button_up {
2021 my ($self, $ev, $x, $y) = @_;
2022
2023 $self->emit ("activate")
2024 if $x >= 0 && $x < $self->{w}
2025 && $y >= 0 && $y < $self->{h};
2026
2027 1
2028}
2029
2030#############################################################################
2031
1841package CFClient::UI::CheckBox; 2032package CFClient::UI::CheckBox;
1842 2033
1843our @ISA = CFClient::UI::DrawBG::; 2034our @ISA = CFClient::UI::DrawBG::;
1844 2035
1845my @tex = 2036my @tex =
… …
1850 2041
1851sub new { 2042sub new {
1852 my $class = shift; 2043 my $class = shift;
1853 2044
1854 $class->SUPER::new ( 2045 $class->SUPER::new (
1855 padding => 2, 2046 padding_x => 2,
2047 padding_y => 2,
1856 fg => [1, 1, 1], 2048 fg => [1, 1, 1],
1857 active_fg => [1, 1, 0], 2049 active_fg => [1, 1, 0],
1858 bg => [0, 0, 0, 0.2], 2050 bg => [0, 0, 0, 0.2],
1859 active_bg => [1, 1, 1, 0.5], 2051 active_bg => [1, 1, 1, 0.5],
1860 state => 0, 2052 state => 0,
… …
1864} 2056}
1865 2057
1866sub size_request { 2058sub size_request {
1867 my ($self) = @_; 2059 my ($self) = @_;
1868 2060
1869 ($self->{padding} * 2 + 6) x 2 2061 (6) x 2
1870} 2062}
1871 2063
1872sub button_down { 2064sub invoke_button_down {
1873 my ($self, $ev, $x, $y) = @_; 2065 my ($self, $ev, $x, $y) = @_;
1874 2066
1875 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 2067 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1876 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 2068 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1877 $self->{state} = !$self->{state}; 2069 $self->{state} = !$self->{state};
1878 $self->_emit (changed => $self->{state}); 2070 $self->emit (changed => $self->{state});
2071 } else {
2072 return 0
2073 }
2074
1879 } 2075 1
1880} 2076}
1881 2077
1882sub _draw { 2078sub _draw {
1883 my ($self) = @_; 2079 my ($self) = @_;
1884 2080
1885 $self->SUPER::_draw; 2081 $self->SUPER::_draw;
1886 2082
1887 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 2083 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1888 2084
1889 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 2085 my ($w, $h) = @$self{qw(w h)};
2086
2087 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1890 2088
1891 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 2089 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1892 2090
1893 my $tex = $self->{state} ? $tex[1] : $tex[0]; 2091 my $tex = $self->{state} ? $tex[1] : $tex[0];
1894 2092
… …
1902package CFClient::UI::Image; 2100package CFClient::UI::Image;
1903 2101
1904our @ISA = CFClient::UI::Base::; 2102our @ISA = CFClient::UI::Base::;
1905 2103
1906use CFClient::OpenGL; 2104use CFClient::OpenGL;
1907use Carp qw/confess/;
1908 2105
1909our %loaded_images; 2106our %texture_cache;
1910 2107
1911sub new { 2108sub new {
1912 my $class = shift; 2109 my $class = shift;
1913 2110
1914 my $self = $class->SUPER::new (can_events => 0, @_); 2111 my $self = $class->SUPER::new (
2112 can_events => 0,
2113 @_,
2114 );
1915 2115
1916 $self->{image} or confess "Image has 'image' not set. This is a fatal error!"; 2116 $self->{path}
2117 or Carp::croak "required attribute 'path' not set";
1917 2118
1918 $loaded_images{$self->{image}} ||= 2119 $self->{tex} = $texture_cache{$self->{path}} ||=
1919 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1; 2120 new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1;
1920 2121
1921 my $tex = $self->{tex} = $loaded_images{$self->{image}}; 2122 Scalar::Util::weaken $texture_cache{$self->{path}};
1922 2123
1923 Scalar::Util::weaken $loaded_images{$self->{image}}; 2124 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
1924
1925 $self->{aspect} = $tex->{w} / $tex->{h};
1926 2125
1927 $self 2126 $self
1928} 2127}
1929 2128
1930sub size_request { 2129sub size_request {
1931 my ($self) = @_; 2130 my ($self) = @_;
1932 2131
1933 ($self->{tex}->{w}, $self->{tex}->{h}) 2132 ($self->{tex}{w}, $self->{tex}{h})
1934} 2133}
1935 2134
1936sub _draw { 2135sub _draw {
1937 my ($self) = @_; 2136 my ($self) = @_;
1938 2137
… …
2049 2248
2050 my $h1 = $self->{h} * (1 - $ycut1); 2249 my $h1 = $self->{h} * (1 - $ycut1);
2051 my $h2 = $self->{h} * (1 - $ycut2); 2250 my $h2 = $self->{h} * (1 - $ycut2);
2052 2251
2053 glEnable GL_BLEND; 2252 glEnable GL_BLEND;
2054 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2253 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2254 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2055 glEnable GL_TEXTURE_2D; 2255 glEnable GL_TEXTURE_2D;
2056 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2256 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2057 2257
2058 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2258 glBindTexture GL_TEXTURE_2D, $t1->{name};
2059 glBegin GL_QUADS; 2259 glBegin GL_QUADS;
… …
2159 fg => [1, 1, 1], 2359 fg => [1, 1, 1],
2160 active_fg => [0, 0, 0], 2360 active_fg => [0, 0, 0],
2161 bg => [0, 0, 0, 0.2], 2361 bg => [0, 0, 0, 0.2],
2162 active_bg => [1, 1, 1, 0.5], 2362 active_bg => [1, 1, 1, 0.5],
2163 range => [0, 0, 100, 10, 0], 2363 range => [0, 0, 100, 10, 0],
2164 req_w => $::WIDTH / 80, 2364 min_w => $::WIDTH / 80,
2165 req_h => $::WIDTH / 80, 2365 min_h => $::WIDTH / 80,
2166 vertical => 0, 2366 vertical => 0,
2167 can_hover => 1, 2367 can_hover => 1,
2168 inner_pad => 0.02, 2368 inner_pad => 0.02,
2169 @_ 2369 @_
2170 ); 2370 );
… …
2173 $self->update; 2373 $self->update;
2174 2374
2175 $self 2375 $self
2176} 2376}
2177 2377
2178sub changed { }
2179
2180sub set_range { 2378sub set_range {
2181 my ($self, $range) = @_; 2379 my ($self, $range) = @_;
2182 2380
2183 ($range, $self->{range}) = ($self->{range}, $range); 2381 ($range, $self->{range}) = ($self->{range}, $range);
2184 2382
2185 $self->update
2186 if "@$range" ne "@{$self->{range}}"; 2383 if ("@$range" ne "@{$self->{range}}") {
2384 $self->update;
2385 $self->set_value ($self->{range}[0]);
2386 }
2187} 2387}
2188 2388
2189sub set_value { 2389sub set_value {
2190 my ($self, $value) = @_; 2390 my ($self, $value) = @_;
2191 2391
… …
2202 if $unit; 2402 if $unit;
2203 2403
2204 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2404 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2205 2405
2206 if ($value != $old_value) { 2406 if ($value != $old_value) {
2207 $self->_emit (changed => $value); 2407 $self->emit (changed => $value);
2208 $self->update; 2408 $self->update;
2209 } 2409 }
2210} 2410}
2211 2411
2212sub size_request { 2412sub size_request {
2213 my ($self) = @_; 2413 my ($self) = @_;
2214 2414
2215 my $w = $self->{req_w}; 2415 ($self->{req_w}, $self->{req_h})
2216 my $h = $self->{req_h};
2217
2218 $self->{vertical} ? ($h, $w) : ($w, $h)
2219} 2416}
2220 2417
2221sub button_down { 2418sub invoke_button_down {
2222 my ($self, $ev, $x, $y) = @_; 2419 my ($self, $ev, $x, $y) = @_;
2223 2420
2224 $self->SUPER::button_down ($ev, $x, $y); 2421 $self->SUPER::invoke_button_down ($ev, $x, $y);
2225 2422
2226 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2423 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2227 2424
2228 $self->mouse_motion ($ev, $x, $y); 2425 $self->invoke_mouse_motion ($ev, $x, $y)
2229} 2426}
2230 2427
2231sub mouse_motion { 2428sub invoke_mouse_motion {
2232 my ($self, $ev, $x, $y) = @_; 2429 my ($self, $ev, $x, $y) = @_;
2233 2430
2234 if ($GRAB == $self) { 2431 if ($GRAB == $self) {
2235 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2432 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2236 2433
2237 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2434 my (undef, $lo, $hi, $page) = @{$self->{range}};
2238 2435
2239 $x = ($x - $self->{click}[1]) / ($w * $self->{scale}); 2436 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2240 2437
2241 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo)); 2438 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2439 } else {
2440 return 0;
2441 }
2442
2242 } 2443 1
2243} 2444}
2244 2445
2245sub update { 2446sub update {
2246 my ($self) = @_; 2447 my ($self) = @_;
2247 2448
2248 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 2449 delete $self->{knob_w};
2450 $self->SUPER::update;
2451}
2452
2453sub _draw {
2454 my ($self) = @_;
2455
2456 unless ($self->{knob_w}) {
2249 $self->set_value ($self->{range}[0]); 2457 $self->set_value ($self->{range}[0]);
2250 2458
2251 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2459 my ($value, $lo, $hi, $page) = @{$self->{range}};
2252 my $range = ($hi - $page - $lo) || 1e-100; 2460 my $range = ($hi - $page - $lo) || 1e-100;
2253 2461
… …
2259 $value = ($value - $lo) / $range; 2467 $value = ($value - $lo) / $range;
2260 $value = $value * $self->{scale} + $self->{offset}; 2468 $value = $value * $self->{scale} + $self->{offset};
2261 2469
2262 $self->{knob_x} = $value - $knob_w * 0.5; 2470 $self->{knob_x} = $value - $knob_w * 0.5;
2263 $self->{knob_w} = $knob_w; 2471 $self->{knob_w} = $knob_w;
2264 }); 2472 }
2265
2266 $self->SUPER::update;
2267}
2268
2269sub _draw {
2270 my ($self) = @_;
2271 2473
2272 $self->SUPER::_draw (); 2474 $self->SUPER::_draw ();
2273 2475
2274 glScale $self->{w}, $self->{h}; 2476 glScale $self->{w}, $self->{h};
2275 2477
… …
2336sub set_range { shift->{slider}->set_range (@_) } 2538sub set_range { shift->{slider}->set_range (@_) }
2337sub set_value { shift->{slider}->set_value (@_) } 2539sub set_value { shift->{slider}->set_value (@_) }
2338 2540
2339############################################################################# 2541#############################################################################
2340 2542
2341package CFClient::UI::TextView; 2543package CFClient::UI::TextScroller;
2342 2544
2343our @ISA = CFClient::UI::HBox::; 2545our @ISA = CFClient::UI::HBox::;
2344 2546
2345use CFClient::OpenGL; 2547use CFClient::OpenGL;
2346 2548
… …
2348 my $class = shift; 2550 my $class = shift;
2349 2551
2350 my $self = $class->SUPER::new ( 2552 my $self = $class->SUPER::new (
2351 fontsize => 1, 2553 fontsize => 1,
2352 can_events => 0, 2554 can_events => 0,
2555 indent => 0,
2353 #font => default_font 2556 #font => default_font
2354 @_, 2557 @_,
2355 2558
2356 layout => (new CFClient::Layout 1), 2559 layout => (new CFClient::Layout 1),
2357 par => [], 2560 par => [],
… …
2372 2575
2373 $self->{fontsize} = $fontsize; 2576 $self->{fontsize} = $fontsize;
2374 $self->reflow; 2577 $self->reflow;
2375} 2578}
2376 2579
2580sub visible_children {
2581 my ($self) = @_;
2582
2583 @{$self->{children}}[0,1]
2584}
2585
2377sub size_allocate { 2586sub invoke_size_allocate {
2378 my ($self, $w, $h, $changed) = @_; 2587 my ($self, $w, $h) = @_;
2379 2588
2380 $self->SUPER::size_allocate ($w, $h, $changed); 2589 my ($empty, $slider, @other) = @{ $self->{children} };
2381 2590 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
2382 return unless $changed;
2383 2591
2384 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2592 $self->{layout}->set_font ($self->{font}) if $self->{font};
2385 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2593 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2386 $self->{layout}->set_width ($self->{children}[0]{w}); 2594 $self->{layout}->set_width ($empty->{w});
2595 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2387 2596
2388 $self->reflow; 2597 $self->reflow;
2389}
2390 2598
2391sub text_size { 2599 $self->SUPER::invoke_size_allocate ($w, $h)
2392 my ($self, $text, $indent) = @_; 2600}
2601
2602sub get_layout {
2603 my ($self, $para) = @_;
2393 2604
2394 my $layout = $self->{layout}; 2605 my $layout = $self->{layout};
2395 2606
2607 $layout->set_font ($self->{font}) if $self->{font};
2608 $layout->set_foreground (@{$para->{fg}});
2396 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2609 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2397 $layout->set_width ($self->{children}[0]{w} - $indent); 2610 $layout->set_width ($self->{children}[0]{w} - $para->{indent});
2611 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2398 $layout->set_markup ($text); 2612 $layout->set_markup ($para->{markup});
2613
2614 $layout->set_shapes (
2615 map
2616 +(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
2617 @{$para->{widget}}
2399 2618 );
2619
2400 $layout->size 2620 $layout
2401} 2621}
2402 2622
2403sub reflow { 2623sub reflow {
2404 my ($self) = @_; 2624 my ($self) = @_;
2405 2625
… …
2414 $self->{children}[1]->set_value ($offset); 2634 $self->{children}[1]->set_value ($offset);
2415} 2635}
2416 2636
2417sub clear { 2637sub clear {
2418 my ($self) = @_; 2638 my ($self) = @_;
2639
2640 my (undef, undef, @other) = @{ $self->{children} };
2641 $self->remove ($_) for @other;
2419 2642
2420 $self->{par} = []; 2643 $self->{par} = [];
2421 $self->{height} = 0; 2644 $self->{height} = 0;
2422 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 2645 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2423} 2646}
2424 2647
2425sub add_paragraph { 2648sub add_paragraph {
2426 my ($self, $color, $text, $indent) = @_; 2649 my ($self, $color, $para, $indent) = @_;
2427 2650
2428 for my $line (split /\n/, $text) { 2651 my ($text, @w) = ref $para ? @$para : $para;
2429 my ($w, $h) = $self->text_size ($line); 2652
2430 $self->{height} += $h; 2653 $para = {
2431 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line]; 2654 w => 1e10,
2655 wrapped => 1,
2656 fg => $color,
2657 indent => $indent,
2658 markup => $text,
2659 widget => \@w,
2432 } 2660 };
2433 2661
2434 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]); 2662 $self->add (@w) if @w;
2663 push @{$self->{par}}, $para;
2664
2665 $self->{need_reflow}++;
2666 $self->update;
2667}
2668
2669sub scroll_to_bottom {
2670 my ($self) = @_;
2671
2672 $self->{scroll_to_bottom} = 1;
2673 $self->update;
2435} 2674}
2436 2675
2437sub update { 2676sub update {
2438 my ($self) = @_; 2677 my ($self) = @_;
2439 2678
… …
2441 2680
2442 return unless $self->{h} > 0; 2681 return unless $self->{h} > 0;
2443 2682
2444 delete $self->{texture}; 2683 delete $self->{texture};
2445 2684
2446 $ROOT->on_post_alloc ($self, sub { 2685 $ROOT->on_post_alloc ($self => sub {
2447 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 2686 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2448 2687
2449 if (delete $self->{need_reflow}) { 2688 if (delete $self->{need_reflow}) {
2450 my $height = 0; 2689 my $height = 0;
2451 2690
2452 my $layout = $self->{layout};
2453
2454 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2455
2456 for (@{$self->{par}}) { 2691 for my $para (@{$self->{par}}) {
2457 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support 2692 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2458 $layout->set_width ($W - $_->[3]); 2693 my $layout = $self->get_layout ($para);
2459 $layout->set_markup ($_->[4]);
2460 my ($w, $h) = $layout->size; 2694 my ($w, $h) = $layout->size;
2461 $_->[0] = $w + $_->[3]; 2695
2462 $_->[1] = $h; 2696 $para->{w} = $w + $para->{indent};
2697 $para->{h} = $h;
2698 $para->{wrapped} = $layout->has_wrapped;
2463 } 2699 }
2464 2700
2465 $height += $_->[1]; 2701 $height += $para->{h};
2466 } 2702 }
2467 2703
2468 $self->{height} = $height; 2704 $self->{height} = $height;
2469 2705
2470 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]); 2706 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2471 2707
2472 delete $self->{texture}; 2708 delete $self->{texture};
2473 } 2709 }
2474 2710
2711 if (delete $self->{scroll_to_bottom}) {
2712 $self->{children}[1]->set_value (1e10);
2713 }
2714
2475 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2715 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2476 glClearColor 0.5, 0.5, 0.5, 0; 2716 glClearColor 0, 0, 0, 0;
2477 glClear GL_COLOR_BUFFER_BIT; 2717 glClear GL_COLOR_BUFFER_BIT;
2478 2718
2479 my $top = int $self->{children}[1]{range}[0]; 2719 my $top = int $self->{children}[1]{range}[0];
2480 2720
2481 my $y0 = $top; 2721 my $y0 = $top;
2482 my $y1 = $top + $H; 2722 my $y1 = $top + $H;
2483 2723
2484 my $y = 0; 2724 my $y = 0;
2485
2486 my $layout = $self->{layout};
2487
2488 $layout->set_font ($self->{font}) if $self->{font};
2489 2725
2490 glEnable GL_BLEND; 2726 glEnable GL_BLEND;
2491 #TODO# not correct in windows where rgba is forced off 2727 #TODO# not correct in windows where rgba is forced off
2492 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2728 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2493 2729
2494 for my $par (@{$self->{par}}) { 2730 for my $para (@{$self->{par}}) {
2495 my $h = $par->[1]; 2731 my $h = $para->{h};
2496 2732
2497 if ($y0 < $y + $h && $y < $y1) { 2733 if ($y0 < $y + $h && $y < $y1) {
2498 $layout->set_foreground (@{ $par->[2] }); 2734
2499 $layout->set_width ($W - $par->[3]); 2735 my $layout = $self->get_layout ($para);
2500 $layout->set_markup ($par->[4]);
2501 2736
2502 my ($w, $h, $data, $format, $internalformat) = $layout->render; 2737 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2503 2738
2504 glRasterPos $par->[3], $y - $y0; 2739 glRasterPos $para->{indent}, $y - $y0;
2505 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data; 2740 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2741
2742 if (my @w = @{ $para->{widget} }) {
2743 my @s = $layout->get_shapes;
2744
2745 for (@w) {
2746 my ($dx, $dy) = splice @s, 0, 2, ();
2747
2748 $_->{x} = $dx + $para->{indent};
2749 $_->{y} = $dy + $y - $y0;
2750
2751 $_->draw;
2752 }
2753 }
2506 } 2754 }
2507 2755
2508 $y += $h; 2756 $y += $h;
2509 } 2757 }
2510 2758
2511 glDisable GL_BLEND; 2759 glDisable GL_BLEND;
2512 }; 2760 };
2513 }); 2761 });
2514} 2762}
2515 2763
2764sub reconfigure {
2765 my ($self) = @_;
2766
2767 $self->SUPER::reconfigure;
2768
2769 $_->{w} = 1e10 for @{ $self->{par} };
2770 $self->reflow;
2771}
2772
2516sub _draw { 2773sub _draw {
2517 my ($self) = @_; 2774 my ($self) = @_;
2518 2775
2519 glEnable GL_TEXTURE_2D; 2776 glEnable GL_TEXTURE_2D;
2520 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2777 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2521 glColor 1, 1, 1, 1; 2778 glColor 0, 0, 0, 1;
2522 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2779 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2523 glDisable GL_TEXTURE_2D; 2780 glDisable GL_TEXTURE_2D;
2524 2781
2525 $self->{children}[1]->draw; 2782 $self->{children}[1]->draw;
2526
2527} 2783}
2528 2784
2529############################################################################# 2785#############################################################################
2530 2786
2531package CFClient::UI::Animator; 2787package CFClient::UI::Animator;
… …
2610} 2866}
2611 2867
2612sub set_tooltip_from { 2868sub set_tooltip_from {
2613 my ($self, $widget) = @_; 2869 my ($self, $widget) = @_;
2614 2870
2871 my $tooltip = $widget->{tooltip};
2872
2873 if ($ENV{CFPLUS_DEBUG} & 2) {
2874 $tooltip .= "\n\n" . (ref $widget) . "\n"
2875 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2876 . "req $widget->{req_w} $widget->{req_h}\n"
2877 . "visible $widget->{visible}";
2878 }
2879
2880 $tooltip =~ s/^\n+//;
2881 $tooltip =~ s/\n+$//;
2882
2615 $self->add (new CFClient::UI::Label 2883 $self->add (new CFClient::UI::Label
2616 markup => $widget->{tooltip}, 2884 markup => $tooltip,
2617 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2885 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2618 fontsize => 0.8, 2886 fontsize => 0.8,
2619 fg => [0, 0, 0, 1], 2887 fg => [0, 0, 0, 1],
2620 ellipsise => 0, 2888 ellipsise => 0,
2621 font => ($widget->{tooltip_font} || $::FONT_PROP), 2889 font => ($widget->{tooltip_font} || $::FONT_PROP),
… …
2628 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2896 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2629 2897
2630 ($w + 4, $h + 4) 2898 ($w + 4, $h + 4)
2631} 2899}
2632 2900
2633sub size_allocate { 2901sub invoke_size_allocate {
2634 my ($self, $w, $h, $changed) = @_; 2902 my ($self, $w, $h) = @_;
2635 2903
2636 return unless $changed;
2637
2638 $self->SUPER::size_allocate ($w - 4, $h - 4, $changed); 2904 $self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2639} 2905}
2640 2906
2641sub visibility_change { 2907sub invoke_visibility_change {
2642 my ($self, $visible) = @_; 2908 my ($self, $visible) = @_;
2643 2909
2644 return unless $visible; 2910 return unless $visible;
2645 2911
2646 $self->{root}->on_post_alloc ("move_$self" => sub { 2912 $self->{root}->on_post_alloc ("move_$self" => sub {
… …
2648 or return; 2914 or return;
2649 2915
2650 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 2916 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2651 2917
2652 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 2918 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2653 if $x + $self->{w} > $::WIDTH; 2919 if $x + $self->{w} > $self->{root}{w};
2654 2920
2655 $self->move ($x, $y); 2921 $self->move_abs ($x, $y);
2656 }); 2922 });
2657} 2923}
2658 2924
2659sub _draw { 2925sub _draw {
2660 my ($self) = @_; 2926 my ($self) = @_;
… …
2747 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 3013 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2748 3014
2749 if ($tex) { 3015 if ($tex) {
2750 glEnable GL_TEXTURE_2D; 3016 glEnable GL_TEXTURE_2D;
2751 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3017 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2752 glColor 1, 1, 1, 1; 3018 glColor 0, 0, 0, 1;
2753 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3019 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2754 glDisable GL_TEXTURE_2D; 3020 glDisable GL_TEXTURE_2D;
2755 } 3021 }
2756} 3022}
2757 3023
2758sub DESTROY { 3024sub destroy {
2759 my ($self) = @_; 3025 my ($self) = @_;
2760 3026
2761 $self->{timer}->cancel 3027 $self->{timer}->cancel
2762 if $self->{timer}; 3028 if $self->{timer};
2763 3029
2764 $self->SUPER::DESTROY; 3030 $self->SUPER::destroy;
2765} 3031}
2766 3032
2767############################################################################# 3033#############################################################################
2768 3034
2769package CFClient::UI::Inventory; 3035package CFClient::UI::Buttonbar;
2770 3036
2771our @ISA = CFClient::UI::ScrolledWindow::; 3037our @ISA = CFClient::UI::HBox::;
2772 3038
2773sub new { 3039# 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 3040
2809############################################################################# 3041#############################################################################
2810 3042
2811package CFClient::UI::Menu; 3043package CFClient::UI::Menu;
2812 3044
… …
2824 ); 3056 );
2825 3057
2826 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3058 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2827 3059
2828 for my $item (@{ $self->{items} }) { 3060 for my $item (@{ $self->{items} }) {
2829 my ($widget, $cb) = @$item; 3061 my ($widget, $cb, $tooltip) = @$item;
2830 3062
2831 # handle various types of items, only text for now 3063 # handle various types of items, only text for now
2832 if (!ref $widget) { 3064 if (!ref $widget) {
2833 $widget = new CFClient::UI::Label 3065 $widget = new CFClient::UI::Label
2834 can_hover => 1, 3066 can_hover => 1,
2835 can_events => 1, 3067 can_events => 1,
2836 text => $widget; 3068 markup => $widget,
3069 tooltip => $tooltip
2837 } 3070 }
2838 3071
2839 $self->{item}{$widget} = $item; 3072 $self->{item}{$widget} = $item;
2840 3073
2841 $self->{vbox}->add ($widget); 3074 $self->{vbox}->add ($widget);
… …
2846 3079
2847# popup given the event (must be a mouse button down event currently) 3080# popup given the event (must be a mouse button down event currently)
2848sub popup { 3081sub popup {
2849 my ($self, $ev) = @_; 3082 my ($self, $ev) = @_;
2850 3083
2851 $self->_emit ("popdown"); 3084 $self->emit ("popdown");
2852 3085
2853 # maybe save $GRAB? must be careful about events... 3086 # maybe save $GRAB? must be careful about events...
2854 $GRAB = $self; 3087 $GRAB = $self;
2855 $self->{button} = $ev->{button}; 3088 $self->{button} = $ev->{button};
2856 3089
2857 $self->show; 3090 $self->show;
2858 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 3091 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2859} 3092}
2860 3093
2861sub mouse_motion { 3094sub invoke_mouse_motion {
2862 my ($self, $ev, $x, $y) = @_; 3095 my ($self, $ev, $x, $y) = @_;
2863 3096
2864 # TODO: should use vbox->find_widget or so 3097 # TODO: should use vbox->find_widget or so
2865 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3098 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2866 $self->{hover} = $self->{item}{$HOVER}; 3099 $self->{hover} = $self->{item}{$HOVER};
2867}
2868 3100
3101 0
3102}
3103
2869sub button_up { 3104sub invoke_button_up {
2870 my ($self, $ev, $x, $y) = @_; 3105 my ($self, $ev, $x, $y) = @_;
2871 3106
2872 if ($ev->{button} == $self->{button}) { 3107 if ($ev->{button} == $self->{button}) {
2873 undef $GRAB; 3108 undef $GRAB;
2874 $self->hide; 3109 $self->hide;
2875 3110
2876 $self->_emit ("popdown"); 3111 $self->emit ("popdown");
2877 $self->{hover}[1]->() if $self->{hover}; 3112 $self->{hover}[1]->() if $self->{hover};
3113 } else {
3114 return 0
3115 }
3116
2878 } 3117 1
2879} 3118}
2880 3119
2881############################################################################# 3120#############################################################################
2882 3121
2883package CFClient::UI::Statusbox; 3122package CFClient::UI::Multiplexer;
2884 3123
2885our @ISA = CFClient::UI::VBox::; 3124our @ISA = CFClient::UI::Container::;
2886 3125
2887sub new { 3126sub new {
2888 my $class = shift; 3127 my $class = shift;
2889 3128
2890 $class->SUPER::new ( 3129 my $self = $class->SUPER::new (
3130 @_,
3131 );
3132
3133 $self->{current} = $self->{children}[0]
3134 if @{ $self->{children} };
3135
3136 $self
3137}
3138
3139sub add {
3140 my ($self, @widgets) = @_;
3141
3142 $self->SUPER::add (@widgets);
3143
3144 $self->{current} = $self->{children}[0]
3145 if @{ $self->{children} };
3146}
3147
3148sub set_current_page {
3149 my ($self, $page_or_widget) = @_;
3150
3151 my $widget = ref $page_or_widget
3152 ? $page_or_widget
3153 : $self->{children}[$page_or_widget];
3154
3155 $self->{current} = $widget;
3156 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3157
3158 $self->emit (page_changed => $self->{current});
3159
3160 $self->realloc;
3161}
3162
3163sub visible_children {
3164 $_[0]{current}
3165}
3166
3167sub size_request {
3168 my ($self) = @_;
3169
3170 $self->{current}->size_request
3171}
3172
3173sub invoke_size_allocate {
3174 my ($self, $w, $h) = @_;
3175
3176 $self->{current}->configure (0, 0, $w, $h);
3177
3178 1
3179}
3180
3181sub _draw {
3182 my ($self) = @_;
3183
3184 $self->{current}->draw;
3185}
3186
3187#############################################################################
3188
3189package CFClient::UI::Notebook;
3190
3191our @ISA = CFClient::UI::VBox::;
3192
3193sub new {
3194 my $class = shift;
3195
3196 my $self = $class->SUPER::new (
3197 buttonbar => (new CFClient::UI::Buttonbar),
3198 multiplexer => (new CFClient::UI::Multiplexer expand => 1),
3199 # filter => # will be put between multiplexer and $self
3200 @_,
3201 );
3202
3203 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3204 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3205
3206 $self
3207}
3208
3209sub add {
3210 my ($self, $title, $widget, $tooltip) = @_;
3211
3212 Scalar::Util::weaken $self;
3213
3214 $self->{buttonbar}->add (new CFClient::UI::Button
3215 markup => $title,
3216 tooltip => $tooltip,
3217 on_activate => sub { $self->set_current_page ($widget) },
3218 );
3219
3220 $self->{multiplexer}->add ($widget);
3221}
3222
3223sub set_current_page {
3224 my ($self, $page) = @_;
3225
3226 $self->{multiplexer}->set_current_page ($page);
3227 $self->emit (page_changed => $self->{multiplexer}{current});
3228}
3229
3230#############################################################################
3231
3232package CFClient::UI::Combobox;
3233
3234use utf8;
3235
3236our @ISA = CFClient::UI::Button::;
3237
3238sub new {
3239 my $class = shift;
3240
3241 my $self = $class->SUPER::new (
3242 options => [], # [value, title, longdesc], ...
3243 value => undef,
3244 @_,
3245 );
3246
3247 $self->_set_value ($self->{value});
3248
3249 $self
3250}
3251
3252sub invoke_button_down {
3253 my ($self, $ev) = @_;
3254
3255 my @menu_items;
3256
3257 for (@{ $self->{options} }) {
3258 my ($value, $title, $tooltip) = @$_;
3259
3260 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3261 }
3262
3263 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
3264}
3265
3266sub _set_value {
3267 my ($self, $value) = @_;
3268
3269 my ($item) = grep $_->[0] eq $value, @{ $self->{options} }
3270 or return;
3271
3272 $self->{value} = $item->[0];
3273 $self->set_markup ("$item->[1] ⇓");
3274 $self->set_tooltip ($item->[2]);
3275}
3276
3277sub set_value {
3278 my ($self, $value) = @_;
3279
3280 return unless $self->{value} ne $value;
3281
3282 $self->_set_value ($value);
3283 $self->emit (changed => $value);
3284}
3285
3286#############################################################################
3287
3288package CFClient::UI::Statusbox;
3289
3290our @ISA = CFClient::UI::VBox::;
3291
3292sub new {
3293 my $class = shift;
3294
3295 my $self = $class->SUPER::new (
2891 fontsize => 0.8, 3296 fontsize => 0.8,
2892 @_, 3297 @_,
2893 ) 3298 );
3299
3300 Scalar::Util::weaken (my $this = $self);
3301
3302 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3303
3304 $self
2894} 3305}
2895 3306
2896sub reorder { 3307sub reorder {
2897 my ($self) = @_; 3308 my ($self) = @_;
2898 my $NOW = time; 3309 my $NOW = Time::HiRes::time;
3310
3311 # freeze display when hovering over any label
3312 return if $CFClient::UI::TOOLTIP->{owner}
3313 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},
3314 values %{ $self->{item} };
2899 3315
2900 while (my ($k, $v) = each %{ $self->{item} }) { 3316 while (my ($k, $v) = each %{ $self->{item} }) {
2901 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3317 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2902 } 3318 }
2903 3319
… …
2906 my @items = sort { 3322 my @items = sort {
2907 $a->{pri} <=> $b->{pri} 3323 $a->{pri} <=> $b->{pri}
2908 or $b->{id} <=> $a->{id} 3324 or $b->{id} <=> $a->{id}
2909 } values %{ $self->{item} }; 3325 } values %{ $self->{item} };
2910 3326
3327 $self->{timer}->interval (1);
3328
2911 my $count = 10 + 1; 3329 my $count = 10 + 1;
2912 for my $item (@items) { 3330 for my $item (@items) {
2913 last unless --$count; 3331 last unless --$count;
2914 3332
2915 push @widgets, $item->{label} ||= do { 3333 my $label = $item->{label} ||= do {
2916 # TODO: doesn't handle markup well (read as: at all) 3334 # TODO: doesn't handle markup well (read as: at all)
2917 my $short = $item->{count} > 1 3335 my $short = $item->{count} > 1
2918 ? "<b>$item->{count} ×</b> $item->{text}" 3336 ? "<b>$item->{count} ×</b> $item->{text}"
2919 : $item->{text}; 3337 : $item->{text};
2920 3338
… …
2928 tooltip => $item->{tooltip}, 3346 tooltip => $item->{tooltip},
2929 tooltip_font => $::FONT_PROP, 3347 tooltip_font => $::FONT_PROP,
2930 tooltip_width => 0.67, 3348 tooltip_width => 0.67,
2931 fontsize => $item->{fontsize} || $self->{fontsize}, 3349 fontsize => $item->{fontsize} || $self->{fontsize},
2932 max_w => $::WIDTH * 0.44, 3350 max_w => $::WIDTH * 0.44,
2933 fg => $item->{fg}, 3351 fg => [@{ $item->{fg} }],
2934 can_events => 1, 3352 can_events => 1,
2935 can_hover => 1 3353 can_hover => 1
2936 }; 3354 };
3355
3356 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3357 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3358 $label->update;
3359 $label->set_max_size (undef, $label->{req_h} * $diff)
3360 if $diff < 1;
3361 $self->{timer}->interval (1/30);
3362 } else {
3363 $label->{fg}[3] = $item->{fg}[3] || 1;
3364 }
3365
3366 push @widgets, $label;
2937 } 3367 }
2938 3368
2939 $self->clear; 3369 $self->clear;
2940 $self->SUPER::add (reverse @widgets); 3370 $self->SUPER::add (reverse @widgets);
2941} 3371}
… …
2946 $text =~ s/^\s+//; 3376 $text =~ s/^\s+//;
2947 $text =~ s/\s+$//; 3377 $text =~ s/\s+$//;
2948 3378
2949 return unless $text; 3379 return unless $text;
2950 3380
2951 my $timeout = time + ((delete $arg{timeout}) || 60); 3381 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
2952 3382
2953 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3383 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2954 3384
2955 if (my $item = $self->{item}{$group}) { 3385 if (my $item = $self->{item}{$group}) {
2956 if ($item->{text} eq $text) { 3386 if ($item->{text} eq $text) {
2957 $item->{count}++; 3387 $item->{count}++;
2958 } else { 3388 } else {
2959 $item->{count} = 1; 3389 $item->{count} = 1;
2960 $item->{text} = $item->{tooltip} = $text; 3390 $item->{text} = $item->{tooltip} = $text;
2961 } 3391 }
2962 $item->{id} = ++$self->{id}; 3392 $item->{id} += 0.2;#d#
2963 $item->{timeout} = $timeout; 3393 $item->{timeout} = $timeout;
2964 delete $item->{label}; 3394 delete $item->{label};
2965 } else { 3395 } else {
2966 $self->{item}{$group} = { 3396 $self->{item}{$group} = {
2967 id => ++$self->{id}, 3397 id => ++$self->{id},
… …
2986 3416
2987 $self->reorder; 3417 $self->reorder;
2988 $self->SUPER::reconfigure; 3418 $self->SUPER::reconfigure;
2989} 3419}
2990 3420
3421sub destroy {
3422 my ($self) = @_;
3423
3424 $self->{timer}->cancel;
3425
3426 $self->SUPER::destroy;
3427}
3428
2991############################################################################# 3429#############################################################################
2992 3430
3431package CFClient::UI::Inventory;
3432
3433our @ISA = CFClient::UI::ScrolledWindow::;
3434
3435sub new {
3436 my $class = shift;
3437
3438 my $self = $class->SUPER::new (
3439 child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3440 @_,
3441 );
3442
3443 $self
3444}
3445
3446sub set_items {
3447 my ($self, $items) = @_;
3448
3449 $self->{child}->clear;
3450 return unless $items;
3451
3452 my @items = sort {
3453 ($a->{type} <=> $b->{type})
3454 or ($a->{name} cmp $b->{name})
3455 } @$items;
3456
3457 $self->{real_items} = \@items;
3458
3459 my $row = 0;
3460 for my $item (@items) {
3461 CFClient::Item::update_widgets $item;
3462
3463 $self->{child}->add (0, $row, $item->{face_widget});
3464 $self->{child}->add (1, $row, $item->{desc_widget});
3465 $self->{child}->add (2, $row, $item->{weight_widget});
3466
3467 $row++;
3468 }
3469}
3470
3471#############################################################################
3472
3473package CFClient::UI::BindEditor;
3474
3475our @ISA = CFClient::UI::FancyFrame::;
3476
3477sub new {
3478 my $class = shift;
3479
3480 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3481
3482 $self->add (my $vb = new CFClient::UI::VBox);
3483
3484
3485 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3486 text => "start recording",
3487 tooltip => "Start/Stops recording of actions."
3488 ."All subsequent actions after the recording started will be captured."
3489 ."The actions are displayed after the record was stopped."
3490 ."To bind the action you have to click on the 'Bind' button",
3491 on_activate => sub {
3492 unless ($self->{recording}) {
3493 $self->start;
3494 } else {
3495 $self->stop;
3496 }
3497 });
3498
3499 $vb->add (new CFClient::UI::Label text => "Actions:");
3500 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3501
3502 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3503 $vb->add (my $hb = new CFClient::UI::HBox);
3504 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3505 $hb->add (new CFClient::UI::Button
3506 text => "bind",
3507 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3508 on_activate => sub {
3509 $self->ask_for_bind;
3510 });
3511
3512 $vb->add (my $hb = new CFClient::UI::HBox);
3513 $hb->add (new CFClient::UI::Button
3514 text => "ok",
3515 expand => 1,
3516 tooltip => "This closes the binding editor and saves the binding",
3517 on_activate => sub {
3518 $self->hide;
3519 $self->commit;
3520 });
3521
3522 $hb->add (new CFClient::UI::Button
3523 text => "cancel",
3524 expand => 1,
3525 tooltip => "This closes the binding editor without saving",
3526 on_activate => sub {
3527 $self->hide;
3528 $self->{binding_cancel}->()
3529 if $self->{binding_cancel};
3530 });
3531
3532 $self->update_binding_widgets;
3533
3534 $self
3535}
3536
3537sub cfg_bind {
3538 my ($self, $mod, $sym, $cmds) = @_;
3539 $::CFG->{profile}{default}{bindings}{$mod}{$sym} = $cmds;
3540 ::update_bindings ();
3541}
3542
3543sub cfg_unbind {
3544 my ($self, $mod, $sym, $cmds) = @_;
3545 delete $::CFG->{profile}{default}{bindings}{$mod}{$sym};
3546 ::update_bindings ();
3547}
3548
3549sub commit {
3550 my ($self) = @_;
3551 my ($mod, $sym, $cmds) = $self->get_binding;
3552 if ($sym != 0 && @$cmds > 0) {
3553 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3554 ."'. Don't forget 'Save Config'!");
3555 $self->{binding_change}->($mod, $sym, $cmds)
3556 if $self->{binding_change};
3557 } else {
3558 $::STATUSBOX->add ("No action bound, no key or action specified!");
3559 $self->{binding_cancel}->()
3560 if $self->{binding_cancel};
3561 }
3562}
3563
3564sub start {
3565 my ($self) = @_;
3566
3567 $self->{rec_btn}->set_text ("stop recording");
3568 $self->{recording} = 1;
3569 $self->clear_command_list;
3570 $::CONN->start_record if $::CONN;
3571}
3572
3573sub stop {
3574 my ($self) = @_;
3575
3576 $self->{rec_btn}->set_text ("start recording");
3577 $self->{recording} = 0;
3578
3579 my $rec;
3580 $rec = $::CONN->stop_record if $::CONN;
3581 return unless ref $rec eq 'ARRAY';
3582 $self->set_command_list ($rec);
3583}
3584
3585
3586sub ask_for_bind_and_commit {
3587 my ($self) = @_;
3588 $self->ask_for_bind (1);
3589}
3590
3591sub ask_for_bind {
3592 my ($self, $commit, $end_cb) = @_;
3593
3594 CFClient::Binder::open_binding_dialog (sub {
3595 my ($mod, $sym) = @_;
3596 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3597 $self->update_binding_widgets;
3598 $self->commit if $commit;
3599 $end_cb->() if $end_cb;
3600 });
3601}
3602
3603# $mod and $sym are the modifiers and key symbol
3604# $cmds is a array ref of strings (the commands)
3605# $cb is the callback that is executed on OK
3606# $ccb is the callback that is executed on CANCEL and
3607# when the binding was unsuccessful on OK
3608sub set_binding {
3609 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3610
3611 $self->clear_command_list;
3612 $self->{recording} = 0;
3613 $self->{rec_btn}->set_text ("start recording");
3614
3615 $self->{binding} = [$mod, $sym];
3616 $self->{commands} = $cmds;
3617
3618 $self->{binding_change} = $cb;
3619 $self->{binding_cancel} = $ccb;
3620
3621 $self->update_binding_widgets;
3622}
3623
3624# this is a shortcut method that asks for a binding
3625# and then just binds it.
3626sub do_quick_binding {
3627 my ($self, $cmds, $end_cb) = @_;
3628 $self->set_binding (undef, undef, $cmds, sub { $self->cfg_bind (@_) });
3629 $self->ask_for_bind (1, $end_cb);
3630}
3631
3632sub update_binding_widgets {
3633 my ($self) = @_;
3634 my ($mod, $sym, $cmds) = $self->get_binding;
3635 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3636 $self->set_command_list ($cmds);
3637}
3638
3639sub get_binding {
3640 my ($self) = @_;
3641 return (
3642 $self->{binding}->[0],
3643 $self->{binding}->[1],
3644 [ grep { defined $_ } @{$self->{commands}} ]
3645 );
3646}
3647
3648sub clear_command_list {
3649 my ($self) = @_;
3650 $self->{cmdbox}->clear ();
3651}
3652
3653sub set_command_list {
3654 my ($self, $cmds) = @_;
3655
3656 $self->{cmdbox}->clear ();
3657 $self->{commands} = $cmds;
3658
3659 my $idx = 0;
3660
3661 for (@$cmds) {
3662 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3663
3664 my $i = $idx;
3665 $hb->add (new CFClient::UI::Label text => $_);
3666 $hb->add (new CFClient::UI::Button
3667 text => "delete",
3668 tooltip => "Deletes the action from the record",
3669 on_activate => sub {
3670 $self->{cmdbox}->remove ($hb);
3671 $cmds->[$i] = undef;
3672 });
3673
3674
3675 $idx++
3676 }
3677}
3678
3679#############################################################################
3680
3681package CFClient::UI::SpellList;
3682
3683our @ISA = CFClient::UI::Table::;
3684
3685sub new {
3686 my $class = shift;
3687
3688 my $self = $class->SUPER::new (
3689 binding => [],
3690 commands => [],
3691 @_,
3692 )
3693}
3694
3695my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3696
3697my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3698 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3699my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3700 "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3701my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3702 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3703my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3704 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3705my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3706 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3707
3708sub rebuild_spell_list {
3709 my ($self) = @_;
3710
3711 $CFClient::UI::ROOT->on_refresh ($self => sub {
3712 $self->clear;
3713
3714 return unless $::CONN;
3715
3716 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3717 $self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3718 $self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3719 $self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3720 $self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3721
3722 my $row = 0;
3723
3724 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3725 my $spell = $self->{spell}{$_};
3726
3727 $row++;
3728
3729 my $spell_cb = sub {
3730 my ($widget, $ev) = @_;
3731
3732 if ($ev->{button} == 1) {
3733 $::CONN->user_send ("cast $spell->{name}");
3734 } elsif ($ev->{button} == 2) {
3735 $::CONN->user_send ("invoke $spell->{name}");
3736 } elsif ($ev->{button} == 3) {
3737 (new CFClient::UI::Menu
3738 items => [
3739 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3740 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3741 ],
3742 )->popup ($ev);
3743 } else {
3744 return 0;
3745 }
3746
3747 1
3748 };
3749
3750 my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3751
3752 #TODO: add path info to tooltip
3753 #$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3754
3755 $self->add (0, $row, new CFClient::UI::Face
3756 face => $spell->{face},
3757 can_hover => 1,
3758 can_events => 1,
3759 tooltip => $tooltip,
3760 on_button_down => $spell_cb,
3761 );
3762
3763 $self->add (1, $row, new CFClient::UI::Label
3764 expand => 1,
3765 text => $spell->{name},
3766 can_hover => 1,
3767 can_events => 1,
3768 tooltip => $tooltip,
3769 on_button_down => $spell_cb,
3770 );
3771
3772 $self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3773 $self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3774 $self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3775 $self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3776 }
3777 });
3778}
3779
3780sub add_spell {
3781 my ($self, $spell) = @_;
3782
3783 $self->{spell}->{$spell->{name}} = $spell;
3784 $self->rebuild_spell_list;
3785}
3786
3787sub remove_spell {
3788 my ($self, $spell) = @_;
3789
3790 delete $self->{spell}->{$spell->{name}};
3791 $self->rebuild_spell_list;
3792}
3793
3794sub clear_spells {
3795 my ($self) = @_;
3796
3797 $self->{spell} = {};
3798 $self->rebuild_spell_list;
3799}
3800
3801#############################################################################
3802
2993package CFClient::UI::Root; 3803package CFClient::UI::Root;
2994 3804
2995our @ISA = CFClient::UI::Container::; 3805our @ISA = CFClient::UI::Container::;
3806
3807use List::Util qw(min max);
2996 3808
2997use CFClient::OpenGL; 3809use CFClient::OpenGL;
2998 3810
2999sub new { 3811sub new {
3000 my $class = shift; 3812 my $class = shift;
… …
3007 Scalar::Util::weaken ($self->{root} = $self); 3819 Scalar::Util::weaken ($self->{root} = $self);
3008 3820
3009 $self 3821 $self
3010} 3822}
3011 3823
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 { 3824sub size_request {
3029 my ($self) = @_; 3825 my ($self) = @_;
3030 3826
3031 ($self->{w}, $self->{h}) 3827 ($self->{w}, $self->{h})
3032} 3828}
3033 3829
3830sub _to_pixel {
3831 my ($coord, $size, $max) = @_;
3832
3833 $coord =
3834 $coord eq "center" ? ($max - $size) * 0.5
3835 : $coord eq "max" ? $max
3836 : $coord;
3837
3838 $coord = 0 if $coord < 0;
3839 $coord = $max - $size if $coord > $max - $size;
3840
3841 int $coord + 0.5
3842}
3843
3034sub size_allocate { 3844sub invoke_size_allocate {
3035 my ($self, $w, $h, $changed) = @_; 3845 my ($self, $w, $h) = @_;
3036 3846
3037 for my $child ($self->children) { 3847 for my $child ($self->children) {
3038 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3848 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3039 3849
3040 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 3850 $X = $child->{force_x} if exists $child->{force_x};
3041 if exists $child->{req_x}; 3851 $Y = $child->{force_y} if exists $child->{force_y};
3042 3852
3043 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1 3853 $X = _to_pixel $X, $W, $self->{w};
3044 if exists $child->{req_y}; 3854 $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 3855
3051 $child->configure ($X, $Y, $W, $H); 3856 $child->configure ($X, $Y, $W, $H);
3052 } 3857 }
3858
3859 1
3053} 3860}
3054 3861
3055sub coord2local { 3862sub coord2local {
3056 my ($self, $x, $y) = @_; 3863 my ($self, $x, $y) = @_;
3057 3864
… …
3071} 3878}
3072 3879
3073sub add { 3880sub add {
3074 my ($self, @children) = @_; 3881 my ($self, @children) = @_;
3075 3882
3076 for my $child (@children) {
3077 $child->{is_toplevel} = 1; 3883 $_->{is_toplevel} = 1
3078 3884 for @children;
3079 # integerise window positions
3080 $child->{x} = int $child->{x};
3081 $child->{y} = int $child->{y};
3082 }
3083 3885
3084 $self->SUPER::add (@children); 3886 $self->SUPER::add (@children);
3085} 3887}
3086 3888
3087sub remove { 3889sub remove {
3088 my ($self, @children) = @_; 3890 my ($self, @children) = @_;
3089 3891
3090 $self->SUPER::remove (@children); 3892 $self->SUPER::remove (@children);
3893
3894 delete $self->{is_toplevel}
3895 for @children;
3091 3896
3092 while (@children) { 3897 while (@children) {
3093 my $w = pop @children; 3898 my $w = pop @children;
3094 push @children, $w->children; 3899 push @children, $w->children;
3095 $w->set_invisible; 3900 $w->set_invisible;
… …
3115 $_->() 3920 $_->()
3116 for values %{delete $self->{refresh_hook}}; 3921 for values %{delete $self->{refresh_hook}};
3117 } 3922 }
3118 3923
3119 if ($self->{realloc}) { 3924 if ($self->{realloc}) {
3925 my %queue;
3120 my @queue; 3926 my @queue;
3927 my $widget;
3121 3928
3929 outer:
3122 while () { 3930 while () {
3123 if ($self->{realloc}) { 3931 if (my $realloc = delete $self->{realloc}) {
3124 #TODO use array-of-depth approach 3932 for $widget (values %$realloc) {
3933 $widget->{visible} or next; # do not resize invisible widgets
3125 3934
3126 @queue = sort { $a->{visible} <=> $b->{visible} } 3935 $queue{$widget+0}++ and next; # duplicates are common
3127 @queue, values %{delete $self->{realloc}}; 3936
3937 push @{ $queue[$widget->{visible}] }, $widget;
3938 }
3128 } 3939 }
3129 3940
3941 while () {
3942 @queue or last outer;
3943
3944 $widget = pop @{ $queue[-1] || [] }
3945 and last;
3946
3947 pop @queue;
3948 }
3949
3950 delete $queue{$widget+0};
3951
3952 my ($w, $h) = $widget->size_request;
3953
3954 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3955 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3956
3957 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3958 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3959
3960 $w = $widget->{force_w} if exists $widget->{force_w};
3961 $h = $widget->{force_h} if exists $widget->{force_h};
3962
3963 if ($widget->{req_w} != $w || $widget->{req_h} != $h
3964 || delete $widget->{force_realloc}) {
3965 $widget->{req_w} = $w;
3966 $widget->{req_h} = $h;
3967
3968 $self->{size_alloc}{$widget+0} = $widget;
3969
3970 if (my $parent = $widget->{parent}) {
3971 $self->{realloc}{$parent+0} = $parent
3972 unless $queue{$parent+0};
3973
3974 $parent->{force_size_alloc} = 1;
3975 $self->{size_alloc}{$parent+0} = $parent;
3976 }
3977 }
3978
3979 delete $self->{realloc}{$widget+0};
3980 }
3981 }
3982
3983 while (my $size_alloc = delete $self->{size_alloc}) {
3984 my @queue = sort { $b->{visible} <=> $a->{visible} }
3985 values %$size_alloc;
3986
3987 while () {
3130 my $widget = pop @queue || last; 3988 my $widget = pop @queue || last;
3131 3989
3132 $widget->{visible} or last; # do not resize invisible widgets 3990 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 3991
3157 $w = 0 if $w < 0; 3992 $w = 0 if $w < 0;
3158 $h = 0 if $h < 0; 3993 $h = 0 if $h < 0;
3159 3994
3160 my $changed = $widget->{w} != $w || $widget->{h} != $h; 3995 $w = int $w + 0.5;
3996 $h = int $h + 0.5;
3161 3997
3998 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3999 $widget->{old_w} = $widget->{w};
4000 $widget->{old_h} = $widget->{h};
4001
3162 $widget->{w} = $w; 4002 $widget->{w} = $w;
3163 $widget->{h} = $h; 4003 $widget->{h} = $h;
3164 4004
3165 $widget->emit (size_allocate => $w, $h, $changed); 4005 $widget->emit (size_allocate => $w, $h);
4006 }
3166 } 4007 }
3167 } 4008 }
3168 4009
3169 while ($self->{post_alloc_hook}) { 4010 while ($self->{post_alloc_hook}) {
3170 $_->() 4011 $_->()
3171 for values %{delete $self->{post_alloc_hook}}; 4012 for values %{delete $self->{post_alloc_hook}};
3172 } 4013 }
4014
3173 4015
3174 glViewport 0, 0, $::WIDTH, $::HEIGHT; 4016 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3175 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 4017 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3176 glClear GL_COLOR_BUFFER_BIT; 4018 glClear GL_COLOR_BUFFER_BIT;
3177 4019
… …
3179 glLoadIdentity; 4021 glLoadIdentity;
3180 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 4022 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3181 glMatrixMode GL_MODELVIEW; 4023 glMatrixMode GL_MODELVIEW;
3182 glLoadIdentity; 4024 glLoadIdentity;
3183 4025
4026 {
4027 package CFClient::UI::Base;
4028
4029 ($draw_x, $draw_y, $draw_w, $draw_h) =
4030 (0, 0, $self->{w}, $self->{h});
4031 }
4032
3184 $self->_draw; 4033 $self->_draw;
3185} 4034}
3186 4035
3187############################################################################# 4036#############################################################################
3188 4037

Diff Legend

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