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.231 by root, Thu May 25 00:26:19 2006 UTC vs.
Revision 1.303 by elmex, Tue Jun 13 10:28:38 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;
11use CFClient::Texture;
10 12
11our ($FOCUS, $HOVER, $GRAB); # various widgets 13our ($FOCUS, $HOVER, $GRAB); # various widgets
12 14
15our $LAYOUT;
13our $ROOT; 16our $ROOT;
14our $TOOLTIP; 17our $TOOLTIP;
15our $BUTTON_STATE; 18our $BUTTON_STATE;
16 19
17our %WIDGET; # all widgets, weak-referenced 20our %WIDGET; # all widgets, weak-referenced
18 21
19sub check_tooltip { 22our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub {
20 if (!$GRAB) { 23 if (!$GRAB) {
21 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 24 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
22 if (length $widget->{tooltip}) { 25 if (length $widget->{tooltip}) {
23
24 if ($TOOLTIP->{owner} != $widget) { 26 if ($TOOLTIP->{owner} != $widget) {
27 $TOOLTIP->hide;
28
25 $TOOLTIP->{owner} = $widget; 29 $TOOLTIP->{owner} = $widget;
30
31 return if $ENV{CFPLUS_DEBUG} & 8;
26 32
27 my $tip = $widget->{tooltip}; 33 my $tip = $widget->{tooltip};
28 34
29 $tip = $tip->($widget) if CODE:: eq ref $tip; 35 $tip = $tip->($widget) if CODE:: eq ref $tip;
30 36
31 $TOOLTIP->set_tooltip_from ($widget); 37 $TOOLTIP->set_tooltip_from ($widget);
32 $TOOLTIP->show; 38 $TOOLTIP->show;
33
34 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
35
36 ($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0)
37 if $x + $TOOLTIP->{w} > $::WIDTH;
38
39 $TOOLTIP->move ($x, $y);
40 $TOOLTIP->check_size;
41 $TOOLTIP->update;
42 } 39 }
43 40
44 return; 41 return;
45 } 42 }
46 } 43 }
47 } 44 }
48 45
49 $TOOLTIP->hide; 46 $TOOLTIP->hide;
50 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;
51} 71}
52 72
53# class methods for events 73# class methods for events
54sub feed_sdl_key_down_event { 74sub feed_sdl_key_down_event {
55 $FOCUS->emit (key_down => $_[0]) 75 $FOCUS->emit (key_down => $_[0])
… …
69 my $widget = $ROOT->find_widget ($x, $y); 89 my $widget = $ROOT->find_widget ($x, $y);
70 90
71 $GRAB = $widget; 91 $GRAB = $widget;
72 $GRAB->update if $GRAB; 92 $GRAB->update if $GRAB;
73 93
74 check_tooltip; 94 $TOOLTIP_WATCHER->cb->();
75 } 95 }
76 96
77 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 97 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
78 98
79 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y)) 99 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
… …
94 if (!$BUTTON_STATE) { 114 if (!$BUTTON_STATE) {
95 my $grab = $GRAB; undef $GRAB; 115 my $grab = $GRAB; undef $GRAB;
96 $grab->update if $grab; 116 $grab->update if $grab;
97 $GRAB->update if $GRAB; 117 $GRAB->update if $GRAB;
98 118
99 check_tooltip; 119 $TOOLTIP_WATCHER->cb->();
100 } 120 }
101} 121}
102 122
103sub feed_sdl_motion_event { 123sub feed_sdl_motion_event {
104 my ($ev) = @_; 124 my ($ev) = @_;
… …
110 my $hover = $HOVER; $HOVER = $widget; 130 my $hover = $HOVER; $HOVER = $widget;
111 131
112 $hover->update if $hover && $hover->{can_hover}; 132 $hover->update if $hover && $hover->{can_hover};
113 $HOVER->update if $HOVER && $HOVER->{can_hover}; 133 $HOVER->update if $HOVER && $HOVER->{can_hover};
114 134
115 check_tooltip; 135 $TOOLTIP_WATCHER->start;
116 } 136 }
117 137
118 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y)) 138 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
119 if $HOVER; 139 if $HOVER;
120} 140}
… …
152sub rescale_widgets { 172sub rescale_widgets {
153 my ($sx, $sy) = @_; 173 my ($sx, $sy) = @_;
154 174
155 for my $widget (values %WIDGET) { 175 for my $widget (values %WIDGET) {
156 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
157 $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.]+$/;
158 $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};
159 $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};
160 $widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w};
161 $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.]+$/;
162 $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};
163 $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};
164 $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
165 } 190 }
166 } 191 }
167 192
168 reconfigure_widgets; 193 reconfigure_widgets;
169} 194}
… …
178 203
179sub new { 204sub new {
180 my $class = shift; 205 my $class = shift;
181 206
182 my $self = bless { 207 my $self = bless {
183 x => 0, 208 x => "center",
184 y => 0, 209 y => "center",
185 z => 0, 210 z => 0,
211 w => undef,
212 h => undef,
186 can_events => 1, 213 can_events => 1,
187 @_ 214 @_
188 }, $class; 215 }, $class;
189 216
217 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
218
190 for (keys %$self) { 219 for (keys %$self) {
191 if (/^connect_(.*)$/) { 220 if (/^on_(.*)$/) {
192 $self->connect ($1 => delete $self->{$_}); 221 $self->connect ($1 => delete $self->{$_});
193 } 222 }
194 } 223 }
195 224
196 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self); 225 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {
226 $self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x};
227 $self->{y} = $layout->{y} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{y};
228 $self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{w};
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};
235 }
197 236
198 $self 237 $self
199} 238}
200 239
201sub destroy { 240sub destroy {
… …
205 %$self = (); 244 %$self = ();
206} 245}
207 246
208sub show { 247sub show {
209 my ($self) = @_; 248 my ($self) = @_;
249
210 return if $self->{parent}; 250 return if $self->{parent};
211 251
212 $CFClient::UI::ROOT->add ($self); 252 $CFClient::UI::ROOT->add ($self);
213} 253}
214 254
215sub show_centered { 255sub set_visible {
216 my ($self) = @_; 256 my ($self) = @_;
257
217 return if $self->{parent}; 258 return if $self->{visible};
218 259
219 $self->show; 260 $self->{root} = $self->{parent}{root};
261 $self->{visible} = $self->{parent}{visible} + 1;
220 262
221 $CFClient::UI::ROOT->on_post_alloc ( 263 $self->emit (visibility_change => 1);
222 "centered $self" => sub { 264
223 $self->move (($::WIDTH - $self->{w}) * 0.5, ($::HEIGHT - $self->{h}) * 0.5); 265 $self->realloc if !exists $self->{req_w};
224 }, 266
225 ); 267 $_->set_visible for $self->children;
226} 268}
227 269
228sub set_invisible { 270sub set_invisible {
229 my ($self) = @_; 271 my ($self) = @_;
230 272
231 # broken show/hide model 273 return unless $self->{visible};
274
275 $_->set_invisible for $self->children;
232 276
233 delete $self->{visible}; 277 delete $self->{visible};
278 delete $self->{root};
234 279
235 undef $GRAB if $GRAB == $self; 280 undef $GRAB if $GRAB == $self;
236 undef $HOVER if $HOVER == $self; 281 undef $HOVER if $HOVER == $self;
237 282
283 $CFClient::UI::TOOLTIP_WATCHER->cb->()
284 if $TOOLTIP->{owner} == $self;
285
238 $self->focus_out; 286 $self->focus_out;
287
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;
239} 306}
240 307
241sub hide { 308sub hide {
242 my ($self) = @_; 309 my ($self) = @_;
243 310
… …
245 312
246 $self->{parent}->remove ($self) 313 $self->{parent}->remove ($self)
247 if $self->{parent}; 314 if $self->{parent};
248} 315}
249 316
250sub move { 317sub move_abs {
251 my ($self, $x, $y, $z) = @_; 318 my ($self, $x, $y, $z) = @_;
252 319
253 $self->{x} = int $x; 320 $self->{x} = List::Util::max 0, List::Util::min $self->{root}{w} - $self->{w}, int $x;
254 $self->{y} = int $y; 321 $self->{y} = List::Util::max 0, List::Util::min $self->{root}{h} - $self->{h}, int $y;
255 $self->{z} = $z if defined $z; 322 $self->{z} = $z if defined $z;
256 323
257 $self->update; 324 $self->update;
258} 325}
259 326
260sub set_size { 327sub set_size {
261 my ($self, $w, $h) = @_; 328 my ($self, $w, $h) = @_;
262 329
263 $self->{user_w} = $w; 330 $self->{force_w} = $w;
264 $self->{user_h} = $h; 331 $self->{force_h} = $h;
265 332
266 $self->check_size; 333 $self->realloc;
267} 334}
268 335
269sub size_request { 336sub size_request {
270 require Carp; 337 require Carp;
271 Carp::confess "size_request is abstract"; 338 Carp::confess "size_request is abstract";
… …
273 340
274sub configure { 341sub configure {
275 my ($self, $x, $y, $w, $h) = @_; 342 my ($self, $x, $y, $w, $h) = @_;
276 343
277 if ($self->{aspect}) { 344 if ($self->{aspect}) {
345 my ($ow, $oh) = ($w, $h);
346
278 my $w2 = List::Util::min $w, int $h * $self->{aspect}; 347 $w = List::Util::min $w, int $h * $self->{aspect};
279 my $h2 = List::Util::min $h, int $w / $self->{aspect}; 348 $h = List::Util::min $h, int $w / $self->{aspect};
280 349
281 # use alignment to adjust x, y 350 # use alignment to adjust x, y
282 351
283 $x += int +($w - $w2) * 0.5; 352 $x += int 0.5 * ($ow - $w);
284 $y += int +($h - $h2) * 0.5; 353 $y += int 0.5 * ($oh - $h);
285
286 ($w, $h) = ($w2, $h2);
287 } 354 }
288 355
289 if ($self->{x} != $x || $self->{y} != $y) { 356 if ($self->{x} ne $x || $self->{y} ne $y) {
290 $self->{x} = $x; 357 $self->{x} = $x;
291 $self->{y} = $y; 358 $self->{y} = $y;
292 $self->update; 359 $self->update;
293 } 360 }
294 361
295 if ($self->{w} != $w || $self->{h} != $h) { 362 if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
296 $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;
297 } 369 }
298} 370}
299 371
300sub size_allocate { 372sub size_allocate {
301 # nothing to be done 373 # nothing to be done
302} 374}
303 375
304sub reconfigure {
305 my ($self) = @_;
306
307 $self->check_size (1);
308 $self->update;
309}
310
311sub children { 376sub children {
377 # nop
378}
379
380sub visible_children {
381 $_[0]->children
312} 382}
313 383
314sub set_max_size { 384sub set_max_size {
315 my ($self, $w, $h) = @_; 385 my ($self, $w, $h) = @_;
316 386
317 delete $self->{max_w}; $self->{max_w} = $w if $w; 387 $self->{max_w} = int $w if defined $w;
318 delete $self->{max_h}; $self->{max_h} = $h if $h; 388 $self->{max_h} = int $h if defined $h;
389
390 $self->realloc;
319} 391}
320 392
321sub set_tooltip { 393sub set_tooltip {
322 my ($self, $tooltip) = @_; 394 my ($self, $tooltip) = @_;
323 395
396 $tooltip =~ s/^\s+//;
397 $tooltip =~ s/\s+$//;
398
399 return if $self->{tooltip} eq $tooltip;
400
324 $self->{tooltip} = $tooltip; 401 $self->{tooltip} = $tooltip;
325 402
326 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 403 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
327 delete $CFClient::UI::TOOLTIP->{owner}; 404 delete $CFClient::UI::TOOLTIP->{owner};
328 CFClient::UI::check_tooltip; 405 $CFClient::UI::TOOLTIP_WATCHER->cb->();
329 } 406 }
330} 407}
331 408
332# translate global coordinates to local coordinate system 409# translate global coordinates to local coordinate system
333sub coord2local { 410sub coord2local {
… …
370 447
371 $::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
372 unless $FOCUS; 449 unless $FOCUS;
373} 450}
374 451
375sub mouse_motion { } 452sub mouse_motion { 0 }
376sub button_up { } 453sub button_up { 0 }
377sub key_down { } 454sub key_down { 0 }
378sub key_up { } 455sub key_up { 0 }
379 456
380sub button_down { 457sub button_down {
381 my ($self, $ev, $x, $y) = @_; 458 my ($self, $ev, $x, $y) = @_;
382 459
383 $self->focus_in; 460 $self->focus_in;
384}
385 461
386sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 462 0
387sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 463}
388sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 464
389sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 465sub find_widget {
390sub 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
391 538
392sub draw { 539sub draw {
393 my ($self) = @_; 540 my ($self) = @_;
394 541
395 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);
396 553
397 glPushMatrix; 554 glPushMatrix;
398 glTranslate $self->{x}, $self->{y}, 0; 555 glTranslate $self->{x}, $self->{y}, 0;
399 $self->_draw;
400 glPopMatrix;
401 556
402 if ($self == $HOVER && $self->{can_hover}) { 557 if ($self == $HOVER && $self->{can_hover}) {
403 my ($x, $y) = @$self{qw(x y)};
404
405 glColor 1, 0.8, 0.5, 0.2; 558 glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
406 glEnable GL_BLEND; 559 glEnable GL_BLEND;
407 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 560 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
408 glBegin GL_QUADS; 561 glBegin GL_QUADS;
409 glVertex $x , $y;
410 glVertex $x + $self->{w}, $y;
411 glVertex $x + $self->{w}, $y + $self->{h};
412 glVertex $x , $y + $self->{h};
413 glEnd;
414 glDisable GL_BLEND;
415 }
416
417 if ($ENV{PCLIENT_DEBUG}) {
418 glPushMatrix;
419 glColor 1, 1, 0, 1;
420 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
421 glBegin GL_LINE_LOOP;
422 glVertex 0 , 0; 562 glVertex 0 , 0;
423 glVertex $self->{w}, 0; 563 glVertex $self->{w}, 0;
424 glVertex $self->{w}, $self->{h}; 564 glVertex $self->{w}, $self->{h};
425 glVertex 0 , $self->{h}; 565 glVertex 0 , $self->{h};
426 glEnd; 566 glEnd;
567 glDisable GL_BLEND;
568 }
569
570 if ($ENV{CFPLUS_DEBUG} & 1) {
571 glPushMatrix;
572 glColor 1, 1, 0, 1;
573 glTranslate 0.375, 0.375;
574 glBegin GL_LINE_LOOP;
575 glVertex 0 , 0;
576 glVertex $self->{w} - 1, 0;
577 glVertex $self->{w} - 1, $self->{h} - 1;
578 glVertex 0 , $self->{h} - 1;
579 glEnd;
427 glPopMatrix; 580 glPopMatrix;
428 #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;
429 } 582 }
583
584 $self->_draw;
585 glPopMatrix;
430} 586}
431 587
432sub _draw { 588sub _draw {
433 my ($self) = @_; 589 my ($self) = @_;
434 590
435 warn "no draw defined for $self\n"; 591 warn "no draw defined for $self\n";
436} 592}
437 593
438sub find_widget {
439 my ($self, $x, $y) = @_;
440
441 return () unless $self->{can_events};
442
443 return $self
444 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
445 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
446
447 ()
448}
449
450sub set_parent {
451 my ($self, $parent) = @_;
452
453 Scalar::Util::weaken ($self->{parent} = $parent);
454
455 # TODO: req_w _does_change after ->reconfigure
456 $self->check_size
457 unless exists $self->{req_w};
458
459 $self->show;
460}
461
462sub check_size {
463 my ($self, $forced) = @_;
464
465 $self->{force_alloc} = 1 if $forced;
466 $CFClient::UI::ROOT->{check_size}{$self} = $self;
467}
468
469sub update {
470 my ($self) = @_;
471
472 $self->{parent}->update
473 if $self->{parent};
474}
475
476sub connect {
477 my ($self, $signal, $cb) = @_;
478
479 push @{ $self->{signal_cb}{$signal} }, $cb;
480}
481
482sub _emit {
483 my ($self, $signal, @args) = @_;
484
485 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
486}
487
488sub emit {
489 my ($self, $signal, @args) = @_;
490
491 $self->_emit ($signal, @args)
492 || $self->$signal (@args);
493}
494
495sub DESTROY { 594sub DESTROY {
496 my ($self) = @_; 595 my ($self) = @_;
497 596
498 delete $WIDGET{$self+0}; 597 delete $WIDGET{$self+0};
499 #$self->deactivate; 598
599 eval { $self->destroy };
600 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
500} 601}
501 602
502############################################################################# 603#############################################################################
503 604
504package CFClient::UI::DrawBG; 605package CFClient::UI::DrawBG;
… …
529 630
530 if ($color && (@$color < 4 || $color->[3])) { 631 if ($color && (@$color < 4 || $color->[3])) {
531 my ($w, $h) = @$self{qw(w h)}; 632 my ($w, $h) = @$self{qw(w h)};
532 633
533 glEnable GL_BLEND; 634 glEnable GL_BLEND;
534 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 635 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
535 glColor @$color; 636 glColor_premultiply @$color;
536 637
537 glBegin GL_QUADS; 638 glBegin GL_QUADS;
538 glVertex 0 , 0; 639 glVertex 0 , 0;
539 glVertex 0 , $h; 640 glVertex 0 , $h;
540 glVertex $w, $h; 641 glVertex $w, $h;
… …
555 my ($class, %arg) = @_; 656 my ($class, %arg) = @_;
556 $class->SUPER::new (can_events => 0, %arg); 657 $class->SUPER::new (can_events => 0, %arg);
557} 658}
558 659
559sub size_request { 660sub size_request {
560 (0, 0) 661 my ($self) = @_;
662
663 ($self->{w} + 0, $self->{h} + 0)
561} 664}
562 665
563sub draw { } 666sub draw { }
564 667
565############################################################################# 668#############################################################################
… …
569our @ISA = CFClient::UI::Base::; 672our @ISA = CFClient::UI::Base::;
570 673
571sub new { 674sub new {
572 my ($class, %arg) = @_; 675 my ($class, %arg) = @_;
573 676
574 my $children = delete $arg{children} || []; 677 my $children = delete $arg{children};
575 678
576 my $self = $class->SUPER::new ( 679 my $self = $class->SUPER::new (
577 children => [], 680 children => [],
578 can_events => 0, 681 can_events => 0,
579 %arg, 682 %arg,
580 ); 683 );
684
581 $self->add ($_) for @$children; 685 $self->add (@$children)
686 if $children;
582 687
583 $self 688 $self
584} 689}
585 690
586sub add { 691sub add {
… …
594 $self->{children} = [ 699 $self->{children} = [
595 sort { $a->{z} <=> $b->{z} } 700 sort { $a->{z} <=> $b->{z} }
596 @{$self->{children}}, @widgets 701 @{$self->{children}}, @widgets
597 ]; 702 ];
598 703
599 $self->check_size (1); 704 $self->realloc;
600 $self->update;
601} 705}
602 706
603sub children { 707sub children {
604 @{ $_[0]{children} } 708 @{ $_[0]{children} }
605} 709}
… …
610 delete $child->{parent}; 714 delete $child->{parent};
611 $child->hide; 715 $child->hide;
612 716
613 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 717 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
614 718
615 $self->check_size; 719 $self->realloc;
616 $self->update;
617} 720}
618 721
619sub clear { 722sub clear {
620 my ($self) = @_; 723 my ($self) = @_;
621 724
… …
625 for (@$children) { 728 for (@$children) {
626 delete $_->{parent}; 729 delete $_->{parent};
627 $_->hide; 730 $_->hide;
628 } 731 }
629 732
630 $self->check_size; 733 $self->realloc;
631 $self->update;
632} 734}
633 735
634sub find_widget { 736sub find_widget {
635 my ($self, $x, $y) = @_; 737 my ($self, $x, $y) = @_;
636 738
637 $x -= $self->{x}; 739 $x -= $self->{x};
638 $y -= $self->{y}; 740 $y -= $self->{y};
639 741
640 my $res; 742 my $res;
641 743
642 for (reverse @{ $self->{children} }) { 744 for (reverse $self->visible_children) {
643 $res = $_->find_widget ($x, $y) 745 $res = $_->find_widget ($x, $y)
644 and return $res; 746 and return $res;
645 } 747 }
646 748
647 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y}) 749 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
… …
668} 770}
669 771
670sub add { 772sub add {
671 my ($self, $child) = @_; 773 my ($self, $child) = @_;
672 774
673 $self->{children} = []; 775 $self->SUPER::remove ($_) for @{ $self->{children} };
674
675 $self->SUPER::add ($child); 776 $self->SUPER::add ($child);
676} 777}
677 778
678sub remove { 779sub remove {
679 my ($self, $widget) = @_; 780 my ($self, $widget) = @_;
… …
696 $self->{children}[0]->configure (0, 0, $w, $h); 797 $self->{children}[0]->configure (0, 0, $w, $h);
697} 798}
698 799
699############################################################################# 800#############################################################################
700 801
802# back-buffered drawing area
803
701package CFClient::UI::Window; 804package CFClient::UI::Window;
702 805
703our @ISA = CFClient::UI::Bin::; 806our @ISA = CFClient::UI::Bin::;
704 807
705use CFClient::OpenGL; 808use CFClient::OpenGL;
… …
723 $self->SUPER::size_allocate ($w, $h); 826 $self->SUPER::size_allocate ($w, $h);
724 $self->update; 827 $self->update;
725} 828}
726 829
727sub _render { 830sub _render {
831 my ($self) = @_;
832
728 $_[0]{children}[0]->draw; 833 $self->{children}[0]->draw;
729} 834}
730 835
731sub render_child { 836sub render_child {
732 my ($self) = @_; 837 my ($self) = @_;
733 838
734 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 839 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
735 glClearColor 0, 0, 0, 0; 840 glClearColor 0, 0, 0, 0;
736 glClear GL_COLOR_BUFFER_BIT; 841 glClear GL_COLOR_BUFFER_BIT;
737 842
843 {
844 package CFClient::UI::Base;
845
846 ($draw_x, $draw_y, $draw_w, $draw_h) =
847 (0, 0, $self->{w}, $self->{h});
848 }
849
738 $self->_render; 850 $self->_render;
739 }; 851 };
740} 852}
741 853
742sub _draw { 854sub _draw {
743 my ($self) = @_; 855 my ($self) = @_;
744 856
745 my ($w, $h) = ($self->w, $self->h); 857 my ($w, $h) = @$self{qw(w h)};
746 858
747 my $tex = $self->{texture} 859 my $tex = $self->{texture}
748 or return; 860 or return;
749 861
750 glEnable GL_TEXTURE_2D; 862 glEnable GL_TEXTURE_2D;
751 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 863 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
752 glColor 1, 1, 1, 1; 864 glColor 0, 0, 0, 1;
753 865
754 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 866 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
755 867
756 glDisable GL_TEXTURE_2D; 868 glDisable GL_TEXTURE_2D;
757} 869}
… …
760 872
761package CFClient::UI::ViewPort; 873package CFClient::UI::ViewPort;
762 874
763our @ISA = CFClient::UI::Window::; 875our @ISA = CFClient::UI::Window::;
764 876
877sub new {
878 my $class = shift;
879
880 $class->SUPER::new (
881 scroll_x => 0,
882 scroll_y => 1,
883 @_,
884 )
885}
886
765sub size_request { 887sub size_request {
766 my ($self) = @_; 888 my ($self) = @_;
767 889
768 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 890 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
769 891
770 @$self{qw(child_w child_h)} 892 $w = 10 if $self->{scroll_x};
893 $h = 10 if $self->{scroll_y};
894
895 ($w, $h)
771} 896}
772 897
773sub size_allocate { 898sub size_allocate {
774 my ($self, $w, $h) = @_; 899 my ($self, $w, $h) = @_;
775 900
776 my ($cw, $ch) = @$self{qw(child_w child_h)}; 901 my $child = $self->child;
777# $w = $self->{w}; 902
903 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
904 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
905
778 $self->child->configure (0, 0, $cw, $ch); 906 $self->child->configure (0, 0, $w, $h);
779 $self->update; 907 $self->update;
780} 908}
781 909
782sub set_offset { 910sub set_offset {
783 my ($self, $x, $y) = @_; 911 my ($self, $x, $y) = @_;
… …
817} 945}
818 946
819sub _render { 947sub _render {
820 my ($self) = @_; 948 my ($self) = @_;
821 949
950 local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};
951 local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y};
952
822 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 953 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
823 954
824 $self->SUPER::_render; 955 $self->SUPER::_render;
825} 956}
826 957
… …
829package CFClient::UI::ScrolledWindow; 960package CFClient::UI::ScrolledWindow;
830 961
831our @ISA = CFClient::UI::HBox::; 962our @ISA = CFClient::UI::HBox::;
832 963
833sub new { 964sub new {
834 my $class = shift; 965 my ($class, %arg) = @_;
966
967 my $child = delete $arg{child};
835 968
836 my $self; 969 my $self;
837 970
838 my $slider = new CFClient::UI::Slider 971 my $slider = new CFClient::UI::Slider
839 vertical => 1, 972 vertical => 1,
840 range => [0, 0, 1, 0.01], # HACK fix 973 range => [0, 0, 1, 0.01], # HACK fix
841 connect_changed => sub { 974 on_changed => sub {
842 $self->{vp}->set_offset (0, $_[1]); 975 $self->{vp}->set_offset (0, $_[1]);
843 }, 976 },
844 ; 977 ;
845 978
846 $self = $class->SUPER::new ( 979 $self = $class->SUPER::new (
847 vp => (new CFClient::UI::ViewPort expand => 1), 980 vp => (new CFClient::UI::ViewPort expand => 1),
848 slider => $slider, 981 slider => $slider,
849 @_, 982 %arg,
850 ); 983 );
851 984
852 $self->{vp}->add ($self->{scrolled});
853 $self->add ($self->{vp});
854 $self->add ($self->{slider}); 985 $self->SUPER::add ($self->{vp}, $self->{slider});
986 $self->add ($child) if $child;
855 987
856 $self 988 $self
989}
990
991sub add {
992 my ($self, $widget) = @_;
993
994 $self->{vp}->add ($self->{child} = $widget);
995}
996
997sub update {
998 my ($self) = @_;
999
1000 $self->SUPER::update;
1001
1002 # todo: overwrite size_allocate of child
1003 my $child = $self->{vp}->child;
1004 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
857} 1005}
858 1006
859sub size_allocate { 1007sub size_allocate {
860 my ($self, $w, $h) = @_; 1008 my ($self, $w, $h) = @_;
861 1009
… …
890 1038
891 if ($self->{bg}) { 1039 if ($self->{bg}) {
892 my ($w, $h) = @$self{qw(w h)}; 1040 my ($w, $h) = @$self{qw(w h)};
893 1041
894 glEnable GL_BLEND; 1042 glEnable GL_BLEND;
895 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1043 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
896 glColor @{ $self->{bg} }; 1044 glColor_premultiply @{ $self->{bg} };
897 1045
898 glBegin GL_QUADS; 1046 glBegin GL_QUADS;
899 glVertex 0 , 0; 1047 glVertex 0 , 0;
900 glVertex 0 , $h; 1048 glVertex 0 , $h;
901 glVertex $w, $h; 1049 glVertex $w, $h;
… …
914 1062
915our @ISA = CFClient::UI::Bin::; 1063our @ISA = CFClient::UI::Bin::;
916 1064
917use CFClient::OpenGL; 1065use CFClient::OpenGL;
918 1066
919my @tex = 1067my $bg =
1068 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1069 mipmap => 1, wrap => 1;
1070
1071my @border =
920 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1072 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
921 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1073 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
922 1074
923sub new { 1075sub new {
924 my $class = shift; 1076 my ($class, %arg) = @_;
925
926 # TODO: user_x, user_y, overwrite moveto?
927 1077
928 my $self = $class->SUPER::new ( 1078 my $self = $class->SUPER::new (
929 bg => [1, 1, 1, 1], 1079 bg => [1, 1, 1, 1],
930 border_bg => [1, 1, 1, 1], 1080 border_bg => [1, 1, 1, 1],
931 border => 0.6, 1081 border => 0.6,
932 is_toplevel => 1,
933 can_events => 1, 1082 can_events => 1,
934 @_ 1083 min_w => 16,
1084 min_h => 16,
1085 %arg,
935 ); 1086 );
936 1087
937 $self->{title} &&= new CFClient::UI::Label 1088 $self->{title_widget} = new CFClient::UI::Label
938 align => 0, 1089 align => 0,
939 valign => 1, 1090 valign => 1,
940 text => $self->{title}, 1091 text => $self->{title},
941 fontsize => $self->{border}; 1092 fontsize => $self->{border},
1093 if exists $self->{title};
1094
1095 unless ($self->{no_close_button}) {
1096 $self->{close_btn} =
1097 new CFClient::UI::ImageButton
1098 image => 'x1_close.png',
1099 on_activate => sub { $self->hide };
1100
1101 $self->CFClient::UI::Container::add ($self->{close_btn});
1102 }
942 1103
943 $self 1104 $self
1105}
1106
1107sub add {
1108 my ($self, @widgets) = @_;
1109
1110 $self->SUPER::add (@widgets);
1111 $self->CFClient::UI::Container::add ($self->{close_btn}) if $self->{close_btn};
1112 $self->CFClient::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
944} 1113}
945 1114
946sub border { 1115sub border {
947 int $_[0]{border} * $::FONTSIZE 1116 int $_[0]{border} * $::FONTSIZE
948} 1117}
949 1118
950sub size_request { 1119sub size_request {
951 my ($self) = @_; 1120 my ($self) = @_;
1121
1122 $self->{title_widget}->size_request
1123 if $self->{title_widget};
1124
1125 $self->{close_btn}->size_request
1126 if $self->{close_btn};
952 1127
953 my ($w, $h) = $self->SUPER::size_request; 1128 my ($w, $h) = $self->SUPER::size_request;
954 1129
955 ( 1130 (
956 $w + $self->border * 2, 1131 $w + $self->border * 2,
… …
959} 1134}
960 1135
961sub size_allocate { 1136sub size_allocate {
962 my ($self, $w, $h) = @_; 1137 my ($self, $w, $h) = @_;
963 1138
1139 if ($self->{title_widget}) {
1140 $self->{title_widget}{w} = $w;
1141 $self->{title_widget}{h} = $h;
1142 $self->{title_widget}->size_allocate ($w, $h);
1143 }
1144
1145 my $border = $self->border;
1146
964 $h -= List::Util::max 0, $self->border * 2; 1147 $h -= List::Util::max 0, $border * 2;
965 $w -= List::Util::max 0, $self->border * 2; 1148 $w -= List::Util::max 0, $border * 2;
966 1149
967 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
968 if $self->{title};
969
970 $self->child->configure ($self->border, $self->border, $w, $h); 1150 $self->child->configure ($border, $border, $w, $h);
1151
1152 $self->{close_btn}->configure ($self->{w} - (2 * $border), 0, $border, $border)
1153 if $self->{close_btn};
971} 1154}
972 1155
973sub button_down { 1156sub button_down {
974 my ($self, $ev, $x, $y) = @_; 1157 my ($self, $ev, $x, $y) = @_;
975 1158
… …
991 my ($ev, $x, $y) = @_; 1174 my ($ev, $x, $y) = @_;
992 1175
993 my $dx = $ev->{x} - $ox; 1176 my $dx = $ev->{x} - $ox;
994 my $dy = $ev->{y} - $oy; 1177 my $dy = $ev->{y} - $oy;
995 1178
996 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1179 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
997 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1180 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1181
998 $self->move ($wx + $dx * $mx, $wy + $dy * $my); 1182 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
999 $self->check_size; 1183 $self->realloc;
1000 }; 1184 };
1001 1185
1002 } elsif ($lr ^ $td) { 1186 } elsif ($lr ^ $td) {
1003 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1187 my ($ox, $oy) = ($ev->{x}, $ev->{y});
1004 my ($bx, $by) = ($self->{x}, $self->{y}); 1188 my ($bx, $by) = ($self->{x}, $self->{y});
… …
1006 $self->{motion} = sub { 1190 $self->{motion} = sub {
1007 my ($ev, $x, $y) = @_; 1191 my ($ev, $x, $y) = @_;
1008 1192
1009 ($x, $y) = ($ev->{x}, $ev->{y}); 1193 ($x, $y) = ($ev->{x}, $ev->{y});
1010 1194
1011 $self->move ($bx + $x - $ox, $by + $y - $oy); 1195 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1012 $self->update; 1196 # HACK: the next line is required to enforce placement
1197 $self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h});
1013 }; 1198 };
1199 } else {
1200 return 0;
1201 }
1202
1014 } 1203 1
1015} 1204}
1016 1205
1017sub button_up { 1206sub button_up {
1018 my ($self, $ev, $x, $y) = @_; 1207 my ($self, $ev, $x, $y) = @_;
1019 1208
1209 $self->{close_btn}->button_up ($ev, $x, $y)
1210 if $self->{close_btn};
1211
1020 delete $self->{motion}; 1212 !!delete $self->{motion}
1021} 1213}
1022 1214
1023sub mouse_motion { 1215sub mouse_motion {
1024 my ($self, $ev, $x, $y) = @_; 1216 my ($self, $ev, $x, $y) = @_;
1025 1217
1026 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1218 $self->{motion}->($ev, $x, $y) if $self->{motion};
1219
1220 !!$self->{motion}
1027} 1221}
1028 1222
1029sub _draw { 1223sub _draw {
1030 my ($self) = @_; 1224 my ($self) = @_;
1031 1225
1226 my $child = $self->{children}[0];
1227
1032 my ($w, $h ) = ($self->{w}, $self->{h}); 1228 my ($w, $h ) = ($self->{w}, $self->{h});
1033 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1229 my ($cw, $ch) = ($child->{w}, $child->{h});
1034 1230
1035 glEnable GL_TEXTURE_2D; 1231 glEnable GL_TEXTURE_2D;
1036 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1232 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1037 1233
1038 my $border = $self->border; 1234 my $border = $self->border;
1039 1235
1040 glColor @{ $self->{border_bg} }; 1236 glColor @{ $self->{border_bg} };
1041 $tex[1]->draw_quad_alpha (0, 0, $w, $border); 1237 $border[0]->draw_quad_alpha (0, 0, $w, $border);
1042 $tex[3]->draw_quad_alpha (0, $border, $border, $ch); 1238 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
1043 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1239 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1044 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border); 1240 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
1045 1241
1046 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1242 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1047 my $bg = $tex[0]; 1243 glColor @{ $self->{bg} };
1048 1244
1049 # TODO: repeat texture not scale 1245 # TODO: repeat texture not scale
1246 # solve this better(?)
1050 my $rep_x = $cw / $bg->{w}; 1247 $bg->{s} = $cw / $bg->{w};
1051 my $rep_y = $ch / $bg->{h}; 1248 $bg->{t} = $ch / $bg->{h};
1052
1053 glColor @{ $self->{bg} };
1054
1055 $bg->{s} = $rep_x;
1056 $bg->{t} = $rep_y;
1057 $bg->{wrap_mode} = 1;
1058 $bg->draw_quad_alpha ($border, $border, $cw, $ch); 1249 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1059 } 1250 }
1060 1251
1061 glDisable GL_TEXTURE_2D; 1252 glDisable GL_TEXTURE_2D;
1062 1253
1063 $self->{title}->draw if $self->{title};
1064
1065 $self->child->draw; 1254 $child->draw;
1255
1256 if ($self->{title_widget}) {
1257 glTranslate 0, $border - $self->{h};
1258 $self->{title_widget}->_draw;
1259
1260 glTranslate 0, - ($border - $self->{h});
1261 }
1262
1263 $self->{close_btn}->draw
1264 if $self->{close_btn};
1066} 1265}
1067 1266
1068############################################################################# 1267#############################################################################
1069 1268
1070package CFClient::UI::Table; 1269package CFClient::UI::Table;
… …
1078sub new { 1277sub new {
1079 my $class = shift; 1278 my $class = shift;
1080 1279
1081 $class->SUPER::new ( 1280 $class->SUPER::new (
1082 col_expand => [], 1281 col_expand => [],
1083 @_ 1282 @_,
1084 ) 1283 )
1284}
1285
1286sub children {
1287 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1085} 1288}
1086 1289
1087sub add { 1290sub add {
1088 my ($self, $x, $y, $child) = @_; 1291 my ($self, $x, $y, $child) = @_;
1089 1292
1090 $child->set_parent ($self); 1293 $child->set_parent ($self);
1091 $self->{children}[$y][$x] = $child; 1294 $self->{children}[$y][$x] = $child;
1092 1295
1093 $child->check_size; 1296 $self->realloc;
1094} 1297}
1095 1298
1096sub children { 1299sub remove {
1097 grep $_, map @$_, grep $_, @{ $_[0]{children} } 1300 my ($self, $child) = @_;
1098}
1099 1301
1302 # TODO: not yet implemented
1303}
1304
1100# TODO: move to container class maybe? send childs a signal on removal? 1305# TODO: move to container class maybe? send children a signal on removal?
1101sub clear { 1306sub clear {
1102 my ($self) = @_; 1307 my ($self) = @_;
1103 1308
1104 my @children = $self->children; 1309 my @children = $self->children;
1105 delete $self->{children}; 1310 delete $self->{children};
… …
1107 for (@children) { 1312 for (@children) {
1108 delete $_->{parent}; 1313 delete $_->{parent};
1109 $_->hide; 1314 $_->hide;
1110 } 1315 }
1111 1316
1112 $self->update; 1317 $self->realloc;
1113} 1318}
1114 1319
1115sub get_wh { 1320sub get_wh {
1116 my ($self) = @_; 1321 my ($self) = @_;
1117 1322
… …
1148sub size_allocate { 1353sub size_allocate {
1149 my ($self, $w, $h) = @_; 1354 my ($self, $w, $h) = @_;
1150 1355
1151 my ($ws, $hs) = $self->get_wh; 1356 my ($ws, $hs) = $self->get_wh;
1152 1357
1153 my $req_w = sum @$ws; 1358 my $req_w = (sum @$ws) || 1;
1154 my $req_h = sum @$hs; 1359 my $req_h = (sum @$hs) || 1;
1155 1360
1156 # TODO: nicer code && do row_expand 1361 # TODO: nicer code && do row_expand
1157 my @col_expand = @{$self->{col_expand}}; 1362 my @col_expand = @{$self->{col_expand}};
1158 @col_expand = (1) x @$ws unless @col_expand; 1363 @col_expand = (1) x @$ws unless @col_expand;
1159 my $col_expand = (sum @col_expand) || 1; 1364 my $col_expand = (sum @col_expand) || 1;
… …
1213 } 1418 }
1214} 1419}
1215 1420
1216############################################################################# 1421#############################################################################
1217 1422
1218package CFClient::UI::HBox; 1423package CFClient::UI::Box;
1219
1220# TODO: wrap into common Box base class
1221 1424
1222our @ISA = CFClient::UI::Container::; 1425our @ISA = CFClient::UI::Container::;
1223 1426
1224sub size_request { 1427sub size_request {
1225 my ($self) = @_; 1428 my ($self) = @_;
1226 1429
1227 my @alloc = map [$_->size_request], @{$self->{children}}; 1430 $self->{vertical}
1228 1431 ? (
1229 ( 1432 (List::Util::max map $_->{req_w}, @{$self->{children}}),
1230 (List::Util::sum map $_->[0], @alloc), 1433 (List::Util::sum map $_->{req_h}, @{$self->{children}}),
1231 (List::Util::max map $_->[1], @alloc), 1434 )
1232 ) 1435 : (
1436 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1437 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1438 )
1233} 1439}
1234 1440
1235sub size_allocate { 1441sub size_allocate {
1236 my ($self, $w, $h) = @_; 1442 my ($self, $w, $h) = @_;
1237 1443
1238 ($h, $w) = ($w, $h); 1444 my $space = $self->{vertical} ? $h : $w;
1239
1240 my $children = $self->{children}; 1445 my $children = $self->{children};
1241 1446
1242 my @h = map $_->{req_w}, @$children; 1447 my @req;
1243 1448
1244 my $req_h = List::Util::sum @h; 1449 if ($self->{homogeneous}) {
1245 1450 @req = ($space / (@$children || 1)) x @$children;
1246 if ($req_h > $h) {
1247 # ah well, not enough space
1248 $_ *= $h / $req_h for @h;
1249 } else { 1451 } else {
1452 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;
1453 my $req = List::Util::sum @req;
1454
1455 if ($req > $space) {
1456 # ah well, not enough space
1457 $_ *= $space / $req for @req;
1458 } else {
1250 my $exp = List::Util::sum map $_->{expand}, @$children; 1459 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1251 $exp ||= 1;
1252 1460
1461 $space = ($space - $req) / $expand; # remaining space to give away
1462
1463 $req[$_] += $space * $children->[$_]{expand}
1253 for (0 .. $#$children) { 1464 for 0 .. $#$children;
1254 my $child = $children->[$_];
1255
1256 my $alloc_h = $h[$_];
1257 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1258 $h[$_] = $alloc_h;
1259 } 1465 }
1260 } 1466 }
1261 1467
1262 CFClient::UI::harmonize \@h; 1468 CFClient::UI::harmonize \@req;
1263 1469
1264 my $y = 0; 1470 my $pos = 0;
1265 for (0 .. $#$children) { 1471 for (0 .. $#$children) {
1266 my $child = $children->[$_];
1267 my $h = $h[$_]; 1472 my $alloc = $req[$_];
1268 $child->configure ($y, 0, $h, $w); 1473 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1269 1474
1270 $y += $h; 1475 $pos += $alloc;
1271 } 1476 }
1272 1477
1273 1 1478 1
1274} 1479}
1275 1480
1276############################################################################# 1481#############################################################################
1277 1482
1483package CFClient::UI::HBox;
1484
1485our @ISA = CFClient::UI::Box::;
1486
1487sub new {
1488 my $class = shift;
1489
1490 $class->SUPER::new (
1491 vertical => 0,
1492 @_,
1493 )
1494}
1495
1496#############################################################################
1497
1278package CFClient::UI::VBox; 1498package CFClient::UI::VBox;
1279 1499
1280# TODO: wrap into common Box base class
1281
1282our @ISA = CFClient::UI::Container::; 1500our @ISA = CFClient::UI::Box::;
1283 1501
1284sub size_request { 1502sub new {
1285 my ($self) = @_; 1503 my $class = shift;
1286 1504
1287 my @alloc = map [$_->size_request], @{$self->{children}}; 1505 $class->SUPER::new (
1288 1506 vertical => 1,
1289 ( 1507 @_,
1290 (List::Util::max map $_->[0], @alloc),
1291 (List::Util::sum map $_->[1], @alloc),
1292 ) 1508 )
1293}
1294
1295sub size_allocate {
1296 my ($self, $w, $h) = @_;
1297
1298 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1299
1300 my $children = $self->{children};
1301
1302 my @h = map $_->{req_h}, @$children;
1303
1304 my $req_h = List::Util::sum @h;
1305
1306 if ($req_h > $h) {
1307 # ah well, not enough space
1308 $_ *= $h / $req_h for @h;
1309 } else {
1310 my $exp = List::Util::sum map $_->{expand}, @$children;
1311 $exp ||= 1;
1312
1313 for (0 .. $#$children) {
1314 my $child = $children->[$_];
1315
1316 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1317 }
1318 }
1319
1320 CFClient::UI::harmonize \@h;
1321
1322 my $y = 0;
1323 for (0 .. $#$children) {
1324 my $child = $children->[$_];
1325 my $h = $h[$_];
1326 $child->configure (0, $y, $w, $h);
1327
1328 $y += $h;
1329 }
1330
1331 1
1332} 1509}
1333 1510
1334############################################################################# 1511#############################################################################
1335 1512
1336package CFClient::UI::Label; 1513package CFClient::UI::Label;
… …
1353 ellipsise => 3, # end 1530 ellipsise => 3, # end
1354 layout => (new CFClient::Layout), 1531 layout => (new CFClient::Layout),
1355 fontsize => 1, 1532 fontsize => 1,
1356 align => -1, 1533 align => -1,
1357 valign => -1, 1534 valign => -1,
1358 padding => 2, 1535 padding_x => 2,
1536 padding_y => 2,
1359 can_events => 0, 1537 can_events => 0,
1360 %arg 1538 %arg
1361 ); 1539 );
1362 1540
1363 if (exists $self->{template}) { 1541 if (exists $self->{template}) {
… …
1390 1568
1391 delete $self->{texture}; 1569 delete $self->{texture};
1392 $self->SUPER::update; 1570 $self->SUPER::update;
1393} 1571}
1394 1572
1573sub realloc {
1574 my ($self) = @_;
1575
1576 delete $self->{ox};
1577 $self->SUPER::realloc;
1578}
1579
1395sub set_text { 1580sub set_text {
1396 my ($self, $text) = @_; 1581 my ($self, $text) = @_;
1397 1582
1398 return if $self->{text} eq "T$text"; 1583 return if $self->{text} eq "T$text";
1399 $self->{text} = "T$text"; 1584 $self->{text} = "T$text";
1400 1585
1401 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1586 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1402 $self->{layout}->set_text ($text); 1587 $self->{layout}->set_text ($text);
1403 1588
1589 delete $self->{size_req};
1590 $self->realloc;
1404 $self->update; 1591 $self->update;
1405 $self->check_size;
1406} 1592}
1407 1593
1408sub set_markup { 1594sub set_markup {
1409 my ($self, $markup) = @_; 1595 my ($self, $markup) = @_;
1410 1596
… …
1414 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1600 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1415 1601
1416 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba; 1602 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1417 $self->{layout}->set_markup ($markup); 1603 $self->{layout}->set_markup ($markup);
1418 1604
1605 delete $self->{size_req};
1606 $self->realloc;
1419 $self->update; 1607 $self->update;
1420 $self->check_size;
1421} 1608}
1422 1609
1423sub size_request { 1610sub size_request {
1424 my ($self) = @_; 1611 my ($self) = @_;
1425 1612
1613 $self->{size_req} ||= do {
1426 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1614 $self->{layout}->set_font ($self->{font}) if $self->{font};
1427 $self->{layout}->set_width ($self->{max_w} || -1); 1615 $self->{layout}->set_width ($self->{max_w} || -1);
1428 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1616 $self->{layout}->set_ellipsise ($self->{ellipsise});
1429 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1617 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1430 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1618 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1431 1619
1432 my ($w, $h) = $self->{layout}->size; 1620 my ($w, $h) = $self->{layout}->size;
1433 1621
1434 if (exists $self->{template}) { 1622 if (exists $self->{template}) {
1435 $self->{template}->set_font ($self->{font}) if $self->{font}; 1623 $self->{template}->set_font ($self->{font}) if $self->{font};
1436 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1624 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1437 1625
1438 my ($w2, $h2) = $self->{template}->size; 1626 my ($w2, $h2) = $self->{template}->size;
1439 1627
1440 $w = List::Util::max $w, $w2; 1628 $w = List::Util::max $w, $w2;
1441 $h = List::Util::max $h, $h2; 1629 $h = List::Util::max $h, $h2;
1630 }
1631
1632 [$w, $h]
1442 } 1633 };
1443 1634
1444 ( 1635 @{ $self->{size_req} }
1445 $w + $self->{padding} * 2,
1446 $h + $self->{padding} * 2,
1447 )
1448} 1636}
1449 1637
1450sub size_allocate { 1638sub size_allocate {
1451 my ($self, $w, $h) = @_; 1639 my ($self, $w, $h) = @_;
1452 1640
1641 delete $self->{ox};
1642
1453 delete $self->{texture}; 1643 delete $self->{texture}
1644 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1454} 1645}
1455 1646
1456sub set_fontsize { 1647sub set_fontsize {
1457 my ($self, $fontsize) = @_; 1648 my ($self, $fontsize) = @_;
1458 1649
1459 $self->{fontsize} = $fontsize; 1650 $self->{fontsize} = $fontsize;
1460 delete $self->{texture}; 1651 delete $self->{texture};
1461 1652
1462 $self->update; 1653 $self->realloc;
1463 $self->check_size; 1654}
1655
1656sub reconfigure {
1657 my ($self) = @_;
1658
1659 delete $self->{size_req};
1660
1661 $self->SUPER::reconfigure;
1464} 1662}
1465 1663
1466sub _draw { 1664sub _draw {
1467 my ($self) = @_; 1665 my ($self) = @_;
1468 1666
… …
1474 $self->{layout}->set_width ($self->{w}); 1672 $self->{layout}->set_width ($self->{w});
1475 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1673 $self->{layout}->set_ellipsise ($self->{ellipsise});
1476 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1674 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1477 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1675 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1478 1676
1479 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1677 new_from_layout CFClient::Texture $self->{layout}
1678 };
1480 1679
1680 unless (exists $self->{ox}) {
1481 $self->{ox} = int ($self->{align} < 0 ? $self->{padding} 1681 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1482 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1682 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1483 : ($self->{w} - $tex->{w}) * 0.5); 1683 : ($self->{w} - $tex->{w}) * 0.5);
1484 1684
1485 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding} 1685 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1486 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding} 1686 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1487 : ($self->{h} - $tex->{h}) * 0.5); 1687 : ($self->{h} - $tex->{h}) * 0.5);
1488
1489 $tex
1490 }; 1688 };
1491 1689
1492 glEnable GL_TEXTURE_2D; 1690 glEnable GL_TEXTURE_2D;
1493 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1691
1692 my $w = List::Util::min $self->{w} + 4, $tex->{w};
1693 my $h = List::Util::min $self->{h} + 2, $tex->{h};
1494 1694
1495 if ($tex->{format} == GL_ALPHA) { 1695 if ($tex->{format} == GL_ALPHA) {
1696 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1496 glColor @{$self->{fg}}; 1697 glColor @{$self->{fg}};
1497 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}); 1698 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}, $w, $h);
1498 } else { 1699 } else {
1700 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1499 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}); 1701 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}, $w, $h);
1500 } 1702 }
1501 1703
1502 glDisable GL_TEXTURE_2D; 1704 glDisable GL_TEXTURE_2D;
1503} 1705}
1504 1706
… …
1521 can_hover => 1, 1723 can_hover => 1,
1522 can_focus => 1, 1724 can_focus => 1,
1523 valign => 0, 1725 valign => 0,
1524 can_events => 1, 1726 can_events => 1,
1525 #text => ... 1727 #text => ...
1728 #hidden => "*",
1526 @_ 1729 @_
1527 ) 1730 )
1528} 1731}
1529 1732
1530sub _set_text { 1733sub _set_text {
… …
1532 1735
1533 delete $self->{cur_h}; 1736 delete $self->{cur_h};
1534 1737
1535 return if $self->{text} eq $text; 1738 return if $self->{text} eq $text;
1536 1739
1537 delete $self->{texture};
1538
1539 $self->{last_activity} = $::NOW; 1740 $self->{last_activity} = $::NOW;
1540 $self->{text} = $text; 1741 $self->{text} = $text;
1541 1742
1542 $text =~ s/./*/g if $self->{hidden}; 1743 $text =~ s/./*/g if $self->{hidden};
1543 $self->{layout}->set_text ("$text "); 1744 $self->{layout}->set_text ("$text ");
1745 delete $self->{size_req};
1544 1746
1545 $self->_emit (changed => $self->{text}); 1747 $self->_emit (changed => $self->{text});
1748
1749 $self->realloc;
1750 $self->update;
1546} 1751}
1547 1752
1548sub set_text { 1753sub set_text {
1549 my ($self, $text) = @_; 1754 my ($self, $text) = @_;
1550 1755
1551 $self->{cursor} = length $text; 1756 $self->{cursor} = length $text;
1552 $self->_set_text ($text); 1757 $self->_set_text ($text);
1553 $self->update;
1554 $self->check_size;
1555} 1758}
1556 1759
1557sub get_text { 1760sub get_text {
1558 $_[0]{text} 1761 $_[0]{text}
1559} 1762}
… …
1562 my ($self) = @_; 1765 my ($self) = @_;
1563 1766
1564 my ($w, $h) = $self->SUPER::size_request; 1767 my ($w, $h) = $self->SUPER::size_request;
1565 1768
1566 ($w + 1, $h) # add 1 for cursor 1769 ($w + 1, $h) # add 1 for cursor
1567}
1568
1569sub size_allocate {
1570 my ($self, $w, $h) = @_;
1571
1572 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1573} 1770}
1574 1771
1575sub key_down { 1772sub key_down {
1576 my ($self, $ev) = @_; 1773 my ($self, $ev) = @_;
1577 1774
… …
1595 $self->{cursor} = length $text; 1792 $self->{cursor} = length $text;
1596 } elsif ($uni == 27) { 1793 } elsif ($uni == 27) {
1597 $self->_emit ('escape'); 1794 $self->_emit ('escape');
1598 } elsif ($uni) { 1795 } elsif ($uni) {
1599 substr $text, $self->{cursor}++, 0, chr $uni; 1796 substr $text, $self->{cursor}++, 0, chr $uni;
1797 } else {
1798 return 0;
1600 } 1799 }
1601 1800
1602 $self->_set_text ($text); 1801 $self->_set_text ($text);
1603 $self->update; 1802
1604 $self->check_size; 1803 $self->realloc;
1804
1805 1
1605} 1806}
1606 1807
1607sub focus_in { 1808sub focus_in {
1608 my ($self) = @_; 1809 my ($self) = @_;
1609 1810
… …
1624 utf8::encode $text; 1825 utf8::encode $text;
1625 $self->{cursor} = length substr $text, 0, $idx; 1826 $self->{cursor} = length substr $text, 0, $idx;
1626 1827
1627 $self->_set_text ($self->{text}); 1828 $self->_set_text ($self->{text});
1628 $self->update; 1829 $self->update;
1830
1831 1
1629} 1832}
1630 1833
1631sub mouse_motion { 1834sub mouse_motion {
1632 my ($self, $ev, $x, $y) = @_; 1835 my ($self, $ev, $x, $y) = @_;
1633# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 1836# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1837
1838 0
1634} 1839}
1635 1840
1636sub _draw { 1841sub _draw {
1637 my ($self) = @_; 1842 my ($self) = @_;
1638 1843
1639 local $self->{fg} = $self->{fg}; 1844 local $self->{fg} = $self->{fg};
1640 1845
1641 if ($FOCUS == $self) { 1846 if ($FOCUS == $self) {
1642 glColor @{$self->{active_bg}}; 1847 glColor_premultiply @{$self->{active_bg}};
1643 $self->{fg} = $self->{active_fg}; 1848 $self->{fg} = $self->{active_fg};
1644 } else { 1849 } else {
1645 glColor @{$self->{bg}}; 1850 glColor_premultiply @{$self->{bg}};
1646 } 1851 }
1647 1852
1648 glEnable GL_BLEND; 1853 glEnable GL_BLEND;
1649 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1854 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1650 glBegin GL_QUADS; 1855 glBegin GL_QUADS;
1651 glVertex 0 , 0; 1856 glVertex 0 , 0;
1652 glVertex 0 , $self->{h}; 1857 glVertex 0 , $self->{h};
1653 glVertex $self->{w}, $self->{h}; 1858 glVertex $self->{w}, $self->{h};
1654 glVertex $self->{w}, 0; 1859 glVertex $self->{w}, 0;
… …
1715 } else { 1920 } else {
1716 $self->set_text ($self->{history_saveback}); 1921 $self->set_text ($self->{history_saveback});
1717 } 1922 }
1718 1923
1719 } else { 1924 } else {
1720 $self->SUPER::key_down ($ev); 1925 return $self->SUPER::key_down ($ev)
1926 }
1927
1721 } 1928 1
1722
1723} 1929}
1724 1930
1725############################################################################# 1931#############################################################################
1726 1932
1727package CFClient::UI::Button; 1933package CFClient::UI::Button;
… …
1736 1942
1737sub new { 1943sub new {
1738 my $class = shift; 1944 my $class = shift;
1739 1945
1740 $class->SUPER::new ( 1946 $class->SUPER::new (
1741 padding => 4, 1947 padding_x => 4,
1948 padding_y => 4,
1742 fg => [1, 1, 1], 1949 fg => [1, 1, 1],
1743 active_fg => [0, 0, 1], 1950 active_fg => [0, 0, 1],
1744 can_hover => 1, 1951 can_hover => 1,
1745 align => 0, 1952 align => 0,
1746 valign => 0, 1953 valign => 0,
… …
1755 my ($self, $ev, $x, $y) = @_; 1962 my ($self, $ev, $x, $y) = @_;
1756 1963
1757 $self->emit ("activate") 1964 $self->emit ("activate")
1758 if $x >= 0 && $x < $self->{w} 1965 if $x >= 0 && $x < $self->{w}
1759 && $y >= 0 && $y < $self->{h}; 1966 && $y >= 0 && $y < $self->{h};
1967
1968 1
1760} 1969}
1761 1970
1762sub _draw { 1971sub _draw {
1763 my ($self) = @_; 1972 my ($self) = @_;
1764 1973
1765 local $self->{fg} = $self->{fg}; 1974 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1766
1767 if ($GRAB == $self) {
1768 $self->{fg} = $self->{active_fg};
1769 }
1770 1975
1771 glEnable GL_TEXTURE_2D; 1976 glEnable GL_TEXTURE_2D;
1772 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1977 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1773 glColor 0, 0, 0, 1; 1978 glColor 0, 0, 0, 1;
1774 1979
… …
1779 $self->SUPER::_draw; 1984 $self->SUPER::_draw;
1780} 1985}
1781 1986
1782############################################################################# 1987#############################################################################
1783 1988
1989package CFClient::UI::ImageButton;
1990
1991our @ISA = CFClient::UI::Image::;
1992
1993use CFClient::OpenGL;
1994
1995my %textures;
1996
1997sub new {
1998 my $class = shift;
1999
2000 my $self = $class->SUPER::new (
2001 padding_x => 4,
2002 padding_y => 4,
2003 fg => [1, 1, 1],
2004 active_fg => [0, 0, 1],
2005 can_hover => 1,
2006 align => 0,
2007 valign => 0,
2008 can_events => 1,
2009 @_
2010 );
2011}
2012
2013sub activate { }
2014
2015sub button_up {
2016 my ($self, $ev, $x, $y) = @_;
2017
2018 $self->emit ("activate")
2019 if $x >= 0 && $x < $self->{w}
2020 && $y >= 0 && $y < $self->{h};
2021
2022 1
2023}
2024
2025#############################################################################
2026
1784package CFClient::UI::CheckBox; 2027package CFClient::UI::CheckBox;
1785 2028
1786our @ISA = CFClient::UI::DrawBG::; 2029our @ISA = CFClient::UI::DrawBG::;
1787 2030
1788my @tex = 2031my @tex =
… …
1793 2036
1794sub new { 2037sub new {
1795 my $class = shift; 2038 my $class = shift;
1796 2039
1797 $class->SUPER::new ( 2040 $class->SUPER::new (
1798 padding => 2, 2041 padding_x => 2,
2042 padding_y => 2,
1799 fg => [1, 1, 1], 2043 fg => [1, 1, 1],
1800 active_fg => [1, 1, 0], 2044 active_fg => [1, 1, 0],
1801 bg => [0, 0, 0, 0.2], 2045 bg => [0, 0, 0, 0.2],
1802 active_bg => [1, 1, 1, 0.5], 2046 active_bg => [1, 1, 1, 0.5],
1803 state => 0, 2047 state => 0,
… …
1807} 2051}
1808 2052
1809sub size_request { 2053sub size_request {
1810 my ($self) = @_; 2054 my ($self) = @_;
1811 2055
1812 ($self->{padding} * 2 + 6) x 2 2056 (6) x 2
1813} 2057}
1814 2058
1815sub button_down { 2059sub button_down {
1816 my ($self, $ev, $x, $y) = @_; 2060 my ($self, $ev, $x, $y) = @_;
1817 2061
1818 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 2062 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1819 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 2063 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1820 $self->{state} = !$self->{state}; 2064 $self->{state} = !$self->{state};
1821 $self->_emit (changed => $self->{state}); 2065 $self->_emit (changed => $self->{state});
2066 } else {
2067 return 0
2068 }
2069
1822 } 2070 1
1823} 2071}
1824 2072
1825sub _draw { 2073sub _draw {
1826 my ($self) = @_; 2074 my ($self) = @_;
1827 2075
1828 $self->SUPER::_draw; 2076 $self->SUPER::_draw;
1829 2077
1830 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 2078 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1831 2079
1832 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 2080 my ($w, $h) = @$self{qw(w h)};
2081
2082 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1833 2083
1834 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 2084 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1835 2085
1836 my $tex = $self->{state} ? $tex[1] : $tex[0]; 2086 my $tex = $self->{state} ? $tex[1] : $tex[0];
1837 2087
… …
1992 2242
1993 my $h1 = $self->{h} * (1 - $ycut1); 2243 my $h1 = $self->{h} * (1 - $ycut1);
1994 my $h2 = $self->{h} * (1 - $ycut2); 2244 my $h2 = $self->{h} * (1 - $ycut2);
1995 2245
1996 glEnable GL_BLEND; 2246 glEnable GL_BLEND;
1997 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2247 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2248 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1998 glEnable GL_TEXTURE_2D; 2249 glEnable GL_TEXTURE_2D;
1999 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2250 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2000 2251
2001 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2252 glBindTexture GL_TEXTURE_2D, $t1->{name};
2002 glBegin GL_QUADS; 2253 glBegin GL_QUADS;
… …
2102 fg => [1, 1, 1], 2353 fg => [1, 1, 1],
2103 active_fg => [0, 0, 0], 2354 active_fg => [0, 0, 0],
2104 bg => [0, 0, 0, 0.2], 2355 bg => [0, 0, 0, 0.2],
2105 active_bg => [1, 1, 1, 0.5], 2356 active_bg => [1, 1, 1, 0.5],
2106 range => [0, 0, 100, 10, 0], 2357 range => [0, 0, 100, 10, 0],
2107 req_w => $::WIDTH / 80, 2358 min_w => $::WIDTH / 80,
2108 req_h => $::WIDTH / 80, 2359 min_h => $::WIDTH / 80,
2109 vertical => 0, 2360 vertical => 0,
2110 can_hover => 1, 2361 can_hover => 1,
2111 inner_pad => 0.02, 2362 inner_pad => 0.02,
2112 @_ 2363 @_
2113 ); 2364 );
… …
2116 $self->update; 2367 $self->update;
2117 2368
2118 $self 2369 $self
2119} 2370}
2120 2371
2372sub changed { }
2373
2121sub set_range { 2374sub set_range {
2122 my ($self, $range) = @_; 2375 my ($self, $range) = @_;
2123 2376
2124 $self->{range} = $range; 2377 ($range, $self->{range}) = ($self->{range}, $range);
2125 2378
2379 if ("@$range" ne "@{$self->{range}}") {
2126 $self->update; 2380 $self->update;
2381 $self->set_value ($self->{range}[0]);
2382 }
2127} 2383}
2128 2384
2129sub set_value { 2385sub set_value {
2130 my ($self, $value) = @_; 2386 my ($self, $value) = @_;
2131 2387
… …
2150} 2406}
2151 2407
2152sub size_request { 2408sub size_request {
2153 my ($self) = @_; 2409 my ($self) = @_;
2154 2410
2155 my $w = $self->{req_w}; 2411 ($self->{req_w}, $self->{req_h})
2156 my $h = $self->{req_h};
2157
2158 $self->{vertical} ? ($h, $w) : ($w, $h)
2159} 2412}
2160 2413
2161sub button_down { 2414sub button_down {
2162 my ($self, $ev, $x, $y) = @_; 2415 my ($self, $ev, $x, $y) = @_;
2163 2416
2164 $self->SUPER::button_down ($ev, $x, $y); 2417 $self->SUPER::button_down ($ev, $x, $y);
2165 2418
2166 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2419 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2167 2420
2168 $self->mouse_motion ($ev, $x, $y); 2421 $self->mouse_motion ($ev, $x, $y)
2169} 2422}
2170 2423
2171sub mouse_motion { 2424sub mouse_motion {
2172 my ($self, $ev, $x, $y) = @_; 2425 my ($self, $ev, $x, $y) = @_;
2173 2426
… …
2177 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2430 my (undef, $lo, $hi, $page) = @{$self->{range}};
2178 2431
2179 $x = ($x - $self->{click}[1]) / ($w * $self->{scale}); 2432 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2180 2433
2181 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo)); 2434 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2435 } else {
2436 return 0;
2437 }
2438
2182 } 2439 1
2183} 2440}
2184 2441
2185sub update { 2442sub update {
2186 my ($self) = @_; 2443 my ($self) = @_;
2187 2444
2188 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 2445 delete $self->{knob_w};
2446 $self->SUPER::update;
2447}
2448
2449sub _draw {
2450 my ($self) = @_;
2451
2452 unless ($self->{knob_w}) {
2189 $self->set_value ($self->{range}[0]); 2453 $self->set_value ($self->{range}[0]);
2190 2454
2191 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2455 my ($value, $lo, $hi, $page) = @{$self->{range}};
2192 my $range = ($hi - $page - $lo) || 1e-100; 2456 my $range = ($hi - $page - $lo) || 1e-100;
2193 2457
… …
2199 $value = ($value - $lo) / $range; 2463 $value = ($value - $lo) / $range;
2200 $value = $value * $self->{scale} + $self->{offset}; 2464 $value = $value * $self->{scale} + $self->{offset};
2201 2465
2202 $self->{knob_x} = $value - $knob_w * 0.5; 2466 $self->{knob_x} = $value - $knob_w * 0.5;
2203 $self->{knob_w} = $knob_w; 2467 $self->{knob_w} = $knob_w;
2204 }); 2468 }
2205
2206 $self->SUPER::update;
2207}
2208
2209sub _draw {
2210 my ($self) = @_;
2211 2469
2212 $self->SUPER::_draw (); 2470 $self->SUPER::_draw ();
2213 2471
2214 glScale $self->{w}, $self->{h}; 2472 glScale $self->{w}, $self->{h};
2215 2473
… …
2276sub set_range { shift->{slider}->set_range (@_) } 2534sub set_range { shift->{slider}->set_range (@_) }
2277sub set_value { shift->{slider}->set_value (@_) } 2535sub set_value { shift->{slider}->set_value (@_) }
2278 2536
2279############################################################################# 2537#############################################################################
2280 2538
2281package CFClient::UI::TextView; 2539package CFClient::UI::TextScroller;
2282 2540
2283our @ISA = CFClient::UI::HBox::; 2541our @ISA = CFClient::UI::HBox::;
2284 2542
2285use CFClient::OpenGL; 2543use CFClient::OpenGL;
2286 2544
… …
2288 my $class = shift; 2546 my $class = shift;
2289 2547
2290 my $self = $class->SUPER::new ( 2548 my $self = $class->SUPER::new (
2291 fontsize => 1, 2549 fontsize => 1,
2292 can_events => 0, 2550 can_events => 0,
2551 indent => 0,
2293 #font => default_font 2552 #font => default_font
2294 @_, 2553 @_,
2295 2554
2296 layout => (new CFClient::Layout 1), 2555 layout => (new CFClient::Layout 1),
2297 par => [], 2556 par => [],
… …
2320 $self->SUPER::size_allocate ($w, $h); 2579 $self->SUPER::size_allocate ($w, $h);
2321 2580
2322 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2581 $self->{layout}->set_font ($self->{font}) if $self->{font};
2323 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2582 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2324 $self->{layout}->set_width ($self->{children}[0]{w}); 2583 $self->{layout}->set_width ($self->{children}[0]{w});
2584 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2325 2585
2326 $self->reflow; 2586 $self->reflow;
2327} 2587}
2328 2588
2329sub text_size { 2589sub text_size {
… …
2331 2591
2332 my $layout = $self->{layout}; 2592 my $layout = $self->{layout};
2333 2593
2334 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2594 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2335 $layout->set_width ($self->{children}[0]{w} - $indent); 2595 $layout->set_width ($self->{children}[0]{w} - $indent);
2596 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2336 $layout->set_markup ($text); 2597 $layout->set_markup ($text);
2337 2598
2338 $layout->size 2599 $layout->size
2339} 2600}
2340 2601
… …
2379 2640
2380 return unless $self->{h} > 0; 2641 return unless $self->{h} > 0;
2381 2642
2382 delete $self->{texture}; 2643 delete $self->{texture};
2383 2644
2384 $ROOT->on_post_alloc ($self, sub { 2645 $ROOT->on_post_alloc ($self => sub {
2385 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 2646 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2386 2647
2387 if (delete $self->{need_reflow}) { 2648 if (delete $self->{need_reflow}) {
2388 my $height = 0; 2649 my $height = 0;
2389 2650
… …
2392 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2653 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2393 2654
2394 for (@{$self->{par}}) { 2655 for (@{$self->{par}}) {
2395 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support 2656 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2396 $layout->set_width ($W - $_->[3]); 2657 $layout->set_width ($W - $_->[3]);
2658 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2397 $layout->set_markup ($_->[4]); 2659 $layout->set_markup ($_->[4]);
2398 my ($w, $h) = $layout->size; 2660 my ($w, $h) = $layout->size;
2399 $_->[0] = $w + $_->[3]; 2661 $_->[0] = $w + $_->[3];
2400 $_->[1] = $h; 2662 $_->[1] = $h;
2401 } 2663 }
… …
2404 } 2666 }
2405 2667
2406 $self->{height} = $height; 2668 $self->{height} = $height;
2407 2669
2408 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]); 2670 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2409 2671
2410 delete $self->{texture}; 2672 delete $self->{texture};
2411 } 2673 }
2412 2674
2413 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2675 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2414 glClearColor 0.5, 0.5, 0.5, 0; 2676 glClearColor 0, 0, 0, 0;
2415 glClear GL_COLOR_BUFFER_BIT; 2677 glClear GL_COLOR_BUFFER_BIT;
2416 2678
2417 my $top = int $self->{children}[1]{range}[0]; 2679 my $top = int $self->{children}[1]{range}[0];
2418 2680
2419 my $y0 = $top; 2681 my $y0 = $top;
… …
2433 my $h = $par->[1]; 2695 my $h = $par->[1];
2434 2696
2435 if ($y0 < $y + $h && $y < $y1) { 2697 if ($y0 < $y + $h && $y < $y1) {
2436 $layout->set_foreground (@{ $par->[2] }); 2698 $layout->set_foreground (@{ $par->[2] });
2437 $layout->set_width ($W - $par->[3]); 2699 $layout->set_width ($W - $par->[3]);
2700 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2438 $layout->set_markup ($par->[4]); 2701 $layout->set_markup ($par->[4]);
2439 2702
2440 my ($w, $h, $data, $format, $internalformat) = $layout->render; 2703 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2441 2704
2442 glRasterPos $par->[3], $y - $y0; 2705 glRasterPos $par->[3], $y - $y0;
… …
2454sub _draw { 2717sub _draw {
2455 my ($self) = @_; 2718 my ($self) = @_;
2456 2719
2457 glEnable GL_TEXTURE_2D; 2720 glEnable GL_TEXTURE_2D;
2458 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2721 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2459 glColor 1, 1, 1, 1; 2722 glColor 0, 0, 0, 1;
2460 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2723 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2461 glDisable GL_TEXTURE_2D; 2724 glDisable GL_TEXTURE_2D;
2462 2725
2463 $self->{children}[1]->draw; 2726 $self->{children}[1]->draw;
2464 2727
2465} 2728}
… …
2514 2777
2515sub new { 2778sub new {
2516 my $class = shift; 2779 my $class = shift;
2517 2780
2518 my $self = $class->SUPER::new ( 2781 my $self = $class->SUPER::new (
2519 state => 0, 2782 state => 0,
2520 connect_activate => \&toggle_flopper, 2783 on_activate => \&toggle_flopper,
2521 @_ 2784 @_
2522 ); 2785 );
2523 2786
2524 if ($self->{state}) {
2525 $self->{state} = 0;
2526 $self->toggle_flopper;
2527 }
2528
2529 $self 2787 $self
2530} 2788}
2531 2789
2532sub toggle_flopper { 2790sub toggle_flopper {
2533 my ($self) = @_; 2791 my ($self) = @_;
2534 2792
2535 # TODO: use animation 2793 $self->{other}->toggle_visibility;
2536 if ($self->{state} = !$self->{state}) {
2537 $CFClient::UI::ROOT->add ($self->{other});
2538 $self->{other}->move ($self->coord2global (0, $self->{h}));
2539 $self->_emit ("open");
2540 } else {
2541 $CFClient::UI::ROOT->remove ($self->{other});
2542 $self->_emit ("close");
2543 }
2544
2545 $self->_emit (changed => $self->{state});
2546} 2794}
2547 2795
2548############################################################################# 2796#############################################################################
2549 2797
2550package CFClient::UI::Tooltip; 2798package CFClient::UI::Tooltip;
… …
2563} 2811}
2564 2812
2565sub set_tooltip_from { 2813sub set_tooltip_from {
2566 my ($self, $widget) = @_; 2814 my ($self, $widget) = @_;
2567 2815
2816 my $tooltip = $widget->{tooltip};
2817
2818 if ($ENV{CFPLUS_DEBUG} & 2) {
2819 $tooltip .= "\n\n" . (ref $widget) . "\n"
2820 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2821 . "req $widget->{req_w} $widget->{req_h}\n"
2822 . "visible $widget->{visible}";
2823 }
2824
2825 $tooltip =~ s/^\n+//;
2826 $tooltip =~ s/\n+$//;
2827
2568 $self->add (new CFClient::UI::Label 2828 $self->add (new CFClient::UI::Label
2569 markup => $widget->{tooltip}, 2829 markup => $tooltip,
2570 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2830 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2571 fontsize => 0.8, 2831 fontsize => 0.8,
2572 fg => [0, 0, 0, 1], 2832 fg => [0, 0, 0, 1],
2573 ellipsise => 0, 2833 ellipsise => 0,
2574 font => ($widget->{tooltip_font} || $::FONT_PROP), 2834 font => ($widget->{tooltip_font} || $::FONT_PROP),
… …
2585 2845
2586sub size_allocate { 2846sub size_allocate {
2587 my ($self, $w, $h) = @_; 2847 my ($self, $w, $h) = @_;
2588 2848
2589 $self->SUPER::size_allocate ($w - 4, $h - 4); 2849 $self->SUPER::size_allocate ($w - 4, $h - 4);
2850}
2851
2852sub visibility_change {
2853 my ($self, $visible) = @_;
2854
2855 return unless $visible;
2856
2857 $self->{root}->on_post_alloc ("move_$self" => sub {
2858 my $widget = $self->{owner}
2859 or return;
2860
2861 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2862
2863 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2864 if $x + $self->{w} > $self->{root}{w};
2865
2866 $self->move_abs ($x, $y);
2867 });
2590} 2868}
2591 2869
2592sub _draw { 2870sub _draw {
2593 my ($self) = @_; 2871 my ($self) = @_;
2594 2872
… …
2611 glVertex $w, $h; 2889 glVertex $w, $h;
2612 glVertex $w, 0; 2890 glVertex $w, 0;
2613 glEnd; 2891 glEnd;
2614 2892
2615 glTranslate 2 - 0.375, 2 - 0.375; 2893 glTranslate 2 - 0.375, 2 - 0.375;
2894
2616 $self->SUPER::_draw; 2895 $self->SUPER::_draw;
2617} 2896}
2618 2897
2619############################################################################# 2898#############################################################################
2620 2899
… …
2626 2905
2627sub new { 2906sub new {
2628 my $class = shift; 2907 my $class = shift;
2629 2908
2630 my $self = $class->SUPER::new ( 2909 my $self = $class->SUPER::new (
2631 aspect => 1, 2910 aspect => 1,
2911 can_events => 0,
2632 @_, 2912 @_,
2633 ); 2913 );
2634 2914
2635 if ($self->{anim} && $self->{animspeed}) { 2915 if ($self->{anim} && $self->{animspeed}) {
2636 Scalar::Util::weaken (my $widget = $self); 2916 Scalar::Util::weaken (my $widget = $self);
… …
2678 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 2958 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2679 2959
2680 if ($tex) { 2960 if ($tex) {
2681 glEnable GL_TEXTURE_2D; 2961 glEnable GL_TEXTURE_2D;
2682 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2962 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2683 glColor 1, 1, 1, 1; 2963 glColor 0, 0, 0, 1;
2684 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2964 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2685 glDisable GL_TEXTURE_2D; 2965 glDisable GL_TEXTURE_2D;
2686 } 2966 }
2687} 2967}
2688 2968
2689sub DESTROY { 2969sub destroy {
2690 my ($self) = @_; 2970 my ($self) = @_;
2691 2971
2692 $self->{timer}->cancel 2972 $self->{timer}->cancel
2693 if $self->{timer}; 2973 if $self->{timer};
2694 2974
2695 $self->SUPER::DESTROY; 2975 $self->SUPER::destroy;
2696} 2976}
2697 2977
2698############################################################################# 2978#############################################################################
2699 2979
2700package CFClient::UI::InventoryItem; 2980package CFClient::UI::Buttonbar;
2701 2981
2702our @ISA = CFClient::UI::HBox::; 2982our @ISA = CFClient::UI::HBox::;
2703 2983
2704sub _item_to_desc { 2984# TODO: should actualyl wrap buttons and other goodies.
2705 my ($item) = @_;
2706
2707 my $desc =
2708 $item->{nrof} < 2
2709 ? $item->{name}
2710 : "$item->{nrof} × $item->{name_pl}";
2711
2712 $item->{flags} & Crossfire::Protocol::F_OPEN
2713 and $desc .= " (open)";
2714 $item->{flags} & Crossfire::Protocol::F_APPLIED
2715 and $desc .= " (applied)";
2716 $item->{flags} & Crossfire::Protocol::F_UNPAID
2717 and $desc .= " (unpaid)";
2718 $item->{flags} & Crossfire::Protocol::F_MAGIC
2719 and $desc .= " (magic)";
2720 $item->{flags} & Crossfire::Protocol::F_CURSED
2721 and $desc .= " (cursed)";
2722 $item->{flags} & Crossfire::Protocol::F_DAMNED
2723 and $desc .= " (damned)";
2724 $item->{flags} & Crossfire::Protocol::F_LOCKED
2725 and $desc .= " *";
2726
2727 $desc
2728}
2729
2730sub new {
2731 my $class = shift;
2732
2733 my %args = @_;
2734
2735 my $item = delete $args{item};
2736
2737 my $desc = _item_to_desc ($item);
2738
2739 my $self = $class->SUPER::new (
2740 can_hover => 1,
2741 can_events => 1,
2742 tooltip => ((CFClient::UI::Label::escape $desc)
2743 . "\n<small>leftclick - examine\nshift+leftclick - move/pickup/drop\nmiddle click - apply\nrightclick - menu</small>"),
2744 connect_button_down => sub {
2745 my ($self, $ev, $x, $y) = @_;
2746
2747 # todo: maybe put examine on 1? but should just be a tooltip :(
2748 if (($ev->{mod} & CFClient::KMOD_SHIFT) && $ev->{button} == 1) {
2749 my $targ = $::CONN->{player}{tag};
2750
2751 if ($item->{container} == $::CONN->{player}{tag}) {
2752 $targ = $main::OPENCONT;
2753 }
2754
2755 $::CONN->send ("move $targ $item->{tag} 0");
2756 } elsif ($ev->{button} == 1) {
2757 $::CONN->send ("examine $item->{tag}");
2758 } elsif ($ev->{button} == 2) {
2759 $::CONN->send ("apply $item->{tag}");
2760 } elsif ($ev->{button} == 3) {
2761 my @menu_items = (
2762 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2763 ["mark", sub { $::CONN->send ("mark ". pack "N", $item->{tag}) }],
2764 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2765 (
2766 $item->{flags} & Crossfire::Protocol::F_LOCKED
2767 ? (
2768 ["unlock", sub { $::CONN->send ("lock " . pack "CN", 0, $item->{tag}) }],
2769 )
2770 : (
2771 ["lock", sub { $::CONN->send ("lock " . pack "CN", 1, $item->{tag}) }],
2772 ["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
2773 )
2774 ),
2775 );
2776
2777 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
2778 }
2779
2780 1
2781 },
2782 %args
2783 );
2784
2785
2786 $self->add (new CFClient::UI::Face
2787 can_events => 0,
2788 face => $item->{face},
2789 anim => $item->{anim},
2790 animspeed => $item->{animspeed},
2791 );
2792
2793 $self->add ($self->{name_lbl} = new CFClient::UI::Label can_events => 0);
2794
2795 $self->{item} = $item;
2796
2797 $self->update_item;
2798
2799 $self
2800}
2801
2802sub update_item {
2803 my ($self) = @_;
2804
2805 my $desc = _item_to_desc ($self->{item});
2806
2807 $self->{name_lbl}->set_text ($desc);
2808}
2809
2810#############################################################################
2811
2812package CFClient::UI::Inventory;
2813
2814our @ISA = CFClient::UI::ScrolledWindow::;
2815
2816sub new {
2817 my $class = shift;
2818
2819 my $self = $class->SUPER::new (
2820 scrolled => (new CFClient::UI::Table),
2821 @_,
2822 );
2823
2824 $self
2825}
2826
2827sub set_items {
2828 my ($self, $items) = @_;
2829
2830 $self->{scrolled}->clear;
2831 return unless $items;
2832
2833 my @items = sort {
2834 ($a->{type} <=> $b->{type})
2835 or ($a->{name} cmp $b->{name})
2836 } @$items;
2837
2838 $self->{real_items} = \@items;
2839
2840 for my $item (@items) {
2841 $item->{item} = $item;
2842 $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;
2843 $item->update_item ();
2844 }
2845
2846 my $i = 0;
2847 for (@items) {
2848 $self->{scrolled}->add (0, $i, $_);
2849 my $nrof = $_->{item}->{nrof} || 1;
2850 $self->{scrolled}->add (1, $i++, new CFClient::UI::Label text => ($_->{item}->{weight} * $nrof) / 1000);
2851 }
2852
2853# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2854}
2855
2856sub size_request {
2857 my ($self) = @_;
2858 ($self->{req_w}, $self->{req_h});
2859}
2860 2985
2861############################################################################# 2986#############################################################################
2862 2987
2863package CFClient::UI::Menu; 2988package CFClient::UI::Menu;
2864 2989
… …
2876 ); 3001 );
2877 3002
2878 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3003 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2879 3004
2880 for my $item (@{ $self->{items} }) { 3005 for my $item (@{ $self->{items} }) {
2881 my ($widget, $cb) = @$item; 3006 my ($widget, $cb, $tooltip) = @$item;
2882 3007
2883 # handle various types of items, only text for now 3008 # handle various types of items, only text for now
2884 if (!ref $widget) { 3009 if (!ref $widget) {
2885 $widget = new CFClient::UI::Label 3010 $widget = new CFClient::UI::Label
2886 can_hover => 1, 3011 can_hover => 1,
2887 can_events => 1, 3012 can_events => 1,
2888 text => $widget; 3013 markup => $widget,
3014 tooltip => $tooltip
2889 } 3015 }
2890 3016
2891 $self->{item}{$widget} = $item; 3017 $self->{item}{$widget} = $item;
2892 3018
2893 $self->{vbox}->add ($widget); 3019 $self->{vbox}->add ($widget);
… …
2905 # maybe save $GRAB? must be careful about events... 3031 # maybe save $GRAB? must be careful about events...
2906 $GRAB = $self; 3032 $GRAB = $self;
2907 $self->{button} = $ev->{button}; 3033 $self->{button} = $ev->{button};
2908 3034
2909 $self->show; 3035 $self->show;
2910 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 3036 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2911} 3037}
2912 3038
2913sub mouse_motion { 3039sub mouse_motion {
2914 my ($self, $ev, $x, $y) = @_; 3040 my ($self, $ev, $x, $y) = @_;
2915 3041
2916 # TODO: should use vbox->find_widget or so 3042 # TODO: should use vbox->find_widget or so
2917 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3043 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2918 $self->{hover} = $self->{item}{$HOVER}; 3044 $self->{hover} = $self->{item}{$HOVER};
3045
3046 0
2919} 3047}
2920 3048
2921sub button_up { 3049sub button_up {
2922 my ($self, $ev, $x, $y) = @_; 3050 my ($self, $ev, $x, $y) = @_;
2923 3051
… …
2925 undef $GRAB; 3053 undef $GRAB;
2926 $self->hide; 3054 $self->hide;
2927 3055
2928 $self->_emit ("popdown"); 3056 $self->_emit ("popdown");
2929 $self->{hover}[1]->() if $self->{hover}; 3057 $self->{hover}[1]->() if $self->{hover};
3058 } else {
3059 return 0
3060 }
3061
2930 } 3062 1
2931} 3063}
2932 3064
2933############################################################################# 3065#############################################################################
2934 3066
2935package CFClient::UI::Statusbox; 3067package CFClient::UI::Multiplexer;
2936 3068
2937our @ISA = CFClient::UI::VBox::; 3069our @ISA = CFClient::UI::Container::;
2938 3070
2939sub new { 3071sub new {
2940 my $class = shift; 3072 my $class = shift;
2941 3073
2942 $class->SUPER::new ( 3074 my $self = $class->SUPER::new (
3075 @_,
3076 );
3077
3078 $self->{current} = $self->{children}[0]
3079 if @{ $self->{children} };
3080
3081 $self
3082}
3083
3084sub add {
3085 my ($self, @widgets) = @_;
3086
3087 $self->SUPER::add (@widgets);
3088
3089 $self->{current} = $self->{children}[0]
3090 if @{ $self->{children} };
3091}
3092
3093sub set_current_page {
3094 my ($self, $page_or_widget) = @_;
3095
3096 my $widget = ref $page_or_widget
3097 ? $page_or_widget
3098 : $self->{children}[$page_or_widget];
3099
3100 $self->{current} = $widget;
3101 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3102
3103 $self->_emit (page_changed => $self->{current});
3104
3105 $self->realloc;
3106}
3107
3108sub visible_children {
3109 $_[0]{current}
3110}
3111
3112sub size_request {
3113 my ($self) = @_;
3114
3115 $self->{current}->size_request
3116}
3117
3118sub size_allocate {
3119 my ($self, $w, $h) = @_;
3120
3121 $self->{current}->configure (0, 0, $w, $h);
3122}
3123
3124sub _draw {
3125 my ($self) = @_;
3126
3127 $self->{current}->draw;
3128}
3129
3130#############################################################################
3131
3132package CFClient::UI::Notebook;
3133
3134our @ISA = CFClient::UI::VBox::;
3135
3136sub new {
3137 my $class = shift;
3138
3139 my $self = $class->SUPER::new (
3140 buttonbar => (new CFClient::UI::Buttonbar),
3141 multiplexer => (new CFClient::UI::Multiplexer expand => 1),
3142 # filter => # will be put between multiplexer and $self
3143 @_,
3144 );
3145
3146 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3147 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3148
3149 $self
3150}
3151
3152sub add {
3153 my ($self, $title, $widget, $tooltip) = @_;
3154
3155 Scalar::Util::weaken $self;
3156
3157 $self->{buttonbar}->add (new CFClient::UI::Button
3158 markup => $title,
3159 tooltip => $tooltip,
3160 on_activate => sub { $self->set_current_page ($widget) },
3161 );
3162
3163 $self->{multiplexer}->add ($widget);
3164}
3165
3166sub set_current_page {
3167 my ($self, $page) = @_;
3168
3169 $self->{multiplexer}->set_current_page ($page);
3170 $self->_emit (page_changed => $self->{multiplexer}{current});
3171}
3172
3173#############################################################################
3174
3175package CFClient::UI::Combobox;
3176
3177use utf8;
3178
3179our @ISA = CFClient::UI::Button::;
3180
3181sub new {
3182 my $class = shift;
3183
3184 my $self = $class->SUPER::new (
3185 options => [], # [value, title, longdesc], ...
3186 value => undef,
3187 @_,
3188 );
3189
3190 $self->_set_value ($self->{value});
3191
3192 $self
3193}
3194
3195sub button_down {
3196 my ($self, $ev) = @_;
3197
3198 my @menu_items;
3199
3200 for (@{ $self->{options} }) {
3201 my ($value, $title, $tooltip) = @$_;
3202
3203 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3204 }
3205
3206 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
3207}
3208
3209sub _set_value {
3210 my ($self, $value) = @_;
3211
3212 my ($item) = grep $_->[0] eq $value, @{ $self->{options} }
3213 or return;
3214
3215 $self->{value} = $item->[0];
3216 $self->set_markup ("$item->[1] ⇓");
3217 $self->set_tooltip ($item->[2]);
3218}
3219
3220sub set_value {
3221 my ($self, $value) = @_;
3222
3223 return unless $self->{value} ne $value;
3224
3225 $self->_set_value ($value);
3226 $self->_emit (changed => $value);
3227}
3228
3229#############################################################################
3230
3231package CFClient::UI::Statusbox;
3232
3233our @ISA = CFClient::UI::VBox::;
3234
3235sub new {
3236 my $class = shift;
3237
3238 my $self = $class->SUPER::new (
2943 fontsize => 0.8, 3239 fontsize => 0.8,
2944 @_, 3240 @_,
2945 ) 3241 );
3242
3243 Scalar::Util::weaken (my $this = $self);
3244
3245 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3246
3247 $self
2946} 3248}
2947 3249
2948sub reorder { 3250sub reorder {
2949 my ($self) = @_; 3251 my ($self) = @_;
2950 my $NOW = time; 3252 my $NOW = Time::HiRes::time;
3253
3254 # freeze display when hovering over any label
3255 return if $CFClient::UI::TOOLTIP->{owner}
3256 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},
3257 values %{ $self->{item} };
2951 3258
2952 while (my ($k, $v) = each %{ $self->{item} }) { 3259 while (my ($k, $v) = each %{ $self->{item} }) {
2953 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3260 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2954 } 3261 }
2955 3262
… …
2958 my @items = sort { 3265 my @items = sort {
2959 $a->{pri} <=> $b->{pri} 3266 $a->{pri} <=> $b->{pri}
2960 or $b->{id} <=> $a->{id} 3267 or $b->{id} <=> $a->{id}
2961 } values %{ $self->{item} }; 3268 } values %{ $self->{item} };
2962 3269
3270 $self->{timer}->interval (1);
3271
2963 my $count = 10 + 1; 3272 my $count = 10 + 1;
2964 for my $item (@items) { 3273 for my $item (@items) {
2965 last unless --$count; 3274 last unless --$count;
2966 3275
2967 push @widgets, $item->{label} ||= do { 3276 my $label = $item->{label} ||= do {
2968 # TODO: doesn't handle markup well (read as: at all) 3277 # TODO: doesn't handle markup well (read as: at all)
2969 my $short = $item->{count} > 1 3278 my $short = $item->{count} > 1
2970 ? "<b>$item->{count} ×</b> $item->{text}" 3279 ? "<b>$item->{count} ×</b> $item->{text}"
2971 : $item->{text}; 3280 : $item->{text};
2972 3281
… …
2980 tooltip => $item->{tooltip}, 3289 tooltip => $item->{tooltip},
2981 tooltip_font => $::FONT_PROP, 3290 tooltip_font => $::FONT_PROP,
2982 tooltip_width => 0.67, 3291 tooltip_width => 0.67,
2983 fontsize => $item->{fontsize} || $self->{fontsize}, 3292 fontsize => $item->{fontsize} || $self->{fontsize},
2984 max_w => $::WIDTH * 0.44, 3293 max_w => $::WIDTH * 0.44,
2985 fg => $item->{fg}, 3294 fg => [@{ $item->{fg} }],
2986 can_events => 1, 3295 can_events => 1,
2987 can_hover => 1 3296 can_hover => 1
2988 }; 3297 };
3298
3299 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3300 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3301 $label->update;
3302 $label->set_max_size (undef, $label->{req_h} * $diff)
3303 if $diff < 1;
3304 $self->{timer}->interval (1/30);
3305 } else {
3306 $label->{fg}[3] = $item->{fg}[3] || 1;
3307 }
3308
3309 push @widgets, $label;
2989 } 3310 }
2990 3311
2991 $self->clear; 3312 $self->clear;
2992 $self->SUPER::add (reverse @widgets); 3313 $self->SUPER::add (reverse @widgets);
2993} 3314}
… …
2996 my ($self, $text, %arg) = @_; 3317 my ($self, $text, %arg) = @_;
2997 3318
2998 $text =~ s/^\s+//; 3319 $text =~ s/^\s+//;
2999 $text =~ s/\s+$//; 3320 $text =~ s/\s+$//;
3000 3321
3322 return unless $text;
3323
3001 my $timeout = time + ((delete $arg{timeout}) || 60); 3324 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
3002 3325
3003 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3326 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
3004 3327
3005 if (my $item = $self->{item}{$group}) { 3328 if (my $item = $self->{item}{$group}) {
3006 if ($item->{text} eq $text) { 3329 if ($item->{text} eq $text) {
3007 $item->{count}++; 3330 $item->{count}++;
3008 } else { 3331 } else {
3009 $item->{count} = 1; 3332 $item->{count} = 1;
3010 $item->{text} = $item->{tooltip} = $text; 3333 $item->{text} = $item->{tooltip} = $text;
3011 } 3334 }
3012 $item->{id} = ++$self->{id}; 3335 $item->{id} += 0.2;#d#
3013 $item->{timeout} = $timeout; 3336 $item->{timeout} = $timeout;
3014 delete $item->{label}; 3337 delete $item->{label};
3015 } else { 3338 } else {
3016 $self->{item}{$group} = { 3339 $self->{item}{$group} = {
3017 id => ++$self->{id}, 3340 id => ++$self->{id},
… …
3036 3359
3037 $self->reorder; 3360 $self->reorder;
3038 $self->SUPER::reconfigure; 3361 $self->SUPER::reconfigure;
3039} 3362}
3040 3363
3364sub destroy {
3365 my ($self) = @_;
3366
3367 $self->{timer}->cancel;
3368
3369 $self->SUPER::destroy;
3370}
3371
3041############################################################################# 3372#############################################################################
3042 3373
3043package CFClient::UI::Root; 3374package CFClient::UI::Inventory;
3044 3375
3045our @ISA = CFClient::UI::Container::; 3376our @ISA = CFClient::UI::ScrolledWindow::;
3046
3047use CFClient::OpenGL;
3048 3377
3049sub new { 3378sub new {
3050 my $class = shift; 3379 my $class = shift;
3051 3380
3052 $class->SUPER::new ( 3381 my $self = $class->SUPER::new (
3382 child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3383 @_,
3384 );
3385
3386 $self
3387}
3388
3389sub set_items {
3390 my ($self, $items) = @_;
3391
3392 $self->{child}->clear;
3393 return unless $items;
3394
3395 my @items = sort {
3396 ($a->{type} <=> $b->{type})
3397 or ($a->{name} cmp $b->{name})
3398 } @$items;
3399
3400 $self->{real_items} = \@items;
3401
3402 my $row = 0;
3403 for my $item (@items) {
3404 CFClient::Item::update_widgets $item;
3405
3406 $self->{child}->add (0, $row, $item->{face_widget});
3407 $self->{child}->add (1, $row, $item->{desc_widget});
3408 $self->{child}->add (2, $row, $item->{weight_widget});
3409
3410 $row++;
3411 }
3412}
3413
3414#############################################################################
3415
3416package CFClient::UI::BindEditor;
3417
3418our @ISA = CFClient::UI::FancyFrame::;
3419
3420sub new {
3421 my $class = shift;
3422
3423 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3424
3425 $self->add (my $vb = new CFClient::UI::VBox);
3426
3427
3428 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3429 text => "start recording",
3430 tooltip => "Start/Stops recording of actions."
3431 ."All subsequent actions after the recording started will be captured."
3432 ."The actions are displayed after the record was stopped."
3433 ."To bind the action you have to click on the 'Bind' button",
3434 on_activate => sub {
3435 unless ($self->{recording}) {
3436 $self->start;
3437 } else {
3438 $self->stop;
3439 }
3440 });
3441
3442 $vb->add (new CFClient::UI::Label text => "Actions:");
3443 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3444
3445 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3446 $vb->add (my $hb = new CFClient::UI::HBox);
3447 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3448 $hb->add (new CFClient::UI::Button
3449 text => "bind",
3450 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3451 on_activate => sub {
3452 $self->ask_for_bind;
3453 });
3454
3455 $vb->add (my $hb = new CFClient::UI::HBox);
3456 $hb->add (new CFClient::UI::Button
3457 text => "ok",
3458 expand => 1,
3459 tooltip => "This closes the binding editor and saves the binding",
3460 on_activate => sub {
3461 $self->hide;
3462 $self->commit;
3463 });
3464
3465 $hb->add (new CFClient::UI::Button
3466 text => "cancel",
3467 expand => 1,
3468 tooltip => "This closes the binding editor without saving",
3469 on_activate => sub {
3470 $self->hide;
3471 $self->{binding_cancel}->()
3472 if $self->{binding_cancel};
3473 });
3474
3475 $self->update_binding_widgets;
3476
3477 $self
3478}
3479
3480sub commit {
3481 my ($self) = @_;
3482 my ($mod, $sym, $cmds) = $self->get_binding;
3483 if ($sym != 0 && @$cmds > 0) {
3484 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3485 ."'. Don't forget 'Save Config'!");
3486 $self->{binding_change}->($mod, $sym, $cmds)
3487 if $self->{binding_change};
3488 } else {
3489 $::STATUSBOX->add ("No action bound, no key or action specified!");
3490 $self->{binding_cancel}->()
3491 if $self->{binding_cancel};
3492 }
3493}
3494
3495sub start {
3496 my ($self) = @_;
3497
3498 $self->{rec_btn}->set_text ("stop recording");
3499 $self->{recording} = 1;
3500 $self->clear_command_list;
3501 $::CONN->start_record if $::CONN;
3502}
3503
3504sub stop {
3505 my ($self) = @_;
3506
3507 $self->{rec_btn}->set_text ("start recording");
3508 $self->{recording} = 0;
3509
3510 my $rec;
3511 $rec = $::CONN->stop_record if $::CONN;
3512 return unless ref $rec eq 'ARRAY';
3513 $self->set_command_list ($rec);
3514}
3515
3516
3517sub ask_for_bind_and_commit {
3518 my ($self) = @_;
3519 $self->ask_for_bind (1);
3520}
3521
3522sub ask_for_bind {
3523 my ($self, $commit) = @_;
3524
3525 CFClient::Binder::open_binding_dialog (sub {
3526 my ($mod, $sym) = @_;
3527 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3528 $self->update_binding_widgets;
3529 $self->commit if $commit;
3530 });
3531}
3532
3533# $mod and $sym are the modifiers and key symbol
3534# $cmds is a array ref of strings (the commands)
3535# $cb is the callback that is executed on OK
3536# $ccb is the callback that is executed on CANCEL and
3537# when the binding was unsuccessful on OK
3538sub set_binding {
3539 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3540
3541 $self->clear_command_list;
3542 $self->{recording} = 0;
3543 $self->{rec_btn}->set_text ("start recording");
3544
3545 $self->{binding} = [$mod, $sym];
3546 $self->{commands} = $cmds;
3547
3548 $self->{binding_change} = $cb;
3549 $self->{binding_cancel} = $ccb;
3550
3551 $self->update_binding_widgets;
3552}
3553
3554# this is a shortcut method that asks for a binding
3555# and then just binds it.
3556sub do_quick_binding {
3557 my ($self, $cmds) = @_;
3558 $self->set_binding (undef, undef, $cmds, sub {
3559 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3560 });
3561 $self->ask_for_bind (1);
3562}
3563
3564sub update_binding_widgets {
3565 my ($self) = @_;
3566 my ($mod, $sym, $cmds) = $self->get_binding;
3567 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3568 $self->set_command_list ($cmds);
3569}
3570
3571sub get_binding {
3572 my ($self) = @_;
3573 return (
3574 $self->{binding}->[0],
3575 $self->{binding}->[1],
3576 [ grep { defined $_ } @{$self->{commands}} ]
3577 );
3578}
3579
3580sub clear_command_list {
3581 my ($self) = @_;
3582 $self->{cmdbox}->clear ();
3583}
3584
3585sub set_command_list {
3586 my ($self, $cmds) = @_;
3587
3588 $self->{cmdbox}->clear ();
3589 $self->{commands} = $cmds;
3590
3591 my $idx = 0;
3592
3593 for (@$cmds) {
3594 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3595
3596 my $i = $idx;
3597 $hb->add (new CFClient::UI::Label text => $_);
3598 $hb->add (new CFClient::UI::Button
3599 text => "delete",
3600 tooltip => "Deletes the action from the record",
3601 on_activate => sub {
3602 $self->{cmdbox}->remove ($hb);
3603 $cmds->[$i] = undef;
3604 });
3605
3606
3607 $idx++
3608 }
3609}
3610
3611#############################################################################
3612
3613package CFClient::UI::SpellList;
3614
3615our @ISA = CFClient::UI::Table::;
3616
3617sub new {
3618 my $class = shift;
3619
3620 my $self = $class->SUPER::new (
3621 binding => [],
3622 commands => [],
3053 @_, 3623 @_,
3054 ) 3624 )
3055} 3625}
3056 3626
3057sub configure { 3627my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3058 my ($self, $x, $y, $w, $h) = @_;
3059 3628
3060 $self->{w} = $w; 3629my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3061 $self->{h} = $h; 3630 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3062} 3631my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3632 "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3633my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3634 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3635my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3636 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3637my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3638 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3063 3639
3064sub check_size { 3640sub rebuild_spell_list {
3641 my ($self) = @_;
3642
3643 $CFClient::UI::ROOT->on_refresh ($self => sub {
3644 $self->clear;
3645
3646 return unless $::CONN;
3647
3648 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3649 $self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3650 $self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3651 $self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3652 $self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3653
3654 my $row = 0;
3655
3656 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3657 my $spell = $self->{spell}{$_};
3658
3659 $row++;
3660
3661 my $spell_cb = sub {
3662 my ($widget, $ev) = @_;
3663
3664 if ($ev->{button} == 1) {
3665 $::CONN->user_send ("cast $spell->{name}");
3666 } elsif ($ev->{button} == 2) {
3667 $::CONN->user_send ("invoke $spell->{name}");
3668 } elsif ($ev->{button} == 3) {
3669 (new CFClient::UI::Menu
3670 items => [
3671 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3672 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3673 ],
3674 )->popup ($ev);
3675 } else {
3676 return 0;
3677 }
3678
3679 1
3680 };
3681
3682 my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3683
3684 #TODO: add path info to tooltip
3685 #$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3686
3687 $self->add (0, $row, new CFClient::UI::Face
3688 face => $spell->{face},
3689 can_hover => 1,
3690 can_events => 1,
3691 tooltip => $tooltip,
3692 on_button_down => $spell_cb,
3693 );
3694
3695 $self->add (1, $row, new CFClient::UI::Label
3696 expand => 1,
3697 text => $spell->{name},
3698 can_hover => 1,
3699 can_events => 1,
3700 tooltip => $tooltip,
3701 on_button_down => $spell_cb,
3702 );
3703
3704 $self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3705 $self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3706 $self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3707 $self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3708 }
3709 });
3710}
3711
3712sub add_spell {
3065 my ($self) = @_; 3713 my ($self, $spell) = @_;
3066 3714
3067 $self->size_allocate ($self->{w}, $self->{h}) 3715 $self->{spell}->{$spell->{name}} = $spell;
3068 if $self->{w}; 3716 $self->rebuild_spell_list;
3717}
3718
3719sub remove_spell {
3720 my ($self, $spell) = @_;
3721
3722 delete $self->{spell}->{$spell->{name}};
3723 $self->rebuild_spell_list;
3724}
3725
3726sub clear_spells {
3727 my ($self) = @_;
3728
3729 $self->{spell} = {};
3730 $self->rebuild_spell_list;
3731}
3732
3733#############################################################################
3734
3735package CFClient::UI::Root;
3736
3737our @ISA = CFClient::UI::Container::;
3738
3739use List::Util qw(min max);
3740
3741use CFClient::OpenGL;
3742
3743sub new {
3744 my $class = shift;
3745
3746 my $self = $class->SUPER::new (
3747 visible => 1,
3748 @_,
3749 );
3750
3751 Scalar::Util::weaken ($self->{root} = $self);
3752
3753 $self
3069} 3754}
3070 3755
3071sub size_request { 3756sub size_request {
3072 my ($self) = @_; 3757 my ($self) = @_;
3073 3758
3074 ($self->{w}, $self->{h}) 3759 ($self->{w}, $self->{h})
3760}
3761
3762sub _to_pixel {
3763 my ($coord, $size, $max) = @_;
3764
3765 $coord =
3766 $coord eq "center" ? ($max - $size) * 0.5
3767 : $coord eq "max" ? $max
3768 : $coord;
3769
3770 $coord = 0 if $coord < 0;
3771 $coord = $max - $size if $coord > $max - $size;
3772
3773 int $coord + 0.5
3075} 3774}
3076 3775
3077sub size_allocate { 3776sub size_allocate {
3078 my ($self, $w, $h) = @_; 3777 my ($self, $w, $h) = @_;
3079 3778
3080 for my $child ($self->children) { 3779 for my $child ($self->children) {
3081 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3780 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3082 3781
3083 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 3782 $X = $child->{force_x} if exists $child->{force_x};
3084 if exists $child->{req_x}; 3783 $Y = $child->{force_y} if exists $child->{force_y};
3085 3784
3086 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1 3785 $X = _to_pixel $X, $W, $self->{w};
3087 if exists $child->{req_y}; 3786 $Y = _to_pixel $Y, $H, $self->{h};
3088
3089 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
3090 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
3091 3787
3092 $child->configure ($X, $Y, $W, $H); 3788 $child->configure ($X, $Y, $W, $H);
3093 } 3789 }
3094} 3790}
3095 3791
… …
3106} 3802}
3107 3803
3108sub update { 3804sub update {
3109 my ($self) = @_; 3805 my ($self) = @_;
3110 3806
3111 $self->check_size;
3112 $::WANT_REFRESH++; 3807 $::WANT_REFRESH++;
3113} 3808}
3114 3809
3115sub add { 3810sub add {
3116 my ($self, @children) = @_; 3811 my ($self, @children) = @_;
3117 3812
3118 for (my @widgets = @children; my $w = pop @widgets; ) {
3119 push @widgets, $w->children;
3120 $w->{root} = $self;
3121 $w->{visible} = 1;
3122 }
3123
3124 for my $child (@children) {
3125 $child->{is_toplevel} = 1; 3813 $_->{is_toplevel} = 1
3126 3814 for @children;
3127 # integerise window positions
3128 $child->{x} = int $child->{x};
3129 $child->{y} = int $child->{y};
3130 }
3131 3815
3132 $self->SUPER::add (@children); 3816 $self->SUPER::add (@children);
3133} 3817}
3134 3818
3135sub remove { 3819sub remove {
3136 my ($self, @children) = @_; 3820 my ($self, @children) = @_;
3137 3821
3138 $self->SUPER::remove (@children); 3822 $self->SUPER::remove (@children);
3823
3824 delete $self->{is_toplevel}
3825 for @children;
3139 3826
3140 while (@children) { 3827 while (@children) {
3141 my $w = pop @children; 3828 my $w = pop @children;
3142 push @children, $w->children; 3829 push @children, $w->children;
3143 $w->set_invisible; 3830 $w->set_invisible;
… …
3162 while ($self->{refresh_hook}) { 3849 while ($self->{refresh_hook}) {
3163 $_->() 3850 $_->()
3164 for values %{delete $self->{refresh_hook}}; 3851 for values %{delete $self->{refresh_hook}};
3165 } 3852 }
3166 3853
3167 if ($self->{check_size}) { 3854 if ($self->{realloc}) {
3168 my @queue = ([], []); 3855 my %queue;
3856 my @queue;
3857 my $widget;
3169 3858
3170 for (;;) { 3859 outer:
3171 if ($self->{check_size}) { 3860 while () {
3172 # heuristic: check containers last 3861 if (my $realloc = delete $self->{realloc}) {
3173 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_ 3862 for $widget (values %$realloc) {
3174 for values %{delete $self->{check_size}} 3863 $widget->{visible} or next; # do not resize invisible widgets
3864
3865 $queue{$widget+0}++ and next; # duplicates are common
3866
3867 push @{ $queue[$widget->{visible}] }, $widget;
3868 }
3175 } 3869 }
3176 3870
3177 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last; 3871 while () {
3872 @queue or last outer;
3178 3873
3179 my ($w, $h) = $widget->{user_w} && $widget->{user_h} 3874 $widget = pop @{ $queue[-1] || [] }
3180 ? @$widget{qw(user_w user_h)} 3875 and last;
3181 : $widget->size_request;
3182
3183 if (delete $widget->{force_alloc}
3184 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
3185 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
3186 3876
3877 pop @queue;
3878 }
3879
3880 delete $queue{$widget+0};
3881
3882 my ($w, $h) = $widget->size_request;
3883
3884 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3885 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3886
3887 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3888 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3889
3890 $w = $widget->{force_w} if exists $widget->{force_w};
3891 $h = $widget->{force_h} if exists $widget->{force_h};
3892
3893 if ($widget->{req_w} != $w || $widget->{req_h} != $h
3894 || delete $widget->{force_realloc}) {
3187 $widget->{req_w} = $w; 3895 $widget->{req_w} = $w;
3188 $widget->{req_h} = $h; 3896 $widget->{req_h} = $h;
3189 3897
3190 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h]; 3898 $self->{size_alloc}{$widget+0} = $widget;
3191 3899
3192 $widget->{parent}->check_size
3193 if $widget->{parent}; 3900 if (my $parent = $widget->{parent}) {
3901 $self->{realloc}{$parent+0} = $parent
3902 unless $queue{$parent+0};
3903
3904 $parent->{force_size_alloc} = 1;
3905 $self->{size_alloc}{$parent+0} = $parent;
3906 }
3194 } 3907 }
3908
3909 delete $self->{realloc}{$widget+0};
3195 } 3910 }
3196 } 3911 }
3197 3912
3198 while ($self->{size_alloc}) { 3913 while (my $size_alloc = delete $self->{size_alloc}) {
3199 for (values %{delete $self->{size_alloc}}) { 3914 my @queue = sort { $b->{visible} <=> $a->{visible} }
3200 my ($widget, $w, $h) = @$_; 3915 values %$size_alloc;
3916
3917 while () {
3918 my $widget = pop @queue || last;
3919
3920 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3201 3921
3202 $w = 0 if $w < 0; 3922 $w = 0 if $w < 0;
3203 $h = 0 if $h < 0; 3923 $h = 0 if $h < 0;
3204 3924
3925 $w = int $w + 0.5;
3926 $h = int $h + 0.5;
3927
3928 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3929 $widget->{old_w} = $widget->{w};
3930 $widget->{old_h} = $widget->{h};
3931
3205 $widget->{w} = $w; 3932 $widget->{w} = $w;
3206 $widget->{h} = $h; 3933 $widget->{h} = $h;
3934
3207 $widget->emit (size_allocate => $w, $h); 3935 $widget->emit (size_allocate => $w, $h);
3936 }
3208 } 3937 }
3209 } 3938 }
3210 3939
3211 while ($self->{post_alloc_hook}) { 3940 while ($self->{post_alloc_hook}) {
3212 $_->() 3941 $_->()
3213 for values %{delete $self->{post_alloc_hook}}; 3942 for values %{delete $self->{post_alloc_hook}};
3214 } 3943 }
3944
3215 3945
3216 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3946 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3217 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3947 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3218 glClear GL_COLOR_BUFFER_BIT; 3948 glClear GL_COLOR_BUFFER_BIT;
3219 3949
… …
3221 glLoadIdentity; 3951 glLoadIdentity;
3222 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 3952 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3223 glMatrixMode GL_MODELVIEW; 3953 glMatrixMode GL_MODELVIEW;
3224 glLoadIdentity; 3954 glLoadIdentity;
3225 3955
3956 {
3957 package CFClient::UI::Base;
3958
3959 ($draw_x, $draw_y, $draw_w, $draw_h) =
3960 (0, 0, $self->{w}, $self->{h});
3961 }
3962
3226 $self->_draw; 3963 $self->_draw;
3227} 3964}
3228 3965
3229############################################################################# 3966#############################################################################
3230 3967

Diff Legend

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