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.173 by root, Tue Apr 25 10:30:48 2006 UTC vs.
Revision 1.262 by elmex, Wed May 31 13:44:26 2006 UTC

1package CFClient::UI; 1package CFClient::UI;
2 2
3use utf8;
3use strict; 4use strict;
4 5
5use Scalar::Util (); 6use Scalar::Util ();
6use List::Util (); 7use List::Util ();
7 8
8use CFClient; 9use CFClient;
10use CFClient::Texture;
9 11
10our ($FOCUS, $HOVER, $GRAB); # various widgets 12our ($FOCUS, $HOVER, $GRAB); # various widgets
11 13
14our $LAYOUT;
12our $ROOT; 15our $ROOT;
13our $TOOLTIP; 16our $TOOLTIP;
14our $BUTTON_STATE; 17our $BUTTON_STATE;
18
19our %WIDGET; # all widgets, weak-referenced
20
21sub get_layout {
22 my $layout;
23
24 for (grep { $_->{name} } values %WIDGET) {
25 my $win = $layout->{$_->{name}} = { };
26
27 $win->{x} = ($_->{x} + $_->{w} * 0.5) / $::WIDTH if $_->{x} =~ /^[0-9.]+$/;
28 $win->{y} = ($_->{y} + $_->{h} * 0.5) / $::HEIGHT if $_->{y} =~ /^[0-9.]+$/;
29 $win->{w} = $_->{w} / $::WIDTH if defined $_->{w};
30 $win->{h} = $_->{h} / $::HEIGHT if defined $_->{h};
31
32 $win->{show} = $_->{visible} && $_->{is_toplevel};
33 }
34
35 $layout
36}
37
38sub set_layout {
39 my ($layout) = @_;
40
41 $LAYOUT = $layout;
42}
15 43
16sub check_tooltip { 44sub check_tooltip {
17 if (!$GRAB) { 45 if (!$GRAB) {
18 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 46 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
19 if (length $widget->{tooltip}) { 47 if (length $widget->{tooltip}) {
20 48
21 if ($TOOLTIP->{owner} != $widget) { 49 if ($TOOLTIP->{owner} != $widget) {
50 $TOOLTIP->hide;
51
22 $TOOLTIP->{owner} = $widget; 52 $TOOLTIP->{owner} = $widget;
23 53
24 my $tip = $widget->{tooltip}; 54 my $tip = $widget->{tooltip};
25 55
26 $tip = $tip->($widget) if CODE:: eq ref $tip; 56 $tip = $tip->($widget) if CODE:: eq ref $tip;
27 57
28 $TOOLTIP->set_markup ($widget->{tooltip}); 58 $TOOLTIP->set_tooltip_from ($widget);
29 $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
241sub children { 374sub children {
242} 375}
243 376
244# call when resoltuion changes etc.
245sub reconfigure {
246 my ($self) = @_;
247
248 $_->reconfigure
249 for $self->children;
250
251 $_->check_size;
252}
253
254sub set_max_size { 377sub set_max_size {
255 my ($self, $w, $h) = @_; 378 my ($self, $w, $h) = @_;
256 379
257 delete $self->{max_w}; $self->{max_w} = $w if $w; 380 delete $self->{max_w}; $self->{max_w} = $w if $w;
258 delete $self->{max_h}; $self->{max_h} = $h if $h; 381 delete $self->{max_h}; $self->{max_h} = $h if $h;
259} 382}
260 383
261# return top left coordinates 384sub set_tooltip {
262sub _topleft {
263 my ($self, $x, $y) = @_; 385 my ($self, $tooltip) = @_;
264 386
265 $self->{parent} 387 $tooltip =~ s/^\s+//;
266 or Carp::confess "no parent widget in _topleft\n";#d# 388 $tooltip =~ s/\s+$//;
267 389
268 $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 }
269} 398}
270 399
271# translate global coordinates to local coordinate system 400# translate global coordinates to local coordinate system
272sub coord2local { 401sub coord2local {
273 my ($self, $x, $y) = @_; 402 my ($self, $x, $y) = @_;
274 403
275 my ($X, $Y) = $self->_topleft; 404 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
276 ($x - $X, $y - $Y)
277} 405}
278 406
279# translate local coordinates to global coordinate system 407# translate local coordinates to global coordinate system
280sub coord2global { 408sub coord2global {
281 my ($self, $x, $y) = @_; 409 my ($self, $x, $y) = @_;
282 410
283 my ($X, $Y) = $self->_topleft; 411 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
284 ($x + $X, $y + $Y)
285} 412}
286 413
287sub focus_in { 414sub focus_in {
288 my ($self) = @_; 415 my ($self) = @_;
289 416
290 return if $FOCUS == $self; 417 return if $FOCUS == $self;
291 return unless $self->{can_focus}; 418 return unless $self->{can_focus};
292 419
293 my $focus = $FOCUS; $FOCUS = $self; 420 my $focus = $FOCUS; $FOCUS = $self;
294 421
295 $self->emit (focus_in => $focus); 422 $self->_emit (focus_in => $focus);
296 423
297 $focus->update if $focus; 424 $focus->update if $focus;
298 $FOCUS->update; 425 $FOCUS->update;
299} 426}
300 427
… …
303 430
304 return unless $FOCUS == $self; 431 return unless $FOCUS == $self;
305 432
306 my $focus = $FOCUS; undef $FOCUS; 433 my $focus = $FOCUS; undef $FOCUS;
307 434
308 $self->emit (focus_out => $focus); 435 $self->_emit (focus_out => $focus);
309 436
310 $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;
311} 441}
312 442
313sub mouse_motion { } 443sub mouse_motion { }
314sub button_up { } 444sub button_up { }
315sub key_down { } 445sub key_down { }
316sub key_up { } 446sub key_up { }
317 447
318sub button_down { 448sub button_down {
319 my ($self, $ev, $x, $y) = @_; 449 my ($self, $ev, $x, $y) = @_;
320 450
321 $self->focus_in; 451 $self->focus_in;
… …
324sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 454sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }
325sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 455sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }
326sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 456sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }
327sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 457sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }
328sub 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}
329 529
330sub draw { 530sub draw {
331 my ($self) = @_; 531 my ($self) = @_;
332 532
333 return unless $self->{h} && $self->{w}; 533 return unless $self->{h} && $self->{w};
… …
350 glVertex $x , $y + $self->{h}; 550 glVertex $x , $y + $self->{h};
351 glEnd; 551 glEnd;
352 glDisable GL_BLEND; 552 glDisable GL_BLEND;
353 } 553 }
354 554
355 if ($ENV{PCLIENT_DEBUG}) { 555 if ($ENV{CFPLUS_DEBUG} & 1) {
356 glPushMatrix; 556 glPushMatrix;
357 glColor 1, 1, 0, 1; 557 glColor 1, 1, 0, 1;
358 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 558 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
359 glBegin GL_LINE_LOOP; 559 glBegin GL_LINE_LOOP;
360 glVertex 0 , 0; 560 glVertex 0 , 0;
361 glVertex $self->{w}, 0; 561 glVertex $self->{w} - 1, 0;
362 glVertex $self->{w}, $self->{h}; 562 glVertex $self->{w} - 1, $self->{h} - 1;
363 glVertex 0 , $self->{h}; 563 glVertex 0 , $self->{h} - 1;
364 glEnd; 564 glEnd;
365 glPopMatrix; 565 glPopMatrix;
366 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;
367 } 567 }
368} 568}
369 569
370sub _draw { 570sub _draw {
371 my ($self) = @_; 571 my ($self) = @_;
372 572
373 warn "no draw defined for $self\n"; 573 warn "no draw defined for $self\n";
374} 574}
375 575
376sub find_widget {
377 my ($self, $x, $y) = @_;
378
379 return () unless $self->{can_events};
380
381 return $self
382 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
383 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
384
385 ()
386}
387
388sub set_parent {
389 my ($self, $parent) = @_;
390
391 Scalar::Util::weaken ($self->{parent} = $parent);
392}
393
394sub check_size {
395 my ($self) = @_;
396
397 $self->{parent}
398 or return 1;
399
400 my ($w, $h) = $self->{user_w} && $self->{user_h}
401 ? @$self{qw(user_w user_h)}
402 : $self->size_request;
403
404 if ($w != $self->{req_w} || $h != $self->{req_h}) {
405 $self->{req_w} = $w;
406 $self->{req_h} = $h;
407
408 $self->{parent}->check_size
409 or $self->size_allocate (
410 (List::Util::max $self->{w}, $w),
411 (List::Util::max $self->{h}, $h),
412 );
413
414 1
415 } else {
416 0
417 }
418}
419
420sub update {
421 my ($self) = @_;
422
423 $self->{parent}->update
424 if $self->{parent};
425}
426
427sub connect {
428 my ($self, $signal, $cb) = @_;
429
430 push @{ $self->{signal_cb}{$signal} }, $cb;
431}
432
433sub emit {
434 my ($self, $signal, @args) = @_;
435
436 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
437}
438
439sub DESTROY { 576sub DESTROY {
440 my ($self) = @_; 577 my ($self) = @_;
441 578
579 delete $WIDGET{$self+0};
442 #$self->deactivate; 580 #$self->deactivate;
443} 581}
444 582
445############################################################################# 583#############################################################################
446 584
… …
455 my $class = shift; 593 my $class = shift;
456 594
457 # range [value, low, high, page] 595 # range [value, low, high, page]
458 596
459 $class->SUPER::new ( 597 $class->SUPER::new (
460 bg => [0, 0, 0, 0.2], 598 #bg => [0, 0, 0, 0.2],
461 active_bg => [1, 1, 1, 0.5], 599 #active_bg => [1, 1, 1, 0.5],
462 @_ 600 @_
463 ) 601 )
464} 602}
465 603
466sub _draw { 604sub _draw {
467 my ($self) = @_; 605 my ($self) = @_;
468 606
607 my $color = $FOCUS == $self && $self->{active_bg}
608 ? $self->{active_bg}
609 : $self->{bg};
610
611 if ($color && (@$color < 4 || $color->[3])) {
469 my ($w, $h) = @$self{qw(w h)}; 612 my ($w, $h) = @$self{qw(w h)};
470 613
471 glEnable GL_BLEND; 614 glEnable GL_BLEND;
472 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 615 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
473 glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} }; 616 glColor @$color;
474 617
475 glBegin GL_QUADS; 618 glBegin GL_QUADS;
476 glVertex 0 , 0; 619 glVertex 0 , 0;
477 glVertex 0 , $h; 620 glVertex 0 , $h;
478 glVertex $w, $h; 621 glVertex $w, $h;
479 glVertex $w, 0; 622 glVertex $w, 0;
480 glEnd; 623 glEnd;
481 624
482 glDisable GL_BLEND; 625 glDisable GL_BLEND;
626 }
483} 627}
484 628
485############################################################################# 629#############################################################################
486 630
487package CFClient::UI::Empty; 631package CFClient::UI::Empty;
… …
492 my ($class, %arg) = @_; 636 my ($class, %arg) = @_;
493 $class->SUPER::new (can_events => 0, %arg); 637 $class->SUPER::new (can_events => 0, %arg);
494} 638}
495 639
496sub size_request { 640sub size_request {
497 (0, 0) 641 my ($self) = @_;
642
643 ($self->{w} + 0, $self->{h} + 0)
498} 644}
499 645
500sub draw { } 646sub draw { }
501 647
502############################################################################# 648#############################################################################
… …
519 665
520 $self 666 $self
521} 667}
522 668
523sub add { 669sub add {
524 my ($self, $child) = @_; 670 my ($self, @widgets) = @_;
525 671
526 $child->set_parent ($self); 672 $_->set_parent ($self)
673 for @widgets;
527 674
528 use sort 'stable'; 675 use sort 'stable';
529 676
530 $self->{children} = [ 677 $self->{children} = [
531 sort { $a->{z} <=> $b->{z} } 678 sort { $a->{z} <=> $b->{z} }
532 @{$self->{children}}, $child 679 @{$self->{children}}, @widgets
533 ]; 680 ];
534 681
535 $child->check_size; 682 $self->realloc;
536} 683}
537 684
538sub children { 685sub children {
539 @{ $_[0]{children} } 686 @{ $_[0]{children} }
540} 687}
… …
545 delete $child->{parent}; 692 delete $child->{parent};
546 $child->hide; 693 $child->hide;
547 694
548 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 695 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
549 696
550 $self->check_size; 697 $self->realloc;
551 $self->update;
552} 698}
553 699
554sub clear { 700sub clear {
555 my ($self) = @_; 701 my ($self) = @_;
556 702
… …
559 705
560 for (@$children) { 706 for (@$children) {
561 delete $_->{parent}; 707 delete $_->{parent};
562 $_->hide; 708 $_->hide;
563 } 709 }
710
711 $self->realloc;
564} 712}
565 713
566sub find_widget { 714sub find_widget {
567 my ($self, $x, $y) = @_; 715 my ($self, $x, $y) = @_;
568 716
… …
643} 791}
644 792
645sub update { 793sub update {
646 my ($self) = @_; 794 my ($self) = @_;
647 795
648 # we want to do this delayed... 796 $ROOT->on_post_alloc ($self => sub { $self->render_child });
649 $self->render_chld;
650 $self->SUPER::update; 797 $self->SUPER::update;
651}
652
653sub render_chld {
654 my ($self) = @_;
655
656 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
657 glClearColor 0, 0, 0, 1;
658 glClear GL_COLOR_BUFFER_BIT;
659 $self->child->draw;
660 };
661} 798}
662 799
663sub size_allocate { 800sub size_allocate {
664 my ($self, $w, $h) = @_; 801 my ($self, $w, $h) = @_;
665 802
666 $self->child->configure (0, 0, $w, $h); 803 $self->SUPER::size_allocate ($w, $h);
804 $self->update;
805}
667 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
668 $self->render_chld; 818 $self->_render;
819 };
669} 820}
670 821
671sub _draw { 822sub _draw {
672 my ($self) = @_; 823 my ($self) = @_;
673 824
674 my ($w, $h) = ($self->w, $self->h); 825 my ($w, $h) = ($self->w, $self->h);
675 826
676 my $tex = $self->{texture} 827 my $tex = $self->{texture}
677 or return; 828 or return;
678 829
679 glEnable GL_BLEND;
680 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
681 glEnable GL_TEXTURE_2D; 830 glEnable GL_TEXTURE_2D;
682 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;
683 833
684 $tex->draw_quad (0, 0, $w, $h); 834 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
685 835
686 glDisable GL_BLEND;
687 glDisable GL_TEXTURE_2D; 836 glDisable GL_TEXTURE_2D;
688} 837}
689 838
690############################################################################# 839#############################################################################
691 840
692package CFClient::UI::ViewPort; 841package CFClient::UI::ViewPort;
693 842
694our @ISA = CFClient::UI::Window::; 843our @ISA = CFClient::UI::Window::;
695
696sub new { die }
697
698sub size_request {
699 my ($self) = @_;
700
701 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
702 $self->child->size_allocate (0, 0, @$self{qw(child_w child_h)});
703
704 @$self{qw(child_w child_h)}
705}
706
707sub _draw {
708 my ($self) = @_;
709
710 $self->{children}[1]->draw;
711}
712
713
714#############################################################################
715
716package CFClient::UI::Frame;
717
718our @ISA = CFClient::UI::Bin::;
719
720use CFClient::OpenGL;
721 844
722sub new { 845sub new {
723 my $class = shift; 846 my $class = shift;
724 847
725 my $self = $class->SUPER::new ( 848 $class->SUPER::new (
726 bg => [1, 1, 1, 1], 849 scroll_x => 0,
727 border_bg => [1, 1, 1, 1], 850 scroll_y => 1,
728 border => 0.8,
729 @_ 851 @_,
730 ); 852 )
731
732 $self
733} 853}
734 854
735sub _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 {
736 my ($self) = @_; 867 my ($self, $w, $h) = @_;
737 868
738 my ($w, $h) = ($self->{w}, $self->{h}); 869 my $child = $self->child;
739 870
740 glEnable GL_BLEND; 871 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
741 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 872 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
742 glEnable GL_TEXTURE_2D;
743 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
744 873
745# glBegin GL_QUADS; 874 $self->child->configure (0, 0, $w, $h);
746# glColor 0, 0, 0, 0; 875 $self->update;
747# glVertex 0 , 0; 876}
748# glVertex 0 , $h;
749# glVertex $w, $h;
750# glVertex $w, 0;
751# glEnd;
752 877
878sub set_offset {
879 my ($self, $x, $y) = @_;
753 880
754 $self->child->draw; 881 $self->{view_x} = int $x;
755 glDisable GL_BLEND; 882 $self->{view_y} = int $y;
756 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;
757} 921}
758 922
759############################################################################# 923#############################################################################
760 924
761package CFClient::UI::FancyFrame; 925package CFClient::UI::ScrolledWindow;
762 926
763our @ISA = CFClient::UI::Bin::; 927our @ISA = CFClient::UI::HBox::;
764
765use CFClient::OpenGL;
766
767my @tex =
768 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
769 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
770 928
771sub new { 929sub new {
772 my $class = shift; 930 my $class = shift;
773 931
774 # 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;
775 1035
776 my $self = $class->SUPER::new ( 1036 my $self = $class->SUPER::new (
777 bg => [1, 1, 1, 1], 1037 bg => [1, 1, 1, 1],
778 border_bg => [1, 1, 1, 1], 1038 border_bg => [1, 1, 1, 1],
779 border => 0.8, 1039 border => 0.6,
780 can_events => 1, 1040 can_events => 1,
1041 min_w => 16,
1042 min_h => 16,
781 @_ 1043 @_
782 ); 1044 );
783 1045
784 $self->{title} &&= new CFClient::UI::Label 1046 $self->{title} &&= new CFClient::UI::Label
785 align => 0, 1047 align => 0,
786 valign => 1, 1048 valign => 1,
787 text => $self->{title}, 1049 text => $self->{title},
788 fontsize => 1; 1050 fontsize => $self->{border};
789 1051
790 $self 1052 $self
791} 1053}
792 1054
793sub border { 1055sub border {
… …
809 my ($self, $w, $h) = @_; 1071 my ($self, $w, $h) = @_;
810 1072
811 $h -= List::Util::max 0, $self->border * 2; 1073 $h -= List::Util::max 0, $self->border * 2;
812 $w -= List::Util::max 0, $self->border * 2; 1074 $w -= List::Util::max 0, $self->border * 2;
813 1075
814 $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)
815 if $self->{title}; 1077 if $self->{title};
816 1078
817 $self->child->configure ($self->border, $self->border, $w, $h); 1079 $self->child->configure ($self->border, $self->border, $w, $h);
818} 1080}
819 1081
820sub button_down { 1082sub button_down {
821 my ($self, $ev, $x, $y) = @_; 1083 my ($self, $ev, $x, $y) = @_;
822 1084
1085 my ($w, $h) = @$self{qw(w h)};
823 my $border = $self->border; 1086 my $border = $self->border;
824 1087
825 if ($x < $self->{w} && $x >= $self->{w} - $border 1088 my $lr = ($x >= 0 && $x < $border) || ($x > $w - $border && $x < $w);
826 && $y < $self->{h} && $y >= $self->{h} - $border) { 1089 my $td = ($y >= 0 && $y < $border) || ($y > $h - $border && $y < $h);
827 1090
1091 if ($lr & $td) {
1092 my ($wx, $wy) = ($self->{x}, $self->{y});
828 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1093 my ($ox, $oy) = ($ev->{x}, $ev->{y});
829 my ($bw, $bh) = ($self->{w}, $self->{h}); 1094 my ($bw, $bh) = ($self->{w}, $self->{h});
830 1095
1096 my $mx = $x < $border;
1097 my $my = $y < $border;
1098
831 $self->{motion} = sub { 1099 $self->{motion} = sub {
832 my ($ev, $x, $y) = @_; 1100 my ($ev, $x, $y) = @_;
833 1101
834 ($x, $y) = ($ev->{x}, $ev->{y}); 1102 my $dx = $ev->{x} - $ox;
1103 my $dy = $ev->{y} - $oy;
835 1104
836 $self->{user_w} = $bw + $x - $ox; 1105 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
837 $self->{user_h} = $bh + $y - $oy; 1106 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
838 $self->check_size; 1107
1108 $self->realloc;
1109 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
839 }; 1110 };
840 1111
841 } elsif ($x >= 0 && $x < $self->{w} 1112 } elsif ($lr ^ $td) {
842 && $y >= 0 && $y < $border) {
843
844 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1113 my ($ox, $oy) = ($ev->{x}, $ev->{y});
845 my ($bx, $by) = ($self->{x}, $self->{y}); 1114 my ($bx, $by) = ($self->{x}, $self->{y});
846 1115
847 $self->{motion} = sub { 1116 $self->{motion} = sub {
848 my ($ev, $x, $y) = @_; 1117 my ($ev, $x, $y) = @_;
849 1118
850 ($x, $y) = ($ev->{x}, $ev->{y}); 1119 ($x, $y) = ($ev->{x}, $ev->{y});
851 1120
852 $self->move ($bx + $x - $ox, $by + $y - $oy); 1121 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
853 $self->update;
854 }; 1122 };
855 } 1123 }
856} 1124}
857 1125
858sub button_up { 1126sub button_up {
… …
871 my ($self) = @_; 1139 my ($self) = @_;
872 1140
873 my ($w, $h ) = ($self->{w}, $self->{h}); 1141 my ($w, $h ) = ($self->{w}, $self->{h});
874 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1142 my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
875 1143
876 glEnable GL_BLEND;
877 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
878 glEnable GL_TEXTURE_2D; 1144 glEnable GL_TEXTURE_2D;
879 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1145 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
880 1146
881 my $border = $self->border; 1147 my $border = $self->border;
882 1148
883 glColor @{ $self->{border_bg} }; 1149 glColor @{ $self->{border_bg} };
884 $tex[1]->draw_quad (0, 0, $w, $border); 1150 $border[0]->draw_quad_alpha (0, 0, $w, $border);
885 $tex[3]->draw_quad (0, $border, $border, $ch); 1151 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
886 $tex[2]->draw_quad ($w - $border, $border, $border, $ch); 1152 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
887 $tex[4]->draw_quad (0, $h - $border, $w, $border); 1153 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
888 1154
889 my $bg = $tex[0]; 1155 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1156 glColor @{ $self->{bg} };
890 1157
891 # TODO: repeat texture not scale 1158 # TODO: repeat texture not scale
892 my $rep_x = $cw / $bg->{w}; 1159 # solve this better(?)
893 my $rep_y = $ch / $bg->{h}; 1160 $bg->{s} = $cw / $bg->{w};
894 1161 $bg->{t} = $ch / $bg->{h};
895 glColor @{ $self->{bg} };
896
897 $bg->{s} = $rep_x;
898 $bg->{t} = $rep_y;
899 $bg->{wrap_mode} = 1;
900 $bg->draw_quad ($border, $border, $cw, $ch); 1162 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1163 }
901 1164
902 glDisable GL_TEXTURE_2D; 1165 glDisable GL_TEXTURE_2D;
903 glDisable GL_BLEND;
904 1166
905 $self->{title}->draw if $self->{title}; 1167 $self->{title}->draw if $self->{title};
1168
906 $self->child->draw; 1169 $self->child->draw;
907} 1170}
908 1171
909############################################################################# 1172#############################################################################
910 1173
… …
919sub new { 1182sub new {
920 my $class = shift; 1183 my $class = shift;
921 1184
922 $class->SUPER::new ( 1185 $class->SUPER::new (
923 col_expand => [], 1186 col_expand => [],
924 @_ 1187 @_,
925 ) 1188 )
1189}
1190
1191sub children {
1192 grep $_, map @$_, grep $_, @{ $_[0]{children} }
926} 1193}
927 1194
928sub add { 1195sub add {
929 my ($self, $x, $y, $child) = @_; 1196 my ($self, $x, $y, $child) = @_;
930 1197
931 $child->set_parent ($self); 1198 $child->set_parent ($self);
932 $self->{children}[$y][$x] = $child; 1199 $self->{children}[$y][$x] = $child;
933 1200
934 $child->check_size; 1201 $self->realloc;
935} 1202}
936 1203
937sub children {
938 grep $_, map @$_, grep $_, @{ $_[0]{children} }
939}
940
941# 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?
942sub clear { 1205sub clear {
943 my ($self) = @_; 1206 my ($self) = @_;
944 1207
945 my @children = $self->children; 1208 my @children = $self->children;
946 delete $self->{children}; 1209 delete $self->{children};
… …
948 for (@children) { 1211 for (@children) {
949 delete $_->{parent}; 1212 delete $_->{parent};
950 $_->hide; 1213 $_->hide;
951 } 1214 }
952 1215
953 $self->update; 1216 $self->realloc;
954} 1217}
955 1218
956sub get_wh { 1219sub get_wh {
957 my ($self) = @_; 1220 my ($self) = @_;
958 1221
… …
989sub size_allocate { 1252sub size_allocate {
990 my ($self, $w, $h) = @_; 1253 my ($self, $w, $h) = @_;
991 1254
992 my ($ws, $hs) = $self->get_wh; 1255 my ($ws, $hs) = $self->get_wh;
993 1256
994 my $req_w = sum @$ws; 1257 my $req_w = (sum @$ws) || 1;
995 my $req_h = sum @$hs; 1258 my $req_h = (sum @$hs) || 1;
996 1259
997 # TODO: nicer code && do row_expand 1260 # TODO: nicer code && do row_expand
998 my @col_expand = @{$self->{col_expand}}; 1261 my @col_expand = @{$self->{col_expand}};
999 @col_expand = (1) x @$ws unless @col_expand; 1262 @col_expand = (1) x @$ws unless @col_expand;
1000 my $col_expand = (sum @col_expand) || 1; 1263 my $col_expand = (sum @col_expand) || 1;
… …
1054 } 1317 }
1055} 1318}
1056 1319
1057############################################################################# 1320#############################################################################
1058 1321
1059package CFClient::UI::HBox; 1322package CFClient::UI::Box;
1060
1061# TODO: wrap into common Box base class
1062 1323
1063our @ISA = CFClient::UI::Container::; 1324our @ISA = CFClient::UI::Container::;
1064 1325
1065sub size_request { 1326sub size_request {
1066 my ($self) = @_; 1327 my ($self) = @_;
1067 1328
1068 my @alloc = map [$_->size_request], @{$self->{children}}; 1329 $self->{vertical}
1069 1330 ? (
1070 ( 1331 (List::Util::max map $_->{req_w}, @{$self->{children}}),
1071 (List::Util::sum map $_->[0], @alloc), 1332 (List::Util::sum map $_->{req_h}, @{$self->{children}}),
1072 (List::Util::max map $_->[1], @alloc), 1333 )
1073 ) 1334 : (
1335 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1336 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1337 )
1074} 1338}
1075 1339
1076sub size_allocate { 1340sub size_allocate {
1077 my ($self, $w, $h) = @_; 1341 my ($self, $w, $h) = @_;
1078 1342
1079 ($h, $w) = ($w, $h); 1343 my $space = $self->{vertical} ? $h : $w;
1080
1081 my $children = $self->{children}; 1344 my $children = $self->{children};
1082 1345
1083 my @h = map $_->{req_w}, @$children; 1346 my @req;
1084 1347
1085 my $req_h = List::Util::sum @h; 1348 if ($self->{homogeneous}) {
1086 1349 @req = ($space / (@$children || 1)) x @$children;
1087 if ($req_h > $h) {
1088 # ah well, not enough space
1089 $_ *= $h / $req_h for @h;
1090 } 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 {
1091 my $exp = List::Util::sum map $_->{expand}, @$children; 1358 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1092 $exp ||= 1;
1093 1359
1360 $space = ($space - $req) / $expand; # remaining space to give away
1361
1362 $req[$_] += $space * $children->[$_]{expand}
1094 for (0 .. $#$children) { 1363 for 0 .. $#$children;
1095 my $child = $children->[$_];
1096
1097 my $alloc_h = $h[$_];
1098 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1099 $h[$_] = $alloc_h;
1100 } 1364 }
1101 } 1365 }
1102 1366
1103 CFClient::UI::harmonize \@h; 1367 CFClient::UI::harmonize \@req;
1104 1368
1105 my $y = 0; 1369 my $pos = 0;
1106 for (0 .. $#$children) { 1370 for (0 .. $#$children) {
1107 my $child = $children->[$_];
1108 my $h = $h[$_]; 1371 my $alloc = $req[$_];
1109 $child->configure ($y, 0, $h, $w); 1372 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1110 1373
1111 $y += $h; 1374 $pos += $alloc;
1112 } 1375 }
1113 1376
1114 1 1377 1
1115} 1378}
1116 1379
1117############################################################################# 1380#############################################################################
1118 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
1119package CFClient::UI::VBox; 1397package CFClient::UI::VBox;
1120 1398
1121# TODO: wrap into common Box base class
1122
1123our @ISA = CFClient::UI::Container::; 1399our @ISA = CFClient::UI::Box::;
1124 1400
1125sub size_request { 1401sub new {
1126 my ($self) = @_; 1402 my $class = shift;
1127 1403
1128 my @alloc = map [$_->size_request], @{$self->{children}}; 1404 $class->SUPER::new (
1129 1405 vertical => 1,
1130 ( 1406 @_,
1131 (List::Util::max map $_->[0], @alloc),
1132 (List::Util::sum map $_->[1], @alloc),
1133 ) 1407 )
1134} 1408}
1135 1409
1136sub size_allocate {
1137 my ($self, $w, $h) = @_;
1138
1139 my $children = $self->{children};
1140
1141 my @h = map $_->{req_h}, @$children;
1142
1143 my $req_h = List::Util::sum @h;
1144
1145 if ($req_h > $h) {
1146 # ah well, not enough space
1147 $_ *= $h / $req_h for @h;
1148 } else {
1149 my $exp = List::Util::sum map $_->{expand}, @$children;
1150 $exp ||= 1;
1151
1152 for (0 .. $#$children) {
1153 my $child = $children->[$_];
1154
1155 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1156 }
1157 }
1158
1159 CFClient::UI::harmonize \@h;
1160
1161 my $y = 0;
1162 for (0 .. $#$children) {
1163 my $child = $children->[$_];
1164 my $h = $h[$_];
1165 $child->configure (0, $y, $w, $h);
1166
1167 $y += $h;
1168 }
1169
1170 1
1171}
1172
1173############################################################################# 1410#############################################################################
1174 1411
1175package CFClient::UI::Label; 1412package CFClient::UI::Label;
1176 1413
1177our @ISA = CFClient::UI::Base::; 1414our @ISA = CFClient::UI::DrawBG::;
1178 1415
1179use CFClient::OpenGL; 1416use CFClient::OpenGL;
1180 1417
1181sub new { 1418sub new {
1182 my ($class, %arg) = @_; 1419 my ($class, %arg) = @_;
1183 1420
1184 my $self = $class->SUPER::new ( 1421 my $self = $class->SUPER::new (
1185 fg => [1, 1, 1], 1422 fg => [1, 1, 1],
1423 #bg => none
1424 #active_bg => none
1186 #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),
1187 fontsize => 1, 1431 fontsize => 1,
1188 text => "",
1189 align => -1, 1432 align => -1,
1190 valign => -1, 1433 valign => -1,
1191 padding => 2, 1434 padding_x => 2,
1192 layout => new CFClient::Layout, 1435 padding_y => 2,
1193 can_events => 0, 1436 can_events => 0,
1194 %arg 1437 %arg
1195 ); 1438 );
1196 1439
1197 if (exists $self->{template}) { 1440 if (exists $self->{template}) {
1198 my $layout = new CFClient::Layout; 1441 my $layout = new CFClient::Layout;
1199 $layout->set_text (delete $self->{template}); 1442 $layout->set_text (delete $self->{template});
1200 $self->{template} = $layout; 1443 $self->{template} = $layout;
1201 } 1444 }
1202 1445
1203 $self->set_text (delete $self->{text}) if exists $self->{text}; 1446 if (exists $self->{markup}) {
1204 $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 }
1205 1451
1206 $self 1452 $self
1207} 1453}
1208 1454
1209sub escape { 1455sub escape($) {
1210 local $_ = $_[1]; 1456 local $_ = $_[0];
1211 1457
1212 s/&/&amp;/g; 1458 s/&/&amp;/g;
1213 s/>/&gt;/g; 1459 s/>/&gt;/g;
1214 s/</&lt;/g; 1460 s/</&lt;/g;
1215 1461
1216 $_[1] 1462 $_
1217} 1463}
1218 1464
1219sub update { 1465sub update {
1220 my ($self) = @_; 1466 my ($self) = @_;
1221 1467
1222 delete $self->{texture}; 1468 delete $self->{texture};
1223 $self->SUPER::update; 1469 $self->SUPER::update;
1224} 1470}
1225 1471
1226sub reconfigure {
1227 my ($self) = @_;
1228
1229 delete $self->{texture};
1230}
1231
1232sub set_text { 1472sub set_text {
1233 my ($self, $text) = @_; 1473 my ($self, $text) = @_;
1234 1474
1235 return if $self->{text} eq "T$text"; 1475 return if $self->{text} eq "T$text";
1236 $self->{text} = "T$text"; 1476 $self->{text} = "T$text";
1237 1477
1478 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1238 $self->{layout}->set_text ($text); 1479 $self->{layout}->set_text ($text);
1239 1480
1240 delete $self->{texture}; 1481 $self->realloc;
1241 $self->update; 1482 $self->update;
1242 $self->check_size;
1243} 1483}
1244 1484
1245sub set_markup { 1485sub set_markup {
1246 my ($self, $markup) = @_; 1486 my ($self, $markup) = @_;
1247 1487
1248 return if $self->{text} eq "M$markup"; 1488 return if $self->{text} eq "M$markup";
1249 $self->{text} = "M$markup"; 1489 $self->{text} = "M$markup";
1250 1490
1491 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1492
1493 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1251 $self->{layout}->set_markup ($markup); 1494 $self->{layout}->set_markup ($markup);
1252 1495
1253 delete $self->{texture}; 1496 $self->realloc;
1254 $self->update; 1497 $self->update;
1255 $self->check_size;
1256} 1498}
1257 1499
1258sub size_request { 1500sub size_request {
1259 my ($self) = @_; 1501 my ($self) = @_;
1260 1502
1261 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1503 $self->{layout}->set_font ($self->{font}) if $self->{font};
1262 $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});
1263 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1507 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1264 1508
1265 my ($w, $h) = $self->{layout}->size; 1509 my ($w, $h) = $self->{layout}->size;
1266 1510
1267 if (exists $self->{template}) { 1511 if (exists $self->{template}) {
… …
1272 1516
1273 $w = List::Util::max $w, $w2; 1517 $w = List::Util::max $w, $w2;
1274 $h = List::Util::max $h, $h2; 1518 $h = List::Util::max $h, $h2;
1275 } 1519 }
1276 1520
1277 ( 1521 ($w, $h)
1278 $w + $self->{padding} * 2,
1279 $h + $self->{padding} * 2,
1280 )
1281} 1522}
1282 1523
1283sub size_allocate { 1524sub size_allocate {
1284 my ($self, $w, $h) = @_; 1525 my ($self, $w, $h) = @_;
1285 1526
… …
1289sub set_fontsize { 1530sub set_fontsize {
1290 my ($self, $fontsize) = @_; 1531 my ($self, $fontsize) = @_;
1291 1532
1292 $self->{fontsize} = $fontsize; 1533 $self->{fontsize} = $fontsize;
1293 delete $self->{texture}; 1534 delete $self->{texture};
1294 $self->check_size; 1535
1295 $self->update; 1536 $self->realloc;
1296} 1537}
1297 1538
1298sub _draw { 1539sub _draw {
1299 my ($self) = @_; 1540 my ($self) = @_;
1300 1541
1542 $self->SUPER::_draw; # draw background, if applicable
1543
1301 my $tex = $self->{texture} ||= do { 1544 my $tex = $self->{texture} ||= do {
1545 $self->{layout}->set_foreground (@{$self->{fg}});
1302 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1546 $self->{layout}->set_font ($self->{font}) if $self->{font};
1303 $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});
1304 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1550 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1551
1305 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
1306 }; 1563 };
1307 1564
1308 glEnable GL_BLEND;
1309 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1310 glEnable GL_TEXTURE_2D; 1565 glEnable GL_TEXTURE_2D;
1311 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1566 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1312 1567
1568 if ($tex->{format} == GL_ALPHA) {
1313 glColor @{$self->{fg}}; 1569 glColor @{$self->{fg}};
1314
1315 $self->{ox} = int (
1316 $self->{align} < 0 ? $self->{padding}
1317 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1318 : ($self->{w} - $tex->{w}) * 0.5
1319 );
1320
1321 $self->{oy} = int (
1322 $self->{valign} < 0 ? $self->{padding}
1323 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1324 : ($self->{h} - $tex->{h}) * 0.5
1325 );
1326
1327 $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 }
1328 1574
1329 glDisable GL_TEXTURE_2D; 1575 glDisable GL_TEXTURE_2D;
1330 glDisable GL_BLEND;
1331} 1576}
1332 1577
1333############################################################################# 1578#############################################################################
1334 1579
1335package CFClient::UI::EntryBase; 1580package CFClient::UI::EntryBase;
… …
1348 active_fg => [0, 0, 0], 1593 active_fg => [0, 0, 0],
1349 can_hover => 1, 1594 can_hover => 1,
1350 can_focus => 1, 1595 can_focus => 1,
1351 valign => 0, 1596 valign => 0,
1352 can_events => 1, 1597 can_events => 1,
1598 #text => ...
1353 @_ 1599 @_
1354 ) 1600 )
1355} 1601}
1356 1602
1357sub _set_text { 1603sub _set_text {
… …
1367 $self->{text} = $text; 1613 $self->{text} = $text;
1368 1614
1369 $text =~ s/./*/g if $self->{hidden}; 1615 $text =~ s/./*/g if $self->{hidden};
1370 $self->{layout}->set_text ("$text "); 1616 $self->{layout}->set_text ("$text ");
1371 1617
1372 $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;
1373} 1628}
1374 1629
1375sub get_text { 1630sub get_text {
1376 $_[0]{text} 1631 $_[0]{text}
1377} 1632}
… …
1380 my ($self) = @_; 1635 my ($self) = @_;
1381 1636
1382 my ($w, $h) = $self->SUPER::size_request; 1637 my ($w, $h) = $self->SUPER::size_request;
1383 1638
1384 ($w + 1, $h) # add 1 for cursor 1639 ($w + 1, $h) # add 1 for cursor
1385}
1386
1387sub size_allocate {
1388 my ($self, $w, $h) = @_;
1389
1390 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1391}
1392
1393sub set_text {
1394 my ($self, $text) = @_;
1395
1396 $self->{cursor} = length $text;
1397 $self->_set_text ($text);
1398 $self->update;
1399} 1640}
1400 1641
1401sub key_down { 1642sub key_down {
1402 my ($self, $ev) = @_; 1643 my ($self, $ev) = @_;
1403 1644
… …
1405 my $sym = $ev->{sym}; 1646 my $sym = $ev->{sym};
1406 my $uni = $ev->{unicode}; 1647 my $uni = $ev->{unicode};
1407 1648
1408 my $text = $self->get_text; 1649 my $text = $self->get_text;
1409 1650
1410 if ($sym == 8) { 1651 if ($uni == 8) {
1411 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1652 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1412 } elsif ($sym == 127) { 1653 } elsif ($uni == 127) {
1413 substr $text, $self->{cursor}, 1, ""; 1654 substr $text, $self->{cursor}, 1, "";
1414 } elsif ($sym == CFClient::SDLK_LEFT) { 1655 } elsif ($sym == CFClient::SDLK_LEFT) {
1415 --$self->{cursor} if $self->{cursor}; 1656 --$self->{cursor} if $self->{cursor};
1416 } elsif ($sym == CFClient::SDLK_RIGHT) { 1657 } elsif ($sym == CFClient::SDLK_RIGHT) {
1417 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1658 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1418 } elsif ($sym == CFClient::SDLK_HOME) { 1659 } elsif ($sym == CFClient::SDLK_HOME) {
1419 $self->{cursor} = 0; 1660 $self->{cursor} = 0;
1420 } elsif ($sym == CFClient::SDLK_END) { 1661 } elsif ($sym == CFClient::SDLK_END) {
1421 $self->{cursor} = length $text; 1662 $self->{cursor} = length $text;
1422 } elsif ($sym == 27) { 1663 } elsif ($uni == 27) {
1423 $self->emit ('escape'); 1664 $self->_emit ('escape');
1424 } elsif ($uni) { 1665 } elsif ($uni) {
1425 substr $text, $self->{cursor}++, 0, chr $uni; 1666 substr $text, $self->{cursor}++, 0, chr $uni;
1426 } 1667 }
1427 1668
1428 $self->_set_text ($text); 1669 $self->_set_text ($text);
1429 $self->update; 1670
1671 $self->realloc;
1430} 1672}
1431 1673
1432sub focus_in { 1674sub focus_in {
1433 my ($self) = @_; 1675 my ($self) = @_;
1434 1676
… …
1514 if ($sym == 13) { 1756 if ($sym == 13) {
1515 unshift @{$self->{history}}, 1757 unshift @{$self->{history}},
1516 my $txt = $self->get_text; 1758 my $txt = $self->get_text;
1517 $self->{history_pointer} = -1; 1759 $self->{history_pointer} = -1;
1518 $self->{history_saveback} = ''; 1760 $self->{history_saveback} = '';
1519 $self->emit (activate => $txt); 1761 $self->_emit (activate => $txt);
1520 $self->update; 1762 $self->update;
1521 1763
1522 } elsif ($sym == CFClient::SDLK_UP) { 1764 } elsif ($sym == CFClient::SDLK_UP) {
1523 if ($self->{history_pointer} < 0) { 1765 if ($self->{history_pointer} < 0) {
1524 $self->{history_saveback} = $self->get_text; 1766 $self->{history_saveback} = $self->get_text;
… …
1561 1803
1562sub new { 1804sub new {
1563 my $class = shift; 1805 my $class = shift;
1564 1806
1565 $class->SUPER::new ( 1807 $class->SUPER::new (
1566 padding => 4, 1808 padding_x => 4,
1809 padding_y => 4,
1567 fg => [1, 1, 1], 1810 fg => [1, 1, 1],
1568 bg => [1, 1, 1, 0.2],
1569 active_fg => [0, 0, 1], 1811 active_fg => [0, 0, 1],
1570 can_hover => 1, 1812 can_hover => 1,
1571 align => 0, 1813 align => 0,
1572 valign => 0, 1814 valign => 0,
1573 can_events => 1, 1815 can_events => 1,
1574 @_ 1816 @_
1575 ) 1817 )
1576} 1818}
1577 1819
1820sub activate { }
1821
1578sub button_up { 1822sub button_up {
1579 my ($self, $ev, $x, $y) = @_; 1823 my ($self, $ev, $x, $y) = @_;
1580 1824
1825 $self->emit ("activate")
1581 if ($x >= 0 && $x < $self->{w} 1826 if $x >= 0 && $x < $self->{w}
1582 && $y >= 0 && $y < $self->{h}) { 1827 && $y >= 0 && $y < $self->{h};
1583 $self->emit ("activate");
1584 }
1585} 1828}
1586 1829
1587sub _draw { 1830sub _draw {
1588 my ($self) = @_; 1831 my ($self) = @_;
1589 1832
… …
1591 1834
1592 if ($GRAB == $self) { 1835 if ($GRAB == $self) {
1593 $self->{fg} = $self->{active_fg}; 1836 $self->{fg} = $self->{active_fg};
1594 } 1837 }
1595 1838
1596 glEnable GL_BLEND;
1597 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1598 glEnable GL_TEXTURE_2D; 1839 glEnable GL_TEXTURE_2D;
1599 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1840 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1600 glColor 0, 0, 0, 1; 1841 glColor 0, 0, 0, 1;
1601 1842
1602 $tex[0]->draw_quad (0, 0, $self->{w}, $self->{h}); 1843 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1603 1844
1604 glDisable GL_TEXTURE_2D; 1845 glDisable GL_TEXTURE_2D;
1605 glDisable GL_BLEND;
1606 1846
1607 $self->SUPER::_draw; 1847 $self->SUPER::_draw;
1608} 1848}
1609 1849
1610############################################################################# 1850#############################################################################
… …
1621 1861
1622sub new { 1862sub new {
1623 my $class = shift; 1863 my $class = shift;
1624 1864
1625 $class->SUPER::new ( 1865 $class->SUPER::new (
1626 padding => 2, 1866 padding_x => 2,
1867 padding_y => 2,
1627 fg => [1, 1, 1], 1868 fg => [1, 1, 1],
1628 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],
1629 state => 0, 1872 state => 0,
1630 can_hover => 1, 1873 can_hover => 1,
1631 @_ 1874 @_
1632 ) 1875 )
1633} 1876}
1634 1877
1635sub size_request { 1878sub size_request {
1636 my ($self) = @_; 1879 my ($self) = @_;
1637 1880
1638 ($self->{padding} * 2 + 6) x 2 1881 (6) x 2
1639} 1882}
1640 1883
1641sub button_down { 1884sub button_down {
1642 my ($self, $ev, $x, $y) = @_; 1885 my ($self, $ev, $x, $y) = @_;
1643 1886
1644 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1887 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1645 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1888 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1646 $self->{state} = !$self->{state}; 1889 $self->{state} = !$self->{state};
1647 $self->emit (changed => $self->{state}); 1890 $self->_emit (changed => $self->{state});
1648 } 1891 }
1649} 1892}
1650 1893
1651sub _draw { 1894sub _draw {
1652 my ($self) = @_; 1895 my ($self) = @_;
1653 1896
1654 $self->SUPER::_draw; 1897 $self->SUPER::_draw;
1655 1898
1656 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 1899 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1657 1900
1658 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;
1659 1904
1660 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1905 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1661 1906
1662 glEnable GL_BLEND; 1907 my $tex = $self->{state} ? $tex[1] : $tex[0];
1908
1663 glEnable GL_TEXTURE_2D; 1909 glEnable GL_TEXTURE_2D;
1664 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1665
1666 my $tex = $self->{state} ? $tex[1] : $tex[0];
1667
1668 $tex->draw_quad (0, 0, $s, $s); 1910 $tex->draw_quad_alpha (0, 0, $s, $s);
1669
1670 glDisable GL_TEXTURE_2D; 1911 glDisable GL_TEXTURE_2D;
1671 glDisable GL_BLEND;
1672} 1912}
1673 1913
1674############################################################################# 1914#############################################################################
1675 1915
1676package CFClient::UI::Image; 1916package CFClient::UI::Image;
… …
1719 glTranslate 0, -$self->{w}, 0; 1959 glTranslate 0, -$self->{w}, 0;
1720 1960
1721 ($w, $h) = ($h, $w); 1961 ($w, $h) = ($h, $w);
1722 } 1962 }
1723 1963
1724 glEnable GL_BLEND;
1725 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1726 glEnable GL_TEXTURE_2D; 1964 glEnable GL_TEXTURE_2D;
1727 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1965 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1728 1966
1729 $tex->draw_quad (0, 0, $w, $h); 1967 $tex->draw_quad_alpha (0, 0, $w, $h);
1730 1968
1731 glDisable GL_BLEND;
1732 glDisable GL_TEXTURE_2D; 1969 glDisable GL_TEXTURE_2D;
1733} 1970}
1734 1971
1735############################################################################# 1972#############################################################################
1736 1973
… …
1925 qw(s1_slider.png s1_slider_bg.png); 2162 qw(s1_slider.png s1_slider_bg.png);
1926 2163
1927sub new { 2164sub new {
1928 my $class = shift; 2165 my $class = shift;
1929 2166
1930 # range [value, low, high, page] 2167 # range [value, low, high, page, unit]
1931 2168
1932 # TODO: 0-width page 2169 # TODO: 0-width page
1933 # TODO: req_w/h are wrong with vertical 2170 # TODO: req_w/h are wrong with vertical
1934 # TODO: calculations are off 2171 # TODO: calculations are off
1935 my $self = $class->SUPER::new ( 2172 my $self = $class->SUPER::new (
1936 fg => [1, 1, 1], 2173 fg => [1, 1, 1],
1937 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],
1938 range => [0, 0, 100, 10], 2177 range => [0, 0, 100, 10, 0],
1939 req_w => 20, 2178 min_w => $::WIDTH / 80,
1940 req_h => 20, 2179 min_h => $::WIDTH / 80,
1941 vertical => 0, 2180 vertical => 0,
1942 can_hover => 1, 2181 can_hover => 1,
1943 inner_pad => 5, 2182 inner_pad => 0.02,
1944 @_ 2183 @_
1945 ); 2184 );
1946 2185
2186 $self->set_value ($self->{range}[0]);
2187 $self->update;
2188
1947 $self 2189 $self
1948} 2190}
1949 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
1950sub size_request { 2226sub size_request {
1951 my ($self) = @_; 2227 my ($self) = @_;
1952 2228
1953 my $w = $self->{req_w}; 2229 ($self->{req_w}, $self->{req_h})
1954 my $h = $self->{req_h};
1955
1956 $self->{vertical} ? ($h, $w) : ($w, $h)
1957} 2230}
1958 2231
1959sub button_down { 2232sub button_down {
1960 my ($self, $ev, $x, $y) = @_; 2233 my ($self, $ev, $x, $y) = @_;
1961 2234
1962 $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
1963 $self->mouse_motion ($ev, $x, $y); 2239 $self->mouse_motion ($ev, $x, $y);
1964} 2240}
1965 2241
1966sub mouse_motion { 2242sub mouse_motion {
1967 my ($self, $ev, $x, $y) = @_; 2243 my ($self, $ev, $x, $y) = @_;
1968 2244
1969 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
1970 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2262 my ($value, $lo, $hi, $page) = @{$self->{range}};
2263 my $range = ($hi - $page - $lo) || 1e-100;
1971 2264
1972 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2265 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
1973 2266
1974 my $inner_pad_px = $self->_calc_inner_pad_px ($w); 2267 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
1975 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right 2268 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
1976 2269
1977 $x -= $inner_pad_px; # substract the padding 2270 $value = ($value - $lo) / $range;
1978 $x = $x * ($hi - $lo) / $inner_w + $lo; 2271 $value = $value * $self->{scale} + $self->{offset};
1979 $x = $lo if $x < $lo;
1980 $x = $hi - $page if $x > $hi - $page;
1981 $self->{range}[0] = $x;
1982 2272
1983 $self->emit (changed => $x); 2273 $self->{knob_x} = $value - $knob_w * 0.5;
1984 $self->update; 2274 $self->{knob_w} = $knob_w;
1985 } 2275 });
1986}
1987 2276
1988# the inner_* stuff is for generating a padding for the slider handle, 2277 $self->SUPER::update;
1989# so that the handle doesn't leave the texture. This calculation isn't 100%
1990# correct propably, but it does the job for now
1991sub _calc_inner_pad_px {
1992 my ($self, $w) = @_;
1993 ($w / 100) * $self->{inner_pad} # % to pixels
1994} 2278}
1995 2279
1996sub _draw { 2280sub _draw {
1997 my ($self) = @_; 2281 my ($self) = @_;
1998 2282
1999 $self->SUPER::_draw (); 2283 $self->SUPER::_draw ();
2000 2284
2001 my ($w, $h) = @$self{qw(w h)}; 2285 glScale $self->{w}, $self->{h};
2002 2286
2003 if ($self->{vertical}) { 2287 if ($self->{vertical}) {
2004 # draw a vertical slider like a rotated horizontal slider 2288 # draw a vertical slider like a rotated horizontal slider
2005 2289
2290 glTranslate 1, 0, 0;
2006 glRotate 90, 0, 0, 1; 2291 glRotate 90, 0, 0, 1;
2007 glTranslate 0, -$self->{w}, 0;
2008
2009 ($w, $h) = ($h, $w);
2010 } 2292 }
2011 2293
2012 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2294 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
2013 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2295 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
2014 2296
2015 my ($value, $lo, $hi, $page) = @{$self->{range}};
2016
2017 $hi = $value + 1 if $lo == $hi;
2018
2019 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
2020 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
2021
2022 $page = int $page * $inner_w / ($hi - $lo);
2023 $value = int +($value - $lo) * $inner_w / ($hi - $lo);
2024
2025 $w -= $page;
2026 $page &= ~1;
2027 glTranslate $page * 0.5, 0, 0;
2028 $page ||= 2;
2029
2030 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
2031 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
2032
2033 glEnable GL_BLEND;
2034 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2035 glEnable GL_TEXTURE_2D; 2297 glEnable GL_TEXTURE_2D;
2036 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2298 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2037 2299
2038 # draw background 2300 # draw background
2039 $tex[1]->draw_quad (0, 0, $w, $h); 2301 $tex[1]->draw_quad_alpha (0, 0, 1, 1);
2040 2302
2041 # draw handle 2303 # draw handle
2042 $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);
2043 2305
2044 glDisable GL_BLEND;
2045 glDisable GL_TEXTURE_2D; 2306 glDisable GL_TEXTURE_2D;
2046} 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 (@_) }
2047 2349
2048############################################################################# 2350#############################################################################
2049 2351
2050package CFClient::UI::TextView; 2352package CFClient::UI::TextView;
2051 2353
… …
2060 fontsize => 1, 2362 fontsize => 1,
2061 can_events => 0, 2363 can_events => 0,
2062 #font => default_font 2364 #font => default_font
2063 @_, 2365 @_,
2064 2366
2065 layout => (new CFClient::Layout), 2367 layout => (new CFClient::Layout 1),
2066 par => [], 2368 par => [],
2067 height => 0, 2369 height => 0,
2068 children => [ 2370 children => [
2069 (new CFClient::UI::Empty expand => 1), 2371 (new CFClient::UI::Empty expand => 1),
2070 (new CFClient::UI::Slider vertical => 1), 2372 (new CFClient::UI::Slider vertical => 1),
2071 ], 2373 ],
2072 ); 2374 );
2073 2375
2074 $self->{children}[1]->connect (changed => sub { 2376 $self->{children}[1]->connect (changed => sub { $self->update });
2075 $self->update;
2076 });
2077 2377
2078 $self 2378 $self
2079} 2379}
2080 2380
2081sub set_fontsize { 2381sub set_fontsize {
2082 my ($self, $fontsize) = @_; 2382 my ($self, $fontsize) = @_;
2083 2383
2084 $self->{fontsize} = $fontsize; 2384 $self->{fontsize} = $fontsize;
2085 $self->reflow; 2385 $self->reflow;
2086}
2087
2088sub text_height {
2089 my ($self, $text) = @_;
2090
2091 my $layout = $self->{layout};
2092
2093 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2094 $layout->set_width ($self->{w});
2095 $layout->set_text ($text);
2096
2097 ($layout->size)[1]
2098}
2099
2100sub reflow {
2101 my ($self) = @_;
2102
2103 $self->{need_reflow}++;
2104 $self->update;
2105} 2386}
2106 2387
2107sub size_allocate { 2388sub size_allocate {
2108 my ($self, $w, $h) = @_; 2389 my ($self, $w, $h) = @_;
2109 2390
… …
2114 $self->{layout}->set_width ($self->{children}[0]{w}); 2395 $self->{layout}->set_width ($self->{children}[0]{w});
2115 2396
2116 $self->reflow; 2397 $self->reflow;
2117} 2398}
2118 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
2119sub add_paragraph { 2434sub add_paragraph {
2120 my ($self, $color, $text) = @_; 2435 my ($self, $color, $text, $indent) = @_;
2121 2436
2122 #TODO: intelligently "reformat" paragraph 2437 for my $line (split /\n/, $text) {
2123 2438 my ($w, $h) = $self->text_size ($line);
2124 my $height = $self->text_height ($text);
2125
2126 $self->{height} += $height; 2439 $self->{height} += $h;
2440 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
2441 }
2127 2442
2128 push @{$self->{par}}, [$height, $color, $text];
2129
2130 $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]);
2131 $self->{children}[1]->update;
2132} 2444}
2133 2445
2134sub update { 2446sub update {
2135 my ($self) = @_; 2447 my ($self) = @_;
2136 2448
… …
2138 2450
2139 return unless $self->{h} > 0; 2451 return unless $self->{h} > 0;
2140 2452
2141 delete $self->{texture}; 2453 delete $self->{texture};
2142 2454
2143 $ROOT->on_refresh ($self, sub { 2455 $ROOT->on_post_alloc ($self, sub {
2456 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2457
2144 if (delete $self->{need_reflow}) { 2458 if (delete $self->{need_reflow}) {
2145 my $height = 0; 2459 my $height = 0;
2146 2460
2147 $height += $_->[0] = $self->text_height ($_->[2]) 2461 my $layout = $self->{layout};
2462
2463 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2464
2148 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 }
2149 2476
2150 $self->{height} = $height; 2477 $self->{height} = $height;
2151 2478
2152 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2479 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2153 2480
2154 delete $self->{texture}; 2481 delete $self->{texture};
2155 } 2482 }
2156 2483
2157 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 2484 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2158 glClearColor 0, 0, 0, 1; 2485 glClearColor 0.5, 0.5, 0.5, 0;
2159 glClear GL_COLOR_BUFFER_BIT; 2486 glClear GL_COLOR_BUFFER_BIT;
2160 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
2161 glEnable GL_BLEND; 2499 glEnable GL_BLEND;
2500 #TODO# not correct in windows where rgba is forced off
2162 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2501 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2163 glEnable GL_TEXTURE_2D;
2164 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2165
2166 my $top = int $self->{children}[1]{range}[0];
2167
2168 my $y0 = $top;
2169 my $y1 = $top + $self->{h};
2170
2171 my $y = 0;
2172
2173 my $layout = $self->{layout};
2174
2175 $layout->set_font ($self->{font}) if $self->{font};
2176 2502
2177 for my $par (@{$self->{par}}) { 2503 for my $par (@{$self->{par}}) {
2178 my $h = $par->[0]; 2504 my $h = $par->[1];
2179 2505
2180 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]);
2181 $layout->set_text ($par->[2]); 2509 $layout->set_markup ($par->[4]);
2182 2510
2183 glColor @{ $par->[1] }; 2511 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2184 my ($W, $H) = $layout->size; 2512
2185 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;
2186 } 2515 }
2187 2516
2188 $y += $h; 2517 $y += $h;
2189 } 2518 }
2190 2519
2191 glDisable GL_TEXTURE_2D;
2192 glDisable GL_BLEND; 2520 glDisable GL_BLEND;
2193 }; 2521 };
2194 }); 2522 });
2195} 2523}
2196 2524
2197sub _draw { 2525sub _draw {
2198 my ($self) = @_; 2526 my ($self) = @_;
2199 2527
2200 if ($self->{texture}) {
2201 glEnable GL_TEXTURE_2D; 2528 glEnable GL_TEXTURE_2D;
2202 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2529 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2203 glColor 1, 1, 1, 1; 2530 glColor 1, 1, 1, 1;
2204 $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});
2205 glDisable GL_TEXTURE_2D; 2532 glDisable GL_TEXTURE_2D;
2206 }
2207 2533
2208 $self->{children}[1]->draw; 2534 $self->{children}[1]->draw;
2209 2535
2210} 2536}
2211 2537
… …
2259 2585
2260sub new { 2586sub new {
2261 my $class = shift; 2587 my $class = shift;
2262 2588
2263 my $self = $class->SUPER::new ( 2589 my $self = $class->SUPER::new (
2264 state => 0, 2590 state => 0,
2265 connect_activate => \&toggle_flopper, 2591 on_activate => \&toggle_flopper,
2266 @_ 2592 @_
2267 ); 2593 );
2268 2594
2269 if ($self->{state}) {
2270 $self->{state} = 0;
2271 $self->toggle_flopper;
2272 }
2273
2274 $self 2595 $self
2275} 2596}
2276 2597
2277sub toggle_flopper { 2598sub toggle_flopper {
2278 my ($self) = @_; 2599 my ($self) = @_;
2279 2600
2280 # TODO: use animation 2601 $self->{other}->toggle_visibility;
2281 if ($self->{state} = !$self->{state}) {
2282 $CFClient::UI::ROOT->add ($self->{other});
2283 $self->{other}->move ($self->coord2global (0, $self->{h}));
2284 $self->emit ("open");
2285 } else {
2286 $CFClient::UI::ROOT->remove ($self->{other});
2287 $self->emit ("close");
2288 }
2289
2290 $self->emit (changed => $self->{state});
2291} 2602}
2292 2603
2293############################################################################# 2604#############################################################################
2294 2605
2295package CFClient::UI::Tooltip; 2606package CFClient::UI::Tooltip;
… …
2305 @_, 2616 @_,
2306 can_events => 0, 2617 can_events => 0,
2307 ) 2618 )
2308} 2619}
2309 2620
2310sub set_markup { 2621sub set_tooltip_from {
2311 my ($self, $text) = @_; 2622 my ($self, $widget) = @_;
2312 2623
2313 $self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0]; 2624 my $tooltip = $widget->{tooltip};
2314 $self->{label}->set_markup ($text); 2625
2315 $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 );
2316} 2641}
2317 2642
2318sub size_request { 2643sub size_request {
2319 my ($self) = @_; 2644 my ($self) = @_;
2320
2321 $self->child->set_max_size ($::WIDTH * 0.3);
2322 2645
2323 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2646 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2324 2647
2325 ($w + 4, $h + 4) 2648 ($w + 4, $h + 4)
2326} 2649}
… …
2329 my ($self, $w, $h) = @_; 2652 my ($self, $w, $h) = @_;
2330 2653
2331 $self->SUPER::size_allocate ($w - 4, $h - 4); 2654 $self->SUPER::size_allocate ($w - 4, $h - 4);
2332} 2655}
2333 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
2334sub _draw { 2675sub _draw {
2335 my ($self) = @_; 2676 my ($self) = @_;
2336 2677
2337 glPushMatrix;
2338 glTranslate 0.375, 0.375; 2678 glTranslate 0.375, 0.375;
2339 2679
2340 my ($w, $h) = @$self{qw(w h)}; 2680 my ($w, $h) = @$self{qw(w h)};
2341 2681
2342 glColor 1, 0.8, 0.4; 2682 glColor 1, 0.8, 0.4;
… …
2353 glVertex 0 , $h; 2693 glVertex 0 , $h;
2354 glVertex $w, $h; 2694 glVertex $w, $h;
2355 glVertex $w, 0; 2695 glVertex $w, 0;
2356 glEnd; 2696 glEnd;
2357 2697
2358 glPopMatrix; 2698 glTranslate 2 - 0.375, 2 - 0.375;
2359 2699
2360 glTranslate 2, 2;
2361 $self->SUPER::_draw; 2700 $self->SUPER::_draw;
2362} 2701}
2363 2702
2364############################################################################# 2703#############################################################################
2365 2704
… …
2370use CFClient::OpenGL; 2709use CFClient::OpenGL;
2371 2710
2372sub new { 2711sub new {
2373 my $class = shift; 2712 my $class = shift;
2374 2713
2375 $class->SUPER::new ( 2714 my $self = $class->SUPER::new (
2376 aspect => 1, 2715 aspect => 1,
2716 can_events => 0,
2377 @_, 2717 @_,
2378 ) 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
2379} 2735}
2380 2736
2381sub size_request { 2737sub size_request {
2382 (32, 8) 2738 (32, 8)
2383} 2739}
2384 2740
2741sub update {
2742 my ($self) = @_;
2743
2744 return unless $self->{visible};
2745
2746 $self->SUPER::update;
2747}
2748
2385sub draw { 2749sub _draw {
2386 my ($self) = @_; 2750 my ($self) = @_;
2387 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
2388 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 2763 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2389 2764
2390 if ($tex) { 2765 if ($tex) {
2391 glEnable GL_BLEND;
2392 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2393 glEnable GL_TEXTURE_2D; 2766 glEnable GL_TEXTURE_2D;
2394 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2767 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2395 glColor 1, 1, 1, 1; 2768 glColor 1, 1, 1, 1;
2396 $tex->draw_quad (0, 0, $self->{w}, $self->{h}); 2769 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2397 glDisable GL_TEXTURE_2D; 2770 glDisable GL_TEXTURE_2D;
2398 glDisable GL_BLEND;
2399 } 2771 }
2772}
2773
2774sub DESTROY {
2775 my ($self) = @_;
2776
2777 $self->{timer}->cancel
2778 if $self->{timer};
2779
2780 $self->SUPER::DESTROY;
2400} 2781}
2401 2782
2402############################################################################# 2783#############################################################################
2403 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
2404package CFClient::UI::Root; 3009package CFClient::UI::Root;
2405 3010
2406our @ISA = CFClient::UI::Container::; 3011our @ISA = CFClient::UI::Container::;
2407 3012
2408use CFClient::OpenGL; 3013use CFClient::OpenGL;
2409 3014
2410sub check_size { 3015sub new {
2411 my ($self) = @_; 3016 my $class = shift;
2412 3017
2413 $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
2414} 3026}
2415 3027
2416sub size_request { 3028sub size_request {
2417 ($::WIDTH, $::HEIGHT) 3029 my ($self) = @_;
2418}
2419 3030
2420sub 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 {
2421 my ($self, $x, $y, $w, $h) = @_; 3049 my ($self, $w, $h) = @_;
2422 3050
2423 $self->SUPER::configure ($x, $y, $w, $h);
2424
2425 for my $child (@{$self->{children}}) { 3051 for my $child ($self->children) {
2426 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)};
2427 3053
2428 $X = List::Util::max 0, List::Util::min $w - $W, $X; 3054 $X = $child->{force_x} if exists $child->{force_x};
2429 $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
2430 $child->configure ($X, $Y, $W,$H); 3060 $child->configure ($X, $Y, $W, $H);
2431 } 3061 }
2432} 3062}
2433 3063
2434sub _topleft { 3064sub coord2local {
2435 my ($self, $x, $y) = @_; 3065 my ($self, $x, $y) = @_;
2436 3066
2437 ($x, $y) 3067 ($x, $y)
2438} 3068}
2439 3069
3070sub coord2global {
3071 my ($self, $x, $y) = @_;
3072
3073 ($x, $y)
3074}
3075
2440sub update { 3076sub update {
2441 my ($self) = @_; 3077 my ($self) = @_;
2442 3078
2443 $self->check_size; 3079 $::WANT_REFRESH++;
2444 ::refresh ();
2445} 3080}
2446 3081
2447sub add { 3082sub add {
2448 my ($self, $child) = @_; 3083 my ($self, @children) = @_;
2449 3084
2450 # integerize window positions 3085 $_->{is_toplevel} = 1
2451 $child->{x} = int $child->{x}; 3086 for @children;
2452 $child->{y} = int $child->{y};
2453 3087
2454 $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 }
2455} 3104}
2456 3105
2457sub on_refresh { 3106sub on_refresh {
2458 my ($self, $id, $cb) = @_; 3107 my ($self, $id, $cb) = @_;
2459 3108
2460 $self->{refresh_hook}{$id} = $cb; 3109 $self->{refresh_hook}{$id} = $cb;
2461} 3110}
2462 3111
3112sub on_post_alloc {
3113 my ($self, $id, $cb) = @_;
3114
3115 $self->{post_alloc_hook}{$id} = $cb;
3116}
3117
2463sub draw { 3118sub draw {
2464 my ($self) = @_; 3119 my ($self) = @_;
2465 3120
2466 while (my $rcb = delete $self->{refresh_hook}) { 3121 while ($self->{refresh_hook}) {
2467 $_->() for values %$rcb; 3122 $_->()
3123 for values %{delete $self->{refresh_hook}};
2468 } 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
2469 3199
2470 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3200 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2471 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3201 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2472 glClear GL_COLOR_BUFFER_BIT; 3202 glClear GL_COLOR_BUFFER_BIT;
2473 3203
2474 glMatrixMode GL_PROJECTION; 3204 glMatrixMode GL_PROJECTION;
2475 glLoadIdentity; 3205 glLoadIdentity;
2476 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000; 3206 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2477 glMatrixMode GL_MODELVIEW; 3207 glMatrixMode GL_MODELVIEW;
2478 glLoadIdentity; 3208 glLoadIdentity;
2479 3209
2480 $self->_draw; 3210 $self->_draw;
2481} 3211}
2482 3212
2483############################################################################# 3213#############################################################################
2484 3214
3215package CFClient::UI::BindEditor;
3216
3217our @ISA = CFClient::UI::FancyFrame::;
3218
3219sub new {
3220 my $class = shift;
3221
3222 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3223
3224 $self->add (my $vb = new CFClient::UI::VBox);
3225
3226
3227 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3228 text => "start recording",
3229 tooltip => "Start/Stops recording of actions."
3230 ."All subsequent actions after the recording started will be captured."
3231 ."The actions are displayed after the record was stopped."
3232 ."To bind the action you have to click on the 'Bind' button",
3233 on_activate => sub {
3234 unless ($self->{recording}) {
3235 $self->start;
3236 } else {
3237 $self->stop;
3238 }
3239 });
3240
3241 $vb->add (new CFClient::UI::Label text => "Actions:");
3242 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3243
3244 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3245 $vb->add (my $hb = new CFClient::UI::HBox);
3246 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3247 $hb->add (new CFClient::UI::Button
3248 text => "bind",
3249 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3250 on_activate => sub {
3251 $self->ask_for_bind;
3252 });
3253
3254 $vb->add (my $hb = new CFClient::UI::HBox);
3255 $hb->add (new CFClient::UI::Button
3256 text => "ok",
3257 expand => 1,
3258 tooltip => "This closes the binding editor and saves the binding",
3259 on_activate => sub {
3260 $self->hide;
3261 $self->commit;
3262 });
3263
3264 $hb->add (new CFClient::UI::Button
3265 text => "cancel",
3266 expand => 1,
3267 tooltip => "This closes the binding editor without saving",
3268 on_activate => sub {
3269 $self->hide;
3270 $self->{binding_cancel}->()
3271 if $self->{binding_cancel};
3272 });
3273
3274 $self->update_binding_widgets;
3275
3276 $self
3277}
3278
3279sub commit {
3280 my ($self) = @_;
3281 my ($mod, $sym, $cmds) = $self->get_binding;
3282 if ($sym != 0 && @$cmds > 0) {
3283 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3284 ."'. Don't forget 'Save Config'!");
3285 $self->{binding_change}->($mod, $sym, $cmds)
3286 if $self->{binding_change};
3287 } else {
3288 $::STATUSBOX->add ("No action bound, no key or action specified!");
3289 $self->{binding_cancel}->()
3290 if $self->{binding_cancel};
3291 }
3292}
3293
3294sub start {
3295 my ($self) = @_;
3296
3297 $self->{rec_btn}->set_text ("stop recording");
3298 $self->{recording} = 1;
3299 $self->clear_command_list;
3300 $::CONN->start_record if $::CONN;
3301}
3302
3303sub stop {
3304 my ($self) = @_;
3305
3306 $self->{rec_btn}->set_text ("start recording");
3307 $self->{recording} = 0;
3308
3309 my $rec;
3310 $rec = $::CONN->stop_record if $::CONN;
3311 return unless ref $rec eq 'ARRAY';
3312 $self->set_command_list ($rec);
3313}
3314
3315# if $commit is true, the binding will be set after the user entered a key combo
3316sub ask_for_bind {
3317 my ($self, $commit) = @_;
3318
3319 CFClient::Binder::open_binding_dialog (sub {
3320 my ($mod, $sym) = @_;
3321 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3322 $self->update_binding_widgets;
3323 $self->commit if $commit;
3324 });
3325}
3326
3327# $mod and $sym are the modifiers and key symbol
3328# $cmds is a array ref of strings (the commands)
3329# $cb is the callback that is executed on OK
3330# $ccb is the callback that is executed on CANCEL and
3331# when the binding was unsuccessful on OK
3332sub set_binding {
3333 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3334
3335 $self->clear_command_list;
3336 $self->{recording} = 0;
3337 $self->{rec_btn}->set_text ("start recording");
3338
3339 $self->{binding} = [$mod, $sym];
3340 $self->{commands} = $cmds;
3341
3342 $self->{binding_change} = $cb;
3343 $self->{binding_cancel} = $ccb;
3344
3345 $self->update_binding_widgets;
3346}
3347
3348# this is a shortcut method that asks for a binding
3349# and then just binds it.
3350sub do_quick_binding {
3351 my ($self, $cmds) = @_;
3352 $self->set_binding (undef, undef, $cmds, sub {
3353 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3354 });
3355 $self->ask_for_bind (1);
3356}
3357
3358sub update_binding_widgets {
3359 my ($self) = @_;
3360 my ($mod, $sym, $cmds) = $self->get_binding;
3361 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3362 $self->set_command_list ($cmds);
3363}
3364
3365sub get_binding {
3366 my ($self) = @_;
3367 return (
3368 $self->{binding}->[0],
3369 $self->{binding}->[1],
3370 [ grep { defined $_ } @{$self->{commands}} ]
3371 );
3372}
3373
3374sub clear_command_list {
3375 my ($self) = @_;
3376 $self->{cmdbox}->clear ();
3377}
3378
3379sub set_command_list {
3380 my ($self, $cmds) = @_;
3381
3382 $self->{cmdbox}->clear ();
3383 $self->{commands} = $cmds;
3384
3385 my $idx = 0;
3386
3387 for (@$cmds) {
3388 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3389
3390 my $i = $idx;
3391 $hb->add (new CFClient::UI::Button
3392 text => "delete",
3393 tooltip => "Deletes the action from the record",
3394 on_activate => sub {
3395 $self->{cmdbox}->remove ($hb);
3396 $cmds->[$i] = undef;
3397 });
3398
3399 $hb->add (new CFClient::UI::Label text => $_);
3400
3401 $idx++
3402 }
3403}
3404
3405
3406#############################################################################
3407
3408package CFClient::UI::SpellList;
3409
3410our @ISA = CFClient::UI::FancyFrame::;
3411
3412sub new {
3413 my $class = shift;
3414
3415 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3416
3417 $self->add (new CFClient::UI::ScrolledWindow
3418 scrolled => $self->{spellbox} = new CFClient::UI::Table);
3419
3420 $self;
3421}
3422
3423# XXX: Do sorting? Argl...
3424sub add_spell {
3425 my ($self, $spell) = @_;
3426 $self->{spells}->{$spell->{name}} = $spell;
3427
3428 $self->{spellbox}->add (0, $self->{tbl_idx}, new CFClient::UI::Face
3429 face => $spell->{face},
3430 can_hover => 1,
3431 can_events => 1,
3432 tooltip => $spell->{message});
3433
3434 $self->{spellbox}->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3435 text => $spell->{name},
3436 can_hover => 1,
3437 can_events => 1,
3438 tooltip => $spell->{message},
3439 expand => 1);
3440 $self->{spellbox}->add (2, $self->{tbl_idx}++, new CFClient::UI::Button
3441 text => "bind to key",
3442 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3443}
3444
3445sub rebuild_spell_list {
3446 my ($self) = @_;
3447 $self->{tbl_idx} = 0;
3448 $self->add_spell ($_) for values %{$self->{spells}};
3449}
3450
3451sub remove_spell {
3452 my ($self, $spell) = @_;
3453 delete $self->{spells}->{$spell->{name}};
3454 $self->rebuild_spell_list;
3455}
3456
3457#############################################################################
3458
2485package CFClient::UI; 3459package CFClient::UI;
2486 3460
2487$ROOT = new CFClient::UI::Root; 3461$ROOT = new CFClient::UI::Root;
2488$TOOLTIP = new CFClient::UI::Tooltip; 3462$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2489 3463
24901 34641
2491 3465

Diff Legend

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