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.239 by root, Thu May 25 22:29:57 2006 UTC vs.
Revision 1.307 by root, Sun Jun 18 19:13:20 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->emit ("focus_out");
287 $self->emit (visibility_change => 0);
288}
289
290sub set_visibility {
291 my ($self, $visible) = @_;
292
293 return if $self->{visible} == $visible;
294
295 $visible ? $self->hide
296 : $self->show;
297}
298
299sub toggle_visibility {
300 my ($self) = @_;
301
302 $self->{visible}
303 ? $self->hide
304 : $self->show;
242} 305}
243 306
244sub hide { 307sub hide {
245 my ($self) = @_; 308 my ($self) = @_;
246 309
… …
248 311
249 $self->{parent}->remove ($self) 312 $self->{parent}->remove ($self)
250 if $self->{parent}; 313 if $self->{parent};
251} 314}
252 315
253sub move { 316sub move_abs {
254 my ($self, $x, $y, $z) = @_; 317 my ($self, $x, $y, $z) = @_;
255 318
256 $self->{x} = int $x; 319 $self->{x} = List::Util::max 0, List::Util::min $self->{root}{w} - $self->{w}, int $x;
257 $self->{y} = int $y; 320 $self->{y} = List::Util::max 0, List::Util::min $self->{root}{h} - $self->{h}, int $y;
258 $self->{z} = $z if defined $z; 321 $self->{z} = $z if defined $z;
259 322
260 $self->update; 323 $self->update;
261} 324}
262 325
263sub set_size { 326sub set_size {
264 my ($self, $w, $h) = @_; 327 my ($self, $w, $h) = @_;
265 328
266 $self->{user_w} = $w; 329 $self->{force_w} = $w;
267 $self->{user_h} = $h; 330 $self->{force_h} = $h;
268 331
269 $self->check_size; 332 $self->realloc;
270} 333}
271 334
272sub size_request { 335sub size_request {
273 require Carp; 336 require Carp;
274 Carp::confess "size_request is abstract"; 337 Carp::confess "size_request is abstract";
… …
276 339
277sub configure { 340sub configure {
278 my ($self, $x, $y, $w, $h) = @_; 341 my ($self, $x, $y, $w, $h) = @_;
279 342
280 if ($self->{aspect}) { 343 if ($self->{aspect}) {
344 my ($ow, $oh) = ($w, $h);
345
281 my $w2 = List::Util::min $w, int $h * $self->{aspect}; 346 $w = List::Util::min $w, int $h * $self->{aspect};
282 my $h2 = List::Util::min $h, int $w / $self->{aspect}; 347 $h = List::Util::min $h, int $w / $self->{aspect};
283 348
284 # use alignment to adjust x, y 349 # use alignment to adjust x, y
285 350
286 $x += int +($w - $w2) * 0.5; 351 $x += int 0.5 * ($ow - $w);
287 $y += int +($h - $h2) * 0.5; 352 $y += int 0.5 * ($oh - $h);
288
289 ($w, $h) = ($w2, $h2);
290 } 353 }
291 354
292 if ($self->{x} != $x || $self->{y} != $y) { 355 if ($self->{x} ne $x || $self->{y} ne $y) {
293 $self->{x} = $x; 356 $self->{x} = $x;
294 $self->{y} = $y; 357 $self->{y} = $y;
295 $self->update; 358 $self->update;
296 } 359 }
297 360
298 if ($self->{w} != $w || $self->{h} != $h) { 361 if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
299 $CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h]; 362 return unless $self->{visible};
300 }
301}
302 363
303sub size_allocate { 364 $self->{alloc_w} = $w;
304 # nothing to be done 365 $self->{alloc_h} = $h;
305}
306 366
307sub reconfigure { 367 $self->{root}{size_alloc}{$self+0} = $self;
308 my ($self) = @_; 368 }
309
310 $self->check_size (1);
311 $self->update;
312} 369}
313 370
314sub children { 371sub children {
372 # nop
373}
374
375sub visible_children {
376 $_[0]->children
315} 377}
316 378
317sub set_max_size { 379sub set_max_size {
318 my ($self, $w, $h) = @_; 380 my ($self, $w, $h) = @_;
319 381
320 delete $self->{max_w}; $self->{max_w} = $w if $w; 382 $self->{max_w} = int $w if defined $w;
321 delete $self->{max_h}; $self->{max_h} = $h if $h; 383 $self->{max_h} = int $h if defined $h;
384
385 $self->realloc;
322} 386}
323 387
324sub set_tooltip { 388sub set_tooltip {
325 my ($self, $tooltip) = @_; 389 my ($self, $tooltip) = @_;
326 390
… …
331 395
332 $self->{tooltip} = $tooltip; 396 $self->{tooltip} = $tooltip;
333 397
334 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 398 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
335 delete $CFClient::UI::TOOLTIP->{owner}; 399 delete $CFClient::UI::TOOLTIP->{owner};
336 CFClient::UI::check_tooltip; 400 $CFClient::UI::TOOLTIP_WATCHER->cb->();
337 } 401 }
338} 402}
339 403
340# translate global coordinates to local coordinate system 404# translate global coordinates to local coordinate system
341sub coord2local { 405sub coord2local {
… …
349 my ($self, $x, $y) = @_; 413 my ($self, $x, $y) = @_;
350 414
351 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y}) 415 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
352} 416}
353 417
354sub focus_in { 418sub invoke_focus_in {
355 my ($self) = @_; 419 my ($self) = @_;
356 420
357 return if $FOCUS == $self; 421 return if $FOCUS == $self;
358 return unless $self->{can_focus}; 422 return unless $self->{can_focus};
359 423
360 my $focus = $FOCUS; $FOCUS = $self; 424 my $focus = $FOCUS; $FOCUS = $self;
361 425
362 $self->_emit (focus_in => $focus);
363
364 $focus->update if $focus; 426 $focus->update if $focus;
365 $FOCUS->update; 427 $FOCUS->update;
366}
367 428
429 0
430}
431
368sub focus_out { 432sub invoke_focus_out {
369 my ($self) = @_; 433 my ($self) = @_;
370 434
371 return unless $FOCUS == $self; 435 return unless $FOCUS == $self;
372 436
373 my $focus = $FOCUS; undef $FOCUS; 437 my $focus = $FOCUS; undef $FOCUS;
374 438
375 $self->_emit (focus_out => $focus);
376
377 $focus->update if $focus; #? 439 $focus->update if $focus; #?
378 440
379 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus 441 $::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus
380 unless $FOCUS; 442 unless $FOCUS;
381}
382 443
444 0
445}
446
447sub grab_focus {
448 my ($self) = @_;
449
450 $self->emit ("focus_in");
451}
452
383sub mouse_motion { } 453sub invoke_mouse_motion { 1 }
384sub button_up { } 454sub invoke_button_up { 1 }
385sub key_down { } 455sub invoke_key_down { 1 }
386sub key_up { } 456sub invoke_key_up { 1 }
387 457
388sub button_down { 458sub invoke_button_down {
389 my ($self, $ev, $x, $y) = @_; 459 my ($self, $ev, $x, $y) = @_;
390 460
391 $self->focus_in; 461 $self->grab_focus;
392}
393 462
394sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 463 1
395sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 464}
396sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 465
397sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 466sub connect {
398sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} } 467 my ($self, $signal, $cb) = @_;
468
469 push @{ $self->{signal_cb}{$signal} }, $cb;
470}
471
472sub emit {
473 my ($self, $signal, @args) = @_;
474
475 (List::Util::sum +(map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}), # before
476 ($self->can ("invoke_$signal") || sub { 1 })->($self, @args)) # closure
477 || ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent
478}
479
480sub find_widget {
481 my ($self, $x, $y) = @_;
482
483 return () unless $self->{can_events};
484
485 return $self
486 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
487 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
488
489 ()
490}
491
492sub set_parent {
493 my ($self, $parent) = @_;
494
495 Scalar::Util::weaken ($self->{parent} = $parent);
496 $self->set_visible if $parent->{visible};
497}
498
499sub realloc {
500 my ($self) = @_;
501
502 if ($self->{visible}) {
503 return if $self->{root}{realloc}{$self+0};
504
505 $self->{root}{realloc}{$self+0} = $self;
506 $self->{root}->update;
507 } else {
508 delete $self->{req_w};
509 delete $self->{req_h};
510 }
511}
512
513sub update {
514 my ($self) = @_;
515
516 $self->{parent}->update
517 if $self->{parent};
518}
519
520sub reconfigure {
521 my ($self) = @_;
522
523 $self->realloc;
524 $self->update;
525}
526
527# using global variables seems a bit hacky, but passing through all drawing
528# functions seems pointless.
529our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn
399 530
400sub draw { 531sub draw {
401 my ($self) = @_; 532 my ($self) = @_;
402 533
403 return unless $self->{h} && $self->{w}; 534 return unless $self->{h} && $self->{w};
535
536 # update screen rectangle
537 local $draw_x = $draw_x + $self->{x};
538 local $draw_y = $draw_y + $self->{y};
539 local $draw_w = $draw_x + $self->{w};
540 local $draw_h = $draw_y + $self->{h};
541
542 # skip widgets that are entirely outside the drawing area
543 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
544 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
404 545
405 glPushMatrix; 546 glPushMatrix;
406 glTranslate $self->{x}, $self->{y}, 0; 547 glTranslate $self->{x}, $self->{y}, 0;
407 $self->_draw;
408 glPopMatrix;
409 548
410 if ($self == $HOVER && $self->{can_hover}) { 549 if ($self == $HOVER && $self->{can_hover}) {
411 my ($x, $y) = @$self{qw(x y)};
412
413 glColor 1, 0.8, 0.5, 0.2; 550 glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
414 glEnable GL_BLEND; 551 glEnable GL_BLEND;
415 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 552 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
416 glBegin GL_QUADS; 553 glBegin GL_QUADS;
417 glVertex $x , $y; 554 glVertex 0 , 0;
418 glVertex $x + $self->{w}, $y; 555 glVertex $self->{w}, 0;
419 glVertex $x + $self->{w}, $y + $self->{h}; 556 glVertex $self->{w}, $self->{h};
420 glVertex $x , $y + $self->{h}; 557 glVertex 0 , $self->{h};
421 glEnd; 558 glEnd;
422 glDisable GL_BLEND; 559 glDisable GL_BLEND;
423 } 560 }
424 561
425 if ($ENV{PCLIENT_DEBUG}) { 562 if ($ENV{CFPLUS_DEBUG} & 1) {
426 glPushMatrix; 563 glPushMatrix;
427 glColor 1, 1, 0, 1; 564 glColor 1, 1, 0, 1;
428 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 565 glTranslate 0.375, 0.375;
429 glBegin GL_LINE_LOOP; 566 glBegin GL_LINE_LOOP;
430 glVertex 0 , 0; 567 glVertex 0 , 0;
431 glVertex $self->{w} - 1, 0; 568 glVertex $self->{w} - 1, 0;
432 glVertex $self->{w} - 1, $self->{h} - 1; 569 glVertex $self->{w} - 1, $self->{h} - 1;
433 glVertex 0 , $self->{h} - 1; 570 glVertex 0 , $self->{h} - 1;
434 glEnd; 571 glEnd;
435 glPopMatrix; 572 glPopMatrix;
436 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 573 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
437 } 574 }
575
576 $self->_draw;
577 glPopMatrix;
438} 578}
439 579
440sub _draw { 580sub _draw {
441 my ($self) = @_; 581 my ($self) = @_;
442 582
443 warn "no draw defined for $self\n"; 583 warn "no draw defined for $self\n";
444} 584}
445 585
446sub find_widget {
447 my ($self, $x, $y) = @_;
448
449 return () unless $self->{can_events};
450
451 return $self
452 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
453 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
454
455 ()
456}
457
458sub set_parent {
459 my ($self, $parent) = @_;
460
461 Scalar::Util::weaken ($self->{parent} = $parent);
462
463 $self->{root} = $parent->{root};
464 $self->{visible} = $parent->{visible};
465
466 # TODO: req_w _does_change after ->reconfigure
467 $self->check_size
468 unless exists $self->{req_w};
469
470 $self->show;
471}
472
473sub check_size {
474 my ($self, $forced) = @_;
475
476 $self->{force_alloc} = 1 if $forced;
477 $CFClient::UI::ROOT->{check_size}{$self} = $self;
478}
479
480sub update {
481 my ($self) = @_;
482
483 $self->{parent}->update
484 if $self->{parent};
485}
486
487sub connect {
488 my ($self, $signal, $cb) = @_;
489
490 push @{ $self->{signal_cb}{$signal} }, $cb;
491}
492
493sub _emit {
494 my ($self, $signal, @args) = @_;
495
496 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
497}
498
499sub emit {
500 my ($self, $signal, @args) = @_;
501
502 $self->_emit ($signal, @args)
503 || $self->$signal (@args);
504}
505
506sub DESTROY { 586sub DESTROY {
507 my ($self) = @_; 587 my ($self) = @_;
508 588
509 delete $WIDGET{$self+0}; 589 delete $WIDGET{$self+0};
510 #$self->deactivate; 590
591 eval { $self->destroy };
592 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
511} 593}
512 594
513############################################################################# 595#############################################################################
514 596
515package CFClient::UI::DrawBG; 597package CFClient::UI::DrawBG;
… …
540 622
541 if ($color && (@$color < 4 || $color->[3])) { 623 if ($color && (@$color < 4 || $color->[3])) {
542 my ($w, $h) = @$self{qw(w h)}; 624 my ($w, $h) = @$self{qw(w h)};
543 625
544 glEnable GL_BLEND; 626 glEnable GL_BLEND;
545 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 627 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
546 glColor @$color; 628 glColor_premultiply @$color;
547 629
548 glBegin GL_QUADS; 630 glBegin GL_QUADS;
549 glVertex 0 , 0; 631 glVertex 0 , 0;
550 glVertex 0 , $h; 632 glVertex 0 , $h;
551 glVertex $w, $h; 633 glVertex $w, $h;
… …
566 my ($class, %arg) = @_; 648 my ($class, %arg) = @_;
567 $class->SUPER::new (can_events => 0, %arg); 649 $class->SUPER::new (can_events => 0, %arg);
568} 650}
569 651
570sub size_request { 652sub size_request {
571 (0, 0) 653 my ($self) = @_;
654
655 ($self->{w} + 0, $self->{h} + 0)
572} 656}
573 657
574sub draw { } 658sub draw { }
575 659
576############################################################################# 660#############################################################################
… …
580our @ISA = CFClient::UI::Base::; 664our @ISA = CFClient::UI::Base::;
581 665
582sub new { 666sub new {
583 my ($class, %arg) = @_; 667 my ($class, %arg) = @_;
584 668
585 my $children = delete $arg{children} || []; 669 my $children = delete $arg{children};
586 670
587 my $self = $class->SUPER::new ( 671 my $self = $class->SUPER::new (
588 children => [], 672 children => [],
589 can_events => 0, 673 can_events => 0,
590 %arg, 674 %arg,
591 ); 675 );
676
592 $self->add ($_) for @$children; 677 $self->add (@$children)
678 if $children;
593 679
594 $self 680 $self
595} 681}
596 682
597sub add { 683sub add {
… …
605 $self->{children} = [ 691 $self->{children} = [
606 sort { $a->{z} <=> $b->{z} } 692 sort { $a->{z} <=> $b->{z} }
607 @{$self->{children}}, @widgets 693 @{$self->{children}}, @widgets
608 ]; 694 ];
609 695
610 $self->check_size (1); 696 $self->realloc;
611 $self->update;
612} 697}
613 698
614sub children { 699sub children {
615 @{ $_[0]{children} } 700 @{ $_[0]{children} }
616} 701}
… …
621 delete $child->{parent}; 706 delete $child->{parent};
622 $child->hide; 707 $child->hide;
623 708
624 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 709 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
625 710
626 $self->check_size (1); 711 $self->realloc;
627 $self->update;
628} 712}
629 713
630sub clear { 714sub clear {
631 my ($self) = @_; 715 my ($self) = @_;
632 716
… …
636 for (@$children) { 720 for (@$children) {
637 delete $_->{parent}; 721 delete $_->{parent};
638 $_->hide; 722 $_->hide;
639 } 723 }
640 724
641 $self->check_size; 725 $self->realloc;
642 $self->update;
643} 726}
644 727
645sub find_widget { 728sub find_widget {
646 my ($self, $x, $y) = @_; 729 my ($self, $x, $y) = @_;
647 730
648 $x -= $self->{x}; 731 $x -= $self->{x};
649 $y -= $self->{y}; 732 $y -= $self->{y};
650 733
651 my $res; 734 my $res;
652 735
653 for (reverse @{ $self->{children} }) { 736 for (reverse $self->visible_children) {
654 $res = $_->find_widget ($x, $y) 737 $res = $_->find_widget ($x, $y)
655 and return $res; 738 and return $res;
656 } 739 }
657 740
658 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y}) 741 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
… …
679} 762}
680 763
681sub add { 764sub add {
682 my ($self, $child) = @_; 765 my ($self, $child) = @_;
683 766
684 $self->{children} = []; 767 $self->SUPER::remove ($_) for @{ $self->{children} };
685
686 $self->SUPER::add ($child); 768 $self->SUPER::add ($child);
687} 769}
688 770
689sub remove { 771sub remove {
690 my ($self, $widget) = @_; 772 my ($self, $widget) = @_;
… …
699 781
700sub size_request { 782sub size_request {
701 $_[0]{children}[0]->size_request 783 $_[0]{children}[0]->size_request
702} 784}
703 785
704sub size_allocate { 786sub invoke_size_allocate {
705 my ($self, $w, $h) = @_; 787 my ($self, $w, $h) = @_;
706 788
707 $self->{children}[0]->configure (0, 0, $w, $h); 789 $self->{children}[0]->configure (0, 0, $w, $h);
790
791 1
708} 792}
709 793
710############################################################################# 794#############################################################################
795
796# back-buffered drawing area
711 797
712package CFClient::UI::Window; 798package CFClient::UI::Window;
713 799
714our @ISA = CFClient::UI::Bin::; 800our @ISA = CFClient::UI::Bin::;
715 801
… …
726 812
727 $ROOT->on_post_alloc ($self => sub { $self->render_child }); 813 $ROOT->on_post_alloc ($self => sub { $self->render_child });
728 $self->SUPER::update; 814 $self->SUPER::update;
729} 815}
730 816
731sub size_allocate { 817sub invoke_size_allocate {
732 my ($self, $w, $h) = @_; 818 my ($self, $w, $h) = @_;
733 819
734 $self->SUPER::size_allocate ($w, $h);
735 $self->update; 820 $self->update;
821
822 $self->SUPER::invoke_size_allocate ($w, $h)
736} 823}
737 824
738sub _render { 825sub _render {
826 my ($self) = @_;
827
739 $_[0]{children}[0]->draw; 828 $self->{children}[0]->draw;
740} 829}
741 830
742sub render_child { 831sub render_child {
743 my ($self) = @_; 832 my ($self) = @_;
744 833
745 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 834 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
746 glClearColor 0, 0, 0, 0; 835 glClearColor 0, 0, 0, 0;
747 glClear GL_COLOR_BUFFER_BIT; 836 glClear GL_COLOR_BUFFER_BIT;
748 837
838 {
839 package CFClient::UI::Base;
840
841 ($draw_x, $draw_y, $draw_w, $draw_h) =
842 (0, 0, $self->{w}, $self->{h});
843 }
844
749 $self->_render; 845 $self->_render;
750 }; 846 };
751} 847}
752 848
753sub _draw { 849sub _draw {
754 my ($self) = @_; 850 my ($self) = @_;
755 851
756 my ($w, $h) = ($self->w, $self->h); 852 my ($w, $h) = @$self{qw(w h)};
757 853
758 my $tex = $self->{texture} 854 my $tex = $self->{texture}
759 or return; 855 or return;
760 856
761 glEnable GL_TEXTURE_2D; 857 glEnable GL_TEXTURE_2D;
762 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 858 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
763 glColor 1, 1, 1, 1; 859 glColor 0, 0, 0, 1;
764 860
765 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 861 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
766 862
767 glDisable GL_TEXTURE_2D; 863 glDisable GL_TEXTURE_2D;
768} 864}
… …
784} 880}
785 881
786sub size_request { 882sub size_request {
787 my ($self) = @_; 883 my ($self) = @_;
788 884
789 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 885 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
790 886
791 @$self{qw(child_w child_h)} 887 $w = 10 if $self->{scroll_x};
792} 888 $h = 10 if $self->{scroll_y};
793 889
890 ($w, $h)
891}
892
794sub size_allocate { 893sub invoke_size_allocate {
795 my ($self, $w, $h) = @_; 894 my ($self, $w, $h) = @_;
796 895
896 my $child = $self->child;
897
797 $w = $self->{child_w} if $self->{scroll_x} && $self->{child_w}; 898 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
798 $h = $self->{child_h} if $self->{scroll_y} && $self->{child_h}; 899 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
799 900
800 $self->child->configure (0, 0, $w, $h); 901 $self->child->configure (0, 0, $w, $h);
801 $self->update; 902 $self->update;
903
904 1
802} 905}
803 906
804sub set_offset { 907sub set_offset {
805 my ($self, $x, $y) = @_; 908 my ($self, $x, $y) = @_;
806 909
… …
839} 942}
840 943
841sub _render { 944sub _render {
842 my ($self) = @_; 945 my ($self) = @_;
843 946
947 local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};
948 local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y};
949
844 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 950 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
845 951
846 $self->SUPER::_render; 952 $self->SUPER::_render;
847} 953}
848 954
… …
851package CFClient::UI::ScrolledWindow; 957package CFClient::UI::ScrolledWindow;
852 958
853our @ISA = CFClient::UI::HBox::; 959our @ISA = CFClient::UI::HBox::;
854 960
855sub new { 961sub new {
856 my $class = shift; 962 my ($class, %arg) = @_;
963
964 my $child = delete $arg{child};
857 965
858 my $self; 966 my $self;
859 967
860 my $slider = new CFClient::UI::Slider 968 my $slider = new CFClient::UI::Slider
861 vertical => 1, 969 vertical => 1,
862 range => [0, 0, 1, 0.01], # HACK fix 970 range => [0, 0, 1, 0.01], # HACK fix
863 connect_changed => sub { 971 on_changed => sub {
864 $self->{vp}->set_offset (0, $_[1]); 972 $self->{vp}->set_offset (0, $_[1]);
865 }, 973 },
866 ; 974 ;
867 975
868 $self = $class->SUPER::new ( 976 $self = $class->SUPER::new (
869 vp => (new CFClient::UI::ViewPort expand => 1), 977 vp => (new CFClient::UI::ViewPort expand => 1),
870 slider => $slider, 978 slider => $slider,
871 @_, 979 %arg,
872 ); 980 );
873 981
874 $self->{vp}->add ($self->{scrolled});
875 $self->add ($self->{vp});
876 $self->add ($self->{slider}); 982 $self->SUPER::add ($self->{vp}, $self->{slider});
983 $self->add ($child) if $child;
877 984
878 $self 985 $self
986}
987
988sub add {
989 my ($self, $widget) = @_;
990
991 $self->{vp}->add ($self->{child} = $widget);
879} 992}
880 993
881sub update { 994sub update {
882 my ($self) = @_; 995 my ($self) = @_;
883 996
… …
886 # todo: overwrite size_allocate of child 999 # todo: overwrite size_allocate of child
887 my $child = $self->{vp}->child; 1000 my $child = $self->{vp}->child;
888 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]); 1001 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
889} 1002}
890 1003
891sub size_allocate { 1004sub invoke_size_allocate {
892 my ($self, $w, $h) = @_; 1005 my ($self, $w, $h) = @_;
893
894 $self->SUPER::size_allocate ($w, $h);
895 1006
896 my $child = $self->{vp}->child; 1007 my $child = $self->{vp}->child;
897 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]); 1008 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1009
1010 $self->SUPER::invoke_size_allocate ($w, $h)
898} 1011}
899 1012
900#TODO# update range on size_allocate depending on child 1013#TODO# update range on size_allocate depending on child
901# update viewport offset on scroll 1014# update viewport offset on scroll
902 1015
… …
922 1035
923 if ($self->{bg}) { 1036 if ($self->{bg}) {
924 my ($w, $h) = @$self{qw(w h)}; 1037 my ($w, $h) = @$self{qw(w h)};
925 1038
926 glEnable GL_BLEND; 1039 glEnable GL_BLEND;
927 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1040 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
928 glColor @{ $self->{bg} }; 1041 glColor_premultiply @{ $self->{bg} };
929 1042
930 glBegin GL_QUADS; 1043 glBegin GL_QUADS;
931 glVertex 0 , 0; 1044 glVertex 0 , 0;
932 glVertex 0 , $h; 1045 glVertex 0 , $h;
933 glVertex $w, $h; 1046 glVertex $w, $h;
… …
946 1059
947our @ISA = CFClient::UI::Bin::; 1060our @ISA = CFClient::UI::Bin::;
948 1061
949use CFClient::OpenGL; 1062use CFClient::OpenGL;
950 1063
951my @tex = 1064my $bg =
1065 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1066 mipmap => 1, wrap => 1;
1067
1068my @border =
952 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1069 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
953 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1070 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
954 1071
955sub new { 1072sub new {
956 my $class = shift; 1073 my ($class, %arg) = @_;
957
958 # TODO: user_x, user_y, overwrite moveto?
959 1074
960 my $self = $class->SUPER::new ( 1075 my $self = $class->SUPER::new (
961 bg => [1, 1, 1, 1], 1076 bg => [1, 1, 1, 1],
962 border_bg => [1, 1, 1, 1], 1077 border_bg => [1, 1, 1, 1],
963 border => 0.6, 1078 border => 0.6,
964 is_toplevel => 1,
965 can_events => 1, 1079 can_events => 1,
966 @_ 1080 min_w => 16,
1081 min_h => 16,
1082 %arg,
967 ); 1083 );
968 1084
969 $self->{title} &&= new CFClient::UI::Label 1085 $self->{title_widget} = new CFClient::UI::Label
970 align => 0, 1086 align => 0,
971 valign => 1, 1087 valign => 1,
972 text => $self->{title}, 1088 text => $self->{title},
973 fontsize => $self->{border}; 1089 fontsize => $self->{border},
1090 if exists $self->{title};
1091
1092 if ($self->{has_close_button}) {
1093 $self->{close_button} =
1094 new CFClient::UI::ImageButton
1095 image => 'x1_close.png',
1096 on_activate => sub { $self->hide };
1097
1098 $self->CFClient::UI::Container::add ($self->{close_button});
1099 }
974 1100
975 $self 1101 $self
1102}
1103
1104sub add {
1105 my ($self, @widgets) = @_;
1106
1107 $self->SUPER::add (@widgets);
1108 $self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button};
1109 $self->CFClient::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
976} 1110}
977 1111
978sub border { 1112sub border {
979 int $_[0]{border} * $::FONTSIZE 1113 int $_[0]{border} * $::FONTSIZE
980} 1114}
981 1115
982sub size_request { 1116sub size_request {
983 my ($self) = @_; 1117 my ($self) = @_;
1118
1119 $self->{title_widget}->size_request
1120 if $self->{title_widget};
1121
1122 $self->{close_button}->size_request
1123 if $self->{close_button};
984 1124
985 my ($w, $h) = $self->SUPER::size_request; 1125 my ($w, $h) = $self->SUPER::size_request;
986 1126
987 ( 1127 (
988 $w + $self->border * 2, 1128 $w + $self->border * 2,
989 $h + $self->border * 2, 1129 $h + $self->border * 2,
990 ) 1130 )
991} 1131}
992 1132
993sub size_allocate { 1133sub invoke_size_allocate {
994 my ($self, $w, $h) = @_; 1134 my ($self, $w, $h) = @_;
995 1135
1136 if ($self->{title_widget}) {
1137 $self->{title_widget}{w} = $w;
1138 $self->{title_widget}{h} = $h;
1139 $self->{title_widget}->invoke_size_allocate ($w, $h);
1140 }
1141
1142 my $border = $self->border;
1143
996 $h -= List::Util::max 0, $self->border * 2; 1144 $h -= List::Util::max 0, $border * 2;
997 $w -= List::Util::max 0, $self->border * 2; 1145 $w -= List::Util::max 0, $border * 2;
998 1146
999 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
1000 if $self->{title};
1001
1002 $self->child->configure ($self->border, $self->border, $w, $h); 1147 $self->child->configure ($border, $border, $w, $h);
1003}
1004 1148
1149 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1150 if $self->{close_button};
1151
1152 1
1153}
1154
1005sub button_down { 1155sub invoke_button_down {
1006 my ($self, $ev, $x, $y) = @_; 1156 my ($self, $ev, $x, $y) = @_;
1007 1157
1008 my ($w, $h) = @$self{qw(w h)}; 1158 my ($w, $h) = @$self{qw(w h)};
1009 my $border = $self->border; 1159 my $border = $self->border;
1010 1160
… …
1023 my ($ev, $x, $y) = @_; 1173 my ($ev, $x, $y) = @_;
1024 1174
1025 my $dx = $ev->{x} - $ox; 1175 my $dx = $ev->{x} - $ox;
1026 my $dy = $ev->{y} - $oy; 1176 my $dy = $ev->{y} - $oy;
1027 1177
1028 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1178 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1029 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1179 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1180
1030 $self->move ($wx + $dx * $mx, $wy + $dy * $my); 1181 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1031 $self->check_size; 1182 $self->realloc;
1032 }; 1183 };
1033 1184
1034 } elsif ($lr ^ $td) { 1185 } elsif ($lr ^ $td) {
1035 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1186 my ($ox, $oy) = ($ev->{x}, $ev->{y});
1036 my ($bx, $by) = ($self->{x}, $self->{y}); 1187 my ($bx, $by) = ($self->{x}, $self->{y});
… …
1038 $self->{motion} = sub { 1189 $self->{motion} = sub {
1039 my ($ev, $x, $y) = @_; 1190 my ($ev, $x, $y) = @_;
1040 1191
1041 ($x, $y) = ($ev->{x}, $ev->{y}); 1192 ($x, $y) = ($ev->{x}, $ev->{y});
1042 1193
1043 $self->move ($bx + $x - $ox, $by + $y - $oy); 1194 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1044 $self->update; 1195 # HACK: the next line is required to enforce placement
1196 $self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
1045 }; 1197 };
1198 } else {
1199 return 0;
1200 }
1201
1046 } 1202 1
1047} 1203}
1048 1204
1049sub button_up { 1205sub invoke_button_up {
1050 my ($self, $ev, $x, $y) = @_; 1206 my ($self, $ev, $x, $y) = @_;
1051 1207
1052 delete $self->{motion}; 1208 ! ! delete $self->{motion}
1053} 1209}
1054 1210
1055sub mouse_motion { 1211sub invoke_mouse_motion {
1056 my ($self, $ev, $x, $y) = @_; 1212 my ($self, $ev, $x, $y) = @_;
1057 1213
1058 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1214 $self->{motion}->($ev, $x, $y) if $self->{motion};
1215
1216 ! ! $self->{motion}
1059} 1217}
1060 1218
1061sub _draw { 1219sub _draw {
1062 my ($self) = @_; 1220 my ($self) = @_;
1063 1221
1222 my $child = $self->{children}[0];
1223
1064 my ($w, $h ) = ($self->{w}, $self->{h}); 1224 my ($w, $h ) = ($self->{w}, $self->{h});
1065 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1225 my ($cw, $ch) = ($child->{w}, $child->{h});
1066 1226
1067 glEnable GL_TEXTURE_2D; 1227 glEnable GL_TEXTURE_2D;
1068 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1228 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1069 1229
1070 my $border = $self->border; 1230 my $border = $self->border;
1071 1231
1072 glColor @{ $self->{border_bg} }; 1232 glColor @{ $self->{border_bg} };
1073 $tex[1]->draw_quad_alpha (0, 0, $w, $border); 1233 $border[0]->draw_quad_alpha (0, 0, $w, $border);
1074 $tex[3]->draw_quad_alpha (0, $border, $border, $ch); 1234 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
1075 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1235 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1076 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border); 1236 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
1077 1237
1078 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1238 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1079 my $bg = $tex[0]; 1239 glColor @{ $self->{bg} };
1080 1240
1081 # TODO: repeat texture not scale 1241 # TODO: repeat texture not scale
1242 # solve this better(?)
1082 my $rep_x = $cw / $bg->{w}; 1243 $bg->{s} = $cw / $bg->{w};
1083 my $rep_y = $ch / $bg->{h}; 1244 $bg->{t} = $ch / $bg->{h};
1084
1085 glColor @{ $self->{bg} };
1086
1087 $bg->{s} = $rep_x;
1088 $bg->{t} = $rep_y;
1089 $bg->{wrap_mode} = 1;
1090 $bg->draw_quad_alpha ($border, $border, $cw, $ch); 1245 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1091 } 1246 }
1092 1247
1093 glDisable GL_TEXTURE_2D; 1248 glDisable GL_TEXTURE_2D;
1094 1249
1095 $self->{title}->draw if $self->{title};
1096
1097 $self->child->draw; 1250 $child->draw;
1251
1252 if ($self->{title_widget}) {
1253 glTranslate 0, $border - $self->{h};
1254 $self->{title_widget}->_draw;
1255
1256 glTranslate 0, - ($border - $self->{h});
1257 }
1258
1259 $self->{close_button}->draw
1260 if $self->{close_button};
1098} 1261}
1099 1262
1100############################################################################# 1263#############################################################################
1101 1264
1102package CFClient::UI::Table; 1265package CFClient::UI::Table;
… …
1124 my ($self, $x, $y, $child) = @_; 1287 my ($self, $x, $y, $child) = @_;
1125 1288
1126 $child->set_parent ($self); 1289 $child->set_parent ($self);
1127 $self->{children}[$y][$x] = $child; 1290 $self->{children}[$y][$x] = $child;
1128 1291
1129 $self->check_size (1); 1292 $self->realloc;
1293}
1294
1295sub remove {
1296 my ($self, $child) = @_;
1297
1298 # TODO: not yet implemented
1130} 1299}
1131 1300
1132# TODO: move to container class maybe? send children a signal on removal? 1301# TODO: move to container class maybe? send children a signal on removal?
1133sub clear { 1302sub clear {
1134 my ($self) = @_; 1303 my ($self) = @_;
… …
1139 for (@children) { 1308 for (@children) {
1140 delete $_->{parent}; 1309 delete $_->{parent};
1141 $_->hide; 1310 $_->hide;
1142 } 1311 }
1143 1312
1144 $self->check_size (1); 1313 $self->realloc;
1145 $self->update;
1146} 1314}
1147 1315
1148sub get_wh { 1316sub get_wh {
1149 my ($self) = @_; 1317 my ($self) = @_;
1150 1318
… …
1176 (sum @$ws), 1344 (sum @$ws),
1177 (sum @$hs), 1345 (sum @$hs),
1178 ) 1346 )
1179} 1347}
1180 1348
1181sub size_allocate { 1349sub invoke_size_allocate {
1182 my ($self, $w, $h) = @_; 1350 my ($self, $w, $h) = @_;
1183 1351
1184 my ($ws, $hs) = $self->get_wh; 1352 my ($ws, $hs) = $self->get_wh;
1185 1353
1186 my $req_w = (sum @$ws) || 1; 1354 my $req_w = (sum @$ws) || 1;
… …
1218 } 1386 }
1219 1387
1220 $y += $row_h; 1388 $y += $row_h;
1221 } 1389 }
1222 1390
1391 1
1223} 1392}
1224 1393
1225sub find_widget { 1394sub find_widget {
1226 my ($self, $x, $y) = @_; 1395 my ($self, $x, $y) = @_;
1227 1396
… …
1246 } 1415 }
1247} 1416}
1248 1417
1249############################################################################# 1418#############################################################################
1250 1419
1420package CFClient::UI::Box;
1421
1422our @ISA = CFClient::UI::Container::;
1423
1424sub size_request {
1425 my ($self) = @_;
1426
1427 $self->{vertical}
1428 ? (
1429 (List::Util::max map $_->{req_w}, @{$self->{children}}),
1430 (List::Util::sum map $_->{req_h}, @{$self->{children}}),
1431 )
1432 : (
1433 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1434 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1435 )
1436}
1437
1438sub invoke_size_allocate {
1439 my ($self, $w, $h) = @_;
1440
1441 my $space = $self->{vertical} ? $h : $w;
1442 my $children = $self->{children};
1443
1444 my @req;
1445
1446 if ($self->{homogeneous}) {
1447 @req = ($space / (@$children || 1)) x @$children;
1448 } else {
1449 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;
1450 my $req = List::Util::sum @req;
1451
1452 if ($req > $space) {
1453 # ah well, not enough space
1454 $_ *= $space / $req for @req;
1455 } else {
1456 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1457
1458 $space = ($space - $req) / $expand; # remaining space to give away
1459
1460 $req[$_] += $space * $children->[$_]{expand}
1461 for 0 .. $#$children;
1462 }
1463 }
1464
1465 CFClient::UI::harmonize \@req;
1466
1467 my $pos = 0;
1468 for (0 .. $#$children) {
1469 my $alloc = $req[$_];
1470 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1471
1472 $pos += $alloc;
1473 }
1474
1475 1
1476}
1477
1478#############################################################################
1479
1251package CFClient::UI::HBox; 1480package CFClient::UI::HBox;
1252 1481
1253# TODO: wrap into common Box base class
1254
1255our @ISA = CFClient::UI::Container::; 1482our @ISA = CFClient::UI::Box::;
1256 1483
1257sub size_request { 1484sub new {
1258 my ($self) = @_; 1485 my $class = shift;
1259 1486
1260 my @alloc = map [$_->size_request], @{$self->{children}}; 1487 $class->SUPER::new (
1261 1488 vertical => 0,
1262 ( 1489 @_,
1263 (List::Util::sum map $_->[0], @alloc),
1264 (List::Util::max map $_->[1], @alloc),
1265 ) 1490 )
1266} 1491}
1267 1492
1268sub size_allocate {
1269 my ($self, $w, $h) = @_;
1270
1271 ($h, $w) = ($w, $h);
1272
1273 my $children = $self->{children};
1274
1275 my @h = map $_->{req_w}, @$children;
1276
1277 my $req_h = List::Util::sum @h;
1278
1279 if ($req_h > $h) {
1280 # ah well, not enough space
1281 $_ *= $h / $req_h for @h;
1282 } else {
1283 my $exp = List::Util::sum map $_->{expand}, @$children;
1284 $exp ||= 1;
1285
1286 for (0 .. $#$children) {
1287 my $child = $children->[$_];
1288
1289 my $alloc_h = $h[$_];
1290 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1291 $h[$_] = $alloc_h;
1292 }
1293 }
1294
1295 CFClient::UI::harmonize \@h;
1296
1297 my $y = 0;
1298 for (0 .. $#$children) {
1299 my $child = $children->[$_];
1300 my $h = $h[$_];
1301 $child->configure ($y, 0, $h, $w);
1302
1303 $y += $h;
1304 }
1305
1306 1
1307}
1308
1309############################################################################# 1493#############################################################################
1310 1494
1311package CFClient::UI::VBox; 1495package CFClient::UI::VBox;
1312 1496
1313# TODO: wrap into common Box base class
1314
1315our @ISA = CFClient::UI::Container::; 1497our @ISA = CFClient::UI::Box::;
1316 1498
1317sub size_request { 1499sub new {
1318 my ($self) = @_; 1500 my $class = shift;
1319 1501
1320 my @alloc = map [$_->size_request], @{$self->{children}}; 1502 $class->SUPER::new (
1321 1503 vertical => 1,
1322 ( 1504 @_,
1323 (List::Util::max map $_->[0], @alloc),
1324 (List::Util::sum map $_->[1], @alloc),
1325 ) 1505 )
1326}
1327
1328sub size_allocate {
1329 my ($self, $w, $h) = @_;
1330
1331 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1332
1333 my $children = $self->{children};
1334
1335 my @h = map $_->{req_h}, @$children;
1336
1337 my $req_h = List::Util::sum @h;
1338
1339 if ($req_h > $h) {
1340 # ah well, not enough space
1341 $_ *= $h / $req_h for @h;
1342 } else {
1343 my $exp = List::Util::sum map $_->{expand}, @$children;
1344 $exp ||= 1;
1345
1346 for (0 .. $#$children) {
1347 my $child = $children->[$_];
1348
1349 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1350 }
1351 }
1352
1353 CFClient::UI::harmonize \@h;
1354
1355 my $y = 0;
1356 for (0 .. $#$children) {
1357 my $child = $children->[$_];
1358 my $h = $h[$_];
1359 $child->configure (0, $y, $w, $h);
1360
1361 $y += $h;
1362 }
1363
1364 1
1365} 1506}
1366 1507
1367############################################################################# 1508#############################################################################
1368 1509
1369package CFClient::UI::Label; 1510package CFClient::UI::Label;
… …
1386 ellipsise => 3, # end 1527 ellipsise => 3, # end
1387 layout => (new CFClient::Layout), 1528 layout => (new CFClient::Layout),
1388 fontsize => 1, 1529 fontsize => 1,
1389 align => -1, 1530 align => -1,
1390 valign => -1, 1531 valign => -1,
1391 padding => 2, 1532 padding_x => 2,
1533 padding_y => 2,
1392 can_events => 0, 1534 can_events => 0,
1393 %arg 1535 %arg
1394 ); 1536 );
1395 1537
1396 if (exists $self->{template}) { 1538 if (exists $self->{template}) {
… …
1423 1565
1424 delete $self->{texture}; 1566 delete $self->{texture};
1425 $self->SUPER::update; 1567 $self->SUPER::update;
1426} 1568}
1427 1569
1570sub realloc {
1571 my ($self) = @_;
1572
1573 delete $self->{ox};
1574 $self->SUPER::realloc;
1575}
1576
1428sub set_text { 1577sub set_text {
1429 my ($self, $text) = @_; 1578 my ($self, $text) = @_;
1430 1579
1431 return if $self->{text} eq "T$text"; 1580 return if $self->{text} eq "T$text";
1432 $self->{text} = "T$text"; 1581 $self->{text} = "T$text";
1433 1582
1434 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1583 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1435 $self->{layout}->set_text ($text); 1584 $self->{layout}->set_text ($text);
1436 1585
1586 delete $self->{size_req};
1587 $self->realloc;
1437 $self->update; 1588 $self->update;
1438 $self->check_size;
1439} 1589}
1440 1590
1441sub set_markup { 1591sub set_markup {
1442 my ($self, $markup) = @_; 1592 my ($self, $markup) = @_;
1443 1593
… …
1447 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1597 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1448 1598
1449 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba; 1599 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1450 $self->{layout}->set_markup ($markup); 1600 $self->{layout}->set_markup ($markup);
1451 1601
1602 delete $self->{size_req};
1603 $self->realloc;
1452 $self->update; 1604 $self->update;
1453 $self->check_size;
1454} 1605}
1455 1606
1456sub size_request { 1607sub size_request {
1457 my ($self) = @_; 1608 my ($self) = @_;
1458 1609
1610 $self->{size_req} ||= do {
1459 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1611 $self->{layout}->set_font ($self->{font}) if $self->{font};
1460 $self->{layout}->set_width ($self->{max_w} || -1); 1612 $self->{layout}->set_width ($self->{max_w} || -1);
1461 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1613 $self->{layout}->set_ellipsise ($self->{ellipsise});
1462 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1614 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1463 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1615 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1464 1616
1465 my ($w, $h) = $self->{layout}->size; 1617 my ($w, $h) = $self->{layout}->size;
1466 1618
1467 if (exists $self->{template}) { 1619 if (exists $self->{template}) {
1468 $self->{template}->set_font ($self->{font}) if $self->{font}; 1620 $self->{template}->set_font ($self->{font}) if $self->{font};
1469 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1621 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1470 1622
1471 my ($w2, $h2) = $self->{template}->size; 1623 my ($w2, $h2) = $self->{template}->size;
1472 1624
1473 $w = List::Util::max $w, $w2; 1625 $w = List::Util::max $w, $w2;
1474 $h = List::Util::max $h, $h2; 1626 $h = List::Util::max $h, $h2;
1627 }
1628
1629 [$w, $h]
1475 } 1630 };
1476 1631
1477 ( 1632 @{ $self->{size_req} }
1478 $w + $self->{padding} * 2,
1479 $h + $self->{padding} * 2,
1480 )
1481} 1633}
1482 1634
1483sub size_allocate { 1635sub invoke_size_allocate {
1484 my ($self, $w, $h) = @_; 1636 my ($self, $w, $h) = @_;
1485 1637
1638 delete $self->{ox};
1639
1486 delete $self->{texture}; 1640 delete $self->{texture}
1641 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1642
1643 1
1487} 1644}
1488 1645
1489sub set_fontsize { 1646sub set_fontsize {
1490 my ($self, $fontsize) = @_; 1647 my ($self, $fontsize) = @_;
1491 1648
1492 $self->{fontsize} = $fontsize; 1649 $self->{fontsize} = $fontsize;
1493 delete $self->{texture}; 1650 delete $self->{texture};
1494 1651
1495 $self->update; 1652 $self->realloc;
1496 $self->check_size; 1653}
1654
1655sub reconfigure {
1656 my ($self) = @_;
1657
1658 delete $self->{size_req};
1659
1660 $self->SUPER::reconfigure;
1497} 1661}
1498 1662
1499sub _draw { 1663sub _draw {
1500 my ($self) = @_; 1664 my ($self) = @_;
1501 1665
… …
1507 $self->{layout}->set_width ($self->{w}); 1671 $self->{layout}->set_width ($self->{w});
1508 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1672 $self->{layout}->set_ellipsise ($self->{ellipsise});
1509 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1673 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1510 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1674 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1511 1675
1512 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1676 new_from_layout CFClient::Texture $self->{layout}
1677 };
1513 1678
1679 unless (exists $self->{ox}) {
1514 $self->{ox} = int ($self->{align} < 0 ? $self->{padding} 1680 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1515 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1681 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1516 : ($self->{w} - $tex->{w}) * 0.5); 1682 : ($self->{w} - $tex->{w}) * 0.5);
1517 1683
1518 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding} 1684 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1519 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding} 1685 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1520 : ($self->{h} - $tex->{h}) * 0.5); 1686 : ($self->{h} - $tex->{h}) * 0.5);
1521
1522 $tex
1523 }; 1687 };
1524 1688
1525 glEnable GL_TEXTURE_2D; 1689 glEnable GL_TEXTURE_2D;
1526 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1690
1691 my $w = List::Util::min $self->{w} + 4, $tex->{w};
1692 my $h = List::Util::min $self->{h} + 2, $tex->{h};
1527 1693
1528 if ($tex->{format} == GL_ALPHA) { 1694 if ($tex->{format} == GL_ALPHA) {
1695 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1529 glColor @{$self->{fg}}; 1696 glColor @{$self->{fg}};
1530 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}); 1697 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}, $w, $h);
1531 } else { 1698 } else {
1699 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1532 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}); 1700 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}, $w, $h);
1533 } 1701 }
1534 1702
1535 glDisable GL_TEXTURE_2D; 1703 glDisable GL_TEXTURE_2D;
1536} 1704}
1537 1705
… …
1554 can_hover => 1, 1722 can_hover => 1,
1555 can_focus => 1, 1723 can_focus => 1,
1556 valign => 0, 1724 valign => 0,
1557 can_events => 1, 1725 can_events => 1,
1558 #text => ... 1726 #text => ...
1727 #hidden => "*",
1559 @_ 1728 @_
1560 ) 1729 )
1561} 1730}
1562 1731
1563sub _set_text { 1732sub _set_text {
… …
1565 1734
1566 delete $self->{cur_h}; 1735 delete $self->{cur_h};
1567 1736
1568 return if $self->{text} eq $text; 1737 return if $self->{text} eq $text;
1569 1738
1570 delete $self->{texture};
1571
1572 $self->{last_activity} = $::NOW; 1739 $self->{last_activity} = $::NOW;
1573 $self->{text} = $text; 1740 $self->{text} = $text;
1574 1741
1575 $text =~ s/./*/g if $self->{hidden}; 1742 $text =~ s/./*/g if $self->{hidden};
1576 $self->{layout}->set_text ("$text "); 1743 $self->{layout}->set_text ("$text ");
1744 delete $self->{size_req};
1577 1745
1578 $self->_emit (changed => $self->{text}); 1746 $self->emit (changed => $self->{text});
1747
1748 $self->realloc;
1749 $self->update;
1579} 1750}
1580 1751
1581sub set_text { 1752sub set_text {
1582 my ($self, $text) = @_; 1753 my ($self, $text) = @_;
1583 1754
1584 $self->{cursor} = length $text; 1755 $self->{cursor} = length $text;
1585 $self->_set_text ($text); 1756 $self->_set_text ($text);
1586 $self->update;
1587 $self->check_size;
1588} 1757}
1589 1758
1590sub get_text { 1759sub get_text {
1591 $_[0]{text} 1760 $_[0]{text}
1592} 1761}
… …
1597 my ($w, $h) = $self->SUPER::size_request; 1766 my ($w, $h) = $self->SUPER::size_request;
1598 1767
1599 ($w + 1, $h) # add 1 for cursor 1768 ($w + 1, $h) # add 1 for cursor
1600} 1769}
1601 1770
1602sub key_down { 1771sub invoke_key_down {
1603 my ($self, $ev) = @_; 1772 my ($self, $ev) = @_;
1604 1773
1605 my $mod = $ev->{mod}; 1774 my $mod = $ev->{mod};
1606 my $sym = $ev->{sym}; 1775 my $sym = $ev->{sym};
1607 my $uni = $ev->{unicode}; 1776 my $uni = $ev->{unicode};
… …
1619 } elsif ($sym == CFClient::SDLK_HOME) { 1788 } elsif ($sym == CFClient::SDLK_HOME) {
1620 $self->{cursor} = 0; 1789 $self->{cursor} = 0;
1621 } elsif ($sym == CFClient::SDLK_END) { 1790 } elsif ($sym == CFClient::SDLK_END) {
1622 $self->{cursor} = length $text; 1791 $self->{cursor} = length $text;
1623 } elsif ($uni == 27) { 1792 } elsif ($uni == 27) {
1624 $self->_emit ('escape'); 1793 $self->emit ('escape');
1625 } elsif ($uni) { 1794 } elsif ($uni) {
1626 substr $text, $self->{cursor}++, 0, chr $uni; 1795 substr $text, $self->{cursor}++, 0, chr $uni;
1796 } else {
1797 return 0;
1627 } 1798 }
1628 1799
1629 $self->_set_text ($text); 1800 $self->_set_text ($text);
1630 $self->update;
1631 $self->check_size;
1632}
1633 1801
1802 $self->realloc;
1803
1804 1
1805}
1806
1634sub focus_in { 1807sub invoke_focus_in {
1635 my ($self) = @_; 1808 my ($self) = @_;
1636 1809
1637 $self->{last_activity} = $::NOW; 1810 $self->{last_activity} = $::NOW;
1638 1811
1639 $self->SUPER::focus_in; 1812 $self->SUPER::invoke_focus_in
1640} 1813}
1641 1814
1642sub button_down { 1815sub invoke_button_down {
1643 my ($self, $ev, $x, $y) = @_; 1816 my ($self, $ev, $x, $y) = @_;
1644 1817
1645 $self->SUPER::button_down ($ev, $x, $y); 1818 $self->SUPER::invoke_button_down ($ev, $x, $y);
1646 1819
1647 my $idx = $self->{layout}->xy_to_index ($x, $y); 1820 my $idx = $self->{layout}->xy_to_index ($x, $y);
1648 1821
1649 # byte-index to char-index 1822 # byte-index to char-index
1650 my $text = $self->{text}; 1823 my $text = $self->{text};
1651 utf8::encode $text; 1824 utf8::encode $text;
1652 $self->{cursor} = length substr $text, 0, $idx; 1825 $self->{cursor} = length substr $text, 0, $idx;
1653 1826
1654 $self->_set_text ($self->{text}); 1827 $self->_set_text ($self->{text});
1655 $self->update; 1828 $self->update;
1829
1830 1
1656} 1831}
1657 1832
1658sub mouse_motion { 1833sub invoke_mouse_motion {
1659 my ($self, $ev, $x, $y) = @_; 1834 my ($self, $ev, $x, $y) = @_;
1660# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 1835# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1836
1837 1
1661} 1838}
1662 1839
1663sub _draw { 1840sub _draw {
1664 my ($self) = @_; 1841 my ($self) = @_;
1665 1842
1666 local $self->{fg} = $self->{fg}; 1843 local $self->{fg} = $self->{fg};
1667 1844
1668 if ($FOCUS == $self) { 1845 if ($FOCUS == $self) {
1669 glColor @{$self->{active_bg}}; 1846 glColor_premultiply @{$self->{active_bg}};
1670 $self->{fg} = $self->{active_fg}; 1847 $self->{fg} = $self->{active_fg};
1671 } else { 1848 } else {
1672 glColor @{$self->{bg}}; 1849 glColor_premultiply @{$self->{bg}};
1673 } 1850 }
1674 1851
1675 glEnable GL_BLEND; 1852 glEnable GL_BLEND;
1676 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1853 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1677 glBegin GL_QUADS; 1854 glBegin GL_QUADS;
1678 glVertex 0 , 0; 1855 glVertex 0 , 0;
1679 glVertex 0 , $self->{h}; 1856 glVertex 0 , $self->{h};
1680 glVertex $self->{w}, $self->{h}; 1857 glVertex $self->{w}, $self->{h};
1681 glVertex $self->{w}, 0; 1858 glVertex $self->{w}, 0;
… …
1706 1883
1707our @ISA = CFClient::UI::EntryBase::; 1884our @ISA = CFClient::UI::EntryBase::;
1708 1885
1709use CFClient::OpenGL; 1886use CFClient::OpenGL;
1710 1887
1711sub key_down { 1888sub invoke_key_down {
1712 my ($self, $ev) = @_; 1889 my ($self, $ev) = @_;
1713 1890
1714 my $sym = $ev->{sym}; 1891 my $sym = $ev->{sym};
1715 1892
1716 if ($sym == 13) { 1893 if ($sym == 13) {
1717 unshift @{$self->{history}}, 1894 unshift @{$self->{history}},
1718 my $txt = $self->get_text; 1895 my $txt = $self->get_text;
1896
1719 $self->{history_pointer} = -1; 1897 $self->{history_pointer} = -1;
1720 $self->{history_saveback} = ''; 1898 $self->{history_saveback} = '';
1721 $self->_emit (activate => $txt); 1899 $self->emit (activate => $txt);
1722 $self->update; 1900 $self->update;
1723 1901
1724 } elsif ($sym == CFClient::SDLK_UP) { 1902 } elsif ($sym == CFClient::SDLK_UP) {
1725 if ($self->{history_pointer} < 0) { 1903 if ($self->{history_pointer} < 0) {
1726 $self->{history_saveback} = $self->get_text; 1904 $self->{history_saveback} = $self->get_text;
… …
1742 } else { 1920 } else {
1743 $self->set_text ($self->{history_saveback}); 1921 $self->set_text ($self->{history_saveback});
1744 } 1922 }
1745 1923
1746 } else { 1924 } else {
1747 $self->SUPER::key_down ($ev); 1925 return $self->SUPER::invoke_key_down ($ev)
1926 }
1927
1748 } 1928 1
1749
1750} 1929}
1751 1930
1752############################################################################# 1931#############################################################################
1753 1932
1754package CFClient::UI::Button; 1933package CFClient::UI::Button;
… …
1763 1942
1764sub new { 1943sub new {
1765 my $class = shift; 1944 my $class = shift;
1766 1945
1767 $class->SUPER::new ( 1946 $class->SUPER::new (
1768 padding => 4, 1947 padding_x => 4,
1948 padding_y => 4,
1769 fg => [1, 1, 1], 1949 fg => [1, 1, 1],
1770 active_fg => [0, 0, 1], 1950 active_fg => [0, 0, 1],
1771 can_hover => 1, 1951 can_hover => 1,
1772 align => 0, 1952 align => 0,
1773 valign => 0, 1953 valign => 0,
1774 can_events => 1, 1954 can_events => 1,
1775 @_ 1955 @_
1776 ) 1956 )
1777} 1957}
1778 1958
1779sub activate { }
1780
1781sub button_up { 1959sub invoke_button_up {
1782 my ($self, $ev, $x, $y) = @_; 1960 my ($self, $ev, $x, $y) = @_;
1783 1961
1784 $self->emit ("activate") 1962 $self->emit ("activate")
1785 if $x >= 0 && $x < $self->{w} 1963 if $x >= 0 && $x < $self->{w}
1786 && $y >= 0 && $y < $self->{h}; 1964 && $y >= 0 && $y < $self->{h};
1965
1966 1
1787} 1967}
1788 1968
1789sub _draw { 1969sub _draw {
1790 my ($self) = @_; 1970 my ($self) = @_;
1791 1971
1792 local $self->{fg} = $self->{fg}; 1972 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1793
1794 if ($GRAB == $self) {
1795 $self->{fg} = $self->{active_fg};
1796 }
1797 1973
1798 glEnable GL_TEXTURE_2D; 1974 glEnable GL_TEXTURE_2D;
1799 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1975 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1800 glColor 0, 0, 0, 1; 1976 glColor 0, 0, 0, 1;
1801 1977
… …
1806 $self->SUPER::_draw; 1982 $self->SUPER::_draw;
1807} 1983}
1808 1984
1809############################################################################# 1985#############################################################################
1810 1986
1987package CFClient::UI::ImageButton;
1988
1989our @ISA = CFClient::UI::Image::;
1990
1991use CFClient::OpenGL;
1992
1993my %textures;
1994
1995sub new {
1996 my $class = shift;
1997
1998 my $self = $class->SUPER::new (
1999 padding_x => 4,
2000 padding_y => 4,
2001 fg => [1, 1, 1],
2002 active_fg => [0, 0, 1],
2003 can_hover => 1,
2004 align => 0,
2005 valign => 0,
2006 can_events => 1,
2007 @_
2008 );
2009}
2010
2011sub invoke_button_up {
2012 my ($self, $ev, $x, $y) = @_;
2013
2014 $self->emit ("activate")
2015 if $x >= 0 && $x < $self->{w}
2016 && $y >= 0 && $y < $self->{h};
2017
2018 1
2019}
2020
2021#############################################################################
2022
1811package CFClient::UI::CheckBox; 2023package CFClient::UI::CheckBox;
1812 2024
1813our @ISA = CFClient::UI::DrawBG::; 2025our @ISA = CFClient::UI::DrawBG::;
1814 2026
1815my @tex = 2027my @tex =
… …
1820 2032
1821sub new { 2033sub new {
1822 my $class = shift; 2034 my $class = shift;
1823 2035
1824 $class->SUPER::new ( 2036 $class->SUPER::new (
1825 padding => 2, 2037 padding_x => 2,
2038 padding_y => 2,
1826 fg => [1, 1, 1], 2039 fg => [1, 1, 1],
1827 active_fg => [1, 1, 0], 2040 active_fg => [1, 1, 0],
1828 bg => [0, 0, 0, 0.2], 2041 bg => [0, 0, 0, 0.2],
1829 active_bg => [1, 1, 1, 0.5], 2042 active_bg => [1, 1, 1, 0.5],
1830 state => 0, 2043 state => 0,
… …
1834} 2047}
1835 2048
1836sub size_request { 2049sub size_request {
1837 my ($self) = @_; 2050 my ($self) = @_;
1838 2051
1839 ($self->{padding} * 2 + 6) x 2 2052 (6) x 2
1840} 2053}
1841 2054
1842sub button_down { 2055sub invoke_button_down {
1843 my ($self, $ev, $x, $y) = @_; 2056 my ($self, $ev, $x, $y) = @_;
1844 2057
1845 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 2058 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1846 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 2059 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1847 $self->{state} = !$self->{state}; 2060 $self->{state} = !$self->{state};
1848 $self->_emit (changed => $self->{state}); 2061 $self->emit (changed => $self->{state});
2062 } else {
2063 return 0
2064 }
2065
1849 } 2066 1
1850} 2067}
1851 2068
1852sub _draw { 2069sub _draw {
1853 my ($self) = @_; 2070 my ($self) = @_;
1854 2071
1855 $self->SUPER::_draw; 2072 $self->SUPER::_draw;
1856 2073
1857 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 2074 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1858 2075
1859 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 2076 my ($w, $h) = @$self{qw(w h)};
2077
2078 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1860 2079
1861 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 2080 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1862 2081
1863 my $tex = $self->{state} ? $tex[1] : $tex[0]; 2082 my $tex = $self->{state} ? $tex[1] : $tex[0];
1864 2083
… …
2019 2238
2020 my $h1 = $self->{h} * (1 - $ycut1); 2239 my $h1 = $self->{h} * (1 - $ycut1);
2021 my $h2 = $self->{h} * (1 - $ycut2); 2240 my $h2 = $self->{h} * (1 - $ycut2);
2022 2241
2023 glEnable GL_BLEND; 2242 glEnable GL_BLEND;
2024 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2243 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2244 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2025 glEnable GL_TEXTURE_2D; 2245 glEnable GL_TEXTURE_2D;
2026 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2246 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2027 2247
2028 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2248 glBindTexture GL_TEXTURE_2D, $t1->{name};
2029 glBegin GL_QUADS; 2249 glBegin GL_QUADS;
… …
2129 fg => [1, 1, 1], 2349 fg => [1, 1, 1],
2130 active_fg => [0, 0, 0], 2350 active_fg => [0, 0, 0],
2131 bg => [0, 0, 0, 0.2], 2351 bg => [0, 0, 0, 0.2],
2132 active_bg => [1, 1, 1, 0.5], 2352 active_bg => [1, 1, 1, 0.5],
2133 range => [0, 0, 100, 10, 0], 2353 range => [0, 0, 100, 10, 0],
2134 req_w => $::WIDTH / 80, 2354 min_w => $::WIDTH / 80,
2135 req_h => $::WIDTH / 80, 2355 min_h => $::WIDTH / 80,
2136 vertical => 0, 2356 vertical => 0,
2137 can_hover => 1, 2357 can_hover => 1,
2138 inner_pad => 0.02, 2358 inner_pad => 0.02,
2139 @_ 2359 @_
2140 ); 2360 );
… …
2148sub set_range { 2368sub set_range {
2149 my ($self, $range) = @_; 2369 my ($self, $range) = @_;
2150 2370
2151 ($range, $self->{range}) = ($self->{range}, $range); 2371 ($range, $self->{range}) = ($self->{range}, $range);
2152 2372
2153 $self->update
2154 if "@$range" ne "@{$self->{range}}"; 2373 if ("@$range" ne "@{$self->{range}}") {
2374 $self->update;
2375 $self->set_value ($self->{range}[0]);
2376 }
2155} 2377}
2156 2378
2157sub set_value { 2379sub set_value {
2158 my ($self, $value) = @_; 2380 my ($self, $value) = @_;
2159 2381
… …
2170 if $unit; 2392 if $unit;
2171 2393
2172 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2394 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2173 2395
2174 if ($value != $old_value) { 2396 if ($value != $old_value) {
2175 $self->_emit (changed => $value); 2397 $self->emit (changed => $value);
2176 $self->update; 2398 $self->update;
2177 } 2399 }
2178} 2400}
2179 2401
2180sub size_request { 2402sub size_request {
2181 my ($self) = @_; 2403 my ($self) = @_;
2182 2404
2183 my $w = $self->{req_w}; 2405 ($self->{req_w}, $self->{req_h})
2184 my $h = $self->{req_h};
2185
2186 $self->{vertical} ? ($h, $w) : ($w, $h)
2187} 2406}
2188 2407
2189sub button_down { 2408sub invoke_button_down {
2190 my ($self, $ev, $x, $y) = @_; 2409 my ($self, $ev, $x, $y) = @_;
2191 2410
2192 $self->SUPER::button_down ($ev, $x, $y); 2411 $self->SUPER::invoke_button_down ($ev, $x, $y);
2193 2412
2194 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2413 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2195 2414
2196 $self->mouse_motion ($ev, $x, $y); 2415 $self->invoke_mouse_motion ($ev, $x, $y)
2197} 2416}
2198 2417
2199sub mouse_motion { 2418sub invoke_mouse_motion {
2200 my ($self, $ev, $x, $y) = @_; 2419 my ($self, $ev, $x, $y) = @_;
2201 2420
2202 if ($GRAB == $self) { 2421 if ($GRAB == $self) {
2203 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2422 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2204 2423
2205 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2424 my (undef, $lo, $hi, $page) = @{$self->{range}};
2206 2425
2207 $x = ($x - $self->{click}[1]) / ($w * $self->{scale}); 2426 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2208 2427
2209 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo)); 2428 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2429 } else {
2430 return 0;
2431 }
2432
2210 } 2433 1
2211} 2434}
2212 2435
2213sub update { 2436sub update {
2214 my ($self) = @_; 2437 my ($self) = @_;
2215 2438
2216 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 2439 delete $self->{knob_w};
2440 $self->SUPER::update;
2441}
2442
2443sub _draw {
2444 my ($self) = @_;
2445
2446 unless ($self->{knob_w}) {
2217 $self->set_value ($self->{range}[0]); 2447 $self->set_value ($self->{range}[0]);
2218 2448
2219 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2449 my ($value, $lo, $hi, $page) = @{$self->{range}};
2220 my $range = ($hi - $page - $lo) || 1e-100; 2450 my $range = ($hi - $page - $lo) || 1e-100;
2221 2451
… …
2227 $value = ($value - $lo) / $range; 2457 $value = ($value - $lo) / $range;
2228 $value = $value * $self->{scale} + $self->{offset}; 2458 $value = $value * $self->{scale} + $self->{offset};
2229 2459
2230 $self->{knob_x} = $value - $knob_w * 0.5; 2460 $self->{knob_x} = $value - $knob_w * 0.5;
2231 $self->{knob_w} = $knob_w; 2461 $self->{knob_w} = $knob_w;
2232 }); 2462 }
2233
2234 $self->SUPER::update;
2235}
2236
2237sub _draw {
2238 my ($self) = @_;
2239 2463
2240 $self->SUPER::_draw (); 2464 $self->SUPER::_draw ();
2241 2465
2242 glScale $self->{w}, $self->{h}; 2466 glScale $self->{w}, $self->{h};
2243 2467
… …
2304sub set_range { shift->{slider}->set_range (@_) } 2528sub set_range { shift->{slider}->set_range (@_) }
2305sub set_value { shift->{slider}->set_value (@_) } 2529sub set_value { shift->{slider}->set_value (@_) }
2306 2530
2307############################################################################# 2531#############################################################################
2308 2532
2309package CFClient::UI::TextView; 2533package CFClient::UI::TextScroller;
2310 2534
2311our @ISA = CFClient::UI::HBox::; 2535our @ISA = CFClient::UI::HBox::;
2312 2536
2313use CFClient::OpenGL; 2537use CFClient::OpenGL;
2314 2538
… …
2316 my $class = shift; 2540 my $class = shift;
2317 2541
2318 my $self = $class->SUPER::new ( 2542 my $self = $class->SUPER::new (
2319 fontsize => 1, 2543 fontsize => 1,
2320 can_events => 0, 2544 can_events => 0,
2545 indent => 0,
2321 #font => default_font 2546 #font => default_font
2322 @_, 2547 @_,
2323 2548
2324 layout => (new CFClient::Layout 1), 2549 layout => (new CFClient::Layout 1),
2325 par => [], 2550 par => [],
… …
2340 2565
2341 $self->{fontsize} = $fontsize; 2566 $self->{fontsize} = $fontsize;
2342 $self->reflow; 2567 $self->reflow;
2343} 2568}
2344 2569
2345sub size_allocate { 2570sub invoke_size_allocate {
2346 my ($self, $w, $h) = @_; 2571 my ($self, $w, $h) = @_;
2347
2348 $self->SUPER::size_allocate ($w, $h);
2349 2572
2350 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2573 $self->{layout}->set_font ($self->{font}) if $self->{font};
2351 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2574 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2352 $self->{layout}->set_width ($self->{children}[0]{w}); 2575 $self->{layout}->set_width ($self->{children}[0]{w});
2576 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2353 2577
2354 $self->reflow; 2578 $self->reflow;
2579
2580 $self->SUPER::invoke_size_allocate ($w, $h)
2355} 2581}
2356 2582
2357sub text_size { 2583sub text_size {
2358 my ($self, $text, $indent) = @_; 2584 my ($self, $text, $indent) = @_;
2359 2585
2360 my $layout = $self->{layout}; 2586 my $layout = $self->{layout};
2361 2587
2362 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2588 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2363 $layout->set_width ($self->{children}[0]{w} - $indent); 2589 $layout->set_width ($self->{children}[0]{w} - $indent);
2590 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2364 $layout->set_markup ($text); 2591 $layout->set_markup ($text);
2365 2592
2366 $layout->size 2593 $layout->size
2367} 2594}
2368 2595
… …
2407 2634
2408 return unless $self->{h} > 0; 2635 return unless $self->{h} > 0;
2409 2636
2410 delete $self->{texture}; 2637 delete $self->{texture};
2411 2638
2412 $ROOT->on_post_alloc ($self, sub { 2639 $ROOT->on_post_alloc ($self => sub {
2413 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 2640 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2414 2641
2415 if (delete $self->{need_reflow}) { 2642 if (delete $self->{need_reflow}) {
2416 my $height = 0; 2643 my $height = 0;
2417 2644
… …
2420 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2647 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2421 2648
2422 for (@{$self->{par}}) { 2649 for (@{$self->{par}}) {
2423 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support 2650 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2424 $layout->set_width ($W - $_->[3]); 2651 $layout->set_width ($W - $_->[3]);
2652 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2425 $layout->set_markup ($_->[4]); 2653 $layout->set_markup ($_->[4]);
2426 my ($w, $h) = $layout->size; 2654 my ($w, $h) = $layout->size;
2427 $_->[0] = $w + $_->[3]; 2655 $_->[0] = $w + $_->[3];
2428 $_->[1] = $h; 2656 $_->[1] = $h;
2429 } 2657 }
… …
2432 } 2660 }
2433 2661
2434 $self->{height} = $height; 2662 $self->{height} = $height;
2435 2663
2436 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]); 2664 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2437 2665
2438 delete $self->{texture}; 2666 delete $self->{texture};
2439 } 2667 }
2440 2668
2441 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2669 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2442 glClearColor 0.5, 0.5, 0.5, 0; 2670 glClearColor 0, 0, 0, 0;
2443 glClear GL_COLOR_BUFFER_BIT; 2671 glClear GL_COLOR_BUFFER_BIT;
2444 2672
2445 my $top = int $self->{children}[1]{range}[0]; 2673 my $top = int $self->{children}[1]{range}[0];
2446 2674
2447 my $y0 = $top; 2675 my $y0 = $top;
… …
2461 my $h = $par->[1]; 2689 my $h = $par->[1];
2462 2690
2463 if ($y0 < $y + $h && $y < $y1) { 2691 if ($y0 < $y + $h && $y < $y1) {
2464 $layout->set_foreground (@{ $par->[2] }); 2692 $layout->set_foreground (@{ $par->[2] });
2465 $layout->set_width ($W - $par->[3]); 2693 $layout->set_width ($W - $par->[3]);
2694 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2466 $layout->set_markup ($par->[4]); 2695 $layout->set_markup ($par->[4]);
2467 2696
2468 my ($w, $h, $data, $format, $internalformat) = $layout->render; 2697 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2469 2698
2470 glRasterPos $par->[3], $y - $y0; 2699 glRasterPos $par->[3], $y - $y0;
… …
2482sub _draw { 2711sub _draw {
2483 my ($self) = @_; 2712 my ($self) = @_;
2484 2713
2485 glEnable GL_TEXTURE_2D; 2714 glEnable GL_TEXTURE_2D;
2486 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2715 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2487 glColor 1, 1, 1, 1; 2716 glColor 0, 0, 0, 1;
2488 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2717 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2489 glDisable GL_TEXTURE_2D; 2718 glDisable GL_TEXTURE_2D;
2490 2719
2491 $self->{children}[1]->draw; 2720 $self->{children}[1]->draw;
2492 2721
2493} 2722}
… …
2542 2771
2543sub new { 2772sub new {
2544 my $class = shift; 2773 my $class = shift;
2545 2774
2546 my $self = $class->SUPER::new ( 2775 my $self = $class->SUPER::new (
2547 state => 0, 2776 state => 0,
2548 connect_activate => \&toggle_flopper, 2777 on_activate => \&toggle_flopper,
2549 @_ 2778 @_
2550 ); 2779 );
2551 2780
2552 if ($self->{state}) {
2553 $self->{state} = 0;
2554 $self->toggle_flopper;
2555 }
2556
2557 $self 2781 $self
2558} 2782}
2559 2783
2560sub toggle_flopper { 2784sub toggle_flopper {
2561 my ($self) = @_; 2785 my ($self) = @_;
2562 2786
2563 # TODO: use animation 2787 $self->{other}->toggle_visibility;
2564 if ($self->{state} = !$self->{state}) {
2565 $CFClient::UI::ROOT->add ($self->{other});
2566 $self->{other}->move ($self->coord2global (0, $self->{h}));
2567 $self->_emit ("open");
2568 } else {
2569 $CFClient::UI::ROOT->remove ($self->{other});
2570 $self->_emit ("close");
2571 }
2572
2573 $self->_emit (changed => $self->{state});
2574} 2788}
2575 2789
2576############################################################################# 2790#############################################################################
2577 2791
2578package CFClient::UI::Tooltip; 2792package CFClient::UI::Tooltip;
… …
2591} 2805}
2592 2806
2593sub set_tooltip_from { 2807sub set_tooltip_from {
2594 my ($self, $widget) = @_; 2808 my ($self, $widget) = @_;
2595 2809
2810 my $tooltip = $widget->{tooltip};
2811
2812 if ($ENV{CFPLUS_DEBUG} & 2) {
2813 $tooltip .= "\n\n" . (ref $widget) . "\n"
2814 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2815 . "req $widget->{req_w} $widget->{req_h}\n"
2816 . "visible $widget->{visible}";
2817 }
2818
2819 $tooltip =~ s/^\n+//;
2820 $tooltip =~ s/\n+$//;
2821
2596 $self->add (new CFClient::UI::Label 2822 $self->add (new CFClient::UI::Label
2597 markup => $widget->{tooltip}, 2823 markup => $tooltip,
2598 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2824 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2599 fontsize => 0.8, 2825 fontsize => 0.8,
2600 fg => [0, 0, 0, 1], 2826 fg => [0, 0, 0, 1],
2601 ellipsise => 0, 2827 ellipsise => 0,
2602 font => ($widget->{tooltip_font} || $::FONT_PROP), 2828 font => ($widget->{tooltip_font} || $::FONT_PROP),
… …
2609 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2835 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2610 2836
2611 ($w + 4, $h + 4) 2837 ($w + 4, $h + 4)
2612} 2838}
2613 2839
2614sub size_allocate { 2840sub invoke_size_allocate {
2615 my ($self, $w, $h) = @_; 2841 my ($self, $w, $h) = @_;
2616 2842
2617 $self->SUPER::size_allocate ($w - 4, $h - 4); 2843 $self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2844}
2845
2846sub invoke_visibility_change {
2847 my ($self, $visible) = @_;
2848
2849 return unless $visible;
2850
2851 $self->{root}->on_post_alloc ("move_$self" => sub {
2852 my $widget = $self->{owner}
2853 or return;
2854
2855 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2856
2857 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2858 if $x + $self->{w} > $self->{root}{w};
2859
2860 $self->move_abs ($x, $y);
2861 });
2618} 2862}
2619 2863
2620sub _draw { 2864sub _draw {
2621 my ($self) = @_; 2865 my ($self) = @_;
2622 2866
… …
2639 glVertex $w, $h; 2883 glVertex $w, $h;
2640 glVertex $w, 0; 2884 glVertex $w, 0;
2641 glEnd; 2885 glEnd;
2642 2886
2643 glTranslate 2 - 0.375, 2 - 0.375; 2887 glTranslate 2 - 0.375, 2 - 0.375;
2888
2644 $self->SUPER::_draw; 2889 $self->SUPER::_draw;
2645} 2890}
2646 2891
2647############################################################################# 2892#############################################################################
2648 2893
… …
2707 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 2952 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2708 2953
2709 if ($tex) { 2954 if ($tex) {
2710 glEnable GL_TEXTURE_2D; 2955 glEnable GL_TEXTURE_2D;
2711 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2956 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2712 glColor 1, 1, 1, 1; 2957 glColor 0, 0, 0, 1;
2713 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2958 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2714 glDisable GL_TEXTURE_2D; 2959 glDisable GL_TEXTURE_2D;
2715 } 2960 }
2716} 2961}
2717 2962
2718sub DESTROY { 2963sub destroy {
2719 my ($self) = @_; 2964 my ($self) = @_;
2720 2965
2721 $self->{timer}->cancel 2966 $self->{timer}->cancel
2722 if $self->{timer}; 2967 if $self->{timer};
2723 2968
2724 $self->SUPER::DESTROY; 2969 $self->SUPER::destroy;
2725} 2970}
2726 2971
2727############################################################################# 2972#############################################################################
2728 2973
2729package CFClient::UI::Inventory; 2974package CFClient::UI::Buttonbar;
2730 2975
2731our @ISA = CFClient::UI::ScrolledWindow::; 2976our @ISA = CFClient::UI::HBox::;
2732 2977
2733sub new { 2978# TODO: should actualyl wrap buttons and other goodies.
2734 my $class = shift;
2735
2736 my $self = $class->SUPER::new (
2737 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2738 @_,
2739 );
2740
2741 $self
2742}
2743
2744sub set_items {
2745 my ($self, $items) = @_;
2746
2747 $self->{scrolled}->clear;
2748 return unless $items;
2749
2750 my @items = sort {
2751 ($a->{type} <=> $b->{type})
2752 or ($a->{name} cmp $b->{name})
2753 } @$items;
2754
2755 $self->{real_items} = \@items;
2756
2757 my $row = 0;
2758 for my $item (@items) {
2759 CFClient::Item::update_widgets $item;
2760
2761 $self->{scrolled}->add (0, $row, $item->{face_widget});
2762 $self->{scrolled}->add (1, $row, $item->{desc_widget});
2763 $self->{scrolled}->add (2, $row, $item->{weight_widget});
2764
2765 $row++;
2766 }
2767}
2768
2769sub size_request {
2770 my ($self) = @_;
2771 ($self->{req_w}, $self->{req_h});
2772}
2773 2979
2774############################################################################# 2980#############################################################################
2775 2981
2776package CFClient::UI::Menu; 2982package CFClient::UI::Menu;
2777 2983
… …
2789 ); 2995 );
2790 2996
2791 $self->add ($self->{vbox} = new CFClient::UI::VBox); 2997 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2792 2998
2793 for my $item (@{ $self->{items} }) { 2999 for my $item (@{ $self->{items} }) {
2794 my ($widget, $cb) = @$item; 3000 my ($widget, $cb, $tooltip) = @$item;
2795 3001
2796 # handle various types of items, only text for now 3002 # handle various types of items, only text for now
2797 if (!ref $widget) { 3003 if (!ref $widget) {
2798 $widget = new CFClient::UI::Label 3004 $widget = new CFClient::UI::Label
2799 can_hover => 1, 3005 can_hover => 1,
2800 can_events => 1, 3006 can_events => 1,
2801 text => $widget; 3007 markup => $widget,
3008 tooltip => $tooltip
2802 } 3009 }
2803 3010
2804 $self->{item}{$widget} = $item; 3011 $self->{item}{$widget} = $item;
2805 3012
2806 $self->{vbox}->add ($widget); 3013 $self->{vbox}->add ($widget);
… …
2811 3018
2812# popup given the event (must be a mouse button down event currently) 3019# popup given the event (must be a mouse button down event currently)
2813sub popup { 3020sub popup {
2814 my ($self, $ev) = @_; 3021 my ($self, $ev) = @_;
2815 3022
2816 $self->_emit ("popdown"); 3023 $self->emit ("popdown");
2817 3024
2818 # maybe save $GRAB? must be careful about events... 3025 # maybe save $GRAB? must be careful about events...
2819 $GRAB = $self; 3026 $GRAB = $self;
2820 $self->{button} = $ev->{button}; 3027 $self->{button} = $ev->{button};
2821 3028
2822 $self->show; 3029 $self->show;
2823 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 3030 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2824} 3031}
2825 3032
2826sub mouse_motion { 3033sub invoke_mouse_motion {
2827 my ($self, $ev, $x, $y) = @_; 3034 my ($self, $ev, $x, $y) = @_;
2828 3035
2829 # TODO: should use vbox->find_widget or so 3036 # TODO: should use vbox->find_widget or so
2830 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3037 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2831 $self->{hover} = $self->{item}{$HOVER}; 3038 $self->{hover} = $self->{item}{$HOVER};
2832}
2833 3039
3040 0
3041}
3042
2834sub button_up { 3043sub invoke_button_up {
2835 my ($self, $ev, $x, $y) = @_; 3044 my ($self, $ev, $x, $y) = @_;
2836 3045
2837 if ($ev->{button} == $self->{button}) { 3046 if ($ev->{button} == $self->{button}) {
2838 undef $GRAB; 3047 undef $GRAB;
2839 $self->hide; 3048 $self->hide;
2840 3049
2841 $self->_emit ("popdown"); 3050 $self->emit ("popdown");
2842 $self->{hover}[1]->() if $self->{hover}; 3051 $self->{hover}[1]->() if $self->{hover};
3052 } else {
3053 return 0
3054 }
3055
2843 } 3056 1
2844} 3057}
2845 3058
2846############################################################################# 3059#############################################################################
2847 3060
2848package CFClient::UI::Statusbox; 3061package CFClient::UI::Multiplexer;
2849 3062
2850our @ISA = CFClient::UI::VBox::; 3063our @ISA = CFClient::UI::Container::;
2851 3064
2852sub new { 3065sub new {
2853 my $class = shift; 3066 my $class = shift;
2854 3067
2855 $class->SUPER::new ( 3068 my $self = $class->SUPER::new (
3069 @_,
3070 );
3071
3072 $self->{current} = $self->{children}[0]
3073 if @{ $self->{children} };
3074
3075 $self
3076}
3077
3078sub add {
3079 my ($self, @widgets) = @_;
3080
3081 $self->SUPER::add (@widgets);
3082
3083 $self->{current} = $self->{children}[0]
3084 if @{ $self->{children} };
3085}
3086
3087sub set_current_page {
3088 my ($self, $page_or_widget) = @_;
3089
3090 my $widget = ref $page_or_widget
3091 ? $page_or_widget
3092 : $self->{children}[$page_or_widget];
3093
3094 $self->{current} = $widget;
3095 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3096
3097 $self->emit (page_changed => $self->{current});
3098
3099 $self->realloc;
3100}
3101
3102sub visible_children {
3103 $_[0]{current}
3104}
3105
3106sub size_request {
3107 my ($self) = @_;
3108
3109 $self->{current}->size_request
3110}
3111
3112sub invoke_size_allocate {
3113 my ($self, $w, $h) = @_;
3114
3115 $self->{current}->configure (0, 0, $w, $h);
3116
3117 1
3118}
3119
3120sub _draw {
3121 my ($self) = @_;
3122
3123 $self->{current}->draw;
3124}
3125
3126#############################################################################
3127
3128package CFClient::UI::Notebook;
3129
3130our @ISA = CFClient::UI::VBox::;
3131
3132sub new {
3133 my $class = shift;
3134
3135 my $self = $class->SUPER::new (
3136 buttonbar => (new CFClient::UI::Buttonbar),
3137 multiplexer => (new CFClient::UI::Multiplexer expand => 1),
3138 # filter => # will be put between multiplexer and $self
3139 @_,
3140 );
3141
3142 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3143 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3144
3145 $self
3146}
3147
3148sub add {
3149 my ($self, $title, $widget, $tooltip) = @_;
3150
3151 Scalar::Util::weaken $self;
3152
3153 $self->{buttonbar}->add (new CFClient::UI::Button
3154 markup => $title,
3155 tooltip => $tooltip,
3156 on_activate => sub { $self->set_current_page ($widget) },
3157 );
3158
3159 $self->{multiplexer}->add ($widget);
3160}
3161
3162sub set_current_page {
3163 my ($self, $page) = @_;
3164
3165 $self->{multiplexer}->set_current_page ($page);
3166 $self->emit (page_changed => $self->{multiplexer}{current});
3167}
3168
3169#############################################################################
3170
3171package CFClient::UI::Combobox;
3172
3173use utf8;
3174
3175our @ISA = CFClient::UI::Button::;
3176
3177sub new {
3178 my $class = shift;
3179
3180 my $self = $class->SUPER::new (
3181 options => [], # [value, title, longdesc], ...
3182 value => undef,
3183 @_,
3184 );
3185
3186 $self->_set_value ($self->{value});
3187
3188 $self
3189}
3190
3191sub invoke_button_down {
3192 my ($self, $ev) = @_;
3193
3194 my @menu_items;
3195
3196 for (@{ $self->{options} }) {
3197 my ($value, $title, $tooltip) = @$_;
3198
3199 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3200 }
3201
3202 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
3203}
3204
3205sub _set_value {
3206 my ($self, $value) = @_;
3207
3208 my ($item) = grep $_->[0] eq $value, @{ $self->{options} }
3209 or return;
3210
3211 $self->{value} = $item->[0];
3212 $self->set_markup ("$item->[1] ⇓");
3213 $self->set_tooltip ($item->[2]);
3214}
3215
3216sub set_value {
3217 my ($self, $value) = @_;
3218
3219 return unless $self->{value} ne $value;
3220
3221 $self->_set_value ($value);
3222 $self->emit (changed => $value);
3223}
3224
3225#############################################################################
3226
3227package CFClient::UI::Statusbox;
3228
3229our @ISA = CFClient::UI::VBox::;
3230
3231sub new {
3232 my $class = shift;
3233
3234 my $self = $class->SUPER::new (
2856 fontsize => 0.8, 3235 fontsize => 0.8,
2857 @_, 3236 @_,
2858 ) 3237 );
3238
3239 Scalar::Util::weaken (my $this = $self);
3240
3241 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3242
3243 $self
2859} 3244}
2860 3245
2861sub reorder { 3246sub reorder {
2862 my ($self) = @_; 3247 my ($self) = @_;
2863 my $NOW = time; 3248 my $NOW = Time::HiRes::time;
3249
3250 # freeze display when hovering over any label
3251 return if $CFClient::UI::TOOLTIP->{owner}
3252 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},
3253 values %{ $self->{item} };
2864 3254
2865 while (my ($k, $v) = each %{ $self->{item} }) { 3255 while (my ($k, $v) = each %{ $self->{item} }) {
2866 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3256 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2867 } 3257 }
2868 3258
… …
2871 my @items = sort { 3261 my @items = sort {
2872 $a->{pri} <=> $b->{pri} 3262 $a->{pri} <=> $b->{pri}
2873 or $b->{id} <=> $a->{id} 3263 or $b->{id} <=> $a->{id}
2874 } values %{ $self->{item} }; 3264 } values %{ $self->{item} };
2875 3265
3266 $self->{timer}->interval (1);
3267
2876 my $count = 10 + 1; 3268 my $count = 10 + 1;
2877 for my $item (@items) { 3269 for my $item (@items) {
2878 last unless --$count; 3270 last unless --$count;
2879 3271
2880 push @widgets, $item->{label} ||= do { 3272 my $label = $item->{label} ||= do {
2881 # TODO: doesn't handle markup well (read as: at all) 3273 # TODO: doesn't handle markup well (read as: at all)
2882 my $short = $item->{count} > 1 3274 my $short = $item->{count} > 1
2883 ? "<b>$item->{count} ×</b> $item->{text}" 3275 ? "<b>$item->{count} ×</b> $item->{text}"
2884 : $item->{text}; 3276 : $item->{text};
2885 3277
… …
2893 tooltip => $item->{tooltip}, 3285 tooltip => $item->{tooltip},
2894 tooltip_font => $::FONT_PROP, 3286 tooltip_font => $::FONT_PROP,
2895 tooltip_width => 0.67, 3287 tooltip_width => 0.67,
2896 fontsize => $item->{fontsize} || $self->{fontsize}, 3288 fontsize => $item->{fontsize} || $self->{fontsize},
2897 max_w => $::WIDTH * 0.44, 3289 max_w => $::WIDTH * 0.44,
2898 fg => $item->{fg}, 3290 fg => [@{ $item->{fg} }],
2899 can_events => 1, 3291 can_events => 1,
2900 can_hover => 1 3292 can_hover => 1
2901 }; 3293 };
3294
3295 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3296 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3297 $label->update;
3298 $label->set_max_size (undef, $label->{req_h} * $diff)
3299 if $diff < 1;
3300 $self->{timer}->interval (1/30);
3301 } else {
3302 $label->{fg}[3] = $item->{fg}[3] || 1;
3303 }
3304
3305 push @widgets, $label;
2902 } 3306 }
2903 3307
2904 $self->clear; 3308 $self->clear;
2905 $self->SUPER::add (reverse @widgets); 3309 $self->SUPER::add (reverse @widgets);
2906} 3310}
… …
2911 $text =~ s/^\s+//; 3315 $text =~ s/^\s+//;
2912 $text =~ s/\s+$//; 3316 $text =~ s/\s+$//;
2913 3317
2914 return unless $text; 3318 return unless $text;
2915 3319
2916 my $timeout = time + ((delete $arg{timeout}) || 60); 3320 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
2917 3321
2918 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3322 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2919 3323
2920 if (my $item = $self->{item}{$group}) { 3324 if (my $item = $self->{item}{$group}) {
2921 if ($item->{text} eq $text) { 3325 if ($item->{text} eq $text) {
2922 $item->{count}++; 3326 $item->{count}++;
2923 } else { 3327 } else {
2924 $item->{count} = 1; 3328 $item->{count} = 1;
2925 $item->{text} = $item->{tooltip} = $text; 3329 $item->{text} = $item->{tooltip} = $text;
2926 } 3330 }
2927 $item->{id} = ++$self->{id}; 3331 $item->{id} += 0.2;#d#
2928 $item->{timeout} = $timeout; 3332 $item->{timeout} = $timeout;
2929 delete $item->{label}; 3333 delete $item->{label};
2930 } else { 3334 } else {
2931 $self->{item}{$group} = { 3335 $self->{item}{$group} = {
2932 id => ++$self->{id}, 3336 id => ++$self->{id},
… …
2951 3355
2952 $self->reorder; 3356 $self->reorder;
2953 $self->SUPER::reconfigure; 3357 $self->SUPER::reconfigure;
2954} 3358}
2955 3359
3360sub destroy {
3361 my ($self) = @_;
3362
3363 $self->{timer}->cancel;
3364
3365 $self->SUPER::destroy;
3366}
3367
2956############################################################################# 3368#############################################################################
2957 3369
2958package CFClient::UI::Root; 3370package CFClient::UI::Inventory;
2959 3371
2960our @ISA = CFClient::UI::Container::; 3372our @ISA = CFClient::UI::ScrolledWindow::;
2961
2962use CFClient::OpenGL;
2963 3373
2964sub new { 3374sub new {
2965 my $class = shift; 3375 my $class = shift;
2966 3376
2967 $class->SUPER::new ( 3377 my $self = $class->SUPER::new (
3378 child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3379 @_,
3380 );
3381
3382 $self
3383}
3384
3385sub set_items {
3386 my ($self, $items) = @_;
3387
3388 $self->{child}->clear;
3389 return unless $items;
3390
3391 my @items = sort {
3392 ($a->{type} <=> $b->{type})
3393 or ($a->{name} cmp $b->{name})
3394 } @$items;
3395
3396 $self->{real_items} = \@items;
3397
3398 my $row = 0;
3399 for my $item (@items) {
3400 CFClient::Item::update_widgets $item;
3401
3402 $self->{child}->add (0, $row, $item->{face_widget});
3403 $self->{child}->add (1, $row, $item->{desc_widget});
3404 $self->{child}->add (2, $row, $item->{weight_widget});
3405
3406 $row++;
3407 }
3408}
3409
3410#############################################################################
3411
3412package CFClient::UI::BindEditor;
3413
3414our @ISA = CFClient::UI::FancyFrame::;
3415
3416sub new {
3417 my $class = shift;
3418
3419 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3420
3421 $self->add (my $vb = new CFClient::UI::VBox);
3422
3423
3424 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3425 text => "start recording",
3426 tooltip => "Start/Stops recording of actions."
3427 ."All subsequent actions after the recording started will be captured."
3428 ."The actions are displayed after the record was stopped."
3429 ."To bind the action you have to click on the 'Bind' button",
3430 on_activate => sub {
3431 unless ($self->{recording}) {
3432 $self->start;
3433 } else {
3434 $self->stop;
3435 }
3436 });
3437
3438 $vb->add (new CFClient::UI::Label text => "Actions:");
3439 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3440
3441 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3442 $vb->add (my $hb = new CFClient::UI::HBox);
3443 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3444 $hb->add (new CFClient::UI::Button
3445 text => "bind",
3446 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3447 on_activate => sub {
3448 $self->ask_for_bind;
3449 });
3450
3451 $vb->add (my $hb = new CFClient::UI::HBox);
3452 $hb->add (new CFClient::UI::Button
3453 text => "ok",
3454 expand => 1,
3455 tooltip => "This closes the binding editor and saves the binding",
3456 on_activate => sub {
3457 $self->hide;
3458 $self->commit;
3459 });
3460
3461 $hb->add (new CFClient::UI::Button
3462 text => "cancel",
3463 expand => 1,
3464 tooltip => "This closes the binding editor without saving",
3465 on_activate => sub {
3466 $self->hide;
3467 $self->{binding_cancel}->()
3468 if $self->{binding_cancel};
3469 });
3470
3471 $self->update_binding_widgets;
3472
3473 $self
3474}
3475
3476sub commit {
3477 my ($self) = @_;
3478 my ($mod, $sym, $cmds) = $self->get_binding;
3479 if ($sym != 0 && @$cmds > 0) {
3480 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3481 ."'. Don't forget 'Save Config'!");
3482 $self->{binding_change}->($mod, $sym, $cmds)
3483 if $self->{binding_change};
3484 } else {
3485 $::STATUSBOX->add ("No action bound, no key or action specified!");
3486 $self->{binding_cancel}->()
3487 if $self->{binding_cancel};
3488 }
3489}
3490
3491sub start {
3492 my ($self) = @_;
3493
3494 $self->{rec_btn}->set_text ("stop recording");
3495 $self->{recording} = 1;
3496 $self->clear_command_list;
3497 $::CONN->start_record if $::CONN;
3498}
3499
3500sub stop {
3501 my ($self) = @_;
3502
3503 $self->{rec_btn}->set_text ("start recording");
3504 $self->{recording} = 0;
3505
3506 my $rec;
3507 $rec = $::CONN->stop_record if $::CONN;
3508 return unless ref $rec eq 'ARRAY';
3509 $self->set_command_list ($rec);
3510}
3511
3512
3513sub ask_for_bind_and_commit {
3514 my ($self) = @_;
3515 $self->ask_for_bind (1);
3516}
3517
3518sub ask_for_bind {
3519 my ($self, $commit, $end_cb) = @_;
3520
3521 CFClient::Binder::open_binding_dialog (sub {
3522 my ($mod, $sym) = @_;
3523 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3524 $self->update_binding_widgets;
3525 $self->commit if $commit;
3526 $end_cb->() if $end_cb;
3527 });
3528}
3529
3530# $mod and $sym are the modifiers and key symbol
3531# $cmds is a array ref of strings (the commands)
3532# $cb is the callback that is executed on OK
3533# $ccb is the callback that is executed on CANCEL and
3534# when the binding was unsuccessful on OK
3535sub set_binding {
3536 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3537
3538 $self->clear_command_list;
3539 $self->{recording} = 0;
3540 $self->{rec_btn}->set_text ("start recording");
3541
3542 $self->{binding} = [$mod, $sym];
3543 $self->{commands} = $cmds;
3544
3545 $self->{binding_change} = $cb;
3546 $self->{binding_cancel} = $ccb;
3547
3548 $self->update_binding_widgets;
3549}
3550
3551# this is a shortcut method that asks for a binding
3552# and then just binds it.
3553sub do_quick_binding {
3554 my ($self, $cmds, $end_cb) = @_;
3555 $self->set_binding (undef, undef, $cmds, sub {
3556 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3557 });
3558 $self->ask_for_bind (1, $end_cb);
3559}
3560
3561sub update_binding_widgets {
3562 my ($self) = @_;
3563 my ($mod, $sym, $cmds) = $self->get_binding;
3564 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3565 $self->set_command_list ($cmds);
3566}
3567
3568sub get_binding {
3569 my ($self) = @_;
3570 return (
3571 $self->{binding}->[0],
3572 $self->{binding}->[1],
3573 [ grep { defined $_ } @{$self->{commands}} ]
3574 );
3575}
3576
3577sub clear_command_list {
3578 my ($self) = @_;
3579 $self->{cmdbox}->clear ();
3580}
3581
3582sub set_command_list {
3583 my ($self, $cmds) = @_;
3584
3585 $self->{cmdbox}->clear ();
3586 $self->{commands} = $cmds;
3587
3588 my $idx = 0;
3589
3590 for (@$cmds) {
3591 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3592
3593 my $i = $idx;
3594 $hb->add (new CFClient::UI::Label text => $_);
3595 $hb->add (new CFClient::UI::Button
3596 text => "delete",
3597 tooltip => "Deletes the action from the record",
3598 on_activate => sub {
3599 $self->{cmdbox}->remove ($hb);
3600 $cmds->[$i] = undef;
3601 });
3602
3603
3604 $idx++
3605 }
3606}
3607
3608#############################################################################
3609
3610package CFClient::UI::SpellList;
3611
3612our @ISA = CFClient::UI::Table::;
3613
3614sub new {
3615 my $class = shift;
3616
3617 my $self = $class->SUPER::new (
3618 binding => [],
3619 commands => [],
2968 @_, 3620 @_,
2969 ) 3621 )
2970} 3622}
2971 3623
2972sub configure { 3624my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
2973 my ($self, $x, $y, $w, $h) = @_;
2974 3625
2975 $self->{w} = $w; 3626my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
2976 $self->{h} = $h; 3627 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
2977} 3628my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3629 "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3630my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3631 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3632my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3633 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3634my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3635 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
2978 3636
2979sub check_size { 3637sub rebuild_spell_list {
3638 my ($self) = @_;
3639
3640 $CFClient::UI::ROOT->on_refresh ($self => sub {
3641 $self->clear;
3642
3643 return unless $::CONN;
3644
3645 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3646 $self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3647 $self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3648 $self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3649 $self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3650
3651 my $row = 0;
3652
3653 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3654 my $spell = $self->{spell}{$_};
3655
3656 $row++;
3657
3658 my $spell_cb = sub {
3659 my ($widget, $ev) = @_;
3660
3661 if ($ev->{button} == 1) {
3662 $::CONN->user_send ("cast $spell->{name}");
3663 } elsif ($ev->{button} == 2) {
3664 $::CONN->user_send ("invoke $spell->{name}");
3665 } elsif ($ev->{button} == 3) {
3666 (new CFClient::UI::Menu
3667 items => [
3668 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3669 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3670 ],
3671 )->popup ($ev);
3672 } else {
3673 return 0;
3674 }
3675
3676 1
3677 };
3678
3679 my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3680
3681 #TODO: add path info to tooltip
3682 #$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3683
3684 $self->add (0, $row, new CFClient::UI::Face
3685 face => $spell->{face},
3686 can_hover => 1,
3687 can_events => 1,
3688 tooltip => $tooltip,
3689 on_button_down => $spell_cb,
3690 );
3691
3692 $self->add (1, $row, new CFClient::UI::Label
3693 expand => 1,
3694 text => $spell->{name},
3695 can_hover => 1,
3696 can_events => 1,
3697 tooltip => $tooltip,
3698 on_button_down => $spell_cb,
3699 );
3700
3701 $self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3702 $self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3703 $self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3704 $self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3705 }
3706 });
3707}
3708
3709sub add_spell {
2980 my ($self) = @_; 3710 my ($self, $spell) = @_;
2981 3711
2982 $self->size_allocate ($self->{w}, $self->{h}) 3712 $self->{spell}->{$spell->{name}} = $spell;
2983 if $self->{w}; 3713 $self->rebuild_spell_list;
3714}
3715
3716sub remove_spell {
3717 my ($self, $spell) = @_;
3718
3719 delete $self->{spell}->{$spell->{name}};
3720 $self->rebuild_spell_list;
3721}
3722
3723sub clear_spells {
3724 my ($self) = @_;
3725
3726 $self->{spell} = {};
3727 $self->rebuild_spell_list;
3728}
3729
3730#############################################################################
3731
3732package CFClient::UI::Root;
3733
3734our @ISA = CFClient::UI::Container::;
3735
3736use List::Util qw(min max);
3737
3738use CFClient::OpenGL;
3739
3740sub new {
3741 my $class = shift;
3742
3743 my $self = $class->SUPER::new (
3744 visible => 1,
3745 @_,
3746 );
3747
3748 Scalar::Util::weaken ($self->{root} = $self);
3749
3750 $self
2984} 3751}
2985 3752
2986sub size_request { 3753sub size_request {
2987 my ($self) = @_; 3754 my ($self) = @_;
2988 3755
2989 ($self->{w}, $self->{h}) 3756 ($self->{w}, $self->{h})
2990} 3757}
2991 3758
3759sub _to_pixel {
3760 my ($coord, $size, $max) = @_;
3761
3762 $coord =
3763 $coord eq "center" ? ($max - $size) * 0.5
3764 : $coord eq "max" ? $max
3765 : $coord;
3766
3767 $coord = 0 if $coord < 0;
3768 $coord = $max - $size if $coord > $max - $size;
3769
3770 int $coord + 0.5
3771}
3772
2992sub size_allocate { 3773sub invoke_size_allocate {
2993 my ($self, $w, $h) = @_; 3774 my ($self, $w, $h) = @_;
2994 3775
2995 for my $child ($self->children) { 3776 for my $child ($self->children) {
2996 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3777 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2997 3778
2998 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 3779 $X = $child->{force_x} if exists $child->{force_x};
2999 if exists $child->{req_x}; 3780 $Y = $child->{force_y} if exists $child->{force_y};
3000 3781
3001 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1 3782 $X = _to_pixel $X, $W, $self->{w};
3002 if exists $child->{req_y}; 3783 $Y = _to_pixel $Y, $H, $self->{h};
3003
3004 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
3005 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
3006 3784
3007 $child->configure ($X, $Y, $W, $H); 3785 $child->configure ($X, $Y, $W, $H);
3008 } 3786 }
3787
3788 1
3009} 3789}
3010 3790
3011sub coord2local { 3791sub coord2local {
3012 my ($self, $x, $y) = @_; 3792 my ($self, $x, $y) = @_;
3013 3793
… …
3021} 3801}
3022 3802
3023sub update { 3803sub update {
3024 my ($self) = @_; 3804 my ($self) = @_;
3025 3805
3026 $self->check_size;
3027 $::WANT_REFRESH++; 3806 $::WANT_REFRESH++;
3028} 3807}
3029 3808
3030sub add { 3809sub add {
3031 my ($self, @children) = @_; 3810 my ($self, @children) = @_;
3032 3811
3033 for (my @widgets = @children; my $w = pop @widgets; ) {
3034 push @widgets, $w->children;
3035 $w->{root} = $self;
3036 $w->{visible} = 1;
3037 }
3038
3039 for my $child (@children) {
3040 $child->{is_toplevel} = 1; 3812 $_->{is_toplevel} = 1
3041 3813 for @children;
3042 # integerise window positions
3043 $child->{x} = int $child->{x};
3044 $child->{y} = int $child->{y};
3045 }
3046 3814
3047 $self->SUPER::add (@children); 3815 $self->SUPER::add (@children);
3048} 3816}
3049 3817
3050sub remove { 3818sub remove {
3051 my ($self, @children) = @_; 3819 my ($self, @children) = @_;
3052 3820
3053 $self->SUPER::remove (@children); 3821 $self->SUPER::remove (@children);
3822
3823 delete $self->{is_toplevel}
3824 for @children;
3054 3825
3055 while (@children) { 3826 while (@children) {
3056 my $w = pop @children; 3827 my $w = pop @children;
3057 push @children, $w->children; 3828 push @children, $w->children;
3058 $w->set_invisible; 3829 $w->set_invisible;
… …
3077 while ($self->{refresh_hook}) { 3848 while ($self->{refresh_hook}) {
3078 $_->() 3849 $_->()
3079 for values %{delete $self->{refresh_hook}}; 3850 for values %{delete $self->{refresh_hook}};
3080 } 3851 }
3081 3852
3082 if ($self->{check_size}) { 3853 if ($self->{realloc}) {
3083 my @queue = ([], []); 3854 my %queue;
3855 my @queue;
3856 my $widget;
3084 3857
3085 for (;;) { 3858 outer:
3086 if ($self->{check_size}) { 3859 while () {
3087 # heuristic: check containers last 3860 if (my $realloc = delete $self->{realloc}) {
3088 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_ 3861 for $widget (values %$realloc) {
3089 for values %{delete $self->{check_size}} 3862 $widget->{visible} or next; # do not resize invisible widgets
3863
3864 $queue{$widget+0}++ and next; # duplicates are common
3865
3866 push @{ $queue[$widget->{visible}] }, $widget;
3867 }
3090 } 3868 }
3091 3869
3092 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last; 3870 while () {
3871 @queue or last outer;
3093 3872
3094 my ($w, $h) = $widget->{user_w} && $widget->{user_h} 3873 $widget = pop @{ $queue[-1] || [] }
3095 ? @$widget{qw(user_w user_h)} 3874 and last;
3096 : $widget->size_request;
3097
3098 if (delete $widget->{force_alloc}
3099 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
3100 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
3101 3875
3876 pop @queue;
3877 }
3878
3879 delete $queue{$widget+0};
3880
3881 my ($w, $h) = $widget->size_request;
3882
3883 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3884 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3885
3886 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3887 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3888
3889 $w = $widget->{force_w} if exists $widget->{force_w};
3890 $h = $widget->{force_h} if exists $widget->{force_h};
3891
3892 if ($widget->{req_w} != $w || $widget->{req_h} != $h
3893 || delete $widget->{force_realloc}) {
3102 $widget->{req_w} = $w; 3894 $widget->{req_w} = $w;
3103 $widget->{req_h} = $h; 3895 $widget->{req_h} = $h;
3104 3896
3105 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h]; 3897 $self->{size_alloc}{$widget+0} = $widget;
3106 3898
3107 $widget->{parent}->check_size
3108 if $widget->{parent}; 3899 if (my $parent = $widget->{parent}) {
3900 $self->{realloc}{$parent+0} = $parent
3901 unless $queue{$parent+0};
3902
3903 $parent->{force_size_alloc} = 1;
3904 $self->{size_alloc}{$parent+0} = $parent;
3905 }
3109 } 3906 }
3907
3908 delete $self->{realloc}{$widget+0};
3110 } 3909 }
3111 } 3910 }
3112 3911
3113 while ($self->{size_alloc}) { 3912 while (my $size_alloc = delete $self->{size_alloc}) {
3114 for (values %{delete $self->{size_alloc}}) { 3913 my @queue = sort { $b->{visible} <=> $a->{visible} }
3115 my ($widget, $w, $h) = @$_; 3914 values %$size_alloc;
3915
3916 while () {
3917 my $widget = pop @queue || last;
3918
3919 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3116 3920
3117 $w = 0 if $w < 0; 3921 $w = 0 if $w < 0;
3118 $h = 0 if $h < 0; 3922 $h = 0 if $h < 0;
3119 3923
3924 $w = int $w + 0.5;
3925 $h = int $h + 0.5;
3926
3927 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3928 $widget->{old_w} = $widget->{w};
3929 $widget->{old_h} = $widget->{h};
3930
3120 $widget->{w} = $w; 3931 $widget->{w} = $w;
3121 $widget->{h} = $h; 3932 $widget->{h} = $h;
3933
3122 $widget->emit (size_allocate => $w, $h); 3934 $widget->emit (size_allocate => $w, $h);
3935 }
3123 } 3936 }
3124 } 3937 }
3125 3938
3126 while ($self->{post_alloc_hook}) { 3939 while ($self->{post_alloc_hook}) {
3127 $_->() 3940 $_->()
3128 for values %{delete $self->{post_alloc_hook}}; 3941 for values %{delete $self->{post_alloc_hook}};
3129 } 3942 }
3943
3130 3944
3131 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3945 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3132 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3946 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3133 glClear GL_COLOR_BUFFER_BIT; 3947 glClear GL_COLOR_BUFFER_BIT;
3134 3948
… …
3136 glLoadIdentity; 3950 glLoadIdentity;
3137 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 3951 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3138 glMatrixMode GL_MODELVIEW; 3952 glMatrixMode GL_MODELVIEW;
3139 glLoadIdentity; 3953 glLoadIdentity;
3140 3954
3955 {
3956 package CFClient::UI::Base;
3957
3958 ($draw_x, $draw_y, $draw_w, $draw_h) =
3959 (0, 0, $self->{w}, $self->{h});
3960 }
3961
3141 $self->_draw; 3962 $self->_draw;
3142} 3963}
3143 3964
3144############################################################################# 3965#############################################################################
3145 3966

Diff Legend

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