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.246 by root, Sun May 28 00:40:51 2006 UTC vs.
Revision 1.290 by root, Mon Jun 5 22:30:35 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}
225
226sub toggle_visibility {
227 my ($self) = @_;
228
229 if ($self->{visible}) {
230 $self->hide;
231 } else {
232 $self->show;
233 }
234} 238}
235 239
236sub destroy { 240sub destroy {
237 my ($self) = @_; 241 my ($self) = @_;
238 242
… …
240 %$self = (); 244 %$self = ();
241} 245}
242 246
243sub show { 247sub show {
244 my ($self) = @_; 248 my ($self) = @_;
249
245 return if $self->{parent}; 250 return if $self->{parent};
246 251
247 $CFClient::UI::ROOT->add ($self); 252 $CFClient::UI::ROOT->add ($self);
248}
249
250sub show_centered {
251 my ($self) = @_;
252 return if $self->{parent};
253
254 $self->show;
255
256 $CFClient::UI::ROOT->on_post_alloc (
257 "centered $self" => sub {
258 $self->move (($::WIDTH - $self->{w}) * 0.5, ($::HEIGHT - $self->{h}) * 0.5);
259 },
260 );
261} 253}
262 254
263sub set_visible { 255sub set_visible {
264 my ($self) = @_; 256 my ($self) = @_;
265 257
266 return if $self->{visible}; 258 return if $self->{visible};
267 259
268 $self->{root} = $self->{parent}{root}; 260 $self->{root} = $self->{parent}{root};
269 $self->{visible} = $self->{parent}{visible} + 1; 261 $self->{visible} = $self->{parent}{visible} + 1;
270 262
271 $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;
272} 268}
273 269
274sub set_invisible { 270sub set_invisible {
275 my ($self) = @_; 271 my ($self) = @_;
276 272
277 return unless $self->{visible}; 273 return unless $self->{visible};
278 274
279 # broken show/hide model 275 $_->set_invisible for $self->children;
280 276
281 delete $self->{root}; 277 delete $self->{root};
282 delete $self->{visible}; 278 delete $self->{visible};
283 279
284 undef $GRAB if $GRAB == $self; 280 undef $GRAB if $GRAB == $self;
285 undef $HOVER if $HOVER == $self; 281 undef $HOVER if $HOVER == $self;
286 282
287 CFClient::UI::check_tooltip 283 $CFClient::UI::TOOLTIP_WATCHER->cb->()
288 if $CFClient::UI::TOOLTIP->{owner} == $self; 284 if $TOOLTIP->{owner} == $self;
289 285
290 $self->focus_out; 286 $self->focus_out;
291 287
292 $self->emit (visibility_change => 0); 288 $self->emit (visibility_change => 0);
289}
290
291sub set_visibility {
292 my ($self, $visible) = @_;
293
294 return if $self->{visible} == $visible;
295
296 $visible ? $self->hide
297 : $self->show;
298}
299
300sub toggle_visibility {
301 my ($self) = @_;
302
303 $self->{visible}
304 ? $self->hide
305 : $self->show;
293} 306}
294 307
295sub hide { 308sub hide {
296 my ($self) = @_; 309 my ($self) = @_;
297 310
… …
299 312
300 $self->{parent}->remove ($self) 313 $self->{parent}->remove ($self)
301 if $self->{parent}; 314 if $self->{parent};
302} 315}
303 316
304sub move { 317sub move_abs {
305 my ($self, $x, $y, $z) = @_; 318 my ($self, $x, $y, $z) = @_;
306 319
307 $self->{x} = int $x; 320 $self->{x} = List::Util::max 0, int $x;
308 $self->{y} = int $y; 321 $self->{y} = List::Util::max 0, int $y;
309 $self->{z} = $z if defined $z; 322 $self->{z} = $z if defined $z;
310 323
311 $self->update; 324 $self->update;
312} 325}
313 326
314sub set_size { 327sub set_size {
315 my ($self, $w, $h) = @_; 328 my ($self, $w, $h) = @_;
316 329
317 $self->{def_w} = $w; 330 $self->{force_w} = $w;
318 $self->{def_h} = $h; 331 $self->{force_h} = $h;
319 332
320 $self->check_size; 333 $self->realloc;
321} 334}
322 335
323sub size_request { 336sub size_request {
324 require Carp; 337 require Carp;
325 Carp::confess "size_request is abstract"; 338 Carp::confess "size_request is abstract";
… …
327 340
328sub configure { 341sub configure {
329 my ($self, $x, $y, $w, $h) = @_; 342 my ($self, $x, $y, $w, $h) = @_;
330 343
331 if ($self->{aspect}) { 344 if ($self->{aspect}) {
345 my ($ow, $oh) = ($w, $h);
346
332 my $w2 = List::Util::min $w, int $h * $self->{aspect}; 347 $w = List::Util::min $w, int $h * $self->{aspect};
333 my $h2 = List::Util::min $h, int $w / $self->{aspect}; 348 $h = List::Util::min $h, int $w / $self->{aspect};
334 349
335 # use alignment to adjust x, y 350 # use alignment to adjust x, y
336 351
337 $x += int +($w - $w2) * 0.5; 352 $x += int 0.5 * ($ow - $w);
338 $y += int +($h - $h2) * 0.5; 353 $y += int 0.5 * ($oh - $h);
339
340 ($w, $h) = ($w2, $h2);
341 } 354 }
342 355
343 if ($self->{x} != $x || $self->{y} != $y) { 356 if ($self->{x} ne $x || $self->{y} ne $y) {
344 $self->{x} = $x; 357 $self->{x} = $x;
345 $self->{y} = $y; 358 $self->{y} = $y;
346 $self->update; 359 $self->update;
347 } 360 }
348 361
349 if ($self->{w} != $w || $self->{h} != $h) { 362 if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
350 $CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h]; 363 return unless $self->{visible};
364
365 $self->{alloc_w} = $w;
366 $self->{alloc_h} = $h;
367
368 $self->{root}{size_alloc}{$self+0} = $self;
351 } 369 }
352} 370}
353 371
354sub size_allocate { 372sub size_allocate {
355 # nothing to be done 373 # nothing to be done
356} 374}
357 375
358sub reconfigure {
359 my ($self) = @_;
360
361 $self->check_size (1);
362 $self->update;
363}
364
365sub children { 376sub children {
377 # nop
378}
379
380sub visible_children {
381 $_[0]->children
366} 382}
367 383
368sub set_max_size { 384sub set_max_size {
369 my ($self, $w, $h) = @_; 385 my ($self, $w, $h) = @_;
370 386
371 delete $self->{max_w}; $self->{max_w} = $w if $w; 387 $self->{max_w} = int $w if defined $w;
372 delete $self->{max_h}; $self->{max_h} = $h if $h; 388 $self->{max_h} = int $h if defined $h;
389
390 $self->realloc;
373} 391}
374 392
375sub set_tooltip { 393sub set_tooltip {
376 my ($self, $tooltip) = @_; 394 my ($self, $tooltip) = @_;
377 395
… …
382 400
383 $self->{tooltip} = $tooltip; 401 $self->{tooltip} = $tooltip;
384 402
385 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 403 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
386 delete $CFClient::UI::TOOLTIP->{owner}; 404 delete $CFClient::UI::TOOLTIP->{owner};
387 CFClient::UI::check_tooltip; 405 $CFClient::UI::TOOLTIP_WATCHER->cb->();
388 } 406 }
389} 407}
390 408
391# translate global coordinates to local coordinate system 409# translate global coordinates to local coordinate system
392sub coord2local { 410sub coord2local {
… …
429 447
430 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus 448 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus
431 unless $FOCUS; 449 unless $FOCUS;
432} 450}
433 451
434sub mouse_motion { } 452sub mouse_motion { 0 }
435sub button_up { } 453sub button_up { 0 }
436sub key_down { } 454sub key_down { 0 }
437sub key_up { } 455sub key_up { 0 }
438 456
439sub button_down { 457sub button_down {
440 my ($self, $ev, $x, $y) = @_; 458 my ($self, $ev, $x, $y) = @_;
441 459
442 $self->focus_in; 460 $self->focus_in;
443}
444 461
445sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 462 0
446sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 463}
447sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 464
448sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 465sub find_widget {
449sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} } 466 my ($self, $x, $y) = @_;
467
468 return () unless $self->{can_events};
469
470 return $self
471 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
472 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
473
474 ()
475}
476
477sub set_parent {
478 my ($self, $parent) = @_;
479
480 Scalar::Util::weaken ($self->{parent} = $parent);
481 $self->set_visible if $parent->{visible};
482}
483
484sub connect {
485 my ($self, $signal, $cb) = @_;
486
487 push @{ $self->{signal_cb}{$signal} }, $cb;
488}
489
490sub _emit {
491 my ($self, $signal, @args) = @_;
492
493 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
494}
495
496sub emit {
497 my ($self, $signal, @args) = @_;
498
499 $self->_emit ($signal, @args)
500 || $self->$signal (@args);
501}
502
503sub visibility_change {
504 #my ($self, $visible) = @_;
505}
506
507sub realloc {
508 my ($self) = @_;
509
510 if ($self->{visible}) {
511 return if $self->{root}{realloc}{$self+0};
512
513 $self->{root}{realloc}{$self+0} = $self;
514 $self->{root}->update;
515 } else {
516 delete $self->{req_w};
517 delete $self->{req_h};
518 }
519}
520
521sub update {
522 my ($self) = @_;
523
524 $self->{parent}->update
525 if $self->{parent};
526}
527
528sub reconfigure {
529 my ($self) = @_;
530
531 $self->realloc;
532 $self->update;
533}
534
535# using global variables seems a bit hacky, but passing through all drawing
536# functions seems pointless.
537our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn
450 538
451sub draw { 539sub draw {
452 my ($self) = @_; 540 my ($self) = @_;
453 541
454 return unless $self->{h} && $self->{w}; 542 return unless $self->{h} && $self->{w};
543
544 # update screen rectangle
545 local $draw_x = $draw_x + $self->{x};
546 local $draw_y = $draw_y + $self->{y};
547 local $draw_w = $draw_x + $self->{w};
548 local $draw_h = $draw_y + $self->{h};
549
550 # skip widgets that are entirely outside the drawing area
551 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
552 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
455 553
456 glPushMatrix; 554 glPushMatrix;
457 glTranslate $self->{x}, $self->{y}, 0; 555 glTranslate $self->{x}, $self->{y}, 0;
458 $self->_draw;
459 glPopMatrix;
460 556
461 if ($self == $HOVER && $self->{can_hover}) { 557 if ($self == $HOVER && $self->{can_hover}) {
462 my ($x, $y) = @$self{qw(x y)};
463
464 glColor 1, 0.8, 0.5, 0.2; 558 glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
465 glEnable GL_BLEND; 559 glEnable GL_BLEND;
466 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 560 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
467 glBegin GL_QUADS; 561 glBegin GL_QUADS;
468 glVertex $x , $y; 562 glVertex 0 , 0;
469 glVertex $x + $self->{w}, $y; 563 glVertex $self->{w}, 0;
470 glVertex $x + $self->{w}, $y + $self->{h}; 564 glVertex $self->{w}, $self->{h};
471 glVertex $x , $y + $self->{h}; 565 glVertex 0 , $self->{h};
472 glEnd; 566 glEnd;
473 glDisable GL_BLEND; 567 glDisable GL_BLEND;
474 } 568 }
475 569
476 if ($ENV{PCLIENT_DEBUG}) { 570 if ($ENV{CFPLUS_DEBUG} & 1) {
477 glPushMatrix; 571 glPushMatrix;
478 glColor 1, 1, 0, 1; 572 glColor 1, 1, 0, 1;
479 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 573 glTranslate 0.375, 0.375;
480 glBegin GL_LINE_LOOP; 574 glBegin GL_LINE_LOOP;
481 glVertex 0 , 0; 575 glVertex 0 , 0;
482 glVertex $self->{w} - 1, 0; 576 glVertex $self->{w} - 1, 0;
483 glVertex $self->{w} - 1, $self->{h} - 1; 577 glVertex $self->{w} - 1, $self->{h} - 1;
484 glVertex 0 , $self->{h} - 1; 578 glVertex 0 , $self->{h} - 1;
485 glEnd; 579 glEnd;
486 glPopMatrix; 580 glPopMatrix;
487 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 581 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
488 } 582 }
583
584 $self->_draw;
585 glPopMatrix;
489} 586}
490 587
491sub _draw { 588sub _draw {
492 my ($self) = @_; 589 my ($self) = @_;
493 590
494 warn "no draw defined for $self\n"; 591 warn "no draw defined for $self\n";
495}
496
497sub find_widget {
498 my ($self, $x, $y) = @_;
499
500 return () unless $self->{can_events};
501
502 return $self
503 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
504 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
505
506 ()
507}
508
509sub set_parent {
510 my ($self, $parent) = @_;
511
512 Scalar::Util::weaken ($self->{parent} = $parent);
513
514 $self->set_visible;
515
516 $self->check_size;
517 $self->show;
518}
519
520sub check_size {
521 my ($self, $forced) = @_;
522
523 $self->{force_alloc} = 1 if $forced;
524 $CFClient::UI::ROOT->{check_size}{$self} = $self;
525}
526
527sub update {
528 my ($self) = @_;
529
530 $self->{parent}->update
531 if $self->{parent};
532}
533
534sub connect {
535 my ($self, $signal, $cb) = @_;
536
537 push @{ $self->{signal_cb}{$signal} }, $cb;
538}
539
540sub _emit {
541 my ($self, $signal, @args) = @_;
542
543 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
544}
545
546sub emit {
547 my ($self, $signal, @args) = @_;
548
549 $self->_emit ($signal, @args)
550 || $self->$signal (@args);
551}
552
553sub visibility_change {
554 #my ($self, $visible) = @_;
555} 592}
556 593
557sub DESTROY { 594sub DESTROY {
558 my ($self) = @_; 595 my ($self) = @_;
559 596
… …
591 628
592 if ($color && (@$color < 4 || $color->[3])) { 629 if ($color && (@$color < 4 || $color->[3])) {
593 my ($w, $h) = @$self{qw(w h)}; 630 my ($w, $h) = @$self{qw(w h)};
594 631
595 glEnable GL_BLEND; 632 glEnable GL_BLEND;
596 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 633 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
597 glColor @$color; 634 glColor_premultiply @$color;
598 635
599 glBegin GL_QUADS; 636 glBegin GL_QUADS;
600 glVertex 0 , 0; 637 glVertex 0 , 0;
601 glVertex 0 , $h; 638 glVertex 0 , $h;
602 glVertex $w, $h; 639 glVertex $w, $h;
… …
617 my ($class, %arg) = @_; 654 my ($class, %arg) = @_;
618 $class->SUPER::new (can_events => 0, %arg); 655 $class->SUPER::new (can_events => 0, %arg);
619} 656}
620 657
621sub size_request { 658sub size_request {
622 (0, 0) 659 my ($self) = @_;
660
661 ($self->{w} + 0, $self->{h} + 0)
623} 662}
624 663
625sub draw { } 664sub draw { }
626 665
627############################################################################# 666#############################################################################
… …
631our @ISA = CFClient::UI::Base::; 670our @ISA = CFClient::UI::Base::;
632 671
633sub new { 672sub new {
634 my ($class, %arg) = @_; 673 my ($class, %arg) = @_;
635 674
636 my $children = delete $arg{children} || []; 675 my $children = delete $arg{children};
637 676
638 my $self = $class->SUPER::new ( 677 my $self = $class->SUPER::new (
639 children => [], 678 children => [],
640 can_events => 0, 679 can_events => 0,
641 %arg, 680 %arg,
642 ); 681 );
682
643 $self->add ($_) for @$children; 683 $self->add (@$children)
684 if $children;
644 685
645 $self 686 $self
646} 687}
647 688
648sub add { 689sub add {
… …
656 $self->{children} = [ 697 $self->{children} = [
657 sort { $a->{z} <=> $b->{z} } 698 sort { $a->{z} <=> $b->{z} }
658 @{$self->{children}}, @widgets 699 @{$self->{children}}, @widgets
659 ]; 700 ];
660 701
661 $self->check_size (1); 702 $self->realloc;
662 $self->update;
663} 703}
664 704
665sub children { 705sub children {
666 @{ $_[0]{children} } 706 @{ $_[0]{children} }
667} 707}
… …
672 delete $child->{parent}; 712 delete $child->{parent};
673 $child->hide; 713 $child->hide;
674 714
675 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 715 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
676 716
677 $self->check_size (1); 717 $self->realloc;
678 $self->update;
679} 718}
680 719
681sub clear { 720sub clear {
682 my ($self) = @_; 721 my ($self) = @_;
683 722
… …
687 for (@$children) { 726 for (@$children) {
688 delete $_->{parent}; 727 delete $_->{parent};
689 $_->hide; 728 $_->hide;
690 } 729 }
691 730
692 $self->check_size; 731 $self->realloc;
693 $self->update;
694} 732}
695 733
696sub find_widget { 734sub find_widget {
697 my ($self, $x, $y) = @_; 735 my ($self, $x, $y) = @_;
698 736
699 $x -= $self->{x}; 737 $x -= $self->{x};
700 $y -= $self->{y}; 738 $y -= $self->{y};
701 739
702 my $res; 740 my $res;
703 741
704 for (reverse @{ $self->{children} }) { 742 for (reverse $self->visible_children) {
705 $res = $_->find_widget ($x, $y) 743 $res = $_->find_widget ($x, $y)
706 and return $res; 744 and return $res;
707 } 745 }
708 746
709 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y}) 747 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
… …
758 $self->{children}[0]->configure (0, 0, $w, $h); 796 $self->{children}[0]->configure (0, 0, $w, $h);
759} 797}
760 798
761############################################################################# 799#############################################################################
762 800
801# back-buffered drawing area
802
763package CFClient::UI::Window; 803package CFClient::UI::Window;
764 804
765our @ISA = CFClient::UI::Bin::; 805our @ISA = CFClient::UI::Bin::;
766 806
767use CFClient::OpenGL; 807use CFClient::OpenGL;
… …
785 $self->SUPER::size_allocate ($w, $h); 825 $self->SUPER::size_allocate ($w, $h);
786 $self->update; 826 $self->update;
787} 827}
788 828
789sub _render { 829sub _render {
830 my ($self) = @_;
831
790 $_[0]{children}[0]->draw; 832 $self->{children}[0]->draw;
791} 833}
792 834
793sub render_child { 835sub render_child {
794 my ($self) = @_; 836 my ($self) = @_;
795 837
796 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 838 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
797 glClearColor 0, 0, 0, 0; 839 glClearColor 0, 0, 0, 0;
798 glClear GL_COLOR_BUFFER_BIT; 840 glClear GL_COLOR_BUFFER_BIT;
799 841
842 {
843 package CFClient::UI::Base;
844
845 ($draw_x, $draw_y, $draw_w, $draw_h) =
846 (0, 0, $self->{w}, $self->{h});
847 }
848
800 $self->_render; 849 $self->_render;
801 }; 850 };
802} 851}
803 852
804sub _draw { 853sub _draw {
805 my ($self) = @_; 854 my ($self) = @_;
806 855
807 my ($w, $h) = ($self->w, $self->h); 856 my ($w, $h) = @$self{qw(w h)};
808 857
809 my $tex = $self->{texture} 858 my $tex = $self->{texture}
810 or return; 859 or return;
811 860
812 glEnable GL_TEXTURE_2D; 861 glEnable GL_TEXTURE_2D;
813 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 862 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
814 glColor 1, 1, 1, 1; 863 glColor 0, 0, 0, 1;
815 864
816 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 865 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
817 866
818 glDisable GL_TEXTURE_2D; 867 glDisable GL_TEXTURE_2D;
819} 868}
… …
835} 884}
836 885
837sub size_request { 886sub size_request {
838 my ($self) = @_; 887 my ($self) = @_;
839 888
840 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 889 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
841 890
842 @$self{qw(child_w child_h)} 891 $w = 10 if $self->{scroll_x};
892 $h = 10 if $self->{scroll_y};
893
894 ($w, $h)
843} 895}
844 896
845sub size_allocate { 897sub size_allocate {
846 my ($self, $w, $h) = @_; 898 my ($self, $w, $h) = @_;
847 899
900 my $child = $self->child;
901
848 $w = $self->{child_w} if $self->{scroll_x} && $self->{child_w}; 902 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
849 $h = $self->{child_h} if $self->{scroll_y} && $self->{child_h}; 903 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
850 904
851 $self->child->configure (0, 0, $w, $h); 905 $self->child->configure (0, 0, $w, $h);
852 $self->update; 906 $self->update;
853} 907}
854 908
… …
890} 944}
891 945
892sub _render { 946sub _render {
893 my ($self) = @_; 947 my ($self) = @_;
894 948
949 local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};
950 local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y};
951
895 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 952 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
896 953
897 $self->SUPER::_render; 954 $self->SUPER::_render;
898} 955}
899 956
… …
902package CFClient::UI::ScrolledWindow; 959package CFClient::UI::ScrolledWindow;
903 960
904our @ISA = CFClient::UI::HBox::; 961our @ISA = CFClient::UI::HBox::;
905 962
906sub new { 963sub new {
907 my $class = shift; 964 my ($class, %arg) = @_;
965
966 my $child = delete $arg{child};
908 967
909 my $self; 968 my $self;
910 969
911 my $slider = new CFClient::UI::Slider 970 my $slider = new CFClient::UI::Slider
912 vertical => 1, 971 vertical => 1,
… …
917 ; 976 ;
918 977
919 $self = $class->SUPER::new ( 978 $self = $class->SUPER::new (
920 vp => (new CFClient::UI::ViewPort expand => 1), 979 vp => (new CFClient::UI::ViewPort expand => 1),
921 slider => $slider, 980 slider => $slider,
922 @_, 981 %arg,
923 ); 982 );
924 983
925 $self->{vp}->add ($self->{scrolled});
926 $self->add ($self->{vp});
927 $self->add ($self->{slider}); 984 $self->SUPER::add ($self->{vp}, $self->{slider});
985 $self->add ($child) if $child;
928 986
929 $self 987 $self
988}
989
990sub add {
991 my ($self, $widget) = @_;
992
993 $self->{vp}->add ($self->{child} = $widget);
930} 994}
931 995
932sub update { 996sub update {
933 my ($self) = @_; 997 my ($self) = @_;
934 998
… …
973 1037
974 if ($self->{bg}) { 1038 if ($self->{bg}) {
975 my ($w, $h) = @$self{qw(w h)}; 1039 my ($w, $h) = @$self{qw(w h)};
976 1040
977 glEnable GL_BLEND; 1041 glEnable GL_BLEND;
978 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1042 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
979 glColor @{ $self->{bg} }; 1043 glColor_premultiply @{ $self->{bg} };
980 1044
981 glBegin GL_QUADS; 1045 glBegin GL_QUADS;
982 glVertex 0 , 0; 1046 glVertex 0 , 0;
983 glVertex 0 , $h; 1047 glVertex 0 , $h;
984 glVertex $w, $h; 1048 glVertex $w, $h;
… …
997 1061
998our @ISA = CFClient::UI::Bin::; 1062our @ISA = CFClient::UI::Bin::;
999 1063
1000use CFClient::OpenGL; 1064use CFClient::OpenGL;
1001 1065
1002my @tex = 1066my $bg =
1067 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1068 mipmap => 1, wrap => 1;
1069
1070my @border =
1003 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1071 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1004 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1072 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1005 1073
1006sub new { 1074sub new {
1007 my $class = shift; 1075 my ($class, %arg) = @_;
1076
1077 my $title = delete $arg{title};
1008 1078
1009 my $self = $class->SUPER::new ( 1079 my $self = $class->SUPER::new (
1010 bg => [1, 1, 1, 1], 1080 bg => [1, 1, 1, 1],
1011 border_bg => [1, 1, 1, 1], 1081 border_bg => [1, 1, 1, 1],
1012 border => 0.6, 1082 border => 0.6,
1013 is_toplevel => 1,
1014 can_events => 1, 1083 can_events => 1,
1015 @_ 1084 min_w => 16,
1085 min_h => 16,
1086 %arg,
1016 ); 1087 );
1017 1088
1018 $self->{title} &&= new CFClient::UI::Label 1089 $self->{title} = new CFClient::UI::Label
1019 align => 0, 1090 align => 0,
1020 valign => 1, 1091 valign => 1,
1021 text => $self->{title}, 1092 text => $title,
1022 fontsize => $self->{border}; 1093 fontsize => $self->{border}
1094 if defined $title;
1023 1095
1024 $self 1096 $self
1097}
1098
1099sub add {
1100 my ($self, @widgets) = @_;
1101
1102 $self->SUPER::add (@widgets);
1103 $self->CFClient::UI::Container::add ($self->{title}) if $self->{title};
1025} 1104}
1026 1105
1027sub border { 1106sub border {
1028 int $_[0]{border} * $::FONTSIZE 1107 int $_[0]{border} * $::FONTSIZE
1029} 1108}
1030 1109
1031sub size_request { 1110sub size_request {
1032 my ($self) = @_; 1111 my ($self) = @_;
1112
1113 $self->{title}->size_request
1114 if $self->{title};
1033 1115
1034 my ($w, $h) = $self->SUPER::size_request; 1116 my ($w, $h) = $self->SUPER::size_request;
1035 1117
1036 ( 1118 (
1037 $w + $self->border * 2, 1119 $w + $self->border * 2,
… …
1040} 1122}
1041 1123
1042sub size_allocate { 1124sub size_allocate {
1043 my ($self, $w, $h) = @_; 1125 my ($self, $w, $h) = @_;
1044 1126
1127 if ($self->{title}) {
1128 $self->{title}{w} = $w;
1129 $self->{title}{h} = $h;
1130 $self->{title}->size_allocate ($w, $h);
1131 }
1132
1133 my $border = $self->border;
1134
1045 $h -= List::Util::max 0, $self->border * 2; 1135 $h -= List::Util::max 0, $border * 2;
1046 $w -= List::Util::max 0, $self->border * 2; 1136 $w -= List::Util::max 0, $border * 2;
1047 1137
1048 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
1049 if $self->{title};
1050
1051 $self->child->configure ($self->border, $self->border, $w, $h); 1138 $self->child->configure ($border, $border, $w, $h);
1052} 1139}
1053 1140
1054sub button_down { 1141sub button_down {
1055 my ($self, $ev, $x, $y) = @_; 1142 my ($self, $ev, $x, $y) = @_;
1056 1143
… …
1072 my ($ev, $x, $y) = @_; 1159 my ($ev, $x, $y) = @_;
1073 1160
1074 my $dx = $ev->{x} - $ox; 1161 my $dx = $ev->{x} - $ox;
1075 my $dy = $ev->{y} - $oy; 1162 my $dy = $ev->{y} - $oy;
1076 1163
1077 $self->{user_x} = $wx + $dx * $mx;
1078 $self->{user_y} = $wy + $dy * $my;
1079 $self->{def_w} = $bw + $dx * ($mx ? -1 : 1); 1164 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1080 $self->{def_h} = $bh + $dy * ($my ? -1 : 1); 1165 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1081 $self->move ($self->{user_x}, $self->{user_y}); 1166
1082 $self->check_size; 1167 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1168 $self->realloc;
1083 }; 1169 };
1084 1170
1085 } elsif ($lr ^ $td) { 1171 } elsif ($lr ^ $td) {
1086 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1172 my ($ox, $oy) = ($ev->{x}, $ev->{y});
1087 my ($bx, $by) = ($self->{x}, $self->{y}); 1173 my ($bx, $by) = ($self->{x}, $self->{y});
… …
1089 $self->{motion} = sub { 1175 $self->{motion} = sub {
1090 my ($ev, $x, $y) = @_; 1176 my ($ev, $x, $y) = @_;
1091 1177
1092 ($x, $y) = ($ev->{x}, $ev->{y}); 1178 ($x, $y) = ($ev->{x}, $ev->{y});
1093 1179
1094 $self->{user_x} = $bx + $x - $ox; 1180 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1095 $self->{user_y} = $by + $y - $oy; 1181 # HACK: the next line is required to enforce placement
1096 1182 $self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h});
1097 $self->move ($self->{user_x}, $self->{user_y});
1098 $self->update;
1099 }; 1183 };
1184 } else {
1185 return 0;
1186 }
1187
1100 } 1188 1
1101} 1189}
1102 1190
1103sub button_up { 1191sub button_up {
1104 my ($self, $ev, $x, $y) = @_; 1192 my ($self, $ev, $x, $y) = @_;
1105 1193
1106 delete $self->{motion}; 1194 !!delete $self->{motion}
1107} 1195}
1108 1196
1109sub mouse_motion { 1197sub mouse_motion {
1110 my ($self, $ev, $x, $y) = @_; 1198 my ($self, $ev, $x, $y) = @_;
1111 1199
1112 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1200 $self->{motion}->($ev, $x, $y) if $self->{motion};
1201
1202 !!$self->{motion}
1113} 1203}
1114 1204
1115sub _draw { 1205sub _draw {
1116 my ($self) = @_; 1206 my ($self) = @_;
1117 1207
1208 my $child = $self->{children}[0];
1209
1118 my ($w, $h ) = ($self->{w}, $self->{h}); 1210 my ($w, $h ) = ($self->{w}, $self->{h});
1119 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1211 my ($cw, $ch) = ($child->{w}, $child->{h});
1120 1212
1121 glEnable GL_TEXTURE_2D; 1213 glEnable GL_TEXTURE_2D;
1122 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1214 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1123 1215
1124 my $border = $self->border; 1216 my $border = $self->border;
1125 1217
1126 glColor @{ $self->{border_bg} }; 1218 glColor @{ $self->{border_bg} };
1127 $tex[1]->draw_quad_alpha (0, 0, $w, $border); 1219 $border[0]->draw_quad_alpha (0, 0, $w, $border);
1128 $tex[3]->draw_quad_alpha (0, $border, $border, $ch); 1220 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
1129 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1221 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1130 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border); 1222 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
1131 1223
1132 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1224 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1133 my $bg = $tex[0]; 1225 glColor @{ $self->{bg} };
1134 1226
1135 # TODO: repeat texture not scale 1227 # TODO: repeat texture not scale
1228 # solve this better(?)
1136 my $rep_x = $cw / $bg->{w}; 1229 $bg->{s} = $cw / $bg->{w};
1137 my $rep_y = $ch / $bg->{h}; 1230 $bg->{t} = $ch / $bg->{h};
1138
1139 glColor @{ $self->{bg} };
1140
1141 $bg->{s} = $rep_x;
1142 $bg->{t} = $rep_y;
1143 $bg->{wrap_mode} = 1;
1144 $bg->draw_quad_alpha ($border, $border, $cw, $ch); 1231 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1145 } 1232 }
1146 1233
1147 glDisable GL_TEXTURE_2D; 1234 glDisable GL_TEXTURE_2D;
1148 1235
1149 $self->{title}->draw if $self->{title};
1150
1151 $self->child->draw; 1236 $child->draw;
1237
1238 if ($self->{title}) {
1239 glTranslate 0, $border - $self->{h};
1240 $self->{title}->_draw;
1241 }
1152} 1242}
1153 1243
1154############################################################################# 1244#############################################################################
1155 1245
1156package CFClient::UI::Table; 1246package CFClient::UI::Table;
… …
1178 my ($self, $x, $y, $child) = @_; 1268 my ($self, $x, $y, $child) = @_;
1179 1269
1180 $child->set_parent ($self); 1270 $child->set_parent ($self);
1181 $self->{children}[$y][$x] = $child; 1271 $self->{children}[$y][$x] = $child;
1182 1272
1183 $self->check_size (1); 1273 $self->realloc;
1184} 1274}
1185 1275
1186# TODO: move to container class maybe? send children a signal on removal? 1276# TODO: move to container class maybe? send children a signal on removal?
1187sub clear { 1277sub clear {
1188 my ($self) = @_; 1278 my ($self) = @_;
… …
1193 for (@children) { 1283 for (@children) {
1194 delete $_->{parent}; 1284 delete $_->{parent};
1195 $_->hide; 1285 $_->hide;
1196 } 1286 }
1197 1287
1198 $self->check_size (1); 1288 $self->realloc;
1199 $self->update;
1200} 1289}
1201 1290
1202sub get_wh { 1291sub get_wh {
1203 my ($self) = @_; 1292 my ($self) = @_;
1204 1293
… …
1324 my ($self, $w, $h) = @_; 1413 my ($self, $w, $h) = @_;
1325 1414
1326 my $space = $self->{vertical} ? $h : $w; 1415 my $space = $self->{vertical} ? $h : $w;
1327 my $children = $self->{children}; 1416 my $children = $self->{children};
1328 1417
1329 my @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children; 1418 my @req;
1330 my $req = List::Util::sum @req;
1331 1419
1332 if ($req > $space) { 1420 if ($self->{homogeneous}) {
1333 # ah well, not enough space 1421 @req = ($space / (@$children || 1)) x @$children;
1334 $_ *= $space / $req for @req;
1335 } else { 1422 } else {
1423 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;
1424 my $req = List::Util::sum @req;
1425
1426 if ($req > $space) {
1427 # ah well, not enough space
1428 $_ *= $space / $req for @req;
1429 } else {
1336 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1; 1430 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1337 1431
1432 $space = ($space - $req) / $expand; # remaining space to give away
1433
1338 $req[$_] += ($space - $req) * $children->[$_]{expand} / $expand 1434 $req[$_] += $space * $children->[$_]{expand}
1339 for 0 .. $#$children; 1435 for 0 .. $#$children;
1436 }
1340 } 1437 }
1341 1438
1342 CFClient::UI::harmonize \@req; 1439 CFClient::UI::harmonize \@req;
1343 1440
1344 my $pos = 0; 1441 my $pos = 0;
… …
1404 ellipsise => 3, # end 1501 ellipsise => 3, # end
1405 layout => (new CFClient::Layout), 1502 layout => (new CFClient::Layout),
1406 fontsize => 1, 1503 fontsize => 1,
1407 align => -1, 1504 align => -1,
1408 valign => -1, 1505 valign => -1,
1409 padding => 2, 1506 padding_x => 2,
1507 padding_y => 2,
1410 can_events => 0, 1508 can_events => 0,
1411 %arg 1509 %arg
1412 ); 1510 );
1413 1511
1414 if (exists $self->{template}) { 1512 if (exists $self->{template}) {
… …
1441 1539
1442 delete $self->{texture}; 1540 delete $self->{texture};
1443 $self->SUPER::update; 1541 $self->SUPER::update;
1444} 1542}
1445 1543
1544sub realloc {
1545 my ($self) = @_;
1546
1547 delete $self->{ox};
1548 $self->SUPER::realloc;
1549}
1550
1446sub set_text { 1551sub set_text {
1447 my ($self, $text) = @_; 1552 my ($self, $text) = @_;
1448 1553
1449 return if $self->{text} eq "T$text"; 1554 return if $self->{text} eq "T$text";
1450 $self->{text} = "T$text"; 1555 $self->{text} = "T$text";
1451 1556
1452 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1557 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1453 $self->{layout}->set_text ($text); 1558 $self->{layout}->set_text ($text);
1454 1559
1560 delete $self->{size_req};
1561 $self->realloc;
1455 $self->update; 1562 $self->update;
1456 $self->check_size;
1457} 1563}
1458 1564
1459sub set_markup { 1565sub set_markup {
1460 my ($self, $markup) = @_; 1566 my ($self, $markup) = @_;
1461 1567
… …
1465 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1571 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1466 1572
1467 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba; 1573 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1468 $self->{layout}->set_markup ($markup); 1574 $self->{layout}->set_markup ($markup);
1469 1575
1576 delete $self->{size_req};
1577 $self->realloc;
1470 $self->update; 1578 $self->update;
1471 $self->check_size;
1472} 1579}
1473 1580
1474sub size_request { 1581sub size_request {
1475 my ($self) = @_; 1582 my ($self) = @_;
1476 1583
1584 $self->{size_req} ||= do {
1477 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1585 $self->{layout}->set_font ($self->{font}) if $self->{font};
1478 $self->{layout}->set_width ($self->{max_w} || -1); 1586 $self->{layout}->set_width ($self->{max_w} || -1);
1479 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1587 $self->{layout}->set_ellipsise ($self->{ellipsise});
1480 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1588 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1481 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1589 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1482 1590
1483 my ($w, $h) = $self->{layout}->size; 1591 my ($w, $h) = $self->{layout}->size;
1484 1592
1485 if (exists $self->{template}) { 1593 if (exists $self->{template}) {
1486 $self->{template}->set_font ($self->{font}) if $self->{font}; 1594 $self->{template}->set_font ($self->{font}) if $self->{font};
1487 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1595 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1488 1596
1489 my ($w2, $h2) = $self->{template}->size; 1597 my ($w2, $h2) = $self->{template}->size;
1490 1598
1491 $w = List::Util::max $w, $w2; 1599 $w = List::Util::max $w, $w2;
1492 $h = List::Util::max $h, $h2; 1600 $h = List::Util::max $h, $h2;
1601 }
1602
1603 [$w, $h]
1493 } 1604 };
1494 1605
1495 ( 1606 @{ $self->{size_req} }
1496 $w + $self->{padding} * 2,
1497 $h + $self->{padding} * 2,
1498 )
1499} 1607}
1500 1608
1501sub size_allocate { 1609sub size_allocate {
1502 my ($self, $w, $h) = @_; 1610 my ($self, $w, $h) = @_;
1503 1611
1612 delete $self->{ox};
1613
1504 delete $self->{texture}; 1614 delete $self->{texture}
1615 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1505} 1616}
1506 1617
1507sub set_fontsize { 1618sub set_fontsize {
1508 my ($self, $fontsize) = @_; 1619 my ($self, $fontsize) = @_;
1509 1620
1510 $self->{fontsize} = $fontsize; 1621 $self->{fontsize} = $fontsize;
1511 delete $self->{texture}; 1622 delete $self->{texture};
1512 1623
1513 $self->update; 1624 $self->realloc;
1514 $self->check_size; 1625}
1626
1627sub reconfigure {
1628 my ($self) = @_;
1629
1630 delete $self->{size_req};
1631
1632 $self->SUPER::reconfigure;
1515} 1633}
1516 1634
1517sub _draw { 1635sub _draw {
1518 my ($self) = @_; 1636 my ($self) = @_;
1519 1637
… …
1525 $self->{layout}->set_width ($self->{w}); 1643 $self->{layout}->set_width ($self->{w});
1526 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1644 $self->{layout}->set_ellipsise ($self->{ellipsise});
1527 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1645 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1528 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1646 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1529 1647
1530 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1648 new_from_layout CFClient::Texture $self->{layout}
1649 };
1531 1650
1651 unless (exists $self->{ox}) {
1532 $self->{ox} = int ($self->{align} < 0 ? $self->{padding} 1652 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1533 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1653 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1534 : ($self->{w} - $tex->{w}) * 0.5); 1654 : ($self->{w} - $tex->{w}) * 0.5);
1535 1655
1536 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding} 1656 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1537 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding} 1657 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1538 : ($self->{h} - $tex->{h}) * 0.5); 1658 : ($self->{h} - $tex->{h}) * 0.5);
1539
1540 $tex
1541 }; 1659 };
1542 1660
1543 glEnable GL_TEXTURE_2D; 1661 glEnable GL_TEXTURE_2D;
1544 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1545 1662
1546 if ($tex->{format} == GL_ALPHA) { 1663 if ($tex->{format} == GL_ALPHA) {
1664 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1547 glColor @{$self->{fg}}; 1665 glColor @{$self->{fg}};
1548 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}); 1666 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1549 } else { 1667 } else {
1668 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1550 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}); 1669 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1551 } 1670 }
1552 1671
1553 glDisable GL_TEXTURE_2D; 1672 glDisable GL_TEXTURE_2D;
1554} 1673}
… …
1583 1702
1584 delete $self->{cur_h}; 1703 delete $self->{cur_h};
1585 1704
1586 return if $self->{text} eq $text; 1705 return if $self->{text} eq $text;
1587 1706
1588 delete $self->{texture};
1589
1590 $self->{last_activity} = $::NOW; 1707 $self->{last_activity} = $::NOW;
1591 $self->{text} = $text; 1708 $self->{text} = $text;
1592 1709
1593 $text =~ s/./*/g if $self->{hidden}; 1710 $text =~ s/./*/g if $self->{hidden};
1594 $self->{layout}->set_text ("$text "); 1711 $self->{layout}->set_text ("$text ");
1712 delete $self->{size_req};
1595 1713
1596 $self->_emit (changed => $self->{text}); 1714 $self->_emit (changed => $self->{text});
1715
1716 $self->realloc;
1717 $self->update;
1597} 1718}
1598 1719
1599sub set_text { 1720sub set_text {
1600 my ($self, $text) = @_; 1721 my ($self, $text) = @_;
1601 1722
1602 $self->{cursor} = length $text; 1723 $self->{cursor} = length $text;
1603 $self->_set_text ($text); 1724 $self->_set_text ($text);
1604 $self->update;
1605 $self->check_size;
1606} 1725}
1607 1726
1608sub get_text { 1727sub get_text {
1609 $_[0]{text} 1728 $_[0]{text}
1610} 1729}
… …
1640 $self->{cursor} = length $text; 1759 $self->{cursor} = length $text;
1641 } elsif ($uni == 27) { 1760 } elsif ($uni == 27) {
1642 $self->_emit ('escape'); 1761 $self->_emit ('escape');
1643 } elsif ($uni) { 1762 } elsif ($uni) {
1644 substr $text, $self->{cursor}++, 0, chr $uni; 1763 substr $text, $self->{cursor}++, 0, chr $uni;
1764 } else {
1765 return 0;
1645 } 1766 }
1646 1767
1647 $self->_set_text ($text); 1768 $self->_set_text ($text);
1648 $self->update; 1769
1649 $self->check_size; 1770 $self->realloc;
1771
1772 1
1650} 1773}
1651 1774
1652sub focus_in { 1775sub focus_in {
1653 my ($self) = @_; 1776 my ($self) = @_;
1654 1777
… …
1669 utf8::encode $text; 1792 utf8::encode $text;
1670 $self->{cursor} = length substr $text, 0, $idx; 1793 $self->{cursor} = length substr $text, 0, $idx;
1671 1794
1672 $self->_set_text ($self->{text}); 1795 $self->_set_text ($self->{text});
1673 $self->update; 1796 $self->update;
1797
1798 1
1674} 1799}
1675 1800
1676sub mouse_motion { 1801sub mouse_motion {
1677 my ($self, $ev, $x, $y) = @_; 1802 my ($self, $ev, $x, $y) = @_;
1678# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 1803# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1804
1805 0
1679} 1806}
1680 1807
1681sub _draw { 1808sub _draw {
1682 my ($self) = @_; 1809 my ($self) = @_;
1683 1810
1684 local $self->{fg} = $self->{fg}; 1811 local $self->{fg} = $self->{fg};
1685 1812
1686 if ($FOCUS == $self) { 1813 if ($FOCUS == $self) {
1687 glColor @{$self->{active_bg}}; 1814 glColor_premultiply @{$self->{active_bg}};
1688 $self->{fg} = $self->{active_fg}; 1815 $self->{fg} = $self->{active_fg};
1689 } else { 1816 } else {
1690 glColor @{$self->{bg}}; 1817 glColor_premultiply @{$self->{bg}};
1691 } 1818 }
1692 1819
1693 glEnable GL_BLEND; 1820 glEnable GL_BLEND;
1694 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1821 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1695 glBegin GL_QUADS; 1822 glBegin GL_QUADS;
1696 glVertex 0 , 0; 1823 glVertex 0 , 0;
1697 glVertex 0 , $self->{h}; 1824 glVertex 0 , $self->{h};
1698 glVertex $self->{w}, $self->{h}; 1825 glVertex $self->{w}, $self->{h};
1699 glVertex $self->{w}, 0; 1826 glVertex $self->{w}, 0;
… …
1760 } else { 1887 } else {
1761 $self->set_text ($self->{history_saveback}); 1888 $self->set_text ($self->{history_saveback});
1762 } 1889 }
1763 1890
1764 } else { 1891 } else {
1765 $self->SUPER::key_down ($ev); 1892 return $self->SUPER::key_down ($ev)
1893 }
1894
1766 } 1895 1
1767
1768} 1896}
1769 1897
1770############################################################################# 1898#############################################################################
1771 1899
1772package CFClient::UI::Button; 1900package CFClient::UI::Button;
… …
1781 1909
1782sub new { 1910sub new {
1783 my $class = shift; 1911 my $class = shift;
1784 1912
1785 $class->SUPER::new ( 1913 $class->SUPER::new (
1786 padding => 4, 1914 padding_x => 4,
1915 padding_y => 4,
1787 fg => [1, 1, 1], 1916 fg => [1, 1, 1],
1788 active_fg => [0, 0, 1], 1917 active_fg => [0, 0, 1],
1789 can_hover => 1, 1918 can_hover => 1,
1790 align => 0, 1919 align => 0,
1791 valign => 0, 1920 valign => 0,
… …
1800 my ($self, $ev, $x, $y) = @_; 1929 my ($self, $ev, $x, $y) = @_;
1801 1930
1802 $self->emit ("activate") 1931 $self->emit ("activate")
1803 if $x >= 0 && $x < $self->{w} 1932 if $x >= 0 && $x < $self->{w}
1804 && $y >= 0 && $y < $self->{h}; 1933 && $y >= 0 && $y < $self->{h};
1934
1935 1
1805} 1936}
1806 1937
1807sub _draw { 1938sub _draw {
1808 my ($self) = @_; 1939 my ($self) = @_;
1809 1940
1810 local $self->{fg} = $self->{fg}; 1941 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1811
1812 if ($GRAB == $self) {
1813 $self->{fg} = $self->{active_fg};
1814 }
1815 1942
1816 glEnable GL_TEXTURE_2D; 1943 glEnable GL_TEXTURE_2D;
1817 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1944 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1818 glColor 0, 0, 0, 1; 1945 glColor 0, 0, 0, 1;
1819 1946
… …
1838 1965
1839sub new { 1966sub new {
1840 my $class = shift; 1967 my $class = shift;
1841 1968
1842 $class->SUPER::new ( 1969 $class->SUPER::new (
1843 padding => 2, 1970 padding_x => 2,
1971 padding_y => 2,
1844 fg => [1, 1, 1], 1972 fg => [1, 1, 1],
1845 active_fg => [1, 1, 0], 1973 active_fg => [1, 1, 0],
1846 bg => [0, 0, 0, 0.2], 1974 bg => [0, 0, 0, 0.2],
1847 active_bg => [1, 1, 1, 0.5], 1975 active_bg => [1, 1, 1, 0.5],
1848 state => 0, 1976 state => 0,
… …
1852} 1980}
1853 1981
1854sub size_request { 1982sub size_request {
1855 my ($self) = @_; 1983 my ($self) = @_;
1856 1984
1857 ($self->{padding} * 2 + 6) x 2 1985 (6) x 2
1858} 1986}
1859 1987
1860sub button_down { 1988sub button_down {
1861 my ($self, $ev, $x, $y) = @_; 1989 my ($self, $ev, $x, $y) = @_;
1862 1990
1863 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1991 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1864 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1992 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1865 $self->{state} = !$self->{state}; 1993 $self->{state} = !$self->{state};
1866 $self->_emit (changed => $self->{state}); 1994 $self->_emit (changed => $self->{state});
1995 } else {
1996 return 0
1997 }
1998
1867 } 1999 1
1868} 2000}
1869 2001
1870sub _draw { 2002sub _draw {
1871 my ($self) = @_; 2003 my ($self) = @_;
1872 2004
1873 $self->SUPER::_draw; 2005 $self->SUPER::_draw;
1874 2006
1875 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 2007 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1876 2008
1877 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 2009 my ($w, $h) = @$self{qw(w h)};
2010
2011 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1878 2012
1879 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 2013 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1880 2014
1881 my $tex = $self->{state} ? $tex[1] : $tex[0]; 2015 my $tex = $self->{state} ? $tex[1] : $tex[0];
1882 2016
… …
2037 2171
2038 my $h1 = $self->{h} * (1 - $ycut1); 2172 my $h1 = $self->{h} * (1 - $ycut1);
2039 my $h2 = $self->{h} * (1 - $ycut2); 2173 my $h2 = $self->{h} * (1 - $ycut2);
2040 2174
2041 glEnable GL_BLEND; 2175 glEnable GL_BLEND;
2042 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2176 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2177 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2043 glEnable GL_TEXTURE_2D; 2178 glEnable GL_TEXTURE_2D;
2044 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2179 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2045 2180
2046 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2181 glBindTexture GL_TEXTURE_2D, $t1->{name};
2047 glBegin GL_QUADS; 2182 glBegin GL_QUADS;
… …
2147 fg => [1, 1, 1], 2282 fg => [1, 1, 1],
2148 active_fg => [0, 0, 0], 2283 active_fg => [0, 0, 0],
2149 bg => [0, 0, 0, 0.2], 2284 bg => [0, 0, 0, 0.2],
2150 active_bg => [1, 1, 1, 0.5], 2285 active_bg => [1, 1, 1, 0.5],
2151 range => [0, 0, 100, 10, 0], 2286 range => [0, 0, 100, 10, 0],
2152 req_w => $::WIDTH / 80, 2287 min_w => $::WIDTH / 80,
2153 req_h => $::WIDTH / 80, 2288 min_h => $::WIDTH / 80,
2154 vertical => 0, 2289 vertical => 0,
2155 can_hover => 1, 2290 can_hover => 1,
2156 inner_pad => 0.02, 2291 inner_pad => 0.02,
2157 @_ 2292 @_
2158 ); 2293 );
… …
2161 $self->update; 2296 $self->update;
2162 2297
2163 $self 2298 $self
2164} 2299}
2165 2300
2301sub changed { }
2302
2166sub set_range { 2303sub set_range {
2167 my ($self, $range) = @_; 2304 my ($self, $range) = @_;
2168 2305
2169 ($range, $self->{range}) = ($self->{range}, $range); 2306 ($range, $self->{range}) = ($self->{range}, $range);
2170 2307
… …
2196} 2333}
2197 2334
2198sub size_request { 2335sub size_request {
2199 my ($self) = @_; 2336 my ($self) = @_;
2200 2337
2201 my $w = $self->{req_w}; 2338 ($self->{req_w}, $self->{req_h})
2202 my $h = $self->{req_h};
2203
2204 $self->{vertical} ? ($h, $w) : ($w, $h)
2205} 2339}
2206 2340
2207sub button_down { 2341sub button_down {
2208 my ($self, $ev, $x, $y) = @_; 2342 my ($self, $ev, $x, $y) = @_;
2209 2343
2210 $self->SUPER::button_down ($ev, $x, $y); 2344 $self->SUPER::button_down ($ev, $x, $y);
2211 2345
2212 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2346 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2213 2347
2214 $self->mouse_motion ($ev, $x, $y); 2348 $self->mouse_motion ($ev, $x, $y)
2215} 2349}
2216 2350
2217sub mouse_motion { 2351sub mouse_motion {
2218 my ($self, $ev, $x, $y) = @_; 2352 my ($self, $ev, $x, $y) = @_;
2219 2353
… …
2223 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2357 my (undef, $lo, $hi, $page) = @{$self->{range}};
2224 2358
2225 $x = ($x - $self->{click}[1]) / ($w * $self->{scale}); 2359 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2226 2360
2227 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo)); 2361 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2362 } else {
2363 return 0;
2364 }
2365
2228 } 2366 1
2229} 2367}
2230 2368
2231sub update { 2369sub update {
2232 my ($self) = @_; 2370 my ($self) = @_;
2233 2371
2234 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 2372 delete $self->{knob_w};
2373 $self->SUPER::update;
2374}
2375
2376sub _draw {
2377 my ($self) = @_;
2378
2379 unless ($self->{knob_w}) {
2235 $self->set_value ($self->{range}[0]); 2380 $self->set_value ($self->{range}[0]);
2236 2381
2237 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2382 my ($value, $lo, $hi, $page) = @{$self->{range}};
2238 my $range = ($hi - $page - $lo) || 1e-100; 2383 my $range = ($hi - $page - $lo) || 1e-100;
2239 2384
… …
2245 $value = ($value - $lo) / $range; 2390 $value = ($value - $lo) / $range;
2246 $value = $value * $self->{scale} + $self->{offset}; 2391 $value = $value * $self->{scale} + $self->{offset};
2247 2392
2248 $self->{knob_x} = $value - $knob_w * 0.5; 2393 $self->{knob_x} = $value - $knob_w * 0.5;
2249 $self->{knob_w} = $knob_w; 2394 $self->{knob_w} = $knob_w;
2250 }); 2395 }
2251
2252 $self->SUPER::update;
2253}
2254
2255sub _draw {
2256 my ($self) = @_;
2257 2396
2258 $self->SUPER::_draw (); 2397 $self->SUPER::_draw ();
2259 2398
2260 glScale $self->{w}, $self->{h}; 2399 glScale $self->{w}, $self->{h};
2261 2400
… …
2455 2594
2456 delete $self->{texture}; 2595 delete $self->{texture};
2457 } 2596 }
2458 2597
2459 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2598 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2460 glClearColor 0.5, 0.5, 0.5, 0; 2599 glClearColor 0, 0, 0, 0;
2461 glClear GL_COLOR_BUFFER_BIT; 2600 glClear GL_COLOR_BUFFER_BIT;
2462 2601
2463 my $top = int $self->{children}[1]{range}[0]; 2602 my $top = int $self->{children}[1]{range}[0];
2464 2603
2465 my $y0 = $top; 2604 my $y0 = $top;
… …
2500sub _draw { 2639sub _draw {
2501 my ($self) = @_; 2640 my ($self) = @_;
2502 2641
2503 glEnable GL_TEXTURE_2D; 2642 glEnable GL_TEXTURE_2D;
2504 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2643 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2505 glColor 1, 1, 1, 1; 2644 glColor 0, 0, 0, 1;
2506 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2645 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2507 glDisable GL_TEXTURE_2D; 2646 glDisable GL_TEXTURE_2D;
2508 2647
2509 $self->{children}[1]->draw; 2648 $self->{children}[1]->draw;
2510 2649
2511} 2650}
… …
2594} 2733}
2595 2734
2596sub set_tooltip_from { 2735sub set_tooltip_from {
2597 my ($self, $widget) = @_; 2736 my ($self, $widget) = @_;
2598 2737
2738 my $tooltip = $widget->{tooltip};
2739
2740 if ($ENV{CFPLUS_DEBUG} & 2) {
2741 $tooltip .= "\n\n" . (ref $widget) . "\n"
2742 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2743 . "req $widget->{req_w} $widget->{req_h}\n"
2744 . "visible $widget->{visible}";
2745 }
2746
2599 $self->add (new CFClient::UI::Label 2747 $self->add (new CFClient::UI::Label
2600 markup => $widget->{tooltip}, 2748 markup => $tooltip,
2601 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2749 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2602 fontsize => 0.8, 2750 fontsize => 0.8,
2603 fg => [0, 0, 0, 1], 2751 fg => [0, 0, 0, 1],
2604 ellipsise => 0, 2752 ellipsise => 0,
2605 font => ($widget->{tooltip_font} || $::FONT_PROP), 2753 font => ($widget->{tooltip_font} || $::FONT_PROP),
… …
2616 2764
2617sub size_allocate { 2765sub size_allocate {
2618 my ($self, $w, $h) = @_; 2766 my ($self, $w, $h) = @_;
2619 2767
2620 $self->SUPER::size_allocate ($w - 4, $h - 4); 2768 $self->SUPER::size_allocate ($w - 4, $h - 4);
2769}
2770
2771sub visibility_change {
2772 my ($self, $visible) = @_;
2773
2774 return unless $visible;
2775
2776 $self->{root}->on_post_alloc ("move_$self" => sub {
2777 my $widget = $self->{owner}
2778 or return;
2779
2780 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2781
2782 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2783 if $x + $self->{w} > $::WIDTH;
2784
2785 $self->move_abs ($x, $y);
2786 });
2621} 2787}
2622 2788
2623sub _draw { 2789sub _draw {
2624 my ($self) = @_; 2790 my ($self) = @_;
2625 2791
… …
2642 glVertex $w, $h; 2808 glVertex $w, $h;
2643 glVertex $w, 0; 2809 glVertex $w, 0;
2644 glEnd; 2810 glEnd;
2645 2811
2646 glTranslate 2 - 0.375, 2 - 0.375; 2812 glTranslate 2 - 0.375, 2 - 0.375;
2813
2647 $self->SUPER::_draw; 2814 $self->SUPER::_draw;
2648} 2815}
2649 2816
2650############################################################################# 2817#############################################################################
2651 2818
… …
2710 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 2877 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2711 2878
2712 if ($tex) { 2879 if ($tex) {
2713 glEnable GL_TEXTURE_2D; 2880 glEnable GL_TEXTURE_2D;
2714 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2881 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2715 glColor 1, 1, 1, 1; 2882 glColor 0, 0, 0, 1;
2716 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2883 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2717 glDisable GL_TEXTURE_2D; 2884 glDisable GL_TEXTURE_2D;
2718 } 2885 }
2719} 2886}
2720 2887
… …
2727 $self->SUPER::DESTROY; 2894 $self->SUPER::DESTROY;
2728} 2895}
2729 2896
2730############################################################################# 2897#############################################################################
2731 2898
2732package CFClient::UI::Inventory; 2899package CFClient::UI::Buttonbar;
2733 2900
2734our @ISA = CFClient::UI::ScrolledWindow::; 2901our @ISA = CFClient::UI::HBox::;
2735 2902
2736sub new { 2903# TODO: should actualyl wrap buttons and other goodies.
2737 my $class = shift;
2738
2739 my $self = $class->SUPER::new (
2740 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2741 @_,
2742 );
2743
2744 $self
2745}
2746
2747sub set_items {
2748 my ($self, $items) = @_;
2749
2750 $self->{scrolled}->clear;
2751 return unless $items;
2752
2753 my @items = sort {
2754 ($a->{type} <=> $b->{type})
2755 or ($a->{name} cmp $b->{name})
2756 } @$items;
2757
2758 $self->{real_items} = \@items;
2759
2760 my $row = 0;
2761 for my $item (@items) {
2762 CFClient::Item::update_widgets $item;
2763
2764 $self->{scrolled}->add (0, $row, $item->{face_widget});
2765 $self->{scrolled}->add (1, $row, $item->{desc_widget});
2766 $self->{scrolled}->add (2, $row, $item->{weight_widget});
2767
2768 $row++;
2769 }
2770}
2771 2904
2772############################################################################# 2905#############################################################################
2773 2906
2774package CFClient::UI::Menu; 2907package CFClient::UI::Menu;
2775 2908
… …
2816 # maybe save $GRAB? must be careful about events... 2949 # maybe save $GRAB? must be careful about events...
2817 $GRAB = $self; 2950 $GRAB = $self;
2818 $self->{button} = $ev->{button}; 2951 $self->{button} = $ev->{button};
2819 2952
2820 $self->show; 2953 $self->show;
2821 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 2954 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2822} 2955}
2823 2956
2824sub mouse_motion { 2957sub mouse_motion {
2825 my ($self, $ev, $x, $y) = @_; 2958 my ($self, $ev, $x, $y) = @_;
2826 2959
2827 # TODO: should use vbox->find_widget or so 2960 # TODO: should use vbox->find_widget or so
2828 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 2961 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2829 $self->{hover} = $self->{item}{$HOVER}; 2962 $self->{hover} = $self->{item}{$HOVER};
2963
2964 0
2830} 2965}
2831 2966
2832sub button_up { 2967sub button_up {
2833 my ($self, $ev, $x, $y) = @_; 2968 my ($self, $ev, $x, $y) = @_;
2834 2969
… …
2836 undef $GRAB; 2971 undef $GRAB;
2837 $self->hide; 2972 $self->hide;
2838 2973
2839 $self->_emit ("popdown"); 2974 $self->_emit ("popdown");
2840 $self->{hover}[1]->() if $self->{hover}; 2975 $self->{hover}[1]->() if $self->{hover};
2976 } else {
2977 return 0
2978 }
2979
2841 } 2980 1
2842} 2981}
2843 2982
2844############################################################################# 2983#############################################################################
2845 2984
2846package CFClient::UI::Statusbox; 2985package CFClient::UI::Multiplexer;
2847 2986
2848our @ISA = CFClient::UI::VBox::; 2987our @ISA = CFClient::UI::Container::;
2849 2988
2850sub new { 2989sub new {
2851 my $class = shift; 2990 my $class = shift;
2852 2991
2853 $class->SUPER::new ( 2992 my $self = $class->SUPER::new (
2993 @_,
2994 );
2995
2996 $self->{current} = $self->{children}[0]
2997 if @{ $self->{children} };
2998
2999 $self
3000}
3001
3002sub add {
3003 my ($self, @widgets) = @_;
3004
3005 $self->SUPER::add (@widgets);
3006
3007 $self->{current} = $self->{children}[0]
3008 if @{ $self->{children} };
3009}
3010
3011sub set_current_page {
3012 my ($self, $page_or_widget) = @_;
3013
3014 my $widget = ref $page_or_widget
3015 ? $page_or_widget
3016 : $self->{children}[$page_or_widget];
3017
3018 $self->{current} = $widget;
3019 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3020
3021 $self->_emit (page_changed => $self->{current});
3022
3023 $self->realloc;
3024}
3025
3026sub visible_children {
3027 $_[0]{current}
3028}
3029
3030sub size_request {
3031 my ($self) = @_;
3032
3033 $self->{current}->size_request
3034}
3035
3036sub size_allocate {
3037 my ($self, $w, $h) = @_;
3038
3039 $self->{current}->configure (0, 0, $w, $h);
3040}
3041
3042sub _draw {
3043 my ($self) = @_;
3044
3045 $self->{current}->draw;
3046}
3047
3048#############################################################################
3049
3050package CFClient::UI::Notebook;
3051
3052our @ISA = CFClient::UI::VBox::;
3053
3054sub new {
3055 my $class = shift;
3056
3057 my $self = $class->SUPER::new (
3058 buttonbar => (new CFClient::UI::Buttonbar),
3059 multiplexer => (new CFClient::UI::Multiplexer expand => 1),
3060 # filter => # will be put between multiplexer and $self
3061 @_,
3062 );
3063
3064 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3065 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3066
3067 $self
3068}
3069
3070sub add {
3071 my ($self, $title, $widget, $tooltip) = @_;
3072
3073 Scalar::Util::weaken $self;
3074
3075 $self->{buttonbar}->add (new CFClient::UI::Button
3076 markup => $title,
3077 tooltip => $tooltip,
3078 on_activate => sub { $self->set_current_page ($widget) },
3079 );
3080
3081 $self->{multiplexer}->add ($widget);
3082}
3083
3084sub set_current_page {
3085 my ($self, $page) = @_;
3086
3087 $self->{multiplexer}->set_current_page ($page);
3088 $self->_emit (page_changed => $self->{multiplexer}{current});
3089}
3090
3091#############################################################################
3092
3093package CFClient::UI::Statusbox;
3094
3095our @ISA = CFClient::UI::VBox::;
3096
3097sub new {
3098 my $class = shift;
3099
3100 my $self = $class->SUPER::new (
2854 fontsize => 0.8, 3101 fontsize => 0.8,
2855 @_, 3102 @_,
2856 ) 3103 );
3104
3105 Scalar::Util::weaken (my $this = $self);
3106
3107 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3108
3109 $self
2857} 3110}
2858 3111
2859sub reorder { 3112sub reorder {
2860 my ($self) = @_; 3113 my ($self) = @_;
2861 my $NOW = time; 3114 my $NOW = Time::HiRes::time;
3115
3116 # freeze display when hovering over any label
3117 return if $CFClient::UI::TOOLTIP->{owner}
3118 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},
3119 values %{ $self->{item} };
2862 3120
2863 while (my ($k, $v) = each %{ $self->{item} }) { 3121 while (my ($k, $v) = each %{ $self->{item} }) {
2864 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3122 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2865 } 3123 }
2866 3124
… …
2869 my @items = sort { 3127 my @items = sort {
2870 $a->{pri} <=> $b->{pri} 3128 $a->{pri} <=> $b->{pri}
2871 or $b->{id} <=> $a->{id} 3129 or $b->{id} <=> $a->{id}
2872 } values %{ $self->{item} }; 3130 } values %{ $self->{item} };
2873 3131
3132 $self->{timer}->interval (1);
3133
2874 my $count = 10 + 1; 3134 my $count = 10 + 1;
2875 for my $item (@items) { 3135 for my $item (@items) {
2876 last unless --$count; 3136 last unless --$count;
2877 3137
2878 push @widgets, $item->{label} ||= do { 3138 my $label = $item->{label} ||= do {
2879 # TODO: doesn't handle markup well (read as: at all) 3139 # TODO: doesn't handle markup well (read as: at all)
2880 my $short = $item->{count} > 1 3140 my $short = $item->{count} > 1
2881 ? "<b>$item->{count} ×</b> $item->{text}" 3141 ? "<b>$item->{count} ×</b> $item->{text}"
2882 : $item->{text}; 3142 : $item->{text};
2883 3143
… …
2891 tooltip => $item->{tooltip}, 3151 tooltip => $item->{tooltip},
2892 tooltip_font => $::FONT_PROP, 3152 tooltip_font => $::FONT_PROP,
2893 tooltip_width => 0.67, 3153 tooltip_width => 0.67,
2894 fontsize => $item->{fontsize} || $self->{fontsize}, 3154 fontsize => $item->{fontsize} || $self->{fontsize},
2895 max_w => $::WIDTH * 0.44, 3155 max_w => $::WIDTH * 0.44,
2896 fg => $item->{fg}, 3156 fg => [@{ $item->{fg} }],
2897 can_events => 1, 3157 can_events => 1,
2898 can_hover => 1 3158 can_hover => 1
2899 }; 3159 };
3160
3161 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3162 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3163 $label->update;
3164 $label->set_max_size (undef, $label->{req_h} * $diff)
3165 if $diff < 1;
3166 $self->{timer}->interval (1/30);
3167 } else {
3168 $label->{fg}[3] = $item->{fg}[3] || 1;
3169 }
3170
3171 push @widgets, $label;
2900 } 3172 }
2901 3173
2902 $self->clear; 3174 $self->clear;
2903 $self->SUPER::add (reverse @widgets); 3175 $self->SUPER::add (reverse @widgets);
2904} 3176}
… …
2909 $text =~ s/^\s+//; 3181 $text =~ s/^\s+//;
2910 $text =~ s/\s+$//; 3182 $text =~ s/\s+$//;
2911 3183
2912 return unless $text; 3184 return unless $text;
2913 3185
2914 my $timeout = time + ((delete $arg{timeout}) || 60); 3186 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
2915 3187
2916 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3188 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2917 3189
2918 if (my $item = $self->{item}{$group}) { 3190 if (my $item = $self->{item}{$group}) {
2919 if ($item->{text} eq $text) { 3191 if ($item->{text} eq $text) {
… …
2949 3221
2950 $self->reorder; 3222 $self->reorder;
2951 $self->SUPER::reconfigure; 3223 $self->SUPER::reconfigure;
2952} 3224}
2953 3225
3226sub DESTROY {
3227 my ($self) = @_;
3228
3229 $self->{timer}->cancel;
3230
3231 $self->SUPER::DESTROY;
3232}
3233
2954############################################################################# 3234#############################################################################
2955 3235
2956package CFClient::UI::Root; 3236package CFClient::UI::Inventory;
2957 3237
2958our @ISA = CFClient::UI::Container::; 3238our @ISA = CFClient::UI::ScrolledWindow::;
2959
2960use CFClient::OpenGL;
2961 3239
2962sub new { 3240sub new {
2963 my $class = shift; 3241 my $class = shift;
2964 3242
2965 $class->SUPER::new ( 3243 my $self = $class->SUPER::new (
3244 child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3245 @_,
3246 );
3247
3248 $self
3249}
3250
3251sub set_items {
3252 my ($self, $items) = @_;
3253
3254 $self->{child}->clear;
3255 return unless $items;
3256
3257 my @items = sort {
3258 ($a->{type} <=> $b->{type})
3259 or ($a->{name} cmp $b->{name})
3260 } @$items;
3261
3262 $self->{real_items} = \@items;
3263
3264 my $row = 0;
3265 for my $item (@items) {
3266 CFClient::Item::update_widgets $item;
3267
3268 $self->{child}->add (0, $row, $item->{face_widget});
3269 $self->{child}->add (1, $row, $item->{desc_widget});
3270 $self->{child}->add (2, $row, $item->{weight_widget});
3271
3272 $row++;
3273 }
3274}
3275
3276#############################################################################
3277
3278package CFClient::UI::BindEditor;
3279
3280our @ISA = CFClient::UI::FancyFrame::;
3281
3282sub new {
3283 my $class = shift;
3284
3285 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3286
3287 $self->add (my $vb = new CFClient::UI::VBox);
3288
3289
3290 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3291 text => "start recording",
3292 tooltip => "Start/Stops recording of actions."
3293 ."All subsequent actions after the recording started will be captured."
3294 ."The actions are displayed after the record was stopped."
3295 ."To bind the action you have to click on the 'Bind' button",
3296 on_activate => sub {
3297 unless ($self->{recording}) {
3298 $self->start;
3299 } else {
3300 $self->stop;
3301 }
3302 });
3303
3304 $vb->add (new CFClient::UI::Label text => "Actions:");
3305 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3306
3307 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3308 $vb->add (my $hb = new CFClient::UI::HBox);
3309 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3310 $hb->add (new CFClient::UI::Button
3311 text => "bind",
3312 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3313 on_activate => sub {
3314 $self->ask_for_bind;
3315 });
3316
3317 $vb->add (my $hb = new CFClient::UI::HBox);
3318 $hb->add (new CFClient::UI::Button
3319 text => "ok",
3320 expand => 1,
3321 tooltip => "This closes the binding editor and saves the binding",
3322 on_activate => sub {
3323 $self->hide;
3324 $self->commit;
3325 });
3326
3327 $hb->add (new CFClient::UI::Button
3328 text => "cancel",
3329 expand => 1,
3330 tooltip => "This closes the binding editor without saving",
3331 on_activate => sub {
3332 $self->hide;
3333 $self->{binding_cancel}->()
3334 if $self->{binding_cancel};
3335 });
3336
3337 $self->update_binding_widgets;
3338
3339 $self
3340}
3341
3342sub commit {
3343 my ($self) = @_;
3344 my ($mod, $sym, $cmds) = $self->get_binding;
3345 if ($sym != 0 && @$cmds > 0) {
3346 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3347 ."'. Don't forget 'Save Config'!");
3348 $self->{binding_change}->($mod, $sym, $cmds)
3349 if $self->{binding_change};
3350 } else {
3351 $::STATUSBOX->add ("No action bound, no key or action specified!");
3352 $self->{binding_cancel}->()
3353 if $self->{binding_cancel};
3354 }
3355}
3356
3357sub start {
3358 my ($self) = @_;
3359
3360 $self->{rec_btn}->set_text ("stop recording");
3361 $self->{recording} = 1;
3362 $self->clear_command_list;
3363 $::CONN->start_record if $::CONN;
3364}
3365
3366sub stop {
3367 my ($self) = @_;
3368
3369 $self->{rec_btn}->set_text ("start recording");
3370 $self->{recording} = 0;
3371
3372 my $rec;
3373 $rec = $::CONN->stop_record if $::CONN;
3374 return unless ref $rec eq 'ARRAY';
3375 $self->set_command_list ($rec);
3376}
3377
3378
3379sub ask_for_bind_and_commit {
3380 my ($self) = @_;
3381 $self->ask_for_bind (1);
3382}
3383
3384sub ask_for_bind {
3385 my ($self, $commit) = @_;
3386
3387 CFClient::Binder::open_binding_dialog (sub {
3388 my ($mod, $sym) = @_;
3389 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3390 $self->update_binding_widgets;
3391 $self->commit if $commit;
3392 });
3393}
3394
3395# $mod and $sym are the modifiers and key symbol
3396# $cmds is a array ref of strings (the commands)
3397# $cb is the callback that is executed on OK
3398# $ccb is the callback that is executed on CANCEL and
3399# when the binding was unsuccessful on OK
3400sub set_binding {
3401 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3402
3403 $self->clear_command_list;
3404 $self->{recording} = 0;
3405 $self->{rec_btn}->set_text ("start recording");
3406
3407 $self->{binding} = [$mod, $sym];
3408 $self->{commands} = $cmds;
3409
3410 $self->{binding_change} = $cb;
3411 $self->{binding_cancel} = $ccb;
3412
3413 $self->update_binding_widgets;
3414}
3415
3416# this is a shortcut method that asks for a binding
3417# and then just binds it.
3418sub do_quick_binding {
3419 my ($self, $cmds) = @_;
3420 $self->set_binding (undef, undef, $cmds, sub {
3421 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3422 });
3423 $self->ask_for_bind (1);
3424}
3425
3426sub update_binding_widgets {
3427 my ($self) = @_;
3428 my ($mod, $sym, $cmds) = $self->get_binding;
3429 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3430 $self->set_command_list ($cmds);
3431}
3432
3433sub get_binding {
3434 my ($self) = @_;
3435 return (
3436 $self->{binding}->[0],
3437 $self->{binding}->[1],
3438 [ grep { defined $_ } @{$self->{commands}} ]
3439 );
3440}
3441
3442sub clear_command_list {
3443 my ($self) = @_;
3444 $self->{cmdbox}->clear ();
3445}
3446
3447sub set_command_list {
3448 my ($self, $cmds) = @_;
3449
3450 $self->{cmdbox}->clear ();
3451 $self->{commands} = $cmds;
3452
3453 my $idx = 0;
3454
3455 for (@$cmds) {
3456 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3457
3458 my $i = $idx;
3459 $hb->add (new CFClient::UI::Label text => $_);
3460 $hb->add (new CFClient::UI::Button
3461 text => "delete",
3462 tooltip => "Deletes the action from the record",
3463 on_activate => sub {
3464 $self->{cmdbox}->remove ($hb);
3465 $cmds->[$i] = undef;
3466 });
3467
3468
3469 $idx++
3470 }
3471}
3472
3473#############################################################################
3474
3475package CFClient::UI::SpellList;
3476
3477our @ISA = CFClient::UI::Table::;
3478
3479sub new {
3480 my $class = shift;
3481
3482 my $self = $class->SUPER::new (
3483 binding => [],
3484 commands => [],
3485 @_,
3486 )
3487}
3488
3489my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3490 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.");
3491my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3492 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.");
3493my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3494 "<b>Damage</b>. The amount of damage the spell deals when it hits.");
3495
3496sub rebuild_spell_list {
3497 my ($self) = @_;
3498
3499 $CFClient::UI::ROOT->on_refresh ($self => sub {
3500 $self->clear;
3501
3502 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name");
3503 $self->add (2, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3504 $self->add (3, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3505 $self->add (4, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3506
3507 my $row = 0;
3508
3509 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3510 my $spell = $self->{spell}{$_};
3511
3512 $row++;
3513
3514 $self->add (0, $row, new CFClient::UI::Face
3515 face => $spell->{face},
3516 can_hover => 1,
3517 can_events => 1,
3518 tooltip => $spell->{message},
3519 );
3520
3521 $self->add (1, $row, new CFClient::UI::Label
3522 expand => 1,
3523 text => $spell->{name},
3524 can_hover => 1,
3525 can_events => 1,
3526 tooltip => $spell->{message},
3527 );
3528
3529 $self->add (2, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3530 $self->add (3, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3531 $self->add (4, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3532
3533 # TODO: should be done via popup
3534 $self->add (5, $row, new CFClient::UI::Button
3535 text => "bind",
3536 tooltip => "bind spell readying (cast command) to key",
3537 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) },
3538 );
3539 }
3540 });
3541}
3542
3543sub add_spell {
3544 my ($self, $spell) = @_;
3545
3546 $self->{spell}->{$spell->{name}} = $spell;
3547 $self->rebuild_spell_list;
3548}
3549
3550sub remove_spell {
3551 my ($self, $spell) = @_;
3552
3553 delete $self->{spell}->{$spell->{name}};
3554 $self->rebuild_spell_list;
3555}
3556
3557#############################################################################
3558
3559package CFClient::UI::Root;
3560
3561our @ISA = CFClient::UI::Container::;
3562
3563use List::Util qw(min max);
3564
3565use CFClient::OpenGL;
3566
3567sub new {
3568 my $class = shift;
3569
3570 my $self = $class->SUPER::new (
2966 visible => 1, 3571 visible => 1,
2967 @_, 3572 @_,
2968 ) 3573 );
2969}
2970 3574
2971sub configure { 3575 Scalar::Util::weaken ($self->{root} = $self);
2972 my ($self, $x, $y, $w, $h) = @_;
2973 3576
2974 $self->{w} = $w; 3577 $self
2975 $self->{h} = $h;
2976}
2977
2978sub check_size {
2979 my ($self) = @_;
2980
2981 $self->size_allocate ($self->{w}, $self->{h})
2982 if $self->{w};
2983} 3578}
2984 3579
2985sub size_request { 3580sub size_request {
2986 my ($self) = @_; 3581 my ($self) = @_;
2987 3582
2988 ($self->{w}, $self->{h}) 3583 ($self->{w}, $self->{h})
3584}
3585
3586sub _to_pixel {
3587 my ($coord, $size, $max) = @_;
3588
3589 $coord =
3590 $coord eq "center" ? ($max - $size) * 0.5
3591 : $coord eq "max" ? $max
3592 : $coord;
3593
3594 $coord = 0 if $coord < 0;
3595 $coord = $max - $size if $coord > $max - $size;
3596
3597 int $coord + 0.5
2989} 3598}
2990 3599
2991sub size_allocate { 3600sub size_allocate {
2992 my ($self, $w, $h) = @_; 3601 my ($self, $w, $h) = @_;
2993 3602
2994 for my $child ($self->children) { 3603 for my $child ($self->children) {
2995 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3604 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2996 3605
2997 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 3606 $X = $child->{force_x} if exists $child->{force_x};
2998 if exists $child->{req_x}; 3607 $Y = $child->{force_y} if exists $child->{force_y};
2999 3608
3000 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1 3609 $X = _to_pixel $X, $W, $self->{w};
3001 if exists $child->{req_y}; 3610 $Y = _to_pixel $Y, $H, $self->{h};
3002
3003 delete @$child{qw(req_x req_y)};
3004
3005 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
3006 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
3007 3611
3008 $child->configure ($X, $Y, $W, $H); 3612 $child->configure ($X, $Y, $W, $H);
3009 } 3613 }
3010} 3614}
3011 3615
… …
3022} 3626}
3023 3627
3024sub update { 3628sub update {
3025 my ($self) = @_; 3629 my ($self) = @_;
3026 3630
3027 $self->check_size;
3028 $::WANT_REFRESH++; 3631 $::WANT_REFRESH++;
3029} 3632}
3030 3633
3031sub add { 3634sub add {
3032 my ($self, @children) = @_; 3635 my ($self, @children) = @_;
3033 3636
3034 for my $child (@children) {
3035 $child->{is_toplevel} = 1; 3637 $_->{is_toplevel} = 1
3036 3638 for @children;
3037 # integerise window positions
3038 $child->{x} = int $child->{x};
3039 $child->{y} = int $child->{y};
3040 }
3041 3639
3042 $self->SUPER::add (@children); 3640 $self->SUPER::add (@children);
3043
3044 for (my @widgets = @children; my $w = pop @widgets; ) {
3045 push @widgets, $w->children;
3046 $w->set_visible;
3047 }
3048
3049} 3641}
3050 3642
3051sub remove { 3643sub remove {
3052 my ($self, @children) = @_; 3644 my ($self, @children) = @_;
3053 3645
3054 $self->SUPER::remove (@children); 3646 $self->SUPER::remove (@children);
3647
3648 delete $self->{is_toplevel}
3649 for @children;
3055 3650
3056 while (@children) { 3651 while (@children) {
3057 my $w = pop @children; 3652 my $w = pop @children;
3058 push @children, $w->children; 3653 push @children, $w->children;
3059 $w->set_invisible; 3654 $w->set_invisible;
… …
3078 while ($self->{refresh_hook}) { 3673 while ($self->{refresh_hook}) {
3079 $_->() 3674 $_->()
3080 for values %{delete $self->{refresh_hook}}; 3675 for values %{delete $self->{refresh_hook}};
3081 } 3676 }
3082 3677
3083 if ($self->{check_size}) { 3678 if ($self->{realloc}) {
3679 my %queue;
3084 my @queue; 3680 my @queue;
3681 my $widget;
3085 3682
3086 for (;;) { 3683 outer:
3087 if ($self->{check_size}) { 3684 while () {
3088 #TODO use array-of-depth approach 3685 if (my $realloc = delete $self->{realloc}) {
3686 for $widget (values %$realloc) {
3687 $widget->{visible} or next; # do not resize invisible widgets
3089 3688
3090 @queue = sort { $a->{visible} <=> $b->{visible} } 3689 $queue{$widget+0}++ and next; # duplicates are common
3091 @queue, values %{delete $self->{check_size}}; 3690
3691 push @{ $queue[$widget->{visible}] }, $widget;
3692 }
3092 } 3693 }
3093 3694
3695 while () {
3696 @queue or last outer;
3697
3094 my $widget = pop @queue || last; 3698 $widget = pop @{ $queue[-1] || [] }
3095 3699 and last;
3096 defined $widget->{visible} or last; # do not resize invisible widgets
3097
3098 my ($w, $h) = $widget->{def_w} && $widget->{def_h}
3099 ? @$widget{qw(def_w def_h)}
3100 : $widget->size_request;
3101
3102 if (delete $widget->{force_alloc}
3103 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
3104 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
3105 3700
3701 pop @queue;
3702 }
3703
3704 delete $queue{$widget+0};
3705
3706 my ($w, $h) = $widget->size_request;
3707
3708 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3709 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3710
3711 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3712 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3713
3714 $w = $widget->{force_w} if exists $widget->{force_w};
3715 $h = $widget->{force_h} if exists $widget->{force_h};
3716
3717 if ($widget->{req_w} != $w || $widget->{req_h} != $h
3718 || delete $widget->{force_realloc}) {
3106 $widget->{req_w} = $w; 3719 $widget->{req_w} = $w;
3107 $widget->{req_h} = $h; 3720 $widget->{req_h} = $h;
3108 3721
3109 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h]; 3722 $self->{size_alloc}{$widget+0} = $widget;
3110 3723
3111 $widget->{parent}->check_size
3112 if $widget->{parent}; 3724 if (my $parent = $widget->{parent}) {
3725 $self->{realloc}{$parent+0} = $parent
3726 unless $queue{$parent+0};
3727
3728 $parent->{force_size_alloc} = 1;
3729 $self->{size_alloc}{$parent+0} = $parent;
3730 }
3113 } 3731 }
3732
3733 delete $self->{realloc}{$widget+0};
3114 } 3734 }
3115 } 3735 }
3116 3736
3117 while ($self->{size_alloc}) { 3737 while (my $size_alloc = delete $self->{size_alloc}) {
3118 for (values %{delete $self->{size_alloc}}) { 3738 my @queue = sort { $b->{visible} <=> $a->{visible} }
3119 my ($widget, $w, $h) = @$_; 3739 values %$size_alloc;
3740
3741 while () {
3742 my $widget = pop @queue || last;
3743
3744 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3120 3745
3121 $w = 0 if $w < 0; 3746 $w = 0 if $w < 0;
3122 $h = 0 if $h < 0; 3747 $h = 0 if $h < 0;
3123 3748
3749 $w = int $w + 0.5;
3750 $h = int $h + 0.5;
3751
3752 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3753 $widget->{old_w} = $widget->{w};
3754 $widget->{old_h} = $widget->{h};
3755
3124 $widget->{w} = $w; 3756 $widget->{w} = $w;
3125 $widget->{h} = $h; 3757 $widget->{h} = $h;
3758
3126 $widget->emit (size_allocate => $w, $h); 3759 $widget->emit (size_allocate => $w, $h);
3760 }
3127 } 3761 }
3128 } 3762 }
3129 3763
3130 while ($self->{post_alloc_hook}) { 3764 while ($self->{post_alloc_hook}) {
3131 $_->() 3765 $_->()
3132 for values %{delete $self->{post_alloc_hook}}; 3766 for values %{delete $self->{post_alloc_hook}};
3133 } 3767 }
3768
3134 3769
3135 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3770 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3136 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3771 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3137 glClear GL_COLOR_BUFFER_BIT; 3772 glClear GL_COLOR_BUFFER_BIT;
3138 3773
… …
3140 glLoadIdentity; 3775 glLoadIdentity;
3141 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 3776 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3142 glMatrixMode GL_MODELVIEW; 3777 glMatrixMode GL_MODELVIEW;
3143 glLoadIdentity; 3778 glLoadIdentity;
3144 3779
3780 {
3781 package CFClient::UI::Base;
3782
3783 ($draw_x, $draw_y, $draw_w, $draw_h) =
3784 (0, 0, $self->{w}, $self->{h});
3785 }
3786
3145 $self->_draw; 3787 $self->_draw;
3146} 3788}
3147 3789
3148############################################################################# 3790#############################################################################
3149 3791

Diff Legend

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