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

Diff Legend

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