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.251 by root, Sun May 28 22:24:24 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) {
27 $TOOLTIP->hide;
28
45 $TOOLTIP->{owner} = $widget; 29 $TOOLTIP->{owner} = $widget;
30
31 return if $ENV{CFPLUS_DEBUG} & 8;
46 32
47 my $tip = $widget->{tooltip}; 33 my $tip = $widget->{tooltip};
48 34
49 $tip = $tip->($widget) if CODE:: eq ref $tip; 35 $tip = $tip->($widget) if CODE:: eq ref $tip;
50 36
51 $TOOLTIP->set_tooltip_from ($widget); 37 $TOOLTIP->set_tooltip_from ($widget);
52 $TOOLTIP->show; 38 $TOOLTIP->show;
53
54 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
55
56 ($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0)
57 if $x + $TOOLTIP->{w} > $::WIDTH;
58
59 $TOOLTIP->move ($x, $y);
60 $TOOLTIP->realloc;
61 } 39 }
62 40
63 return; 41 return;
64 } 42 }
65 } 43 }
66 } 44 }
67 45
68 $TOOLTIP->hide; 46 $TOOLTIP->hide;
69 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;
70} 71}
71 72
72# class methods for events 73# class methods for events
73sub feed_sdl_key_down_event { 74sub feed_sdl_key_down_event {
74 $FOCUS->emit (key_down => $_[0]) 75 $FOCUS->emit (key_down => $_[0])
… …
88 my $widget = $ROOT->find_widget ($x, $y); 89 my $widget = $ROOT->find_widget ($x, $y);
89 90
90 $GRAB = $widget; 91 $GRAB = $widget;
91 $GRAB->update if $GRAB; 92 $GRAB->update if $GRAB;
92 93
93 check_tooltip; 94 $TOOLTIP_WATCHER->cb->();
94 } 95 }
95 96
96 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 97 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
97 98
98 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y)) 99 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
… …
113 if (!$BUTTON_STATE) { 114 if (!$BUTTON_STATE) {
114 my $grab = $GRAB; undef $GRAB; 115 my $grab = $GRAB; undef $GRAB;
115 $grab->update if $grab; 116 $grab->update if $grab;
116 $GRAB->update if $GRAB; 117 $GRAB->update if $GRAB;
117 118
118 check_tooltip; 119 $TOOLTIP_WATCHER->cb->();
119 } 120 }
120} 121}
121 122
122sub feed_sdl_motion_event { 123sub feed_sdl_motion_event {
123 my ($ev) = @_; 124 my ($ev) = @_;
… …
129 my $hover = $HOVER; $HOVER = $widget; 130 my $hover = $HOVER; $HOVER = $widget;
130 131
131 $hover->update if $hover && $hover->{can_hover}; 132 $hover->update if $hover && $hover->{can_hover};
132 $HOVER->update if $HOVER && $HOVER->{can_hover}; 133 $HOVER->update if $HOVER && $HOVER->{can_hover};
133 134
134 check_tooltip; 135 $TOOLTIP_WATCHER->start;
135 } 136 }
136 137
137 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y)) 138 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
138 if $HOVER; 139 if $HOVER;
139} 140}
… …
171sub rescale_widgets { 172sub rescale_widgets {
172 my ($sx, $sy) = @_; 173 my ($sx, $sy) = @_;
173 174
174 for my $widget (values %WIDGET) { 175 for my $widget (values %WIDGET) {
175 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
176 $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.]+$/;
177 $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};
178 $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};
179 $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.]+$/;
180 $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};
181 $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
182 } 190 }
183 } 191 }
184 192
185 reconfigure_widgets; 193 reconfigure_widgets;
186} 194}
… …
195 203
196sub new { 204sub new {
197 my $class = shift; 205 my $class = shift;
198 206
199 my $self = bless { 207 my $self = bless {
200 x => 0, 208 x => "center",
201 y => 0, 209 y => "center",
202 z => 0, 210 z => 0,
211 w => undef,
212 h => undef,
203 can_events => 1, 213 can_events => 1,
204 @_ 214 @_
205 }, $class; 215 }, $class;
216
217 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
206 218
207 for (keys %$self) { 219 for (keys %$self) {
208 if (/^on_(.*)$/) { 220 if (/^on_(.*)$/) {
209 $self->connect ($1 => delete $self->{$_}); 221 $self->connect ($1 => delete $self->{$_});
210 } 222 }
211 } 223 }
212 224
213 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
214
215 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) { 225 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {
216 $self->{req_x} = $layout->{x} * $::WIDTH; 226 $self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x};
217 $self->{req_y} = $layout->{y} * $::HEIGHT; 227 $self->{y} = $layout->{y} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{y};
218 $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};
219 $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};
220 } 235 }
221 236
222 $self 237 $self
223} 238}
224 239
… …
235 return if $self->{parent}; 250 return if $self->{parent};
236 251
237 $CFClient::UI::ROOT->add ($self); 252 $CFClient::UI::ROOT->add ($self);
238} 253}
239 254
240sub center {
241 my ($self) = @_;
242
243 $CFClient::UI::ROOT->on_post_alloc (
244 "center_$self" => sub {
245 $self->move (($self->{parent}{w} - $self->{w}) * 0.5, ($self->{parent}{h} - $self->{h}) * 0.5);
246 },
247 );
248
249 $self->update;
250}
251
252sub set_visible { 255sub set_visible {
253 my ($self) = @_; 256 my ($self) = @_;
254 257
255 return if $self->{visible}; 258 return if $self->{visible};
256 259
257 $self->{root} = $self->{parent}{root}; 260 $self->{root} = $self->{parent}{root};
258 $self->{visible} = $self->{parent}{visible} + 1; 261 $self->{visible} = $self->{parent}{visible} + 1;
259 262
260 $self->emit (visibility_change => 1); 263 $self->emit (visibility_change => 1);
261 264
262 $self->realloc unless exists $self->{req_w}; 265 $self->realloc if !exists $self->{req_w};
263 266
264 $_->set_visible for $self->children; 267 $_->set_visible for $self->children;
265} 268}
266 269
267sub set_invisible { 270sub set_invisible {
… …
269 272
270 return unless $self->{visible}; 273 return unless $self->{visible};
271 274
272 $_->set_invisible for $self->children; 275 $_->set_invisible for $self->children;
273 276
277 delete $self->{visible};
274 delete $self->{root}; 278 delete $self->{root};
275 delete $self->{visible};
276 279
277 undef $GRAB if $GRAB == $self; 280 undef $GRAB if $GRAB == $self;
278 undef $HOVER if $HOVER == $self; 281 undef $HOVER if $HOVER == $self;
279 282
280 CFClient::UI::check_tooltip 283 $CFClient::UI::TOOLTIP_WATCHER->cb->()
281 if $TOOLTIP->{owner} == $self; 284 if $TOOLTIP->{owner} == $self;
282 285
283 $self->focus_out; 286 $self->emit ("focus_out");
284
285 $self->emit (visibility_change => 0); 287 $self->emit (visibility_change => 0);
286} 288}
287 289
288sub set_visibility { 290sub set_visibility {
289 my ($self, $visible) = @_; 291 my ($self, $visible) = @_;
… …
309 311
310 $self->{parent}->remove ($self) 312 $self->{parent}->remove ($self)
311 if $self->{parent}; 313 if $self->{parent};
312} 314}
313 315
314sub move { 316sub move_abs {
315 my ($self, $x, $y, $z) = @_; 317 my ($self, $x, $y, $z) = @_;
316 318
317 $self->{x} = int $x; 319 $self->{x} = List::Util::max 0, List::Util::min $self->{root}{w} - $self->{w}, int $x;
318 $self->{y} = int $y; 320 $self->{y} = List::Util::max 0, List::Util::min $self->{root}{h} - $self->{h}, int $y;
319 $self->{z} = $z if defined $z; 321 $self->{z} = $z if defined $z;
320 322
321 $self->update; 323 $self->update;
322} 324}
323 325
324sub set_size { 326sub set_size {
325 my ($self, $w, $h) = @_; 327 my ($self, $w, $h) = @_;
326 328
327 $self->{def_w} = $w; 329 $self->{force_w} = $w;
328 $self->{def_h} = $h; 330 $self->{force_h} = $h;
329 331
330 $self->realloc; 332 $self->realloc;
331} 333}
332 334
333sub size_request { 335sub size_request {
334 require Carp; 336 require Carp;
335 Carp::confess "size_request is abstract"; 337 Carp::confess "size_request is abstract";
336} 338}
337 339
340sub baseline_shift {
341 0
342}
343
338sub configure { 344sub configure {
339 my ($self, $x, $y, $w, $h) = @_; 345 my ($self, $x, $y, $w, $h) = @_;
340 346
341 if ($self->{aspect}) { 347 if ($self->{aspect}) {
348 my ($ow, $oh) = ($w, $h);
349
342 my $w2 = List::Util::min $w, int $h * $self->{aspect}; 350 $w = List::Util::min $w, int $h * $self->{aspect};
343 my $h2 = List::Util::min $h, int $w / $self->{aspect}; 351 $h = List::Util::min $h, int $w / $self->{aspect};
344 352
345 # use alignment to adjust x, y 353 # use alignment to adjust x, y
346 354
347 $x += int +($w - $w2) * 0.5; 355 $x += int 0.5 * ($ow - $w);
348 $y += int +($h - $h2) * 0.5; 356 $y += int 0.5 * ($oh - $h);
349
350 ($w, $h) = ($w2, $h2);
351 } 357 }
352 358
353 if ($self->{x} != $x || $self->{y} != $y) { 359 if ($self->{x} ne $x || $self->{y} ne $y) {
354 $self->{x} = $x; 360 $self->{x} = $x;
355 $self->{y} = $y; 361 $self->{y} = $y;
356 $self->update; 362 $self->update;
357 } 363 }
358 364
359 if ($self->{w} != $w || $self->{h} != $h) { 365 if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
360 return unless $self->{visible}; 366 return unless $self->{visible};
361 367
368 $self->{alloc_w} = $w;
369 $self->{alloc_h} = $h;
370
362 $self->{root}->{size_alloc}{$self+0} = [$self, $w, $h]; 371 $self->{root}{size_alloc}{$self+0} = $self;
363 } 372 }
364}
365
366sub size_allocate {
367 # nothing to be done
368} 373}
369 374
370sub children { 375sub children {
376 # nop
377}
378
379sub visible_children {
380 $_[0]->children
371} 381}
372 382
373sub set_max_size { 383sub set_max_size {
374 my ($self, $w, $h) = @_; 384 my ($self, $w, $h) = @_;
375 385
376 delete $self->{max_w}; $self->{max_w} = $w if $w; 386 $self->{max_w} = int $w if defined $w;
377 delete $self->{max_h}; $self->{max_h} = $h if $h; 387 $self->{max_h} = int $h if defined $h;
388
389 $self->realloc;
378} 390}
379 391
380sub set_tooltip { 392sub set_tooltip {
381 my ($self, $tooltip) = @_; 393 my ($self, $tooltip) = @_;
382 394
… …
387 399
388 $self->{tooltip} = $tooltip; 400 $self->{tooltip} = $tooltip;
389 401
390 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 402 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
391 delete $CFClient::UI::TOOLTIP->{owner}; 403 delete $CFClient::UI::TOOLTIP->{owner};
392 CFClient::UI::check_tooltip; 404 $CFClient::UI::TOOLTIP_WATCHER->cb->();
393 } 405 }
394} 406}
395 407
396# translate global coordinates to local coordinate system 408# translate global coordinates to local coordinate system
397sub coord2local { 409sub coord2local {
… …
405 my ($self, $x, $y) = @_; 417 my ($self, $x, $y) = @_;
406 418
407 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y}) 419 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
408} 420}
409 421
410sub focus_in { 422sub invoke_focus_in {
411 my ($self) = @_; 423 my ($self) = @_;
412 424
413 return if $FOCUS == $self; 425 return if $FOCUS == $self;
414 return unless $self->{can_focus}; 426 return unless $self->{can_focus};
415 427
416 my $focus = $FOCUS; $FOCUS = $self; 428 my $focus = $FOCUS; $FOCUS = $self;
417 429
418 $self->_emit (focus_in => $focus);
419
420 $focus->update if $focus; 430 $focus->update if $focus;
421 $FOCUS->update; 431 $FOCUS->update;
422}
423 432
433 0
434}
435
424sub focus_out { 436sub invoke_focus_out {
425 my ($self) = @_; 437 my ($self) = @_;
426 438
427 return unless $FOCUS == $self; 439 return unless $FOCUS == $self;
428 440
429 my $focus = $FOCUS; undef $FOCUS; 441 my $focus = $FOCUS; undef $FOCUS;
430 442
431 $self->_emit (focus_out => $focus);
432
433 $focus->update if $focus; #? 443 $focus->update if $focus; #?
434 444
435 $::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
436 unless $FOCUS; 446 unless $FOCUS;
437}
438 447
448 0
449}
450
451sub grab_focus {
452 my ($self) = @_;
453
454 $self->emit ("focus_in");
455}
456
439sub mouse_motion { } 457sub invoke_mouse_motion { 1 }
440sub button_up { } 458sub invoke_button_up { 1 }
441sub key_down { } 459sub invoke_key_down { 1 }
442sub key_up { } 460sub invoke_key_up { 1 }
443 461
444sub button_down { 462sub invoke_button_down {
445 my ($self, $ev, $x, $y) = @_; 463 my ($self, $ev, $x, $y) = @_;
446 464
447 $self->focus_in; 465 $self->grab_focus;
448}
449 466
450sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 467 1
451sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 468}
452sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 469
453sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 470sub connect {
454sub 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}
455 484
456sub find_widget { 485sub find_widget {
457 my ($self, $x, $y) = @_; 486 my ($self, $x, $y) = @_;
458 487
459 return () unless $self->{can_events}; 488 return () unless $self->{can_events};
… …
467 496
468sub set_parent { 497sub set_parent {
469 my ($self, $parent) = @_; 498 my ($self, $parent) = @_;
470 499
471 Scalar::Util::weaken ($self->{parent} = $parent); 500 Scalar::Util::weaken ($self->{parent} = $parent);
472
473 $self->set_visible if $parent->{visible}; 501 $self->set_visible if $parent->{visible};
474
475 $self->realloc;
476}
477
478sub connect {
479 my ($self, $signal, $cb) = @_;
480
481 push @{ $self->{signal_cb}{$signal} }, $cb;
482}
483
484sub _emit {
485 my ($self, $signal, @args) = @_;
486
487 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
488}
489
490sub emit {
491 my ($self, $signal, @args) = @_;
492
493 $self->_emit ($signal, @args)
494 || $self->$signal (@args);
495}
496
497sub visibility_change {
498 #my ($self, $visible) = @_;
499} 502}
500 503
501sub realloc { 504sub realloc {
502 my ($self) = @_; 505 my ($self) = @_;
503 506
504 return unless $self->{visible}; 507 if ($self->{visible}) {
505
506 return if $self->{root}{realloc}{$self}; 508 return if $self->{root}{realloc}{$self+0};
507 509
508 $self->{root}{realloc}{$self} = $self; 510 $self->{root}{realloc}{$self+0} = $self;
509 $self->{root}->update; 511 $self->{root}->update;
512 } else {
513 delete $self->{req_w};
514 delete $self->{req_h};
515 }
510} 516}
511 517
512sub update { 518sub update {
513 my ($self) = @_; 519 my ($self) = @_;
514 520
515 $self->{parent}->update 521 $self->{parent}->update
516 if $self->{parent}; 522 if $self->{parent};
517} 523}
518 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
519sub draw { 536sub draw {
520 my ($self) = @_; 537 my ($self) = @_;
521 538
522 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);
523 550
524 glPushMatrix; 551 glPushMatrix;
525 glTranslate $self->{x}, $self->{y}, 0; 552 glTranslate $self->{x}, $self->{y}, 0;
526 $self->_draw;
527 glPopMatrix;
528 553
529 if ($self == $HOVER && $self->{can_hover}) { 554 if ($self == $HOVER && $self->{can_hover}) {
530 my ($x, $y) = @$self{qw(x y)};
531
532 glColor 1, 0.8, 0.5, 0.2; 555 glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
533 glEnable GL_BLEND; 556 glEnable GL_BLEND;
534 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 557 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
535 glBegin GL_QUADS; 558 glBegin GL_QUADS;
536 glVertex $x , $y; 559 glVertex 0 , 0;
537 glVertex $x + $self->{w}, $y; 560 glVertex $self->{w}, 0;
538 glVertex $x + $self->{w}, $y + $self->{h}; 561 glVertex $self->{w}, $self->{h};
539 glVertex $x , $y + $self->{h}; 562 glVertex 0 , $self->{h};
540 glEnd; 563 glEnd;
541 glDisable GL_BLEND; 564 glDisable GL_BLEND;
542 } 565 }
543 566
544 if ($ENV{PCLIENT_DEBUG}) { 567 if ($ENV{CFPLUS_DEBUG} & 1) {
545 glPushMatrix; 568 glPushMatrix;
546 glColor 1, 1, 0, 1; 569 glColor 1, 1, 0, 1;
547 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 570 glTranslate 0.375, 0.375;
548 glBegin GL_LINE_LOOP; 571 glBegin GL_LINE_LOOP;
549 glVertex 0 , 0; 572 glVertex 0 , 0;
550 glVertex $self->{w} - 1, 0; 573 glVertex $self->{w} - 1, 0;
551 glVertex $self->{w} - 1, $self->{h} - 1; 574 glVertex $self->{w} - 1, $self->{h} - 1;
552 glVertex 0 , $self->{h} - 1; 575 glVertex 0 , $self->{h} - 1;
553 glEnd; 576 glEnd;
554 glPopMatrix; 577 glPopMatrix;
555 #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;
556 } 579 }
580
581 $self->_draw;
582 glPopMatrix;
557} 583}
558 584
559sub _draw { 585sub _draw {
560 my ($self) = @_; 586 my ($self) = @_;
561 587
… …
564 590
565sub DESTROY { 591sub DESTROY {
566 my ($self) = @_; 592 my ($self) = @_;
567 593
568 delete $WIDGET{$self+0}; 594 delete $WIDGET{$self+0};
569 #$self->deactivate; 595
596 eval { $self->destroy };
597 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
570} 598}
571 599
572############################################################################# 600#############################################################################
573 601
574package CFClient::UI::DrawBG; 602package CFClient::UI::DrawBG;
… …
599 627
600 if ($color && (@$color < 4 || $color->[3])) { 628 if ($color && (@$color < 4 || $color->[3])) {
601 my ($w, $h) = @$self{qw(w h)}; 629 my ($w, $h) = @$self{qw(w h)};
602 630
603 glEnable GL_BLEND; 631 glEnable GL_BLEND;
604 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 632 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
605 glColor @$color; 633 glColor_premultiply @$color;
606 634
607 glBegin GL_QUADS; 635 glBegin GL_QUADS;
608 glVertex 0 , 0; 636 glVertex 0 , 0;
609 glVertex 0 , $h; 637 glVertex 0 , $h;
610 glVertex $w, $h; 638 glVertex $w, $h;
… …
625 my ($class, %arg) = @_; 653 my ($class, %arg) = @_;
626 $class->SUPER::new (can_events => 0, %arg); 654 $class->SUPER::new (can_events => 0, %arg);
627} 655}
628 656
629sub size_request { 657sub size_request {
630 (0, 0) 658 my ($self) = @_;
659
660 ($self->{w} + 0, $self->{h} + 0)
631} 661}
632 662
633sub draw { } 663sub draw { }
634 664
635############################################################################# 665#############################################################################
… …
639our @ISA = CFClient::UI::Base::; 669our @ISA = CFClient::UI::Base::;
640 670
641sub new { 671sub new {
642 my ($class, %arg) = @_; 672 my ($class, %arg) = @_;
643 673
644 my $children = delete $arg{children} || []; 674 my $children = delete $arg{children};
645 675
646 my $self = $class->SUPER::new ( 676 my $self = $class->SUPER::new (
647 children => [], 677 children => [],
648 can_events => 0, 678 can_events => 0,
649 %arg, 679 %arg,
650 ); 680 );
681
651 $self->add ($_) for @$children; 682 $self->add (@$children)
683 if $children;
652 684
653 $self 685 $self
654} 686}
655 687
656sub add { 688sub add {
… …
704 $x -= $self->{x}; 736 $x -= $self->{x};
705 $y -= $self->{y}; 737 $y -= $self->{y};
706 738
707 my $res; 739 my $res;
708 740
709 for (reverse @{ $self->{children} }) { 741 for (reverse $self->visible_children) {
710 $res = $_->find_widget ($x, $y) 742 $res = $_->find_widget ($x, $y)
711 and return $res; 743 and return $res;
712 } 744 }
713 745
714 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y}) 746 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
… …
735} 767}
736 768
737sub add { 769sub add {
738 my ($self, $child) = @_; 770 my ($self, $child) = @_;
739 771
740 $self->{children} = []; 772 $self->SUPER::remove ($_) for @{ $self->{children} };
741
742 $self->SUPER::add ($child); 773 $self->SUPER::add ($child);
743} 774}
744 775
745sub remove { 776sub remove {
746 my ($self, $widget) = @_; 777 my ($self, $widget) = @_;
… …
755 786
756sub size_request { 787sub size_request {
757 $_[0]{children}[0]->size_request 788 $_[0]{children}[0]->size_request
758} 789}
759 790
760sub size_allocate { 791sub invoke_size_allocate {
761 my ($self, $w, $h, $changed) = @_; 792 my ($self, $w, $h) = @_;
762 793
763 $self->{children}[0]->configure (0, 0, $w, $h); 794 $self->{children}[0]->configure (0, 0, $w, $h);
795
796 1
764} 797}
765 798
766############################################################################# 799#############################################################################
800
801# back-buffered drawing area
767 802
768package CFClient::UI::Window; 803package CFClient::UI::Window;
769 804
770our @ISA = CFClient::UI::Bin::; 805our @ISA = CFClient::UI::Bin::;
771 806
… …
782 817
783 $ROOT->on_post_alloc ($self => sub { $self->render_child }); 818 $ROOT->on_post_alloc ($self => sub { $self->render_child });
784 $self->SUPER::update; 819 $self->SUPER::update;
785} 820}
786 821
787sub size_allocate { 822sub invoke_size_allocate {
788 my ($self, $w, $h, $changed) = @_; 823 my ($self, $w, $h) = @_;
789 824
790 $self->SUPER::size_allocate ($w, $h, $changed);
791 $self->update 825 $self->update;
792 if $changed; 826
827 $self->SUPER::invoke_size_allocate ($w, $h)
793} 828}
794 829
795sub _render { 830sub _render {
831 my ($self) = @_;
832
796 $_[0]{children}[0]->draw; 833 $self->{children}[0]->draw;
797} 834}
798 835
799sub render_child { 836sub render_child {
800 my ($self) = @_; 837 my ($self) = @_;
801 838
802 $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 {
803 glClearColor 0, 0, 0, 0; 840 glClearColor 0, 0, 0, 0;
804 glClear GL_COLOR_BUFFER_BIT; 841 glClear GL_COLOR_BUFFER_BIT;
805 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
806 $self->_render; 850 $self->_render;
807 }; 851 };
808} 852}
809 853
810sub _draw { 854sub _draw {
811 my ($self) = @_; 855 my ($self) = @_;
812 856
813 my ($w, $h) = ($self->w, $self->h); 857 my ($w, $h) = @$self{qw(w h)};
814 858
815 my $tex = $self->{texture} 859 my $tex = $self->{texture}
816 or return; 860 or return;
817 861
818 glEnable GL_TEXTURE_2D; 862 glEnable GL_TEXTURE_2D;
819 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 863 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
820 glColor 1, 1, 1, 1; 864 glColor 0, 0, 0, 1;
821 865
822 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 866 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
823 867
824 glDisable GL_TEXTURE_2D; 868 glDisable GL_TEXTURE_2D;
825} 869}
… …
841} 885}
842 886
843sub size_request { 887sub size_request {
844 my ($self) = @_; 888 my ($self) = @_;
845 889
846 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)};
847 891
848 $w = 10 if $self->{scroll_x}; 892 $w = 10 if $self->{scroll_x};
849 $h = 10 if $self->{scroll_y}; 893 $h = 10 if $self->{scroll_y};
850 894
851 ($w, $h) 895 ($w, $h)
852} 896}
853 897
854sub size_allocate { 898sub invoke_size_allocate {
855 my ($self, $w, $h, $changed) = @_; 899 my ($self, $w, $h) = @_;
856 900
901 my $child = $self->child;
902
857 $w = $self->{child_w} if $self->{scroll_x} && $self->{child_w}; 903 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
858 $h = $self->{child_h} if $self->{scroll_y} && $self->{child_h}; 904 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
859 905
860 $self->child->configure (0, 0, $w, $h); 906 $self->child->configure (0, 0, $w, $h);
861 $self->update; 907 $self->update;
908
909 1
862} 910}
863 911
864sub set_offset { 912sub set_offset {
865 my ($self, $x, $y) = @_; 913 my ($self, $x, $y) = @_;
866 914
… …
899} 947}
900 948
901sub _render { 949sub _render {
902 my ($self) = @_; 950 my ($self) = @_;
903 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
904 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 955 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
905 956
906 $self->SUPER::_render; 957 $self->SUPER::_render;
907} 958}
908 959
… …
911package CFClient::UI::ScrolledWindow; 962package CFClient::UI::ScrolledWindow;
912 963
913our @ISA = CFClient::UI::HBox::; 964our @ISA = CFClient::UI::HBox::;
914 965
915sub new { 966sub new {
916 my $class = shift; 967 my ($class, %arg) = @_;
968
969 my $child = delete $arg{child};
917 970
918 my $self; 971 my $self;
919 972
920 my $slider = new CFClient::UI::Slider 973 my $slider = new CFClient::UI::Slider
921 vertical => 1, 974 vertical => 1,
… …
926 ; 979 ;
927 980
928 $self = $class->SUPER::new ( 981 $self = $class->SUPER::new (
929 vp => (new CFClient::UI::ViewPort expand => 1), 982 vp => (new CFClient::UI::ViewPort expand => 1),
930 slider => $slider, 983 slider => $slider,
931 @_, 984 %arg,
932 ); 985 );
933 986
934 $self->{vp}->add ($self->{scrolled});
935 $self->add ($self->{vp});
936 $self->add ($self->{slider}); 987 $self->SUPER::add ($self->{vp}, $self->{slider});
988 $self->add ($child) if $child;
937 989
938 $self 990 $self
991}
992
993sub add {
994 my ($self, $widget) = @_;
995
996 $self->{vp}->add ($self->{child} = $widget);
939} 997}
940 998
941sub update { 999sub update {
942 my ($self) = @_; 1000 my ($self) = @_;
943 1001
… …
946 # todo: overwrite size_allocate of child 1004 # todo: overwrite size_allocate of child
947 my $child = $self->{vp}->child; 1005 my $child = $self->{vp}->child;
948 $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]);
949} 1007}
950 1008
951sub size_allocate { 1009sub invoke_size_allocate {
952 my ($self, $w, $h, $changed) = @_; 1010 my ($self, $w, $h) = @_;
953
954 $self->SUPER::size_allocate ($w, $h, $changed);
955 1011
956 my $child = $self->{vp}->child; 1012 my $child = $self->{vp}->child;
957 $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)
958} 1016}
959 1017
960#TODO# update range on size_allocate depending on child 1018#TODO# update range on size_allocate depending on child
961# update viewport offset on scroll 1019# update viewport offset on scroll
962 1020
… …
982 1040
983 if ($self->{bg}) { 1041 if ($self->{bg}) {
984 my ($w, $h) = @$self{qw(w h)}; 1042 my ($w, $h) = @$self{qw(w h)};
985 1043
986 glEnable GL_BLEND; 1044 glEnable GL_BLEND;
987 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1045 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
988 glColor @{ $self->{bg} }; 1046 glColor_premultiply @{ $self->{bg} };
989 1047
990 glBegin GL_QUADS; 1048 glBegin GL_QUADS;
991 glVertex 0 , 0; 1049 glVertex 0 , 0;
992 glVertex 0 , $h; 1050 glVertex 0 , $h;
993 glVertex $w, $h; 1051 glVertex $w, $h;
… …
1006 1064
1007our @ISA = CFClient::UI::Bin::; 1065our @ISA = CFClient::UI::Bin::;
1008 1066
1009use CFClient::OpenGL; 1067use CFClient::OpenGL;
1010 1068
1011my @tex = 1069my $bg =
1070 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1071 mipmap => 1, wrap => 1;
1072
1073my @border =
1012 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1074 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1013 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);
1014 1076
1015sub new { 1077sub new {
1016 my $class = shift; 1078 my ($class, %arg) = @_;
1017 1079
1018 my $self = $class->SUPER::new ( 1080 my $self = $class->SUPER::new (
1019 bg => [1, 1, 1, 1], 1081 bg => [1, 1, 1, 1],
1020 border_bg => [1, 1, 1, 1], 1082 border_bg => [1, 1, 1, 1],
1021 border => 0.6, 1083 border => 0.6,
1022 is_toplevel => 1,
1023 can_events => 1, 1084 can_events => 1,
1024 @_ 1085 min_w => 16,
1086 min_h => 16,
1087 %arg,
1025 ); 1088 );
1026 1089
1027 $self->{title} &&= new CFClient::UI::Label 1090 $self->{title_widget} = new CFClient::UI::Label
1028 align => 0, 1091 align => 0,
1029 valign => 1, 1092 valign => 1,
1030 text => $self->{title}, 1093 text => $self->{title},
1031 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 }
1032 1105
1033 $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};
1034} 1115}
1035 1116
1036sub border { 1117sub border {
1037 int $_[0]{border} * $::FONTSIZE 1118 int $_[0]{border} * $::FONTSIZE
1038} 1119}
1039 1120
1040sub size_request { 1121sub size_request {
1041 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};
1042 1129
1043 my ($w, $h) = $self->SUPER::size_request; 1130 my ($w, $h) = $self->SUPER::size_request;
1044 1131
1045 ( 1132 (
1046 $w + $self->border * 2, 1133 $w + $self->border * 2,
1047 $h + $self->border * 2, 1134 $h + $self->border * 2,
1048 ) 1135 )
1049} 1136}
1050 1137
1051sub size_allocate { 1138sub invoke_size_allocate {
1052 my ($self, $w, $h, $changed) = @_; 1139 my ($self, $w, $h) = @_;
1053 1140
1054 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 }
1055 1146
1147 my $border = $self->border;
1148
1056 $h -= List::Util::max 0, $self->border * 2; 1149 $h -= List::Util::max 0, $border * 2;
1057 $w -= List::Util::max 0, $self->border * 2; 1150 $w -= List::Util::max 0, $border * 2;
1058 1151
1059 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
1060 if $self->{title};
1061
1062 $self->child->configure ($self->border, $self->border, $w, $h); 1152 $self->child->configure ($border, $border, $w, $h);
1063}
1064 1153
1154 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1155 if $self->{close_button};
1156
1157 1
1158}
1159
1065sub button_down { 1160sub invoke_button_down {
1066 my ($self, $ev, $x, $y) = @_; 1161 my ($self, $ev, $x, $y) = @_;
1067 1162
1068 my ($w, $h) = @$self{qw(w h)}; 1163 my ($w, $h) = @$self{qw(w h)};
1069 my $border = $self->border; 1164 my $border = $self->border;
1070 1165
… …
1083 my ($ev, $x, $y) = @_; 1178 my ($ev, $x, $y) = @_;
1084 1179
1085 my $dx = $ev->{x} - $ox; 1180 my $dx = $ev->{x} - $ox;
1086 my $dy = $ev->{y} - $oy; 1181 my $dy = $ev->{y} - $oy;
1087 1182
1088 $self->{user_x} = $wx + $dx * $mx;
1089 $self->{user_y} = $wy + $dy * $my;
1090 $self->{def_w} = $bw + $dx * ($mx ? -1 : 1); 1183 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1091 $self->{def_h} = $bh + $dy * ($my ? -1 : 1); 1184 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1092 $self->move ($self->{user_x}, $self->{user_y}); 1185
1186 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1093 $self->realloc; 1187 $self->realloc;
1094 }; 1188 };
1095 1189
1096 } elsif ($lr ^ $td) { 1190 } elsif ($lr ^ $td) {
1097 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1191 my ($ox, $oy) = ($ev->{x}, $ev->{y});
… …
1100 $self->{motion} = sub { 1194 $self->{motion} = sub {
1101 my ($ev, $x, $y) = @_; 1195 my ($ev, $x, $y) = @_;
1102 1196
1103 ($x, $y) = ($ev->{x}, $ev->{y}); 1197 ($x, $y) = ($ev->{x}, $ev->{y});
1104 1198
1105 $self->{user_x} = $bx + $x - $ox; 1199 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1106 $self->{user_y} = $by + $y - $oy; 1200 # HACK: the next line is required to enforce placement
1107 1201 $self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
1108 $self->move ($self->{user_x}, $self->{user_y});
1109 $self->realloc;
1110 }; 1202 };
1203 } else {
1204 return 0;
1205 }
1206
1111 } 1207 1
1112} 1208}
1113 1209
1114sub button_up { 1210sub invoke_button_up {
1115 my ($self, $ev, $x, $y) = @_; 1211 my ($self, $ev, $x, $y) = @_;
1116 1212
1117 delete $self->{motion}; 1213 ! ! delete $self->{motion}
1118} 1214}
1119 1215
1120sub mouse_motion { 1216sub invoke_mouse_motion {
1121 my ($self, $ev, $x, $y) = @_; 1217 my ($self, $ev, $x, $y) = @_;
1122 1218
1123 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1219 $self->{motion}->($ev, $x, $y) if $self->{motion};
1220
1221 ! ! $self->{motion}
1124} 1222}
1125 1223
1126sub _draw { 1224sub _draw {
1127 my ($self) = @_; 1225 my ($self) = @_;
1128 1226
1227 my $child = $self->{children}[0];
1228
1129 my ($w, $h ) = ($self->{w}, $self->{h}); 1229 my ($w, $h ) = ($self->{w}, $self->{h});
1130 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1230 my ($cw, $ch) = ($child->{w}, $child->{h});
1131 1231
1132 glEnable GL_TEXTURE_2D; 1232 glEnable GL_TEXTURE_2D;
1133 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1233 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1134 1234
1135 my $border = $self->border; 1235 my $border = $self->border;
1136 1236
1137 glColor @{ $self->{border_bg} }; 1237 glColor @{ $self->{border_bg} };
1138 $tex[1]->draw_quad_alpha (0, 0, $w, $border); 1238 $border[0]->draw_quad_alpha (0, 0, $w, $border);
1139 $tex[3]->draw_quad_alpha (0, $border, $border, $ch); 1239 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
1140 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1240 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1141 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border); 1241 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
1142 1242
1143 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1243 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1144 my $bg = $tex[0]; 1244 glColor @{ $self->{bg} };
1145 1245
1146 # TODO: repeat texture not scale 1246 # TODO: repeat texture not scale
1247 # solve this better(?)
1147 my $rep_x = $cw / $bg->{w}; 1248 $bg->{s} = $cw / $bg->{w};
1148 my $rep_y = $ch / $bg->{h}; 1249 $bg->{t} = $ch / $bg->{h};
1149
1150 glColor @{ $self->{bg} };
1151
1152 $bg->{s} = $rep_x;
1153 $bg->{t} = $rep_y;
1154 $bg->{wrap_mode} = 1;
1155 $bg->draw_quad_alpha ($border, $border, $cw, $ch); 1250 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1156 } 1251 }
1157 1252
1158 glDisable GL_TEXTURE_2D; 1253 glDisable GL_TEXTURE_2D;
1159 1254
1160 $self->{title}->draw if $self->{title};
1161
1162 $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};
1163} 1266}
1164 1267
1165############################################################################# 1268#############################################################################
1166 1269
1167package CFClient::UI::Table; 1270package CFClient::UI::Table;
… …
1190 1293
1191 $child->set_parent ($self); 1294 $child->set_parent ($self);
1192 $self->{children}[$y][$x] = $child; 1295 $self->{children}[$y][$x] = $child;
1193 1296
1194 $self->realloc; 1297 $self->realloc;
1298}
1299
1300sub remove {
1301 my ($self, $child) = @_;
1302
1303 # TODO: not yet implemented
1195} 1304}
1196 1305
1197# 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?
1198sub clear { 1307sub clear {
1199 my ($self) = @_; 1308 my ($self) = @_;
… …
1240 (sum @$ws), 1349 (sum @$ws),
1241 (sum @$hs), 1350 (sum @$hs),
1242 ) 1351 )
1243} 1352}
1244 1353
1245sub size_allocate { 1354sub invoke_size_allocate {
1246 my ($self, $w, $h, $changed) = @_; 1355 my ($self, $w, $h) = @_;
1247 1356
1248 my ($ws, $hs) = $self->get_wh; 1357 my ($ws, $hs) = $self->get_wh;
1249 1358
1250 my $req_w = (sum @$ws) || 1; 1359 my $req_w = (sum @$ws) || 1;
1251 my $req_h = (sum @$hs) || 1; 1360 my $req_h = (sum @$hs) || 1;
… …
1282 } 1391 }
1283 1392
1284 $y += $row_h; 1393 $y += $row_h;
1285 } 1394 }
1286 1395
1396 1
1287} 1397}
1288 1398
1289sub find_widget { 1399sub find_widget {
1290 my ($self, $x, $y) = @_; 1400 my ($self, $x, $y) = @_;
1291 1401
… …
1328 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1438 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1329 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1439 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1330 ) 1440 )
1331} 1441}
1332 1442
1333sub size_allocate { 1443sub invoke_size_allocate {
1334 my ($self, $w, $h, $changed) = @_; 1444 my ($self, $w, $h) = @_;
1335 1445
1336 my $space = $self->{vertical} ? $h : $w; 1446 my $space = $self->{vertical} ? $h : $w;
1337 my $children = $self->{children}; 1447 my @children = $self->visible_children;
1338 1448
1339 my @req; 1449 my @req;
1340 1450
1341 if ($self->{homogeneous}) { 1451 if ($self->{homogeneous}) {
1342 @req = ($space / (@$children || 1)) x @$children; 1452 @req = ($space / (@children || 1)) x @children;
1343 } else { 1453 } else {
1344 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children; 1454 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1345 my $req = List::Util::sum @req; 1455 my $req = List::Util::sum @req;
1346 1456
1347 if ($req > $space) { 1457 if ($req > $space) {
1348 # ah well, not enough space 1458 # ah well, not enough space
1349 $_ *= $space / $req for @req; 1459 $_ *= $space / $req for @req;
1350 } else { 1460 } else {
1351 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1; 1461 my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1352 1462
1353 $space = ($space - $req) / $expand; # remaining space to give away 1463 $space = ($space - $req) / $expand; # remaining space to give away
1354 1464
1355 $req[$_] += $space * $children->[$_]{expand} 1465 $req[$_] += $space * $children[$_]{expand}
1356 for 0 .. $#$children; 1466 for 0 .. $#children;
1357 } 1467 }
1358 } 1468 }
1359 1469
1360 CFClient::UI::harmonize \@req; 1470 CFClient::UI::harmonize \@req;
1361 1471
1362 my $pos = 0; 1472 my $pos = 0;
1363 for (0 .. $#$children) { 1473 for (0 .. $#children) {
1364 my $alloc = $req[$_]; 1474 my $alloc = $req[$_];
1365 $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));
1366 1476
1367 $pos += $alloc; 1477 $pos += $alloc;
1368 } 1478 }
1369 1479
1370 1 1480 1
… …
1422 ellipsise => 3, # end 1532 ellipsise => 3, # end
1423 layout => (new CFClient::Layout), 1533 layout => (new CFClient::Layout),
1424 fontsize => 1, 1534 fontsize => 1,
1425 align => -1, 1535 align => -1,
1426 valign => -1, 1536 valign => -1,
1427 padding => 2, 1537 padding_x => 2,
1538 padding_y => 2,
1428 can_events => 0, 1539 can_events => 0,
1429 %arg 1540 %arg
1430 ); 1541 );
1431 1542
1432 if (exists $self->{template}) { 1543 if (exists $self->{template}) {
… …
1459 1570
1460 delete $self->{texture}; 1571 delete $self->{texture};
1461 $self->SUPER::update; 1572 $self->SUPER::update;
1462} 1573}
1463 1574
1575sub realloc {
1576 my ($self) = @_;
1577
1578 delete $self->{ox};
1579 $self->SUPER::realloc;
1580}
1581
1464sub set_text { 1582sub set_text {
1465 my ($self, $text) = @_; 1583 my ($self, $text) = @_;
1466 1584
1467 return if $self->{text} eq "T$text"; 1585 return if $self->{text} eq "T$text";
1468 $self->{text} = "T$text"; 1586 $self->{text} = "T$text";
1469 1587
1470 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1588 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1471 $self->{layout}->set_text ($text); 1589 $self->{layout}->set_text ($text);
1472 1590
1591 delete $self->{size_req};
1473 $self->realloc; 1592 $self->realloc;
1593 $self->update;
1474} 1594}
1475 1595
1476sub set_markup { 1596sub set_markup {
1477 my ($self, $markup) = @_; 1597 my ($self, $markup) = @_;
1478 1598
… …
1482 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1602 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1483 1603
1484 $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;
1485 $self->{layout}->set_markup ($markup); 1605 $self->{layout}->set_markup ($markup);
1486 1606
1607 delete $self->{size_req};
1487 $self->realloc; 1608 $self->realloc;
1609 $self->update;
1488} 1610}
1489 1611
1490sub size_request { 1612sub size_request {
1491 my ($self) = @_; 1613 my ($self) = @_;
1492 1614
1615 $self->{size_req} ||= do {
1493 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1616 $self->{layout}->set_font ($self->{font}) if $self->{font};
1494 $self->{layout}->set_width ($self->{max_w} || -1); 1617 $self->{layout}->set_width ($self->{max_w} || -1);
1495 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1618 $self->{layout}->set_ellipsise ($self->{ellipsise});
1496 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1619 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1497 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1620 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1498 1621
1499 my ($w, $h) = $self->{layout}->size; 1622 my ($w, $h) = $self->{layout}->size;
1500 1623
1501 if (exists $self->{template}) { 1624 if (exists $self->{template}) {
1502 $self->{template}->set_font ($self->{font}) if $self->{font}; 1625 $self->{template}->set_font ($self->{font}) if $self->{font};
1503 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1626 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1504 1627
1505 my ($w2, $h2) = $self->{template}->size; 1628 my ($w2, $h2) = $self->{template}->size;
1506 1629
1507 $w = List::Util::max $w, $w2; 1630 $w = List::Util::max $w, $w2;
1508 $h = List::Util::max $h, $h2; 1631 $h = List::Util::max $h, $h2;
1632 }
1633
1634 [$w, $h]
1509 } 1635 };
1510 1636
1511 ( 1637 @{ $self->{size_req} }
1512 $w + $self->{padding} * 2,
1513 $h + $self->{padding} * 2,
1514 )
1515} 1638}
1516 1639
1640sub baseline_shift {
1641 $_[0]{layout}->descent
1642}
1643
1517sub size_allocate { 1644sub invoke_size_allocate {
1518 my ($self, $w, $h, $changed) = @_; 1645 my ($self, $w, $h) = @_;
1646
1647 delete $self->{ox};
1519 1648
1520 delete $self->{texture} 1649 delete $self->{texture}
1521 if $changed; 1650 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1651
1652 1
1522} 1653}
1523 1654
1524sub set_fontsize { 1655sub set_fontsize {
1525 my ($self, $fontsize) = @_; 1656 my ($self, $fontsize) = @_;
1526 1657
1527 $self->{fontsize} = $fontsize; 1658 $self->{fontsize} = $fontsize;
1528 delete $self->{texture}; 1659 delete $self->{texture};
1529 1660
1530 $self->realloc; 1661 $self->realloc;
1662}
1663
1664sub reconfigure {
1665 my ($self) = @_;
1666
1667 delete $self->{size_req};
1668
1669 $self->SUPER::reconfigure;
1531} 1670}
1532 1671
1533sub _draw { 1672sub _draw {
1534 my ($self) = @_; 1673 my ($self) = @_;
1535 1674
… …
1541 $self->{layout}->set_width ($self->{w}); 1680 $self->{layout}->set_width ($self->{w});
1542 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1681 $self->{layout}->set_ellipsise ($self->{ellipsise});
1543 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1682 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1544 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1683 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1545 1684
1546 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1685 new_from_layout CFClient::Texture $self->{layout}
1686 };
1547 1687
1688 unless (exists $self->{ox}) {
1548 $self->{ox} = int ($self->{align} < 0 ? $self->{padding} 1689 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1549 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1690 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1550 : ($self->{w} - $tex->{w}) * 0.5); 1691 : ($self->{w} - $tex->{w}) * 0.5);
1551 1692
1552 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding} 1693 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1553 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding} 1694 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1554 : ($self->{h} - $tex->{h}) * 0.5); 1695 : ($self->{h} - $tex->{h}) * 0.5);
1555
1556 $tex
1557 }; 1696 };
1558 1697
1559 glEnable GL_TEXTURE_2D; 1698 glEnable GL_TEXTURE_2D;
1560 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};
1561 1702
1562 if ($tex->{format} == GL_ALPHA) { 1703 if ($tex->{format} == GL_ALPHA) {
1704 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1563 glColor @{$self->{fg}}; 1705 glColor @{$self->{fg}};
1564 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}); 1706 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}, $w, $h);
1565 } else { 1707 } else {
1708 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1566 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}); 1709 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}, $w, $h);
1567 } 1710 }
1568 1711
1569 glDisable GL_TEXTURE_2D; 1712 glDisable GL_TEXTURE_2D;
1570} 1713}
1571 1714
… …
1588 can_hover => 1, 1731 can_hover => 1,
1589 can_focus => 1, 1732 can_focus => 1,
1590 valign => 0, 1733 valign => 0,
1591 can_events => 1, 1734 can_events => 1,
1592 #text => ... 1735 #text => ...
1736 #hidden => "*",
1593 @_ 1737 @_
1594 ) 1738 )
1595} 1739}
1596 1740
1597sub _set_text { 1741sub _set_text {
… …
1599 1743
1600 delete $self->{cur_h}; 1744 delete $self->{cur_h};
1601 1745
1602 return if $self->{text} eq $text; 1746 return if $self->{text} eq $text;
1603 1747
1604 delete $self->{texture};
1605
1606 $self->{last_activity} = $::NOW; 1748 $self->{last_activity} = $::NOW;
1607 $self->{text} = $text; 1749 $self->{text} = $text;
1608 1750
1609 $text =~ s/./*/g if $self->{hidden}; 1751 $text =~ s/./*/g if $self->{hidden};
1610 $self->{layout}->set_text ("$text "); 1752 $self->{layout}->set_text ("$text ");
1753 delete $self->{size_req};
1611 1754
1612 $self->_emit (changed => $self->{text}); 1755 $self->emit (changed => $self->{text});
1756
1757 $self->realloc;
1758 $self->update;
1613} 1759}
1614 1760
1615sub set_text { 1761sub set_text {
1616 my ($self, $text) = @_; 1762 my ($self, $text) = @_;
1617 1763
1618 $self->{cursor} = length $text; 1764 $self->{cursor} = length $text;
1619 $self->_set_text ($text); 1765 $self->_set_text ($text);
1620
1621 $self->realloc;
1622} 1766}
1623 1767
1624sub get_text { 1768sub get_text {
1625 $_[0]{text} 1769 $_[0]{text}
1626} 1770}
… …
1631 my ($w, $h) = $self->SUPER::size_request; 1775 my ($w, $h) = $self->SUPER::size_request;
1632 1776
1633 ($w + 1, $h) # add 1 for cursor 1777 ($w + 1, $h) # add 1 for cursor
1634} 1778}
1635 1779
1636sub key_down { 1780sub invoke_key_down {
1637 my ($self, $ev) = @_; 1781 my ($self, $ev) = @_;
1638 1782
1639 my $mod = $ev->{mod}; 1783 my $mod = $ev->{mod};
1640 my $sym = $ev->{sym}; 1784 my $sym = $ev->{sym};
1641 my $uni = $ev->{unicode}; 1785 my $uni = $ev->{unicode};
… …
1653 } elsif ($sym == CFClient::SDLK_HOME) { 1797 } elsif ($sym == CFClient::SDLK_HOME) {
1654 $self->{cursor} = 0; 1798 $self->{cursor} = 0;
1655 } elsif ($sym == CFClient::SDLK_END) { 1799 } elsif ($sym == CFClient::SDLK_END) {
1656 $self->{cursor} = length $text; 1800 $self->{cursor} = length $text;
1657 } elsif ($uni == 27) { 1801 } elsif ($uni == 27) {
1658 $self->_emit ('escape'); 1802 $self->emit ('escape');
1659 } elsif ($uni) { 1803 } elsif ($uni) {
1660 substr $text, $self->{cursor}++, 0, chr $uni; 1804 substr $text, $self->{cursor}++, 0, chr $uni;
1805 } else {
1806 return 0;
1661 } 1807 }
1662 1808
1663 $self->_set_text ($text); 1809 $self->_set_text ($text);
1664 1810
1665 $self->realloc; 1811 $self->realloc;
1666}
1667 1812
1813 1
1814}
1815
1668sub focus_in { 1816sub invoke_focus_in {
1669 my ($self) = @_; 1817 my ($self) = @_;
1670 1818
1671 $self->{last_activity} = $::NOW; 1819 $self->{last_activity} = $::NOW;
1672 1820
1673 $self->SUPER::focus_in; 1821 $self->SUPER::invoke_focus_in
1674} 1822}
1675 1823
1676sub button_down { 1824sub invoke_button_down {
1677 my ($self, $ev, $x, $y) = @_; 1825 my ($self, $ev, $x, $y) = @_;
1678 1826
1679 $self->SUPER::button_down ($ev, $x, $y); 1827 $self->SUPER::invoke_button_down ($ev, $x, $y);
1680 1828
1681 my $idx = $self->{layout}->xy_to_index ($x, $y); 1829 my $idx = $self->{layout}->xy_to_index ($x, $y);
1682 1830
1683 # byte-index to char-index 1831 # byte-index to char-index
1684 my $text = $self->{text}; 1832 my $text = $self->{text};
1685 utf8::encode $text; 1833 utf8::encode $text;
1686 $self->{cursor} = length substr $text, 0, $idx; 1834 $self->{cursor} = length substr $text, 0, $idx;
1687 1835
1688 $self->_set_text ($self->{text}); 1836 $self->_set_text ($self->{text});
1689 $self->update; 1837 $self->update;
1838
1839 1
1690} 1840}
1691 1841
1692sub mouse_motion { 1842sub invoke_mouse_motion {
1693 my ($self, $ev, $x, $y) = @_; 1843 my ($self, $ev, $x, $y) = @_;
1694# 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
1695} 1847}
1696 1848
1697sub _draw { 1849sub _draw {
1698 my ($self) = @_; 1850 my ($self) = @_;
1699 1851
1700 local $self->{fg} = $self->{fg}; 1852 local $self->{fg} = $self->{fg};
1701 1853
1702 if ($FOCUS == $self) { 1854 if ($FOCUS == $self) {
1703 glColor @{$self->{active_bg}}; 1855 glColor_premultiply @{$self->{active_bg}};
1704 $self->{fg} = $self->{active_fg}; 1856 $self->{fg} = $self->{active_fg};
1705 } else { 1857 } else {
1706 glColor @{$self->{bg}}; 1858 glColor_premultiply @{$self->{bg}};
1707 } 1859 }
1708 1860
1709 glEnable GL_BLEND; 1861 glEnable GL_BLEND;
1710 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1862 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1711 glBegin GL_QUADS; 1863 glBegin GL_QUADS;
1712 glVertex 0 , 0; 1864 glVertex 0 , 0;
1713 glVertex 0 , $self->{h}; 1865 glVertex 0 , $self->{h};
1714 glVertex $self->{w}, $self->{h}; 1866 glVertex $self->{w}, $self->{h};
1715 glVertex $self->{w}, 0; 1867 glVertex $self->{w}, 0;
… …
1740 1892
1741our @ISA = CFClient::UI::EntryBase::; 1893our @ISA = CFClient::UI::EntryBase::;
1742 1894
1743use CFClient::OpenGL; 1895use CFClient::OpenGL;
1744 1896
1745sub key_down { 1897sub invoke_key_down {
1746 my ($self, $ev) = @_; 1898 my ($self, $ev) = @_;
1747 1899
1748 my $sym = $ev->{sym}; 1900 my $sym = $ev->{sym};
1749 1901
1750 if ($sym == 13) { 1902 if ($sym == 13) {
1751 unshift @{$self->{history}}, 1903 unshift @{$self->{history}},
1752 my $txt = $self->get_text; 1904 my $txt = $self->get_text;
1905
1753 $self->{history_pointer} = -1; 1906 $self->{history_pointer} = -1;
1754 $self->{history_saveback} = ''; 1907 $self->{history_saveback} = '';
1755 $self->_emit (activate => $txt); 1908 $self->emit (activate => $txt);
1756 $self->update; 1909 $self->update;
1757 1910
1758 } elsif ($sym == CFClient::SDLK_UP) { 1911 } elsif ($sym == CFClient::SDLK_UP) {
1759 if ($self->{history_pointer} < 0) { 1912 if ($self->{history_pointer} < 0) {
1760 $self->{history_saveback} = $self->get_text; 1913 $self->{history_saveback} = $self->get_text;
… …
1776 } else { 1929 } else {
1777 $self->set_text ($self->{history_saveback}); 1930 $self->set_text ($self->{history_saveback});
1778 } 1931 }
1779 1932
1780 } else { 1933 } else {
1781 $self->SUPER::key_down ($ev); 1934 return $self->SUPER::invoke_key_down ($ev)
1935 }
1936
1782 } 1937 1
1783
1784} 1938}
1785 1939
1786############################################################################# 1940#############################################################################
1787 1941
1788package CFClient::UI::Button; 1942package CFClient::UI::Button;
… …
1797 1951
1798sub new { 1952sub new {
1799 my $class = shift; 1953 my $class = shift;
1800 1954
1801 $class->SUPER::new ( 1955 $class->SUPER::new (
1802 padding => 4, 1956 padding_x => 4,
1957 padding_y => 4,
1803 fg => [1, 1, 1], 1958 fg => [1, 1, 1],
1804 active_fg => [0, 0, 1], 1959 active_fg => [0, 0, 1],
1805 can_hover => 1, 1960 can_hover => 1,
1806 align => 0, 1961 align => 0,
1807 valign => 0, 1962 valign => 0,
1808 can_events => 1, 1963 can_events => 1,
1809 @_ 1964 @_
1810 ) 1965 )
1811} 1966}
1812 1967
1813sub activate { }
1814
1815sub button_up { 1968sub invoke_button_up {
1816 my ($self, $ev, $x, $y) = @_; 1969 my ($self, $ev, $x, $y) = @_;
1817 1970
1818 $self->emit ("activate") 1971 $self->emit ("activate")
1819 if $x >= 0 && $x < $self->{w} 1972 if $x >= 0 && $x < $self->{w}
1820 && $y >= 0 && $y < $self->{h}; 1973 && $y >= 0 && $y < $self->{h};
1974
1975 1
1821} 1976}
1822 1977
1823sub _draw { 1978sub _draw {
1824 my ($self) = @_; 1979 my ($self) = @_;
1825 1980
1826 local $self->{fg} = $self->{fg}; 1981 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1827
1828 if ($GRAB == $self) {
1829 $self->{fg} = $self->{active_fg};
1830 }
1831 1982
1832 glEnable GL_TEXTURE_2D; 1983 glEnable GL_TEXTURE_2D;
1833 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1984 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1834 glColor 0, 0, 0, 1; 1985 glColor 0, 0, 0, 1;
1835 1986
… …
1840 $self->SUPER::_draw; 1991 $self->SUPER::_draw;
1841} 1992}
1842 1993
1843############################################################################# 1994#############################################################################
1844 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
1845package CFClient::UI::CheckBox; 2032package CFClient::UI::CheckBox;
1846 2033
1847our @ISA = CFClient::UI::DrawBG::; 2034our @ISA = CFClient::UI::DrawBG::;
1848 2035
1849my @tex = 2036my @tex =
… …
1854 2041
1855sub new { 2042sub new {
1856 my $class = shift; 2043 my $class = shift;
1857 2044
1858 $class->SUPER::new ( 2045 $class->SUPER::new (
1859 padding => 2, 2046 padding_x => 2,
2047 padding_y => 2,
1860 fg => [1, 1, 1], 2048 fg => [1, 1, 1],
1861 active_fg => [1, 1, 0], 2049 active_fg => [1, 1, 0],
1862 bg => [0, 0, 0, 0.2], 2050 bg => [0, 0, 0, 0.2],
1863 active_bg => [1, 1, 1, 0.5], 2051 active_bg => [1, 1, 1, 0.5],
1864 state => 0, 2052 state => 0,
… …
1868} 2056}
1869 2057
1870sub size_request { 2058sub size_request {
1871 my ($self) = @_; 2059 my ($self) = @_;
1872 2060
1873 ($self->{padding} * 2 + 6) x 2 2061 (6) x 2
1874} 2062}
1875 2063
1876sub button_down { 2064sub invoke_button_down {
1877 my ($self, $ev, $x, $y) = @_; 2065 my ($self, $ev, $x, $y) = @_;
1878 2066
1879 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 2067 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1880 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 2068 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1881 $self->{state} = !$self->{state}; 2069 $self->{state} = !$self->{state};
1882 $self->_emit (changed => $self->{state}); 2070 $self->emit (changed => $self->{state});
2071 } else {
2072 return 0
2073 }
2074
1883 } 2075 1
1884} 2076}
1885 2077
1886sub _draw { 2078sub _draw {
1887 my ($self) = @_; 2079 my ($self) = @_;
1888 2080
1889 $self->SUPER::_draw; 2081 $self->SUPER::_draw;
1890 2082
1891 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 2083 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1892 2084
1893 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;
1894 2088
1895 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 2089 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1896 2090
1897 my $tex = $self->{state} ? $tex[1] : $tex[0]; 2091 my $tex = $self->{state} ? $tex[1] : $tex[0];
1898 2092
… …
1906package CFClient::UI::Image; 2100package CFClient::UI::Image;
1907 2101
1908our @ISA = CFClient::UI::Base::; 2102our @ISA = CFClient::UI::Base::;
1909 2103
1910use CFClient::OpenGL; 2104use CFClient::OpenGL;
1911use Carp qw/confess/;
1912 2105
1913our %loaded_images; 2106our %texture_cache;
1914 2107
1915sub new { 2108sub new {
1916 my $class = shift; 2109 my $class = shift;
1917 2110
1918 my $self = $class->SUPER::new (can_events => 0, @_); 2111 my $self = $class->SUPER::new (
2112 can_events => 0,
2113 @_,
2114 );
1919 2115
1920 $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";
1921 2118
1922 $loaded_images{$self->{image}} ||= 2119 $self->{tex} = $texture_cache{$self->{path}} ||=
1923 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;
1924 2121
1925 my $tex = $self->{tex} = $loaded_images{$self->{image}}; 2122 Scalar::Util::weaken $texture_cache{$self->{path}};
1926 2123
1927 Scalar::Util::weaken $loaded_images{$self->{image}}; 2124 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
1928
1929 $self->{aspect} = $tex->{w} / $tex->{h};
1930 2125
1931 $self 2126 $self
1932} 2127}
1933 2128
1934sub size_request { 2129sub size_request {
1935 my ($self) = @_; 2130 my ($self) = @_;
1936 2131
1937 ($self->{tex}->{w}, $self->{tex}->{h}) 2132 ($self->{tex}{w}, $self->{tex}{h})
1938} 2133}
1939 2134
1940sub _draw { 2135sub _draw {
1941 my ($self) = @_; 2136 my ($self) = @_;
1942 2137
… …
2053 2248
2054 my $h1 = $self->{h} * (1 - $ycut1); 2249 my $h1 = $self->{h} * (1 - $ycut1);
2055 my $h2 = $self->{h} * (1 - $ycut2); 2250 my $h2 = $self->{h} * (1 - $ycut2);
2056 2251
2057 glEnable GL_BLEND; 2252 glEnable GL_BLEND;
2058 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;
2059 glEnable GL_TEXTURE_2D; 2255 glEnable GL_TEXTURE_2D;
2060 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2256 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2061 2257
2062 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2258 glBindTexture GL_TEXTURE_2D, $t1->{name};
2063 glBegin GL_QUADS; 2259 glBegin GL_QUADS;
… …
2163 fg => [1, 1, 1], 2359 fg => [1, 1, 1],
2164 active_fg => [0, 0, 0], 2360 active_fg => [0, 0, 0],
2165 bg => [0, 0, 0, 0.2], 2361 bg => [0, 0, 0, 0.2],
2166 active_bg => [1, 1, 1, 0.5], 2362 active_bg => [1, 1, 1, 0.5],
2167 range => [0, 0, 100, 10, 0], 2363 range => [0, 0, 100, 10, 0],
2168 req_w => $::WIDTH / 80, 2364 min_w => $::WIDTH / 80,
2169 req_h => $::WIDTH / 80, 2365 min_h => $::WIDTH / 80,
2170 vertical => 0, 2366 vertical => 0,
2171 can_hover => 1, 2367 can_hover => 1,
2172 inner_pad => 0.02, 2368 inner_pad => 0.02,
2173 @_ 2369 @_
2174 ); 2370 );
… …
2177 $self->update; 2373 $self->update;
2178 2374
2179 $self 2375 $self
2180} 2376}
2181 2377
2182sub changed { }
2183
2184sub set_range { 2378sub set_range {
2185 my ($self, $range) = @_; 2379 my ($self, $range) = @_;
2186 2380
2187 ($range, $self->{range}) = ($self->{range}, $range); 2381 ($range, $self->{range}) = ($self->{range}, $range);
2188 2382
2189 $self->update
2190 if "@$range" ne "@{$self->{range}}"; 2383 if ("@$range" ne "@{$self->{range}}") {
2384 $self->update;
2385 $self->set_value ($self->{range}[0]);
2386 }
2191} 2387}
2192 2388
2193sub set_value { 2389sub set_value {
2194 my ($self, $value) = @_; 2390 my ($self, $value) = @_;
2195 2391
… …
2206 if $unit; 2402 if $unit;
2207 2403
2208 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2404 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2209 2405
2210 if ($value != $old_value) { 2406 if ($value != $old_value) {
2211 $self->_emit (changed => $value); 2407 $self->emit (changed => $value);
2212 $self->update; 2408 $self->update;
2213 } 2409 }
2214} 2410}
2215 2411
2216sub size_request { 2412sub size_request {
2217 my ($self) = @_; 2413 my ($self) = @_;
2218 2414
2219 my $w = $self->{req_w}; 2415 ($self->{req_w}, $self->{req_h})
2220 my $h = $self->{req_h};
2221
2222 $self->{vertical} ? ($h, $w) : ($w, $h)
2223} 2416}
2224 2417
2225sub button_down { 2418sub invoke_button_down {
2226 my ($self, $ev, $x, $y) = @_; 2419 my ($self, $ev, $x, $y) = @_;
2227 2420
2228 $self->SUPER::button_down ($ev, $x, $y); 2421 $self->SUPER::invoke_button_down ($ev, $x, $y);
2229 2422
2230 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2423 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2231 2424
2232 $self->mouse_motion ($ev, $x, $y); 2425 $self->invoke_mouse_motion ($ev, $x, $y)
2233} 2426}
2234 2427
2235sub mouse_motion { 2428sub invoke_mouse_motion {
2236 my ($self, $ev, $x, $y) = @_; 2429 my ($self, $ev, $x, $y) = @_;
2237 2430
2238 if ($GRAB == $self) { 2431 if ($GRAB == $self) {
2239 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2432 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2240 2433
2241 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2434 my (undef, $lo, $hi, $page) = @{$self->{range}};
2242 2435
2243 $x = ($x - $self->{click}[1]) / ($w * $self->{scale}); 2436 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2244 2437
2245 $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
2246 } 2443 1
2247} 2444}
2248 2445
2249sub update { 2446sub update {
2250 my ($self) = @_; 2447 my ($self) = @_;
2251 2448
2252 $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}) {
2253 $self->set_value ($self->{range}[0]); 2457 $self->set_value ($self->{range}[0]);
2254 2458
2255 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2459 my ($value, $lo, $hi, $page) = @{$self->{range}};
2256 my $range = ($hi - $page - $lo) || 1e-100; 2460 my $range = ($hi - $page - $lo) || 1e-100;
2257 2461
… …
2263 $value = ($value - $lo) / $range; 2467 $value = ($value - $lo) / $range;
2264 $value = $value * $self->{scale} + $self->{offset}; 2468 $value = $value * $self->{scale} + $self->{offset};
2265 2469
2266 $self->{knob_x} = $value - $knob_w * 0.5; 2470 $self->{knob_x} = $value - $knob_w * 0.5;
2267 $self->{knob_w} = $knob_w; 2471 $self->{knob_w} = $knob_w;
2268 }); 2472 }
2269
2270 $self->SUPER::update;
2271}
2272
2273sub _draw {
2274 my ($self) = @_;
2275 2473
2276 $self->SUPER::_draw (); 2474 $self->SUPER::_draw ();
2277 2475
2278 glScale $self->{w}, $self->{h}; 2476 glScale $self->{w}, $self->{h};
2279 2477
… …
2340sub set_range { shift->{slider}->set_range (@_) } 2538sub set_range { shift->{slider}->set_range (@_) }
2341sub set_value { shift->{slider}->set_value (@_) } 2539sub set_value { shift->{slider}->set_value (@_) }
2342 2540
2343############################################################################# 2541#############################################################################
2344 2542
2345package CFClient::UI::TextView; 2543package CFClient::UI::TextScroller;
2346 2544
2347our @ISA = CFClient::UI::HBox::; 2545our @ISA = CFClient::UI::HBox::;
2348 2546
2349use CFClient::OpenGL; 2547use CFClient::OpenGL;
2350 2548
… …
2352 my $class = shift; 2550 my $class = shift;
2353 2551
2354 my $self = $class->SUPER::new ( 2552 my $self = $class->SUPER::new (
2355 fontsize => 1, 2553 fontsize => 1,
2356 can_events => 0, 2554 can_events => 0,
2555 indent => 0,
2357 #font => default_font 2556 #font => default_font
2358 @_, 2557 @_,
2359 2558
2360 layout => (new CFClient::Layout 1), 2559 layout => (new CFClient::Layout 1),
2361 par => [], 2560 par => [],
… …
2376 2575
2377 $self->{fontsize} = $fontsize; 2576 $self->{fontsize} = $fontsize;
2378 $self->reflow; 2577 $self->reflow;
2379} 2578}
2380 2579
2580sub visible_children {
2581 my ($self) = @_;
2582
2583 @{$self->{children}}[0,1]
2584}
2585
2381sub size_allocate { 2586sub invoke_size_allocate {
2382 my ($self, $w, $h, $changed) = @_; 2587 my ($self, $w, $h) = @_;
2383 2588
2384 $self->SUPER::size_allocate ($w, $h, $changed); 2589 my ($empty, $slider, @other) = @{ $self->{children} };
2385 2590 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
2386 return unless $changed;
2387 2591
2388 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2592 $self->{layout}->set_font ($self->{font}) if $self->{font};
2389 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2593 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2390 $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});
2391 2596
2392 $self->reflow; 2597 $self->reflow;
2393}
2394 2598
2395sub text_size { 2599 $self->SUPER::invoke_size_allocate ($w, $h)
2396 my ($self, $text, $indent) = @_; 2600}
2601
2602sub get_layout {
2603 my ($self, $para) = @_;
2397 2604
2398 my $layout = $self->{layout}; 2605 my $layout = $self->{layout};
2399 2606
2607 $layout->set_font ($self->{font}) if $self->{font};
2608 $layout->set_foreground (@{$para->{fg}});
2400 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2609 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2401 $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});
2402 $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}}
2403 2618 );
2619
2404 $layout->size 2620 $layout
2405} 2621}
2406 2622
2407sub reflow { 2623sub reflow {
2408 my ($self) = @_; 2624 my ($self) = @_;
2409 2625
… …
2418 $self->{children}[1]->set_value ($offset); 2634 $self->{children}[1]->set_value ($offset);
2419} 2635}
2420 2636
2421sub clear { 2637sub clear {
2422 my ($self) = @_; 2638 my ($self) = @_;
2639
2640 my (undef, undef, @other) = @{ $self->{children} };
2641 $self->remove ($_) for @other;
2423 2642
2424 $self->{par} = []; 2643 $self->{par} = [];
2425 $self->{height} = 0; 2644 $self->{height} = 0;
2426 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 2645 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2427} 2646}
2428 2647
2429sub add_paragraph { 2648sub add_paragraph {
2430 my ($self, $color, $text, $indent) = @_; 2649 my ($self, $color, $para, $indent) = @_;
2431 2650
2432 for my $line (split /\n/, $text) { 2651 my ($text, @w) = ref $para ? @$para : $para;
2433 my ($w, $h) = $self->text_size ($line); 2652
2434 $self->{height} += $h; 2653 $para = {
2435 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,
2436 } 2660 };
2437 2661
2438 $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;
2439} 2674}
2440 2675
2441sub update { 2676sub update {
2442 my ($self) = @_; 2677 my ($self) = @_;
2443 2678
… …
2445 2680
2446 return unless $self->{h} > 0; 2681 return unless $self->{h} > 0;
2447 2682
2448 delete $self->{texture}; 2683 delete $self->{texture};
2449 2684
2450 $ROOT->on_post_alloc ($self, sub { 2685 $ROOT->on_post_alloc ($self => sub {
2451 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 2686 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2452 2687
2453 if (delete $self->{need_reflow}) { 2688 if (delete $self->{need_reflow}) {
2454 my $height = 0; 2689 my $height = 0;
2455 2690
2456 my $layout = $self->{layout};
2457
2458 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2459
2460 for (@{$self->{par}}) { 2691 for my $para (@{$self->{par}}) {
2461 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support 2692 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2462 $layout->set_width ($W - $_->[3]); 2693 my $layout = $self->get_layout ($para);
2463 $layout->set_markup ($_->[4]);
2464 my ($w, $h) = $layout->size; 2694 my ($w, $h) = $layout->size;
2465 $_->[0] = $w + $_->[3]; 2695
2466 $_->[1] = $h; 2696 $para->{w} = $w + $para->{indent};
2697 $para->{h} = $h;
2698 $para->{wrapped} = $layout->has_wrapped;
2467 } 2699 }
2468 2700
2469 $height += $_->[1]; 2701 $height += $para->{h};
2470 } 2702 }
2471 2703
2472 $self->{height} = $height; 2704 $self->{height} = $height;
2473 2705
2474 $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]);
2475 2707
2476 delete $self->{texture}; 2708 delete $self->{texture};
2477 } 2709 }
2478 2710
2711 if (delete $self->{scroll_to_bottom}) {
2712 $self->{children}[1]->set_value (1e10);
2713 }
2714
2479 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2715 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2480 glClearColor 0.5, 0.5, 0.5, 0; 2716 glClearColor 0, 0, 0, 0;
2481 glClear GL_COLOR_BUFFER_BIT; 2717 glClear GL_COLOR_BUFFER_BIT;
2482 2718
2483 my $top = int $self->{children}[1]{range}[0]; 2719 my $top = int $self->{children}[1]{range}[0];
2484 2720
2485 my $y0 = $top; 2721 my $y0 = $top;
2486 my $y1 = $top + $H; 2722 my $y1 = $top + $H;
2487 2723
2488 my $y = 0; 2724 my $y = 0;
2489
2490 my $layout = $self->{layout};
2491
2492 $layout->set_font ($self->{font}) if $self->{font};
2493 2725
2494 glEnable GL_BLEND; 2726 glEnable GL_BLEND;
2495 #TODO# not correct in windows where rgba is forced off 2727 #TODO# not correct in windows where rgba is forced off
2496 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2728 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2497 2729
2498 for my $par (@{$self->{par}}) { 2730 for my $para (@{$self->{par}}) {
2499 my $h = $par->[1]; 2731 my $h = $para->{h};
2500 2732
2501 if ($y0 < $y + $h && $y < $y1) { 2733 if ($y0 < $y + $h && $y < $y1) {
2502 $layout->set_foreground (@{ $par->[2] }); 2734
2503 $layout->set_width ($W - $par->[3]); 2735 my $layout = $self->get_layout ($para);
2504 $layout->set_markup ($par->[4]);
2505 2736
2506 my ($w, $h, $data, $format, $internalformat) = $layout->render; 2737 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2507 2738
2508 glRasterPos $par->[3], $y - $y0; 2739 glRasterPos $para->{indent}, $y - $y0;
2509 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 }
2510 } 2754 }
2511 2755
2512 $y += $h; 2756 $y += $h;
2513 } 2757 }
2514 2758
2515 glDisable GL_BLEND; 2759 glDisable GL_BLEND;
2516 }; 2760 };
2517 }); 2761 });
2518} 2762}
2519 2763
2764sub reconfigure {
2765 my ($self) = @_;
2766
2767 $self->SUPER::reconfigure;
2768
2769 $_->{w} = 1e10 for @{ $self->{par} };
2770 $self->reflow;
2771}
2772
2520sub _draw { 2773sub _draw {
2521 my ($self) = @_; 2774 my ($self) = @_;
2522 2775
2523 glEnable GL_TEXTURE_2D; 2776 glEnable GL_TEXTURE_2D;
2524 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2777 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2525 glColor 1, 1, 1, 1; 2778 glColor 0, 0, 0, 1;
2526 $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});
2527 glDisable GL_TEXTURE_2D; 2780 glDisable GL_TEXTURE_2D;
2528 2781
2529 $self->{children}[1]->draw; 2782 $self->{children}[1]->draw;
2530
2531} 2783}
2532 2784
2533############################################################################# 2785#############################################################################
2534 2786
2535package CFClient::UI::Animator; 2787package CFClient::UI::Animator;
… …
2614} 2866}
2615 2867
2616sub set_tooltip_from { 2868sub set_tooltip_from {
2617 my ($self, $widget) = @_; 2869 my ($self, $widget) = @_;
2618 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
2619 $self->add (new CFClient::UI::Label 2883 $self->add (new CFClient::UI::Label
2620 markup => $widget->{tooltip}, 2884 markup => $tooltip,
2621 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2885 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2622 fontsize => 0.8, 2886 fontsize => 0.8,
2623 fg => [0, 0, 0, 1], 2887 fg => [0, 0, 0, 1],
2624 ellipsise => 0, 2888 ellipsise => 0,
2625 font => ($widget->{tooltip_font} || $::FONT_PROP), 2889 font => ($widget->{tooltip_font} || $::FONT_PROP),
… …
2632 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2896 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2633 2897
2634 ($w + 4, $h + 4) 2898 ($w + 4, $h + 4)
2635} 2899}
2636 2900
2637sub size_allocate { 2901sub invoke_size_allocate {
2638 my ($self, $w, $h, $changed) = @_; 2902 my ($self, $w, $h) = @_;
2639 2903
2640 return unless $changed;
2641
2642 $self->SUPER::size_allocate ($w - 4, $h - 4, $changed); 2904 $self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2905}
2906
2907sub invoke_visibility_change {
2908 my ($self, $visible) = @_;
2909
2910 return unless $visible;
2911
2912 $self->{root}->on_post_alloc ("move_$self" => sub {
2913 my $widget = $self->{owner}
2914 or return;
2915
2916 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2917
2918 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2919 if $x + $self->{w} > $self->{root}{w};
2920
2921 $self->move_abs ($x, $y);
2922 });
2643} 2923}
2644 2924
2645sub _draw { 2925sub _draw {
2646 my ($self) = @_; 2926 my ($self) = @_;
2647 2927
… …
2664 glVertex $w, $h; 2944 glVertex $w, $h;
2665 glVertex $w, 0; 2945 glVertex $w, 0;
2666 glEnd; 2946 glEnd;
2667 2947
2668 glTranslate 2 - 0.375, 2 - 0.375; 2948 glTranslate 2 - 0.375, 2 - 0.375;
2949
2669 $self->SUPER::_draw; 2950 $self->SUPER::_draw;
2670} 2951}
2671 2952
2672############################################################################# 2953#############################################################################
2673 2954
… …
2732 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 3013 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2733 3014
2734 if ($tex) { 3015 if ($tex) {
2735 glEnable GL_TEXTURE_2D; 3016 glEnable GL_TEXTURE_2D;
2736 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3017 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2737 glColor 1, 1, 1, 1; 3018 glColor 0, 0, 0, 1;
2738 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3019 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2739 glDisable GL_TEXTURE_2D; 3020 glDisable GL_TEXTURE_2D;
2740 } 3021 }
2741} 3022}
2742 3023
2743sub DESTROY { 3024sub destroy {
2744 my ($self) = @_; 3025 my ($self) = @_;
2745 3026
2746 $self->{timer}->cancel 3027 $self->{timer}->cancel
2747 if $self->{timer}; 3028 if $self->{timer};
2748 3029
2749 $self->SUPER::DESTROY; 3030 $self->SUPER::destroy;
2750} 3031}
2751 3032
2752############################################################################# 3033#############################################################################
2753 3034
2754package CFClient::UI::Inventory; 3035package CFClient::UI::Buttonbar;
2755 3036
2756our @ISA = CFClient::UI::ScrolledWindow::; 3037our @ISA = CFClient::UI::HBox::;
2757 3038
2758sub new { 3039# TODO: should actualyl wrap buttons and other goodies.
2759 my $class = shift;
2760
2761 my $self = $class->SUPER::new (
2762 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2763 @_,
2764 );
2765
2766 $self
2767}
2768
2769sub set_items {
2770 my ($self, $items) = @_;
2771
2772 $self->{scrolled}->clear;
2773 return unless $items;
2774
2775 my @items = sort {
2776 ($a->{type} <=> $b->{type})
2777 or ($a->{name} cmp $b->{name})
2778 } @$items;
2779
2780 $self->{real_items} = \@items;
2781
2782 my $row = 0;
2783 for my $item (@items) {
2784 CFClient::Item::update_widgets $item;
2785
2786 $self->{scrolled}->add (0, $row, $item->{face_widget});
2787 $self->{scrolled}->add (1, $row, $item->{desc_widget});
2788 $self->{scrolled}->add (2, $row, $item->{weight_widget});
2789
2790 $row++;
2791 }
2792}
2793 3040
2794############################################################################# 3041#############################################################################
2795 3042
2796package CFClient::UI::Menu; 3043package CFClient::UI::Menu;
2797 3044
… …
2809 ); 3056 );
2810 3057
2811 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3058 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2812 3059
2813 for my $item (@{ $self->{items} }) { 3060 for my $item (@{ $self->{items} }) {
2814 my ($widget, $cb) = @$item; 3061 my ($widget, $cb, $tooltip) = @$item;
2815 3062
2816 # handle various types of items, only text for now 3063 # handle various types of items, only text for now
2817 if (!ref $widget) { 3064 if (!ref $widget) {
2818 $widget = new CFClient::UI::Label 3065 $widget = new CFClient::UI::Label
2819 can_hover => 1, 3066 can_hover => 1,
2820 can_events => 1, 3067 can_events => 1,
2821 text => $widget; 3068 markup => $widget,
3069 tooltip => $tooltip
2822 } 3070 }
2823 3071
2824 $self->{item}{$widget} = $item; 3072 $self->{item}{$widget} = $item;
2825 3073
2826 $self->{vbox}->add ($widget); 3074 $self->{vbox}->add ($widget);
… …
2831 3079
2832# 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)
2833sub popup { 3081sub popup {
2834 my ($self, $ev) = @_; 3082 my ($self, $ev) = @_;
2835 3083
2836 $self->_emit ("popdown"); 3084 $self->emit ("popdown");
2837 3085
2838 # maybe save $GRAB? must be careful about events... 3086 # maybe save $GRAB? must be careful about events...
2839 $GRAB = $self; 3087 $GRAB = $self;
2840 $self->{button} = $ev->{button}; 3088 $self->{button} = $ev->{button};
2841 3089
2842 $self->show; 3090 $self->show;
2843 $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);
2844} 3092}
2845 3093
2846sub mouse_motion { 3094sub invoke_mouse_motion {
2847 my ($self, $ev, $x, $y) = @_; 3095 my ($self, $ev, $x, $y) = @_;
2848 3096
2849 # TODO: should use vbox->find_widget or so 3097 # TODO: should use vbox->find_widget or so
2850 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3098 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2851 $self->{hover} = $self->{item}{$HOVER}; 3099 $self->{hover} = $self->{item}{$HOVER};
2852}
2853 3100
3101 0
3102}
3103
2854sub button_up { 3104sub invoke_button_up {
2855 my ($self, $ev, $x, $y) = @_; 3105 my ($self, $ev, $x, $y) = @_;
2856 3106
2857 if ($ev->{button} == $self->{button}) { 3107 if ($ev->{button} == $self->{button}) {
2858 undef $GRAB; 3108 undef $GRAB;
2859 $self->hide; 3109 $self->hide;
2860 3110
2861 $self->_emit ("popdown"); 3111 $self->emit ("popdown");
2862 $self->{hover}[1]->() if $self->{hover}; 3112 $self->{hover}[1]->() if $self->{hover};
3113 } else {
3114 return 0
3115 }
3116
2863 } 3117 1
2864} 3118}
2865 3119
2866############################################################################# 3120#############################################################################
2867 3121
2868package CFClient::UI::Statusbox; 3122package CFClient::UI::Multiplexer;
2869 3123
2870our @ISA = CFClient::UI::VBox::; 3124our @ISA = CFClient::UI::Container::;
2871 3125
2872sub new { 3126sub new {
2873 my $class = shift; 3127 my $class = shift;
2874 3128
2875 $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 (
2876 fontsize => 0.8, 3296 fontsize => 0.8,
2877 @_, 3297 @_,
2878 ) 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
2879} 3305}
2880 3306
2881sub reorder { 3307sub reorder {
2882 my ($self) = @_; 3308 my ($self) = @_;
2883 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} };
2884 3315
2885 while (my ($k, $v) = each %{ $self->{item} }) { 3316 while (my ($k, $v) = each %{ $self->{item} }) {
2886 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3317 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2887 } 3318 }
2888 3319
… …
2891 my @items = sort { 3322 my @items = sort {
2892 $a->{pri} <=> $b->{pri} 3323 $a->{pri} <=> $b->{pri}
2893 or $b->{id} <=> $a->{id} 3324 or $b->{id} <=> $a->{id}
2894 } values %{ $self->{item} }; 3325 } values %{ $self->{item} };
2895 3326
3327 $self->{timer}->interval (1);
3328
2896 my $count = 10 + 1; 3329 my $count = 10 + 1;
2897 for my $item (@items) { 3330 for my $item (@items) {
2898 last unless --$count; 3331 last unless --$count;
2899 3332
2900 push @widgets, $item->{label} ||= do { 3333 my $label = $item->{label} ||= do {
2901 # TODO: doesn't handle markup well (read as: at all) 3334 # TODO: doesn't handle markup well (read as: at all)
2902 my $short = $item->{count} > 1 3335 my $short = $item->{count} > 1
2903 ? "<b>$item->{count} ×</b> $item->{text}" 3336 ? "<b>$item->{count} ×</b> $item->{text}"
2904 : $item->{text}; 3337 : $item->{text};
2905 3338
… …
2913 tooltip => $item->{tooltip}, 3346 tooltip => $item->{tooltip},
2914 tooltip_font => $::FONT_PROP, 3347 tooltip_font => $::FONT_PROP,
2915 tooltip_width => 0.67, 3348 tooltip_width => 0.67,
2916 fontsize => $item->{fontsize} || $self->{fontsize}, 3349 fontsize => $item->{fontsize} || $self->{fontsize},
2917 max_w => $::WIDTH * 0.44, 3350 max_w => $::WIDTH * 0.44,
2918 fg => $item->{fg}, 3351 fg => [@{ $item->{fg} }],
2919 can_events => 1, 3352 can_events => 1,
2920 can_hover => 1 3353 can_hover => 1
2921 }; 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;
2922 } 3367 }
2923 3368
2924 $self->clear; 3369 $self->clear;
2925 $self->SUPER::add (reverse @widgets); 3370 $self->SUPER::add (reverse @widgets);
2926} 3371}
… …
2931 $text =~ s/^\s+//; 3376 $text =~ s/^\s+//;
2932 $text =~ s/\s+$//; 3377 $text =~ s/\s+$//;
2933 3378
2934 return unless $text; 3379 return unless $text;
2935 3380
2936 my $timeout = time + ((delete $arg{timeout}) || 60); 3381 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
2937 3382
2938 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3383 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2939 3384
2940 if (my $item = $self->{item}{$group}) { 3385 if (my $item = $self->{item}{$group}) {
2941 if ($item->{text} eq $text) { 3386 if ($item->{text} eq $text) {
2942 $item->{count}++; 3387 $item->{count}++;
2943 } else { 3388 } else {
2944 $item->{count} = 1; 3389 $item->{count} = 1;
2945 $item->{text} = $item->{tooltip} = $text; 3390 $item->{text} = $item->{tooltip} = $text;
2946 } 3391 }
2947 $item->{id} = ++$self->{id}; 3392 $item->{id} += 0.2;#d#
2948 $item->{timeout} = $timeout; 3393 $item->{timeout} = $timeout;
2949 delete $item->{label}; 3394 delete $item->{label};
2950 } else { 3395 } else {
2951 $self->{item}{$group} = { 3396 $self->{item}{$group} = {
2952 id => ++$self->{id}, 3397 id => ++$self->{id},
… …
2971 3416
2972 $self->reorder; 3417 $self->reorder;
2973 $self->SUPER::reconfigure; 3418 $self->SUPER::reconfigure;
2974} 3419}
2975 3420
3421sub destroy {
3422 my ($self) = @_;
3423
3424 $self->{timer}->cancel;
3425
3426 $self->SUPER::destroy;
3427}
3428
2976############################################################################# 3429#############################################################################
2977 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
2978package CFClient::UI::Root; 3803package CFClient::UI::Root;
2979 3804
2980our @ISA = CFClient::UI::Container::; 3805our @ISA = CFClient::UI::Container::;
3806
3807use List::Util qw(min max);
2981 3808
2982use CFClient::OpenGL; 3809use CFClient::OpenGL;
2983 3810
2984sub new { 3811sub new {
2985 my $class = shift; 3812 my $class = shift;
… …
2992 Scalar::Util::weaken ($self->{root} = $self); 3819 Scalar::Util::weaken ($self->{root} = $self);
2993 3820
2994 $self 3821 $self
2995} 3822}
2996 3823
2997sub configure {
2998 my ($self, $x, $y, $w, $h) = @_;
2999
3000 $self->{w} = $w;
3001 $self->{h} = $h;
3002}
3003
3004sub reconfigure {
3005 my ($self) = @_;
3006
3007 $self->SUPER::reconfigure;
3008
3009 $self->size_allocate ($self->{w}, $self->{h}, 1)
3010 if $self->{w};
3011}
3012
3013sub size_request { 3824sub size_request {
3014 my ($self) = @_; 3825 my ($self) = @_;
3015 3826
3016 ($self->{w}, $self->{h}) 3827 ($self->{w}, $self->{h})
3017} 3828}
3018 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
3019sub size_allocate { 3844sub invoke_size_allocate {
3020 my ($self, $w, $h, $changed) = @_; 3845 my ($self, $w, $h) = @_;
3021 3846
3022 for my $child ($self->children) { 3847 for my $child ($self->children) {
3023 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)};
3024 3849
3025 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 3850 $X = $child->{force_x} if exists $child->{force_x};
3026 if exists $child->{req_x}; 3851 $Y = $child->{force_y} if exists $child->{force_y};
3027 3852
3028 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1 3853 $X = _to_pixel $X, $W, $self->{w};
3029 if exists $child->{req_y}; 3854 $Y = _to_pixel $Y, $H, $self->{h};
3030
3031 #delete @$child{qw(req_x req_y)};#d# def_x, def_y
3032
3033 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
3034 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
3035 3855
3036 $child->configure ($X, $Y, $W, $H); 3856 $child->configure ($X, $Y, $W, $H);
3037 } 3857 }
3858
3859 1
3038} 3860}
3039 3861
3040sub coord2local { 3862sub coord2local {
3041 my ($self, $x, $y) = @_; 3863 my ($self, $x, $y) = @_;
3042 3864
… …
3056} 3878}
3057 3879
3058sub add { 3880sub add {
3059 my ($self, @children) = @_; 3881 my ($self, @children) = @_;
3060 3882
3061 for my $child (@children) {
3062 $child->{is_toplevel} = 1; 3883 $_->{is_toplevel} = 1
3063 3884 for @children;
3064 # integerise window positions
3065 $child->{x} = int $child->{x};
3066 $child->{y} = int $child->{y};
3067 }
3068 3885
3069 $self->SUPER::add (@children); 3886 $self->SUPER::add (@children);
3070} 3887}
3071 3888
3072sub remove { 3889sub remove {
3073 my ($self, @children) = @_; 3890 my ($self, @children) = @_;
3074 3891
3075 $self->SUPER::remove (@children); 3892 $self->SUPER::remove (@children);
3893
3894 delete $self->{is_toplevel}
3895 for @children;
3076 3896
3077 while (@children) { 3897 while (@children) {
3078 my $w = pop @children; 3898 my $w = pop @children;
3079 push @children, $w->children; 3899 push @children, $w->children;
3080 $w->set_invisible; 3900 $w->set_invisible;
… …
3100 $_->() 3920 $_->()
3101 for values %{delete $self->{refresh_hook}}; 3921 for values %{delete $self->{refresh_hook}};
3102 } 3922 }
3103 3923
3104 if ($self->{realloc}) { 3924 if ($self->{realloc}) {
3925 my %queue;
3105 my @queue; 3926 my @queue;
3927 my $widget;
3106 3928
3929 outer:
3107 while () { 3930 while () {
3108 if ($self->{realloc}) { 3931 if (my $realloc = delete $self->{realloc}) {
3109 #TODO use array-of-depth approach 3932 for $widget (values %$realloc) {
3933 $widget->{visible} or next; # do not resize invisible widgets
3110 3934
3111 @queue = sort { $a->{visible} <=> $b->{visible} } 3935 $queue{$widget+0}++ and next; # duplicates are common
3112 @queue, values %{delete $self->{realloc}}; 3936
3937 push @{ $queue[$widget->{visible}] }, $widget;
3938 }
3113 } 3939 }
3114 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 () {
3115 my $widget = pop @queue || last; 3988 my $widget = pop @queue || last;
3116 3989
3117 $widget->{visible} or last; # do not resize invisible widgets 3990 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3118
3119 my ($w, $h) = $widget->{def_w} && $widget->{def_h}
3120 ? @$widget{qw(def_w def_h)}
3121 : $widget->size_request;
3122
3123 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
3124
3125 $widget->{req_w} = $w;
3126 $widget->{req_h} = $h;
3127
3128 $self->{size_alloc}{$widget} = [$widget, $widget->{w}, $widget->{h}];
3129
3130 push @queue, $widget->{parent}
3131 if $widget->{parent};
3132 }
3133 }
3134
3135 while (my $size_alloc = delete $self->{size_alloc}) {
3136 my @queue = sort $b->[0]{visible} <=> $a->[0]{visible},
3137 values %$size_alloc;
3138
3139 while () {
3140 my ($widget, $w, $h) = @{ pop @queue or last };
3141 3991
3142 $w = 0 if $w < 0; 3992 $w = 0 if $w < 0;
3143 $h = 0 if $h < 0; 3993 $h = 0 if $h < 0;
3144 3994
3995 $w = int $w + 0.5;
3996 $h = int $h + 0.5;
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
3145 $widget->{w} = $w; 4002 $widget->{w} = $w;
3146 $widget->{h} = $h; 4003 $widget->{h} = $h;
4004
3147 $widget->emit (size_allocate => $w, $h, 1); 4005 $widget->emit (size_allocate => $w, $h);
4006 }
3148 } 4007 }
3149 } 4008 }
3150 4009
3151 while ($self->{post_alloc_hook}) { 4010 while ($self->{post_alloc_hook}) {
3152 $_->() 4011 $_->()
3153 for values %{delete $self->{post_alloc_hook}}; 4012 for values %{delete $self->{post_alloc_hook}};
3154 } 4013 }
4014
3155 4015
3156 glViewport 0, 0, $::WIDTH, $::HEIGHT; 4016 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3157 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 4017 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3158 glClear GL_COLOR_BUFFER_BIT; 4018 glClear GL_COLOR_BUFFER_BIT;
3159 4019
… …
3161 glLoadIdentity; 4021 glLoadIdentity;
3162 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 4022 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3163 glMatrixMode GL_MODELVIEW; 4023 glMatrixMode GL_MODELVIEW;
3164 glLoadIdentity; 4024 glLoadIdentity;
3165 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
3166 $self->_draw; 4033 $self->_draw;
3167} 4034}
3168 4035
3169############################################################################# 4036#############################################################################
3170 4037

Diff Legend

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