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.245 by elmex, Sat May 27 21:15:57 2006 UTC vs.
Revision 1.286 by root, Mon Jun 5 03:48:49 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->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w};
181 $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.]+$/;
182 $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};
183 $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};
184 $widget->{user_h} = int 0.5 + $widget->{user_h} * $sy if exists $widget->{user_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
185 } 190 }
186 } 191 }
187 192
188 reconfigure_widgets; 193 reconfigure_widgets;
189} 194}
… …
198 203
199sub new { 204sub new {
200 my $class = shift; 205 my $class = shift;
201 206
202 my $self = bless { 207 my $self = bless {
203 x => 0, 208 x => "center",
204 y => 0, 209 y => "center",
205 z => 0, 210 z => 0,
211 w => undef,
212 h => undef,
206 can_events => 1, 213 can_events => 1,
207 @_ 214 @_
208 }, $class; 215 }, $class;
216
217 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
209 218
210 for (keys %$self) { 219 for (keys %$self) {
211 if (/^on_(.*)$/) { 220 if (/^on_(.*)$/) {
212 $self->connect ($1 => delete $self->{$_}); 221 $self->connect ($1 => delete $self->{$_});
213 } 222 }
214 } 223 }
215 224
216 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
217
218 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) { 225 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {
219 $self->{user_x} = $layout->{x} * $::WIDTH; 226 $self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x};
220 $self->{user_y} = $layout->{y} * $::HEIGHT; 227 $self->{y} = $layout->{y} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{y};
221 $self->{user_w} = ($layout->{w} != 0 ? $layout->{w} : 1) * $::WIDTH; 228 $self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{w};
222 $self->{user_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};
223 } 235 }
224 236
225 $self 237 $self
226}
227
228sub toggle_visibility {
229 my ($self) = @_;
230
231 if ($self->{visible}) {
232 $self->hide;
233 } else {
234 $self->show;
235 }
236} 238}
237 239
238sub destroy { 240sub destroy {
239 my ($self) = @_; 241 my ($self) = @_;
240 242
… …
242 %$self = (); 244 %$self = ();
243} 245}
244 246
245sub show { 247sub show {
246 my ($self) = @_; 248 my ($self) = @_;
249
247 return if $self->{parent}; 250 return if $self->{parent};
248 251
249 $CFClient::UI::ROOT->add ($self); 252 $CFClient::UI::ROOT->add ($self);
250} 253}
251 254
252sub show_centered { 255sub set_visible {
253 my ($self) = @_; 256 my ($self) = @_;
257
254 return if $self->{parent}; 258 return if $self->{visible};
255 259
256 $self->show; 260 $self->{root} = $self->{parent}{root};
261 $self->{visible} = $self->{parent}{visible} + 1;
257 262
258 $CFClient::UI::ROOT->on_post_alloc ( 263 $self->emit (visibility_change => 1);
259 "centered $self" => sub { 264
260 $self->move (($::WIDTH - $self->{w}) * 0.5, ($::HEIGHT - $self->{h}) * 0.5); 265 $self->realloc if !exists $self->{req_w};
261 }, 266
262 ); 267 $_->set_visible for $self->children;
263} 268}
264 269
265sub set_invisible { 270sub set_invisible {
266 my ($self) = @_; 271 my ($self) = @_;
267 272
268 return unless $self->{visible}; 273 return unless $self->{visible};
269 274
270 # broken show/hide model 275 $_->set_invisible for $self->children;
271 276
272 delete $self->{root}; 277 delete $self->{root};
273 delete $self->{visible}; 278 delete $self->{visible};
274 279
275 undef $GRAB if $GRAB == $self; 280 undef $GRAB if $GRAB == $self;
276 undef $HOVER if $HOVER == $self; 281 undef $HOVER if $HOVER == $self;
277 282
278 CFClient::UI::check_tooltip 283 $CFClient::UI::TOOLTIP_WATCHER->cb->()
279 if $CFClient::UI::TOOLTIP->{owner} == $self; 284 if $TOOLTIP->{owner} == $self;
280 285
281 $self->focus_out; 286 $self->focus_out;
282 287
283 $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;
284} 306}
285 307
286sub hide { 308sub hide {
287 my ($self) = @_; 309 my ($self) = @_;
288 310
… …
290 312
291 $self->{parent}->remove ($self) 313 $self->{parent}->remove ($self)
292 if $self->{parent}; 314 if $self->{parent};
293} 315}
294 316
295sub move { 317sub move_abs {
296 my ($self, $x, $y, $z) = @_; 318 my ($self, $x, $y, $z) = @_;
297 319
298 $self->{x} = int $x; 320 $self->{x} = List::Util::max 0, int $x;
299 $self->{y} = int $y; 321 $self->{y} = List::Util::max 0, int $y;
300 $self->{z} = $z if defined $z; 322 $self->{z} = $z if defined $z;
301 323
302 $self->update; 324 $self->update;
303} 325}
304 326
305sub set_size { 327sub set_size {
306 my ($self, $w, $h) = @_; 328 my ($self, $w, $h) = @_;
307 329
308 $self->{user_w} = $w; 330 $self->{force_w} = $w;
309 $self->{user_h} = $h; 331 $self->{force_h} = $h;
310 332
311 $self->check_size; 333 $self->realloc;
312} 334}
313 335
314sub size_request { 336sub size_request {
315 require Carp; 337 require Carp;
316 Carp::confess "size_request is abstract"; 338 Carp::confess "size_request is abstract";
… …
318 340
319sub configure { 341sub configure {
320 my ($self, $x, $y, $w, $h) = @_; 342 my ($self, $x, $y, $w, $h) = @_;
321 343
322 if ($self->{aspect}) { 344 if ($self->{aspect}) {
345 my ($ow, $oh) = ($w, $h);
346
323 my $w2 = List::Util::min $w, int $h * $self->{aspect}; 347 $w = List::Util::min $w, int $h * $self->{aspect};
324 my $h2 = List::Util::min $h, int $w / $self->{aspect}; 348 $h = List::Util::min $h, int $w / $self->{aspect};
325 349
326 # use alignment to adjust x, y 350 # use alignment to adjust x, y
327 351
328 $x += int +($w - $w2) * 0.5; 352 $x += int 0.5 * ($ow - $w);
329 $y += int +($h - $h2) * 0.5; 353 $y += int 0.5 * ($oh - $h);
330
331 ($w, $h) = ($w2, $h2);
332 } 354 }
333 355
334 if ($self->{x} != $x || $self->{y} != $y) { 356 if ($self->{x} ne $x || $self->{y} ne $y) {
335 $self->{x} = $x; 357 $self->{x} = $x;
336 $self->{y} = $y; 358 $self->{y} = $y;
337 $self->update; 359 $self->update;
338 } 360 }
339 361
340 if ($self->{w} != $w || $self->{h} != $h) { 362 if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
341 $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;
342 } 369 }
343} 370}
344 371
345sub size_allocate { 372sub size_allocate {
346 # nothing to be done 373 # nothing to be done
347} 374}
348 375
349sub reconfigure {
350 my ($self) = @_;
351
352 $self->check_size (1);
353 $self->update;
354}
355
356sub children { 376sub children {
377 # nop
378}
379
380sub visible_children {
381 $_[0]->children
357} 382}
358 383
359sub set_max_size { 384sub set_max_size {
360 my ($self, $w, $h) = @_; 385 my ($self, $w, $h) = @_;
361 386
362 delete $self->{max_w}; $self->{max_w} = $w if $w; 387 $self->{max_w} = int $w if defined $w;
363 delete $self->{max_h}; $self->{max_h} = $h if $h; 388 $self->{max_h} = int $h if defined $h;
389
390 $self->realloc;
364} 391}
365 392
366sub set_tooltip { 393sub set_tooltip {
367 my ($self, $tooltip) = @_; 394 my ($self, $tooltip) = @_;
368 395
… …
373 400
374 $self->{tooltip} = $tooltip; 401 $self->{tooltip} = $tooltip;
375 402
376 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 403 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
377 delete $CFClient::UI::TOOLTIP->{owner}; 404 delete $CFClient::UI::TOOLTIP->{owner};
378 CFClient::UI::check_tooltip; 405 $CFClient::UI::TOOLTIP_WATCHER->cb->();
379 } 406 }
380} 407}
381 408
382# translate global coordinates to local coordinate system 409# translate global coordinates to local coordinate system
383sub coord2local { 410sub coord2local {
… …
420 447
421 $::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
422 unless $FOCUS; 449 unless $FOCUS;
423} 450}
424 451
425sub mouse_motion { } 452sub mouse_motion { 0 }
426sub button_up { } 453sub button_up { 0 }
427sub key_down { } 454sub key_down { 0 }
428sub key_up { } 455sub key_up { 0 }
429 456
430sub button_down { 457sub button_down {
431 my ($self, $ev, $x, $y) = @_; 458 my ($self, $ev, $x, $y) = @_;
432 459
433 $self->focus_in; 460 $self->focus_in;
434}
435 461
436sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 462 0
437sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 463}
438sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 464
439sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 465sub find_widget {
440sub 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
441 538
442sub draw { 539sub draw {
443 my ($self) = @_; 540 my ($self) = @_;
444 541
445 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);
446 553
447 glPushMatrix; 554 glPushMatrix;
448 glTranslate $self->{x}, $self->{y}, 0; 555 glTranslate $self->{x}, $self->{y}, 0;
449 $self->_draw;
450 glPopMatrix;
451 556
452 if ($self == $HOVER && $self->{can_hover}) { 557 if ($self == $HOVER && $self->{can_hover}) {
453 my ($x, $y) = @$self{qw(x y)};
454
455 glColor 1, 0.8, 0.5, 0.2; 558 glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
456 glEnable GL_BLEND; 559 glEnable GL_BLEND;
457 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 560 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
458 glBegin GL_QUADS; 561 glBegin GL_QUADS;
459 glVertex $x , $y; 562 glVertex 0 , 0;
460 glVertex $x + $self->{w}, $y; 563 glVertex $self->{w}, 0;
461 glVertex $x + $self->{w}, $y + $self->{h}; 564 glVertex $self->{w}, $self->{h};
462 glVertex $x , $y + $self->{h}; 565 glVertex 0 , $self->{h};
463 glEnd; 566 glEnd;
464 glDisable GL_BLEND; 567 glDisable GL_BLEND;
465 } 568 }
466 569
467 if ($ENV{PCLIENT_DEBUG}) { 570 if ($ENV{CFPLUS_DEBUG} & 1) {
468 glPushMatrix; 571 glPushMatrix;
469 glColor 1, 1, 0, 1; 572 glColor 1, 1, 0, 1;
470 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 573 glTranslate 0.375, 0.375;
471 glBegin GL_LINE_LOOP; 574 glBegin GL_LINE_LOOP;
472 glVertex 0 , 0; 575 glVertex 0 , 0;
473 glVertex $self->{w} - 1, 0; 576 glVertex $self->{w} - 1, 0;
474 glVertex $self->{w} - 1, $self->{h} - 1; 577 glVertex $self->{w} - 1, $self->{h} - 1;
475 glVertex 0 , $self->{h} - 1; 578 glVertex 0 , $self->{h} - 1;
476 glEnd; 579 glEnd;
477 glPopMatrix; 580 glPopMatrix;
478 #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;
479 } 582 }
583
584 $self->_draw;
585 glPopMatrix;
480} 586}
481 587
482sub _draw { 588sub _draw {
483 my ($self) = @_; 589 my ($self) = @_;
484 590
485 warn "no draw defined for $self\n"; 591 warn "no draw defined for $self\n";
486}
487
488sub find_widget {
489 my ($self, $x, $y) = @_;
490
491 return () unless $self->{can_events};
492
493 return $self
494 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
495 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
496
497 ()
498}
499
500sub set_parent {
501 my ($self, $parent) = @_;
502
503 Scalar::Util::weaken ($self->{parent} = $parent);
504
505 if ($parent->{visible} || 1) {
506 $self->{root} = $parent->{root};
507 $self->{visible} = $parent->{visible} + 1;
508
509 $self->emit (visibility_change => 1)
510 unless $self->{parent}{visible};
511 }
512
513 # TODO: req_w _does_change after ->reconfigure
514 $self->check_size
515 unless exists $self->{req_w};
516
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) = @_;
1008 1076
1009 # TODO: user_x, user_y, overwrite moveto? 1077 my $title = delete $arg{title};
1010 1078
1011 my $self = $class->SUPER::new ( 1079 my $self = $class->SUPER::new (
1012 bg => [1, 1, 1, 1], 1080 bg => [1, 1, 1, 1],
1013 border_bg => [1, 1, 1, 1], 1081 border_bg => [1, 1, 1, 1],
1014 border => 0.6, 1082 border => 0.6,
1015 is_toplevel => 1,
1016 can_events => 1, 1083 can_events => 1,
1017 @_ 1084 min_w => 16,
1085 min_h => 16,
1086 %arg,
1018 ); 1087 );
1019 1088
1020 $self->{title} &&= new CFClient::UI::Label 1089 $self->{title} = new CFClient::UI::Label
1021 align => 0, 1090 align => 0,
1022 valign => 1, 1091 valign => 1,
1023 text => $self->{title}, 1092 text => $title,
1024 fontsize => $self->{border}; 1093 fontsize => $self->{border}
1094 if defined $title;
1025 1095
1026 $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};
1027} 1104}
1028 1105
1029sub border { 1106sub border {
1030 int $_[0]{border} * $::FONTSIZE 1107 int $_[0]{border} * $::FONTSIZE
1031} 1108}
1032 1109
1033sub size_request { 1110sub size_request {
1034 my ($self) = @_; 1111 my ($self) = @_;
1112
1113 $self->{title}->size_request
1114 if $self->{title};
1035 1115
1036 my ($w, $h) = $self->SUPER::size_request; 1116 my ($w, $h) = $self->SUPER::size_request;
1037 1117
1038 ( 1118 (
1039 $w + $self->border * 2, 1119 $w + $self->border * 2,
… …
1042} 1122}
1043 1123
1044sub size_allocate { 1124sub size_allocate {
1045 my ($self, $w, $h) = @_; 1125 my ($self, $w, $h) = @_;
1046 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
1047 $h -= List::Util::max 0, $self->border * 2; 1135 $h -= List::Util::max 0, $border * 2;
1048 $w -= List::Util::max 0, $self->border * 2; 1136 $w -= List::Util::max 0, $border * 2;
1049 1137
1050 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
1051 if $self->{title};
1052
1053 $self->child->configure ($self->border, $self->border, $w, $h); 1138 $self->child->configure ($border, $border, $w, $h);
1054} 1139}
1055 1140
1056sub button_down { 1141sub button_down {
1057 my ($self, $ev, $x, $y) = @_; 1142 my ($self, $ev, $x, $y) = @_;
1058 1143
… …
1074 my ($ev, $x, $y) = @_; 1159 my ($ev, $x, $y) = @_;
1075 1160
1076 my $dx = $ev->{x} - $ox; 1161 my $dx = $ev->{x} - $ox;
1077 my $dy = $ev->{y} - $oy; 1162 my $dy = $ev->{y} - $oy;
1078 1163
1079 $self->{user_x} = $wx + $dx * $mx;
1080 $self->{user_y} = $wy + $dy * $my;
1081 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1164 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1082 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1165 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1083 $self->move ($self->{user_x}, $self->{user_y}); 1166
1084 $self->check_size; 1167 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1168 $self->realloc;
1085 }; 1169 };
1086 1170
1087 } elsif ($lr ^ $td) { 1171 } elsif ($lr ^ $td) {
1088 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1172 my ($ox, $oy) = ($ev->{x}, $ev->{y});
1089 my ($bx, $by) = ($self->{x}, $self->{y}); 1173 my ($bx, $by) = ($self->{x}, $self->{y});
… …
1091 $self->{motion} = sub { 1175 $self->{motion} = sub {
1092 my ($ev, $x, $y) = @_; 1176 my ($ev, $x, $y) = @_;
1093 1177
1094 ($x, $y) = ($ev->{x}, $ev->{y}); 1178 ($x, $y) = ($ev->{x}, $ev->{y});
1095 1179
1096 $self->{user_x} = $bx + $x - $ox; 1180 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1097 $self->{user_y} = $by + $y - $oy; 1181 # HACK: the next line is required to enforce placement
1098 $self->move ($self->{user_x}, $self->{user_y}); 1182 $self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h});
1099 $self->update;
1100 }; 1183 };
1184 } else {
1185 return 0;
1186 }
1187
1101 } 1188 1
1102} 1189}
1103 1190
1104sub button_up { 1191sub button_up {
1105 my ($self, $ev, $x, $y) = @_; 1192 my ($self, $ev, $x, $y) = @_;
1106 1193
1107 delete $self->{motion}; 1194 !!delete $self->{motion}
1108} 1195}
1109 1196
1110sub mouse_motion { 1197sub mouse_motion {
1111 my ($self, $ev, $x, $y) = @_; 1198 my ($self, $ev, $x, $y) = @_;
1112 1199
1113 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1200 $self->{motion}->($ev, $x, $y) if $self->{motion};
1201
1202 !!$self->{motion}
1114} 1203}
1115 1204
1116sub _draw { 1205sub _draw {
1117 my ($self) = @_; 1206 my ($self) = @_;
1118 1207
1208 my $child = $self->{children}[0];
1209
1119 my ($w, $h ) = ($self->{w}, $self->{h}); 1210 my ($w, $h ) = ($self->{w}, $self->{h});
1120 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1211 my ($cw, $ch) = ($child->{w}, $child->{h});
1121 1212
1122 glEnable GL_TEXTURE_2D; 1213 glEnable GL_TEXTURE_2D;
1123 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1214 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1124 1215
1125 my $border = $self->border; 1216 my $border = $self->border;
1126 1217
1127 glColor @{ $self->{border_bg} }; 1218 glColor @{ $self->{border_bg} };
1128 $tex[1]->draw_quad_alpha (0, 0, $w, $border); 1219 $border[0]->draw_quad_alpha (0, 0, $w, $border);
1129 $tex[3]->draw_quad_alpha (0, $border, $border, $ch); 1220 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
1130 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1221 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1131 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border); 1222 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
1132 1223
1133 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1224 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1134 my $bg = $tex[0]; 1225 glColor @{ $self->{bg} };
1135 1226
1136 # TODO: repeat texture not scale 1227 # TODO: repeat texture not scale
1228 # solve this better(?)
1137 my $rep_x = $cw / $bg->{w}; 1229 $bg->{s} = $cw / $bg->{w};
1138 my $rep_y = $ch / $bg->{h}; 1230 $bg->{t} = $ch / $bg->{h};
1139
1140 glColor @{ $self->{bg} };
1141
1142 $bg->{s} = $rep_x;
1143 $bg->{t} = $rep_y;
1144 $bg->{wrap_mode} = 1;
1145 $bg->draw_quad_alpha ($border, $border, $cw, $ch); 1231 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1146 } 1232 }
1147 1233
1148 glDisable GL_TEXTURE_2D; 1234 glDisable GL_TEXTURE_2D;
1149 1235
1150 $self->{title}->draw if $self->{title};
1151
1152 $self->child->draw; 1236 $child->draw;
1237
1238 if ($self->{title}) {
1239 glTranslate 0, $border - $self->{h};
1240 $self->{title}->_draw;
1241 }
1153} 1242}
1154 1243
1155############################################################################# 1244#############################################################################
1156 1245
1157package CFClient::UI::Table; 1246package CFClient::UI::Table;
… …
1179 my ($self, $x, $y, $child) = @_; 1268 my ($self, $x, $y, $child) = @_;
1180 1269
1181 $child->set_parent ($self); 1270 $child->set_parent ($self);
1182 $self->{children}[$y][$x] = $child; 1271 $self->{children}[$y][$x] = $child;
1183 1272
1184 $self->check_size (1); 1273 $self->realloc;
1185} 1274}
1186 1275
1187# 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?
1188sub clear { 1277sub clear {
1189 my ($self) = @_; 1278 my ($self) = @_;
… …
1194 for (@children) { 1283 for (@children) {
1195 delete $_->{parent}; 1284 delete $_->{parent};
1196 $_->hide; 1285 $_->hide;
1197 } 1286 }
1198 1287
1199 $self->check_size (1); 1288 $self->realloc;
1200 $self->update;
1201} 1289}
1202 1290
1203sub get_wh { 1291sub get_wh {
1204 my ($self) = @_; 1292 my ($self) = @_;
1205 1293
… …
1301 } 1389 }
1302} 1390}
1303 1391
1304############################################################################# 1392#############################################################################
1305 1393
1306package CFClient::UI::HBox; 1394package CFClient::UI::Box;
1307
1308# TODO: wrap into common Box base class
1309 1395
1310our @ISA = CFClient::UI::Container::; 1396our @ISA = CFClient::UI::Container::;
1311 1397
1312sub size_request { 1398sub size_request {
1313 my ($self) = @_; 1399 my ($self) = @_;
1314 1400
1315 my @alloc = map [$_->size_request], @{$self->{children}}; 1401 $self->{vertical}
1316 1402 ? (
1317 ( 1403 (List::Util::max map $_->{req_w}, @{$self->{children}}),
1318 (List::Util::sum map $_->[0], @alloc), 1404 (List::Util::sum map $_->{req_h}, @{$self->{children}}),
1319 (List::Util::max map $_->[1], @alloc), 1405 )
1320 ) 1406 : (
1407 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1408 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1409 )
1321} 1410}
1322 1411
1323sub size_allocate { 1412sub size_allocate {
1324 my ($self, $w, $h) = @_; 1413 my ($self, $w, $h) = @_;
1325 1414
1326 ($h, $w) = ($w, $h); 1415 my $space = $self->{vertical} ? $h : $w;
1327
1328 my $children = $self->{children}; 1416 my $children = $self->{children};
1329 1417
1330 my @h = map $_->{req_w}, @$children; 1418 my @req;
1331 1419
1332 my $req_h = List::Util::sum @h; 1420 if ($self->{homogeneous}) {
1333 1421 @req = ($space / (@$children || 1)) x @$children;
1334 if ($req_h > $h) {
1335 # ah well, not enough space
1336 $_ *= $h / $req_h for @h;
1337 } 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 {
1338 my $exp = List::Util::sum map $_->{expand}, @$children; 1430 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1339 $exp ||= 1;
1340 1431
1432 $space = ($space - $req) / $expand; # remaining space to give away
1433
1434 $req[$_] += $space * $children->[$_]{expand}
1341 for (0 .. $#$children) { 1435 for 0 .. $#$children;
1342 my $child = $children->[$_];
1343
1344 my $alloc_h = $h[$_];
1345 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1346 $h[$_] = $alloc_h;
1347 } 1436 }
1348 } 1437 }
1349 1438
1350 CFClient::UI::harmonize \@h; 1439 CFClient::UI::harmonize \@req;
1351 1440
1352 my $y = 0; 1441 my $pos = 0;
1353 for (0 .. $#$children) { 1442 for (0 .. $#$children) {
1354 my $child = $children->[$_];
1355 my $h = $h[$_]; 1443 my $alloc = $req[$_];
1356 $child->configure ($y, 0, $h, $w); 1444 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1357 1445
1358 $y += $h; 1446 $pos += $alloc;
1359 } 1447 }
1360 1448
1361 1 1449 1
1362} 1450}
1363 1451
1364############################################################################# 1452#############################################################################
1365 1453
1454package CFClient::UI::HBox;
1455
1456our @ISA = CFClient::UI::Box::;
1457
1458sub new {
1459 my $class = shift;
1460
1461 $class->SUPER::new (
1462 vertical => 0,
1463 @_,
1464 )
1465}
1466
1467#############################################################################
1468
1366package CFClient::UI::VBox; 1469package CFClient::UI::VBox;
1367 1470
1368# TODO: wrap into common Box base class
1369
1370our @ISA = CFClient::UI::Container::; 1471our @ISA = CFClient::UI::Box::;
1371 1472
1372sub size_request { 1473sub new {
1373 my ($self) = @_; 1474 my $class = shift;
1374 1475
1375 my @alloc = map [$_->size_request], @{$self->{children}}; 1476 $class->SUPER::new (
1376 1477 vertical => 1,
1377 ( 1478 @_,
1378 (List::Util::max map $_->[0], @alloc),
1379 (List::Util::sum map $_->[1], @alloc),
1380 ) 1479 )
1381}
1382
1383sub size_allocate {
1384 my ($self, $w, $h) = @_;
1385
1386 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1387
1388 my $children = $self->{children};
1389
1390 my @h = map $_->{req_h}, @$children;
1391
1392 my $req_h = List::Util::sum @h;
1393
1394 if ($req_h > $h) {
1395 # ah well, not enough space
1396 $_ *= $h / $req_h for @h;
1397 } else {
1398 my $exp = List::Util::sum map $_->{expand}, @$children;
1399 $exp ||= 1;
1400
1401 for (0 .. $#$children) {
1402 my $child = $children->[$_];
1403
1404 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1405 }
1406 }
1407
1408 CFClient::UI::harmonize \@h;
1409
1410 my $y = 0;
1411 for (0 .. $#$children) {
1412 my $child = $children->[$_];
1413 my $h = $h[$_];
1414 $child->configure (0, $y, $w, $h);
1415
1416 $y += $h;
1417 }
1418
1419 1
1420} 1480}
1421 1481
1422############################################################################# 1482#############################################################################
1423 1483
1424package CFClient::UI::Label; 1484package CFClient::UI::Label;
… …
1441 ellipsise => 3, # end 1501 ellipsise => 3, # end
1442 layout => (new CFClient::Layout), 1502 layout => (new CFClient::Layout),
1443 fontsize => 1, 1503 fontsize => 1,
1444 align => -1, 1504 align => -1,
1445 valign => -1, 1505 valign => -1,
1446 padding => 2, 1506 padding_x => 2,
1507 padding_y => 2,
1447 can_events => 0, 1508 can_events => 0,
1448 %arg 1509 %arg
1449 ); 1510 );
1450 1511
1451 if (exists $self->{template}) { 1512 if (exists $self->{template}) {
… …
1478 1539
1479 delete $self->{texture}; 1540 delete $self->{texture};
1480 $self->SUPER::update; 1541 $self->SUPER::update;
1481} 1542}
1482 1543
1544sub realloc {
1545 my ($self) = @_;
1546
1547 delete $self->{ox};
1548 $self->SUPER::realloc;
1549}
1550
1483sub set_text { 1551sub set_text {
1484 my ($self, $text) = @_; 1552 my ($self, $text) = @_;
1485 1553
1486 return if $self->{text} eq "T$text"; 1554 return if $self->{text} eq "T$text";
1487 $self->{text} = "T$text"; 1555 $self->{text} = "T$text";
1488 1556
1489 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1557 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1490 $self->{layout}->set_text ($text); 1558 $self->{layout}->set_text ($text);
1559 delete $self->{req_h};
1491 1560
1561 $self->realloc;
1492 $self->update; 1562 $self->update;
1493 $self->check_size;
1494} 1563}
1495 1564
1496sub set_markup { 1565sub set_markup {
1497 my ($self, $markup) = @_; 1566 my ($self, $markup) = @_;
1498 1567
… …
1501 1570
1502 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1571 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1503 1572
1504 $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;
1505 $self->{layout}->set_markup ($markup); 1574 $self->{layout}->set_markup ($markup);
1575 delete $self->{req_h};
1506 1576
1577 $self->realloc;
1507 $self->update; 1578 $self->update;
1508 $self->check_size;
1509} 1579}
1510 1580
1511sub size_request { 1581sub size_request {
1512 my ($self) = @_; 1582 my ($self) = @_;
1513 1583
1584 if (exists $self->{req_h}) {
1585 @$self{qw(req_w req_h)}
1586 } else {
1514 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1587 $self->{layout}->set_font ($self->{font}) if $self->{font};
1515 $self->{layout}->set_width ($self->{max_w} || -1); 1588 $self->{layout}->set_width ($self->{max_w} || -1);
1516 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1589 $self->{layout}->set_ellipsise ($self->{ellipsise});
1517 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1590 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1518 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1591 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1519 1592
1520 my ($w, $h) = $self->{layout}->size; 1593 my ($w, $h) = $self->{layout}->size;
1521 1594
1522 if (exists $self->{template}) { 1595 if (exists $self->{template}) {
1523 $self->{template}->set_font ($self->{font}) if $self->{font}; 1596 $self->{template}->set_font ($self->{font}) if $self->{font};
1524 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1597 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1525 1598
1526 my ($w2, $h2) = $self->{template}->size; 1599 my ($w2, $h2) = $self->{template}->size;
1527 1600
1528 $w = List::Util::max $w, $w2; 1601 $w = List::Util::max $w, $w2;
1529 $h = List::Util::max $h, $h2; 1602 $h = List::Util::max $h, $h2;
1530 } 1603 }
1531 1604
1605 ($w, $h)
1532 ( 1606 }
1533 $w + $self->{padding} * 2,
1534 $h + $self->{padding} * 2,
1535 )
1536} 1607}
1537 1608
1538sub size_allocate { 1609sub size_allocate {
1539 my ($self, $w, $h) = @_; 1610 my ($self, $w, $h) = @_;
1540 1611
1612 delete $self->{ox};
1613
1541 delete $self->{texture}; 1614 delete $self->{texture}
1615 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1542} 1616}
1543 1617
1544sub set_fontsize { 1618sub set_fontsize {
1545 my ($self, $fontsize) = @_; 1619 my ($self, $fontsize) = @_;
1546 1620
1547 $self->{fontsize} = $fontsize; 1621 $self->{fontsize} = $fontsize;
1548 delete $self->{texture}; 1622 delete $self->{texture};
1549 1623
1550 $self->update; 1624 $self->realloc;
1551 $self->check_size;
1552} 1625}
1553 1626
1554sub _draw { 1627sub _draw {
1555 my ($self) = @_; 1628 my ($self) = @_;
1556 1629
… …
1562 $self->{layout}->set_width ($self->{w}); 1635 $self->{layout}->set_width ($self->{w});
1563 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1636 $self->{layout}->set_ellipsise ($self->{ellipsise});
1564 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1637 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1565 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1638 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1566 1639
1567 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1640 new_from_layout CFClient::Texture $self->{layout}
1641 };
1568 1642
1643 unless (exists $self->{ox}) {
1569 $self->{ox} = int ($self->{align} < 0 ? $self->{padding} 1644 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1570 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1645 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1571 : ($self->{w} - $tex->{w}) * 0.5); 1646 : ($self->{w} - $tex->{w}) * 0.5);
1572 1647
1573 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding} 1648 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1574 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding} 1649 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1575 : ($self->{h} - $tex->{h}) * 0.5); 1650 : ($self->{h} - $tex->{h}) * 0.5);
1576
1577 $tex
1578 }; 1651 };
1579 1652
1580 glEnable GL_TEXTURE_2D; 1653 glEnable GL_TEXTURE_2D;
1581 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1654 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1582 1655
… …
1620 1693
1621 delete $self->{cur_h}; 1694 delete $self->{cur_h};
1622 1695
1623 return if $self->{text} eq $text; 1696 return if $self->{text} eq $text;
1624 1697
1625 delete $self->{texture};
1626
1627 $self->{last_activity} = $::NOW; 1698 $self->{last_activity} = $::NOW;
1628 $self->{text} = $text; 1699 $self->{text} = $text;
1629 1700
1630 $text =~ s/./*/g if $self->{hidden}; 1701 $text =~ s/./*/g if $self->{hidden};
1631 $self->{layout}->set_text ("$text "); 1702 $self->{layout}->set_text ("$text ");
1703 delete $self->{req_h};
1632 1704
1633 $self->_emit (changed => $self->{text}); 1705 $self->_emit (changed => $self->{text});
1706
1707 $self->realloc;
1708 $self->update;
1634} 1709}
1635 1710
1636sub set_text { 1711sub set_text {
1637 my ($self, $text) = @_; 1712 my ($self, $text) = @_;
1638 1713
1639 $self->{cursor} = length $text; 1714 $self->{cursor} = length $text;
1640 $self->_set_text ($text); 1715 $self->_set_text ($text);
1641 $self->update;
1642 $self->check_size;
1643} 1716}
1644 1717
1645sub get_text { 1718sub get_text {
1646 $_[0]{text} 1719 $_[0]{text}
1647} 1720}
… …
1677 $self->{cursor} = length $text; 1750 $self->{cursor} = length $text;
1678 } elsif ($uni == 27) { 1751 } elsif ($uni == 27) {
1679 $self->_emit ('escape'); 1752 $self->_emit ('escape');
1680 } elsif ($uni) { 1753 } elsif ($uni) {
1681 substr $text, $self->{cursor}++, 0, chr $uni; 1754 substr $text, $self->{cursor}++, 0, chr $uni;
1755 } else {
1756 return 0;
1682 } 1757 }
1683 1758
1684 $self->_set_text ($text); 1759 $self->_set_text ($text);
1685 $self->update; 1760
1686 $self->check_size; 1761 $self->realloc;
1762
1763 1
1687} 1764}
1688 1765
1689sub focus_in { 1766sub focus_in {
1690 my ($self) = @_; 1767 my ($self) = @_;
1691 1768
… …
1706 utf8::encode $text; 1783 utf8::encode $text;
1707 $self->{cursor} = length substr $text, 0, $idx; 1784 $self->{cursor} = length substr $text, 0, $idx;
1708 1785
1709 $self->_set_text ($self->{text}); 1786 $self->_set_text ($self->{text});
1710 $self->update; 1787 $self->update;
1788
1789 1
1711} 1790}
1712 1791
1713sub mouse_motion { 1792sub mouse_motion {
1714 my ($self, $ev, $x, $y) = @_; 1793 my ($self, $ev, $x, $y) = @_;
1715# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 1794# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1795
1796 0
1716} 1797}
1717 1798
1718sub _draw { 1799sub _draw {
1719 my ($self) = @_; 1800 my ($self) = @_;
1720 1801
1721 local $self->{fg} = $self->{fg}; 1802 local $self->{fg} = $self->{fg};
1722 1803
1723 if ($FOCUS == $self) { 1804 if ($FOCUS == $self) {
1724 glColor @{$self->{active_bg}}; 1805 glColor_premultiply @{$self->{active_bg}};
1725 $self->{fg} = $self->{active_fg}; 1806 $self->{fg} = $self->{active_fg};
1726 } else { 1807 } else {
1727 glColor @{$self->{bg}}; 1808 glColor_premultiply @{$self->{bg}};
1728 } 1809 }
1729 1810
1730 glEnable GL_BLEND; 1811 glEnable GL_BLEND;
1731 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1812 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1732 glBegin GL_QUADS; 1813 glBegin GL_QUADS;
1733 glVertex 0 , 0; 1814 glVertex 0 , 0;
1734 glVertex 0 , $self->{h}; 1815 glVertex 0 , $self->{h};
1735 glVertex $self->{w}, $self->{h}; 1816 glVertex $self->{w}, $self->{h};
1736 glVertex $self->{w}, 0; 1817 glVertex $self->{w}, 0;
… …
1797 } else { 1878 } else {
1798 $self->set_text ($self->{history_saveback}); 1879 $self->set_text ($self->{history_saveback});
1799 } 1880 }
1800 1881
1801 } else { 1882 } else {
1802 $self->SUPER::key_down ($ev); 1883 return $self->SUPER::key_down ($ev)
1884 }
1885
1803 } 1886 1
1804
1805} 1887}
1806 1888
1807############################################################################# 1889#############################################################################
1808 1890
1809package CFClient::UI::Button; 1891package CFClient::UI::Button;
… …
1818 1900
1819sub new { 1901sub new {
1820 my $class = shift; 1902 my $class = shift;
1821 1903
1822 $class->SUPER::new ( 1904 $class->SUPER::new (
1823 padding => 4, 1905 padding_x => 4,
1906 padding_y => 4,
1824 fg => [1, 1, 1], 1907 fg => [1, 1, 1],
1825 active_fg => [0, 0, 1], 1908 active_fg => [0, 0, 1],
1826 can_hover => 1, 1909 can_hover => 1,
1827 align => 0, 1910 align => 0,
1828 valign => 0, 1911 valign => 0,
… …
1837 my ($self, $ev, $x, $y) = @_; 1920 my ($self, $ev, $x, $y) = @_;
1838 1921
1839 $self->emit ("activate") 1922 $self->emit ("activate")
1840 if $x >= 0 && $x < $self->{w} 1923 if $x >= 0 && $x < $self->{w}
1841 && $y >= 0 && $y < $self->{h}; 1924 && $y >= 0 && $y < $self->{h};
1925
1926 1
1842} 1927}
1843 1928
1844sub _draw { 1929sub _draw {
1845 my ($self) = @_; 1930 my ($self) = @_;
1846 1931
1847 local $self->{fg} = $self->{fg}; 1932 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1848
1849 if ($GRAB == $self) {
1850 $self->{fg} = $self->{active_fg};
1851 }
1852 1933
1853 glEnable GL_TEXTURE_2D; 1934 glEnable GL_TEXTURE_2D;
1854 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1935 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1855 glColor 0, 0, 0, 1; 1936 glColor 0, 0, 0, 1;
1856 1937
… …
1875 1956
1876sub new { 1957sub new {
1877 my $class = shift; 1958 my $class = shift;
1878 1959
1879 $class->SUPER::new ( 1960 $class->SUPER::new (
1880 padding => 2, 1961 padding_x => 2,
1962 padding_y => 2,
1881 fg => [1, 1, 1], 1963 fg => [1, 1, 1],
1882 active_fg => [1, 1, 0], 1964 active_fg => [1, 1, 0],
1883 bg => [0, 0, 0, 0.2], 1965 bg => [0, 0, 0, 0.2],
1884 active_bg => [1, 1, 1, 0.5], 1966 active_bg => [1, 1, 1, 0.5],
1885 state => 0, 1967 state => 0,
… …
1889} 1971}
1890 1972
1891sub size_request { 1973sub size_request {
1892 my ($self) = @_; 1974 my ($self) = @_;
1893 1975
1894 ($self->{padding} * 2 + 6) x 2 1976 (6) x 2
1895} 1977}
1896 1978
1897sub button_down { 1979sub button_down {
1898 my ($self, $ev, $x, $y) = @_; 1980 my ($self, $ev, $x, $y) = @_;
1899 1981
1900 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1982 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1901 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1983 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1902 $self->{state} = !$self->{state}; 1984 $self->{state} = !$self->{state};
1903 $self->_emit (changed => $self->{state}); 1985 $self->_emit (changed => $self->{state});
1986 } else {
1987 return 0
1988 }
1989
1904 } 1990 1
1905} 1991}
1906 1992
1907sub _draw { 1993sub _draw {
1908 my ($self) = @_; 1994 my ($self) = @_;
1909 1995
1910 $self->SUPER::_draw; 1996 $self->SUPER::_draw;
1911 1997
1912 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 1998 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1913 1999
1914 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 2000 my ($w, $h) = @$self{qw(w h)};
2001
2002 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1915 2003
1916 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 2004 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1917 2005
1918 my $tex = $self->{state} ? $tex[1] : $tex[0]; 2006 my $tex = $self->{state} ? $tex[1] : $tex[0];
1919 2007
… …
2074 2162
2075 my $h1 = $self->{h} * (1 - $ycut1); 2163 my $h1 = $self->{h} * (1 - $ycut1);
2076 my $h2 = $self->{h} * (1 - $ycut2); 2164 my $h2 = $self->{h} * (1 - $ycut2);
2077 2165
2078 glEnable GL_BLEND; 2166 glEnable GL_BLEND;
2079 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2167 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2168 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2080 glEnable GL_TEXTURE_2D; 2169 glEnable GL_TEXTURE_2D;
2081 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2170 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2082 2171
2083 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2172 glBindTexture GL_TEXTURE_2D, $t1->{name};
2084 glBegin GL_QUADS; 2173 glBegin GL_QUADS;
… …
2184 fg => [1, 1, 1], 2273 fg => [1, 1, 1],
2185 active_fg => [0, 0, 0], 2274 active_fg => [0, 0, 0],
2186 bg => [0, 0, 0, 0.2], 2275 bg => [0, 0, 0, 0.2],
2187 active_bg => [1, 1, 1, 0.5], 2276 active_bg => [1, 1, 1, 0.5],
2188 range => [0, 0, 100, 10, 0], 2277 range => [0, 0, 100, 10, 0],
2189 req_w => $::WIDTH / 80, 2278 min_w => $::WIDTH / 80,
2190 req_h => $::WIDTH / 80, 2279 min_h => $::WIDTH / 80,
2191 vertical => 0, 2280 vertical => 0,
2192 can_hover => 1, 2281 can_hover => 1,
2193 inner_pad => 0.02, 2282 inner_pad => 0.02,
2194 @_ 2283 @_
2195 ); 2284 );
… …
2198 $self->update; 2287 $self->update;
2199 2288
2200 $self 2289 $self
2201} 2290}
2202 2291
2292sub changed { }
2293
2203sub set_range { 2294sub set_range {
2204 my ($self, $range) = @_; 2295 my ($self, $range) = @_;
2205 2296
2206 ($range, $self->{range}) = ($self->{range}, $range); 2297 ($range, $self->{range}) = ($self->{range}, $range);
2207 2298
… …
2233} 2324}
2234 2325
2235sub size_request { 2326sub size_request {
2236 my ($self) = @_; 2327 my ($self) = @_;
2237 2328
2238 my $w = $self->{req_w}; 2329 ($self->{req_w}, $self->{req_h})
2239 my $h = $self->{req_h};
2240
2241 $self->{vertical} ? ($h, $w) : ($w, $h)
2242} 2330}
2243 2331
2244sub button_down { 2332sub button_down {
2245 my ($self, $ev, $x, $y) = @_; 2333 my ($self, $ev, $x, $y) = @_;
2246 2334
2247 $self->SUPER::button_down ($ev, $x, $y); 2335 $self->SUPER::button_down ($ev, $x, $y);
2248 2336
2249 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2337 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2250 2338
2251 $self->mouse_motion ($ev, $x, $y); 2339 $self->mouse_motion ($ev, $x, $y)
2252} 2340}
2253 2341
2254sub mouse_motion { 2342sub mouse_motion {
2255 my ($self, $ev, $x, $y) = @_; 2343 my ($self, $ev, $x, $y) = @_;
2256 2344
… …
2260 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2348 my (undef, $lo, $hi, $page) = @{$self->{range}};
2261 2349
2262 $x = ($x - $self->{click}[1]) / ($w * $self->{scale}); 2350 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2263 2351
2264 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo)); 2352 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2353 } else {
2354 return 0;
2355 }
2356
2265 } 2357 1
2266} 2358}
2267 2359
2268sub update { 2360sub update {
2269 my ($self) = @_; 2361 my ($self) = @_;
2270 2362
2271 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 2363 delete $self->{knob_w};
2364 $self->SUPER::update;
2365}
2366
2367sub _draw {
2368 my ($self) = @_;
2369
2370 unless ($self->{knob_w}) {
2272 $self->set_value ($self->{range}[0]); 2371 $self->set_value ($self->{range}[0]);
2273 2372
2274 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2373 my ($value, $lo, $hi, $page) = @{$self->{range}};
2275 my $range = ($hi - $page - $lo) || 1e-100; 2374 my $range = ($hi - $page - $lo) || 1e-100;
2276 2375
… …
2282 $value = ($value - $lo) / $range; 2381 $value = ($value - $lo) / $range;
2283 $value = $value * $self->{scale} + $self->{offset}; 2382 $value = $value * $self->{scale} + $self->{offset};
2284 2383
2285 $self->{knob_x} = $value - $knob_w * 0.5; 2384 $self->{knob_x} = $value - $knob_w * 0.5;
2286 $self->{knob_w} = $knob_w; 2385 $self->{knob_w} = $knob_w;
2287 }); 2386 }
2288
2289 $self->SUPER::update;
2290}
2291
2292sub _draw {
2293 my ($self) = @_;
2294 2387
2295 $self->SUPER::_draw (); 2388 $self->SUPER::_draw ();
2296 2389
2297 glScale $self->{w}, $self->{h}; 2390 glScale $self->{w}, $self->{h};
2298 2391
… …
2492 2585
2493 delete $self->{texture}; 2586 delete $self->{texture};
2494 } 2587 }
2495 2588
2496 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2589 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2497 glClearColor 0.5, 0.5, 0.5, 0; 2590 glClearColor 0, 0, 0, 0;
2498 glClear GL_COLOR_BUFFER_BIT; 2591 glClear GL_COLOR_BUFFER_BIT;
2499 2592
2500 my $top = int $self->{children}[1]{range}[0]; 2593 my $top = int $self->{children}[1]{range}[0];
2501 2594
2502 my $y0 = $top; 2595 my $y0 = $top;
… …
2537sub _draw { 2630sub _draw {
2538 my ($self) = @_; 2631 my ($self) = @_;
2539 2632
2540 glEnable GL_TEXTURE_2D; 2633 glEnable GL_TEXTURE_2D;
2541 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2634 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2542 glColor 1, 1, 1, 1; 2635 glColor 0, 0, 0, 1;
2543 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2636 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2544 glDisable GL_TEXTURE_2D; 2637 glDisable GL_TEXTURE_2D;
2545 2638
2546 $self->{children}[1]->draw; 2639 $self->{children}[1]->draw;
2547 2640
2548} 2641}
… …
2631} 2724}
2632 2725
2633sub set_tooltip_from { 2726sub set_tooltip_from {
2634 my ($self, $widget) = @_; 2727 my ($self, $widget) = @_;
2635 2728
2729 my $tooltip = $widget->{tooltip};
2730
2731 if ($ENV{CFPLUS_DEBUG} & 2) {
2732 $tooltip .= "\n\n" . (ref $widget) . "\n"
2733 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2734 . "req $widget->{req_w} $widget->{req_h}\n"
2735 . "visible $widget->{visible}";
2736 }
2737
2636 $self->add (new CFClient::UI::Label 2738 $self->add (new CFClient::UI::Label
2637 markup => $widget->{tooltip}, 2739 markup => $tooltip,
2638 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2740 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2639 fontsize => 0.8, 2741 fontsize => 0.8,
2640 fg => [0, 0, 0, 1], 2742 fg => [0, 0, 0, 1],
2641 ellipsise => 0, 2743 ellipsise => 0,
2642 font => ($widget->{tooltip_font} || $::FONT_PROP), 2744 font => ($widget->{tooltip_font} || $::FONT_PROP),
… …
2653 2755
2654sub size_allocate { 2756sub size_allocate {
2655 my ($self, $w, $h) = @_; 2757 my ($self, $w, $h) = @_;
2656 2758
2657 $self->SUPER::size_allocate ($w - 4, $h - 4); 2759 $self->SUPER::size_allocate ($w - 4, $h - 4);
2760}
2761
2762sub visibility_change {
2763 my ($self, $visible) = @_;
2764
2765 return unless $visible;
2766
2767 $self->{root}->on_post_alloc ("move_$self" => sub {
2768 my $widget = $self->{owner}
2769 or return;
2770
2771 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2772
2773 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2774 if $x + $self->{w} > $::WIDTH;
2775
2776 $self->move_abs ($x, $y);
2777 });
2658} 2778}
2659 2779
2660sub _draw { 2780sub _draw {
2661 my ($self) = @_; 2781 my ($self) = @_;
2662 2782
… …
2679 glVertex $w, $h; 2799 glVertex $w, $h;
2680 glVertex $w, 0; 2800 glVertex $w, 0;
2681 glEnd; 2801 glEnd;
2682 2802
2683 glTranslate 2 - 0.375, 2 - 0.375; 2803 glTranslate 2 - 0.375, 2 - 0.375;
2804
2684 $self->SUPER::_draw; 2805 $self->SUPER::_draw;
2685} 2806}
2686 2807
2687############################################################################# 2808#############################################################################
2688 2809
… …
2747 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 2868 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2748 2869
2749 if ($tex) { 2870 if ($tex) {
2750 glEnable GL_TEXTURE_2D; 2871 glEnable GL_TEXTURE_2D;
2751 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2872 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2752 glColor 1, 1, 1, 1; 2873 glColor 0, 0, 0, 1;
2753 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2874 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2754 glDisable GL_TEXTURE_2D; 2875 glDisable GL_TEXTURE_2D;
2755 } 2876 }
2756} 2877}
2757 2878
… …
2764 $self->SUPER::DESTROY; 2885 $self->SUPER::DESTROY;
2765} 2886}
2766 2887
2767############################################################################# 2888#############################################################################
2768 2889
2769package CFClient::UI::Inventory; 2890package CFClient::UI::Buttonbar;
2770 2891
2771our @ISA = CFClient::UI::ScrolledWindow::; 2892our @ISA = CFClient::UI::HBox::;
2772 2893
2773sub new { 2894# TODO: should actualyl wrap buttons and other goodies.
2774 my $class = shift;
2775
2776 my $self = $class->SUPER::new (
2777 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2778 @_,
2779 );
2780
2781 $self
2782}
2783
2784sub set_items {
2785 my ($self, $items) = @_;
2786
2787 $self->{scrolled}->clear;
2788 return unless $items;
2789
2790 my @items = sort {
2791 ($a->{type} <=> $b->{type})
2792 or ($a->{name} cmp $b->{name})
2793 } @$items;
2794
2795 $self->{real_items} = \@items;
2796
2797 my $row = 0;
2798 for my $item (@items) {
2799 CFClient::Item::update_widgets $item;
2800
2801 $self->{scrolled}->add (0, $row, $item->{face_widget});
2802 $self->{scrolled}->add (1, $row, $item->{desc_widget});
2803 $self->{scrolled}->add (2, $row, $item->{weight_widget});
2804
2805 $row++;
2806 }
2807}
2808
2809sub size_request {
2810 my ($self) = @_;
2811 ($self->{req_w}, $self->{req_h});
2812}
2813 2895
2814############################################################################# 2896#############################################################################
2815 2897
2816package CFClient::UI::Menu; 2898package CFClient::UI::Menu;
2817 2899
… …
2858 # maybe save $GRAB? must be careful about events... 2940 # maybe save $GRAB? must be careful about events...
2859 $GRAB = $self; 2941 $GRAB = $self;
2860 $self->{button} = $ev->{button}; 2942 $self->{button} = $ev->{button};
2861 2943
2862 $self->show; 2944 $self->show;
2863 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 2945 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2864} 2946}
2865 2947
2866sub mouse_motion { 2948sub mouse_motion {
2867 my ($self, $ev, $x, $y) = @_; 2949 my ($self, $ev, $x, $y) = @_;
2868 2950
2869 # TODO: should use vbox->find_widget or so 2951 # TODO: should use vbox->find_widget or so
2870 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 2952 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2871 $self->{hover} = $self->{item}{$HOVER}; 2953 $self->{hover} = $self->{item}{$HOVER};
2954
2955 0
2872} 2956}
2873 2957
2874sub button_up { 2958sub button_up {
2875 my ($self, $ev, $x, $y) = @_; 2959 my ($self, $ev, $x, $y) = @_;
2876 2960
… …
2878 undef $GRAB; 2962 undef $GRAB;
2879 $self->hide; 2963 $self->hide;
2880 2964
2881 $self->_emit ("popdown"); 2965 $self->_emit ("popdown");
2882 $self->{hover}[1]->() if $self->{hover}; 2966 $self->{hover}[1]->() if $self->{hover};
2967 } else {
2968 return 0
2969 }
2970
2883 } 2971 1
2884} 2972}
2885 2973
2886############################################################################# 2974#############################################################################
2887 2975
2888package CFClient::UI::Statusbox; 2976package CFClient::UI::Multiplexer;
2889 2977
2890our @ISA = CFClient::UI::VBox::; 2978our @ISA = CFClient::UI::Container::;
2891 2979
2892sub new { 2980sub new {
2893 my $class = shift; 2981 my $class = shift;
2894 2982
2895 $class->SUPER::new ( 2983 my $self = $class->SUPER::new (
2984 @_,
2985 );
2986
2987 $self->{current} = $self->{children}[0]
2988 if @{ $self->{children} };
2989
2990 $self
2991}
2992
2993sub add {
2994 my ($self, @widgets) = @_;
2995
2996 $self->SUPER::add (@widgets);
2997
2998 $self->{current} = $self->{children}[0]
2999 if @{ $self->{children} };
3000}
3001
3002sub set_current_page {
3003 my ($self, $page_or_widget) = @_;
3004
3005 my $widget = ref $page_or_widget
3006 ? $page_or_widget
3007 : $self->{children}[$page_or_widget];
3008
3009 $self->{current} = $widget;
3010 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3011
3012 $self->_emit (page_changed => $self->{current});
3013
3014 $self->realloc;
3015}
3016
3017sub visible_children {
3018 $_[0]{current}
3019}
3020
3021sub size_request {
3022 my ($self) = @_;
3023
3024 $self->{current}->size_request
3025}
3026
3027sub size_allocate {
3028 my ($self, $w, $h) = @_;
3029
3030 $self->{current}->configure (0, 0, $w, $h);
3031}
3032
3033sub _draw {
3034 my ($self) = @_;
3035
3036 $self->{current}->draw;
3037}
3038
3039#############################################################################
3040
3041package CFClient::UI::Notebook;
3042
3043our @ISA = CFClient::UI::VBox::;
3044
3045sub new {
3046 my $class = shift;
3047
3048 my $self = $class->SUPER::new (
3049 buttonbar => (new CFClient::UI::Buttonbar),
3050 multiplexer => (new CFClient::UI::Multiplexer expand => 1),
3051 # filter => # will be put between multiplexer and $self
3052 @_,
3053 );
3054
3055 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3056 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3057
3058 $self
3059}
3060
3061sub add {
3062 my ($self, $title, $widget, $tooltip) = @_;
3063
3064 Scalar::Util::weaken $self;
3065
3066 $self->{buttonbar}->add (new CFClient::UI::Button
3067 markup => $title,
3068 tooltip => $tooltip,
3069 on_activate => sub { $self->set_current_page ($widget) },
3070 );
3071
3072 $self->{multiplexer}->add ($widget);
3073}
3074
3075sub set_current_page {
3076 my ($self, $page) = @_;
3077
3078 $self->{multiplexer}->set_current_page ($page);
3079 $self->_emit (page_changed => $self->{multiplexer}{current});
3080}
3081
3082#############################################################################
3083
3084package CFClient::UI::Statusbox;
3085
3086our @ISA = CFClient::UI::VBox::;
3087
3088sub new {
3089 my $class = shift;
3090
3091 my $self = $class->SUPER::new (
2896 fontsize => 0.8, 3092 fontsize => 0.8,
2897 @_, 3093 @_,
2898 ) 3094 );
3095
3096 Scalar::Util::weaken (my $this = $self);
3097
3098 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3099
3100 $self
2899} 3101}
2900 3102
2901sub reorder { 3103sub reorder {
2902 my ($self) = @_; 3104 my ($self) = @_;
2903 my $NOW = time; 3105 my $NOW = Time::HiRes::time;
3106
3107 # freeze display when hovering over any label
3108 return if $CFClient::UI::TOOLTIP->{owner}
3109 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},
3110 values %{ $self->{item} };
2904 3111
2905 while (my ($k, $v) = each %{ $self->{item} }) { 3112 while (my ($k, $v) = each %{ $self->{item} }) {
2906 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3113 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2907 } 3114 }
2908 3115
… …
2911 my @items = sort { 3118 my @items = sort {
2912 $a->{pri} <=> $b->{pri} 3119 $a->{pri} <=> $b->{pri}
2913 or $b->{id} <=> $a->{id} 3120 or $b->{id} <=> $a->{id}
2914 } values %{ $self->{item} }; 3121 } values %{ $self->{item} };
2915 3122
3123 $self->{timer}->interval (1);
3124
2916 my $count = 10 + 1; 3125 my $count = 10 + 1;
2917 for my $item (@items) { 3126 for my $item (@items) {
2918 last unless --$count; 3127 last unless --$count;
2919 3128
2920 push @widgets, $item->{label} ||= do { 3129 my $label = $item->{label} ||= do {
2921 # TODO: doesn't handle markup well (read as: at all) 3130 # TODO: doesn't handle markup well (read as: at all)
2922 my $short = $item->{count} > 1 3131 my $short = $item->{count} > 1
2923 ? "<b>$item->{count} ×</b> $item->{text}" 3132 ? "<b>$item->{count} ×</b> $item->{text}"
2924 : $item->{text}; 3133 : $item->{text};
2925 3134
… …
2933 tooltip => $item->{tooltip}, 3142 tooltip => $item->{tooltip},
2934 tooltip_font => $::FONT_PROP, 3143 tooltip_font => $::FONT_PROP,
2935 tooltip_width => 0.67, 3144 tooltip_width => 0.67,
2936 fontsize => $item->{fontsize} || $self->{fontsize}, 3145 fontsize => $item->{fontsize} || $self->{fontsize},
2937 max_w => $::WIDTH * 0.44, 3146 max_w => $::WIDTH * 0.44,
2938 fg => $item->{fg}, 3147 fg => [@{ $item->{fg} }],
2939 can_events => 1, 3148 can_events => 1,
2940 can_hover => 1 3149 can_hover => 1
2941 }; 3150 };
3151
3152 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3153 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3154 $label->update;
3155 $label->set_max_size (undef, $label->{req_h} * $diff)
3156 if $diff < 1;
3157 $self->{timer}->interval (1/30);
3158 } else {
3159 $label->{fg}[3] = $item->{fg}[3] || 1;
3160 }
3161
3162 push @widgets, $label;
2942 } 3163 }
2943 3164
2944 $self->clear; 3165 $self->clear;
2945 $self->SUPER::add (reverse @widgets); 3166 $self->SUPER::add (reverse @widgets);
2946} 3167}
… …
2951 $text =~ s/^\s+//; 3172 $text =~ s/^\s+//;
2952 $text =~ s/\s+$//; 3173 $text =~ s/\s+$//;
2953 3174
2954 return unless $text; 3175 return unless $text;
2955 3176
2956 my $timeout = time + ((delete $arg{timeout}) || 60); 3177 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
2957 3178
2958 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3179 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2959 3180
2960 if (my $item = $self->{item}{$group}) { 3181 if (my $item = $self->{item}{$group}) {
2961 if ($item->{text} eq $text) { 3182 if ($item->{text} eq $text) {
… …
2991 3212
2992 $self->reorder; 3213 $self->reorder;
2993 $self->SUPER::reconfigure; 3214 $self->SUPER::reconfigure;
2994} 3215}
2995 3216
3217sub DESTROY {
3218 my ($self) = @_;
3219
3220 $self->{timer}->cancel;
3221
3222 $self->SUPER::DESTROY;
3223}
3224
2996############################################################################# 3225#############################################################################
2997 3226
2998package CFClient::UI::Root; 3227package CFClient::UI::Inventory;
2999 3228
3000our @ISA = CFClient::UI::Container::; 3229our @ISA = CFClient::UI::ScrolledWindow::;
3001
3002use CFClient::OpenGL;
3003 3230
3004sub new { 3231sub new {
3005 my $class = shift; 3232 my $class = shift;
3006 3233
3007 $class->SUPER::new ( 3234 my $self = $class->SUPER::new (
3235 child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3236 @_,
3237 );
3238
3239 $self
3240}
3241
3242sub set_items {
3243 my ($self, $items) = @_;
3244
3245 $self->{child}->clear;
3246 return unless $items;
3247
3248 my @items = sort {
3249 ($a->{type} <=> $b->{type})
3250 or ($a->{name} cmp $b->{name})
3251 } @$items;
3252
3253 $self->{real_items} = \@items;
3254
3255 my $row = 0;
3256 for my $item (@items) {
3257 CFClient::Item::update_widgets $item;
3258
3259 $self->{child}->add (0, $row, $item->{face_widget});
3260 $self->{child}->add (1, $row, $item->{desc_widget});
3261 $self->{child}->add (2, $row, $item->{weight_widget});
3262
3263 $row++;
3264 }
3265}
3266
3267#############################################################################
3268
3269package CFClient::UI::BindEditor;
3270
3271our @ISA = CFClient::UI::FancyFrame::;
3272
3273sub new {
3274 my $class = shift;
3275
3276 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3277
3278 $self->add (my $vb = new CFClient::UI::VBox);
3279
3280
3281 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3282 text => "start recording",
3283 tooltip => "Start/Stops recording of actions."
3284 ."All subsequent actions after the recording started will be captured."
3285 ."The actions are displayed after the record was stopped."
3286 ."To bind the action you have to click on the 'Bind' button",
3287 on_activate => sub {
3288 unless ($self->{recording}) {
3289 $self->start;
3290 } else {
3291 $self->stop;
3292 }
3293 });
3294
3295 $vb->add (new CFClient::UI::Label text => "Actions:");
3296 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3297
3298 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3299 $vb->add (my $hb = new CFClient::UI::HBox);
3300 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3301 $hb->add (new CFClient::UI::Button
3302 text => "bind",
3303 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3304 on_activate => sub {
3305 $self->ask_for_bind;
3306 });
3307
3308 $vb->add (my $hb = new CFClient::UI::HBox);
3309 $hb->add (new CFClient::UI::Button
3310 text => "ok",
3311 expand => 1,
3312 tooltip => "This closes the binding editor and saves the binding",
3313 on_activate => sub {
3314 $self->hide;
3315 $self->commit;
3316 });
3317
3318 $hb->add (new CFClient::UI::Button
3319 text => "cancel",
3320 expand => 1,
3321 tooltip => "This closes the binding editor without saving",
3322 on_activate => sub {
3323 $self->hide;
3324 $self->{binding_cancel}->()
3325 if $self->{binding_cancel};
3326 });
3327
3328 $self->update_binding_widgets;
3329
3330 $self
3331}
3332
3333sub commit {
3334 my ($self) = @_;
3335 my ($mod, $sym, $cmds) = $self->get_binding;
3336 if ($sym != 0 && @$cmds > 0) {
3337 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3338 ."'. Don't forget 'Save Config'!");
3339 $self->{binding_change}->($mod, $sym, $cmds)
3340 if $self->{binding_change};
3341 } else {
3342 $::STATUSBOX->add ("No action bound, no key or action specified!");
3343 $self->{binding_cancel}->()
3344 if $self->{binding_cancel};
3345 }
3346}
3347
3348sub start {
3349 my ($self) = @_;
3350
3351 $self->{rec_btn}->set_text ("stop recording");
3352 $self->{recording} = 1;
3353 $self->clear_command_list;
3354 $::CONN->start_record if $::CONN;
3355}
3356
3357sub stop {
3358 my ($self) = @_;
3359
3360 $self->{rec_btn}->set_text ("start recording");
3361 $self->{recording} = 0;
3362
3363 my $rec;
3364 $rec = $::CONN->stop_record if $::CONN;
3365 return unless ref $rec eq 'ARRAY';
3366 $self->set_command_list ($rec);
3367}
3368
3369
3370sub ask_for_bind_and_commit {
3371 my ($self) = @_;
3372 $self->ask_for_bind (1);
3373}
3374
3375sub ask_for_bind {
3376 my ($self, $commit) = @_;
3377
3378 CFClient::Binder::open_binding_dialog (sub {
3379 my ($mod, $sym) = @_;
3380 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3381 $self->update_binding_widgets;
3382 $self->commit if $commit;
3383 });
3384}
3385
3386# $mod and $sym are the modifiers and key symbol
3387# $cmds is a array ref of strings (the commands)
3388# $cb is the callback that is executed on OK
3389# $ccb is the callback that is executed on CANCEL and
3390# when the binding was unsuccessful on OK
3391sub set_binding {
3392 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3393
3394 $self->clear_command_list;
3395 $self->{recording} = 0;
3396 $self->{rec_btn}->set_text ("start recording");
3397
3398 $self->{binding} = [$mod, $sym];
3399 $self->{commands} = $cmds;
3400
3401 $self->{binding_change} = $cb;
3402 $self->{binding_cancel} = $ccb;
3403
3404 $self->update_binding_widgets;
3405}
3406
3407# this is a shortcut method that asks for a binding
3408# and then just binds it.
3409sub do_quick_binding {
3410 my ($self, $cmds) = @_;
3411 $self->set_binding (undef, undef, $cmds, sub {
3412 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3413 });
3414 $self->ask_for_bind (1);
3415}
3416
3417sub update_binding_widgets {
3418 my ($self) = @_;
3419 my ($mod, $sym, $cmds) = $self->get_binding;
3420 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3421 $self->set_command_list ($cmds);
3422}
3423
3424sub get_binding {
3425 my ($self) = @_;
3426 return (
3427 $self->{binding}->[0],
3428 $self->{binding}->[1],
3429 [ grep { defined $_ } @{$self->{commands}} ]
3430 );
3431}
3432
3433sub clear_command_list {
3434 my ($self) = @_;
3435 $self->{cmdbox}->clear ();
3436}
3437
3438sub set_command_list {
3439 my ($self, $cmds) = @_;
3440
3441 $self->{cmdbox}->clear ();
3442 $self->{commands} = $cmds;
3443
3444 my $idx = 0;
3445
3446 for (@$cmds) {
3447 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3448
3449 my $i = $idx;
3450 $hb->add (new CFClient::UI::Label text => $_);
3451 $hb->add (new CFClient::UI::Button
3452 text => "delete",
3453 tooltip => "Deletes the action from the record",
3454 on_activate => sub {
3455 $self->{cmdbox}->remove ($hb);
3456 $cmds->[$i] = undef;
3457 });
3458
3459
3460 $idx++
3461 }
3462}
3463
3464#############################################################################
3465
3466package CFClient::UI::SpellList;
3467
3468our @ISA = CFClient::UI::Table::;
3469
3470sub new {
3471 my $class = shift;
3472
3473 my $self = $class->SUPER::new (
3474 binding => [],
3475 commands => [],
3476 @_,
3477 )
3478}
3479
3480# XXX: Do sorting? Argl...
3481sub add_spell {
3482 my ($self, $spell) = @_;
3483 $self->{spells}->{$spell->{name}} = $spell;
3484
3485 $self->add (0, $self->{tbl_idx}, new CFClient::UI::Face
3486 face => $spell->{face},
3487 can_hover => 1,
3488 can_events => 1,
3489 tooltip => $spell->{message});
3490
3491 $self->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3492 text => $spell->{name},
3493 can_hover => 1,
3494 can_events => 1,
3495 tooltip => $spell->{message},
3496 expand => 1);
3497
3498 $self->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3499 text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3500 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3501 expand => 1);
3502
3503 $self->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3504 text => "bind to key",
3505 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3506}
3507
3508sub rebuild_spell_list {
3509 my ($self) = @_;
3510 $self->{tbl_idx} = 0;
3511 $self->add_spell ($_) for values %{$self->{spells}};
3512}
3513
3514sub remove_spell {
3515 my ($self, $spell) = @_;
3516 delete $self->{spells}->{$spell->{name}};
3517 $self->rebuild_spell_list;
3518}
3519
3520#############################################################################
3521
3522package CFClient::UI::Root;
3523
3524our @ISA = CFClient::UI::Container::;
3525
3526use List::Util qw(min max);
3527
3528use CFClient::OpenGL;
3529
3530sub new {
3531 my $class = shift;
3532
3533 my $self = $class->SUPER::new (
3008 visible => 1, 3534 visible => 1,
3009 @_, 3535 @_,
3010 ) 3536 );
3011}
3012 3537
3013sub configure { 3538 Scalar::Util::weaken ($self->{root} = $self);
3014 my ($self, $x, $y, $w, $h) = @_;
3015 3539
3016 $self->{w} = $w; 3540 $self
3017 $self->{h} = $h;
3018}
3019
3020sub check_size {
3021 my ($self) = @_;
3022
3023 $self->size_allocate ($self->{w}, $self->{h})
3024 if $self->{w};
3025} 3541}
3026 3542
3027sub size_request { 3543sub size_request {
3028 my ($self) = @_; 3544 my ($self) = @_;
3029 3545
3030 ($self->{w}, $self->{h}) 3546 ($self->{w}, $self->{h})
3547}
3548
3549sub _to_pixel {
3550 my ($coord, $size, $max) = @_;
3551
3552 $coord =
3553 $coord eq "center" ? ($max - $size) * 0.5
3554 : $coord eq "max" ? $max
3555 : $coord;
3556
3557 $coord = 0 if $coord < 0;
3558 $coord = $max - $size if $coord > $max - $size;
3559
3560 int $coord + 0.5
3031} 3561}
3032 3562
3033sub size_allocate { 3563sub size_allocate {
3034 my ($self, $w, $h) = @_; 3564 my ($self, $w, $h) = @_;
3035 3565
3036 for my $child ($self->children) { 3566 for my $child ($self->children) {
3037 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3567 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3038 3568
3039 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 3569 $X = $child->{force_x} if exists $child->{force_x};
3040 if exists $child->{req_x}; 3570 $Y = $child->{force_y} if exists $child->{force_y};
3041 3571
3042 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1 3572 $X = _to_pixel $X, $W, $self->{w};
3043 if exists $child->{req_y}; 3573 $Y = _to_pixel $Y, $H, $self->{h};
3044
3045 $X = $self->{user_x} if exists $self->{user_x};
3046 $Y = $self->{user_y} if exists $self->{user_y};
3047
3048 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
3049 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
3050 3574
3051 $child->configure ($X, $Y, $W, $H); 3575 $child->configure ($X, $Y, $W, $H);
3052 } 3576 }
3053} 3577}
3054 3578
… …
3065} 3589}
3066 3590
3067sub update { 3591sub update {
3068 my ($self) = @_; 3592 my ($self) = @_;
3069 3593
3070 $self->check_size;
3071 $::WANT_REFRESH++; 3594 $::WANT_REFRESH++;
3072} 3595}
3073 3596
3074sub add { 3597sub add {
3075 my ($self, @children) = @_; 3598 my ($self, @children) = @_;
3076 3599
3077 for (my @widgets = @children; my $w = pop @widgets; ) {
3078 push @widgets, $w->children;
3079 $w->{root} = $self;
3080 $w->{visible} = $self->{visible} + 1;
3081 }
3082
3083 for my $child (@children) {
3084 $child->{is_toplevel} = 1; 3600 $_->{is_toplevel} = 1
3085 3601 for @children;
3086 # integerise window positions
3087 $child->{x} = int $child->{x};
3088 $child->{y} = int $child->{y};
3089 }
3090 3602
3091 $self->SUPER::add (@children); 3603 $self->SUPER::add (@children);
3092} 3604}
3093 3605
3094sub remove { 3606sub remove {
3095 my ($self, @children) = @_; 3607 my ($self, @children) = @_;
3096 3608
3097 $self->SUPER::remove (@children); 3609 $self->SUPER::remove (@children);
3610
3611 delete $self->{is_toplevel}
3612 for @children;
3098 3613
3099 while (@children) { 3614 while (@children) {
3100 my $w = pop @children; 3615 my $w = pop @children;
3101 push @children, $w->children; 3616 push @children, $w->children;
3102 $w->set_invisible; 3617 $w->set_invisible;
… …
3121 while ($self->{refresh_hook}) { 3636 while ($self->{refresh_hook}) {
3122 $_->() 3637 $_->()
3123 for values %{delete $self->{refresh_hook}}; 3638 for values %{delete $self->{refresh_hook}};
3124 } 3639 }
3125 3640
3126 if ($self->{check_size}) { 3641 if ($self->{realloc}) {
3642 my %queue;
3127 my @queue; 3643 my @queue;
3644 my $widget;
3128 3645
3129 for (;;) { 3646 outer:
3130 if ($self->{check_size}) { 3647 while () {
3131 #TODO use array-of-depth approach 3648 if (my $realloc = delete $self->{realloc}) {
3649 for $widget (values %$realloc) {
3650 $widget->{visible} or next; # do not resize invisible widgets
3132 3651
3133 @queue = sort { $a->{visible} <=> $b->{visible} } 3652 $queue{$widget+0}++ and next; # duplicates are common
3134 @queue, values %{delete $self->{check_size}}; 3653
3654 push @{ $queue[$widget->{visible}] }, $widget;
3655 }
3135 } 3656 }
3136 3657
3658 while () {
3659 @queue or last outer;
3660
3137 my $widget = pop @queue || last; 3661 $widget = pop @{ $queue[-1] || [] }
3138 3662 and last;
3139 defined $widget->{visible} or last; # do not resize invisible widgets
3140
3141 my ($w, $h) = $widget->{user_w} && $widget->{user_h}
3142 ? @$widget{qw(user_w user_h)}
3143 : $widget->size_request;
3144
3145 if (delete $widget->{force_alloc}
3146 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
3147 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
3148 3663
3664 pop @queue;
3665 }
3666
3667 delete $queue{$widget+0};
3668
3669 my ($w, $h) = $widget->size_request;
3670
3671 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3672 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3673
3674 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3675 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3676
3677 $w = $widget->{force_w} if exists $widget->{force_w};
3678 $h = $widget->{force_h} if exists $widget->{force_h};
3679
3680 if ($widget->{req_w} != $w || $widget->{req_h} != $h
3681 || delete $widget->{force_realloc}) {
3149 $widget->{req_w} = $w; 3682 $widget->{req_w} = $w;
3150 $widget->{req_h} = $h; 3683 $widget->{req_h} = $h;
3151 3684
3152 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h]; 3685 $self->{size_alloc}{$widget+0} = $widget;
3153 3686
3154 $widget->{parent}->check_size
3155 if $widget->{parent}; 3687 if (my $parent = $widget->{parent}) {
3688 $self->{realloc}{$parent+0} = $parent
3689 unless $queue{$parent+0};
3690
3691 $parent->{force_size_alloc} = 1;
3692 $self->{size_alloc}{$parent+0} = $parent;
3693 }
3156 } 3694 }
3695
3696 delete $self->{realloc}{$widget+0};
3157 } 3697 }
3158 } 3698 }
3159 3699
3160 while ($self->{size_alloc}) { 3700 while (my $size_alloc = delete $self->{size_alloc}) {
3161 for (values %{delete $self->{size_alloc}}) { 3701 my @queue = sort { $b->{visible} <=> $a->{visible} }
3162 my ($widget, $w, $h) = @$_; 3702 values %$size_alloc;
3703
3704 while () {
3705 my $widget = pop @queue || last;
3706
3707 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3163 3708
3164 $w = 0 if $w < 0; 3709 $w = 0 if $w < 0;
3165 $h = 0 if $h < 0; 3710 $h = 0 if $h < 0;
3166 3711
3712 $w = int $w + 0.5;
3713 $h = int $h + 0.5;
3714
3715 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3716 $widget->{old_w} = $widget->{w};
3717 $widget->{old_h} = $widget->{h};
3718
3167 $widget->{w} = $w; 3719 $widget->{w} = $w;
3168 $widget->{h} = $h; 3720 $widget->{h} = $h;
3721
3169 $widget->emit (size_allocate => $w, $h); 3722 $widget->emit (size_allocate => $w, $h);
3723 }
3170 } 3724 }
3171 } 3725 }
3172 3726
3173 while ($self->{post_alloc_hook}) { 3727 while ($self->{post_alloc_hook}) {
3174 $_->() 3728 $_->()
3175 for values %{delete $self->{post_alloc_hook}}; 3729 for values %{delete $self->{post_alloc_hook}};
3176 } 3730 }
3731
3177 3732
3178 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3733 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3179 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3734 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3180 glClear GL_COLOR_BUFFER_BIT; 3735 glClear GL_COLOR_BUFFER_BIT;
3181 3736
… …
3183 glLoadIdentity; 3738 glLoadIdentity;
3184 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 3739 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3185 glMatrixMode GL_MODELVIEW; 3740 glMatrixMode GL_MODELVIEW;
3186 glLoadIdentity; 3741 glLoadIdentity;
3187 3742
3743 {
3744 package CFClient::UI::Base;
3745
3746 ($draw_x, $draw_y, $draw_w, $draw_h) =
3747 (0, 0, $self->{w}, $self->{h});
3748 }
3749
3188 $self->_draw; 3750 $self->_draw;
3189} 3751}
3190 3752
3191############################################################################# 3753#############################################################################
3192 3754

Diff Legend

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