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.230 by root, Wed May 24 21:59:54 2006 UTC vs.
Revision 1.302 by root, Mon Jun 12 13:26:14 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]) || $FOCUS->key_down ($_[0]) 75 $FOCUS->emit (key_down => $_[0])
56 if $FOCUS; 76 if $FOCUS;
57} 77}
58 78
59sub feed_sdl_key_up_event { 79sub feed_sdl_key_up_event {
60 $FOCUS->emit (key_up => $_[0]) || $FOCUS->key_up ($_[0]) 80 $FOCUS->emit (key_up => $_[0])
61 if $FOCUS; 81 if $FOCUS;
62} 82}
63 83
64sub feed_sdl_button_down_event { 84sub feed_sdl_button_down_event {
65 my ($ev) = @_; 85 my ($ev) = @_;
… …
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 if ($GRAB) { 99 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
80 ($x, $y) = $GRAB->coord2local ($x, $y); 100 if $GRAB;
81 $GRAB->emit (button_down => $ev, $x, $y) || $GRAB->button_down ($ev, $x, $y);
82 }
83} 101}
84 102
85sub feed_sdl_button_up_event { 103sub feed_sdl_button_up_event {
86 my ($ev) = @_; 104 my ($ev) = @_;
87 my ($x, $y) = ($ev->{x}, $ev->{y}); 105 my ($x, $y) = ($ev->{x}, $ev->{y});
88 106
89 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 107 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
90 108
91 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); 109 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
92 110
93 if ($GRAB) { 111 $GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y))
94 ($x, $y) = $GRAB->coord2local ($x, $y); 112 if $GRAB;
95 $GRAB->emit (button_up => $ev, $x, $y) || $GRAB->button_up ($ev, $x, $y);
96 }
97 113
98 if (!$BUTTON_STATE) { 114 if (!$BUTTON_STATE) {
99 my $grab = $GRAB; undef $GRAB; 115 my $grab = $GRAB; undef $GRAB;
100 $grab->update if $grab; 116 $grab->update if $grab;
101 $GRAB->update if $GRAB; 117 $GRAB->update if $GRAB;
102 118
103 check_tooltip; 119 $TOOLTIP_WATCHER->cb->();
104 } 120 }
105} 121}
106 122
107sub feed_sdl_motion_event { 123sub feed_sdl_motion_event {
108 my ($ev) = @_; 124 my ($ev) = @_;
… …
114 my $hover = $HOVER; $HOVER = $widget; 130 my $hover = $HOVER; $HOVER = $widget;
115 131
116 $hover->update if $hover && $hover->{can_hover}; 132 $hover->update if $hover && $hover->{can_hover};
117 $HOVER->update if $HOVER && $HOVER->{can_hover}; 133 $HOVER->update if $HOVER && $HOVER->{can_hover};
118 134
119 check_tooltip; 135 $TOOLTIP_WATCHER->start;
120 } 136 }
121 137
122 if ($HOVER) {
123 ($x, $y) = $HOVER->coord2local ($x, $y);
124 $HOVER->emit (mouse_motion => $ev, $x, $y) || $HOVER->mouse_motion ($ev, $x, $y); 138 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
125 } 139 if $HOVER;
126} 140}
127 141
128# convert position array to integers 142# convert position array to integers
129sub harmonize { 143sub harmonize {
130 my ($vals) = @_; 144 my ($vals) = @_;
… …
158sub rescale_widgets { 172sub rescale_widgets {
159 my ($sx, $sy) = @_; 173 my ($sx, $sy) = @_;
160 174
161 for my $widget (values %WIDGET) { 175 for my $widget (values %WIDGET) {
162 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
163 $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.]+$/;
164 $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};
165 $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};
166 $widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w};
167 $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.]+$/;
168 $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};
169 $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};
170 $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
171 } 190 }
172 } 191 }
173 192
174 reconfigure_widgets; 193 reconfigure_widgets;
175} 194}
… …
184 203
185sub new { 204sub new {
186 my $class = shift; 205 my $class = shift;
187 206
188 my $self = bless { 207 my $self = bless {
189 x => 0, 208 x => "center",
190 y => 0, 209 y => "center",
191 z => 0, 210 z => 0,
211 w => undef,
212 h => undef,
192 can_events => 1, 213 can_events => 1,
193 @_ 214 @_
194 }, $class; 215 }, $class;
195 216
217 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
218
196 for (keys %$self) { 219 for (keys %$self) {
197 if (/^connect_(.*)$/) { 220 if (/^on_(.*)$/) {
198 $self->connect ($1 => delete $self->{$_}); 221 $self->connect ($1 => delete $self->{$_});
199 } 222 }
200 } 223 }
201 224
202 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 }
203 236
204 $self 237 $self
205} 238}
206 239
207sub destroy { 240sub destroy {
… …
211 %$self = (); 244 %$self = ();
212} 245}
213 246
214sub show { 247sub show {
215 my ($self) = @_; 248 my ($self) = @_;
249
216 return if $self->{parent}; 250 return if $self->{parent};
217 251
218 $CFClient::UI::ROOT->add ($self); 252 $CFClient::UI::ROOT->add ($self);
219} 253}
220 254
221sub show_centered { 255sub set_visible {
222 my ($self) = @_; 256 my ($self) = @_;
257
223 return if $self->{parent}; 258 return if $self->{visible};
224 259
225 $self->show; 260 $self->{root} = $self->{parent}{root};
261 $self->{visible} = $self->{parent}{visible} + 1;
226 262
227 $CFClient::UI::ROOT->on_post_alloc ( 263 $self->emit (visibility_change => 1);
228 "centered $self" => sub {
229 $self->move (($::WIDTH - $self->{w}) * 0.5, ($::HEIGHT - $self->{h}) * 0.5);
230 },
231 );
232}
233 264
234sub hide { 265 $self->realloc if !exists $self->{req_w};
266
267 $_->set_visible for $self->children;
268}
269
270sub set_invisible {
235 my ($self) = @_; 271 my ($self) = @_;
272
273 return unless $self->{visible};
274
275 $_->set_invisible for $self->children;
276
277 delete $self->{visible};
278 delete $self->{root};
236 279
237 undef $GRAB if $GRAB == $self; 280 undef $GRAB if $GRAB == $self;
238 undef $HOVER if $HOVER == $self; 281 undef $HOVER if $HOVER == $self;
239 282
283 $CFClient::UI::TOOLTIP_WATCHER->cb->()
284 if $TOOLTIP->{owner} == $self;
285
286 $self->focus_out;
287
288 $self->emit (visibility_change => 0);
289}
290
291sub set_visibility {
292 my ($self, $visible) = @_;
293
294 return if $self->{visible} == $visible;
295
296 $visible ? $self->hide
297 : $self->show;
298}
299
300sub toggle_visibility {
301 my ($self) = @_;
302
303 $self->{visible}
304 ? $self->hide
305 : $self->show;
306}
307
308sub hide {
309 my ($self) = @_;
310
311 $self->set_invisible;
312
240 $self->{parent}->remove ($self) 313 $self->{parent}->remove ($self)
241 if $self->{parent}; 314 if $self->{parent};
242} 315}
243 316
244sub move { 317sub move_abs {
245 my ($self, $x, $y, $z) = @_; 318 my ($self, $x, $y, $z) = @_;
246 319
247 $self->{x} = int $x; 320 $self->{x} = List::Util::max 0, List::Util::min $self->{root}{w} - $self->{w}, int $x;
248 $self->{y} = int $y; 321 $self->{y} = List::Util::max 0, List::Util::min $self->{root}{h} - $self->{h}, int $y;
249 $self->{z} = $z if defined $z; 322 $self->{z} = $z if defined $z;
250 323
251 $self->update; 324 $self->update;
252} 325}
253 326
254sub set_size { 327sub set_size {
255 my ($self, $w, $h) = @_; 328 my ($self, $w, $h) = @_;
256 329
257 $self->{user_w} = $w; 330 $self->{force_w} = $w;
258 $self->{user_h} = $h; 331 $self->{force_h} = $h;
259 332
260 $self->check_size; 333 $self->realloc;
261} 334}
262 335
263sub size_request { 336sub size_request {
264 require Carp; 337 require Carp;
265 Carp::confess "size_request is abstract"; 338 Carp::confess "size_request is abstract";
… …
267 340
268sub configure { 341sub configure {
269 my ($self, $x, $y, $w, $h) = @_; 342 my ($self, $x, $y, $w, $h) = @_;
270 343
271 if ($self->{aspect}) { 344 if ($self->{aspect}) {
345 my ($ow, $oh) = ($w, $h);
346
272 my $w2 = List::Util::min $w, int $h * $self->{aspect}; 347 $w = List::Util::min $w, int $h * $self->{aspect};
273 my $h2 = List::Util::min $h, int $w / $self->{aspect}; 348 $h = List::Util::min $h, int $w / $self->{aspect};
274 349
275 # use alignment to adjust x, y 350 # use alignment to adjust x, y
276 351
277 $x += int +($w - $w2) * 0.5; 352 $x += int 0.5 * ($ow - $w);
278 $y += int +($h - $h2) * 0.5; 353 $y += int 0.5 * ($oh - $h);
279
280 ($w, $h) = ($w2, $h2);
281 } 354 }
282 355
283 if ($self->{x} != $x || $self->{y} != $y) { 356 if ($self->{x} ne $x || $self->{y} ne $y) {
284 $self->{x} = $x; 357 $self->{x} = $x;
285 $self->{y} = $y; 358 $self->{y} = $y;
286 $self->update; 359 $self->update;
287 } 360 }
288 361
289 if ($self->{w} != $w || $self->{h} != $h) { 362 if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
290 $CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h]; 363 return unless $self->{visible};
364
365 $self->{alloc_w} = $w;
366 $self->{alloc_h} = $h;
367
368 $self->{root}{size_alloc}{$self+0} = $self;
291 } 369 }
292} 370}
293 371
294sub size_allocate { 372sub size_allocate {
295 # nothing to be done 373 # nothing to be done
296} 374}
297 375
298sub reconfigure {
299 my ($self) = @_;
300
301 $self->check_size (1);
302 $self->update;
303}
304
305sub children { 376sub children {
377 # nop
378}
379
380sub visible_children {
381 $_[0]->children
306} 382}
307 383
308sub set_max_size { 384sub set_max_size {
309 my ($self, $w, $h) = @_; 385 my ($self, $w, $h) = @_;
310 386
311 delete $self->{max_w}; $self->{max_w} = $w if $w; 387 $self->{max_w} = int $w if defined $w;
312 delete $self->{max_h}; $self->{max_h} = $h if $h; 388 $self->{max_h} = int $h if defined $h;
389
390 $self->realloc;
313} 391}
314 392
315sub set_tooltip { 393sub set_tooltip {
316 my ($self, $tooltip) = @_; 394 my ($self, $tooltip) = @_;
317 395
396 $tooltip =~ s/^\s+//;
397 $tooltip =~ s/\s+$//;
398
399 return if $self->{tooltip} eq $tooltip;
400
318 $self->{tooltip} = $tooltip; 401 $self->{tooltip} = $tooltip;
319 402
320 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 403 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
321 delete $CFClient::UI::TOOLTIP->{owner}; 404 delete $CFClient::UI::TOOLTIP->{owner};
322 CFClient::UI::check_tooltip; 405 $CFClient::UI::TOOLTIP_WATCHER->cb->();
323 } 406 }
324} 407}
325 408
326# translate global coordinates to local coordinate system 409# translate global coordinates to local coordinate system
327sub coord2local { 410sub coord2local {
… …
343 return if $FOCUS == $self; 426 return if $FOCUS == $self;
344 return unless $self->{can_focus}; 427 return unless $self->{can_focus};
345 428
346 my $focus = $FOCUS; $FOCUS = $self; 429 my $focus = $FOCUS; $FOCUS = $self;
347 430
348 $self->emit (focus_in => $focus); 431 $self->_emit (focus_in => $focus);
349 432
350 $focus->update if $focus; 433 $focus->update if $focus;
351 $FOCUS->update; 434 $FOCUS->update;
352} 435}
353 436
… …
356 439
357 return unless $FOCUS == $self; 440 return unless $FOCUS == $self;
358 441
359 my $focus = $FOCUS; undef $FOCUS; 442 my $focus = $FOCUS; undef $FOCUS;
360 443
361 $self->emit (focus_out => $focus); 444 $self->_emit (focus_out => $focus);
362 445
363 $focus->update if $focus; #? 446 $focus->update if $focus; #?
364}
365 447
448 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus
449 unless $FOCUS;
450}
451
366sub mouse_motion { } 452sub mouse_motion { 0 }
367sub button_up { } 453sub button_up { 0 }
368sub key_down { } 454sub key_down { 0 }
369sub key_up { } 455sub key_up { 0 }
370 456
371sub button_down { 457sub button_down {
372 my ($self, $ev, $x, $y) = @_; 458 my ($self, $ev, $x, $y) = @_;
373 459
374 $self->focus_in; 460 $self->focus_in;
375}
376 461
377sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 462 0
378sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 463}
379sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 464
380sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 465sub find_widget {
381sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} } 466 my ($self, $x, $y) = @_;
467
468 return () unless $self->{can_events};
469
470 return $self
471 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
472 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
473
474 ()
475}
476
477sub set_parent {
478 my ($self, $parent) = @_;
479
480 Scalar::Util::weaken ($self->{parent} = $parent);
481 $self->set_visible if $parent->{visible};
482}
483
484sub connect {
485 my ($self, $signal, $cb) = @_;
486
487 push @{ $self->{signal_cb}{$signal} }, $cb;
488}
489
490sub _emit {
491 my ($self, $signal, @args) = @_;
492
493 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
494}
495
496sub emit {
497 my ($self, $signal, @args) = @_;
498
499 $self->_emit ($signal, @args)
500 || $self->$signal (@args);
501}
502
503sub visibility_change {
504 #my ($self, $visible) = @_;
505}
506
507sub realloc {
508 my ($self) = @_;
509
510 if ($self->{visible}) {
511 return if $self->{root}{realloc}{$self+0};
512
513 $self->{root}{realloc}{$self+0} = $self;
514 $self->{root}->update;
515 } else {
516 delete $self->{req_w};
517 delete $self->{req_h};
518 }
519}
520
521sub update {
522 my ($self) = @_;
523
524 $self->{parent}->update
525 if $self->{parent};
526}
527
528sub reconfigure {
529 my ($self) = @_;
530
531 $self->realloc;
532 $self->update;
533}
534
535# using global variables seems a bit hacky, but passing through all drawing
536# functions seems pointless.
537our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn
382 538
383sub draw { 539sub draw {
384 my ($self) = @_; 540 my ($self) = @_;
385 541
386 return unless $self->{h} && $self->{w}; 542 return unless $self->{h} && $self->{w};
543
544 # update screen rectangle
545 local $draw_x = $draw_x + $self->{x};
546 local $draw_y = $draw_y + $self->{y};
547 local $draw_w = $draw_x + $self->{w};
548 local $draw_h = $draw_y + $self->{h};
549
550 # skip widgets that are entirely outside the drawing area
551 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
552 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
387 553
388 glPushMatrix; 554 glPushMatrix;
389 glTranslate $self->{x}, $self->{y}, 0; 555 glTranslate $self->{x}, $self->{y}, 0;
390 $self->_draw;
391 glPopMatrix;
392 556
393 if ($self == $HOVER && $self->{can_hover}) { 557 if ($self == $HOVER && $self->{can_hover}) {
394 my ($x, $y) = @$self{qw(x y)};
395
396 glColor 1, 0.8, 0.5, 0.2; 558 glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
397 glEnable GL_BLEND; 559 glEnable GL_BLEND;
398 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 560 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
399 glBegin GL_QUADS; 561 glBegin GL_QUADS;
400 glVertex $x , $y;
401 glVertex $x + $self->{w}, $y;
402 glVertex $x + $self->{w}, $y + $self->{h};
403 glVertex $x , $y + $self->{h};
404 glEnd;
405 glDisable GL_BLEND;
406 }
407
408 if ($ENV{PCLIENT_DEBUG}) {
409 glPushMatrix;
410 glColor 1, 1, 0, 1;
411 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
412 glBegin GL_LINE_LOOP;
413 glVertex 0 , 0; 562 glVertex 0 , 0;
414 glVertex $self->{w}, 0; 563 glVertex $self->{w}, 0;
415 glVertex $self->{w}, $self->{h}; 564 glVertex $self->{w}, $self->{h};
416 glVertex 0 , $self->{h}; 565 glVertex 0 , $self->{h};
417 glEnd; 566 glEnd;
567 glDisable GL_BLEND;
568 }
569
570 if ($ENV{CFPLUS_DEBUG} & 1) {
571 glPushMatrix;
572 glColor 1, 1, 0, 1;
573 glTranslate 0.375, 0.375;
574 glBegin GL_LINE_LOOP;
575 glVertex 0 , 0;
576 glVertex $self->{w} - 1, 0;
577 glVertex $self->{w} - 1, $self->{h} - 1;
578 glVertex 0 , $self->{h} - 1;
579 glEnd;
418 glPopMatrix; 580 glPopMatrix;
419 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 581 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
420 } 582 }
583
584 $self->_draw;
585 glPopMatrix;
421} 586}
422 587
423sub _draw { 588sub _draw {
424 my ($self) = @_; 589 my ($self) = @_;
425 590
426 warn "no draw defined for $self\n"; 591 warn "no draw defined for $self\n";
427} 592}
428 593
429sub find_widget {
430 my ($self, $x, $y) = @_;
431
432 return () unless $self->{can_events};
433
434 return $self
435 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
436 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
437
438 ()
439}
440
441sub set_parent {
442 my ($self, $parent) = @_;
443
444 Scalar::Util::weaken ($self->{parent} = $parent);
445
446 # TODO: req_w _does_change after ->reconfigure
447 $self->check_size
448 unless exists $self->{req_w};
449
450 $self->show;
451}
452
453sub check_size {
454 my ($self, $forced) = @_;
455
456 $self->{force_alloc} = 1 if $forced;
457 $CFClient::UI::ROOT->{check_size}{$self} = $self;
458}
459
460sub update {
461 my ($self) = @_;
462
463 $self->{parent}->update
464 if $self->{parent};
465}
466
467sub connect {
468 my ($self, $signal, $cb) = @_;
469
470 push @{ $self->{signal_cb}{$signal} }, $cb;
471}
472
473sub emit {
474 my ($self, $signal, @args) = @_;
475
476 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
477}
478
479sub DESTROY { 594sub DESTROY {
480 my ($self) = @_; 595 my ($self) = @_;
481 596
482 delete $WIDGET{$self+0}; 597 delete $WIDGET{$self+0};
483 #$self->deactivate; 598
599 eval { $self->destroy };
600 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
484} 601}
485 602
486############################################################################# 603#############################################################################
487 604
488package CFClient::UI::DrawBG; 605package CFClient::UI::DrawBG;
… …
513 630
514 if ($color && (@$color < 4 || $color->[3])) { 631 if ($color && (@$color < 4 || $color->[3])) {
515 my ($w, $h) = @$self{qw(w h)}; 632 my ($w, $h) = @$self{qw(w h)};
516 633
517 glEnable GL_BLEND; 634 glEnable GL_BLEND;
518 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 635 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
519 glColor @$color; 636 glColor_premultiply @$color;
520 637
521 glBegin GL_QUADS; 638 glBegin GL_QUADS;
522 glVertex 0 , 0; 639 glVertex 0 , 0;
523 glVertex 0 , $h; 640 glVertex 0 , $h;
524 glVertex $w, $h; 641 glVertex $w, $h;
… …
539 my ($class, %arg) = @_; 656 my ($class, %arg) = @_;
540 $class->SUPER::new (can_events => 0, %arg); 657 $class->SUPER::new (can_events => 0, %arg);
541} 658}
542 659
543sub size_request { 660sub size_request {
544 (0, 0) 661 my ($self) = @_;
662
663 ($self->{w} + 0, $self->{h} + 0)
545} 664}
546 665
547sub draw { } 666sub draw { }
548 667
549############################################################################# 668#############################################################################
… …
553our @ISA = CFClient::UI::Base::; 672our @ISA = CFClient::UI::Base::;
554 673
555sub new { 674sub new {
556 my ($class, %arg) = @_; 675 my ($class, %arg) = @_;
557 676
558 my $children = delete $arg{children} || []; 677 my $children = delete $arg{children};
559 678
560 my $self = $class->SUPER::new ( 679 my $self = $class->SUPER::new (
561 children => [], 680 children => [],
562 can_events => 0, 681 can_events => 0,
563 %arg, 682 %arg,
564 ); 683 );
684
565 $self->add ($_) for @$children; 685 $self->add (@$children)
686 if $children;
566 687
567 $self 688 $self
568} 689}
569 690
570sub add { 691sub add {
… …
578 $self->{children} = [ 699 $self->{children} = [
579 sort { $a->{z} <=> $b->{z} } 700 sort { $a->{z} <=> $b->{z} }
580 @{$self->{children}}, @widgets 701 @{$self->{children}}, @widgets
581 ]; 702 ];
582 703
583 $self->check_size (1); 704 $self->realloc;
584 $self->update;
585} 705}
586 706
587sub children { 707sub children {
588 @{ $_[0]{children} } 708 @{ $_[0]{children} }
589} 709}
… …
594 delete $child->{parent}; 714 delete $child->{parent};
595 $child->hide; 715 $child->hide;
596 716
597 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 717 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
598 718
599 $self->check_size; 719 $self->realloc;
600 $self->update;
601} 720}
602 721
603sub clear { 722sub clear {
604 my ($self) = @_; 723 my ($self) = @_;
605 724
… …
609 for (@$children) { 728 for (@$children) {
610 delete $_->{parent}; 729 delete $_->{parent};
611 $_->hide; 730 $_->hide;
612 } 731 }
613 732
614 $self->check_size; 733 $self->realloc;
615 $self->update;
616} 734}
617 735
618sub find_widget { 736sub find_widget {
619 my ($self, $x, $y) = @_; 737 my ($self, $x, $y) = @_;
620 738
621 $x -= $self->{x}; 739 $x -= $self->{x};
622 $y -= $self->{y}; 740 $y -= $self->{y};
623 741
624 my $res; 742 my $res;
625 743
626 for (reverse @{ $self->{children} }) { 744 for (reverse $self->visible_children) {
627 $res = $_->find_widget ($x, $y) 745 $res = $_->find_widget ($x, $y)
628 and return $res; 746 and return $res;
629 } 747 }
630 748
631 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y}) 749 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
… …
652} 770}
653 771
654sub add { 772sub add {
655 my ($self, $child) = @_; 773 my ($self, $child) = @_;
656 774
657 $self->{children} = []; 775 $self->SUPER::remove ($_) for @{ $self->{children} };
658
659 $self->SUPER::add ($child); 776 $self->SUPER::add ($child);
660} 777}
661 778
662sub remove { 779sub remove {
663 my ($self, $widget) = @_; 780 my ($self, $widget) = @_;
… …
680 $self->{children}[0]->configure (0, 0, $w, $h); 797 $self->{children}[0]->configure (0, 0, $w, $h);
681} 798}
682 799
683############################################################################# 800#############################################################################
684 801
802# back-buffered drawing area
803
685package CFClient::UI::Window; 804package CFClient::UI::Window;
686 805
687our @ISA = CFClient::UI::Bin::; 806our @ISA = CFClient::UI::Bin::;
688 807
689use CFClient::OpenGL; 808use CFClient::OpenGL;
… …
707 $self->SUPER::size_allocate ($w, $h); 826 $self->SUPER::size_allocate ($w, $h);
708 $self->update; 827 $self->update;
709} 828}
710 829
711sub _render { 830sub _render {
831 my ($self) = @_;
832
712 $_[0]{children}[0]->draw; 833 $self->{children}[0]->draw;
713} 834}
714 835
715sub render_child { 836sub render_child {
716 my ($self) = @_; 837 my ($self) = @_;
717 838
718 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 839 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
719 glClearColor 0, 0, 0, 0; 840 glClearColor 0, 0, 0, 0;
720 glClear GL_COLOR_BUFFER_BIT; 841 glClear GL_COLOR_BUFFER_BIT;
721 842
843 {
844 package CFClient::UI::Base;
845
846 ($draw_x, $draw_y, $draw_w, $draw_h) =
847 (0, 0, $self->{w}, $self->{h});
848 }
849
722 $self->_render; 850 $self->_render;
723 }; 851 };
724} 852}
725 853
726sub _draw { 854sub _draw {
727 my ($self) = @_; 855 my ($self) = @_;
728 856
729 my ($w, $h) = ($self->w, $self->h); 857 my ($w, $h) = @$self{qw(w h)};
730 858
731 my $tex = $self->{texture} 859 my $tex = $self->{texture}
732 or return; 860 or return;
733 861
734 glEnable GL_TEXTURE_2D; 862 glEnable GL_TEXTURE_2D;
735 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 863 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
736 glColor 1, 1, 1, 1; 864 glColor 0, 0, 0, 1;
737 865
738 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 866 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
739 867
740 glDisable GL_TEXTURE_2D; 868 glDisable GL_TEXTURE_2D;
741} 869}
… …
744 872
745package CFClient::UI::ViewPort; 873package CFClient::UI::ViewPort;
746 874
747our @ISA = CFClient::UI::Window::; 875our @ISA = CFClient::UI::Window::;
748 876
877sub new {
878 my $class = shift;
879
880 $class->SUPER::new (
881 scroll_x => 0,
882 scroll_y => 1,
883 @_,
884 )
885}
886
749sub size_request { 887sub size_request {
750 my ($self) = @_; 888 my ($self) = @_;
751 889
752 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 890 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
753 891
754 @$self{qw(child_w child_h)} 892 $w = 10 if $self->{scroll_x};
893 $h = 10 if $self->{scroll_y};
894
895 ($w, $h)
755} 896}
756 897
757sub size_allocate { 898sub size_allocate {
758 my ($self, $w, $h) = @_; 899 my ($self, $w, $h) = @_;
759 900
760 my ($cw, $ch) = @$self{qw(child_w child_h)}; 901 my $child = $self->child;
761# $w = $self->{w}; 902
903 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
904 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
905
762 $self->child->configure (0, 0, $cw, $ch); 906 $self->child->configure (0, 0, $w, $h);
763 $self->update; 907 $self->update;
764} 908}
765 909
766sub set_offset { 910sub set_offset {
767 my ($self, $x, $y) = @_; 911 my ($self, $x, $y) = @_;
… …
801} 945}
802 946
803sub _render { 947sub _render {
804 my ($self) = @_; 948 my ($self) = @_;
805 949
950 local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};
951 local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y};
952
806 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 953 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
807 954
808 $self->SUPER::_render; 955 $self->SUPER::_render;
809} 956}
810 957
… …
813package CFClient::UI::ScrolledWindow; 960package CFClient::UI::ScrolledWindow;
814 961
815our @ISA = CFClient::UI::HBox::; 962our @ISA = CFClient::UI::HBox::;
816 963
817sub new { 964sub new {
818 my $class = shift; 965 my ($class, %arg) = @_;
966
967 my $child = delete $arg{child};
819 968
820 my $self; 969 my $self;
821 970
822 my $slider = new CFClient::UI::Slider 971 my $slider = new CFClient::UI::Slider
823 vertical => 1, 972 vertical => 1,
824 range => [0, 0, 1, 0.01], # HACK fix 973 range => [0, 0, 1, 0.01], # HACK fix
825 connect_changed => sub { 974 on_changed => sub {
826 $self->{vp}->set_offset (0, $_[1]); 975 $self->{vp}->set_offset (0, $_[1]);
827 }, 976 },
828 ; 977 ;
829 978
830 $self = $class->SUPER::new ( 979 $self = $class->SUPER::new (
831 vp => (new CFClient::UI::ViewPort expand => 1), 980 vp => (new CFClient::UI::ViewPort expand => 1),
832 slider => $slider, 981 slider => $slider,
833 @_, 982 %arg,
834 ); 983 );
835 984
836 $self->{vp}->add ($self->{scrolled});
837 $self->add ($self->{vp});
838 $self->add ($self->{slider}); 985 $self->SUPER::add ($self->{vp}, $self->{slider});
986 $self->add ($child) if $child;
839 987
840 $self 988 $self
989}
990
991sub add {
992 my ($self, $widget) = @_;
993
994 $self->{vp}->add ($self->{child} = $widget);
995}
996
997sub update {
998 my ($self) = @_;
999
1000 $self->SUPER::update;
1001
1002 # todo: overwrite size_allocate of child
1003 my $child = $self->{vp}->child;
1004 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
841} 1005}
842 1006
843sub size_allocate { 1007sub size_allocate {
844 my ($self, $w, $h) = @_; 1008 my ($self, $w, $h) = @_;
845 1009
… …
874 1038
875 if ($self->{bg}) { 1039 if ($self->{bg}) {
876 my ($w, $h) = @$self{qw(w h)}; 1040 my ($w, $h) = @$self{qw(w h)};
877 1041
878 glEnable GL_BLEND; 1042 glEnable GL_BLEND;
879 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1043 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
880 glColor @{ $self->{bg} }; 1044 glColor_premultiply @{ $self->{bg} };
881 1045
882 glBegin GL_QUADS; 1046 glBegin GL_QUADS;
883 glVertex 0 , 0; 1047 glVertex 0 , 0;
884 glVertex 0 , $h; 1048 glVertex 0 , $h;
885 glVertex $w, $h; 1049 glVertex $w, $h;
… …
898 1062
899our @ISA = CFClient::UI::Bin::; 1063our @ISA = CFClient::UI::Bin::;
900 1064
901use CFClient::OpenGL; 1065use CFClient::OpenGL;
902 1066
903my @tex = 1067my $bg =
1068 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1069 mipmap => 1, wrap => 1;
1070
1071my @border =
904 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1072 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
905 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1073 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
906 1074
907sub new { 1075sub new {
908 my $class = shift; 1076 my ($class, %arg) = @_;
909
910 # TODO: user_x, user_y, overwrite moveto?
911 1077
912 my $self = $class->SUPER::new ( 1078 my $self = $class->SUPER::new (
913 bg => [1, 1, 1, 1], 1079 bg => [1, 1, 1, 1],
914 border_bg => [1, 1, 1, 1], 1080 border_bg => [1, 1, 1, 1],
915 border => 0.6, 1081 border => 0.6,
916 is_toplevel => 1,
917 can_events => 1, 1082 can_events => 1,
918 @_ 1083 min_w => 16,
1084 min_h => 16,
1085 %arg,
919 ); 1086 );
920 1087
921 $self->{title} &&= new CFClient::UI::Label 1088 $self->{title_widget} = new CFClient::UI::Label
922 align => 0, 1089 align => 0,
923 valign => 1, 1090 valign => 1,
924 text => $self->{title}, 1091 text => $self->{title},
925 fontsize => $self->{border}; 1092 fontsize => $self->{border},
1093 if exists $self->{title};
926 1094
927 $self 1095 $self
1096}
1097
1098sub add {
1099 my ($self, @widgets) = @_;
1100
1101 $self->SUPER::add (@widgets);
1102 $self->CFClient::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
928} 1103}
929 1104
930sub border { 1105sub border {
931 int $_[0]{border} * $::FONTSIZE 1106 int $_[0]{border} * $::FONTSIZE
932} 1107}
933 1108
934sub size_request { 1109sub size_request {
935 my ($self) = @_; 1110 my ($self) = @_;
1111
1112 $self->{title_widget}->size_request
1113 if $self->{title_widget};
936 1114
937 my ($w, $h) = $self->SUPER::size_request; 1115 my ($w, $h) = $self->SUPER::size_request;
938 1116
939 ( 1117 (
940 $w + $self->border * 2, 1118 $w + $self->border * 2,
… …
943} 1121}
944 1122
945sub size_allocate { 1123sub size_allocate {
946 my ($self, $w, $h) = @_; 1124 my ($self, $w, $h) = @_;
947 1125
1126 if ($self->{title_widget}) {
1127 $self->{title_widget}{w} = $w;
1128 $self->{title_widget}{h} = $h;
1129 $self->{title_widget}->size_allocate ($w, $h);
1130 }
1131
1132 my $border = $self->border;
1133
948 $h -= List::Util::max 0, $self->border * 2; 1134 $h -= List::Util::max 0, $border * 2;
949 $w -= List::Util::max 0, $self->border * 2; 1135 $w -= List::Util::max 0, $border * 2;
950 1136
951 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
952 if $self->{title};
953
954 $self->child->configure ($self->border, $self->border, $w, $h); 1137 $self->child->configure ($border, $border, $w, $h);
955} 1138}
956 1139
957sub button_down { 1140sub button_down {
958 my ($self, $ev, $x, $y) = @_; 1141 my ($self, $ev, $x, $y) = @_;
959 1142
… …
975 my ($ev, $x, $y) = @_; 1158 my ($ev, $x, $y) = @_;
976 1159
977 my $dx = $ev->{x} - $ox; 1160 my $dx = $ev->{x} - $ox;
978 my $dy = $ev->{y} - $oy; 1161 my $dy = $ev->{y} - $oy;
979 1162
980 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1163 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
981 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1164 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1165
982 $self->move ($wx + $dx * $mx, $wy + $dy * $my); 1166 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
983 $self->check_size; 1167 $self->realloc;
984 }; 1168 };
985 1169
986 } elsif ($lr ^ $td) { 1170 } elsif ($lr ^ $td) {
987 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1171 my ($ox, $oy) = ($ev->{x}, $ev->{y});
988 my ($bx, $by) = ($self->{x}, $self->{y}); 1172 my ($bx, $by) = ($self->{x}, $self->{y});
… …
990 $self->{motion} = sub { 1174 $self->{motion} = sub {
991 my ($ev, $x, $y) = @_; 1175 my ($ev, $x, $y) = @_;
992 1176
993 ($x, $y) = ($ev->{x}, $ev->{y}); 1177 ($x, $y) = ($ev->{x}, $ev->{y});
994 1178
995 $self->move ($bx + $x - $ox, $by + $y - $oy); 1179 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
996 $self->update; 1180 # HACK: the next line is required to enforce placement
1181 $self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h});
997 }; 1182 };
1183 } else {
1184 return 0;
1185 }
1186
998 } 1187 1
999} 1188}
1000 1189
1001sub button_up { 1190sub button_up {
1002 my ($self, $ev, $x, $y) = @_; 1191 my ($self, $ev, $x, $y) = @_;
1003 1192
1004 delete $self->{motion}; 1193 !!delete $self->{motion}
1005} 1194}
1006 1195
1007sub mouse_motion { 1196sub mouse_motion {
1008 my ($self, $ev, $x, $y) = @_; 1197 my ($self, $ev, $x, $y) = @_;
1009 1198
1010 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1199 $self->{motion}->($ev, $x, $y) if $self->{motion};
1200
1201 !!$self->{motion}
1011} 1202}
1012 1203
1013sub _draw { 1204sub _draw {
1014 my ($self) = @_; 1205 my ($self) = @_;
1015 1206
1207 my $child = $self->{children}[0];
1208
1016 my ($w, $h ) = ($self->{w}, $self->{h}); 1209 my ($w, $h ) = ($self->{w}, $self->{h});
1017 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1210 my ($cw, $ch) = ($child->{w}, $child->{h});
1018 1211
1019 glEnable GL_TEXTURE_2D; 1212 glEnable GL_TEXTURE_2D;
1020 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1213 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1021 1214
1022 my $border = $self->border; 1215 my $border = $self->border;
1023 1216
1024 glColor @{ $self->{border_bg} }; 1217 glColor @{ $self->{border_bg} };
1025 $tex[1]->draw_quad_alpha (0, 0, $w, $border); 1218 $border[0]->draw_quad_alpha (0, 0, $w, $border);
1026 $tex[3]->draw_quad_alpha (0, $border, $border, $ch); 1219 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
1027 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1220 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1028 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border); 1221 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
1029 1222
1030 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1223 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1031 my $bg = $tex[0]; 1224 glColor @{ $self->{bg} };
1032 1225
1033 # TODO: repeat texture not scale 1226 # TODO: repeat texture not scale
1227 # solve this better(?)
1034 my $rep_x = $cw / $bg->{w}; 1228 $bg->{s} = $cw / $bg->{w};
1035 my $rep_y = $ch / $bg->{h}; 1229 $bg->{t} = $ch / $bg->{h};
1036
1037 glColor @{ $self->{bg} };
1038
1039 $bg->{s} = $rep_x;
1040 $bg->{t} = $rep_y;
1041 $bg->{wrap_mode} = 1;
1042 $bg->draw_quad_alpha ($border, $border, $cw, $ch); 1230 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1043 } 1231 }
1044 1232
1045 glDisable GL_TEXTURE_2D; 1233 glDisable GL_TEXTURE_2D;
1046 1234
1047 $self->{title}->draw if $self->{title};
1048
1049 $self->child->draw; 1235 $child->draw;
1236
1237 if ($self->{title_widget}) {
1238 glTranslate 0, $border - $self->{h};
1239 $self->{title_widget}->_draw;
1240 }
1050} 1241}
1051 1242
1052############################################################################# 1243#############################################################################
1053 1244
1054package CFClient::UI::Table; 1245package CFClient::UI::Table;
… …
1062sub new { 1253sub new {
1063 my $class = shift; 1254 my $class = shift;
1064 1255
1065 $class->SUPER::new ( 1256 $class->SUPER::new (
1066 col_expand => [], 1257 col_expand => [],
1067 @_ 1258 @_,
1068 ) 1259 )
1260}
1261
1262sub children {
1263 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1069} 1264}
1070 1265
1071sub add { 1266sub add {
1072 my ($self, $x, $y, $child) = @_; 1267 my ($self, $x, $y, $child) = @_;
1073 1268
1074 $child->set_parent ($self); 1269 $child->set_parent ($self);
1075 $self->{children}[$y][$x] = $child; 1270 $self->{children}[$y][$x] = $child;
1076 1271
1077 $child->check_size; 1272 $self->realloc;
1078} 1273}
1079 1274
1080sub children { 1275sub remove {
1081 grep $_, map @$_, grep $_, @{ $_[0]{children} } 1276 my ($self, $child) = @_;
1082}
1083 1277
1278 # TODO: not yet implemented
1279}
1280
1084# TODO: move to container class maybe? send childs a signal on removal? 1281# TODO: move to container class maybe? send children a signal on removal?
1085sub clear { 1282sub clear {
1086 my ($self) = @_; 1283 my ($self) = @_;
1087 1284
1088 my @children = $self->children; 1285 my @children = $self->children;
1089 delete $self->{children}; 1286 delete $self->{children};
… …
1091 for (@children) { 1288 for (@children) {
1092 delete $_->{parent}; 1289 delete $_->{parent};
1093 $_->hide; 1290 $_->hide;
1094 } 1291 }
1095 1292
1096 $self->update; 1293 $self->realloc;
1097} 1294}
1098 1295
1099sub get_wh { 1296sub get_wh {
1100 my ($self) = @_; 1297 my ($self) = @_;
1101 1298
… …
1132sub size_allocate { 1329sub size_allocate {
1133 my ($self, $w, $h) = @_; 1330 my ($self, $w, $h) = @_;
1134 1331
1135 my ($ws, $hs) = $self->get_wh; 1332 my ($ws, $hs) = $self->get_wh;
1136 1333
1137 my $req_w = sum @$ws; 1334 my $req_w = (sum @$ws) || 1;
1138 my $req_h = sum @$hs; 1335 my $req_h = (sum @$hs) || 1;
1139 1336
1140 # TODO: nicer code && do row_expand 1337 # TODO: nicer code && do row_expand
1141 my @col_expand = @{$self->{col_expand}}; 1338 my @col_expand = @{$self->{col_expand}};
1142 @col_expand = (1) x @$ws unless @col_expand; 1339 @col_expand = (1) x @$ws unless @col_expand;
1143 my $col_expand = (sum @col_expand) || 1; 1340 my $col_expand = (sum @col_expand) || 1;
… …
1197 } 1394 }
1198} 1395}
1199 1396
1200############################################################################# 1397#############################################################################
1201 1398
1202package CFClient::UI::HBox; 1399package CFClient::UI::Box;
1203
1204# TODO: wrap into common Box base class
1205 1400
1206our @ISA = CFClient::UI::Container::; 1401our @ISA = CFClient::UI::Container::;
1207 1402
1208sub size_request { 1403sub size_request {
1209 my ($self) = @_; 1404 my ($self) = @_;
1210 1405
1211 my @alloc = map [$_->size_request], @{$self->{children}}; 1406 $self->{vertical}
1212 1407 ? (
1213 ( 1408 (List::Util::max map $_->{req_w}, @{$self->{children}}),
1214 (List::Util::sum map $_->[0], @alloc), 1409 (List::Util::sum map $_->{req_h}, @{$self->{children}}),
1215 (List::Util::max map $_->[1], @alloc), 1410 )
1216 ) 1411 : (
1412 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1413 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1414 )
1217} 1415}
1218 1416
1219sub size_allocate { 1417sub size_allocate {
1220 my ($self, $w, $h) = @_; 1418 my ($self, $w, $h) = @_;
1221 1419
1222 ($h, $w) = ($w, $h); 1420 my $space = $self->{vertical} ? $h : $w;
1223
1224 my $children = $self->{children}; 1421 my $children = $self->{children};
1225 1422
1226 my @h = map $_->{req_w}, @$children; 1423 my @req;
1227 1424
1228 my $req_h = List::Util::sum @h; 1425 if ($self->{homogeneous}) {
1229 1426 @req = ($space / (@$children || 1)) x @$children;
1230 if ($req_h > $h) {
1231 # ah well, not enough space
1232 $_ *= $h / $req_h for @h;
1233 } else { 1427 } else {
1428 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;
1429 my $req = List::Util::sum @req;
1430
1431 if ($req > $space) {
1432 # ah well, not enough space
1433 $_ *= $space / $req for @req;
1434 } else {
1234 my $exp = List::Util::sum map $_->{expand}, @$children; 1435 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1235 $exp ||= 1;
1236 1436
1437 $space = ($space - $req) / $expand; # remaining space to give away
1438
1439 $req[$_] += $space * $children->[$_]{expand}
1237 for (0 .. $#$children) { 1440 for 0 .. $#$children;
1238 my $child = $children->[$_];
1239
1240 my $alloc_h = $h[$_];
1241 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1242 $h[$_] = $alloc_h;
1243 } 1441 }
1244 } 1442 }
1245 1443
1246 CFClient::UI::harmonize \@h; 1444 CFClient::UI::harmonize \@req;
1247 1445
1248 my $y = 0; 1446 my $pos = 0;
1249 for (0 .. $#$children) { 1447 for (0 .. $#$children) {
1250 my $child = $children->[$_];
1251 my $h = $h[$_]; 1448 my $alloc = $req[$_];
1252 $child->configure ($y, 0, $h, $w); 1449 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1253 1450
1254 $y += $h; 1451 $pos += $alloc;
1255 } 1452 }
1256 1453
1257 1 1454 1
1258} 1455}
1259 1456
1260############################################################################# 1457#############################################################################
1261 1458
1459package CFClient::UI::HBox;
1460
1461our @ISA = CFClient::UI::Box::;
1462
1463sub new {
1464 my $class = shift;
1465
1466 $class->SUPER::new (
1467 vertical => 0,
1468 @_,
1469 )
1470}
1471
1472#############################################################################
1473
1262package CFClient::UI::VBox; 1474package CFClient::UI::VBox;
1263 1475
1264# TODO: wrap into common Box base class
1265
1266our @ISA = CFClient::UI::Container::; 1476our @ISA = CFClient::UI::Box::;
1267 1477
1268sub size_request { 1478sub new {
1269 my ($self) = @_; 1479 my $class = shift;
1270 1480
1271 my @alloc = map [$_->size_request], @{$self->{children}}; 1481 $class->SUPER::new (
1272 1482 vertical => 1,
1273 ( 1483 @_,
1274 (List::Util::max map $_->[0], @alloc),
1275 (List::Util::sum map $_->[1], @alloc),
1276 ) 1484 )
1277}
1278
1279sub size_allocate {
1280 my ($self, $w, $h) = @_;
1281
1282 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1283
1284 my $children = $self->{children};
1285
1286 my @h = map $_->{req_h}, @$children;
1287
1288 my $req_h = List::Util::sum @h;
1289
1290 if ($req_h > $h) {
1291 # ah well, not enough space
1292 $_ *= $h / $req_h for @h;
1293 } else {
1294 my $exp = List::Util::sum map $_->{expand}, @$children;
1295 $exp ||= 1;
1296
1297 for (0 .. $#$children) {
1298 my $child = $children->[$_];
1299
1300 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1301 }
1302 }
1303
1304 CFClient::UI::harmonize \@h;
1305
1306 my $y = 0;
1307 for (0 .. $#$children) {
1308 my $child = $children->[$_];
1309 my $h = $h[$_];
1310 $child->configure (0, $y, $w, $h);
1311
1312 $y += $h;
1313 }
1314
1315 1
1316} 1485}
1317 1486
1318############################################################################# 1487#############################################################################
1319 1488
1320package CFClient::UI::Label; 1489package CFClient::UI::Label;
… …
1337 ellipsise => 3, # end 1506 ellipsise => 3, # end
1338 layout => (new CFClient::Layout), 1507 layout => (new CFClient::Layout),
1339 fontsize => 1, 1508 fontsize => 1,
1340 align => -1, 1509 align => -1,
1341 valign => -1, 1510 valign => -1,
1342 padding => 2, 1511 padding_x => 2,
1512 padding_y => 2,
1343 can_events => 0, 1513 can_events => 0,
1344 %arg 1514 %arg
1345 ); 1515 );
1346 1516
1347 if (exists $self->{template}) { 1517 if (exists $self->{template}) {
… …
1374 1544
1375 delete $self->{texture}; 1545 delete $self->{texture};
1376 $self->SUPER::update; 1546 $self->SUPER::update;
1377} 1547}
1378 1548
1549sub realloc {
1550 my ($self) = @_;
1551
1552 delete $self->{ox};
1553 $self->SUPER::realloc;
1554}
1555
1379sub set_text { 1556sub set_text {
1380 my ($self, $text) = @_; 1557 my ($self, $text) = @_;
1381 1558
1382 return if $self->{text} eq "T$text"; 1559 return if $self->{text} eq "T$text";
1383 $self->{text} = "T$text"; 1560 $self->{text} = "T$text";
1384 1561
1385 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1562 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1386 $self->{layout}->set_text ($text); 1563 $self->{layout}->set_text ($text);
1387 1564
1565 delete $self->{size_req};
1566 $self->realloc;
1388 $self->update; 1567 $self->update;
1389 $self->check_size;
1390} 1568}
1391 1569
1392sub set_markup { 1570sub set_markup {
1393 my ($self, $markup) = @_; 1571 my ($self, $markup) = @_;
1394 1572
… …
1398 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1576 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1399 1577
1400 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba; 1578 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1401 $self->{layout}->set_markup ($markup); 1579 $self->{layout}->set_markup ($markup);
1402 1580
1581 delete $self->{size_req};
1582 $self->realloc;
1403 $self->update; 1583 $self->update;
1404 $self->check_size;
1405} 1584}
1406 1585
1407sub size_request { 1586sub size_request {
1408 my ($self) = @_; 1587 my ($self) = @_;
1409 1588
1589 $self->{size_req} ||= do {
1410 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1590 $self->{layout}->set_font ($self->{font}) if $self->{font};
1411 $self->{layout}->set_width ($self->{max_w} || -1); 1591 $self->{layout}->set_width ($self->{max_w} || -1);
1412 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1592 $self->{layout}->set_ellipsise ($self->{ellipsise});
1413 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1593 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1414 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1594 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1415 1595
1416 my ($w, $h) = $self->{layout}->size; 1596 my ($w, $h) = $self->{layout}->size;
1417 1597
1418 if (exists $self->{template}) { 1598 if (exists $self->{template}) {
1419 $self->{template}->set_font ($self->{font}) if $self->{font}; 1599 $self->{template}->set_font ($self->{font}) if $self->{font};
1420 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1600 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1421 1601
1422 my ($w2, $h2) = $self->{template}->size; 1602 my ($w2, $h2) = $self->{template}->size;
1423 1603
1424 $w = List::Util::max $w, $w2; 1604 $w = List::Util::max $w, $w2;
1425 $h = List::Util::max $h, $h2; 1605 $h = List::Util::max $h, $h2;
1606 }
1607
1608 [$w, $h]
1426 } 1609 };
1427 1610
1428 ( 1611 @{ $self->{size_req} }
1429 $w + $self->{padding} * 2,
1430 $h + $self->{padding} * 2,
1431 )
1432} 1612}
1433 1613
1434sub size_allocate { 1614sub size_allocate {
1435 my ($self, $w, $h) = @_; 1615 my ($self, $w, $h) = @_;
1436 1616
1617 delete $self->{ox};
1618
1437 delete $self->{texture}; 1619 delete $self->{texture}
1620 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1438} 1621}
1439 1622
1440sub set_fontsize { 1623sub set_fontsize {
1441 my ($self, $fontsize) = @_; 1624 my ($self, $fontsize) = @_;
1442 1625
1443 $self->{fontsize} = $fontsize; 1626 $self->{fontsize} = $fontsize;
1444 delete $self->{texture}; 1627 delete $self->{texture};
1445 1628
1446 $self->update; 1629 $self->realloc;
1447 $self->check_size; 1630}
1631
1632sub reconfigure {
1633 my ($self) = @_;
1634
1635 delete $self->{size_req};
1636
1637 $self->SUPER::reconfigure;
1448} 1638}
1449 1639
1450sub _draw { 1640sub _draw {
1451 my ($self) = @_; 1641 my ($self) = @_;
1452 1642
… …
1458 $self->{layout}->set_width ($self->{w}); 1648 $self->{layout}->set_width ($self->{w});
1459 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1649 $self->{layout}->set_ellipsise ($self->{ellipsise});
1460 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1650 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1461 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1651 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1462 1652
1463 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1653 new_from_layout CFClient::Texture $self->{layout}
1654 };
1464 1655
1656 unless (exists $self->{ox}) {
1465 $self->{ox} = int ($self->{align} < 0 ? $self->{padding} 1657 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1466 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1658 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1467 : ($self->{w} - $tex->{w}) * 0.5); 1659 : ($self->{w} - $tex->{w}) * 0.5);
1468 1660
1469 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding} 1661 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1470 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding} 1662 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1471 : ($self->{h} - $tex->{h}) * 0.5); 1663 : ($self->{h} - $tex->{h}) * 0.5);
1472
1473 $tex
1474 }; 1664 };
1475 1665
1476 glEnable GL_TEXTURE_2D; 1666 glEnable GL_TEXTURE_2D;
1477 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1667
1668 my $w = List::Util::min $self->{w} + 4, $tex->{w};
1669 my $h = List::Util::min $self->{h} + 2, $tex->{h};
1478 1670
1479 if ($tex->{format} == GL_ALPHA) { 1671 if ($tex->{format} == GL_ALPHA) {
1672 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1480 glColor @{$self->{fg}}; 1673 glColor @{$self->{fg}};
1481 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}); 1674 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}, $w, $h);
1482 } else { 1675 } else {
1676 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1483 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}); 1677 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}, $w, $h);
1484 } 1678 }
1485 1679
1486 glDisable GL_TEXTURE_2D; 1680 glDisable GL_TEXTURE_2D;
1487} 1681}
1488 1682
… …
1505 can_hover => 1, 1699 can_hover => 1,
1506 can_focus => 1, 1700 can_focus => 1,
1507 valign => 0, 1701 valign => 0,
1508 can_events => 1, 1702 can_events => 1,
1509 #text => ... 1703 #text => ...
1704 #hidden => "*",
1510 @_ 1705 @_
1511 ) 1706 )
1512} 1707}
1513 1708
1514sub _set_text { 1709sub _set_text {
… …
1516 1711
1517 delete $self->{cur_h}; 1712 delete $self->{cur_h};
1518 1713
1519 return if $self->{text} eq $text; 1714 return if $self->{text} eq $text;
1520 1715
1521 delete $self->{texture};
1522
1523 $self->{last_activity} = $::NOW; 1716 $self->{last_activity} = $::NOW;
1524 $self->{text} = $text; 1717 $self->{text} = $text;
1525 1718
1526 $text =~ s/./*/g if $self->{hidden}; 1719 $text =~ s/./*/g if $self->{hidden};
1527 $self->{layout}->set_text ("$text "); 1720 $self->{layout}->set_text ("$text ");
1721 delete $self->{size_req};
1528 1722
1529 $self->emit (changed => $self->{text}); 1723 $self->_emit (changed => $self->{text});
1724
1725 $self->realloc;
1726 $self->update;
1530} 1727}
1531 1728
1532sub set_text { 1729sub set_text {
1533 my ($self, $text) = @_; 1730 my ($self, $text) = @_;
1534 1731
1535 $self->{cursor} = length $text; 1732 $self->{cursor} = length $text;
1536 $self->_set_text ($text); 1733 $self->_set_text ($text);
1537 $self->update;
1538 $self->check_size;
1539} 1734}
1540 1735
1541sub get_text { 1736sub get_text {
1542 $_[0]{text} 1737 $_[0]{text}
1543} 1738}
… …
1546 my ($self) = @_; 1741 my ($self) = @_;
1547 1742
1548 my ($w, $h) = $self->SUPER::size_request; 1743 my ($w, $h) = $self->SUPER::size_request;
1549 1744
1550 ($w + 1, $h) # add 1 for cursor 1745 ($w + 1, $h) # add 1 for cursor
1551}
1552
1553sub size_allocate {
1554 my ($self, $w, $h) = @_;
1555
1556 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1557} 1746}
1558 1747
1559sub key_down { 1748sub key_down {
1560 my ($self, $ev) = @_; 1749 my ($self, $ev) = @_;
1561 1750
… …
1576 } elsif ($sym == CFClient::SDLK_HOME) { 1765 } elsif ($sym == CFClient::SDLK_HOME) {
1577 $self->{cursor} = 0; 1766 $self->{cursor} = 0;
1578 } elsif ($sym == CFClient::SDLK_END) { 1767 } elsif ($sym == CFClient::SDLK_END) {
1579 $self->{cursor} = length $text; 1768 $self->{cursor} = length $text;
1580 } elsif ($uni == 27) { 1769 } elsif ($uni == 27) {
1581 $self->emit ('escape'); 1770 $self->_emit ('escape');
1582 } elsif ($uni) { 1771 } elsif ($uni) {
1583 substr $text, $self->{cursor}++, 0, chr $uni; 1772 substr $text, $self->{cursor}++, 0, chr $uni;
1773 } else {
1774 return 0;
1584 } 1775 }
1585 1776
1586 $self->_set_text ($text); 1777 $self->_set_text ($text);
1587 $self->update; 1778
1588 $self->check_size; 1779 $self->realloc;
1780
1781 1
1589} 1782}
1590 1783
1591sub focus_in { 1784sub focus_in {
1592 my ($self) = @_; 1785 my ($self) = @_;
1593 1786
… …
1608 utf8::encode $text; 1801 utf8::encode $text;
1609 $self->{cursor} = length substr $text, 0, $idx; 1802 $self->{cursor} = length substr $text, 0, $idx;
1610 1803
1611 $self->_set_text ($self->{text}); 1804 $self->_set_text ($self->{text});
1612 $self->update; 1805 $self->update;
1806
1807 1
1613} 1808}
1614 1809
1615sub mouse_motion { 1810sub mouse_motion {
1616 my ($self, $ev, $x, $y) = @_; 1811 my ($self, $ev, $x, $y) = @_;
1617# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 1812# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1813
1814 0
1618} 1815}
1619 1816
1620sub _draw { 1817sub _draw {
1621 my ($self) = @_; 1818 my ($self) = @_;
1622 1819
1623 local $self->{fg} = $self->{fg}; 1820 local $self->{fg} = $self->{fg};
1624 1821
1625 if ($FOCUS == $self) { 1822 if ($FOCUS == $self) {
1626 glColor @{$self->{active_bg}}; 1823 glColor_premultiply @{$self->{active_bg}};
1627 $self->{fg} = $self->{active_fg}; 1824 $self->{fg} = $self->{active_fg};
1628 } else { 1825 } else {
1629 glColor @{$self->{bg}}; 1826 glColor_premultiply @{$self->{bg}};
1630 } 1827 }
1631 1828
1632 glEnable GL_BLEND; 1829 glEnable GL_BLEND;
1633 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1830 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1634 glBegin GL_QUADS; 1831 glBegin GL_QUADS;
1635 glVertex 0 , 0; 1832 glVertex 0 , 0;
1636 glVertex 0 , $self->{h}; 1833 glVertex 0 , $self->{h};
1637 glVertex $self->{w}, $self->{h}; 1834 glVertex $self->{w}, $self->{h};
1638 glVertex $self->{w}, 0; 1835 glVertex $self->{w}, 0;
… …
1673 if ($sym == 13) { 1870 if ($sym == 13) {
1674 unshift @{$self->{history}}, 1871 unshift @{$self->{history}},
1675 my $txt = $self->get_text; 1872 my $txt = $self->get_text;
1676 $self->{history_pointer} = -1; 1873 $self->{history_pointer} = -1;
1677 $self->{history_saveback} = ''; 1874 $self->{history_saveback} = '';
1678 $self->emit (activate => $txt); 1875 $self->_emit (activate => $txt);
1679 $self->update; 1876 $self->update;
1680 1877
1681 } elsif ($sym == CFClient::SDLK_UP) { 1878 } elsif ($sym == CFClient::SDLK_UP) {
1682 if ($self->{history_pointer} < 0) { 1879 if ($self->{history_pointer} < 0) {
1683 $self->{history_saveback} = $self->get_text; 1880 $self->{history_saveback} = $self->get_text;
… …
1699 } else { 1896 } else {
1700 $self->set_text ($self->{history_saveback}); 1897 $self->set_text ($self->{history_saveback});
1701 } 1898 }
1702 1899
1703 } else { 1900 } else {
1704 $self->SUPER::key_down ($ev); 1901 return $self->SUPER::key_down ($ev)
1902 }
1903
1705 } 1904 1
1706
1707} 1905}
1708 1906
1709############################################################################# 1907#############################################################################
1710 1908
1711package CFClient::UI::Button; 1909package CFClient::UI::Button;
… …
1720 1918
1721sub new { 1919sub new {
1722 my $class = shift; 1920 my $class = shift;
1723 1921
1724 $class->SUPER::new ( 1922 $class->SUPER::new (
1725 padding => 4, 1923 padding_x => 4,
1924 padding_y => 4,
1726 fg => [1, 1, 1], 1925 fg => [1, 1, 1],
1727 active_fg => [0, 0, 1], 1926 active_fg => [0, 0, 1],
1728 can_hover => 1, 1927 can_hover => 1,
1729 align => 0, 1928 align => 0,
1730 valign => 0, 1929 valign => 0,
1731 can_events => 1, 1930 can_events => 1,
1732 @_ 1931 @_
1733 ) 1932 )
1734} 1933}
1735 1934
1935sub activate { }
1936
1736sub button_up { 1937sub button_up {
1737 my ($self, $ev, $x, $y) = @_; 1938 my ($self, $ev, $x, $y) = @_;
1738 1939
1940 $self->emit ("activate")
1739 if ($x >= 0 && $x < $self->{w} 1941 if $x >= 0 && $x < $self->{w}
1740 && $y >= 0 && $y < $self->{h}) { 1942 && $y >= 0 && $y < $self->{h};
1741 $self->emit ("activate"); 1943
1742 } 1944 1
1743} 1945}
1744 1946
1745sub _draw { 1947sub _draw {
1746 my ($self) = @_; 1948 my ($self) = @_;
1747 1949
1748 local $self->{fg} = $self->{fg}; 1950 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1749
1750 if ($GRAB == $self) {
1751 $self->{fg} = $self->{active_fg};
1752 }
1753 1951
1754 glEnable GL_TEXTURE_2D; 1952 glEnable GL_TEXTURE_2D;
1755 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1953 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1756 glColor 0, 0, 0, 1; 1954 glColor 0, 0, 0, 1;
1757 1955
… …
1776 1974
1777sub new { 1975sub new {
1778 my $class = shift; 1976 my $class = shift;
1779 1977
1780 $class->SUPER::new ( 1978 $class->SUPER::new (
1781 padding => 2, 1979 padding_x => 2,
1980 padding_y => 2,
1782 fg => [1, 1, 1], 1981 fg => [1, 1, 1],
1783 active_fg => [1, 1, 0], 1982 active_fg => [1, 1, 0],
1784 bg => [0, 0, 0, 0.2], 1983 bg => [0, 0, 0, 0.2],
1785 active_bg => [1, 1, 1, 0.5], 1984 active_bg => [1, 1, 1, 0.5],
1786 state => 0, 1985 state => 0,
… …
1790} 1989}
1791 1990
1792sub size_request { 1991sub size_request {
1793 my ($self) = @_; 1992 my ($self) = @_;
1794 1993
1795 ($self->{padding} * 2 + 6) x 2 1994 (6) x 2
1796} 1995}
1797 1996
1798sub button_down { 1997sub button_down {
1799 my ($self, $ev, $x, $y) = @_; 1998 my ($self, $ev, $x, $y) = @_;
1800 1999
1801 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 2000 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1802 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 2001 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1803 $self->{state} = !$self->{state}; 2002 $self->{state} = !$self->{state};
1804 $self->emit (changed => $self->{state}); 2003 $self->_emit (changed => $self->{state});
2004 } else {
2005 return 0
2006 }
2007
1805 } 2008 1
1806} 2009}
1807 2010
1808sub _draw { 2011sub _draw {
1809 my ($self) = @_; 2012 my ($self) = @_;
1810 2013
1811 $self->SUPER::_draw; 2014 $self->SUPER::_draw;
1812 2015
1813 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 2016 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1814 2017
1815 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 2018 my ($w, $h) = @$self{qw(w h)};
2019
2020 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1816 2021
1817 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 2022 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1818 2023
1819 my $tex = $self->{state} ? $tex[1] : $tex[0]; 2024 my $tex = $self->{state} ? $tex[1] : $tex[0];
1820 2025
… …
1975 2180
1976 my $h1 = $self->{h} * (1 - $ycut1); 2181 my $h1 = $self->{h} * (1 - $ycut1);
1977 my $h2 = $self->{h} * (1 - $ycut2); 2182 my $h2 = $self->{h} * (1 - $ycut2);
1978 2183
1979 glEnable GL_BLEND; 2184 glEnable GL_BLEND;
1980 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2185 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2186 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1981 glEnable GL_TEXTURE_2D; 2187 glEnable GL_TEXTURE_2D;
1982 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2188 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1983 2189
1984 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2190 glBindTexture GL_TEXTURE_2D, $t1->{name};
1985 glBegin GL_QUADS; 2191 glBegin GL_QUADS;
… …
2085 fg => [1, 1, 1], 2291 fg => [1, 1, 1],
2086 active_fg => [0, 0, 0], 2292 active_fg => [0, 0, 0],
2087 bg => [0, 0, 0, 0.2], 2293 bg => [0, 0, 0, 0.2],
2088 active_bg => [1, 1, 1, 0.5], 2294 active_bg => [1, 1, 1, 0.5],
2089 range => [0, 0, 100, 10, 0], 2295 range => [0, 0, 100, 10, 0],
2090 req_w => $::WIDTH / 80, 2296 min_w => $::WIDTH / 80,
2091 req_h => $::WIDTH / 80, 2297 min_h => $::WIDTH / 80,
2092 vertical => 0, 2298 vertical => 0,
2093 can_hover => 1, 2299 can_hover => 1,
2094 inner_pad => 0.02, 2300 inner_pad => 0.02,
2095 @_ 2301 @_
2096 ); 2302 );
… …
2099 $self->update; 2305 $self->update;
2100 2306
2101 $self 2307 $self
2102} 2308}
2103 2309
2310sub changed { }
2311
2104sub set_range { 2312sub set_range {
2105 my ($self, $range) = @_; 2313 my ($self, $range) = @_;
2106 2314
2107 $self->{range} = $range; 2315 ($range, $self->{range}) = ($self->{range}, $range);
2108 2316
2317 if ("@$range" ne "@{$self->{range}}") {
2109 $self->update; 2318 $self->update;
2319 $self->set_value ($self->{range}[0]);
2320 }
2110} 2321}
2111 2322
2112sub set_value { 2323sub set_value {
2113 my ($self, $value) = @_; 2324 my ($self, $value) = @_;
2114 2325
… …
2125 if $unit; 2336 if $unit;
2126 2337
2127 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2338 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2128 2339
2129 if ($value != $old_value) { 2340 if ($value != $old_value) {
2130 $self->emit (changed => $value); 2341 $self->_emit (changed => $value);
2131 $self->update; 2342 $self->update;
2132 } 2343 }
2133} 2344}
2134 2345
2135sub size_request { 2346sub size_request {
2136 my ($self) = @_; 2347 my ($self) = @_;
2137 2348
2138 my $w = $self->{req_w}; 2349 ($self->{req_w}, $self->{req_h})
2139 my $h = $self->{req_h};
2140
2141 $self->{vertical} ? ($h, $w) : ($w, $h)
2142} 2350}
2143 2351
2144sub button_down { 2352sub button_down {
2145 my ($self, $ev, $x, $y) = @_; 2353 my ($self, $ev, $x, $y) = @_;
2146 2354
2147 $self->SUPER::button_down ($ev, $x, $y); 2355 $self->SUPER::button_down ($ev, $x, $y);
2148 2356
2149 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2357 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2150 2358
2151 $self->mouse_motion ($ev, $x, $y); 2359 $self->mouse_motion ($ev, $x, $y)
2152} 2360}
2153 2361
2154sub mouse_motion { 2362sub mouse_motion {
2155 my ($self, $ev, $x, $y) = @_; 2363 my ($self, $ev, $x, $y) = @_;
2156 2364
… …
2160 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2368 my (undef, $lo, $hi, $page) = @{$self->{range}};
2161 2369
2162 $x = ($x - $self->{click}[1]) / ($w * $self->{scale}); 2370 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2163 2371
2164 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo)); 2372 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2373 } else {
2374 return 0;
2375 }
2376
2165 } 2377 1
2166} 2378}
2167 2379
2168sub update { 2380sub update {
2169 my ($self) = @_; 2381 my ($self) = @_;
2170 2382
2171 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 2383 delete $self->{knob_w};
2384 $self->SUPER::update;
2385}
2386
2387sub _draw {
2388 my ($self) = @_;
2389
2390 unless ($self->{knob_w}) {
2172 $self->set_value ($self->{range}[0]); 2391 $self->set_value ($self->{range}[0]);
2173 2392
2174 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2393 my ($value, $lo, $hi, $page) = @{$self->{range}};
2175 my $range = ($hi - $page - $lo) || 1e-100; 2394 my $range = ($hi - $page - $lo) || 1e-100;
2176 2395
… …
2182 $value = ($value - $lo) / $range; 2401 $value = ($value - $lo) / $range;
2183 $value = $value * $self->{scale} + $self->{offset}; 2402 $value = $value * $self->{scale} + $self->{offset};
2184 2403
2185 $self->{knob_x} = $value - $knob_w * 0.5; 2404 $self->{knob_x} = $value - $knob_w * 0.5;
2186 $self->{knob_w} = $knob_w; 2405 $self->{knob_w} = $knob_w;
2187 }); 2406 }
2188
2189 $self->SUPER::update;
2190}
2191
2192sub _draw {
2193 my ($self) = @_;
2194 2407
2195 $self->SUPER::_draw (); 2408 $self->SUPER::_draw ();
2196 2409
2197 glScale $self->{w}, $self->{h}; 2410 glScale $self->{w}, $self->{h};
2198 2411
… …
2259sub set_range { shift->{slider}->set_range (@_) } 2472sub set_range { shift->{slider}->set_range (@_) }
2260sub set_value { shift->{slider}->set_value (@_) } 2473sub set_value { shift->{slider}->set_value (@_) }
2261 2474
2262############################################################################# 2475#############################################################################
2263 2476
2264package CFClient::UI::TextView; 2477package CFClient::UI::TextScroller;
2265 2478
2266our @ISA = CFClient::UI::HBox::; 2479our @ISA = CFClient::UI::HBox::;
2267 2480
2268use CFClient::OpenGL; 2481use CFClient::OpenGL;
2269 2482
… …
2271 my $class = shift; 2484 my $class = shift;
2272 2485
2273 my $self = $class->SUPER::new ( 2486 my $self = $class->SUPER::new (
2274 fontsize => 1, 2487 fontsize => 1,
2275 can_events => 0, 2488 can_events => 0,
2489 indent => 0,
2276 #font => default_font 2490 #font => default_font
2277 @_, 2491 @_,
2278 2492
2279 layout => (new CFClient::Layout 1), 2493 layout => (new CFClient::Layout 1),
2280 par => [], 2494 par => [],
… …
2303 $self->SUPER::size_allocate ($w, $h); 2517 $self->SUPER::size_allocate ($w, $h);
2304 2518
2305 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2519 $self->{layout}->set_font ($self->{font}) if $self->{font};
2306 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2520 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2307 $self->{layout}->set_width ($self->{children}[0]{w}); 2521 $self->{layout}->set_width ($self->{children}[0]{w});
2522 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2308 2523
2309 $self->reflow; 2524 $self->reflow;
2310} 2525}
2311 2526
2312sub text_size { 2527sub text_size {
… …
2314 2529
2315 my $layout = $self->{layout}; 2530 my $layout = $self->{layout};
2316 2531
2317 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2532 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2318 $layout->set_width ($self->{children}[0]{w} - $indent); 2533 $layout->set_width ($self->{children}[0]{w} - $indent);
2534 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2319 $layout->set_markup ($text); 2535 $layout->set_markup ($text);
2320 2536
2321 $layout->size 2537 $layout->size
2322} 2538}
2323 2539
… …
2362 2578
2363 return unless $self->{h} > 0; 2579 return unless $self->{h} > 0;
2364 2580
2365 delete $self->{texture}; 2581 delete $self->{texture};
2366 2582
2367 $ROOT->on_post_alloc ($self, sub { 2583 $ROOT->on_post_alloc ($self => sub {
2368 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 2584 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2369 2585
2370 if (delete $self->{need_reflow}) { 2586 if (delete $self->{need_reflow}) {
2371 my $height = 0; 2587 my $height = 0;
2372 2588
… …
2375 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2591 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2376 2592
2377 for (@{$self->{par}}) { 2593 for (@{$self->{par}}) {
2378 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support 2594 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2379 $layout->set_width ($W - $_->[3]); 2595 $layout->set_width ($W - $_->[3]);
2596 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2380 $layout->set_markup ($_->[4]); 2597 $layout->set_markup ($_->[4]);
2381 my ($w, $h) = $layout->size; 2598 my ($w, $h) = $layout->size;
2382 $_->[0] = $w + $_->[3]; 2599 $_->[0] = $w + $_->[3];
2383 $_->[1] = $h; 2600 $_->[1] = $h;
2384 } 2601 }
… …
2387 } 2604 }
2388 2605
2389 $self->{height} = $height; 2606 $self->{height} = $height;
2390 2607
2391 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]); 2608 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2392 2609
2393 delete $self->{texture}; 2610 delete $self->{texture};
2394 } 2611 }
2395 2612
2396 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2613 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2397 glClearColor 0.5, 0.5, 0.5, 0; 2614 glClearColor 0, 0, 0, 0;
2398 glClear GL_COLOR_BUFFER_BIT; 2615 glClear GL_COLOR_BUFFER_BIT;
2399 2616
2400 my $top = int $self->{children}[1]{range}[0]; 2617 my $top = int $self->{children}[1]{range}[0];
2401 2618
2402 my $y0 = $top; 2619 my $y0 = $top;
… …
2416 my $h = $par->[1]; 2633 my $h = $par->[1];
2417 2634
2418 if ($y0 < $y + $h && $y < $y1) { 2635 if ($y0 < $y + $h && $y < $y1) {
2419 $layout->set_foreground (@{ $par->[2] }); 2636 $layout->set_foreground (@{ $par->[2] });
2420 $layout->set_width ($W - $par->[3]); 2637 $layout->set_width ($W - $par->[3]);
2638 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2421 $layout->set_markup ($par->[4]); 2639 $layout->set_markup ($par->[4]);
2422 2640
2423 my ($w, $h, $data, $format, $internalformat) = $layout->render; 2641 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2424 2642
2425 glRasterPos $par->[3], $y - $y0; 2643 glRasterPos $par->[3], $y - $y0;
… …
2437sub _draw { 2655sub _draw {
2438 my ($self) = @_; 2656 my ($self) = @_;
2439 2657
2440 glEnable GL_TEXTURE_2D; 2658 glEnable GL_TEXTURE_2D;
2441 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2659 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2442 glColor 1, 1, 1, 1; 2660 glColor 0, 0, 0, 1;
2443 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2661 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2444 glDisable GL_TEXTURE_2D; 2662 glDisable GL_TEXTURE_2D;
2445 2663
2446 $self->{children}[1]->draw; 2664 $self->{children}[1]->draw;
2447 2665
2448} 2666}
… …
2497 2715
2498sub new { 2716sub new {
2499 my $class = shift; 2717 my $class = shift;
2500 2718
2501 my $self = $class->SUPER::new ( 2719 my $self = $class->SUPER::new (
2502 state => 0, 2720 state => 0,
2503 connect_activate => \&toggle_flopper, 2721 on_activate => \&toggle_flopper,
2504 @_ 2722 @_
2505 ); 2723 );
2506 2724
2507 if ($self->{state}) {
2508 $self->{state} = 0;
2509 $self->toggle_flopper;
2510 }
2511
2512 $self 2725 $self
2513} 2726}
2514 2727
2515sub toggle_flopper { 2728sub toggle_flopper {
2516 my ($self) = @_; 2729 my ($self) = @_;
2517 2730
2518 # TODO: use animation 2731 $self->{other}->toggle_visibility;
2519 if ($self->{state} = !$self->{state}) {
2520 $CFClient::UI::ROOT->add ($self->{other});
2521 $self->{other}->move ($self->coord2global (0, $self->{h}));
2522 $self->emit ("open");
2523 } else {
2524 $CFClient::UI::ROOT->remove ($self->{other});
2525 $self->emit ("close");
2526 }
2527
2528 $self->emit (changed => $self->{state});
2529} 2732}
2530 2733
2531############################################################################# 2734#############################################################################
2532 2735
2533package CFClient::UI::Tooltip; 2736package CFClient::UI::Tooltip;
… …
2546} 2749}
2547 2750
2548sub set_tooltip_from { 2751sub set_tooltip_from {
2549 my ($self, $widget) = @_; 2752 my ($self, $widget) = @_;
2550 2753
2754 my $tooltip = $widget->{tooltip};
2755
2756 if ($ENV{CFPLUS_DEBUG} & 2) {
2757 $tooltip .= "\n\n" . (ref $widget) . "\n"
2758 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2759 . "req $widget->{req_w} $widget->{req_h}\n"
2760 . "visible $widget->{visible}";
2761 }
2762
2763 $tooltip =~ s/^\n+//;
2764 $tooltip =~ s/\n+$//;
2765
2551 $self->add (new CFClient::UI::Label 2766 $self->add (new CFClient::UI::Label
2552 markup => $widget->{tooltip}, 2767 markup => $tooltip,
2553 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2768 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2554 fontsize => 0.8, 2769 fontsize => 0.8,
2555 fg => [0, 0, 0, 1], 2770 fg => [0, 0, 0, 1],
2556 ellipsise => 0, 2771 ellipsise => 0,
2557 font => ($widget->{tooltip_font} || $::FONT_PROP), 2772 font => ($widget->{tooltip_font} || $::FONT_PROP),
… …
2568 2783
2569sub size_allocate { 2784sub size_allocate {
2570 my ($self, $w, $h) = @_; 2785 my ($self, $w, $h) = @_;
2571 2786
2572 $self->SUPER::size_allocate ($w - 4, $h - 4); 2787 $self->SUPER::size_allocate ($w - 4, $h - 4);
2788}
2789
2790sub visibility_change {
2791 my ($self, $visible) = @_;
2792
2793 return unless $visible;
2794
2795 $self->{root}->on_post_alloc ("move_$self" => sub {
2796 my $widget = $self->{owner}
2797 or return;
2798
2799 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2800
2801 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2802 if $x + $self->{w} > $self->{root}{w};
2803
2804 $self->move_abs ($x, $y);
2805 });
2573} 2806}
2574 2807
2575sub _draw { 2808sub _draw {
2576 my ($self) = @_; 2809 my ($self) = @_;
2577 2810
… …
2594 glVertex $w, $h; 2827 glVertex $w, $h;
2595 glVertex $w, 0; 2828 glVertex $w, 0;
2596 glEnd; 2829 glEnd;
2597 2830
2598 glTranslate 2 - 0.375, 2 - 0.375; 2831 glTranslate 2 - 0.375, 2 - 0.375;
2832
2599 $self->SUPER::_draw; 2833 $self->SUPER::_draw;
2600} 2834}
2601 2835
2602############################################################################# 2836#############################################################################
2603 2837
… …
2609 2843
2610sub new { 2844sub new {
2611 my $class = shift; 2845 my $class = shift;
2612 2846
2613 my $self = $class->SUPER::new ( 2847 my $self = $class->SUPER::new (
2614 aspect => 1, 2848 aspect => 1,
2849 can_events => 0,
2615 @_, 2850 @_,
2616 ); 2851 );
2617 2852
2618 if ($self->{anim} && $self->{animspeed}) { 2853 if ($self->{anim} && $self->{animspeed}) {
2619 Scalar::Util::weaken (my $widget = $self); 2854 Scalar::Util::weaken (my $widget = $self);
… …
2661 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 2896 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2662 2897
2663 if ($tex) { 2898 if ($tex) {
2664 glEnable GL_TEXTURE_2D; 2899 glEnable GL_TEXTURE_2D;
2665 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2900 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2666 glColor 1, 1, 1, 1; 2901 glColor 0, 0, 0, 1;
2667 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2902 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2668 glDisable GL_TEXTURE_2D; 2903 glDisable GL_TEXTURE_2D;
2669 } 2904 }
2670} 2905}
2671 2906
2672sub DESTROY { 2907sub destroy {
2673 my ($self) = @_; 2908 my ($self) = @_;
2674 2909
2675 $self->{timer}->cancel 2910 $self->{timer}->cancel
2676 if $self->{timer}; 2911 if $self->{timer};
2677 2912
2678 $self->SUPER::DESTROY; 2913 $self->SUPER::destroy;
2679} 2914}
2680 2915
2681############################################################################# 2916#############################################################################
2682 2917
2683package CFClient::UI::InventoryItem; 2918package CFClient::UI::Buttonbar;
2684 2919
2685our @ISA = CFClient::UI::HBox::; 2920our @ISA = CFClient::UI::HBox::;
2686 2921
2687sub _item_to_desc { 2922# TODO: should actualyl wrap buttons and other goodies.
2688 my ($item) = @_;
2689
2690 my $desc =
2691 $item->{nrof} < 2
2692 ? $item->{name}
2693 : "$item->{nrof} × $item->{name_pl}";
2694
2695 $item->{flags} & Crossfire::Protocol::F_OPEN
2696 and $desc .= " (open)";
2697 $item->{flags} & Crossfire::Protocol::F_APPLIED
2698 and $desc .= " (applied)";
2699 $item->{flags} & Crossfire::Protocol::F_UNPAID
2700 and $desc .= " (unpaid)";
2701 $item->{flags} & Crossfire::Protocol::F_MAGIC
2702 and $desc .= " (magic)";
2703 $item->{flags} & Crossfire::Protocol::F_CURSED
2704 and $desc .= " (cursed)";
2705 $item->{flags} & Crossfire::Protocol::F_DAMNED
2706 and $desc .= " (damned)";
2707 $item->{flags} & Crossfire::Protocol::F_LOCKED
2708 and $desc .= " *";
2709
2710 $desc
2711}
2712
2713sub new {
2714 my $class = shift;
2715
2716 my %args = @_;
2717
2718 my $item = delete $args{item};
2719
2720 my $desc = _item_to_desc ($item);
2721
2722 my $self = $class->SUPER::new (
2723 can_hover => 1,
2724 can_events => 1,
2725 tooltip => ((CFClient::UI::Label::escape $desc)
2726 . "\n<small>leftclick - examine\nshift+leftclick - move/pickup/drop\nmiddle click - apply\nrightclick - menu</small>"),
2727 connect_button_down => sub {
2728 my ($self, $ev, $x, $y) = @_;
2729
2730 # todo: maybe put examine on 1? but should just be a tooltip :(
2731 if (($ev->{mod} & CFClient::KMOD_SHIFT) && $ev->{button} == 1) {
2732 my $targ = $::CONN->{player}{tag};
2733
2734 if ($item->{container} == $::CONN->{player}{tag}) {
2735 $targ = $main::OPENCONT;
2736 }
2737
2738 $::CONN->send ("move $targ $item->{tag} 0");
2739 } elsif ($ev->{button} == 1) {
2740 $::CONN->send ("examine $item->{tag}");
2741 } elsif ($ev->{button} == 2) {
2742 $::CONN->send ("apply $item->{tag}");
2743 } elsif ($ev->{button} == 3) {
2744 my @menu_items = (
2745 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2746 ["mark", sub { $::CONN->send ("mark ". pack "N", $item->{tag}) }],
2747 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2748 (
2749 $item->{flags} & Crossfire::Protocol::F_LOCKED
2750 ? (
2751 ["unlock", sub { $::CONN->send ("lock " . pack "CN", 0, $item->{tag}) }],
2752 )
2753 : (
2754 ["lock", sub { $::CONN->send ("lock " . pack "CN", 1, $item->{tag}) }],
2755 ["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
2756 )
2757 ),
2758 );
2759
2760 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
2761 }
2762
2763 1
2764 },
2765 %args
2766 );
2767
2768
2769 $self->add (new CFClient::UI::Face
2770 can_events => 0,
2771 face => $item->{face},
2772 anim => $item->{anim},
2773 animspeed => $item->{animspeed},
2774 );
2775
2776 $self->add ($self->{name_lbl} = new CFClient::UI::Label can_events => 0);
2777
2778 $self->{item} = $item;
2779
2780 $self->update_item;
2781
2782 $self
2783}
2784
2785sub update_item {
2786 my ($self) = @_;
2787
2788 my $desc = _item_to_desc ($self->{item});
2789
2790 $self->{name_lbl}->set_text ($desc);
2791}
2792
2793#############################################################################
2794
2795package CFClient::UI::Inventory;
2796
2797our @ISA = CFClient::UI::ScrolledWindow::;
2798
2799sub new {
2800 my $class = shift;
2801
2802 my $self = $class->SUPER::new (
2803 scrolled => (new CFClient::UI::Table),
2804 @_,
2805 );
2806
2807 $self
2808}
2809
2810sub set_items {
2811 my ($self, $items) = @_;
2812
2813 $self->{scrolled}->clear;
2814 return unless $items;
2815
2816 my @items = sort {
2817 ($a->{type} <=> $b->{type})
2818 or ($a->{name} cmp $b->{name})
2819 } @$items;
2820
2821 $self->{real_items} = \@items;
2822
2823 for my $item (@items) {
2824 $item->{item} = $item;
2825 $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;
2826 $item->update_item ();
2827 }
2828
2829 my $i = 0;
2830 for (@items) {
2831 $self->{scrolled}->add (0, $i, $_);
2832 my $nrof = $_->{item}->{nrof} || 1;
2833 $self->{scrolled}->add (1, $i++, new CFClient::UI::Label text => ($_->{item}->{weight} * $nrof) / 1000);
2834 }
2835
2836# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2837}
2838
2839sub size_request {
2840 my ($self) = @_;
2841 ($self->{req_w}, $self->{req_h});
2842}
2843 2923
2844############################################################################# 2924#############################################################################
2845 2925
2846package CFClient::UI::Menu; 2926package CFClient::UI::Menu;
2847 2927
… …
2859 ); 2939 );
2860 2940
2861 $self->add ($self->{vbox} = new CFClient::UI::VBox); 2941 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2862 2942
2863 for my $item (@{ $self->{items} }) { 2943 for my $item (@{ $self->{items} }) {
2864 my ($widget, $cb) = @$item; 2944 my ($widget, $cb, $tooltip) = @$item;
2865 2945
2866 # handle various types of items, only text for now 2946 # handle various types of items, only text for now
2867 if (!ref $widget) { 2947 if (!ref $widget) {
2868 $widget = new CFClient::UI::Label 2948 $widget = new CFClient::UI::Label
2869 can_hover => 1, 2949 can_hover => 1,
2870 can_events => 1, 2950 can_events => 1,
2871 text => $widget; 2951 markup => $widget,
2952 tooltip => $tooltip
2872 } 2953 }
2873 2954
2874 $self->{item}{$widget} = $item; 2955 $self->{item}{$widget} = $item;
2875 2956
2876 $self->{vbox}->add ($widget); 2957 $self->{vbox}->add ($widget);
… …
2881 2962
2882# popup given the event (must be a mouse button down event currently) 2963# popup given the event (must be a mouse button down event currently)
2883sub popup { 2964sub popup {
2884 my ($self, $ev) = @_; 2965 my ($self, $ev) = @_;
2885 2966
2886 $self->emit ("popdown"); 2967 $self->_emit ("popdown");
2887 2968
2888 # maybe save $GRAB? must be careful about events... 2969 # maybe save $GRAB? must be careful about events...
2889 $GRAB = $self; 2970 $GRAB = $self;
2890 $self->{button} = $ev->{button}; 2971 $self->{button} = $ev->{button};
2891 2972
2892 $self->show; 2973 $self->show;
2893 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 2974 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2894} 2975}
2895 2976
2896sub mouse_motion { 2977sub mouse_motion {
2897 my ($self, $ev, $x, $y) = @_; 2978 my ($self, $ev, $x, $y) = @_;
2898 2979
2899 # TODO: should use vbox->find_widget or so 2980 # TODO: should use vbox->find_widget or so
2900 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 2981 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2901 $self->{hover} = $self->{item}{$HOVER}; 2982 $self->{hover} = $self->{item}{$HOVER};
2983
2984 0
2902} 2985}
2903 2986
2904sub button_up { 2987sub button_up {
2905 my ($self, $ev, $x, $y) = @_; 2988 my ($self, $ev, $x, $y) = @_;
2906 2989
2907 if ($ev->{button} == $self->{button}) { 2990 if ($ev->{button} == $self->{button}) {
2908 undef $GRAB; 2991 undef $GRAB;
2909 $self->hide; 2992 $self->hide;
2910 2993
2911 $self->emit ("popdown"); 2994 $self->_emit ("popdown");
2912 $self->{hover}[1]->() if $self->{hover}; 2995 $self->{hover}[1]->() if $self->{hover};
2996 } else {
2997 return 0
2998 }
2999
2913 } 3000 1
2914} 3001}
2915 3002
2916############################################################################# 3003#############################################################################
2917 3004
2918package CFClient::UI::Statusbox; 3005package CFClient::UI::Multiplexer;
2919 3006
2920our @ISA = CFClient::UI::VBox::; 3007our @ISA = CFClient::UI::Container::;
2921 3008
2922sub new { 3009sub new {
2923 my $class = shift; 3010 my $class = shift;
2924 3011
2925 $class->SUPER::new ( 3012 my $self = $class->SUPER::new (
3013 @_,
3014 );
3015
3016 $self->{current} = $self->{children}[0]
3017 if @{ $self->{children} };
3018
3019 $self
3020}
3021
3022sub add {
3023 my ($self, @widgets) = @_;
3024
3025 $self->SUPER::add (@widgets);
3026
3027 $self->{current} = $self->{children}[0]
3028 if @{ $self->{children} };
3029}
3030
3031sub set_current_page {
3032 my ($self, $page_or_widget) = @_;
3033
3034 my $widget = ref $page_or_widget
3035 ? $page_or_widget
3036 : $self->{children}[$page_or_widget];
3037
3038 $self->{current} = $widget;
3039 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3040
3041 $self->_emit (page_changed => $self->{current});
3042
3043 $self->realloc;
3044}
3045
3046sub visible_children {
3047 $_[0]{current}
3048}
3049
3050sub size_request {
3051 my ($self) = @_;
3052
3053 $self->{current}->size_request
3054}
3055
3056sub size_allocate {
3057 my ($self, $w, $h) = @_;
3058
3059 $self->{current}->configure (0, 0, $w, $h);
3060}
3061
3062sub _draw {
3063 my ($self) = @_;
3064
3065 $self->{current}->draw;
3066}
3067
3068#############################################################################
3069
3070package CFClient::UI::Notebook;
3071
3072our @ISA = CFClient::UI::VBox::;
3073
3074sub new {
3075 my $class = shift;
3076
3077 my $self = $class->SUPER::new (
3078 buttonbar => (new CFClient::UI::Buttonbar),
3079 multiplexer => (new CFClient::UI::Multiplexer expand => 1),
3080 # filter => # will be put between multiplexer and $self
3081 @_,
3082 );
3083
3084 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3085 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3086
3087 $self
3088}
3089
3090sub add {
3091 my ($self, $title, $widget, $tooltip) = @_;
3092
3093 Scalar::Util::weaken $self;
3094
3095 $self->{buttonbar}->add (new CFClient::UI::Button
3096 markup => $title,
3097 tooltip => $tooltip,
3098 on_activate => sub { $self->set_current_page ($widget) },
3099 );
3100
3101 $self->{multiplexer}->add ($widget);
3102}
3103
3104sub set_current_page {
3105 my ($self, $page) = @_;
3106
3107 $self->{multiplexer}->set_current_page ($page);
3108 $self->_emit (page_changed => $self->{multiplexer}{current});
3109}
3110
3111#############################################################################
3112
3113package CFClient::UI::Combobox;
3114
3115use utf8;
3116
3117our @ISA = CFClient::UI::Button::;
3118
3119sub new {
3120 my $class = shift;
3121
3122 my $self = $class->SUPER::new (
3123 options => [], # [value, title, longdesc], ...
3124 value => undef,
3125 @_,
3126 );
3127
3128 $self->_set_value ($self->{value});
3129
3130 $self
3131}
3132
3133sub button_down {
3134 my ($self, $ev) = @_;
3135
3136 my @menu_items;
3137
3138 for (@{ $self->{options} }) {
3139 my ($value, $title, $tooltip) = @$_;
3140
3141 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3142 }
3143
3144 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
3145}
3146
3147sub _set_value {
3148 my ($self, $value) = @_;
3149
3150 my ($item) = grep $_->[0] eq $value, @{ $self->{options} }
3151 or return;
3152
3153 $self->{value} = $item->[0];
3154 $self->set_markup ("$item->[1] ⇓");
3155 $self->set_tooltip ($item->[2]);
3156}
3157
3158sub set_value {
3159 my ($self, $value) = @_;
3160
3161 return unless $self->{value} ne $value;
3162
3163 $self->_set_value ($value);
3164 $self->_emit (changed => $value);
3165}
3166
3167#############################################################################
3168
3169package CFClient::UI::Statusbox;
3170
3171our @ISA = CFClient::UI::VBox::;
3172
3173sub new {
3174 my $class = shift;
3175
3176 my $self = $class->SUPER::new (
2926 fontsize => 0.8, 3177 fontsize => 0.8,
2927 @_, 3178 @_,
2928 ) 3179 );
3180
3181 Scalar::Util::weaken (my $this = $self);
3182
3183 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3184
3185 $self
2929} 3186}
2930 3187
2931sub reorder { 3188sub reorder {
2932 my ($self) = @_; 3189 my ($self) = @_;
2933 my $NOW = time; 3190 my $NOW = Time::HiRes::time;
3191
3192 # freeze display when hovering over any label
3193 return if $CFClient::UI::TOOLTIP->{owner}
3194 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},
3195 values %{ $self->{item} };
2934 3196
2935 while (my ($k, $v) = each %{ $self->{item} }) { 3197 while (my ($k, $v) = each %{ $self->{item} }) {
2936 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3198 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2937 } 3199 }
2938 3200
… …
2941 my @items = sort { 3203 my @items = sort {
2942 $a->{pri} <=> $b->{pri} 3204 $a->{pri} <=> $b->{pri}
2943 or $b->{id} <=> $a->{id} 3205 or $b->{id} <=> $a->{id}
2944 } values %{ $self->{item} }; 3206 } values %{ $self->{item} };
2945 3207
3208 $self->{timer}->interval (1);
3209
2946 my $count = 10 + 1; 3210 my $count = 10 + 1;
2947 for my $item (@items) { 3211 for my $item (@items) {
2948 last unless --$count; 3212 last unless --$count;
2949 3213
2950 push @widgets, $item->{label} ||= do { 3214 my $label = $item->{label} ||= do {
2951 # TODO: doesn't handle markup well (read as: at all) 3215 # TODO: doesn't handle markup well (read as: at all)
2952 my $short = $item->{count} > 1 3216 my $short = $item->{count} > 1
2953 ? "<b>$item->{count} ×</b> $item->{text}" 3217 ? "<b>$item->{count} ×</b> $item->{text}"
2954 : $item->{text}; 3218 : $item->{text};
2955 3219
… …
2963 tooltip => $item->{tooltip}, 3227 tooltip => $item->{tooltip},
2964 tooltip_font => $::FONT_PROP, 3228 tooltip_font => $::FONT_PROP,
2965 tooltip_width => 0.67, 3229 tooltip_width => 0.67,
2966 fontsize => $item->{fontsize} || $self->{fontsize}, 3230 fontsize => $item->{fontsize} || $self->{fontsize},
2967 max_w => $::WIDTH * 0.44, 3231 max_w => $::WIDTH * 0.44,
2968 fg => $item->{fg}, 3232 fg => [@{ $item->{fg} }],
2969 can_events => 1, 3233 can_events => 1,
2970 can_hover => 1 3234 can_hover => 1
2971 }; 3235 };
3236
3237 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3238 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3239 $label->update;
3240 $label->set_max_size (undef, $label->{req_h} * $diff)
3241 if $diff < 1;
3242 $self->{timer}->interval (1/30);
3243 } else {
3244 $label->{fg}[3] = $item->{fg}[3] || 1;
3245 }
3246
3247 push @widgets, $label;
2972 } 3248 }
2973 3249
2974 $self->clear; 3250 $self->clear;
2975 $self->SUPER::add (reverse @widgets); 3251 $self->SUPER::add (reverse @widgets);
2976} 3252}
… …
2979 my ($self, $text, %arg) = @_; 3255 my ($self, $text, %arg) = @_;
2980 3256
2981 $text =~ s/^\s+//; 3257 $text =~ s/^\s+//;
2982 $text =~ s/\s+$//; 3258 $text =~ s/\s+$//;
2983 3259
3260 return unless $text;
3261
2984 my $timeout = time + ((delete $arg{timeout}) || 60); 3262 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
2985 3263
2986 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3264 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2987 3265
2988 if (my $item = $self->{item}{$group}) { 3266 if (my $item = $self->{item}{$group}) {
2989 if ($item->{text} eq $text) { 3267 if ($item->{text} eq $text) {
2990 $item->{count}++; 3268 $item->{count}++;
2991 } else { 3269 } else {
2992 $item->{count} = 1; 3270 $item->{count} = 1;
2993 $item->{text} = $item->{tooltip} = $text; 3271 $item->{text} = $item->{tooltip} = $text;
2994 } 3272 }
2995 $item->{id} = ++$self->{id}; 3273 $item->{id} += 0.2;#d#
2996 $item->{timeout} = $timeout; 3274 $item->{timeout} = $timeout;
2997 delete $item->{label}; 3275 delete $item->{label};
2998 } else { 3276 } else {
2999 $self->{item}{$group} = { 3277 $self->{item}{$group} = {
3000 id => ++$self->{id}, 3278 id => ++$self->{id},
… …
3019 3297
3020 $self->reorder; 3298 $self->reorder;
3021 $self->SUPER::reconfigure; 3299 $self->SUPER::reconfigure;
3022} 3300}
3023 3301
3302sub destroy {
3303 my ($self) = @_;
3304
3305 $self->{timer}->cancel;
3306
3307 $self->SUPER::destroy;
3308}
3309
3024############################################################################# 3310#############################################################################
3025 3311
3026package CFClient::UI::Root; 3312package CFClient::UI::Inventory;
3027 3313
3028our @ISA = CFClient::UI::Container::; 3314our @ISA = CFClient::UI::ScrolledWindow::;
3029
3030use CFClient::OpenGL;
3031 3315
3032sub new { 3316sub new {
3033 my $class = shift; 3317 my $class = shift;
3034 3318
3035 $class->SUPER::new ( 3319 my $self = $class->SUPER::new (
3320 child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3321 @_,
3322 );
3323
3324 $self
3325}
3326
3327sub set_items {
3328 my ($self, $items) = @_;
3329
3330 $self->{child}->clear;
3331 return unless $items;
3332
3333 my @items = sort {
3334 ($a->{type} <=> $b->{type})
3335 or ($a->{name} cmp $b->{name})
3336 } @$items;
3337
3338 $self->{real_items} = \@items;
3339
3340 my $row = 0;
3341 for my $item (@items) {
3342 CFClient::Item::update_widgets $item;
3343
3344 $self->{child}->add (0, $row, $item->{face_widget});
3345 $self->{child}->add (1, $row, $item->{desc_widget});
3346 $self->{child}->add (2, $row, $item->{weight_widget});
3347
3348 $row++;
3349 }
3350}
3351
3352#############################################################################
3353
3354package CFClient::UI::BindEditor;
3355
3356our @ISA = CFClient::UI::FancyFrame::;
3357
3358sub new {
3359 my $class = shift;
3360
3361 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3362
3363 $self->add (my $vb = new CFClient::UI::VBox);
3364
3365
3366 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3367 text => "start recording",
3368 tooltip => "Start/Stops recording of actions."
3369 ."All subsequent actions after the recording started will be captured."
3370 ."The actions are displayed after the record was stopped."
3371 ."To bind the action you have to click on the 'Bind' button",
3372 on_activate => sub {
3373 unless ($self->{recording}) {
3374 $self->start;
3375 } else {
3376 $self->stop;
3377 }
3378 });
3379
3380 $vb->add (new CFClient::UI::Label text => "Actions:");
3381 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3382
3383 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3384 $vb->add (my $hb = new CFClient::UI::HBox);
3385 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3386 $hb->add (new CFClient::UI::Button
3387 text => "bind",
3388 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3389 on_activate => sub {
3390 $self->ask_for_bind;
3391 });
3392
3393 $vb->add (my $hb = new CFClient::UI::HBox);
3394 $hb->add (new CFClient::UI::Button
3395 text => "ok",
3396 expand => 1,
3397 tooltip => "This closes the binding editor and saves the binding",
3398 on_activate => sub {
3399 $self->hide;
3400 $self->commit;
3401 });
3402
3403 $hb->add (new CFClient::UI::Button
3404 text => "cancel",
3405 expand => 1,
3406 tooltip => "This closes the binding editor without saving",
3407 on_activate => sub {
3408 $self->hide;
3409 $self->{binding_cancel}->()
3410 if $self->{binding_cancel};
3411 });
3412
3413 $self->update_binding_widgets;
3414
3415 $self
3416}
3417
3418sub commit {
3419 my ($self) = @_;
3420 my ($mod, $sym, $cmds) = $self->get_binding;
3421 if ($sym != 0 && @$cmds > 0) {
3422 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3423 ."'. Don't forget 'Save Config'!");
3424 $self->{binding_change}->($mod, $sym, $cmds)
3425 if $self->{binding_change};
3426 } else {
3427 $::STATUSBOX->add ("No action bound, no key or action specified!");
3428 $self->{binding_cancel}->()
3429 if $self->{binding_cancel};
3430 }
3431}
3432
3433sub start {
3434 my ($self) = @_;
3435
3436 $self->{rec_btn}->set_text ("stop recording");
3437 $self->{recording} = 1;
3438 $self->clear_command_list;
3439 $::CONN->start_record if $::CONN;
3440}
3441
3442sub stop {
3443 my ($self) = @_;
3444
3445 $self->{rec_btn}->set_text ("start recording");
3446 $self->{recording} = 0;
3447
3448 my $rec;
3449 $rec = $::CONN->stop_record if $::CONN;
3450 return unless ref $rec eq 'ARRAY';
3451 $self->set_command_list ($rec);
3452}
3453
3454
3455sub ask_for_bind_and_commit {
3456 my ($self) = @_;
3457 $self->ask_for_bind (1);
3458}
3459
3460sub ask_for_bind {
3461 my ($self, $commit) = @_;
3462
3463 CFClient::Binder::open_binding_dialog (sub {
3464 my ($mod, $sym) = @_;
3465 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3466 $self->update_binding_widgets;
3467 $self->commit if $commit;
3468 });
3469}
3470
3471# $mod and $sym are the modifiers and key symbol
3472# $cmds is a array ref of strings (the commands)
3473# $cb is the callback that is executed on OK
3474# $ccb is the callback that is executed on CANCEL and
3475# when the binding was unsuccessful on OK
3476sub set_binding {
3477 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3478
3479 $self->clear_command_list;
3480 $self->{recording} = 0;
3481 $self->{rec_btn}->set_text ("start recording");
3482
3483 $self->{binding} = [$mod, $sym];
3484 $self->{commands} = $cmds;
3485
3486 $self->{binding_change} = $cb;
3487 $self->{binding_cancel} = $ccb;
3488
3489 $self->update_binding_widgets;
3490}
3491
3492# this is a shortcut method that asks for a binding
3493# and then just binds it.
3494sub do_quick_binding {
3495 my ($self, $cmds) = @_;
3496 $self->set_binding (undef, undef, $cmds, sub {
3497 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3498 });
3499 $self->ask_for_bind (1);
3500}
3501
3502sub update_binding_widgets {
3503 my ($self) = @_;
3504 my ($mod, $sym, $cmds) = $self->get_binding;
3505 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3506 $self->set_command_list ($cmds);
3507}
3508
3509sub get_binding {
3510 my ($self) = @_;
3511 return (
3512 $self->{binding}->[0],
3513 $self->{binding}->[1],
3514 [ grep { defined $_ } @{$self->{commands}} ]
3515 );
3516}
3517
3518sub clear_command_list {
3519 my ($self) = @_;
3520 $self->{cmdbox}->clear ();
3521}
3522
3523sub set_command_list {
3524 my ($self, $cmds) = @_;
3525
3526 $self->{cmdbox}->clear ();
3527 $self->{commands} = $cmds;
3528
3529 my $idx = 0;
3530
3531 for (@$cmds) {
3532 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3533
3534 my $i = $idx;
3535 $hb->add (new CFClient::UI::Label text => $_);
3536 $hb->add (new CFClient::UI::Button
3537 text => "delete",
3538 tooltip => "Deletes the action from the record",
3539 on_activate => sub {
3540 $self->{cmdbox}->remove ($hb);
3541 $cmds->[$i] = undef;
3542 });
3543
3544
3545 $idx++
3546 }
3547}
3548
3549#############################################################################
3550
3551package CFClient::UI::SpellList;
3552
3553our @ISA = CFClient::UI::Table::;
3554
3555sub new {
3556 my $class = shift;
3557
3558 my $self = $class->SUPER::new (
3559 binding => [],
3560 commands => [],
3036 @_, 3561 @_,
3037 ) 3562 )
3038} 3563}
3039 3564
3040sub configure { 3565my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3041 my ($self, $x, $y, $w, $h) = @_;
3042 3566
3043 $self->{w} = $w; 3567my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3044 $self->{h} = $h; 3568 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3045} 3569my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3570 "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3571my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3572 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3573my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3574 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3575my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3576 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3046 3577
3047sub check_size { 3578sub rebuild_spell_list {
3579 my ($self) = @_;
3580
3581 $CFClient::UI::ROOT->on_refresh ($self => sub {
3582 $self->clear;
3583
3584 return unless $::CONN;
3585
3586 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3587 $self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3588 $self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3589 $self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3590 $self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3591
3592 my $row = 0;
3593
3594 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3595 my $spell = $self->{spell}{$_};
3596
3597 $row++;
3598
3599 my $spell_cb = sub {
3600 my ($widget, $ev) = @_;
3601
3602 if ($ev->{button} == 1) {
3603 $::CONN->user_send ("cast $spell->{name}");
3604 } elsif ($ev->{button} == 2) {
3605 $::CONN->user_send ("invoke $spell->{name}");
3606 } elsif ($ev->{button} == 3) {
3607 (new CFClient::UI::Menu
3608 items => [
3609 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3610 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3611 ],
3612 )->popup ($ev);
3613 } else {
3614 return 0;
3615 }
3616
3617 1
3618 };
3619
3620 my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3621
3622 #TODO: add path info to tooltip
3623 #$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3624
3625 $self->add (0, $row, new CFClient::UI::Face
3626 face => $spell->{face},
3627 can_hover => 1,
3628 can_events => 1,
3629 tooltip => $tooltip,
3630 on_button_down => $spell_cb,
3631 );
3632
3633 $self->add (1, $row, new CFClient::UI::Label
3634 expand => 1,
3635 text => $spell->{name},
3636 can_hover => 1,
3637 can_events => 1,
3638 tooltip => $tooltip,
3639 on_button_down => $spell_cb,
3640 );
3641
3642 $self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3643 $self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3644 $self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3645 $self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3646 }
3647 });
3648}
3649
3650sub add_spell {
3048 my ($self) = @_; 3651 my ($self, $spell) = @_;
3049 3652
3050 $self->size_allocate ($self->{w}, $self->{h}) 3653 $self->{spell}->{$spell->{name}} = $spell;
3051 if $self->{w}; 3654 $self->rebuild_spell_list;
3655}
3656
3657sub remove_spell {
3658 my ($self, $spell) = @_;
3659
3660 delete $self->{spell}->{$spell->{name}};
3661 $self->rebuild_spell_list;
3662}
3663
3664sub clear_spells {
3665 my ($self) = @_;
3666
3667 $self->{spell} = {};
3668 $self->rebuild_spell_list;
3669}
3670
3671#############################################################################
3672
3673package CFClient::UI::Root;
3674
3675our @ISA = CFClient::UI::Container::;
3676
3677use List::Util qw(min max);
3678
3679use CFClient::OpenGL;
3680
3681sub new {
3682 my $class = shift;
3683
3684 my $self = $class->SUPER::new (
3685 visible => 1,
3686 @_,
3687 );
3688
3689 Scalar::Util::weaken ($self->{root} = $self);
3690
3691 $self
3052} 3692}
3053 3693
3054sub size_request { 3694sub size_request {
3055 my ($self) = @_; 3695 my ($self) = @_;
3056 3696
3057 ($self->{w}, $self->{h}) 3697 ($self->{w}, $self->{h})
3698}
3699
3700sub _to_pixel {
3701 my ($coord, $size, $max) = @_;
3702
3703 $coord =
3704 $coord eq "center" ? ($max - $size) * 0.5
3705 : $coord eq "max" ? $max
3706 : $coord;
3707
3708 $coord = 0 if $coord < 0;
3709 $coord = $max - $size if $coord > $max - $size;
3710
3711 int $coord + 0.5
3058} 3712}
3059 3713
3060sub size_allocate { 3714sub size_allocate {
3061 my ($self, $w, $h) = @_; 3715 my ($self, $w, $h) = @_;
3062 3716
3063 for my $child ($self->children) { 3717 for my $child ($self->children) {
3064 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3718 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3065 3719
3066 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 3720 $X = $child->{force_x} if exists $child->{force_x};
3067 if exists $child->{req_x}; 3721 $Y = $child->{force_y} if exists $child->{force_y};
3068 3722
3069 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1 3723 $X = _to_pixel $X, $W, $self->{w};
3070 if exists $child->{req_y}; 3724 $Y = _to_pixel $Y, $H, $self->{h};
3071
3072 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
3073 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
3074 3725
3075 $child->configure ($X, $Y, $W, $H); 3726 $child->configure ($X, $Y, $W, $H);
3076 } 3727 }
3077} 3728}
3078 3729
… …
3089} 3740}
3090 3741
3091sub update { 3742sub update {
3092 my ($self) = @_; 3743 my ($self) = @_;
3093 3744
3094 $self->check_size;
3095 $::WANT_REFRESH++; 3745 $::WANT_REFRESH++;
3096} 3746}
3097 3747
3098sub add { 3748sub add {
3099 my ($self, @children) = @_; 3749 my ($self, @children) = @_;
3100 3750
3101 for (my @widgets = @children; my $w = pop @widgets; ) {
3102 push @widgets, $w->children;
3103 $w->{root} = $self;
3104 $w->{visible} = 1;
3105 }
3106
3107 for my $child (@children) {
3108 $child->{is_toplevel} = 1; 3751 $_->{is_toplevel} = 1
3109 3752 for @children;
3110 # integerise window positions
3111 $child->{x} = int $child->{x};
3112 $child->{y} = int $child->{y};
3113 }
3114 3753
3115 $self->SUPER::add (@children); 3754 $self->SUPER::add (@children);
3116} 3755}
3117 3756
3118sub remove { 3757sub remove {
3119 my ($self, @children) = @_; 3758 my ($self, @children) = @_;
3120 3759
3121 $self->SUPER::remove (@children); 3760 $self->SUPER::remove (@children);
3761
3762 delete $self->{is_toplevel}
3763 for @children;
3122 3764
3123 while (@children) { 3765 while (@children) {
3124 my $w = pop @children; 3766 my $w = pop @children;
3125 push @children, $w->children; 3767 push @children, $w->children;
3126 delete $w->{visible}; 3768 $w->set_invisible;
3127 } 3769 }
3128} 3770}
3129 3771
3130sub on_refresh { 3772sub on_refresh {
3131 my ($self, $id, $cb) = @_; 3773 my ($self, $id, $cb) = @_;
… …
3145 while ($self->{refresh_hook}) { 3787 while ($self->{refresh_hook}) {
3146 $_->() 3788 $_->()
3147 for values %{delete $self->{refresh_hook}}; 3789 for values %{delete $self->{refresh_hook}};
3148 } 3790 }
3149 3791
3150 if ($self->{check_size}) { 3792 if ($self->{realloc}) {
3151 my @queue = ([], []); 3793 my %queue;
3794 my @queue;
3795 my $widget;
3152 3796
3153 for (;;) { 3797 outer:
3154 if ($self->{check_size}) { 3798 while () {
3155 # heuristic: check containers last 3799 if (my $realloc = delete $self->{realloc}) {
3156 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_ 3800 for $widget (values %$realloc) {
3157 for values %{delete $self->{check_size}} 3801 $widget->{visible} or next; # do not resize invisible widgets
3802
3803 $queue{$widget+0}++ and next; # duplicates are common
3804
3805 push @{ $queue[$widget->{visible}] }, $widget;
3806 }
3158 } 3807 }
3159 3808
3160 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last; 3809 while () {
3810 @queue or last outer;
3161 3811
3162 my ($w, $h) = $widget->{user_w} && $widget->{user_h} 3812 $widget = pop @{ $queue[-1] || [] }
3163 ? @$widget{qw(user_w user_h)} 3813 and last;
3164 : $widget->size_request;
3165
3166 if (delete $widget->{force_alloc}
3167 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
3168 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
3169 3814
3815 pop @queue;
3816 }
3817
3818 delete $queue{$widget+0};
3819
3820 my ($w, $h) = $widget->size_request;
3821
3822 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3823 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3824
3825 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3826 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3827
3828 $w = $widget->{force_w} if exists $widget->{force_w};
3829 $h = $widget->{force_h} if exists $widget->{force_h};
3830
3831 if ($widget->{req_w} != $w || $widget->{req_h} != $h
3832 || delete $widget->{force_realloc}) {
3170 $widget->{req_w} = $w; 3833 $widget->{req_w} = $w;
3171 $widget->{req_h} = $h; 3834 $widget->{req_h} = $h;
3172 3835
3173 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h]; 3836 $self->{size_alloc}{$widget+0} = $widget;
3174 3837
3175 $widget->{parent}->check_size
3176 if $widget->{parent}; 3838 if (my $parent = $widget->{parent}) {
3839 $self->{realloc}{$parent+0} = $parent
3840 unless $queue{$parent+0};
3841
3842 $parent->{force_size_alloc} = 1;
3843 $self->{size_alloc}{$parent+0} = $parent;
3844 }
3177 } 3845 }
3846
3847 delete $self->{realloc}{$widget+0};
3178 } 3848 }
3179 } 3849 }
3180 3850
3181 while ($self->{size_alloc}) { 3851 while (my $size_alloc = delete $self->{size_alloc}) {
3182 for (values %{delete $self->{size_alloc}}) { 3852 my @queue = sort { $b->{visible} <=> $a->{visible} }
3183 my ($widget, $w, $h) = @$_; 3853 values %$size_alloc;
3854
3855 while () {
3856 my $widget = pop @queue || last;
3857
3858 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3184 3859
3185 $w = 0 if $w < 0; 3860 $w = 0 if $w < 0;
3186 $h = 0 if $h < 0; 3861 $h = 0 if $h < 0;
3187 3862
3863 $w = int $w + 0.5;
3864 $h = int $h + 0.5;
3865
3866 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3867 $widget->{old_w} = $widget->{w};
3868 $widget->{old_h} = $widget->{h};
3869
3188 $widget->{w} = $w; 3870 $widget->{w} = $w;
3189 $widget->{h} = $h; 3871 $widget->{h} = $h;
3190 $widget->size_allocate ($w, $h); 3872
3191 $widget->emit (size_allocate => $w, $h); 3873 $widget->emit (size_allocate => $w, $h);
3874 }
3192 } 3875 }
3193 } 3876 }
3194 3877
3195 while ($self->{post_alloc_hook}) { 3878 while ($self->{post_alloc_hook}) {
3196 $_->() 3879 $_->()
3197 for values %{delete $self->{post_alloc_hook}}; 3880 for values %{delete $self->{post_alloc_hook}};
3198 } 3881 }
3882
3199 3883
3200 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3884 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3201 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3885 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3202 glClear GL_COLOR_BUFFER_BIT; 3886 glClear GL_COLOR_BUFFER_BIT;
3203 3887
… …
3205 glLoadIdentity; 3889 glLoadIdentity;
3206 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 3890 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3207 glMatrixMode GL_MODELVIEW; 3891 glMatrixMode GL_MODELVIEW;
3208 glLoadIdentity; 3892 glLoadIdentity;
3209 3893
3894 {
3895 package CFClient::UI::Base;
3896
3897 ($draw_x, $draw_y, $draw_w, $draw_h) =
3898 (0, 0, $self->{w}, $self->{h});
3899 }
3900
3210 $self->_draw; 3901 $self->_draw;
3211} 3902}
3212 3903
3213############################################################################# 3904#############################################################################
3214 3905

Diff Legend

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