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.193 by root, Wed May 10 21:12:26 2006 UTC vs.
Revision 1.262 by elmex, Wed May 31 13:44:26 2006 UTC

1package CFClient::UI; 1package CFClient::UI;
2 2
3use utf8;
3use strict; 4use strict;
4 5
5use Scalar::Util (); 6use Scalar::Util ();
6use List::Util (); 7use List::Util ();
7 8
8use CFClient; 9use CFClient;
10use CFClient::Texture;
9 11
10our ($FOCUS, $HOVER, $GRAB); # various widgets 12our ($FOCUS, $HOVER, $GRAB); # various widgets
11 13
14our $LAYOUT;
12our $ROOT; 15our $ROOT;
13our $TOOLTIP; 16our $TOOLTIP;
14our $BUTTON_STATE; 17our $BUTTON_STATE;
18
19our %WIDGET; # all widgets, weak-referenced
20
21sub get_layout {
22 my $layout;
23
24 for (grep { $_->{name} } values %WIDGET) {
25 my $win = $layout->{$_->{name}} = { };
26
27 $win->{x} = ($_->{x} + $_->{w} * 0.5) / $::WIDTH if $_->{x} =~ /^[0-9.]+$/;
28 $win->{y} = ($_->{y} + $_->{h} * 0.5) / $::HEIGHT if $_->{y} =~ /^[0-9.]+$/;
29 $win->{w} = $_->{w} / $::WIDTH if defined $_->{w};
30 $win->{h} = $_->{h} / $::HEIGHT if defined $_->{h};
31
32 $win->{show} = $_->{visible} && $_->{is_toplevel};
33 }
34
35 $layout
36}
37
38sub set_layout {
39 my ($layout) = @_;
40
41 $LAYOUT = $layout;
42}
15 43
16sub check_tooltip { 44sub check_tooltip {
17 if (!$GRAB) { 45 if (!$GRAB) {
18 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 46 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
19 if (length $widget->{tooltip}) { 47 if (length $widget->{tooltip}) {
20 48
21 if ($TOOLTIP->{owner} != $widget) { 49 if ($TOOLTIP->{owner} != $widget) {
50 $TOOLTIP->hide;
51
22 $TOOLTIP->{owner} = $widget; 52 $TOOLTIP->{owner} = $widget;
23 53
24 my $tip = $widget->{tooltip}; 54 my $tip = $widget->{tooltip};
25 55
26 $tip = $tip->($widget) if CODE:: eq ref $tip; 56 $tip = $tip->($widget) if CODE:: eq ref $tip;
27 57
28 $TOOLTIP->set_markup ($widget->{tooltip}); 58 $TOOLTIP->set_tooltip_from ($widget);
29
30 $TOOLTIP->show; 59 $TOOLTIP->show;
31
32 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
33
34 if ($x + $TOOLTIP->{w} > $::WIDTH) {
35 ($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0);
36 }
37
38 $TOOLTIP->move ($x, $y);
39 } 60 }
40 61
41 return; 62 return;
42 } 63 }
43 } 64 }
… …
47 delete $TOOLTIP->{owner}; 68 delete $TOOLTIP->{owner};
48} 69}
49 70
50# class methods for events 71# class methods for events
51sub feed_sdl_key_down_event { 72sub feed_sdl_key_down_event {
52 $FOCUS->emit (key_down => $_[0]) || $FOCUS->key_down ($_[0]) 73 $FOCUS->emit (key_down => $_[0])
53 if $FOCUS; 74 if $FOCUS;
54} 75}
55 76
56sub feed_sdl_key_up_event { 77sub feed_sdl_key_up_event {
57 $FOCUS->emit (key_up => $_[0]) || $FOCUS->key_up ($_[0]) 78 $FOCUS->emit (key_up => $_[0])
58 if $FOCUS; 79 if $FOCUS;
59} 80}
60 81
61sub feed_sdl_button_down_event { 82sub feed_sdl_button_down_event {
62 my ($ev) = @_; 83 my ($ev) = @_;
… …
71 check_tooltip; 92 check_tooltip;
72 } 93 }
73 94
74 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 95 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
75 96
76 if ($GRAB) { 97 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
77 ($x, $y) = $GRAB->coord2local ($x, $y); 98 if $GRAB;
78 $GRAB->emit (button_down => $ev, $x, $y) || $GRAB->button_down ($ev, $x, $y);
79 }
80} 99}
81 100
82sub feed_sdl_button_up_event { 101sub feed_sdl_button_up_event {
83 my ($ev) = @_; 102 my ($ev) = @_;
84 my ($x, $y) = ($ev->{x}, $ev->{y}); 103 my ($x, $y) = ($ev->{x}, $ev->{y});
85 104
86 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 105 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
87 106
88 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); 107 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
89 108
90 if ($GRAB) { 109 $GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y))
91 ($x, $y) = $GRAB->coord2local ($x, $y); 110 if $GRAB;
92 $GRAB->emit (button_up => $ev, $x, $y) || $GRAB->button_up ($ev, $x, $y);
93 }
94 111
95 if (!$BUTTON_STATE) { 112 if (!$BUTTON_STATE) {
96 my $grab = $GRAB; undef $GRAB; 113 my $grab = $GRAB; undef $GRAB;
97 $grab->update if $grab; 114 $grab->update if $grab;
98 $GRAB->update if $GRAB; 115 $GRAB->update if $GRAB;
… …
114 $HOVER->update if $HOVER && $HOVER->{can_hover}; 131 $HOVER->update if $HOVER && $HOVER->{can_hover};
115 132
116 check_tooltip; 133 check_tooltip;
117 } 134 }
118 135
119 if ($HOVER) {
120 ($x, $y) = $HOVER->coord2local ($x, $y);
121 $HOVER->emit (mouse_motion => $ev, $x, $y) || $HOVER->mouse_motion ($ev, $x, $y); 136 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
122 } 137 if $HOVER;
123} 138}
124 139
125# convert position array to integers 140# convert position array to integers
126sub harmonize { 141sub harmonize {
127 my ($vals) = @_; 142 my ($vals) = @_;
… …
133 $rem += $_ - $i; 148 $rem += $_ - $i;
134 $_ = $i; 149 $_ = $i;
135 } 150 }
136} 151}
137 152
153sub full_refresh {
154 # make a copy, otherwise for complains about freed values.
155 my @widgets = values %WIDGET;
156
157 $_->update
158 for @widgets;
159}
160
161sub reconfigure_widgets {
162 # make a copy, otherwise C<for> complains about freed values.
163 my @widgets = values %WIDGET;
164
165 $_->reconfigure
166 for @widgets;
167}
168
169# call when resolution changes etc.
170sub rescale_widgets {
171 my ($sx, $sy) = @_;
172
173 for my $widget (values %WIDGET) {
174 if ($widget->{is_toplevel}) {
175 $widget->{x} += $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
176 $widget->{y} += $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
177
178 $widget->{x} = int 0.5 + $widget->{x} * $sx if $widget->{x} =~ /^[0-9.]+$/;
179 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
180 $widget->{force_w} = int 0.5 + $widget->{force_w} * $sx if exists $widget->{force_w};
181 $widget->{y} = int 0.5 + $widget->{y} * $sy if $widget->{y} =~ /^[0-9.]+$/;
182 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
183 $widget->{force_h} = int 0.5 + $widget->{force_h} * $sy if exists $widget->{force_h};
184
185 $widget->{x} -= $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
186 $widget->{y} -= $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
187
188 }
189 }
190
191 reconfigure_widgets;
192}
193
138############################################################################# 194#############################################################################
139 195
140package CFClient::UI::Base; 196package CFClient::UI::Base;
141 197
142use strict; 198use strict;
… …
145 201
146sub new { 202sub new {
147 my $class = shift; 203 my $class = shift;
148 204
149 my $self = bless { 205 my $self = bless {
150 x => 0, 206 x => "center",
151 y => 0, 207 y => "center",
152 z => 0, 208 z => 0,
209 w => undef,
210 h => undef,
153 can_events => 1, 211 can_events => 1,
154 @_ 212 @_
155 }, $class; 213 }, $class;
156 214
215 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
216
157 for (keys %$self) { 217 for (keys %$self) {
158 if (/^connect_(.*)$/) { 218 if (/^on_(.*)$/) {
159 $self->connect ($1 => delete $self->{$_}); 219 $self->connect ($1 => delete $self->{$_});
160 } 220 }
161 } 221 }
162 222
223 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {
224 $self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x};
225 $self->{y} = $layout->{y} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{y};
226 $self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{w};
227 $self->{force_h} = $layout->{h} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{h};
228
229 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
230 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
231
232 $self->show if $layout->{show};
233 }
234
163 $self 235 $self
164} 236}
165 237
166sub destroy { 238sub destroy {
167 my ($self) = @_; 239 my ($self) = @_;
… …
176 return if $self->{parent}; 248 return if $self->{parent};
177 249
178 $CFClient::UI::ROOT->add ($self); 250 $CFClient::UI::ROOT->add ($self);
179} 251}
180 252
181sub hide { 253sub set_visible {
182 my ($self) = @_; 254 my ($self) = @_;
255
256 return if $self->{visible};
257
258 $self->{root} = $self->{parent}{root};
259 $self->{visible} = $self->{parent}{visible} + 1;
260
261 $self->emit (visibility_change => 1);
262
263 $self->realloc if !exists $self->{req_w};
264
265 $_->set_visible for $self->children;
266}
267
268sub set_invisible {
269 my ($self) = @_;
270
271 return unless $self->{visible};
272
273 $_->set_invisible for $self->children;
274
275 delete $self->{root};
276 delete $self->{visible};
183 277
184 undef $GRAB if $GRAB == $self; 278 undef $GRAB if $GRAB == $self;
185 undef $HOVER if $HOVER == $self; 279 undef $HOVER if $HOVER == $self;
186 280
281 CFClient::UI::check_tooltip
282 if $TOOLTIP->{owner} == $self;
283
284 $self->focus_out;
285
286 $self->emit (visibility_change => 0);
287}
288
289sub set_visibility {
290 my ($self, $visible) = @_;
291
292 return if $self->{visible} == $visible;
293
294 $visible ? $self->hide
295 : $self->show;
296}
297
298sub toggle_visibility {
299 my ($self) = @_;
300
301 $self->{visible}
302 ? $self->hide
303 : $self->show;
304}
305
306sub hide {
307 my ($self) = @_;
308
309 $self->set_invisible;
310
187 $self->{parent}->remove ($self) 311 $self->{parent}->remove ($self)
188 if $self->{parent}; 312 if $self->{parent};
189} 313}
190 314
191sub move { 315sub move_abs {
192 my ($self, $x, $y, $z) = @_; 316 my ($self, $x, $y, $z) = @_;
193 317
194 $self->{x} = int $x; 318 $self->{x} = List::Util::max 0, int $x;
195 $self->{y} = int $y; 319 $self->{y} = List::Util::max 0, int $y;
196 $self->{z} = $z if defined $z; 320 $self->{z} = $z if defined $z;
197 321
198 $self->update; 322 $self->update;
199} 323}
200 324
201sub set_size { 325sub set_size {
202 my ($self, $w, $h) = @_; 326 my ($self, $w, $h) = @_;
203 327
204 $self->{user_w} = $w; 328 $self->{force_w} = $w;
205 $self->{user_h} = $h; 329 $self->{force_h} = $h;
206 330
207 $self->check_size; 331 $self->realloc;
208} 332}
209 333
210sub size_request { 334sub size_request {
211 require Carp; 335 require Carp;
212 Carp::confess "size_request is abstract"; 336 Carp::confess "size_request is abstract";
… …
214 338
215sub configure { 339sub configure {
216 my ($self, $x, $y, $w, $h) = @_; 340 my ($self, $x, $y, $w, $h) = @_;
217 341
218 if ($self->{aspect}) { 342 if ($self->{aspect}) {
343 my ($ow, $oh) = ($w, $h);
344
219 my $w2 = List::Util::min $w, int $h * $self->{aspect}; 345 $w = List::Util::min $w, int $h * $self->{aspect};
220 my $h2 = List::Util::min $h, int $w / $self->{aspect}; 346 $h = List::Util::min $h, int $w / $self->{aspect};
221 347
222 # use alignment to adjust x, y 348 # use alignment to adjust x, y
223 349
224 $x += int +($w - $w2) * 0.5; 350 $x += int 0.5 * ($ow - $w);
225 $y += int +($h - $h2) * 0.5; 351 $y += int 0.5 * ($oh - $h);
226
227 ($w, $h) = ($w2, $h2);
228 } 352 }
229 353
230 if ($self->{x} != $x || $self->{y} != $y) { 354 if ($self->{x} ne $x || $self->{y} ne $y) {
231 $self->{x} = $x; 355 $self->{x} = $x;
232 $self->{y} = $y; 356 $self->{y} = $y;
233 $self->update; 357 $self->update;
234 } 358 }
235 359
236 if ($self->{w} != $w || $self->{h} != $h) { 360 if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
237 $CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h]; 361 return unless $self->{visible};
362
363 $self->{alloc_w} = $w;
364 $self->{alloc_h} = $h;
365
366 $self->{root}{size_alloc}{$self+0} = $self;
238 } 367 }
239} 368}
240 369
241sub size_allocate { 370sub size_allocate {
242 # nothing to be done 371 # nothing to be done
243} 372}
244 373
245sub children { 374sub children {
246} 375}
247 376
248# call when resolution changes etc.
249sub reconfigure {
250 my ($self) = @_;
251
252 $_->reconfigure
253 for $self->children;
254
255 $self->check_size;
256 $CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $self->{w}, $self->{h}];
257 $self->update;
258}
259
260sub set_max_size { 377sub set_max_size {
261 my ($self, $w, $h) = @_; 378 my ($self, $w, $h) = @_;
262 379
263 delete $self->{max_w}; $self->{max_w} = $w if $w; 380 delete $self->{max_w}; $self->{max_w} = $w if $w;
264 delete $self->{max_h}; $self->{max_h} = $h if $h; 381 delete $self->{max_h}; $self->{max_h} = $h if $h;
382}
383
384sub set_tooltip {
385 my ($self, $tooltip) = @_;
386
387 $tooltip =~ s/^\s+//;
388 $tooltip =~ s/\s+$//;
389
390 return if $self->{tooltip} eq $tooltip;
391
392 $self->{tooltip} = $tooltip;
393
394 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
395 delete $CFClient::UI::TOOLTIP->{owner};
396 CFClient::UI::check_tooltip;
397 }
265} 398}
266 399
267# translate global coordinates to local coordinate system 400# translate global coordinates to local coordinate system
268sub coord2local { 401sub coord2local {
269 my ($self, $x, $y) = @_; 402 my ($self, $x, $y) = @_;
… …
284 return if $FOCUS == $self; 417 return if $FOCUS == $self;
285 return unless $self->{can_focus}; 418 return unless $self->{can_focus};
286 419
287 my $focus = $FOCUS; $FOCUS = $self; 420 my $focus = $FOCUS; $FOCUS = $self;
288 421
289 $self->emit (focus_in => $focus); 422 $self->_emit (focus_in => $focus);
290 423
291 $focus->update if $focus; 424 $focus->update if $focus;
292 $FOCUS->update; 425 $FOCUS->update;
293} 426}
294 427
… …
297 430
298 return unless $FOCUS == $self; 431 return unless $FOCUS == $self;
299 432
300 my $focus = $FOCUS; undef $FOCUS; 433 my $focus = $FOCUS; undef $FOCUS;
301 434
302 $self->emit (focus_out => $focus); 435 $self->_emit (focus_out => $focus);
303 436
304 $focus->update if $focus; #? 437 $focus->update if $focus; #?
438
439 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus
440 unless $FOCUS;
305} 441}
306 442
307sub mouse_motion { } 443sub mouse_motion { }
308sub button_up { } 444sub button_up { }
309sub key_down { } 445sub key_down { }
310sub key_up { } 446sub key_up { }
311 447
312sub button_down { 448sub button_down {
313 my ($self, $ev, $x, $y) = @_; 449 my ($self, $ev, $x, $y) = @_;
314 450
315 $self->focus_in; 451 $self->focus_in;
… …
318sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 454sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }
319sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 455sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }
320sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 456sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }
321sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 457sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }
322sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} } 458sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} }
459
460sub find_widget {
461 my ($self, $x, $y) = @_;
462
463 return () unless $self->{can_events};
464
465 return $self
466 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
467 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
468
469 ()
470}
471
472sub set_parent {
473 my ($self, $parent) = @_;
474
475 Scalar::Util::weaken ($self->{parent} = $parent);
476 $self->set_visible if $parent->{visible};
477}
478
479sub connect {
480 my ($self, $signal, $cb) = @_;
481
482 push @{ $self->{signal_cb}{$signal} }, $cb;
483}
484
485sub _emit {
486 my ($self, $signal, @args) = @_;
487
488 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
489}
490
491sub emit {
492 my ($self, $signal, @args) = @_;
493
494 $self->_emit ($signal, @args)
495 || $self->$signal (@args);
496}
497
498sub visibility_change {
499 #my ($self, $visible) = @_;
500}
501
502sub realloc {
503 my ($self) = @_;
504
505 if ($self->{visible}) {
506 return if $self->{root}{realloc}{$self+0};
507
508 $self->{root}{realloc}{$self+0} = $self;
509 $self->{root}->update;
510 } else {
511 delete $self->{req_w};
512 delete $self->{req_h};
513 }
514}
515
516sub update {
517 my ($self) = @_;
518
519 $self->{parent}->update
520 if $self->{parent};
521}
522
523sub reconfigure {
524 my ($self) = @_;
525
526 $self->realloc;
527 $self->update;
528}
323 529
324sub draw { 530sub draw {
325 my ($self) = @_; 531 my ($self) = @_;
326 532
327 return unless $self->{h} && $self->{w}; 533 return unless $self->{h} && $self->{w};
… …
344 glVertex $x , $y + $self->{h}; 550 glVertex $x , $y + $self->{h};
345 glEnd; 551 glEnd;
346 glDisable GL_BLEND; 552 glDisable GL_BLEND;
347 } 553 }
348 554
349 if ($ENV{PCLIENT_DEBUG}) { 555 if ($ENV{CFPLUS_DEBUG} & 1) {
350 glPushMatrix; 556 glPushMatrix;
351 glColor 1, 1, 0, 1; 557 glColor 1, 1, 0, 1;
352 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 558 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
353 glBegin GL_LINE_LOOP; 559 glBegin GL_LINE_LOOP;
354 glVertex 0 , 0; 560 glVertex 0 , 0;
355 glVertex $self->{w}, 0; 561 glVertex $self->{w} - 1, 0;
356 glVertex $self->{w}, $self->{h}; 562 glVertex $self->{w} - 1, $self->{h} - 1;
357 glVertex 0 , $self->{h}; 563 glVertex 0 , $self->{h} - 1;
358 glEnd; 564 glEnd;
359 glPopMatrix; 565 glPopMatrix;
360 CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 566 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
361 } 567 }
362} 568}
363 569
364sub _draw { 570sub _draw {
365 my ($self) = @_; 571 my ($self) = @_;
366 572
367 warn "no draw defined for $self\n"; 573 warn "no draw defined for $self\n";
368} 574}
369 575
370sub find_widget {
371 my ($self, $x, $y) = @_;
372
373 return () unless $self->{can_events};
374
375 return $self
376 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
377 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
378
379 ()
380}
381
382sub set_parent {
383 my ($self, $parent) = @_;
384
385 Scalar::Util::weaken ($self->{parent} = $parent);
386
387 $self->check_size
388 unless exists $self->{req_w};
389}
390
391sub check_size {
392 my ($self) = @_;
393
394 $CFClient::UI::ROOT->{check_size}{$self} = $self;
395}
396
397sub update {
398 my ($self) = @_;
399
400 $self->{parent}->update
401 if $self->{parent};
402}
403
404sub connect {
405 my ($self, $signal, $cb) = @_;
406
407 push @{ $self->{signal_cb}{$signal} }, $cb;
408}
409
410sub emit {
411 my ($self, $signal, @args) = @_;
412
413 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
414}
415
416sub DESTROY { 576sub DESTROY {
417 my ($self) = @_; 577 my ($self) = @_;
418 578
579 delete $WIDGET{$self+0};
419 #$self->deactivate; 580 #$self->deactivate;
420} 581}
421 582
422############################################################################# 583#############################################################################
423 584
… …
432 my $class = shift; 593 my $class = shift;
433 594
434 # range [value, low, high, page] 595 # range [value, low, high, page]
435 596
436 $class->SUPER::new ( 597 $class->SUPER::new (
437 bg => [0, 0, 0, 0.2], 598 #bg => [0, 0, 0, 0.2],
438 active_bg => [1, 1, 1, 0.5], 599 #active_bg => [1, 1, 1, 0.5],
439 @_ 600 @_
440 ) 601 )
441} 602}
442 603
443sub _draw { 604sub _draw {
444 my ($self) = @_; 605 my ($self) = @_;
445 606
607 my $color = $FOCUS == $self && $self->{active_bg}
608 ? $self->{active_bg}
609 : $self->{bg};
610
611 if ($color && (@$color < 4 || $color->[3])) {
446 my ($w, $h) = @$self{qw(w h)}; 612 my ($w, $h) = @$self{qw(w h)};
447 613
448 glEnable GL_BLEND; 614 glEnable GL_BLEND;
449 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 615 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
450 glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} }; 616 glColor @$color;
451 617
452 glBegin GL_QUADS; 618 glBegin GL_QUADS;
453 glVertex 0 , 0; 619 glVertex 0 , 0;
454 glVertex 0 , $h; 620 glVertex 0 , $h;
455 glVertex $w, $h; 621 glVertex $w, $h;
456 glVertex $w, 0; 622 glVertex $w, 0;
457 glEnd; 623 glEnd;
458 624
459 glDisable GL_BLEND; 625 glDisable GL_BLEND;
626 }
460} 627}
461 628
462############################################################################# 629#############################################################################
463 630
464package CFClient::UI::Empty; 631package CFClient::UI::Empty;
… …
469 my ($class, %arg) = @_; 636 my ($class, %arg) = @_;
470 $class->SUPER::new (can_events => 0, %arg); 637 $class->SUPER::new (can_events => 0, %arg);
471} 638}
472 639
473sub size_request { 640sub size_request {
474 (0, 0) 641 my ($self) = @_;
642
643 ($self->{w} + 0, $self->{h} + 0)
475} 644}
476 645
477sub draw { } 646sub draw { }
478 647
479############################################################################# 648#############################################################################
… …
508 $self->{children} = [ 677 $self->{children} = [
509 sort { $a->{z} <=> $b->{z} } 678 sort { $a->{z} <=> $b->{z} }
510 @{$self->{children}}, @widgets 679 @{$self->{children}}, @widgets
511 ]; 680 ];
512 681
513 $self->check_size; 682 $self->realloc;
514 $self->update;
515} 683}
516 684
517sub children { 685sub children {
518 @{ $_[0]{children} } 686 @{ $_[0]{children} }
519} 687}
… …
524 delete $child->{parent}; 692 delete $child->{parent};
525 $child->hide; 693 $child->hide;
526 694
527 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 695 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
528 696
529 $self->check_size; 697 $self->realloc;
530 $self->update;
531} 698}
532 699
533sub clear { 700sub clear {
534 my ($self) = @_; 701 my ($self) = @_;
535 702
… …
539 for (@$children) { 706 for (@$children) {
540 delete $_->{parent}; 707 delete $_->{parent};
541 $_->hide; 708 $_->hide;
542 } 709 }
543 710
544 $self->check_size; 711 $self->realloc;
545 $self->update;
546} 712}
547 713
548sub find_widget { 714sub find_widget {
549 my ($self, $x, $y) = @_; 715 my ($self, $x, $y) = @_;
550 716
… …
625} 791}
626 792
627sub update { 793sub update {
628 my ($self) = @_; 794 my ($self) = @_;
629 795
630 $ROOT->on_refresh ($self => sub { $self->render_child }); 796 $ROOT->on_post_alloc ($self => sub { $self->render_child });
631 $self->SUPER::update; 797 $self->SUPER::update;
632} 798}
633 799
634sub size_allocate { 800sub size_allocate {
635 my ($self, $w, $h) = @_; 801 my ($self, $w, $h) = @_;
… …
648 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 814 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
649 glClearColor 0, 0, 0, 0; 815 glClearColor 0, 0, 0, 0;
650 glClear GL_COLOR_BUFFER_BIT; 816 glClear GL_COLOR_BUFFER_BIT;
651 817
652 $self->_render; 818 $self->_render;
653# glColorMask 1, 1, 1, 0;
654# glEnable GL_BLEND;
655# glBlendFunc GL_SRC_ALPHA, GL_ZERO;
656# glRasterPos 0, 0;
657# glCopyPixels 0, 0, $self->{w}, $self->{h};
658# glDisable GL_BLEND;
659# glColorMask 1, 1, 1, 1;
660 }; 819 };
661} 820}
662 821
663sub _draw { 822sub _draw {
664 my ($self) = @_; 823 my ($self) = @_;
… …
666 my ($w, $h) = ($self->w, $self->h); 825 my ($w, $h) = ($self->w, $self->h);
667 826
668 my $tex = $self->{texture} 827 my $tex = $self->{texture}
669 or return; 828 or return;
670 829
671 glEnable GL_BLEND;
672 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
673 glEnable GL_TEXTURE_2D; 830 glEnable GL_TEXTURE_2D;
674 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 831 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
675 glColor 0, 0, 0, 1; 832 glColor 1, 1, 1, 1;
676 833
677 $tex->draw_quad (0, 0, $w, $h); 834 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
678 835
679 glDisable GL_BLEND;
680 glDisable GL_TEXTURE_2D; 836 glDisable GL_TEXTURE_2D;
681} 837}
682 838
683############################################################################# 839#############################################################################
684 840
685package CFClient::UI::ViewPort; 841package CFClient::UI::ViewPort;
686 842
687our @ISA = CFClient::UI::Window::; 843our @ISA = CFClient::UI::Window::;
688 844
845sub new {
846 my $class = shift;
847
848 $class->SUPER::new (
849 scroll_x => 0,
850 scroll_y => 1,
851 @_,
852 )
853}
854
689sub size_request { 855sub size_request {
690 my ($self) = @_; 856 my ($self) = @_;
691 857
692 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 858 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
693 $self->child->configure (0, 0, @$self{qw(child_w child_h)});
694 859
695 @$self{qw(child_w child_h)} 860 $w = 10 if $self->{scroll_x};
861 $h = 10 if $self->{scroll_y};
862
863 ($w, $h)
696} 864}
697 865
698sub size_allocate { 866sub size_allocate {
699 my ($self, $w, $h) = @_; 867 my ($self, $w, $h) = @_;
700 868
869 my $child = $self->child;
870
871 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
872 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
873
874 $self->child->configure (0, 0, $w, $h);
701 $self->update; 875 $self->update;
702} 876}
703 877
704sub set_offset { 878sub set_offset {
705 my ($self, $x, $y) = @_; 879 my ($self, $x, $y) = @_;
… …
756 my $class = shift; 930 my $class = shift;
757 931
758 my $self; 932 my $self;
759 933
760 my $slider = new CFClient::UI::Slider 934 my $slider = new CFClient::UI::Slider
761 vertical => 1, 935 vertical => 1,
762 range => [0, 0, 1, 0.01], # HACK fix 936 range => [0, 0, 1, 0.01], # HACK fix
763 connect_changed => sub { 937 on_changed => sub {
764 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h})); 938 $self->{vp}->set_offset (0, $_[1]);
765 }, 939 },
766 ; 940 ;
767 941
768 $self = $class->SUPER::new ( 942 $self = $class->SUPER::new (
769 vp => (new CFClient::UI::ViewPort), 943 vp => (new CFClient::UI::ViewPort expand => 1),
770 slider => $slider, 944 slider => $slider,
771 @_, 945 @_,
772 ); 946 );
773 947
774 $self->{vp}->add ($self->{scrolled}); 948 $self->{vp}->add ($self->{scrolled});
… …
776 $self->add ($self->{slider}); 950 $self->add ($self->{slider});
777 951
778 $self 952 $self
779} 953}
780 954
955sub update {
956 my ($self) = @_;
957
958 $self->SUPER::update;
959
960 # todo: overwrite size_allocate of child
961 my $child = $self->{vp}->child;
962 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
963}
964
965sub size_allocate {
966 my ($self, $w, $h) = @_;
967
968 $self->SUPER::size_allocate ($w, $h);
969
970 my $child = $self->{vp}->child;
971 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
972}
973
781#TODO# update range on size_allocate depeneing on child 974#TODO# update range on size_allocate depending on child
782# update viewport offset on scroll 975# update viewport offset on scroll
783 976
784############################################################################# 977#############################################################################
785 978
786package CFClient::UI::Frame; 979package CFClient::UI::Frame;
… …
790use CFClient::OpenGL; 983use CFClient::OpenGL;
791 984
792sub new { 985sub new {
793 my $class = shift; 986 my $class = shift;
794 987
795 my $self = $class->SUPER::new ( 988 $class->SUPER::new (
796 bg => [1, 1, 1, 1], 989 bg => undef,
797 border_bg => [1, 1, 1, 1],
798 border => 0.8,
799 @_ 990 @_,
800 ); 991 )
801
802 $self
803} 992}
804 993
805sub _draw { 994sub _draw {
806 my ($self) = @_; 995 my ($self) = @_;
807 996
808 my ($w, $h) = ($self->{w}, $self->{h}); 997 if ($self->{bg}) {
998 my ($w, $h) = @$self{qw(w h)};
809 999
810 glEnable GL_BLEND; 1000 glEnable GL_BLEND;
811 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1001 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
812 glEnable GL_TEXTURE_2D; 1002 glColor @{ $self->{bg} };
813 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
814 1003
815# glBegin GL_QUADS; 1004 glBegin GL_QUADS;
816# glColor 0, 0, 0, 0;
817# glVertex 0 , 0; 1005 glVertex 0 , 0;
818# glVertex 0 , $h; 1006 glVertex 0 , $h;
819# glVertex $w, $h; 1007 glVertex $w, $h;
820# glVertex $w, 0; 1008 glVertex $w, 0;
821# glEnd; 1009 glEnd;
822 1010
823
824 $self->child->draw;
825 glDisable GL_BLEND; 1011 glDisable GL_BLEND;
826 glDisable GL_TEXTURE_2D; 1012 }
1013
1014 $self->SUPER::_draw;
827} 1015}
828 1016
829############################################################################# 1017#############################################################################
830 1018
831package CFClient::UI::FancyFrame; 1019package CFClient::UI::FancyFrame;
832 1020
833our @ISA = CFClient::UI::Bin::; 1021our @ISA = CFClient::UI::Bin::;
834 1022
835use CFClient::OpenGL; 1023use CFClient::OpenGL;
836 1024
837my @tex = 1025my $bg =
1026 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1027 mipmap => 1, wrap => 1;
1028
1029my @border =
838 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1030 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
839 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1031 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
840 1032
841sub new { 1033sub new {
842 my $class = shift; 1034 my $class = shift;
843 1035
844 # TODO: user_x, user_y, overwrite moveto?
845
846 my $self = $class->SUPER::new ( 1036 my $self = $class->SUPER::new (
847 bg => [1, 1, 1, 1], 1037 bg => [1, 1, 1, 1],
848 border_bg => [1, 1, 1, 1], 1038 border_bg => [1, 1, 1, 1],
849 border => 0.6, 1039 border => 0.6,
850 can_events => 1, 1040 can_events => 1,
1041 min_w => 16,
1042 min_h => 16,
851 @_ 1043 @_
852 ); 1044 );
853 1045
854 $self->{title} &&= new CFClient::UI::Label 1046 $self->{title} &&= new CFClient::UI::Label
855 align => 0, 1047 align => 0,
… …
879 my ($self, $w, $h) = @_; 1071 my ($self, $w, $h) = @_;
880 1072
881 $h -= List::Util::max 0, $self->border * 2; 1073 $h -= List::Util::max 0, $self->border * 2;
882 $w -= List::Util::max 0, $self->border * 2; 1074 $w -= List::Util::max 0, $self->border * 2;
883 1075
884 $self->{title}->configure ($self->border, $self->border - $::FONTSIZE * 2, $w, $::FONTSIZE * 2) 1076 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
885 if $self->{title}; 1077 if $self->{title};
886 1078
887 $self->child->configure ($self->border, $self->border, $w, $h); 1079 $self->child->configure ($self->border, $self->border, $w, $h);
888} 1080}
889 1081
… …
908 my ($ev, $x, $y) = @_; 1100 my ($ev, $x, $y) = @_;
909 1101
910 my $dx = $ev->{x} - $ox; 1102 my $dx = $ev->{x} - $ox;
911 my $dy = $ev->{y} - $oy; 1103 my $dy = $ev->{y} - $oy;
912 1104
913 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1105 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
914 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1106 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1107
1108 $self->realloc;
915 $self->move ($wx + $dx * $mx, $wy + $dy * $my); 1109 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
916 $self->check_size;
917 }; 1110 };
918 1111
919 } elsif ($lr ^ $td) { 1112 } elsif ($lr ^ $td) {
920 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1113 my ($ox, $oy) = ($ev->{x}, $ev->{y});
921 my ($bx, $by) = ($self->{x}, $self->{y}); 1114 my ($bx, $by) = ($self->{x}, $self->{y});
… …
923 $self->{motion} = sub { 1116 $self->{motion} = sub {
924 my ($ev, $x, $y) = @_; 1117 my ($ev, $x, $y) = @_;
925 1118
926 ($x, $y) = ($ev->{x}, $ev->{y}); 1119 ($x, $y) = ($ev->{x}, $ev->{y});
927 1120
928 $self->move ($bx + $x - $ox, $by + $y - $oy); 1121 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
929 $self->update;
930 }; 1122 };
931 } 1123 }
932} 1124}
933 1125
934sub button_up { 1126sub button_up {
… …
947 my ($self) = @_; 1139 my ($self) = @_;
948 1140
949 my ($w, $h ) = ($self->{w}, $self->{h}); 1141 my ($w, $h ) = ($self->{w}, $self->{h});
950 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1142 my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
951 1143
952 glEnable GL_BLEND;
953 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
954 glEnable GL_TEXTURE_2D; 1144 glEnable GL_TEXTURE_2D;
955 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1145 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
956 1146
957 my $border = $self->border; 1147 my $border = $self->border;
958 1148
959 glColor @{ $self->{border_bg} }; 1149 glColor @{ $self->{border_bg} };
960 $tex[1]->draw_quad (0, 0, $w, $border); 1150 $border[0]->draw_quad_alpha (0, 0, $w, $border);
961 $tex[3]->draw_quad (0, $border, $border, $ch); 1151 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
962 $tex[2]->draw_quad ($w - $border, $border, $border, $ch); 1152 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
963 $tex[4]->draw_quad (0, $h - $border, $w, $border); 1153 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
964 1154
965 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1155 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
966 my $bg = $tex[0]; 1156 glColor @{ $self->{bg} };
967 1157
968 # TODO: repeat texture not scale 1158 # TODO: repeat texture not scale
1159 # solve this better(?)
969 my $rep_x = $cw / $bg->{w}; 1160 $bg->{s} = $cw / $bg->{w};
970 my $rep_y = $ch / $bg->{h}; 1161 $bg->{t} = $ch / $bg->{h};
971
972 glColor @{ $self->{bg} };
973
974 $bg->{s} = $rep_x;
975 $bg->{t} = $rep_y;
976 $bg->{wrap_mode} = 1;
977 $bg->draw_quad ($border, $border, $cw, $ch); 1162 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1163 }
978 1164
979 glDisable GL_TEXTURE_2D; 1165 glDisable GL_TEXTURE_2D;
980 glDisable GL_BLEND;
981 }
982 1166
983 $self->{title}->draw if $self->{title}; 1167 $self->{title}->draw if $self->{title};
984 1168
985 $self->child->draw; 1169 $self->child->draw;
986} 1170}
… …
998sub new { 1182sub new {
999 my $class = shift; 1183 my $class = shift;
1000 1184
1001 $class->SUPER::new ( 1185 $class->SUPER::new (
1002 col_expand => [], 1186 col_expand => [],
1003 @_ 1187 @_,
1004 ) 1188 )
1189}
1190
1191sub children {
1192 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1005} 1193}
1006 1194
1007sub add { 1195sub add {
1008 my ($self, $x, $y, $child) = @_; 1196 my ($self, $x, $y, $child) = @_;
1009 1197
1010 $child->set_parent ($self); 1198 $child->set_parent ($self);
1011 $self->{children}[$y][$x] = $child; 1199 $self->{children}[$y][$x] = $child;
1012 1200
1013 $child->check_size; 1201 $self->realloc;
1014} 1202}
1015 1203
1016sub children {
1017 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1018}
1019
1020# TODO: move to container class maybe? send childs a signal on removal? 1204# TODO: move to container class maybe? send children a signal on removal?
1021sub clear { 1205sub clear {
1022 my ($self) = @_; 1206 my ($self) = @_;
1023 1207
1024 my @children = $self->children; 1208 my @children = $self->children;
1025 delete $self->{children}; 1209 delete $self->{children};
… …
1027 for (@children) { 1211 for (@children) {
1028 delete $_->{parent}; 1212 delete $_->{parent};
1029 $_->hide; 1213 $_->hide;
1030 } 1214 }
1031 1215
1032 $self->update; 1216 $self->realloc;
1033} 1217}
1034 1218
1035sub get_wh { 1219sub get_wh {
1036 my ($self) = @_; 1220 my ($self) = @_;
1037 1221
… …
1068sub size_allocate { 1252sub size_allocate {
1069 my ($self, $w, $h) = @_; 1253 my ($self, $w, $h) = @_;
1070 1254
1071 my ($ws, $hs) = $self->get_wh; 1255 my ($ws, $hs) = $self->get_wh;
1072 1256
1073 my $req_w = sum @$ws; 1257 my $req_w = (sum @$ws) || 1;
1074 my $req_h = sum @$hs; 1258 my $req_h = (sum @$hs) || 1;
1075 1259
1076 # TODO: nicer code && do row_expand 1260 # TODO: nicer code && do row_expand
1077 my @col_expand = @{$self->{col_expand}}; 1261 my @col_expand = @{$self->{col_expand}};
1078 @col_expand = (1) x @$ws unless @col_expand; 1262 @col_expand = (1) x @$ws unless @col_expand;
1079 my $col_expand = (sum @col_expand) || 1; 1263 my $col_expand = (sum @col_expand) || 1;
… …
1133 } 1317 }
1134} 1318}
1135 1319
1136############################################################################# 1320#############################################################################
1137 1321
1138package CFClient::UI::HBox; 1322package CFClient::UI::Box;
1139
1140# TODO: wrap into common Box base class
1141 1323
1142our @ISA = CFClient::UI::Container::; 1324our @ISA = CFClient::UI::Container::;
1143 1325
1144sub size_request { 1326sub size_request {
1145 my ($self) = @_; 1327 my ($self) = @_;
1146 1328
1147 my @alloc = map [$_->size_request], @{$self->{children}}; 1329 $self->{vertical}
1148 1330 ? (
1149 ( 1331 (List::Util::max map $_->{req_w}, @{$self->{children}}),
1150 (List::Util::sum map $_->[0], @alloc), 1332 (List::Util::sum map $_->{req_h}, @{$self->{children}}),
1151 (List::Util::max map $_->[1], @alloc), 1333 )
1152 ) 1334 : (
1335 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1336 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1337 )
1153} 1338}
1154 1339
1155sub size_allocate { 1340sub size_allocate {
1156 my ($self, $w, $h) = @_; 1341 my ($self, $w, $h) = @_;
1157 1342
1158 ($h, $w) = ($w, $h); 1343 my $space = $self->{vertical} ? $h : $w;
1159
1160 my $children = $self->{children}; 1344 my $children = $self->{children};
1161 1345
1162 my @h = map $_->{req_w}, @$children; 1346 my @req;
1163 1347
1164 my $req_h = List::Util::sum @h; 1348 if ($self->{homogeneous}) {
1165 1349 @req = ($space / (@$children || 1)) x @$children;
1166 if ($req_h > $h) {
1167 # ah well, not enough space
1168 $_ *= $h / $req_h for @h;
1169 } else { 1350 } else {
1351 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;
1352 my $req = List::Util::sum @req;
1353
1354 if ($req > $space) {
1355 # ah well, not enough space
1356 $_ *= $space / $req for @req;
1357 } else {
1170 my $exp = List::Util::sum map $_->{expand}, @$children; 1358 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1171 $exp ||= 1;
1172 1359
1360 $space = ($space - $req) / $expand; # remaining space to give away
1361
1362 $req[$_] += $space * $children->[$_]{expand}
1173 for (0 .. $#$children) { 1363 for 0 .. $#$children;
1174 my $child = $children->[$_];
1175
1176 my $alloc_h = $h[$_];
1177 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1178 $h[$_] = $alloc_h;
1179 } 1364 }
1180 } 1365 }
1181 1366
1182 CFClient::UI::harmonize \@h; 1367 CFClient::UI::harmonize \@req;
1183 1368
1184 my $y = 0; 1369 my $pos = 0;
1185 for (0 .. $#$children) { 1370 for (0 .. $#$children) {
1186 my $child = $children->[$_];
1187 my $h = $h[$_]; 1371 my $alloc = $req[$_];
1188 $child->configure ($y, 0, $h, $w); 1372 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1189 1373
1190 $y += $h; 1374 $pos += $alloc;
1191 } 1375 }
1192 1376
1193 1 1377 1
1194} 1378}
1195 1379
1196############################################################################# 1380#############################################################################
1197 1381
1382package CFClient::UI::HBox;
1383
1384our @ISA = CFClient::UI::Box::;
1385
1386sub new {
1387 my $class = shift;
1388
1389 $class->SUPER::new (
1390 vertical => 0,
1391 @_,
1392 )
1393}
1394
1395#############################################################################
1396
1198package CFClient::UI::VBox; 1397package CFClient::UI::VBox;
1199 1398
1200# TODO: wrap into common Box base class
1201
1202our @ISA = CFClient::UI::Container::; 1399our @ISA = CFClient::UI::Box::;
1203 1400
1204sub size_request { 1401sub new {
1205 my ($self) = @_; 1402 my $class = shift;
1206 1403
1207 my @alloc = map [$_->size_request], @{$self->{children}}; 1404 $class->SUPER::new (
1208 1405 vertical => 1,
1209 ( 1406 @_,
1210 (List::Util::max map $_->[0], @alloc),
1211 (List::Util::sum map $_->[1], @alloc),
1212 ) 1407 )
1213} 1408}
1214 1409
1215sub size_allocate {
1216 my ($self, $w, $h) = @_;
1217
1218 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1219
1220 my $children = $self->{children};
1221
1222 my @h = map $_->{req_h}, @$children;
1223
1224 my $req_h = List::Util::sum @h;
1225
1226 if ($req_h > $h) {
1227 # ah well, not enough space
1228 $_ *= $h / $req_h for @h;
1229 } else {
1230 my $exp = List::Util::sum map $_->{expand}, @$children;
1231 $exp ||= 1;
1232
1233 for (0 .. $#$children) {
1234 my $child = $children->[$_];
1235
1236 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1237 }
1238 }
1239
1240 CFClient::UI::harmonize \@h;
1241
1242 my $y = 0;
1243 for (0 .. $#$children) {
1244 my $child = $children->[$_];
1245 my $h = $h[$_];
1246 $child->configure (0, $y, $w, $h);
1247
1248 $y += $h;
1249 }
1250
1251 1
1252}
1253
1254############################################################################# 1410#############################################################################
1255 1411
1256package CFClient::UI::Label; 1412package CFClient::UI::Label;
1257 1413
1258our @ISA = CFClient::UI::Base::; 1414our @ISA = CFClient::UI::DrawBG::;
1259 1415
1260use CFClient::OpenGL; 1416use CFClient::OpenGL;
1261 1417
1262sub new { 1418sub new {
1263 my ($class, %arg) = @_; 1419 my ($class, %arg) = @_;
1264 1420
1265 my $self = $class->SUPER::new ( 1421 my $self = $class->SUPER::new (
1266 fg => [1, 1, 1], 1422 fg => [1, 1, 1],
1423 #bg => none
1424 #active_bg => none
1267 #font => default_font 1425 #font => default_font
1426 #text => initial text
1427 #markup => initial narkup
1428 #max_w => maximum pixel width
1429 ellipsise => 3, # end
1430 layout => (new CFClient::Layout),
1268 fontsize => 1, 1431 fontsize => 1,
1269 text => "",
1270 align => -1, 1432 align => -1,
1271 valign => -1, 1433 valign => -1,
1272 padding => 2, 1434 padding_x => 2,
1273 layout => new CFClient::Layout, 1435 padding_y => 2,
1274 can_events => 0, 1436 can_events => 0,
1275 %arg 1437 %arg
1276 ); 1438 );
1277 1439
1278 if (exists $self->{template}) { 1440 if (exists $self->{template}) {
1279 my $layout = new CFClient::Layout; 1441 my $layout = new CFClient::Layout;
1280 $layout->set_text (delete $self->{template}); 1442 $layout->set_text (delete $self->{template});
1281 $self->{template} = $layout; 1443 $self->{template} = $layout;
1282 } 1444 }
1283 1445
1284 $self->set_text (delete $self->{text}) if exists $self->{text}; 1446 if (exists $self->{markup}) {
1285 $self->set_markup (delete $self->{markup}) if exists $self->{markup}; 1447 $self->set_markup (delete $self->{markup});
1448 } else {
1449 $self->set_text (delete $self->{text});
1450 }
1286 1451
1287 $self 1452 $self
1288} 1453}
1289 1454
1290sub escape { 1455sub escape($) {
1291 local $_ = $_[1]; 1456 local $_ = $_[0];
1292 1457
1293 s/&/&amp;/g; 1458 s/&/&amp;/g;
1294 s/>/&gt;/g; 1459 s/>/&gt;/g;
1295 s/</&lt;/g; 1460 s/</&lt;/g;
1296 1461
1297 $_[1] 1462 $_
1298} 1463}
1299 1464
1300sub update { 1465sub update {
1301 my ($self) = @_; 1466 my ($self) = @_;
1302 1467
… …
1308 my ($self, $text) = @_; 1473 my ($self, $text) = @_;
1309 1474
1310 return if $self->{text} eq "T$text"; 1475 return if $self->{text} eq "T$text";
1311 $self->{text} = "T$text"; 1476 $self->{text} = "T$text";
1312 1477
1478 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1313 $self->{layout}->set_text ($text); 1479 $self->{layout}->set_text ($text);
1314 1480
1481 $self->realloc;
1315 $self->update; 1482 $self->update;
1316 $self->check_size;
1317} 1483}
1318 1484
1319sub set_markup { 1485sub set_markup {
1320 my ($self, $markup) = @_; 1486 my ($self, $markup) = @_;
1321 1487
1322 return if $self->{text} eq "M$markup"; 1488 return if $self->{text} eq "M$markup";
1323 $self->{text} = "M$markup"; 1489 $self->{text} = "M$markup";
1324 1490
1491 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1492
1493 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1325 $self->{layout}->set_markup ($markup); 1494 $self->{layout}->set_markup ($markup);
1326 1495
1496 $self->realloc;
1327 $self->update; 1497 $self->update;
1328 $self->check_size;
1329} 1498}
1330 1499
1331sub size_request { 1500sub size_request {
1332 my ($self) = @_; 1501 my ($self) = @_;
1333 1502
1334 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1503 $self->{layout}->set_font ($self->{font}) if $self->{font};
1335 $self->{layout}->set_width ($self->{max_w} || -1); 1504 $self->{layout}->set_width ($self->{max_w} || -1);
1505 $self->{layout}->set_ellipsise ($self->{ellipsise});
1506 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1336 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1507 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1337 1508
1338 my ($w, $h) = $self->{layout}->size; 1509 my ($w, $h) = $self->{layout}->size;
1339 1510
1340 if (exists $self->{template}) { 1511 if (exists $self->{template}) {
… …
1345 1516
1346 $w = List::Util::max $w, $w2; 1517 $w = List::Util::max $w, $w2;
1347 $h = List::Util::max $h, $h2; 1518 $h = List::Util::max $h, $h2;
1348 } 1519 }
1349 1520
1350 ( 1521 ($w, $h)
1351 $w + $self->{padding} * 2,
1352 $h + $self->{padding} * 2,
1353 )
1354} 1522}
1355 1523
1356sub size_allocate { 1524sub size_allocate {
1357 my ($self, $w, $h) = @_; 1525 my ($self, $w, $h) = @_;
1358 1526
… …
1363 my ($self, $fontsize) = @_; 1531 my ($self, $fontsize) = @_;
1364 1532
1365 $self->{fontsize} = $fontsize; 1533 $self->{fontsize} = $fontsize;
1366 delete $self->{texture}; 1534 delete $self->{texture};
1367 1535
1368 $self->update; 1536 $self->realloc;
1369 $self->check_size;
1370} 1537}
1371 1538
1372sub _draw { 1539sub _draw {
1373 my ($self) = @_; 1540 my ($self) = @_;
1374 1541
1542 $self->SUPER::_draw; # draw background, if applicable
1543
1375 my $tex = $self->{texture} ||= do { 1544 my $tex = $self->{texture} ||= do {
1545 $self->{layout}->set_foreground (@{$self->{fg}});
1376 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1546 $self->{layout}->set_font ($self->{font}) if $self->{font};
1377 $self->{layout}->set_width ($self->{w}); 1547 $self->{layout}->set_width ($self->{w});
1548 $self->{layout}->set_ellipsise ($self->{ellipsise});
1549 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1378 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1550 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1551
1379 new_from_layout CFClient::Texture $self->{layout} 1552 my $tex = new_from_layout CFClient::Texture $self->{layout};
1553
1554 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1555 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1556 : ($self->{w} - $tex->{w}) * 0.5);
1557
1558 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1559 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1560 : ($self->{h} - $tex->{h}) * 0.5);
1561
1562 $tex
1380 }; 1563 };
1381 1564
1382 glEnable GL_BLEND;
1383 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1384 glEnable GL_TEXTURE_2D; 1565 glEnable GL_TEXTURE_2D;
1385 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1566 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1386 1567
1568 if ($tex->{format} == GL_ALPHA) {
1387 glColor @{$self->{fg}}; 1569 glColor @{$self->{fg}};
1388
1389 $self->{ox} = int (
1390 $self->{align} < 0 ? $self->{padding}
1391 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1392 : ($self->{w} - $tex->{w}) * 0.5
1393 );
1394
1395 $self->{oy} = int (
1396 $self->{valign} < 0 ? $self->{padding}
1397 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1398 : ($self->{h} - $tex->{h}) * 0.5
1399 );
1400
1401 $tex->draw_quad ($self->{ox}, $self->{oy}); 1570 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1571 } else {
1572 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1573 }
1402 1574
1403 glDisable GL_TEXTURE_2D; 1575 glDisable GL_TEXTURE_2D;
1404 glDisable GL_BLEND;
1405} 1576}
1406 1577
1407############################################################################# 1578#############################################################################
1408 1579
1409package CFClient::UI::EntryBase; 1580package CFClient::UI::EntryBase;
… …
1422 active_fg => [0, 0, 0], 1593 active_fg => [0, 0, 0],
1423 can_hover => 1, 1594 can_hover => 1,
1424 can_focus => 1, 1595 can_focus => 1,
1425 valign => 0, 1596 valign => 0,
1426 can_events => 1, 1597 can_events => 1,
1598 #text => ...
1427 @_ 1599 @_
1428 ) 1600 )
1429} 1601}
1430 1602
1431sub _set_text { 1603sub _set_text {
… …
1441 $self->{text} = $text; 1613 $self->{text} = $text;
1442 1614
1443 $text =~ s/./*/g if $self->{hidden}; 1615 $text =~ s/./*/g if $self->{hidden};
1444 $self->{layout}->set_text ("$text "); 1616 $self->{layout}->set_text ("$text ");
1445 1617
1446 $self->emit (changed => $self->{text}); 1618 $self->_emit (changed => $self->{text});
1619}
1620
1621sub set_text {
1622 my ($self, $text) = @_;
1623
1624 $self->{cursor} = length $text;
1625 $self->_set_text ($text);
1626
1627 $self->realloc;
1447} 1628}
1448 1629
1449sub get_text { 1630sub get_text {
1450 $_[0]{text} 1631 $_[0]{text}
1451} 1632}
… …
1454 my ($self) = @_; 1635 my ($self) = @_;
1455 1636
1456 my ($w, $h) = $self->SUPER::size_request; 1637 my ($w, $h) = $self->SUPER::size_request;
1457 1638
1458 ($w + 1, $h) # add 1 for cursor 1639 ($w + 1, $h) # add 1 for cursor
1459}
1460
1461sub size_allocate {
1462 my ($self, $w, $h) = @_;
1463
1464 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1465}
1466
1467sub set_text {
1468 my ($self, $text) = @_;
1469
1470 $self->{cursor} = length $text;
1471 $self->_set_text ($text);
1472 $self->update;
1473} 1640}
1474 1641
1475sub key_down { 1642sub key_down {
1476 my ($self, $ev) = @_; 1643 my ($self, $ev) = @_;
1477 1644
… …
1479 my $sym = $ev->{sym}; 1646 my $sym = $ev->{sym};
1480 my $uni = $ev->{unicode}; 1647 my $uni = $ev->{unicode};
1481 1648
1482 my $text = $self->get_text; 1649 my $text = $self->get_text;
1483 1650
1484 if ($sym == 8) { 1651 if ($uni == 8) {
1485 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1652 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1486 } elsif ($sym == 127) { 1653 } elsif ($uni == 127) {
1487 substr $text, $self->{cursor}, 1, ""; 1654 substr $text, $self->{cursor}, 1, "";
1488 } elsif ($sym == CFClient::SDLK_LEFT) { 1655 } elsif ($sym == CFClient::SDLK_LEFT) {
1489 --$self->{cursor} if $self->{cursor}; 1656 --$self->{cursor} if $self->{cursor};
1490 } elsif ($sym == CFClient::SDLK_RIGHT) { 1657 } elsif ($sym == CFClient::SDLK_RIGHT) {
1491 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1658 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1492 } elsif ($sym == CFClient::SDLK_HOME) { 1659 } elsif ($sym == CFClient::SDLK_HOME) {
1493 $self->{cursor} = 0; 1660 $self->{cursor} = 0;
1494 } elsif ($sym == CFClient::SDLK_END) { 1661 } elsif ($sym == CFClient::SDLK_END) {
1495 $self->{cursor} = length $text; 1662 $self->{cursor} = length $text;
1496 } elsif ($sym == 27) { 1663 } elsif ($uni == 27) {
1497 $self->emit ('escape'); 1664 $self->_emit ('escape');
1498 } elsif ($uni) { 1665 } elsif ($uni) {
1499 substr $text, $self->{cursor}++, 0, chr $uni; 1666 substr $text, $self->{cursor}++, 0, chr $uni;
1500 } 1667 }
1501 1668
1502 $self->_set_text ($text); 1669 $self->_set_text ($text);
1503 $self->update; 1670
1671 $self->realloc;
1504} 1672}
1505 1673
1506sub focus_in { 1674sub focus_in {
1507 my ($self) = @_; 1675 my ($self) = @_;
1508 1676
… …
1588 if ($sym == 13) { 1756 if ($sym == 13) {
1589 unshift @{$self->{history}}, 1757 unshift @{$self->{history}},
1590 my $txt = $self->get_text; 1758 my $txt = $self->get_text;
1591 $self->{history_pointer} = -1; 1759 $self->{history_pointer} = -1;
1592 $self->{history_saveback} = ''; 1760 $self->{history_saveback} = '';
1593 $self->emit (activate => $txt); 1761 $self->_emit (activate => $txt);
1594 $self->update; 1762 $self->update;
1595 1763
1596 } elsif ($sym == CFClient::SDLK_UP) { 1764 } elsif ($sym == CFClient::SDLK_UP) {
1597 if ($self->{history_pointer} < 0) { 1765 if ($self->{history_pointer} < 0) {
1598 $self->{history_saveback} = $self->get_text; 1766 $self->{history_saveback} = $self->get_text;
… …
1635 1803
1636sub new { 1804sub new {
1637 my $class = shift; 1805 my $class = shift;
1638 1806
1639 $class->SUPER::new ( 1807 $class->SUPER::new (
1640 padding => 4, 1808 padding_x => 4,
1809 padding_y => 4,
1641 fg => [1, 1, 1], 1810 fg => [1, 1, 1],
1642 bg => [1, 1, 1, 0.2],
1643 active_fg => [0, 0, 1], 1811 active_fg => [0, 0, 1],
1644 can_hover => 1, 1812 can_hover => 1,
1645 align => 0, 1813 align => 0,
1646 valign => 0, 1814 valign => 0,
1647 can_events => 1, 1815 can_events => 1,
1648 @_ 1816 @_
1649 ) 1817 )
1650} 1818}
1651 1819
1820sub activate { }
1821
1652sub button_up { 1822sub button_up {
1653 my ($self, $ev, $x, $y) = @_; 1823 my ($self, $ev, $x, $y) = @_;
1654 1824
1825 $self->emit ("activate")
1655 if ($x >= 0 && $x < $self->{w} 1826 if $x >= 0 && $x < $self->{w}
1656 && $y >= 0 && $y < $self->{h}) { 1827 && $y >= 0 && $y < $self->{h};
1657 $self->emit ("activate");
1658 }
1659} 1828}
1660 1829
1661sub _draw { 1830sub _draw {
1662 my ($self) = @_; 1831 my ($self) = @_;
1663 1832
… …
1665 1834
1666 if ($GRAB == $self) { 1835 if ($GRAB == $self) {
1667 $self->{fg} = $self->{active_fg}; 1836 $self->{fg} = $self->{active_fg};
1668 } 1837 }
1669 1838
1670 glEnable GL_BLEND;
1671 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1672 glEnable GL_TEXTURE_2D; 1839 glEnable GL_TEXTURE_2D;
1673 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1840 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1674 glColor 0, 0, 0, 1; 1841 glColor 0, 0, 0, 1;
1675 1842
1676 $tex[0]->draw_quad (0, 0, $self->{w}, $self->{h}); 1843 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1677 1844
1678 glDisable GL_TEXTURE_2D; 1845 glDisable GL_TEXTURE_2D;
1679 glDisable GL_BLEND;
1680 1846
1681 $self->SUPER::_draw; 1847 $self->SUPER::_draw;
1682} 1848}
1683 1849
1684############################################################################# 1850#############################################################################
… …
1695 1861
1696sub new { 1862sub new {
1697 my $class = shift; 1863 my $class = shift;
1698 1864
1699 $class->SUPER::new ( 1865 $class->SUPER::new (
1700 padding => 2, 1866 padding_x => 2,
1867 padding_y => 2,
1701 fg => [1, 1, 1], 1868 fg => [1, 1, 1],
1702 active_fg => [1, 1, 0], 1869 active_fg => [1, 1, 0],
1870 bg => [0, 0, 0, 0.2],
1871 active_bg => [1, 1, 1, 0.5],
1703 state => 0, 1872 state => 0,
1704 can_hover => 1, 1873 can_hover => 1,
1705 @_ 1874 @_
1706 ) 1875 )
1707} 1876}
1708 1877
1709sub size_request { 1878sub size_request {
1710 my ($self) = @_; 1879 my ($self) = @_;
1711 1880
1712 ($self->{padding} * 2 + 6) x 2 1881 (6) x 2
1713} 1882}
1714 1883
1715sub button_down { 1884sub button_down {
1716 my ($self, $ev, $x, $y) = @_; 1885 my ($self, $ev, $x, $y) = @_;
1717 1886
1718 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1887 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1719 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1888 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1720 $self->{state} = !$self->{state}; 1889 $self->{state} = !$self->{state};
1721 $self->emit (changed => $self->{state}); 1890 $self->_emit (changed => $self->{state});
1722 } 1891 }
1723} 1892}
1724 1893
1725sub _draw { 1894sub _draw {
1726 my ($self) = @_; 1895 my ($self) = @_;
1727 1896
1728 $self->SUPER::_draw; 1897 $self->SUPER::_draw;
1729 1898
1730 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 1899 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1731 1900
1732 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 1901 my ($w, $h) = @$self{qw(w h)};
1902
1903 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1733 1904
1734 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1905 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1735 1906
1736 glEnable GL_BLEND; 1907 my $tex = $self->{state} ? $tex[1] : $tex[0];
1908
1737 glEnable GL_TEXTURE_2D; 1909 glEnable GL_TEXTURE_2D;
1738 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1739
1740 my $tex = $self->{state} ? $tex[1] : $tex[0];
1741
1742 $tex->draw_quad (0, 0, $s, $s); 1910 $tex->draw_quad_alpha (0, 0, $s, $s);
1743
1744 glDisable GL_TEXTURE_2D; 1911 glDisable GL_TEXTURE_2D;
1745 glDisable GL_BLEND;
1746} 1912}
1747 1913
1748############################################################################# 1914#############################################################################
1749 1915
1750package CFClient::UI::Image; 1916package CFClient::UI::Image;
… …
1793 glTranslate 0, -$self->{w}, 0; 1959 glTranslate 0, -$self->{w}, 0;
1794 1960
1795 ($w, $h) = ($h, $w); 1961 ($w, $h) = ($h, $w);
1796 } 1962 }
1797 1963
1798 glEnable GL_BLEND;
1799 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1800 glEnable GL_TEXTURE_2D; 1964 glEnable GL_TEXTURE_2D;
1801 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1965 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1802 1966
1803 $tex->draw_quad (0, 0, $w, $h); 1967 $tex->draw_quad_alpha (0, 0, $w, $h);
1804 1968
1805 glDisable GL_BLEND;
1806 glDisable GL_TEXTURE_2D; 1969 glDisable GL_TEXTURE_2D;
1807} 1970}
1808 1971
1809############################################################################# 1972#############################################################################
1810 1973
… …
1999 qw(s1_slider.png s1_slider_bg.png); 2162 qw(s1_slider.png s1_slider_bg.png);
2000 2163
2001sub new { 2164sub new {
2002 my $class = shift; 2165 my $class = shift;
2003 2166
2004 # range [value, low, high, page] 2167 # range [value, low, high, page, unit]
2005 2168
2006 # TODO: 0-width page 2169 # TODO: 0-width page
2007 # TODO: req_w/h are wrong with vertical 2170 # TODO: req_w/h are wrong with vertical
2008 # TODO: calculations are off 2171 # TODO: calculations are off
2009 my $self = $class->SUPER::new ( 2172 my $self = $class->SUPER::new (
2010 fg => [1, 1, 1], 2173 fg => [1, 1, 1],
2011 active_fg => [0, 0, 0], 2174 active_fg => [0, 0, 0],
2175 bg => [0, 0, 0, 0.2],
2176 active_bg => [1, 1, 1, 0.5],
2012 range => [0, 0, 100, 10], 2177 range => [0, 0, 100, 10, 0],
2013 req_w => $::WIDTH / 80, 2178 min_w => $::WIDTH / 80,
2014 req_h => $::WIDTH / 80, 2179 min_h => $::WIDTH / 80,
2015 vertical => 0, 2180 vertical => 0,
2016 can_hover => 1, 2181 can_hover => 1,
2017 inner_pad => 5, 2182 inner_pad => 0.02,
2018 @_ 2183 @_
2019 ); 2184 );
2020 2185
2186 $self->set_value ($self->{range}[0]);
2187 $self->update;
2188
2021 $self 2189 $self
2022} 2190}
2023 2191
2192sub changed { }
2193
2194sub set_range {
2195 my ($self, $range) = @_;
2196
2197 ($range, $self->{range}) = ($self->{range}, $range);
2198
2199 $self->update
2200 if "@$range" ne "@{$self->{range}}";
2201}
2202
2203sub set_value {
2204 my ($self, $value) = @_;
2205
2206 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2207
2208 $hi = $lo + 1 if $hi <= $lo;
2209
2210 $page = $hi - $lo if $page > $hi - $lo;
2211
2212 $value = $lo if $value < $lo;
2213 $value = $hi - $page if $value > $hi - $page;
2214
2215 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2216 if $unit;
2217
2218 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2219
2220 if ($value != $old_value) {
2221 $self->_emit (changed => $value);
2222 $self->update;
2223 }
2224}
2225
2024sub size_request { 2226sub size_request {
2025 my ($self) = @_; 2227 my ($self) = @_;
2026 2228
2027 my $w = $self->{req_w}; 2229 ($self->{req_w}, $self->{req_h})
2028 my $h = $self->{req_h};
2029
2030 $self->{vertical} ? ($h, $w) : ($w, $h)
2031} 2230}
2032 2231
2033sub button_down { 2232sub button_down {
2034 my ($self, $ev, $x, $y) = @_; 2233 my ($self, $ev, $x, $y) = @_;
2035 2234
2036 $self->SUPER::button_down ($ev, $x, $y); 2235 $self->SUPER::button_down ($ev, $x, $y);
2236
2237 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2238
2037 $self->mouse_motion ($ev, $x, $y); 2239 $self->mouse_motion ($ev, $x, $y);
2038} 2240}
2039 2241
2040sub mouse_motion { 2242sub mouse_motion {
2041 my ($self, $ev, $x, $y) = @_; 2243 my ($self, $ev, $x, $y) = @_;
2042 2244
2043 if ($GRAB == $self) { 2245 if ($GRAB == $self) {
2246 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2247
2248 my (undef, $lo, $hi, $page) = @{$self->{range}};
2249
2250 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2251
2252 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2253 }
2254}
2255
2256sub update {
2257 my ($self) = @_;
2258
2259 $CFClient::UI::ROOT->on_post_alloc ($self => sub {
2260 $self->set_value ($self->{range}[0]);
2261
2044 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2262 my ($value, $lo, $hi, $page) = @{$self->{range}};
2263 my $range = ($hi - $page - $lo) || 1e-100;
2045 2264
2046 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2265 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
2047 2266
2048 my $inner_pad_px = $self->_calc_inner_pad_px ($w); 2267 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
2049 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right 2268 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
2050 2269
2051 $x -= $inner_pad_px; # substract the padding 2270 $value = ($value - $lo) / $range;
2052 $x = $x * ($hi - $lo) / $inner_w + $lo; 2271 $value = $value * $self->{scale} + $self->{offset};
2053 $x = $lo if $x < $lo;
2054 $x = $hi - $page if $x > $hi - $page;
2055 $self->{range}[0] = $x;
2056 2272
2057 $self->emit (changed => $x); 2273 $self->{knob_x} = $value - $knob_w * 0.5;
2058 $self->update; 2274 $self->{knob_w} = $knob_w;
2059 } 2275 });
2060}
2061 2276
2062# the inner_* stuff is for generating a padding for the slider handle, 2277 $self->SUPER::update;
2063# so that the handle doesn't leave the texture. This calculation isn't 100%
2064# correct propably, but it does the job for now
2065sub _calc_inner_pad_px {
2066 my ($self, $w) = @_;
2067 ($w / 100) * $self->{inner_pad} # % to pixels
2068} 2278}
2069 2279
2070sub _draw { 2280sub _draw {
2071 my ($self) = @_; 2281 my ($self) = @_;
2072 2282
2073 $self->SUPER::_draw (); 2283 $self->SUPER::_draw ();
2074 2284
2075 my ($w, $h) = @$self{qw(w h)}; 2285 glScale $self->{w}, $self->{h};
2076 2286
2077 if ($self->{vertical}) { 2287 if ($self->{vertical}) {
2078 # draw a vertical slider like a rotated horizontal slider 2288 # draw a vertical slider like a rotated horizontal slider
2079 2289
2290 glTranslate 1, 0, 0;
2080 glRotate 90, 0, 0, 1; 2291 glRotate 90, 0, 0, 1;
2081 glTranslate 0, -$self->{w}, 0;
2082
2083 ($w, $h) = ($h, $w);
2084 } 2292 }
2085 2293
2086 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2294 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
2087 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2295 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
2088 2296
2089 my ($value, $lo, $hi, $page) = @{$self->{range}};
2090
2091 $hi = $value + 1 if $lo == $hi;
2092
2093 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
2094 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
2095
2096 $page = int $page * $inner_w / ($hi - $lo);
2097 $value = int +($value - $lo) * $inner_w / ($hi - $lo);
2098
2099 $w -= $page;
2100 $page &= ~1;
2101 glTranslate $page * 0.5, 0, 0;
2102 $page ||= 2;
2103
2104 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
2105 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
2106
2107 glEnable GL_BLEND;
2108 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2109 glEnable GL_TEXTURE_2D; 2297 glEnable GL_TEXTURE_2D;
2110 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2298 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2111 2299
2112 # draw background 2300 # draw background
2113 $tex[1]->draw_quad (0, 0, $w, $h); 2301 $tex[1]->draw_quad_alpha (0, 0, 1, 1);
2114 2302
2115 # draw handle 2303 # draw handle
2116 $tex[0]->draw_quad ($knob_a, 0, $knob_b - $knob_a, $h); 2304 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
2117 2305
2118 glDisable GL_BLEND;
2119 glDisable GL_TEXTURE_2D; 2306 glDisable GL_TEXTURE_2D;
2120} 2307}
2308
2309#############################################################################
2310
2311package CFClient::UI::ValSlider;
2312
2313our @ISA = CFClient::UI::HBox::;
2314
2315sub new {
2316 my ($class, %arg) = @_;
2317
2318 my $range = delete $arg{range};
2319
2320 my $self = $class->SUPER::new (
2321 slider => (new CFClient::UI::Slider expand => 1, range => $range),
2322 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),
2323 to_value => sub { shift },
2324 from_value => sub { shift },
2325 %arg,
2326 );
2327
2328 $self->{slider}->connect (changed => sub {
2329 my ($self, $value) = @_;
2330 $self->{parent}{entry}->set_text ($self->{parent}{to_value}->($value));
2331 $self->{parent}->emit (changed => $value);
2332 });
2333
2334# $self->{entry}->connect (changed => sub {
2335# my ($self, $value) = @_;
2336# $self->{parent}{slider}->set_value ($self->{parent}{from_value}->($value));
2337# $self->{parent}->emit (changed => $value);
2338# });
2339
2340 $self->add ($self->{slider}, $self->{entry});
2341
2342 $self->{slider}->emit (changed => $self->{slider}{range}[0]);
2343
2344 $self
2345}
2346
2347sub set_range { shift->{slider}->set_range (@_) }
2348sub set_value { shift->{slider}->set_value (@_) }
2121 2349
2122############################################################################# 2350#############################################################################
2123 2351
2124package CFClient::UI::TextView; 2352package CFClient::UI::TextView;
2125 2353
… …
2134 fontsize => 1, 2362 fontsize => 1,
2135 can_events => 0, 2363 can_events => 0,
2136 #font => default_font 2364 #font => default_font
2137 @_, 2365 @_,
2138 2366
2139 layout => (new CFClient::Layout), 2367 layout => (new CFClient::Layout 1),
2140 par => [], 2368 par => [],
2141 height => 0, 2369 height => 0,
2142 children => [ 2370 children => [
2143 (new CFClient::UI::Empty expand => 1), 2371 (new CFClient::UI::Empty expand => 1),
2144 (new CFClient::UI::Slider vertical => 1), 2372 (new CFClient::UI::Slider vertical => 1),
… …
2155 2383
2156 $self->{fontsize} = $fontsize; 2384 $self->{fontsize} = $fontsize;
2157 $self->reflow; 2385 $self->reflow;
2158} 2386}
2159 2387
2160sub text_height {
2161 my ($self, $text) = @_;
2162
2163 my $layout = $self->{layout};
2164
2165 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2166 $layout->set_width ($self->{children}[0]{w});
2167 $layout->set_text ($text);
2168
2169 ($layout->size)[1]
2170}
2171
2172sub reflow {
2173 my ($self) = @_;
2174
2175 $self->{need_reflow}++;
2176 $self->update;
2177}
2178
2179sub size_allocate { 2388sub size_allocate {
2180 my ($self, $w, $h) = @_; 2389 my ($self, $w, $h) = @_;
2181 2390
2182 $self->SUPER::size_allocate ($w, $h); 2391 $self->SUPER::size_allocate ($w, $h);
2183 2392
… …
2186 $self->{layout}->set_width ($self->{children}[0]{w}); 2395 $self->{layout}->set_width ($self->{children}[0]{w});
2187 2396
2188 $self->reflow; 2397 $self->reflow;
2189} 2398}
2190 2399
2400sub text_size {
2401 my ($self, $text, $indent) = @_;
2402
2403 my $layout = $self->{layout};
2404
2405 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2406 $layout->set_width ($self->{children}[0]{w} - $indent);
2407 $layout->set_markup ($text);
2408
2409 $layout->size
2410}
2411
2412sub reflow {
2413 my ($self) = @_;
2414
2415 $self->{need_reflow}++;
2416 $self->update;
2417}
2418
2419sub set_offset {
2420 my ($self, $offset) = @_;
2421
2422 # todo: base offset on lines or so, not on pixels
2423 $self->{children}[1]->set_value ($offset);
2424}
2425
2426sub clear {
2427 my ($self) = @_;
2428
2429 $self->{par} = [];
2430 $self->{height} = 0;
2431 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2432}
2433
2191sub add_paragraph { 2434sub add_paragraph {
2192 my ($self, $color, $text) = @_; 2435 my ($self, $color, $text, $indent) = @_;
2193 2436
2194 #TODO: intelligently "reformat" paragraph 2437 for my $line (split /\n/, $text) {
2195 2438 my ($w, $h) = $self->text_size ($line);
2196 my $height = $self->text_height ($text);
2197
2198 $self->{height} += $height; 2439 $self->{height} += $h;
2440 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
2441 }
2199 2442
2200 push @{$self->{par}}, [$height, $color, $text];
2201
2202 $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}]; 2443 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);
2203 $self->{children}[1]->update;
2204} 2444}
2205 2445
2206sub update { 2446sub update {
2207 my ($self) = @_; 2447 my ($self) = @_;
2208 2448
… …
2210 2450
2211 return unless $self->{h} > 0; 2451 return unless $self->{h} > 0;
2212 2452
2213 delete $self->{texture}; 2453 delete $self->{texture};
2214 2454
2215 $ROOT->on_refresh ($self, sub { 2455 $ROOT->on_post_alloc ($self, sub {
2456 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2457
2216 if (delete $self->{need_reflow}) { 2458 if (delete $self->{need_reflow}) {
2217 my $height = 0; 2459 my $height = 0;
2218 2460
2219 $height += $_->[0] = $self->text_height ($_->[2]) 2461 my $layout = $self->{layout};
2462
2463 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2464
2220 for @{$self->{par}}; 2465 for (@{$self->{par}}) {
2466 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2467 $layout->set_width ($W - $_->[3]);
2468 $layout->set_markup ($_->[4]);
2469 my ($w, $h) = $layout->size;
2470 $_->[0] = $w + $_->[3];
2471 $_->[1] = $h;
2472 }
2473
2474 $height += $_->[1];
2475 }
2221 2476
2222 $self->{height} = $height; 2477 $self->{height} = $height;
2223 2478
2224 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2479 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2225 2480
2226 delete $self->{texture}; 2481 delete $self->{texture};
2227 } 2482 }
2228 2483
2229 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub { 2484 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2230 glClearColor 0, 0, 0, 0; 2485 glClearColor 0.5, 0.5, 0.5, 0;
2231 glClear GL_COLOR_BUFFER_BIT; 2486 glClear GL_COLOR_BUFFER_BIT;
2232 2487
2488 my $top = int $self->{children}[1]{range}[0];
2489
2490 my $y0 = $top;
2491 my $y1 = $top + $H;
2492
2493 my $y = 0;
2494
2495 my $layout = $self->{layout};
2496
2497 $layout->set_font ($self->{font}) if $self->{font};
2498
2233 glEnable GL_BLEND; 2499 glEnable GL_BLEND;
2500 #TODO# not correct in windows where rgba is forced off
2234 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2501 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2235 glEnable GL_TEXTURE_2D;
2236 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2237
2238 my $top = int $self->{children}[1]{range}[0];
2239
2240 my $y0 = $top;
2241 my $y1 = $top + $self->{h};
2242
2243 my $y = 0;
2244
2245 my $layout = $self->{layout};
2246
2247 $layout->set_font ($self->{font}) if $self->{font};
2248 2502
2249 for my $par (@{$self->{par}}) { 2503 for my $par (@{$self->{par}}) {
2250 my $h = $par->[0]; 2504 my $h = $par->[1];
2251 2505
2252 if ($y0 < $y + $h && $y < $y1) { 2506 if ($y0 < $y + $h && $y < $y1) {
2507 $layout->set_foreground (@{ $par->[2] });
2508 $layout->set_width ($W - $par->[3]);
2253 $layout->set_text ($par->[2]); 2509 $layout->set_markup ($par->[4]);
2254 2510
2255 glColor @{ $par->[1] }; 2511 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2256 my ($W, $H) = $layout->size; 2512
2257 CFClient::Texture->new_from_layout ($layout)->draw_quad (0, $y - $y0); 2513 glRasterPos $par->[3], $y - $y0;
2514 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2258 } 2515 }
2259 2516
2260 $y += $h; 2517 $y += $h;
2261 } 2518 }
2262 2519
2263 glDisable GL_TEXTURE_2D;
2264 glDisable GL_BLEND; 2520 glDisable GL_BLEND;
2265 }; 2521 };
2266 }); 2522 });
2267} 2523}
2268 2524
2269sub _draw { 2525sub _draw {
2270 my ($self) = @_; 2526 my ($self) = @_;
2271 2527
2272 glEnable GL_BLEND;
2273 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2274 glEnable GL_TEXTURE_2D; 2528 glEnable GL_TEXTURE_2D;
2275 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2529 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2276 glColor 1, 1, 1, 1; 2530 glColor 1, 1, 1, 1;
2277 $self->{texture}->draw_quad (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2531 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2278 glDisable GL_TEXTURE_2D; 2532 glDisable GL_TEXTURE_2D;
2279 glDisable GL_BLEND;
2280 2533
2281 $self->{children}[1]->draw; 2534 $self->{children}[1]->draw;
2282 2535
2283} 2536}
2284 2537
… …
2332 2585
2333sub new { 2586sub new {
2334 my $class = shift; 2587 my $class = shift;
2335 2588
2336 my $self = $class->SUPER::new ( 2589 my $self = $class->SUPER::new (
2337 state => 0, 2590 state => 0,
2338 connect_activate => \&toggle_flopper, 2591 on_activate => \&toggle_flopper,
2339 @_ 2592 @_
2340 ); 2593 );
2341 2594
2342 if ($self->{state}) {
2343 $self->{state} = 0;
2344 $self->toggle_flopper;
2345 }
2346
2347 $self 2595 $self
2348} 2596}
2349 2597
2350sub toggle_flopper { 2598sub toggle_flopper {
2351 my ($self) = @_; 2599 my ($self) = @_;
2352 2600
2353 # TODO: use animation 2601 $self->{other}->toggle_visibility;
2354 if ($self->{state} = !$self->{state}) {
2355 $CFClient::UI::ROOT->add ($self->{other});
2356 $self->{other}->move ($self->coord2global (0, $self->{h}));
2357 $self->emit ("open");
2358 } else {
2359 $CFClient::UI::ROOT->remove ($self->{other});
2360 $self->emit ("close");
2361 }
2362
2363 $self->emit (changed => $self->{state});
2364} 2602}
2365 2603
2366############################################################################# 2604#############################################################################
2367 2605
2368package CFClient::UI::Tooltip; 2606package CFClient::UI::Tooltip;
… …
2378 @_, 2616 @_,
2379 can_events => 0, 2617 can_events => 0,
2380 ) 2618 )
2381} 2619}
2382 2620
2383sub set_markup { 2621sub set_tooltip_from {
2384 my ($self, $text) = @_; 2622 my ($self, $widget) = @_;
2385 2623
2386 $self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0]; 2624 my $tooltip = $widget->{tooltip};
2387 $self->{label}->set_markup ($text); 2625
2388 $self->add ($self->{label}); 2626 if ($ENV{CFPLUS_DEBUG} & 2) {
2627 $tooltip .= "\n\n" . (ref $widget) . "\n"
2628 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2629 . "req $widget->{req_w} $widget->{req_h}\n"
2630 . "visible $widget->{visible}";
2631 }
2632
2633 $self->add (new CFClient::UI::Label
2634 markup => $tooltip,
2635 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2636 fontsize => 0.8,
2637 fg => [0, 0, 0, 1],
2638 ellipsise => 0,
2639 font => ($widget->{tooltip_font} || $::FONT_PROP),
2640 );
2389} 2641}
2390 2642
2391sub size_request { 2643sub size_request {
2392 my ($self) = @_; 2644 my ($self) = @_;
2393
2394 $self->child->set_max_size ($::WIDTH * 0.3);
2395 2645
2396 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2646 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2397 2647
2398 ($w + 4, $h + 4) 2648 ($w + 4, $h + 4)
2399} 2649}
… …
2402 my ($self, $w, $h) = @_; 2652 my ($self, $w, $h) = @_;
2403 2653
2404 $self->SUPER::size_allocate ($w - 4, $h - 4); 2654 $self->SUPER::size_allocate ($w - 4, $h - 4);
2405} 2655}
2406 2656
2657sub visibility_change {
2658 my ($self, $visible) = @_;
2659
2660 return unless $visible;
2661
2662 $self->{root}->on_post_alloc ("move_$self" => sub {
2663 my $widget = $self->{owner}
2664 or return;
2665
2666 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2667
2668 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2669 if $x + $self->{w} > $::WIDTH;
2670
2671 $self->move_abs ($x, $y);
2672 });
2673}
2674
2407sub _draw { 2675sub _draw {
2408 my ($self) = @_; 2676 my ($self) = @_;
2409 2677
2410 glPushMatrix;
2411 glTranslate 0.375, 0.375; 2678 glTranslate 0.375, 0.375;
2412 2679
2413 my ($w, $h) = @$self{qw(w h)}; 2680 my ($w, $h) = @$self{qw(w h)};
2414 2681
2415 glColor 1, 0.8, 0.4; 2682 glColor 1, 0.8, 0.4;
… …
2426 glVertex 0 , $h; 2693 glVertex 0 , $h;
2427 glVertex $w, $h; 2694 glVertex $w, $h;
2428 glVertex $w, 0; 2695 glVertex $w, 0;
2429 glEnd; 2696 glEnd;
2430 2697
2431 glPopMatrix; 2698 glTranslate 2 - 0.375, 2 - 0.375;
2432 2699
2433 glTranslate 2, 2;
2434 $self->SUPER::_draw; 2700 $self->SUPER::_draw;
2435} 2701}
2436 2702
2437############################################################################# 2703#############################################################################
2438 2704
… …
2443use CFClient::OpenGL; 2709use CFClient::OpenGL;
2444 2710
2445sub new { 2711sub new {
2446 my $class = shift; 2712 my $class = shift;
2447 2713
2448 $class->SUPER::new ( 2714 my $self = $class->SUPER::new (
2449 aspect => 1, 2715 aspect => 1,
2716 can_events => 0,
2450 @_, 2717 @_,
2451 ) 2718 );
2719
2720 if ($self->{anim} && $self->{animspeed}) {
2721 Scalar::Util::weaken (my $widget = $self);
2722
2723 $self->{timer} = Event->timer (
2724 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2725 hard => 1,
2726 interval => $self->{animspeed},
2727 cb => sub {
2728 ++$widget->{frame};
2729 $widget->update;
2730 },
2731 );
2732 }
2733
2734 $self
2452} 2735}
2453 2736
2454sub size_request { 2737sub size_request {
2455 (32, 8) 2738 (32, 8)
2456} 2739}
2457 2740
2741sub update {
2742 my ($self) = @_;
2743
2744 return unless $self->{visible};
2745
2746 $self->SUPER::update;
2747}
2748
2458sub _draw { 2749sub _draw {
2459 my ($self) = @_; 2750 my ($self) = @_;
2460 2751
2461 return unless $::CONN;#d# manage and cache textures differently 2752 return unless $::CONN;
2753
2754 my $face;
2755
2756 if ($self->{frame}) {
2757 my $anim = $::CONN->{anim}[$self->{anim}];
2758
2759 $face = $anim->[ $self->{frame} % @$anim ]
2760 if $anim && @$anim;
2761 }
2762
2462 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 2763 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2463 2764
2464 # TODO animation
2465 if ($tex) { 2765 if ($tex) {
2466 glEnable GL_BLEND;
2467 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2468 glEnable GL_TEXTURE_2D; 2766 glEnable GL_TEXTURE_2D;
2469 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2767 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2470 glColor 1, 1, 1, 1; 2768 glColor 1, 1, 1, 1;
2471 $tex->draw_quad (0, 0, $self->{w}, $self->{h}); 2769 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2472 glDisable GL_TEXTURE_2D; 2770 glDisable GL_TEXTURE_2D;
2473 glDisable GL_BLEND;
2474 } 2771 }
2772}
2773
2774sub DESTROY {
2775 my ($self) = @_;
2776
2777 $self->{timer}->cancel
2778 if $self->{timer};
2779
2780 $self->SUPER::DESTROY;
2475} 2781}
2476 2782
2477############################################################################# 2783#############################################################################
2478 2784
2479package CFClient::UI::InventoryItem; 2785package CFClient::UI::Inventory;
2480 2786
2481our @ISA = CFClient::UI::HBox::; 2787our @ISA = CFClient::UI::ScrolledWindow::;
2482 2788
2483sub new { 2789sub new {
2484 my $class = shift; 2790 my $class = shift;
2485 2791
2486 my %args = @_;
2487
2488 my $item = delete $args{item};
2489
2490 my $desc = $item->{nrof} < 2
2491 ? $item->{name}
2492 : "$item->{nrof} $item->{name_pl}";
2493
2494
2495 my $self = $class->SUPER::new ( 2792 my $self = $class->SUPER::new (
2496 can_hover => 1, 2793 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2497 can_events => 1,
2498 tooltip => (CFClient::UI::Label->escape ($desc)
2499 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2500 connect_button_down => sub {
2501 my ($self, $ev, $x, $y) = @_;
2502
2503 # todo: maybe put examine on 1? but should just be a tooltip :(
2504 if ($ev->{button} == 1) {
2505 $::CONN->send ("move $::CONN->{player}{tag} $item->{tag} 0");
2506 } elsif ($ev->{button} == 2) {
2507 $::CONN->send ("apply $item->{tag}");
2508 } elsif ($ev->{button} == 3) {
2509 CFClient::UI::Menu->new (
2510 items => [
2511 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2512 [
2513 $item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2514 sub { $::CONN->send ("lock $item->{tag}") },
2515 ],
2516 ["mark", sub { $::CONN->send ("mark $item->{tag}") }],
2517 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2518 ["drop", sub { $::CONN->send ("move 0 $item->{tag} 0") }],
2519 ],
2520 )->popup ($ev);
2521 }
2522
2523 1
2524 },
2525 %args
2526 );
2527
2528 $self->add (new CFClient::UI::Face
2529 can_events => 0,
2530 face => $item->{face},
2531 anim => $item->{anim},
2532 animspeed => $item->{animspeed},
2533 );
2534
2535 $self->add (new CFClient::UI::Label
2536 can_events => 0,
2537 text => $desc,
2538 );
2539
2540 $self
2541}
2542
2543#############################################################################
2544
2545package CFClient::UI::Inventory;
2546
2547our @ISA = CFClient::UI::ScrolledWindow::;
2548
2549sub new {
2550 my $class = shift;
2551
2552 my $self = $class->SUPER::new (
2553 scrolled => (new CFClient::UI::VBox),
2554 @_, 2794 @_,
2555 ); 2795 );
2556 2796
2557 $self 2797 $self
2558} 2798}
… …
2561 my ($self, $items) = @_; 2801 my ($self, $items) = @_;
2562 2802
2563 $self->{scrolled}->clear; 2803 $self->{scrolled}->clear;
2564 return unless $items; 2804 return unless $items;
2565 2805
2566 my @items = sort { $a->{type} <=> $b->{type} } @$items; 2806 my @items = sort {
2807 ($a->{type} <=> $b->{type})
2808 or ($a->{name} cmp $b->{name})
2809 } @$items;
2567 2810
2568 $self->{real_items} = \@items; 2811 $self->{real_items} = \@items;
2569 2812
2813 my $row = 0;
2570 for my $item (@items) { 2814 for my $item (@items) {
2571 my $desc = $item->{nrof} < 2 2815 CFClient::Item::update_widgets $item;
2572 ? $item->{name}
2573 : "$item->{nrof} $item->{name_pl}";
2574 2816
2575 $self->{scrolled}->add ($item->{widget} ||= new CFClient::UI::InventoryItem item => $item); 2817 $self->{scrolled}->add (0, $row, $item->{face_widget});
2576 } 2818 $self->{scrolled}->add (1, $row, $item->{desc_widget});
2819 $self->{scrolled}->add (2, $row, $item->{weight_widget});
2577 2820
2578# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page]; 2821 $row++;
2579} 2822 }
2580
2581sub size_request {
2582 my ($self) = @_;
2583 ($self->{req_w}, $self->{req_h});
2584} 2823}
2585 2824
2586############################################################################# 2825#############################################################################
2587 2826
2588package CFClient::UI::Menu; 2827package CFClient::UI::Menu;
… …
2623 2862
2624# popup given the event (must be a mouse button down event currently) 2863# popup given the event (must be a mouse button down event currently)
2625sub popup { 2864sub popup {
2626 my ($self, $ev) = @_; 2865 my ($self, $ev) = @_;
2627 2866
2628 $self->emit ("popdown"); 2867 $self->_emit ("popdown");
2629 2868
2630 # maybe save $GRAB? must be careful about events... 2869 # maybe save $GRAB? must be careful about events...
2631 $GRAB = $self; 2870 $GRAB = $self;
2632 $self->{button} = $ev->{button}; 2871 $self->{button} = $ev->{button};
2633 2872
2634 $self->show; 2873 $self->show;
2635 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 2874 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2636} 2875}
2637 2876
2638sub mouse_motion { 2877sub mouse_motion {
2639 my ($self, $ev, $x, $y) = @_; 2878 my ($self, $ev, $x, $y) = @_;
2640 2879
… …
2648 2887
2649 if ($ev->{button} == $self->{button}) { 2888 if ($ev->{button} == $self->{button}) {
2650 undef $GRAB; 2889 undef $GRAB;
2651 $self->hide; 2890 $self->hide;
2652 2891
2653 $self->emit ("popdown"); 2892 $self->_emit ("popdown");
2654 $self->{hover}[1]->() if $self->{hover}; 2893 $self->{hover}[1]->() if $self->{hover};
2655 } 2894 }
2656} 2895}
2657 2896
2658############################################################################# 2897#############################################################################
2659 2898
2660package CFClient::UI::Root; 2899package CFClient::UI::Statusbox;
2661 2900
2662our @ISA = CFClient::UI::Container::; 2901our @ISA = CFClient::UI::VBox::;
2663
2664use CFClient::OpenGL;
2665 2902
2666sub new { 2903sub new {
2667 my $class = shift; 2904 my $class = shift;
2668 2905
2669 $class->SUPER::new ( 2906 $class->SUPER::new (
2907 fontsize => 0.8,
2670 @_, 2908 @_,
2671 ) 2909 )
2672} 2910}
2673 2911
2912sub reorder {
2913 my ($self) = @_;
2914 my $NOW = time;
2915
2916 while (my ($k, $v) = each %{ $self->{item} }) {
2917 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2918 }
2919
2920 my @widgets;
2921
2922 my @items = sort {
2923 $a->{pri} <=> $b->{pri}
2924 or $b->{id} <=> $a->{id}
2925 } values %{ $self->{item} };
2926
2927 my $count = 10 + 1;
2928 for my $item (@items) {
2929 last unless --$count;
2930
2931 push @widgets, $item->{label} ||= do {
2932 # TODO: doesn't handle markup well (read as: at all)
2933 my $short = $item->{count} > 1
2934 ? "<b>$item->{count} ×</b> $item->{text}"
2935 : $item->{text};
2936
2937 for ($short) {
2938 s/^\s+//;
2939 s/\s+/ /g;
2940 }
2941
2942 new CFClient::UI::Label
2943 markup => $short,
2944 tooltip => $item->{tooltip},
2945 tooltip_font => $::FONT_PROP,
2946 tooltip_width => 0.67,
2947 fontsize => $item->{fontsize} || $self->{fontsize},
2948 max_w => $::WIDTH * 0.44,
2949 fg => $item->{fg},
2950 can_events => 1,
2951 can_hover => 1
2952 };
2953 }
2954
2955 $self->clear;
2956 $self->SUPER::add (reverse @widgets);
2957}
2958
2959sub add {
2960 my ($self, $text, %arg) = @_;
2961
2962 $text =~ s/^\s+//;
2963 $text =~ s/\s+$//;
2964
2965 return unless $text;
2966
2967 my $timeout = time + ((delete $arg{timeout}) || 60);
2968
2969 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2970
2971 if (my $item = $self->{item}{$group}) {
2972 if ($item->{text} eq $text) {
2973 $item->{count}++;
2974 } else {
2975 $item->{count} = 1;
2976 $item->{text} = $item->{tooltip} = $text;
2977 }
2978 $item->{id} = ++$self->{id};
2979 $item->{timeout} = $timeout;
2980 delete $item->{label};
2981 } else {
2982 $self->{item}{$group} = {
2983 id => ++$self->{id},
2984 text => $text,
2985 timeout => $timeout,
2986 tooltip => $text,
2987 fg => [0.8, 0.8, 0.8, 0.8],
2988 pri => 0,
2989 count => 1,
2990 %arg,
2991 };
2992 }
2993
2994 $self->reorder;
2995}
2996
2674sub configure { 2997sub reconfigure {
2675 my ($self, $x, $y, $w, $h) = @_;
2676
2677 $self->{w} = $w;
2678 $self->{h} = $h;
2679}
2680
2681sub check_size {
2682 my ($self) = @_; 2998 my ($self) = @_;
2683 2999
2684 $self->size_allocate ($self->{w}, $self->{h}) 3000 delete $_->{label}
2685 if $self->{w}; 3001 for values %{ $self->{item} || {} };
3002
3003 $self->reorder;
3004 $self->SUPER::reconfigure;
3005}
3006
3007#############################################################################
3008
3009package CFClient::UI::Root;
3010
3011our @ISA = CFClient::UI::Container::;
3012
3013use CFClient::OpenGL;
3014
3015sub new {
3016 my $class = shift;
3017
3018 my $self = $class->SUPER::new (
3019 visible => 1,
3020 @_,
3021 );
3022
3023 Scalar::Util::weaken ($self->{root} = $self);
3024
3025 $self
2686} 3026}
2687 3027
2688sub size_request { 3028sub size_request {
2689 my ($self) = @_; 3029 my ($self) = @_;
2690 3030
2691 ($self->{w}, $self->{h}) 3031 ($self->{w}, $self->{h})
3032}
3033
3034sub _to_pixel {
3035 my ($coord, $size, $max) = @_;
3036
3037 $coord =
3038 $coord eq "center" ? ($max - $size) * 0.5
3039 : $coord eq "max" ? $max
3040 : $coord;
3041
3042 $coord = 0 if $coord < 0;
3043 $coord = $max - $size if $coord > $max - $size;
3044
3045 int $coord + 0.5
2692} 3046}
2693 3047
2694sub size_allocate { 3048sub size_allocate {
2695 my ($self, $w, $h) = @_; 3049 my ($self, $w, $h) = @_;
2696 3050
2697 my $old_w = $self->{old_w};
2698 my $old_h = $self->{old_h};
2699
2700 if ($old_w && $old_h) {
2701 for my $child ($self->children) {
2702 $child->{x} = int 0.5 + $child->{x} * $w / $old_w;
2703 $child->{w} = int 0.5 + $child->{w} * $w / $old_w;
2704 $child->{req_w} = int 0.5 + $child->{req_w} * $w / $old_w if exists $child->{req_w};
2705 $child->{user_w} = int 0.5 + $child->{user_w} * $w / $old_w if exists $child->{user_w};
2706 $child->{y} = int 0.5 + $child->{y} * $h / $old_h;
2707 $child->{h} = int 0.5 + $child->{h} * $h / $old_h;
2708 $child->{req_h} = int 0.5 + $child->{req_h} * $h / $old_h if exists $child->{req_h};
2709 $child->{user_h} = int 0.5 + $child->{user_h} * $h / $old_h if exists $child->{user_h};
2710 }
2711 }
2712
2713 for my $child ($self->children) { 3051 for my $child ($self->children) {
2714 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3052 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2715 3053
2716 $X = List::Util::max 0, List::Util::min $w - $W, $X; 3054 $X = $child->{force_x} if exists $child->{force_x};
2717 $Y = List::Util::max 0, List::Util::min $h - $H, $Y; 3055 $Y = $child->{force_y} if exists $child->{force_y};
3056
3057 $X = _to_pixel $X, $W, $self->{w};
3058 $Y = _to_pixel $Y, $H, $self->{h};
3059
2718 $child->configure ($X, $Y, $W, $H); 3060 $child->configure ($X, $Y, $W, $H);
2719 } 3061 }
2720
2721 $self->{old_w} = $w;
2722 $self->{old_h} = $h;
2723} 3062}
2724 3063
2725sub coord2local { 3064sub coord2local {
2726 my ($self, $x, $y) = @_; 3065 my ($self, $x, $y) = @_;
2727 3066
… …
2735} 3074}
2736 3075
2737sub update { 3076sub update {
2738 my ($self) = @_; 3077 my ($self) = @_;
2739 3078
2740 $self->check_size;
2741 $::WANT_REFRESH++; 3079 $::WANT_REFRESH++;
2742} 3080}
2743 3081
2744sub add { 3082sub add {
2745 my ($self, $child) = @_; 3083 my ($self, @children) = @_;
2746 3084
2747 # integerise window positions 3085 $_->{is_toplevel} = 1
2748 $child->{x} = int $child->{x}; 3086 for @children;
2749 $child->{y} = int $child->{y};
2750 3087
2751 $self->SUPER::add ($child); 3088 $self->SUPER::add (@children);
3089}
3090
3091sub remove {
3092 my ($self, @children) = @_;
3093
3094 $self->SUPER::remove (@children);
3095
3096 delete $self->{is_toplevel}
3097 for @children;
3098
3099 while (@children) {
3100 my $w = pop @children;
3101 push @children, $w->children;
3102 $w->set_invisible;
3103 }
2752} 3104}
2753 3105
2754sub on_refresh { 3106sub on_refresh {
2755 my ($self, $id, $cb) = @_; 3107 my ($self, $id, $cb) = @_;
2756 3108
2757 $self->{refresh_hook}{$id} = $cb; 3109 $self->{refresh_hook}{$id} = $cb;
2758} 3110}
2759 3111
3112sub on_post_alloc {
3113 my ($self, $id, $cb) = @_;
3114
3115 $self->{post_alloc_hook}{$id} = $cb;
3116}
3117
2760sub draw { 3118sub draw {
2761 my ($self) = @_; 3119 my ($self) = @_;
2762
2763 if ($self->{check_size}) {
2764 my @queue = ([], []);
2765
2766 for (;;) {
2767 if ($self->{check_size}) {
2768 # heuristic: check containers last
2769 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_
2770 for values %{delete $self->{check_size}}
2771 }
2772
2773 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last;
2774
2775 my ($w, $h) = $widget->{user_w} && $widget->{user_h}
2776 ? @$widget{qw(user_w user_h)}
2777 : $widget->size_request;
2778
2779 if ($w != $widget->{req_w} || $h != $widget->{req_h}) {
2780 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
2781
2782 $widget->{req_w} = $w;
2783 $widget->{req_h} = $h;
2784
2785 $self->{size_alloc}{$widget} = [$widget, $widget->{w}, $widget->{h}];
2786
2787 $widget->{parent}->check_size
2788 if $widget->{parent};
2789 }
2790 }
2791 }
2792
2793 while ($self->{size_alloc}) {
2794 for (values %{delete $self->{size_alloc}}) {
2795 my ($widget, $w, $h) = @$_;
2796
2797 $w = 0 if $w < 0;
2798 $h = 0 if $h < 0;
2799
2800 $widget->{w} = $w;
2801 $widget->{h} = $h;
2802 $widget->size_allocate ($w, $h);
2803 $widget->emit (size_allocate => $w, $h);
2804 }
2805 }
2806 3120
2807 while ($self->{refresh_hook}) { 3121 while ($self->{refresh_hook}) {
2808 $_->() 3122 $_->()
2809 for values %{delete $self->{refresh_hook}}; 3123 for values %{delete $self->{refresh_hook}};
2810 } 3124 }
2811 3125
3126 if ($self->{realloc}) {
3127 my @queue;
3128
3129 while () {
3130 if ($self->{realloc}) {
3131 #TODO use array-of-depth approach
3132
3133 use sort 'stable';
3134
3135 @queue = sort { $a->{visible} <=> $b->{visible} }
3136 @queue, values %{delete $self->{realloc}};
3137 }
3138
3139 my $widget = pop @queue || last;
3140
3141 $widget->{visible} or last; # do not resize invisible widgets
3142
3143 my ($w, $h) = $widget->size_request;
3144
3145 $w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3146 $h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3147
3148 $w = $widget->{force_w} if exists $widget->{force_w};
3149 $h = $widget->{force_h} if exists $widget->{force_h};
3150
3151 if ($widget->{req_w} != $w || $widget->{req_h} != $h
3152 || delete $widget->{force_realloc}) {
3153 $widget->{req_w} = $w;
3154 $widget->{req_h} = $h;
3155
3156 $self->{size_alloc}{$widget+0} = $widget;
3157
3158 if (my $parent = $widget->{parent}) {
3159 $self->{realloc}{$parent+0} = $parent;
3160 #unshift @queue, $parent;
3161 $parent->{force_size_alloc} = 1;
3162 $self->{size_alloc}{$parent+0} = $parent;
3163 }
3164 }
3165
3166 delete $self->{realloc}{$widget+0};
3167 }
3168 }
3169
3170 while (my $size_alloc = delete $self->{size_alloc}) {
3171 my @queue = sort { $b->{visible} <=> $a->{visible} }
3172 values %$size_alloc;
3173
3174 while () {
3175 my $widget = pop @queue || last;
3176
3177 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3178
3179 $w = 0 if $w < 0;
3180 $h = 0 if $h < 0;
3181
3182 $w = int $w + 0.5;
3183 $h = int $h + 0.5;
3184
3185 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3186 $widget->{w} = $w;
3187 $widget->{h} = $h;
3188
3189 $widget->emit (size_allocate => $w, $h);
3190 }
3191 }
3192 }
3193
3194 while ($self->{post_alloc_hook}) {
3195 $_->()
3196 for values %{delete $self->{post_alloc_hook}};
3197 }
3198
3199
2812 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3200 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2813 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3201 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2814 glClear GL_COLOR_BUFFER_BIT; 3202 glClear GL_COLOR_BUFFER_BIT;
2815 3203
2816 glMatrixMode GL_PROJECTION; 3204 glMatrixMode GL_PROJECTION;
2817 glLoadIdentity; 3205 glLoadIdentity;
2818 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000; 3206 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2819 glMatrixMode GL_MODELVIEW; 3207 glMatrixMode GL_MODELVIEW;
2820 glLoadIdentity; 3208 glLoadIdentity;
2821 3209
2822 $self->_draw; 3210 $self->_draw;
2823} 3211}
2824 3212
2825############################################################################# 3213#############################################################################
2826 3214
3215package CFClient::UI::BindEditor;
3216
3217our @ISA = CFClient::UI::FancyFrame::;
3218
3219sub new {
3220 my $class = shift;
3221
3222 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3223
3224 $self->add (my $vb = new CFClient::UI::VBox);
3225
3226
3227 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3228 text => "start recording",
3229 tooltip => "Start/Stops recording of actions."
3230 ."All subsequent actions after the recording started will be captured."
3231 ."The actions are displayed after the record was stopped."
3232 ."To bind the action you have to click on the 'Bind' button",
3233 on_activate => sub {
3234 unless ($self->{recording}) {
3235 $self->start;
3236 } else {
3237 $self->stop;
3238 }
3239 });
3240
3241 $vb->add (new CFClient::UI::Label text => "Actions:");
3242 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3243
3244 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3245 $vb->add (my $hb = new CFClient::UI::HBox);
3246 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3247 $hb->add (new CFClient::UI::Button
3248 text => "bind",
3249 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3250 on_activate => sub {
3251 $self->ask_for_bind;
3252 });
3253
3254 $vb->add (my $hb = new CFClient::UI::HBox);
3255 $hb->add (new CFClient::UI::Button
3256 text => "ok",
3257 expand => 1,
3258 tooltip => "This closes the binding editor and saves the binding",
3259 on_activate => sub {
3260 $self->hide;
3261 $self->commit;
3262 });
3263
3264 $hb->add (new CFClient::UI::Button
3265 text => "cancel",
3266 expand => 1,
3267 tooltip => "This closes the binding editor without saving",
3268 on_activate => sub {
3269 $self->hide;
3270 $self->{binding_cancel}->()
3271 if $self->{binding_cancel};
3272 });
3273
3274 $self->update_binding_widgets;
3275
3276 $self
3277}
3278
3279sub commit {
3280 my ($self) = @_;
3281 my ($mod, $sym, $cmds) = $self->get_binding;
3282 if ($sym != 0 && @$cmds > 0) {
3283 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3284 ."'. Don't forget 'Save Config'!");
3285 $self->{binding_change}->($mod, $sym, $cmds)
3286 if $self->{binding_change};
3287 } else {
3288 $::STATUSBOX->add ("No action bound, no key or action specified!");
3289 $self->{binding_cancel}->()
3290 if $self->{binding_cancel};
3291 }
3292}
3293
3294sub start {
3295 my ($self) = @_;
3296
3297 $self->{rec_btn}->set_text ("stop recording");
3298 $self->{recording} = 1;
3299 $self->clear_command_list;
3300 $::CONN->start_record if $::CONN;
3301}
3302
3303sub stop {
3304 my ($self) = @_;
3305
3306 $self->{rec_btn}->set_text ("start recording");
3307 $self->{recording} = 0;
3308
3309 my $rec;
3310 $rec = $::CONN->stop_record if $::CONN;
3311 return unless ref $rec eq 'ARRAY';
3312 $self->set_command_list ($rec);
3313}
3314
3315# if $commit is true, the binding will be set after the user entered a key combo
3316sub ask_for_bind {
3317 my ($self, $commit) = @_;
3318
3319 CFClient::Binder::open_binding_dialog (sub {
3320 my ($mod, $sym) = @_;
3321 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3322 $self->update_binding_widgets;
3323 $self->commit if $commit;
3324 });
3325}
3326
3327# $mod and $sym are the modifiers and key symbol
3328# $cmds is a array ref of strings (the commands)
3329# $cb is the callback that is executed on OK
3330# $ccb is the callback that is executed on CANCEL and
3331# when the binding was unsuccessful on OK
3332sub set_binding {
3333 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3334
3335 $self->clear_command_list;
3336 $self->{recording} = 0;
3337 $self->{rec_btn}->set_text ("start recording");
3338
3339 $self->{binding} = [$mod, $sym];
3340 $self->{commands} = $cmds;
3341
3342 $self->{binding_change} = $cb;
3343 $self->{binding_cancel} = $ccb;
3344
3345 $self->update_binding_widgets;
3346}
3347
3348# this is a shortcut method that asks for a binding
3349# and then just binds it.
3350sub do_quick_binding {
3351 my ($self, $cmds) = @_;
3352 $self->set_binding (undef, undef, $cmds, sub {
3353 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3354 });
3355 $self->ask_for_bind (1);
3356}
3357
3358sub update_binding_widgets {
3359 my ($self) = @_;
3360 my ($mod, $sym, $cmds) = $self->get_binding;
3361 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3362 $self->set_command_list ($cmds);
3363}
3364
3365sub get_binding {
3366 my ($self) = @_;
3367 return (
3368 $self->{binding}->[0],
3369 $self->{binding}->[1],
3370 [ grep { defined $_ } @{$self->{commands}} ]
3371 );
3372}
3373
3374sub clear_command_list {
3375 my ($self) = @_;
3376 $self->{cmdbox}->clear ();
3377}
3378
3379sub set_command_list {
3380 my ($self, $cmds) = @_;
3381
3382 $self->{cmdbox}->clear ();
3383 $self->{commands} = $cmds;
3384
3385 my $idx = 0;
3386
3387 for (@$cmds) {
3388 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3389
3390 my $i = $idx;
3391 $hb->add (new CFClient::UI::Button
3392 text => "delete",
3393 tooltip => "Deletes the action from the record",
3394 on_activate => sub {
3395 $self->{cmdbox}->remove ($hb);
3396 $cmds->[$i] = undef;
3397 });
3398
3399 $hb->add (new CFClient::UI::Label text => $_);
3400
3401 $idx++
3402 }
3403}
3404
3405
3406#############################################################################
3407
3408package CFClient::UI::SpellList;
3409
3410our @ISA = CFClient::UI::FancyFrame::;
3411
3412sub new {
3413 my $class = shift;
3414
3415 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3416
3417 $self->add (new CFClient::UI::ScrolledWindow
3418 scrolled => $self->{spellbox} = new CFClient::UI::Table);
3419
3420 $self;
3421}
3422
3423# XXX: Do sorting? Argl...
3424sub add_spell {
3425 my ($self, $spell) = @_;
3426 $self->{spells}->{$spell->{name}} = $spell;
3427
3428 $self->{spellbox}->add (0, $self->{tbl_idx}, new CFClient::UI::Face
3429 face => $spell->{face},
3430 can_hover => 1,
3431 can_events => 1,
3432 tooltip => $spell->{message});
3433
3434 $self->{spellbox}->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3435 text => $spell->{name},
3436 can_hover => 1,
3437 can_events => 1,
3438 tooltip => $spell->{message},
3439 expand => 1);
3440 $self->{spellbox}->add (2, $self->{tbl_idx}++, new CFClient::UI::Button
3441 text => "bind to key",
3442 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3443}
3444
3445sub rebuild_spell_list {
3446 my ($self) = @_;
3447 $self->{tbl_idx} = 0;
3448 $self->add_spell ($_) for values %{$self->{spells}};
3449}
3450
3451sub remove_spell {
3452 my ($self, $spell) = @_;
3453 delete $self->{spells}->{$spell->{name}};
3454 $self->rebuild_spell_list;
3455}
3456
3457#############################################################################
3458
2827package CFClient::UI; 3459package CFClient::UI;
2828 3460
2829$ROOT = new CFClient::UI::Root; 3461$ROOT = new CFClient::UI::Root;
2830$TOOLTIP = new CFClient::UI::Tooltip; 3462$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2831 3463
28321 34641
2833 3465

Diff Legend

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