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.170 by root, Mon Apr 24 11:45:17 2006 UTC vs.
Revision 1.261 by elmex, Tue May 30 14:45:56 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 $TOOLTIP->move ($widget->coord2global ($widget->{w}, 0));
30 $TOOLTIP->show; 59 $TOOLTIP->show;
31 } 60 }
32 61
33 return; 62 return;
34 } 63 }
… …
39 delete $TOOLTIP->{owner}; 68 delete $TOOLTIP->{owner};
40} 69}
41 70
42# class methods for events 71# class methods for events
43sub feed_sdl_key_down_event { 72sub feed_sdl_key_down_event {
44 $FOCUS->emit (key_down => $_[0]) || $FOCUS->key_down ($_[0]) 73 $FOCUS->emit (key_down => $_[0])
45 if $FOCUS; 74 if $FOCUS;
46} 75}
47 76
48sub feed_sdl_key_up_event { 77sub feed_sdl_key_up_event {
49 $FOCUS->emit (key_up => $_[0]) || $FOCUS->key_up ($_[0]) 78 $FOCUS->emit (key_up => $_[0])
50 if $FOCUS; 79 if $FOCUS;
51} 80}
52 81
53sub feed_sdl_button_down_event { 82sub feed_sdl_button_down_event {
54 my ($ev) = @_; 83 my ($ev) = @_;
… …
63 check_tooltip; 92 check_tooltip;
64 } 93 }
65 94
66 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 95 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
67 96
68 if ($GRAB) { 97 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
69 ($x, $y) = $GRAB->coord2local ($x, $y); 98 if $GRAB;
70 $GRAB->emit (button_down => $ev, $x, $y) || $GRAB->button_down ($ev, $x, $y);
71 }
72} 99}
73 100
74sub feed_sdl_button_up_event { 101sub feed_sdl_button_up_event {
75 my ($ev) = @_; 102 my ($ev) = @_;
76 my ($x, $y) = ($ev->{x}, $ev->{y}); 103 my ($x, $y) = ($ev->{x}, $ev->{y});
77 104
78 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 105 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
79 106
80 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); 107 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
81 108
82 if ($GRAB) { 109 $GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y))
83 ($x, $y) = $GRAB->coord2local ($x, $y); 110 if $GRAB;
84 $GRAB->emit (button_up => $ev, $x, $y) || $GRAB->button_up ($ev, $x, $y);
85 }
86 111
87 if (!$BUTTON_STATE) { 112 if (!$BUTTON_STATE) {
88 my $grab = $GRAB; undef $GRAB; 113 my $grab = $GRAB; undef $GRAB;
89 $grab->update if $grab; 114 $grab->update if $grab;
90 $GRAB->update if $GRAB; 115 $GRAB->update if $GRAB;
… …
106 $HOVER->update if $HOVER && $HOVER->{can_hover}; 131 $HOVER->update if $HOVER && $HOVER->{can_hover};
107 132
108 check_tooltip; 133 check_tooltip;
109 } 134 }
110 135
111 if ($HOVER) {
112 ($x, $y) = $HOVER->coord2local ($x, $y);
113 $HOVER->emit (mouse_motion => $ev, $x, $y) || $HOVER->mouse_motion ($ev, $x, $y); 136 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
114 } 137 if $HOVER;
115} 138}
116 139
117# convert position array to integers 140# convert position array to integers
118sub harmonize { 141sub harmonize {
119 my ($vals) = @_; 142 my ($vals) = @_;
… …
125 $rem += $_ - $i; 148 $rem += $_ - $i;
126 $_ = $i; 149 $_ = $i;
127 } 150 }
128} 151}
129 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
130############################################################################# 194#############################################################################
131 195
132package CFClient::UI::Base; 196package CFClient::UI::Base;
133 197
134use strict; 198use strict;
… …
137 201
138sub new { 202sub new {
139 my $class = shift; 203 my $class = shift;
140 204
141 my $self = bless { 205 my $self = bless {
142 x => 0, 206 x => "center",
143 y => 0, 207 y => "center",
144 z => 0, 208 z => 0,
209 w => undef,
210 h => undef,
145 can_events => 1, 211 can_events => 1,
146 @_ 212 @_
147 }, $class; 213 }, $class;
148 214
215 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
216
149 for (keys %$self) { 217 for (keys %$self) {
150 if (/^connect_(.*)$/) { 218 if (/^on_(.*)$/) {
151 $self->connect ($1 => delete $self->{$_}); 219 $self->connect ($1 => delete $self->{$_});
152 } 220 }
153 } 221 }
154 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
155 $self 235 $self
156} 236}
157 237
158sub destroy { 238sub destroy {
159 my ($self) = @_; 239 my ($self) = @_;
… …
168 return if $self->{parent}; 248 return if $self->{parent};
169 249
170 $CFClient::UI::ROOT->add ($self); 250 $CFClient::UI::ROOT->add ($self);
171} 251}
172 252
173sub hide { 253sub set_visible {
174 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};
175 277
176 undef $GRAB if $GRAB == $self; 278 undef $GRAB if $GRAB == $self;
177 undef $HOVER if $HOVER == $self; 279 undef $HOVER if $HOVER == $self;
178 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
179 $self->{parent}->remove ($self) 311 $self->{parent}->remove ($self)
180 if $self->{parent}; 312 if $self->{parent};
181} 313}
182 314
183sub move { 315sub move_abs {
184 my ($self, $x, $y, $z) = @_; 316 my ($self, $x, $y, $z) = @_;
185 317
186 $self->{x} = int $x; 318 $self->{x} = List::Util::max 0, int $x;
187 $self->{y} = int $y; 319 $self->{y} = List::Util::max 0, int $y;
188 $self->{z} = $z if defined $z; 320 $self->{z} = $z if defined $z;
189 321
190 $self->update; 322 $self->update;
191} 323}
192 324
193sub set_size { 325sub set_size {
194 my ($self, $w, $h) = @_; 326 my ($self, $w, $h) = @_;
195 327
196 $self->{user_w} = $w; 328 $self->{force_w} = $w;
197 $self->{user_h} = $h; 329 $self->{force_h} = $h;
198 330
199 $self->check_size; 331 $self->realloc;
200} 332}
201 333
202sub size_request { 334sub size_request {
203 require Carp; 335 require Carp;
204 Carp::confess "size_request is abstract"; 336 Carp::confess "size_request is abstract";
… …
206 338
207sub configure { 339sub configure {
208 my ($self, $x, $y, $w, $h) = @_; 340 my ($self, $x, $y, $w, $h) = @_;
209 341
210 if ($self->{aspect}) { 342 if ($self->{aspect}) {
343 my ($ow, $oh) = ($w, $h);
344
211 my $w2 = List::Util::min $w, int $h * $self->{aspect}; 345 $w = List::Util::min $w, int $h * $self->{aspect};
212 my $h2 = List::Util::min $h, int $w / $self->{aspect}; 346 $h = List::Util::min $h, int $w / $self->{aspect};
213 347
214 # use alignment to adjust x, y 348 # use alignment to adjust x, y
215 349
216 $x += int +($w - $w2) * 0.5; 350 $x += int 0.5 * ($ow - $w);
217 $y += int +($h - $h2) * 0.5; 351 $y += int 0.5 * ($oh - $h);
218
219 ($w, $h) = ($w2, $h2);
220 } 352 }
221 353
222 if ($self->{x} != $x || $self->{y} != $y) { 354 if ($self->{x} ne $x || $self->{y} ne $y) {
223 $self->{x} = $x; 355 $self->{x} = $x;
224 $self->{y} = $y; 356 $self->{y} = $y;
225 $self->update; 357 $self->update;
226 } 358 }
227 359
228 if ($self->{w} != $w || $self->{h} != $h) { 360 if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
361 return unless $self->{visible};
362
229 $self->{w} = $w; 363 $self->{alloc_w} = $w;
230 $self->{h} = $h; 364 $self->{alloc_h} = $h;
231 365
232 $self->size_allocate ($w, $h); 366 $self->{root}{size_alloc}{$self+0} = $self;
233 $self->update;
234 } 367 }
235} 368}
236 369
237sub size_allocate { 370sub size_allocate {
238 # nothing to be done 371 # nothing to be done
239} 372}
240 373
374sub children {
375}
376
241sub set_max_size { 377sub set_max_size {
242 my ($self, $w, $h) = @_; 378 my ($self, $w, $h) = @_;
243 379
244 delete $self->{max_w}; $self->{max_w} = $w if $w; 380 delete $self->{max_w}; $self->{max_w} = $w if $w;
245 delete $self->{max_h}; $self->{max_h} = $h if $h; 381 delete $self->{max_h}; $self->{max_h} = $h if $h;
246} 382}
247 383
248# return top left coordinates 384sub set_tooltip {
249sub _topleft {
250 my ($self, $x, $y) = @_; 385 my ($self, $tooltip) = @_;
251 386
252 $self->{parent} 387 $tooltip =~ s/^\s+//;
253 or Carp::confess "no parent widget in _topleft\n";#d# 388 $tooltip =~ s/\s+$//;
254 389
255 $self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y}); 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 }
256} 398}
257 399
258# translate global coordinates to local coordinate system 400# translate global coordinates to local coordinate system
259sub coord2local { 401sub coord2local {
260 my ($self, $x, $y) = @_; 402 my ($self, $x, $y) = @_;
261 403
262 my ($X, $Y) = $self->_topleft; 404 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
263 ($x - $X, $y - $Y)
264} 405}
265 406
266# translate local coordinates to global coordinate system 407# translate local coordinates to global coordinate system
267sub coord2global { 408sub coord2global {
268 my ($self, $x, $y) = @_; 409 my ($self, $x, $y) = @_;
269 410
270 my ($X, $Y) = $self->_topleft; 411 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
271 ($x + $X, $y + $Y)
272} 412}
273 413
274sub focus_in { 414sub focus_in {
275 my ($self) = @_; 415 my ($self) = @_;
276 416
277 return if $FOCUS == $self; 417 return if $FOCUS == $self;
278 return unless $self->{can_focus}; 418 return unless $self->{can_focus};
279 419
280 my $focus = $FOCUS; $FOCUS = $self; 420 my $focus = $FOCUS; $FOCUS = $self;
281 421
282 $self->emit (focus_in => $focus); 422 $self->_emit (focus_in => $focus);
283 423
284 $focus->update if $focus; 424 $focus->update if $focus;
285 $FOCUS->update; 425 $FOCUS->update;
286} 426}
287 427
… …
290 430
291 return unless $FOCUS == $self; 431 return unless $FOCUS == $self;
292 432
293 my $focus = $FOCUS; undef $FOCUS; 433 my $focus = $FOCUS; undef $FOCUS;
294 434
295 $self->emit (focus_out => $focus); 435 $self->_emit (focus_out => $focus);
296 436
297 $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;
298} 441}
299 442
300sub mouse_motion { } 443sub mouse_motion { }
301sub button_up { } 444sub button_up { }
302sub key_down { } 445sub key_down { }
303sub key_up { } 446sub key_up { }
304 447
305sub button_down { 448sub button_down {
306 my ($self, $ev, $x, $y) = @_; 449 my ($self, $ev, $x, $y) = @_;
307 450
308 $self->focus_in; 451 $self->focus_in;
… …
311sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 454sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }
312sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 455sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }
313sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 456sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }
314sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 457sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }
315sub 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}
316 529
317sub draw { 530sub draw {
318 my ($self) = @_; 531 my ($self) = @_;
319 532
320 return unless $self->{h} && $self->{w}; 533 return unless $self->{h} && $self->{w};
… …
337 glVertex $x , $y + $self->{h}; 550 glVertex $x , $y + $self->{h};
338 glEnd; 551 glEnd;
339 glDisable GL_BLEND; 552 glDisable GL_BLEND;
340 } 553 }
341 554
342 if ($ENV{PCLIENT_DEBUG}) { 555 if ($ENV{CFPLUS_DEBUG} & 1) {
343 glPushMatrix; 556 glPushMatrix;
344 glColor 1, 1, 0, 1; 557 glColor 1, 1, 0, 1;
345 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 558 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
346 glBegin GL_LINE_LOOP; 559 glBegin GL_LINE_LOOP;
347 glVertex 0 , 0; 560 glVertex 0 , 0;
348 glVertex $self->{w}, 0; 561 glVertex $self->{w} - 1, 0;
349 glVertex $self->{w}, $self->{h}; 562 glVertex $self->{w} - 1, $self->{h} - 1;
350 glVertex 0 , $self->{h}; 563 glVertex 0 , $self->{h} - 1;
351 glEnd; 564 glEnd;
352 glPopMatrix; 565 glPopMatrix;
353 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;
354 } 567 }
355} 568}
356 569
357sub _draw { 570sub _draw {
358 my ($self) = @_; 571 my ($self) = @_;
359 572
360 warn "no draw defined for $self\n"; 573 warn "no draw defined for $self\n";
361} 574}
362 575
363sub find_widget {
364 my ($self, $x, $y) = @_;
365
366 return () unless $self->{can_events};
367
368 return $self
369 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
370 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
371
372 ()
373}
374
375sub set_parent {
376 my ($self, $parent) = @_;
377
378 Scalar::Util::weaken ($self->{parent} = $parent);
379}
380
381sub check_size {
382 my ($self) = @_;
383
384 $self->{parent}
385 or return 1;
386
387 my ($w, $h) = $self->{user_w} && $self->{user_h}
388 ? @$self{qw(user_w user_h)}
389 : $self->size_request;
390
391 if ($w != $self->{req_w} || $h != $self->{req_h}) {
392 $self->{req_w} = $w;
393 $self->{req_h} = $h;
394
395 $self->{parent}->check_size
396 or $self->size_allocate (
397 (List::Util::max $self->{w}, $w),
398 (List::Util::max $self->{h}, $h),
399 );
400
401 1
402 } else {
403 0
404 }
405}
406
407sub update {
408 my ($self) = @_;
409
410 $self->{parent}->update
411 if $self->{parent};
412}
413
414sub connect {
415 my ($self, $signal, $cb) = @_;
416
417 push @{ $self->{signal_cb}{$signal} }, $cb;
418}
419
420sub emit {
421 my ($self, $signal, @args) = @_;
422
423 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
424}
425
426sub DESTROY { 576sub DESTROY {
427 my ($self) = @_; 577 my ($self) = @_;
428 578
579 delete $WIDGET{$self+0};
429 #$self->deactivate; 580 #$self->deactivate;
430} 581}
431 582
432############################################################################# 583#############################################################################
433 584
… …
442 my $class = shift; 593 my $class = shift;
443 594
444 # range [value, low, high, page] 595 # range [value, low, high, page]
445 596
446 $class->SUPER::new ( 597 $class->SUPER::new (
447 bg => [0, 0, 0, 0.2], 598 #bg => [0, 0, 0, 0.2],
448 active_bg => [1, 1, 1, 0.5], 599 #active_bg => [1, 1, 1, 0.5],
449 @_ 600 @_
450 ) 601 )
451} 602}
452 603
453sub _draw { 604sub _draw {
454 my ($self) = @_; 605 my ($self) = @_;
455 606
607 my $color = $FOCUS == $self && $self->{active_bg}
608 ? $self->{active_bg}
609 : $self->{bg};
610
611 if ($color && (@$color < 4 || $color->[3])) {
456 my ($w, $h) = @$self{qw(w h)}; 612 my ($w, $h) = @$self{qw(w h)};
457 613
458 glEnable GL_BLEND; 614 glEnable GL_BLEND;
459 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 615 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
460 glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} }; 616 glColor @$color;
461 617
462 glBegin GL_QUADS; 618 glBegin GL_QUADS;
463 glVertex 0 , 0; 619 glVertex 0 , 0;
464 glVertex 0 , $h; 620 glVertex 0 , $h;
465 glVertex $w, $h; 621 glVertex $w, $h;
466 glVertex $w, 0; 622 glVertex $w, 0;
467 glEnd; 623 glEnd;
468 624
469 glDisable GL_BLEND; 625 glDisable GL_BLEND;
626 }
470} 627}
471 628
472############################################################################# 629#############################################################################
473 630
474package CFClient::UI::Empty; 631package CFClient::UI::Empty;
… …
479 my ($class, %arg) = @_; 636 my ($class, %arg) = @_;
480 $class->SUPER::new (can_events => 0, %arg); 637 $class->SUPER::new (can_events => 0, %arg);
481} 638}
482 639
483sub size_request { 640sub size_request {
484 (0, 0) 641 my ($self) = @_;
642
643 ($self->{w} + 0, $self->{h} + 0)
485} 644}
486 645
487sub draw { } 646sub draw { }
488 647
489############################################################################# 648#############################################################################
… …
506 665
507 $self 666 $self
508} 667}
509 668
510sub add { 669sub add {
511 my ($self, $child) = @_; 670 my ($self, @widgets) = @_;
512 671
513 $child->set_parent ($self); 672 $_->set_parent ($self)
673 for @widgets;
514 674
515 use sort 'stable'; 675 use sort 'stable';
516 676
517 $self->{children} = [ 677 $self->{children} = [
518 sort { $a->{z} <=> $b->{z} } 678 sort { $a->{z} <=> $b->{z} }
519 @{$self->{children}}, $child 679 @{$self->{children}}, @widgets
520 ]; 680 ];
521 681
522 $child->check_size; 682 $self->realloc;
683}
684
685sub children {
686 @{ $_[0]{children} }
523} 687}
524 688
525sub remove { 689sub remove {
526 my ($self, $child) = @_; 690 my ($self, $child) = @_;
527 691
528 delete $child->{parent}; 692 delete $child->{parent};
529 $child->hide; 693 $child->hide;
530 694
531 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 695 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
532 696
533 $self->check_size; 697 $self->realloc;
534 $self->update;
535} 698}
536 699
537sub clear { 700sub clear {
538 my ($self) = @_; 701 my ($self) = @_;
539 702
… …
542 705
543 for (@$children) { 706 for (@$children) {
544 delete $_->{parent}; 707 delete $_->{parent};
545 $_->hide; 708 $_->hide;
546 } 709 }
710
711 $self->realloc;
547} 712}
548 713
549sub find_widget { 714sub find_widget {
550 my ($self, $x, $y) = @_; 715 my ($self, $x, $y) = @_;
551 716
… …
626} 791}
627 792
628sub update { 793sub update {
629 my ($self) = @_; 794 my ($self) = @_;
630 795
631 # we want to do this delayed... 796 $ROOT->on_post_alloc ($self => sub { $self->render_child });
632 $self->render_chld;
633 $self->SUPER::update; 797 $self->SUPER::update;
634}
635
636sub render_chld {
637 my ($self) = @_;
638
639 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
640 glClearColor 0, 0, 0, 1;
641 glClear GL_COLOR_BUFFER_BIT;
642 $self->child->draw;
643 };
644} 798}
645 799
646sub size_allocate { 800sub size_allocate {
647 my ($self, $w, $h) = @_; 801 my ($self, $w, $h) = @_;
648 802
649 $self->child->configure (0, 0, $w, $h); 803 $self->SUPER::size_allocate ($w, $h);
804 $self->update;
805}
650 806
807sub _render {
808 $_[0]{children}[0]->draw;
809}
810
811sub render_child {
812 my ($self) = @_;
813
814 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
815 glClearColor 0, 0, 0, 0;
816 glClear GL_COLOR_BUFFER_BIT;
817
651 $self->render_chld; 818 $self->_render;
819 };
652} 820}
653 821
654sub _draw { 822sub _draw {
655 my ($self) = @_; 823 my ($self) = @_;
656 824
657 my ($w, $h) = ($self->w, $self->h); 825 my ($w, $h) = ($self->w, $self->h);
658 826
659 my $tex = $self->{texture} 827 my $tex = $self->{texture}
660 or return; 828 or return;
661 829
662 glEnable GL_BLEND;
663 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
664 glEnable GL_TEXTURE_2D; 830 glEnable GL_TEXTURE_2D;
665 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 831 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
832 glColor 1, 1, 1, 1;
666 833
667 $tex->draw_quad (0, 0, $w, $h); 834 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
668 835
669 glDisable GL_BLEND;
670 glDisable GL_TEXTURE_2D; 836 glDisable GL_TEXTURE_2D;
671} 837}
672 838
673############################################################################# 839#############################################################################
674 840
675package CFClient::UI::ViewPort; 841package CFClient::UI::ViewPort;
676 842
677our @ISA = CFClient::UI::Window::; 843our @ISA = CFClient::UI::Window::;
678
679sub new { die }
680
681sub size_request {
682 my ($self) = @_;
683
684 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
685 $self->child->size_allocate (0, 0, @$self{qw(child_w child_h)});
686
687 @$self{qw(child_w child_h)}
688}
689
690sub _draw {
691 my ($self) = @_;
692
693 $self->{children}[1]->draw;
694}
695
696
697#############################################################################
698
699package CFClient::UI::Frame;
700
701our @ISA = CFClient::UI::Bin::;
702
703use CFClient::OpenGL;
704 844
705sub new { 845sub new {
706 my $class = shift; 846 my $class = shift;
707 847
708 my $self = $class->SUPER::new ( 848 $class->SUPER::new (
709 bg => [1, 1, 1, 1], 849 scroll_x => 0,
710 border_bg => [1, 1, 1, 1], 850 scroll_y => 1,
711 border => 0.8,
712 @_ 851 @_,
713 ); 852 )
714
715 $self
716} 853}
717 854
718sub _draw { 855sub size_request {
856 my ($self) = @_;
857
858 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
859
860 $w = 10 if $self->{scroll_x};
861 $h = 10 if $self->{scroll_y};
862
863 ($w, $h)
864}
865
866sub size_allocate {
719 my ($self) = @_; 867 my ($self, $w, $h) = @_;
720 868
721 my ($w, $h) = ($self->{w}, $self->{h}); 869 my $child = $self->child;
722 870
723 glEnable GL_BLEND; 871 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
724 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 872 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
725 glEnable GL_TEXTURE_2D;
726 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
727 873
728# glBegin GL_QUADS; 874 $self->child->configure (0, 0, $w, $h);
729# glColor 0, 0, 0, 0; 875 $self->update;
730# glVertex 0 , 0; 876}
731# glVertex 0 , $h;
732# glVertex $w, $h;
733# glVertex $w, 0;
734# glEnd;
735 877
878sub set_offset {
879 my ($self, $x, $y) = @_;
736 880
737 $self->child->draw; 881 $self->{view_x} = int $x;
738 glDisable GL_BLEND; 882 $self->{view_y} = int $y;
739 glDisable GL_TEXTURE_2D; 883
884 $self->update;
885}
886
887# hmm, this does not work for topleft of $self... but we should not ask for that
888sub coord2local {
889 my ($self, $x, $y) = @_;
890
891 $self->SUPER::coord2local ($x + $self->{view_x}, $y + $self->{view_y})
892}
893
894sub coord2global {
895 my ($self, $x, $y) = @_;
896
897 $x = List::Util::min $self->{w}, $x - $self->{view_x};
898 $y = List::Util::min $self->{h}, $y - $self->{view_y};
899
900 $self->SUPER::coord2global ($x, $y)
901}
902
903sub find_widget {
904 my ($self, $x, $y) = @_;
905
906 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
907 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
908 ) {
909 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
910 } else {
911 $self->CFClient::UI::Base::find_widget ($x, $y)
912 }
913}
914
915sub _render {
916 my ($self) = @_;
917
918 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
919
920 $self->SUPER::_render;
740} 921}
741 922
742############################################################################# 923#############################################################################
743 924
744package CFClient::UI::FancyFrame; 925package CFClient::UI::ScrolledWindow;
745 926
746our @ISA = CFClient::UI::Bin::; 927our @ISA = CFClient::UI::HBox::;
747
748use CFClient::OpenGL;
749
750my @tex =
751 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
752 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
753 928
754sub new { 929sub new {
755 my $class = shift; 930 my $class = shift;
756 931
757 # TODO: user_x, user_y, overwrite moveto? 932 my $self;
933
934 my $slider = new CFClient::UI::Slider
935 vertical => 1,
936 range => [0, 0, 1, 0.01], # HACK fix
937 on_changed => sub {
938 $self->{vp}->set_offset (0, $_[1]);
939 },
940 ;
941
942 $self = $class->SUPER::new (
943 vp => (new CFClient::UI::ViewPort expand => 1),
944 slider => $slider,
945 @_,
946 );
947
948 $self->{vp}->add ($self->{scrolled});
949 $self->add ($self->{vp});
950 $self->add ($self->{slider});
951
952 $self
953}
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
974#TODO# update range on size_allocate depending on child
975# update viewport offset on scroll
976
977#############################################################################
978
979package CFClient::UI::Frame;
980
981our @ISA = CFClient::UI::Bin::;
982
983use CFClient::OpenGL;
984
985sub new {
986 my $class = shift;
987
988 $class->SUPER::new (
989 bg => undef,
990 @_,
991 )
992}
993
994sub _draw {
995 my ($self) = @_;
996
997 if ($self->{bg}) {
998 my ($w, $h) = @$self{qw(w h)};
999
1000 glEnable GL_BLEND;
1001 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1002 glColor @{ $self->{bg} };
1003
1004 glBegin GL_QUADS;
1005 glVertex 0 , 0;
1006 glVertex 0 , $h;
1007 glVertex $w, $h;
1008 glVertex $w, 0;
1009 glEnd;
1010
1011 glDisable GL_BLEND;
1012 }
1013
1014 $self->SUPER::_draw;
1015}
1016
1017#############################################################################
1018
1019package CFClient::UI::FancyFrame;
1020
1021our @ISA = CFClient::UI::Bin::;
1022
1023use CFClient::OpenGL;
1024
1025my $bg =
1026 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1027 mipmap => 1, wrap => 1;
1028
1029my @border =
1030 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1031 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1032
1033sub new {
1034 my $class = shift;
758 1035
759 my $self = $class->SUPER::new ( 1036 my $self = $class->SUPER::new (
760 bg => [1, 1, 1, 1], 1037 bg => [1, 1, 1, 1],
761 border_bg => [1, 1, 1, 1], 1038 border_bg => [1, 1, 1, 1],
762 border => 0.8, 1039 border => 0.6,
763 can_events => 1, 1040 can_events => 1,
1041 min_w => 16,
1042 min_h => 16,
764 @_ 1043 @_
765 ); 1044 );
766 1045
767 $self->{title} &&= new CFClient::UI::Label 1046 $self->{title} &&= new CFClient::UI::Label
768 align => 0, 1047 align => 0,
769 valign => 1, 1048 valign => 1,
770 text => $self->{title}, 1049 text => $self->{title},
771 fontsize => 1; 1050 fontsize => $self->{border};
772 1051
773 $self 1052 $self
774} 1053}
775 1054
776sub border { 1055sub border {
… …
792 my ($self, $w, $h) = @_; 1071 my ($self, $w, $h) = @_;
793 1072
794 $h -= List::Util::max 0, $self->border * 2; 1073 $h -= List::Util::max 0, $self->border * 2;
795 $w -= List::Util::max 0, $self->border * 2; 1074 $w -= List::Util::max 0, $self->border * 2;
796 1075
797 $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)
798 if $self->{title}; 1077 if $self->{title};
799 1078
800 $self->child->configure ($self->border, $self->border, $w, $h); 1079 $self->child->configure ($self->border, $self->border, $w, $h);
801} 1080}
802 1081
803sub button_down { 1082sub button_down {
804 my ($self, $ev, $x, $y) = @_; 1083 my ($self, $ev, $x, $y) = @_;
805 1084
1085 my ($w, $h) = @$self{qw(w h)};
806 my $border = $self->border; 1086 my $border = $self->border;
807 1087
808 if ($x < $self->{w} && $x >= $self->{w} - $border 1088 my $lr = ($x >= 0 && $x < $border) || ($x > $w - $border && $x < $w);
809 && $y < $self->{h} && $y >= $self->{h} - $border) { 1089 my $td = ($y >= 0 && $y < $border) || ($y > $h - $border && $y < $h);
810 1090
1091 if ($lr & $td) {
1092 my ($wx, $wy) = ($self->{x}, $self->{y});
811 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1093 my ($ox, $oy) = ($ev->{x}, $ev->{y});
812 my ($bw, $bh) = ($self->{w}, $self->{h}); 1094 my ($bw, $bh) = ($self->{w}, $self->{h});
813 1095
1096 my $mx = $x < $border;
1097 my $my = $y < $border;
1098
814 $self->{motion} = sub { 1099 $self->{motion} = sub {
815 my ($ev, $x, $y) = @_; 1100 my ($ev, $x, $y) = @_;
816 1101
817 ($x, $y) = ($ev->{x}, $ev->{y}); 1102 my $dx = $ev->{x} - $ox;
1103 my $dy = $ev->{y} - $oy;
818 1104
819 $self->{user_w} = $bw + $x - $ox; 1105 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
820 $self->{user_h} = $bh + $y - $oy; 1106 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
821 $self->check_size; 1107
1108 $self->realloc;
1109 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
822 }; 1110 };
823 1111
824 } elsif ($x >= 0 && $x < $self->{w} 1112 } elsif ($lr ^ $td) {
825 && $y >= 0 && $y < $border) {
826
827 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1113 my ($ox, $oy) = ($ev->{x}, $ev->{y});
828 my ($bx, $by) = ($self->{x}, $self->{y}); 1114 my ($bx, $by) = ($self->{x}, $self->{y});
829 1115
830 $self->{motion} = sub { 1116 $self->{motion} = sub {
831 my ($ev, $x, $y) = @_; 1117 my ($ev, $x, $y) = @_;
832 1118
833 ($x, $y) = ($ev->{x}, $ev->{y}); 1119 ($x, $y) = ($ev->{x}, $ev->{y});
834 1120
835 $self->move ($bx + $x - $ox, $by + $y - $oy); 1121 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
836 $self->update;
837 }; 1122 };
838 } 1123 }
839} 1124}
840 1125
841sub button_up { 1126sub button_up {
… …
854 my ($self) = @_; 1139 my ($self) = @_;
855 1140
856 my ($w, $h ) = ($self->{w}, $self->{h}); 1141 my ($w, $h ) = ($self->{w}, $self->{h});
857 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1142 my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
858 1143
859 glEnable GL_BLEND;
860 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
861 glEnable GL_TEXTURE_2D; 1144 glEnable GL_TEXTURE_2D;
862 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1145 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
863 1146
864 my $border = $self->border; 1147 my $border = $self->border;
865 1148
866 glColor @{ $self->{border_bg} }; 1149 glColor @{ $self->{border_bg} };
867 $tex[1]->draw_quad (0, 0, $w, $border); 1150 $border[0]->draw_quad_alpha (0, 0, $w, $border);
868 $tex[3]->draw_quad (0, $border, $border, $ch); 1151 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
869 $tex[2]->draw_quad ($w - $border, $border, $border, $ch); 1152 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
870 $tex[4]->draw_quad (0, $h - $border, $w, $border); 1153 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
871 1154
872 my $bg = $tex[0]; 1155 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1156 glColor @{ $self->{bg} };
873 1157
874 # TODO: repeat texture not scale 1158 # TODO: repeat texture not scale
875 my $rep_x = $cw / $bg->{w}; 1159 # solve this better(?)
876 my $rep_y = $ch / $bg->{h}; 1160 $bg->{s} = $cw / $bg->{w};
877 1161 $bg->{t} = $ch / $bg->{h};
878 glColor @{ $self->{bg} };
879
880 $bg->{s} = $rep_x;
881 $bg->{t} = $rep_y;
882 $bg->{wrap_mode} = 1;
883 $bg->draw_quad ($border, $border, $cw, $ch); 1162 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1163 }
884 1164
885 glDisable GL_TEXTURE_2D; 1165 glDisable GL_TEXTURE_2D;
886 glDisable GL_BLEND;
887 1166
888 $self->{title}->draw if $self->{title}; 1167 $self->{title}->draw if $self->{title};
1168
889 $self->child->draw; 1169 $self->child->draw;
890} 1170}
891 1171
892############################################################################# 1172#############################################################################
893 1173
… …
902sub new { 1182sub new {
903 my $class = shift; 1183 my $class = shift;
904 1184
905 $class->SUPER::new ( 1185 $class->SUPER::new (
906 col_expand => [], 1186 col_expand => [],
907 @_ 1187 @_,
908 ) 1188 )
1189}
1190
1191sub children {
1192 grep $_, map @$_, grep $_, @{ $_[0]{children} }
909} 1193}
910 1194
911sub add { 1195sub add {
912 my ($self, $x, $y, $child) = @_; 1196 my ($self, $x, $y, $child) = @_;
913 1197
914 $child->set_parent ($self); 1198 $child->set_parent ($self);
915 $self->{children}[$y][$x] = $child; 1199 $self->{children}[$y][$x] = $child;
916 1200
917 $child->check_size; 1201 $self->realloc;
918} 1202}
919 1203
920# 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?
921sub clear { 1205sub clear {
922 my ($self) = @_; 1206 my ($self) = @_;
923 1207
924 my $children = delete $self->{children}; 1208 my @children = $self->children;
1209 delete $self->{children};
925 1210
926 for (grep $_, map @$_, grep $_, @$children) { 1211 for (@children) {
927 delete $_->{parent}; 1212 delete $_->{parent};
928 $_->hide; 1213 $_->hide;
929 } 1214 }
930 1215
931 $self->update; 1216 $self->realloc;
932} 1217}
933 1218
934sub get_wh { 1219sub get_wh {
935 my ($self) = @_; 1220 my ($self) = @_;
936 1221
… …
967sub size_allocate { 1252sub size_allocate {
968 my ($self, $w, $h) = @_; 1253 my ($self, $w, $h) = @_;
969 1254
970 my ($ws, $hs) = $self->get_wh; 1255 my ($ws, $hs) = $self->get_wh;
971 1256
972 my $req_w = sum @$ws; 1257 my $req_w = (sum @$ws) || 1;
973 my $req_h = sum @$hs; 1258 my $req_h = (sum @$hs) || 1;
974 1259
975 # TODO: nicer code && do row_expand 1260 # TODO: nicer code && do row_expand
976 my @col_expand = @{$self->{col_expand}}; 1261 my @col_expand = @{$self->{col_expand}};
977 @col_expand = (1) x @$ws unless @col_expand; 1262 @col_expand = (1) x @$ws unless @col_expand;
978 my $col_expand = (sum @col_expand) || 1; 1263 my $col_expand = (sum @col_expand) || 1;
… …
1032 } 1317 }
1033} 1318}
1034 1319
1035############################################################################# 1320#############################################################################
1036 1321
1037package CFClient::UI::HBox; 1322package CFClient::UI::Box;
1038
1039# TODO: wrap into common Box base class
1040 1323
1041our @ISA = CFClient::UI::Container::; 1324our @ISA = CFClient::UI::Container::;
1042 1325
1043sub size_request { 1326sub size_request {
1044 my ($self) = @_; 1327 my ($self) = @_;
1045 1328
1046 my @alloc = map [$_->size_request], @{$self->{children}}; 1329 $self->{vertical}
1047 1330 ? (
1048 ( 1331 (List::Util::max map $_->{req_w}, @{$self->{children}}),
1049 (List::Util::sum map $_->[0], @alloc), 1332 (List::Util::sum map $_->{req_h}, @{$self->{children}}),
1050 (List::Util::max map $_->[1], @alloc), 1333 )
1051 ) 1334 : (
1335 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1336 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1337 )
1052} 1338}
1053 1339
1054sub size_allocate { 1340sub size_allocate {
1055 my ($self, $w, $h) = @_; 1341 my ($self, $w, $h) = @_;
1056 1342
1057 ($h, $w) = ($w, $h); 1343 my $space = $self->{vertical} ? $h : $w;
1058
1059 my $children = $self->{children}; 1344 my $children = $self->{children};
1060 1345
1061 my @h = map $_->{req_w}, @$children; 1346 my @req;
1062 1347
1063 my $req_h = List::Util::sum @h; 1348 if ($self->{homogeneous}) {
1064 1349 @req = ($space / (@$children || 1)) x @$children;
1065 if ($req_h > $h) {
1066 # ah well, not enough space
1067 $_ *= $h / $req_h for @h;
1068 } 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 {
1069 my $exp = List::Util::sum map $_->{expand}, @$children; 1358 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1070 $exp ||= 1;
1071 1359
1360 $space = ($space - $req) / $expand; # remaining space to give away
1361
1362 $req[$_] += $space * $children->[$_]{expand}
1072 for (0 .. $#$children) { 1363 for 0 .. $#$children;
1073 my $child = $children->[$_];
1074
1075 my $alloc_h = $h[$_];
1076 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1077 $h[$_] = $alloc_h;
1078 } 1364 }
1079 } 1365 }
1080 1366
1081 CFClient::UI::harmonize \@h; 1367 CFClient::UI::harmonize \@req;
1082 1368
1083 my $y = 0; 1369 my $pos = 0;
1084 for (0 .. $#$children) { 1370 for (0 .. $#$children) {
1085 my $child = $children->[$_];
1086 my $h = $h[$_]; 1371 my $alloc = $req[$_];
1087 $child->configure ($y, 0, $h, $w); 1372 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1088 1373
1089 $y += $h; 1374 $pos += $alloc;
1090 } 1375 }
1091 1376
1092 1 1377 1
1093} 1378}
1094 1379
1095############################################################################# 1380#############################################################################
1096 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
1097package CFClient::UI::VBox; 1397package CFClient::UI::VBox;
1098 1398
1099# TODO: wrap into common Box base class
1100
1101our @ISA = CFClient::UI::Container::; 1399our @ISA = CFClient::UI::Box::;
1102 1400
1103sub size_request { 1401sub new {
1104 my ($self) = @_; 1402 my $class = shift;
1105 1403
1106 my @alloc = map [$_->size_request], @{$self->{children}}; 1404 $class->SUPER::new (
1107 1405 vertical => 1,
1108 ( 1406 @_,
1109 (List::Util::max map $_->[0], @alloc),
1110 (List::Util::sum map $_->[1], @alloc),
1111 ) 1407 )
1112} 1408}
1113 1409
1114sub size_allocate {
1115 my ($self, $w, $h) = @_;
1116
1117 my $children = $self->{children};
1118
1119 my @h = map $_->{req_h}, @$children;
1120
1121 my $req_h = List::Util::sum @h;
1122
1123 if ($req_h > $h) {
1124 # ah well, not enough space
1125 $_ *= $h / $req_h for @h;
1126 } else {
1127 my $exp = List::Util::sum map $_->{expand}, @$children;
1128 $exp ||= 1;
1129
1130 for (0 .. $#$children) {
1131 my $child = $children->[$_];
1132
1133 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1134 }
1135 }
1136
1137 CFClient::UI::harmonize \@h;
1138
1139 my $y = 0;
1140 for (0 .. $#$children) {
1141 my $child = $children->[$_];
1142 my $h = $h[$_];
1143 $child->configure (0, $y, $w, $h);
1144
1145 $y += $h;
1146 }
1147
1148 1
1149}
1150
1151############################################################################# 1410#############################################################################
1152 1411
1153package CFClient::UI::Label; 1412package CFClient::UI::Label;
1154 1413
1155our @ISA = CFClient::UI::Base::; 1414our @ISA = CFClient::UI::DrawBG::;
1156 1415
1157use CFClient::OpenGL; 1416use CFClient::OpenGL;
1158 1417
1159sub new { 1418sub new {
1160 my ($class, %arg) = @_; 1419 my ($class, %arg) = @_;
1161 1420
1162 my $self = $class->SUPER::new ( 1421 my $self = $class->SUPER::new (
1163 fg => [1, 1, 1], 1422 fg => [1, 1, 1],
1423 #bg => none
1424 #active_bg => none
1164 #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),
1165 fontsize => 1, 1431 fontsize => 1,
1166 text => "",
1167 align => -1, 1432 align => -1,
1168 valign => -1, 1433 valign => -1,
1169 padding => 2, 1434 padding_x => 2,
1170 layout => new CFClient::Layout, 1435 padding_y => 2,
1171 can_events => 0, 1436 can_events => 0,
1172 %arg 1437 %arg
1173 ); 1438 );
1174 1439
1175 if (exists $self->{template}) { 1440 if (exists $self->{template}) {
1176 my $layout = new CFClient::Layout; 1441 my $layout = new CFClient::Layout;
1177 $layout->set_text (delete $self->{template}); 1442 $layout->set_text (delete $self->{template});
1178 $self->{template} = $layout; 1443 $self->{template} = $layout;
1179 } 1444 }
1180 1445
1181 $self->set_text (delete $self->{text}) if exists $self->{text}; 1446 if (exists $self->{markup}) {
1182 $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 }
1183 1451
1184 $self 1452 $self
1185} 1453}
1186 1454
1187sub escape { 1455sub escape($) {
1188 local $_ = $_[1]; 1456 local $_ = $_[0];
1189 1457
1190 s/&/&amp;/g; 1458 s/&/&amp;/g;
1191 s/>/&gt;/g; 1459 s/>/&gt;/g;
1192 s/</&lt;/g; 1460 s/</&lt;/g;
1193 1461
1194 $_[1] 1462 $_
1463}
1464
1465sub update {
1466 my ($self) = @_;
1467
1468 delete $self->{texture};
1469 $self->SUPER::update;
1195} 1470}
1196 1471
1197sub set_text { 1472sub set_text {
1198 my ($self, $text) = @_; 1473 my ($self, $text) = @_;
1199 1474
1475 return if $self->{text} eq "T$text";
1476 $self->{text} = "T$text";
1477
1478 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1200 $self->{layout}->set_text ($text); 1479 $self->{layout}->set_text ($text);
1201 1480
1202 delete $self->{texture}; 1481 $self->realloc;
1203 $self->check_size;
1204 $self->update; 1482 $self->update;
1205} 1483}
1206 1484
1207sub set_markup { 1485sub set_markup {
1208 my ($self, $markup) = @_; 1486 my ($self, $markup) = @_;
1209 1487
1488 return if $self->{text} eq "M$markup";
1489 $self->{text} = "M$markup";
1490
1491 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1492
1493 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1210 $self->{layout}->set_markup ($markup); 1494 $self->{layout}->set_markup ($markup);
1211 1495
1212 delete $self->{texture}; 1496 $self->realloc;
1213 $self->check_size;
1214 $self->update; 1497 $self->update;
1215} 1498}
1216 1499
1217sub size_request { 1500sub size_request {
1218 my ($self) = @_; 1501 my ($self) = @_;
1219 1502
1220 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1503 $self->{layout}->set_font ($self->{font}) if $self->{font};
1221 $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});
1222 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1507 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1223 1508
1224 my ($w, $h) = $self->{layout}->size; 1509 my ($w, $h) = $self->{layout}->size;
1225 1510
1226 if (exists $self->{template}) { 1511 if (exists $self->{template}) {
… …
1231 1516
1232 $w = List::Util::max $w, $w2; 1517 $w = List::Util::max $w, $w2;
1233 $h = List::Util::max $h, $h2; 1518 $h = List::Util::max $h, $h2;
1234 } 1519 }
1235 1520
1236 ( 1521 ($w, $h)
1237 $w + $self->{padding} * 2,
1238 $h + $self->{padding} * 2,
1239 )
1240} 1522}
1241 1523
1242sub size_allocate { 1524sub size_allocate {
1243 my ($self, $w, $h) = @_; 1525 my ($self, $w, $h) = @_;
1244 1526
… …
1248sub set_fontsize { 1530sub set_fontsize {
1249 my ($self, $fontsize) = @_; 1531 my ($self, $fontsize) = @_;
1250 1532
1251 $self->{fontsize} = $fontsize; 1533 $self->{fontsize} = $fontsize;
1252 delete $self->{texture}; 1534 delete $self->{texture};
1253 $self->check_size; 1535
1254 $self->update; 1536 $self->realloc;
1255} 1537}
1256 1538
1257sub _draw { 1539sub _draw {
1258 my ($self) = @_; 1540 my ($self) = @_;
1259 1541
1542 $self->SUPER::_draw; # draw background, if applicable
1543
1260 my $tex = $self->{texture} ||= do { 1544 my $tex = $self->{texture} ||= do {
1545 $self->{layout}->set_foreground (@{$self->{fg}});
1261 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1546 $self->{layout}->set_font ($self->{font}) if $self->{font};
1262 $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});
1263 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1550 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1551
1264 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
1265 }; 1563 };
1266 1564
1267 glEnable GL_BLEND;
1268 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1269 glEnable GL_TEXTURE_2D; 1565 glEnable GL_TEXTURE_2D;
1270 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1566 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1271 1567
1568 if ($tex->{format} == GL_ALPHA) {
1272 glColor @{$self->{fg}}; 1569 glColor @{$self->{fg}};
1273
1274 $self->{ox} = int (
1275 $self->{align} < 0 ? $self->{padding}
1276 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1277 : ($self->{w} - $tex->{w}) * 0.5
1278 );
1279
1280 $self->{oy} = int (
1281 $self->{valign} < 0 ? $self->{padding}
1282 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1283 : ($self->{h} - $tex->{h}) * 0.5
1284 );
1285
1286 $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 }
1287 1574
1288 glDisable GL_TEXTURE_2D; 1575 glDisable GL_TEXTURE_2D;
1289 glDisable GL_BLEND;
1290} 1576}
1291 1577
1292############################################################################# 1578#############################################################################
1293 1579
1294package CFClient::UI::EntryBase; 1580package CFClient::UI::EntryBase;
… …
1307 active_fg => [0, 0, 0], 1593 active_fg => [0, 0, 0],
1308 can_hover => 1, 1594 can_hover => 1,
1309 can_focus => 1, 1595 can_focus => 1,
1310 valign => 0, 1596 valign => 0,
1311 can_events => 1, 1597 can_events => 1,
1598 #text => ...
1312 @_ 1599 @_
1313 ) 1600 )
1314} 1601}
1315 1602
1316sub _set_text { 1603sub _set_text {
… …
1326 $self->{text} = $text; 1613 $self->{text} = $text;
1327 1614
1328 $text =~ s/./*/g if $self->{hidden}; 1615 $text =~ s/./*/g if $self->{hidden};
1329 $self->{layout}->set_text ("$text "); 1616 $self->{layout}->set_text ("$text ");
1330 1617
1331 $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;
1332} 1628}
1333 1629
1334sub get_text { 1630sub get_text {
1335 $_[0]{text} 1631 $_[0]{text}
1336} 1632}
… …
1339 my ($self) = @_; 1635 my ($self) = @_;
1340 1636
1341 my ($w, $h) = $self->SUPER::size_request; 1637 my ($w, $h) = $self->SUPER::size_request;
1342 1638
1343 ($w + 1, $h) # add 1 for cursor 1639 ($w + 1, $h) # add 1 for cursor
1344}
1345
1346sub size_allocate {
1347 my ($self, $w, $h) = @_;
1348
1349 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1350}
1351
1352sub set_text {
1353 my ($self, $text) = @_;
1354
1355 $self->{cursor} = length $text;
1356 $self->_set_text ($text);
1357 $self->update;
1358} 1640}
1359 1641
1360sub key_down { 1642sub key_down {
1361 my ($self, $ev) = @_; 1643 my ($self, $ev) = @_;
1362 1644
… …
1364 my $sym = $ev->{sym}; 1646 my $sym = $ev->{sym};
1365 my $uni = $ev->{unicode}; 1647 my $uni = $ev->{unicode};
1366 1648
1367 my $text = $self->get_text; 1649 my $text = $self->get_text;
1368 1650
1369 if ($sym == 8) { 1651 if ($uni == 8) {
1370 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1652 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1371 } elsif ($sym == 127) { 1653 } elsif ($uni == 127) {
1372 substr $text, $self->{cursor}, 1, ""; 1654 substr $text, $self->{cursor}, 1, "";
1373 } elsif ($sym == CFClient::SDLK_LEFT) { 1655 } elsif ($sym == CFClient::SDLK_LEFT) {
1374 --$self->{cursor} if $self->{cursor}; 1656 --$self->{cursor} if $self->{cursor};
1375 } elsif ($sym == CFClient::SDLK_RIGHT) { 1657 } elsif ($sym == CFClient::SDLK_RIGHT) {
1376 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1658 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1377 } elsif ($sym == CFClient::SDLK_HOME) { 1659 } elsif ($sym == CFClient::SDLK_HOME) {
1378 $self->{cursor} = 0; 1660 $self->{cursor} = 0;
1379 } elsif ($sym == CFClient::SDLK_END) { 1661 } elsif ($sym == CFClient::SDLK_END) {
1380 $self->{cursor} = length $text; 1662 $self->{cursor} = length $text;
1381 } elsif ($sym == 27) { 1663 } elsif ($uni == 27) {
1382 $self->emit ('escape'); 1664 $self->_emit ('escape');
1383 } elsif ($uni) { 1665 } elsif ($uni) {
1384 substr $text, $self->{cursor}++, 0, chr $uni; 1666 substr $text, $self->{cursor}++, 0, chr $uni;
1385 } 1667 }
1386 1668
1387 $self->_set_text ($text); 1669 $self->_set_text ($text);
1388 $self->update; 1670
1671 $self->realloc;
1389} 1672}
1390 1673
1391sub focus_in { 1674sub focus_in {
1392 my ($self) = @_; 1675 my ($self) = @_;
1393 1676
… …
1473 if ($sym == 13) { 1756 if ($sym == 13) {
1474 unshift @{$self->{history}}, 1757 unshift @{$self->{history}},
1475 my $txt = $self->get_text; 1758 my $txt = $self->get_text;
1476 $self->{history_pointer} = -1; 1759 $self->{history_pointer} = -1;
1477 $self->{history_saveback} = ''; 1760 $self->{history_saveback} = '';
1478 $self->emit (activate => $txt); 1761 $self->_emit (activate => $txt);
1479 $self->update; 1762 $self->update;
1480 1763
1481 } elsif ($sym == CFClient::SDLK_UP) { 1764 } elsif ($sym == CFClient::SDLK_UP) {
1482 if ($self->{history_pointer} < 0) { 1765 if ($self->{history_pointer} < 0) {
1483 $self->{history_saveback} = $self->get_text; 1766 $self->{history_saveback} = $self->get_text;
… …
1520 1803
1521sub new { 1804sub new {
1522 my $class = shift; 1805 my $class = shift;
1523 1806
1524 $class->SUPER::new ( 1807 $class->SUPER::new (
1525 padding => 4, 1808 padding_x => 4,
1809 padding_y => 4,
1526 fg => [1, 1, 1], 1810 fg => [1, 1, 1],
1527 bg => [1, 1, 1, 0.2],
1528 active_fg => [0, 0, 1], 1811 active_fg => [0, 0, 1],
1529 can_hover => 1, 1812 can_hover => 1,
1530 align => 0, 1813 align => 0,
1531 valign => 0, 1814 valign => 0,
1532 can_events => 1, 1815 can_events => 1,
1533 @_ 1816 @_
1534 ) 1817 )
1535} 1818}
1536 1819
1820sub activate { }
1821
1537sub button_up { 1822sub button_up {
1538 my ($self, $ev, $x, $y) = @_; 1823 my ($self, $ev, $x, $y) = @_;
1539 1824
1825 $self->emit ("activate")
1540 if ($x >= 0 && $x < $self->{w} 1826 if $x >= 0 && $x < $self->{w}
1541 && $y >= 0 && $y < $self->{h}) { 1827 && $y >= 0 && $y < $self->{h};
1542 $self->emit ("activate");
1543 }
1544} 1828}
1545 1829
1546sub _draw { 1830sub _draw {
1547 my ($self) = @_; 1831 my ($self) = @_;
1548 1832
… …
1550 1834
1551 if ($GRAB == $self) { 1835 if ($GRAB == $self) {
1552 $self->{fg} = $self->{active_fg}; 1836 $self->{fg} = $self->{active_fg};
1553 } 1837 }
1554 1838
1555 glEnable GL_BLEND;
1556 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1557 glEnable GL_TEXTURE_2D; 1839 glEnable GL_TEXTURE_2D;
1558 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1840 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1559 glColor 0, 0, 0, 1; 1841 glColor 0, 0, 0, 1;
1560 1842
1561 $tex[0]->draw_quad (0, 0, $self->{w}, $self->{h}); 1843 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1562 1844
1563 glDisable GL_TEXTURE_2D; 1845 glDisable GL_TEXTURE_2D;
1564 glDisable GL_BLEND;
1565 1846
1566 $self->SUPER::_draw; 1847 $self->SUPER::_draw;
1567} 1848}
1568 1849
1569############################################################################# 1850#############################################################################
… …
1580 1861
1581sub new { 1862sub new {
1582 my $class = shift; 1863 my $class = shift;
1583 1864
1584 $class->SUPER::new ( 1865 $class->SUPER::new (
1585 padding => 2, 1866 padding_x => 2,
1867 padding_y => 2,
1586 fg => [1, 1, 1], 1868 fg => [1, 1, 1],
1587 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],
1588 state => 0, 1872 state => 0,
1589 can_hover => 1, 1873 can_hover => 1,
1590 @_ 1874 @_
1591 ) 1875 )
1592} 1876}
1593 1877
1594sub size_request { 1878sub size_request {
1595 my ($self) = @_; 1879 my ($self) = @_;
1596 1880
1597 ($self->{padding} * 2 + 6) x 2 1881 (6) x 2
1598} 1882}
1599 1883
1600sub button_down { 1884sub button_down {
1601 my ($self, $ev, $x, $y) = @_; 1885 my ($self, $ev, $x, $y) = @_;
1602 1886
1603 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1887 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1604 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1888 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1605 $self->{state} = !$self->{state}; 1889 $self->{state} = !$self->{state};
1606 $self->emit (changed => $self->{state}); 1890 $self->_emit (changed => $self->{state});
1607 } 1891 }
1608} 1892}
1609 1893
1610sub _draw { 1894sub _draw {
1611 my ($self) = @_; 1895 my ($self) = @_;
1612 1896
1613 $self->SUPER::_draw; 1897 $self->SUPER::_draw;
1614 1898
1615 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 1899 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1616 1900
1617 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;
1618 1904
1619 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1905 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1620 1906
1621 glEnable GL_BLEND; 1907 my $tex = $self->{state} ? $tex[1] : $tex[0];
1908
1622 glEnable GL_TEXTURE_2D; 1909 glEnable GL_TEXTURE_2D;
1623 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1624
1625 my $tex = $self->{state} ? $tex[1] : $tex[0];
1626
1627 $tex->draw_quad (0, 0, $s, $s); 1910 $tex->draw_quad_alpha (0, 0, $s, $s);
1628
1629 glDisable GL_TEXTURE_2D; 1911 glDisable GL_TEXTURE_2D;
1630 glDisable GL_BLEND;
1631} 1912}
1632 1913
1633############################################################################# 1914#############################################################################
1634 1915
1635package CFClient::UI::Image; 1916package CFClient::UI::Image;
… …
1678 glTranslate 0, -$self->{w}, 0; 1959 glTranslate 0, -$self->{w}, 0;
1679 1960
1680 ($w, $h) = ($h, $w); 1961 ($w, $h) = ($h, $w);
1681 } 1962 }
1682 1963
1683 glEnable GL_BLEND;
1684 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1685 glEnable GL_TEXTURE_2D; 1964 glEnable GL_TEXTURE_2D;
1686 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1965 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1687 1966
1688 $tex->draw_quad (0, 0, $w, $h); 1967 $tex->draw_quad_alpha (0, 0, $w, $h);
1689 1968
1690 glDisable GL_BLEND;
1691 glDisable GL_TEXTURE_2D; 1969 glDisable GL_TEXTURE_2D;
1692} 1970}
1693 1971
1694############################################################################# 1972#############################################################################
1695 1973
… …
1743} 2021}
1744 2022
1745sub set_max { 2023sub set_max {
1746 my ($self, $max) = @_; 2024 my ($self, $max) = @_;
1747 2025
2026 return if $self->{max_val} == $max;
2027
1748 $self->{max_val} = $max; 2028 $self->{max_val} = $max;
2029 $self->update;
1749} 2030}
1750 2031
1751sub set_value { 2032sub set_value {
1752 my ($self, $val, $max) = @_; 2033 my ($self, $val, $max) = @_;
1753 2034
1754 $self->set_max ($max) 2035 $self->set_max ($max)
1755 if defined $max; 2036 if defined $max;
1756 2037
1757 $max = $self->{max_val}; 2038 return if $self->{val} == $val;
2039
1758 $self->{val} = $val; 2040 $self->{val} = $val;
1759
1760 $self->update; 2041 $self->update;
1761} 2042}
1762 2043
1763sub _draw { 2044sub _draw {
1764 my ($self) = @_; 2045 my ($self) = @_;
… …
1827 2108
1828sub new { 2109sub new {
1829 my ($class, %arg) = @_; 2110 my ($class, %arg) = @_;
1830 2111
1831 my $self = $class->SUPER::new ( 2112 my $self = $class->SUPER::new (
1832 tooltip => $arg{type}, 2113 tooltip => $arg{type},
1833 can_hover => 1, 2114 can_hover => 1,
2115 can_events => 1,
1834 %arg, 2116 %arg,
1835 ); 2117 );
1836 2118
1837 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999"); 2119 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");
1838 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1); 2120 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
… …
1846 2128
1847 $self->{value}->set_fontsize ($fsize); 2129 $self->{value}->set_fontsize ($fsize);
1848 $self->{max} ->set_fontsize ($fsize); 2130 $self->{max} ->set_fontsize ($fsize);
1849} 2131}
1850 2132
2133sub set_max {
2134 my ($self, $max) = @_;
2135
2136 $self->{gauge}->set_max ($max);
2137 $self->{max}->set_text ($max);
2138}
2139
1851sub set_value { 2140sub set_value {
1852 my ($self, $val, $max) = @_; 2141 my ($self, $val, $max) = @_;
1853 2142
1854 $self->set_max ($max) 2143 $self->set_max ($max)
1855 if defined $max; 2144 if defined $max;
1856 2145
1857 $self->{gauge}->set_value ($val, $max); 2146 $self->{gauge}->set_value ($val, $max);
1858 $self->{value}->set_text ($val); 2147 $self->{value}->set_text ($val);
1859}
1860
1861sub set_max {
1862 my ($self, $max) = @_;
1863
1864 $self->{gauge}->set_max ($max);
1865 $self->{max}->set_text ($max);
1866} 2148}
1867 2149
1868############################################################################# 2150#############################################################################
1869 2151
1870package CFClient::UI::Slider; 2152package CFClient::UI::Slider;
… …
1880 qw(s1_slider.png s1_slider_bg.png); 2162 qw(s1_slider.png s1_slider_bg.png);
1881 2163
1882sub new { 2164sub new {
1883 my $class = shift; 2165 my $class = shift;
1884 2166
1885 # range [value, low, high, page] 2167 # range [value, low, high, page, unit]
1886 2168
1887 # TODO: 0-width page 2169 # TODO: 0-width page
1888 # TODO: req_w/h are wrong with vertical 2170 # TODO: req_w/h are wrong with vertical
1889 # TODO: calculations are off 2171 # TODO: calculations are off
1890 my $self = $class->SUPER::new ( 2172 my $self = $class->SUPER::new (
1891 fg => [1, 1, 1], 2173 fg => [1, 1, 1],
1892 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],
1893 range => [0, 0, 100, 10], 2177 range => [0, 0, 100, 10, 0],
1894 req_w => 20, 2178 min_w => $::WIDTH / 80,
1895 req_h => 20, 2179 min_h => $::WIDTH / 80,
1896 vertical => 0, 2180 vertical => 0,
1897 can_hover => 1, 2181 can_hover => 1,
1898 inner_pad => 5, 2182 inner_pad => 0.02,
1899 @_ 2183 @_
1900 ); 2184 );
1901 2185
2186 $self->set_value ($self->{range}[0]);
2187 $self->update;
2188
1902 $self 2189 $self
1903} 2190}
1904 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
1905sub size_request { 2226sub size_request {
1906 my ($self) = @_; 2227 my ($self) = @_;
1907 2228
1908 my $w = $self->{req_w}; 2229 ($self->{req_w}, $self->{req_h})
1909 my $h = $self->{req_h};
1910
1911 $self->{vertical} ? ($h, $w) : ($w, $h)
1912} 2230}
1913 2231
1914sub button_down { 2232sub button_down {
1915 my ($self, $ev, $x, $y) = @_; 2233 my ($self, $ev, $x, $y) = @_;
1916 2234
1917 $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
1918 $self->mouse_motion ($ev, $x, $y); 2239 $self->mouse_motion ($ev, $x, $y);
1919} 2240}
1920 2241
1921sub mouse_motion { 2242sub mouse_motion {
1922 my ($self, $ev, $x, $y) = @_; 2243 my ($self, $ev, $x, $y) = @_;
1923 2244
1924 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
1925 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2262 my ($value, $lo, $hi, $page) = @{$self->{range}};
2263 my $range = ($hi - $page - $lo) || 1e-100;
1926 2264
1927 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2265 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
1928 2266
1929 my $inner_pad_px = $self->_calc_inner_pad_px ($w); 2267 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
1930 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right 2268 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
1931 2269
1932 $x -= $inner_pad_px; # substract the padding 2270 $value = ($value - $lo) / $range;
1933 $x = $x * ($hi - $lo) / $inner_w + $lo; 2271 $value = $value * $self->{scale} + $self->{offset};
1934 $x = $lo if $x < $lo;
1935 $x = $hi - $page if $x > $hi - $page;
1936 $self->{range}[0] = $x;
1937 2272
1938 $self->emit (changed => $x); 2273 $self->{knob_x} = $value - $knob_w * 0.5;
1939 $self->update; 2274 $self->{knob_w} = $knob_w;
1940 } 2275 });
1941}
1942 2276
1943# the inner_* stuff is for generating a padding for the slider handle, 2277 $self->SUPER::update;
1944# so that the handle doesn't leave the texture. This calculation isn't 100%
1945# correct propably, but it does the job for now
1946sub _calc_inner_pad_px {
1947 my ($self, $w) = @_;
1948 ($w / 100) * $self->{inner_pad} # % to pixels
1949} 2278}
1950 2279
1951sub _draw { 2280sub _draw {
1952 my ($self) = @_; 2281 my ($self) = @_;
1953 2282
1954 $self->SUPER::_draw (); 2283 $self->SUPER::_draw ();
1955 2284
1956 my ($w, $h) = @$self{qw(w h)}; 2285 glScale $self->{w}, $self->{h};
1957 2286
1958 if ($self->{vertical}) { 2287 if ($self->{vertical}) {
1959 # draw a vertical slider like a rotated horizontal slider 2288 # draw a vertical slider like a rotated horizontal slider
1960 2289
2290 glTranslate 1, 0, 0;
1961 glRotate 90, 0, 0, 1; 2291 glRotate 90, 0, 0, 1;
1962 glTranslate 0, -$self->{w}, 0;
1963
1964 ($w, $h) = ($h, $w);
1965 } 2292 }
1966 2293
1967 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2294 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
1968 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2295 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
1969 2296
1970 my ($value, $lo, $hi, $page) = @{$self->{range}};
1971
1972 $hi = $value + 1 if $lo == $hi;
1973
1974 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
1975 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
1976
1977 $page = int $page * $inner_w / ($hi - $lo);
1978 $value = int +($value - $lo) * $inner_w / ($hi - $lo);
1979
1980 $w -= $page;
1981 $page &= ~1;
1982 glTranslate $page * 0.5, 0, 0;
1983 $page ||= 2;
1984
1985 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
1986 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
1987
1988 glEnable GL_BLEND;
1989 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1990 glEnable GL_TEXTURE_2D; 2297 glEnable GL_TEXTURE_2D;
1991 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2298 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1992 2299
1993 # draw background 2300 # draw background
1994 $tex[1]->draw_quad (0, 0, $w, $h); 2301 $tex[1]->draw_quad_alpha (0, 0, 1, 1);
1995 2302
1996 # draw handle 2303 # draw handle
1997 $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);
1998 2305
1999 glDisable GL_BLEND;
2000 glDisable GL_TEXTURE_2D; 2306 glDisable GL_TEXTURE_2D;
2001} 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 (@_) }
2002 2349
2003############################################################################# 2350#############################################################################
2004 2351
2005package CFClient::UI::TextView; 2352package CFClient::UI::TextView;
2006 2353
… …
2015 fontsize => 1, 2362 fontsize => 1,
2016 can_events => 0, 2363 can_events => 0,
2017 #font => default_font 2364 #font => default_font
2018 @_, 2365 @_,
2019 2366
2020 layout => (new CFClient::Layout), 2367 layout => (new CFClient::Layout 1),
2021 par => [], 2368 par => [],
2022 height => 0, 2369 height => 0,
2023 children => [ 2370 children => [
2024 (new CFClient::UI::Empty expand => 1), 2371 (new CFClient::UI::Empty expand => 1),
2025 (new CFClient::UI::Slider vertical => 1), 2372 (new CFClient::UI::Slider vertical => 1),
2026 ], 2373 ],
2027 ); 2374 );
2028 2375
2029 $self->{children}[1]->connect (changed => sub { 2376 $self->{children}[1]->connect (changed => sub { $self->update });
2030 $self->update;
2031 });
2032 2377
2033 $self 2378 $self
2034} 2379}
2035 2380
2036sub set_fontsize { 2381sub set_fontsize {
2037 my ($self, $fontsize) = @_; 2382 my ($self, $fontsize) = @_;
2038 2383
2039 $self->{fontsize} = $fontsize; 2384 $self->{fontsize} = $fontsize;
2040 $self->reflow; 2385 $self->reflow;
2041}
2042
2043sub text_height {
2044 my ($self, $text) = @_;
2045
2046 my $layout = $self->{layout};
2047
2048 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2049 $layout->set_width ($self->{w});
2050 $layout->set_text ($text);
2051
2052 ($layout->size)[1]
2053}
2054
2055sub reflow {
2056 my ($self) = @_;
2057
2058 $self->{need_reflow}++;
2059 $self->update;
2060} 2386}
2061 2387
2062sub size_allocate { 2388sub size_allocate {
2063 my ($self, $w, $h) = @_; 2389 my ($self, $w, $h) = @_;
2064 2390
… …
2069 $self->{layout}->set_width ($self->{children}[0]{w}); 2395 $self->{layout}->set_width ($self->{children}[0]{w});
2070 2396
2071 $self->reflow; 2397 $self->reflow;
2072} 2398}
2073 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
2074sub add_paragraph { 2434sub add_paragraph {
2075 my ($self, $color, $text) = @_; 2435 my ($self, $color, $text, $indent) = @_;
2076 2436
2077 #TODO: intelligently "reformat" paragraph 2437 for my $line (split /\n/, $text) {
2078 2438 my ($w, $h) = $self->text_size ($line);
2079 my $height = $self->text_height ($text);
2080
2081 $self->{height} += $height; 2439 $self->{height} += $h;
2440 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
2441 }
2082 2442
2083 push @{$self->{par}}, [$height, $color, $text];
2084
2085 $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]);
2086 $self->{children}[1]->update;
2087} 2444}
2088 2445
2089sub update { 2446sub update {
2090 my ($self) = @_; 2447 my ($self) = @_;
2091 2448
… …
2093 2450
2094 return unless $self->{h} > 0; 2451 return unless $self->{h} > 0;
2095 2452
2096 delete $self->{texture}; 2453 delete $self->{texture};
2097 2454
2098 $ROOT->on_refresh ($self, sub { 2455 $ROOT->on_post_alloc ($self, sub {
2456 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2457
2099 if (delete $self->{need_reflow}) { 2458 if (delete $self->{need_reflow}) {
2100 my $height = 0; 2459 my $height = 0;
2101 2460
2102 $height += $_->[0] = $self->text_height ($_->[2]) 2461 my $layout = $self->{layout};
2462
2463 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2464
2103 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 }
2104 2476
2105 $self->{height} = $height; 2477 $self->{height} = $height;
2106 2478
2107 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2479 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2108 2480
2109 delete $self->{texture}; 2481 delete $self->{texture};
2110 } 2482 }
2111 2483
2112 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 2484 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2113 glClearColor 0, 0, 0, 1; 2485 glClearColor 0.5, 0.5, 0.5, 0;
2114 glClear GL_COLOR_BUFFER_BIT; 2486 glClear GL_COLOR_BUFFER_BIT;
2115 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
2116 glEnable GL_BLEND; 2499 glEnable GL_BLEND;
2500 #TODO# not correct in windows where rgba is forced off
2117 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2501 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2118 glEnable GL_TEXTURE_2D;
2119 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2120
2121 my $top = int $self->{children}[1]{range}[0];
2122
2123 my $y0 = $top;
2124 my $y1 = $top + $self->{h};
2125
2126 my $y = 0;
2127
2128 my $layout = $self->{layout};
2129
2130 $layout->set_font ($self->{font}) if $self->{font};
2131 2502
2132 for my $par (@{$self->{par}}) { 2503 for my $par (@{$self->{par}}) {
2133 my $h = $par->[0]; 2504 my $h = $par->[1];
2134 2505
2135 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]);
2136 $layout->set_text ($par->[2]); 2509 $layout->set_markup ($par->[4]);
2137 2510
2138 glColor @{ $par->[1] }; 2511 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2139 my ($W, $H) = $layout->size; 2512
2140 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;
2141 } 2515 }
2142 2516
2143 $y += $h; 2517 $y += $h;
2144 } 2518 }
2145 2519
2146 glDisable GL_TEXTURE_2D;
2147 glDisable GL_BLEND; 2520 glDisable GL_BLEND;
2148 }; 2521 };
2149 }); 2522 });
2150} 2523}
2151 2524
2152sub _draw { 2525sub _draw {
2153 my ($self) = @_; 2526 my ($self) = @_;
2154 2527
2155 if ($self->{texture}) {
2156 glEnable GL_TEXTURE_2D; 2528 glEnable GL_TEXTURE_2D;
2157 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2529 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2530 glColor 1, 1, 1, 1;
2158 $self->{texture}->draw_quad (0, 0, $self->{w}, $self->{h}); 2531 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2159 glDisable GL_TEXTURE_2D; 2532 glDisable GL_TEXTURE_2D;
2160 }
2161 2533
2162 $self->{children}[1]->draw; 2534 $self->{children}[1]->draw;
2163 2535
2164} 2536}
2165 2537
… …
2213 2585
2214sub new { 2586sub new {
2215 my $class = shift; 2587 my $class = shift;
2216 2588
2217 my $self = $class->SUPER::new ( 2589 my $self = $class->SUPER::new (
2218 state => 0, 2590 state => 0,
2219 connect_activate => \&toggle_flopper, 2591 on_activate => \&toggle_flopper,
2220 @_ 2592 @_
2221 ); 2593 );
2222 2594
2223 if ($self->{state}) {
2224 $self->{state} = 0;
2225 $self->toggle_flopper;
2226 }
2227
2228 $self 2595 $self
2229} 2596}
2230 2597
2231sub toggle_flopper { 2598sub toggle_flopper {
2232 my ($self) = @_; 2599 my ($self) = @_;
2233 2600
2234 # TODO: use animation 2601 $self->{other}->toggle_visibility;
2235 if ($self->{state} = !$self->{state}) {
2236 $CFClient::UI::ROOT->add ($self->{other});
2237 $self->{other}->move ($self->coord2global (0, $self->{h}));
2238 $self->emit ("open");
2239 } else {
2240 $CFClient::UI::ROOT->remove ($self->{other});
2241 $self->emit ("close");
2242 }
2243
2244 $self->emit (changed => $self->{state});
2245} 2602}
2246 2603
2247############################################################################# 2604#############################################################################
2248 2605
2249package CFClient::UI::Tooltip; 2606package CFClient::UI::Tooltip;
… …
2259 @_, 2616 @_,
2260 can_events => 0, 2617 can_events => 0,
2261 ) 2618 )
2262} 2619}
2263 2620
2264sub set_markup { 2621sub set_tooltip_from {
2265 my ($self, $text) = @_; 2622 my ($self, $widget) = @_;
2266 2623
2267 $self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0]; 2624 my $tooltip = $widget->{tooltip};
2268 $self->{label}->set_markup ($text); 2625
2269 $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 );
2270} 2641}
2271 2642
2272sub size_request { 2643sub size_request {
2273 my ($self) = @_; 2644 my ($self) = @_;
2274
2275 $self->child->set_max_size ($::WIDTH * 0.3);
2276 2645
2277 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2646 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2278 2647
2279 ($w + 4, $h + 4) 2648 ($w + 4, $h + 4)
2280} 2649}
… …
2283 my ($self, $w, $h) = @_; 2652 my ($self, $w, $h) = @_;
2284 2653
2285 $self->SUPER::size_allocate ($w - 4, $h - 4); 2654 $self->SUPER::size_allocate ($w - 4, $h - 4);
2286} 2655}
2287 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
2288sub _draw { 2675sub _draw {
2289 my ($self) = @_; 2676 my ($self) = @_;
2290 2677
2291 glPushMatrix;
2292 glTranslate 0.375, 0.375; 2678 glTranslate 0.375, 0.375;
2293 2679
2294 my ($w, $h) = @$self{qw(w h)}; 2680 my ($w, $h) = @$self{qw(w h)};
2295 2681
2296 glColor 1, 0.8, 0.4; 2682 glColor 1, 0.8, 0.4;
… …
2307 glVertex 0 , $h; 2693 glVertex 0 , $h;
2308 glVertex $w, $h; 2694 glVertex $w, $h;
2309 glVertex $w, 0; 2695 glVertex $w, 0;
2310 glEnd; 2696 glEnd;
2311 2697
2312 glPopMatrix; 2698 glTranslate 2 - 0.375, 2 - 0.375;
2313 2699
2314 glTranslate 2, 2;
2315 $self->SUPER::_draw; 2700 $self->SUPER::_draw;
2316} 2701}
2317 2702
2318############################################################################# 2703#############################################################################
2319 2704
… …
2324use CFClient::OpenGL; 2709use CFClient::OpenGL;
2325 2710
2326sub new { 2711sub new {
2327 my $class = shift; 2712 my $class = shift;
2328 2713
2329 $class->SUPER::new ( 2714 my $self = $class->SUPER::new (
2330 aspect => 1, 2715 aspect => 1,
2716 can_events => 0,
2331 @_, 2717 @_,
2332 ) 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
2333} 2735}
2334 2736
2335sub size_request { 2737sub size_request {
2336 (32, 8) 2738 (32, 8)
2337} 2739}
2338 2740
2741sub update {
2742 my ($self) = @_;
2743
2744 return unless $self->{visible};
2745
2746 $self->SUPER::update;
2747}
2748
2339sub draw { 2749sub _draw {
2340 my ($self) = @_; 2750 my ($self) = @_;
2341 2751
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
2342 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 2763 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2343 2764
2344 if ($tex) { 2765 if ($tex) {
2345 glEnable GL_BLEND;
2346 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2347 glEnable GL_TEXTURE_2D; 2766 glEnable GL_TEXTURE_2D;
2348 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2767 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2349 glColor 1, 1, 1, 1; 2768 glColor 1, 1, 1, 1;
2350 $tex->draw_quad (0, 0, $self->{w}, $self->{h}); 2769 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2351 glDisable GL_TEXTURE_2D; 2770 glDisable GL_TEXTURE_2D;
2352 glDisable GL_BLEND;
2353 } 2771 }
2772}
2773
2774sub DESTROY {
2775 my ($self) = @_;
2776
2777 $self->{timer}->cancel
2778 if $self->{timer};
2779
2780 $self->SUPER::DESTROY;
2354} 2781}
2355 2782
2356############################################################################# 2783#############################################################################
2357 2784
2785package CFClient::UI::Inventory;
2786
2787our @ISA = CFClient::UI::ScrolledWindow::;
2788
2789sub new {
2790 my $class = shift;
2791
2792 my $self = $class->SUPER::new (
2793 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2794 @_,
2795 );
2796
2797 $self
2798}
2799
2800sub set_items {
2801 my ($self, $items) = @_;
2802
2803 $self->{scrolled}->clear;
2804 return unless $items;
2805
2806 my @items = sort {
2807 ($a->{type} <=> $b->{type})
2808 or ($a->{name} cmp $b->{name})
2809 } @$items;
2810
2811 $self->{real_items} = \@items;
2812
2813 my $row = 0;
2814 for my $item (@items) {
2815 CFClient::Item::update_widgets $item;
2816
2817 $self->{scrolled}->add (0, $row, $item->{face_widget});
2818 $self->{scrolled}->add (1, $row, $item->{desc_widget});
2819 $self->{scrolled}->add (2, $row, $item->{weight_widget});
2820
2821 $row++;
2822 }
2823}
2824
2825#############################################################################
2826
2827package CFClient::UI::Menu;
2828
2829our @ISA = CFClient::UI::FancyFrame::;
2830
2831use CFClient::OpenGL;
2832
2833sub new {
2834 my $class = shift;
2835
2836 my $self = $class->SUPER::new (
2837 items => [],
2838 z => 100,
2839 @_,
2840 );
2841
2842 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2843
2844 for my $item (@{ $self->{items} }) {
2845 my ($widget, $cb) = @$item;
2846
2847 # handle various types of items, only text for now
2848 if (!ref $widget) {
2849 $widget = new CFClient::UI::Label
2850 can_hover => 1,
2851 can_events => 1,
2852 text => $widget;
2853 }
2854
2855 $self->{item}{$widget} = $item;
2856
2857 $self->{vbox}->add ($widget);
2858 }
2859
2860 $self
2861}
2862
2863# popup given the event (must be a mouse button down event currently)
2864sub popup {
2865 my ($self, $ev) = @_;
2866
2867 $self->_emit ("popdown");
2868
2869 # maybe save $GRAB? must be careful about events...
2870 $GRAB = $self;
2871 $self->{button} = $ev->{button};
2872
2873 $self->show;
2874 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2875}
2876
2877sub mouse_motion {
2878 my ($self, $ev, $x, $y) = @_;
2879
2880 # TODO: should use vbox->find_widget or so
2881 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2882 $self->{hover} = $self->{item}{$HOVER};
2883}
2884
2885sub button_up {
2886 my ($self, $ev, $x, $y) = @_;
2887
2888 if ($ev->{button} == $self->{button}) {
2889 undef $GRAB;
2890 $self->hide;
2891
2892 $self->_emit ("popdown");
2893 $self->{hover}[1]->() if $self->{hover};
2894 }
2895}
2896
2897#############################################################################
2898
2899package CFClient::UI::Statusbox;
2900
2901our @ISA = CFClient::UI::VBox::;
2902
2903sub new {
2904 my $class = shift;
2905
2906 $class->SUPER::new (
2907 fontsize => 0.8,
2908 @_,
2909 )
2910}
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
2997sub reconfigure {
2998 my ($self) = @_;
2999
3000 delete $_->{label}
3001 for values %{ $self->{item} || {} };
3002
3003 $self->reorder;
3004 $self->SUPER::reconfigure;
3005}
3006
3007#############################################################################
3008
2358package CFClient::UI::Root; 3009package CFClient::UI::Root;
2359 3010
2360our @ISA = CFClient::UI::Container::; 3011our @ISA = CFClient::UI::Container::;
2361 3012
2362use CFClient::OpenGL; 3013use CFClient::OpenGL;
2363 3014
2364sub check_size { 3015sub new {
2365 my ($self) = @_; 3016 my $class = shift;
2366 3017
2367 $self->configure (0, 0, $::WIDTH, $::HEIGHT); 3018 my $self = $class->SUPER::new (
3019 visible => 1,
3020 @_,
3021 );
3022
3023 Scalar::Util::weaken ($self->{root} = $self);
3024
3025 $self
2368} 3026}
2369 3027
2370sub size_request { 3028sub size_request {
2371 ($::WIDTH, $::HEIGHT) 3029 my ($self) = @_;
2372}
2373 3030
2374sub configure { 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
3046}
3047
3048sub size_allocate {
2375 my ($self, $x, $y, $w, $h) = @_; 3049 my ($self, $w, $h) = @_;
2376 3050
2377 $self->SUPER::configure ($x, $y, $w, $h);
2378
2379 for my $child (@{$self->{children}}) { 3051 for my $child ($self->children) {
2380 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)};
2381 3053
2382 $X = List::Util::max 0, List::Util::min $w - $W, $X; 3054 $X = $child->{force_x} if exists $child->{force_x};
2383 $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
2384 $child->configure ($X, $Y, $W,$H); 3060 $child->configure ($X, $Y, $W, $H);
2385 } 3061 }
2386} 3062}
2387 3063
2388sub _topleft { 3064sub coord2local {
2389 my ($self, $x, $y) = @_; 3065 my ($self, $x, $y) = @_;
2390 3066
2391 ($x, $y) 3067 ($x, $y)
2392} 3068}
2393 3069
3070sub coord2global {
3071 my ($self, $x, $y) = @_;
3072
3073 ($x, $y)
3074}
3075
2394sub update { 3076sub update {
2395 my ($self) = @_; 3077 my ($self) = @_;
2396 3078
2397 $self->check_size; 3079 $::WANT_REFRESH++;
2398 ::refresh ();
2399} 3080}
2400 3081
2401sub add { 3082sub add {
2402 my ($self, $child) = @_; 3083 my ($self, @children) = @_;
2403 3084
2404 # integerize window positions 3085 $_->{is_toplevel} = 1
2405 $child->{x} = int $child->{x}; 3086 for @children;
2406 $child->{y} = int $child->{y};
2407 3087
2408 $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 }
2409} 3104}
2410 3105
2411sub on_refresh { 3106sub on_refresh {
2412 my ($self, $id, $cb) = @_; 3107 my ($self, $id, $cb) = @_;
2413 3108
2414 $self->{refresh_hook}{$id} = $cb; 3109 $self->{refresh_hook}{$id} = $cb;
2415} 3110}
2416 3111
3112sub on_post_alloc {
3113 my ($self, $id, $cb) = @_;
3114
3115 $self->{post_alloc_hook}{$id} = $cb;
3116}
3117
2417sub draw { 3118sub draw {
2418 my ($self) = @_; 3119 my ($self) = @_;
2419 3120
2420 while (my $rcb = delete $self->{refresh_hook}) { 3121 while ($self->{refresh_hook}) {
2421 $_->() for values %$rcb; 3122 $_->()
3123 for values %{delete $self->{refresh_hook}};
2422 } 3124 }
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
2423 3199
2424 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3200 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2425 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3201 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2426 glClear GL_COLOR_BUFFER_BIT; 3202 glClear GL_COLOR_BUFFER_BIT;
2427 3203
2428 glMatrixMode GL_PROJECTION; 3204 glMatrixMode GL_PROJECTION;
2429 glLoadIdentity; 3205 glLoadIdentity;
2430 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000; 3206 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2431 glMatrixMode GL_MODELVIEW; 3207 glMatrixMode GL_MODELVIEW;
2432 glLoadIdentity; 3208 glLoadIdentity;
2433 3209
2434 $self->_draw; 3210 $self->_draw;
2435} 3211}
2436 3212
2437############################################################################# 3213#############################################################################
2438 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
3315sub ask_for_bind {
3316 my ($self, $commit) = @_;
3317
3318 CFClient::Binder::open_binding_dialog (sub {
3319 my ($mod, $sym) = @_;
3320 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3321 $self->update_binding_widgets;
3322 $self->commit if $commit;
3323 });
3324}
3325
3326sub set_binding {
3327 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3328
3329 $self->clear_command_list;
3330 $self->{recording} = 0;
3331 $self->{rec_btn}->set_text ("start recording");
3332
3333 $self->{binding} = [$mod, $sym];
3334 $self->{commands} = $cmds;
3335
3336 $self->{binding_change} = $cb;
3337 $self->{binding_cancel} = $ccb;
3338
3339 $self->update_binding_widgets;
3340}
3341
3342sub update_binding_widgets {
3343 my ($self) = @_;
3344 my ($mod, $sym, $cmds) = $self->get_binding;
3345 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3346 $self->set_command_list ($cmds);
3347}
3348
3349sub get_binding {
3350 my ($self) = @_;
3351 return (
3352 $self->{binding}->[0],
3353 $self->{binding}->[1],
3354 [ grep { defined $_ } @{$self->{commands}} ]
3355 );
3356}
3357
3358sub clear_command_list {
3359 my ($self) = @_;
3360 $self->{cmdbox}->clear ();
3361}
3362
3363sub set_command_list {
3364 my ($self, $cmds) = @_;
3365
3366 $self->{cmdbox}->clear ();
3367 $self->{commands} = $cmds;
3368
3369 my $idx = 0;
3370
3371 for (@$cmds) {
3372 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3373
3374 my $i = $idx;
3375 $hb->add (new CFClient::UI::Button
3376 text => "delete",
3377 tooltip => "Deletes the action from the record",
3378 on_activate => sub {
3379 $self->{cmdbox}->remove ($hb);
3380 $cmds->[$i] = undef;
3381 });
3382
3383 $hb->add (new CFClient::UI::Label text => $_);
3384
3385 $idx++
3386 }
3387}
3388
3389
3390#############################################################################
3391
2439package CFClient::UI; 3392package CFClient::UI;
2440 3393
2441$ROOT = new CFClient::UI::Root; 3394$ROOT = new CFClient::UI::Root;
2442$TOOLTIP = new CFClient::UI::Tooltip; 3395$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2443 3396
24441 33971
2445 3398

Diff Legend

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