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

Diff Legend

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