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

Diff Legend

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