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.148 by elmex, Sat Apr 22 12:14:45 2006 UTC vs.
Revision 1.261 by elmex, Tue May 30 14:45:56 2006 UTC

1package CFClient::UI; 1package CFClient::UI;
2 2
3use utf8;
3use strict; 4use strict;
4 5
5use Scalar::Util (); 6use Scalar::Util ();
6use List::Util (); 7use List::Util ();
7 8
8use CFClient; 9use CFClient;
10use CFClient::Texture;
9 11
10our ($FOCUS, $HOVER, $GRAB); # various widgets 12our ($FOCUS, $HOVER, $GRAB); # various widgets
11 13
14our $LAYOUT;
12our $ROOT; 15our $ROOT;
16our $TOOLTIP;
13our $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}
43
44sub check_tooltip {
45 if (!$GRAB) {
46 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
47 if (length $widget->{tooltip}) {
48
49 if ($TOOLTIP->{owner} != $widget) {
50 $TOOLTIP->hide;
51
52 $TOOLTIP->{owner} = $widget;
53
54 my $tip = $widget->{tooltip};
55
56 $tip = $tip->($widget) if CODE:: eq ref $tip;
57
58 $TOOLTIP->set_tooltip_from ($widget);
59 $TOOLTIP->show;
60 }
61
62 return;
63 }
64 }
65 }
66
67 $TOOLTIP->hide;
68 delete $TOOLTIP->{owner};
69}
14 70
15# class methods for events 71# class methods for events
16sub feed_sdl_key_down_event { 72sub feed_sdl_key_down_event {
17 $FOCUS->key_down ($_[0]) if $FOCUS; 73 $FOCUS->emit (key_down => $_[0])
74 if $FOCUS;
18} 75}
19 76
20sub feed_sdl_key_up_event { 77sub feed_sdl_key_up_event {
21 $FOCUS->key_up ($_[0]) if $FOCUS; 78 $FOCUS->emit (key_up => $_[0])
79 if $FOCUS;
22} 80}
23 81
24sub feed_sdl_button_down_event { 82sub feed_sdl_button_down_event {
25 my ($ev) = @_; 83 my ($ev) = @_;
26 my ($x, $y) = ($ev->{x}, $ev->{y}); 84 my ($x, $y) = ($ev->{x}, $ev->{y});
… …
28 if (!$BUTTON_STATE) { 86 if (!$BUTTON_STATE) {
29 my $widget = $ROOT->find_widget ($x, $y); 87 my $widget = $ROOT->find_widget ($x, $y);
30 88
31 $GRAB = $widget; 89 $GRAB = $widget;
32 $GRAB->update if $GRAB; 90 $GRAB->update if $GRAB;
91
92 check_tooltip;
33 } 93 }
34 94
35 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 95 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
36 96
37 $GRAB->button_down ($ev, $GRAB->coord2local ($x, $y)) if $GRAB; 97 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
98 if $GRAB;
38} 99}
39 100
40sub feed_sdl_button_up_event { 101sub feed_sdl_button_up_event {
41 my ($ev) = @_; 102 my ($ev) = @_;
42 my ($x, $y) = ($ev->{x}, $ev->{y}); 103 my ($x, $y) = ($ev->{x}, $ev->{y});
43 104
44 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 105 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
45 106
46 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); 107 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
47 108
48 $GRAB->button_up ($ev, $GRAB->coord2local ($x, $y)) if $GRAB; 109 $GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y))
110 if $GRAB;
49 111
50 if (!$BUTTON_STATE) { 112 if (!$BUTTON_STATE) {
51 my $grab = $GRAB; undef $GRAB; 113 my $grab = $GRAB; undef $GRAB;
52 $grab->update if $grab; 114 $grab->update if $grab;
53 $GRAB->update if $GRAB; 115 $GRAB->update if $GRAB;
116
117 check_tooltip;
54 } 118 }
55} 119}
56 120
57sub feed_sdl_motion_event { 121sub feed_sdl_motion_event {
58 my ($ev) = @_; 122 my ($ev) = @_;
… …
63 if ($widget != $HOVER) { 127 if ($widget != $HOVER) {
64 my $hover = $HOVER; $HOVER = $widget; 128 my $hover = $HOVER; $HOVER = $widget;
65 129
66 $hover->update if $hover && $hover->{can_hover}; 130 $hover->update if $hover && $hover->{can_hover};
67 $HOVER->update if $HOVER && $HOVER->{can_hover}; 131 $HOVER->update if $HOVER && $HOVER->{can_hover};
68 }
69 132
133 check_tooltip;
134 }
135
70 $HOVER->mouse_motion ($ev, $HOVER->coord2local ($x, $y)) if $HOVER; 136 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
137 if $HOVER;
71} 138}
72 139
73# convert position array to integers 140# convert position array to integers
74sub harmonize { 141sub harmonize {
75 my ($vals) = @_; 142 my ($vals) = @_;
… …
81 $rem += $_ - $i; 148 $rem += $_ - $i;
82 $_ = $i; 149 $_ = $i;
83 } 150 }
84} 151}
85 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
86############################################################################# 194#############################################################################
87 195
88package CFClient::UI::Base; 196package CFClient::UI::Base;
89 197
90use strict; 198use strict;
… …
93 201
94sub new { 202sub new {
95 my $class = shift; 203 my $class = shift;
96 204
97 my $self = bless { 205 my $self = bless {
98 x => 0, 206 x => "center",
99 y => 0, 207 y => "center",
100 z => 0, 208 z => 0,
209 w => undef,
210 h => undef,
211 can_events => 1,
101 @_ 212 @_
102 }, $class; 213 }, $class;
103 214
215 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
216
104 for (keys %$self) { 217 for (keys %$self) {
105 if (/^connect_(.*)$/) { 218 if (/^on_(.*)$/) {
106 $self->connect ($1 => delete $self->{$_}); 219 $self->connect ($1 => delete $self->{$_});
107 } 220 }
108 } 221 }
109 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
110 $self 235 $self
111} 236}
112 237
238sub destroy {
239 my ($self) = @_;
240
241 $self->hide;
242 %$self = ();
243}
244
113sub show { 245sub show {
114 my ($self) = @_; 246 my ($self) = @_;
115 247
116 return if $self->{parent}; 248 return if $self->{parent};
117 249
118 $CFClient::UI::ROOT->add ($self); 250 $CFClient::UI::ROOT->add ($self);
119} 251}
120 252
253sub set_visible {
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};
277
278 undef $GRAB if $GRAB == $self;
279 undef $HOVER if $HOVER == $self;
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
121sub hide { 306sub hide {
122 my ($self) = @_; 307 my ($self) = @_;
123 308
124 return unless $self->{parent}; 309 $self->set_invisible;
125 310
126 $self->{parent}->remove ($self); 311 $self->{parent}->remove ($self)
312 if $self->{parent};
127} 313}
128 314
129sub move { 315sub move_abs {
130 my ($self, $x, $y, $z) = @_; 316 my ($self, $x, $y, $z) = @_;
131 317
132 $self->{x} = int $x; 318 $self->{x} = List::Util::max 0, int $x;
133 $self->{y} = int $y; 319 $self->{y} = List::Util::max 0, int $y;
134 $self->{z} = $z if defined $z; 320 $self->{z} = $z if defined $z;
135 321
136 $self->update; 322 $self->update;
137} 323}
138 324
139sub needs_redraw { 325sub set_size {
140 0 326 my ($self, $w, $h) = @_;
327
328 $self->{force_w} = $w;
329 $self->{force_h} = $h;
330
331 $self->realloc;
141} 332}
142 333
143sub size_request { 334sub size_request {
144 require Carp; 335 require Carp;
145 Carp::confess "size_request is abstract"; 336 Carp::confess "size_request is abstract";
… …
147 338
148sub configure { 339sub configure {
149 my ($self, $x, $y, $w, $h) = @_; 340 my ($self, $x, $y, $w, $h) = @_;
150 341
151 if ($self->{aspect}) { 342 if ($self->{aspect}) {
343 my ($ow, $oh) = ($w, $h);
344
152 my $w2 = List::Util::min $w, int $h * $self->{aspect}; 345 $w = List::Util::min $w, int $h * $self->{aspect};
153 my $h2 = List::Util::min $h, int $w / $self->{aspect}; 346 $h = List::Util::min $h, int $w / $self->{aspect};
154 347
155 # use alignment to adjust x, y 348 # use alignment to adjust x, y
156 349
157 $x += int +($w - $w2) * 0.5; 350 $x += int 0.5 * ($ow - $w);
158 $y += int +($h - $h2) * 0.5; 351 $y += int 0.5 * ($oh - $h);
159
160 ($w, $h) = ($w2, $h2);
161 } 352 }
162 353
163 if ($self->{x} != $x || $self->{y} != $y) { 354 if ($self->{x} ne $x || $self->{y} ne $y) {
164 $self->{x} = $x; 355 $self->{x} = $x;
165 $self->{y} = $y; 356 $self->{y} = $y;
166 $self->update; 357 $self->update;
167 } 358 }
168 359
169 if ($self->{w} != $w || $self->{h} != $h) { 360 if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
361 return unless $self->{visible};
362
170 $self->{w} = $w; 363 $self->{alloc_w} = $w;
171 $self->{h} = $h; 364 $self->{alloc_h} = $h;
172 365
173 $self->size_allocate ($w, $h); 366 $self->{root}{size_alloc}{$self+0} = $self;
174 $self->update;
175 } 367 }
176} 368}
177 369
178sub size_allocate { 370sub size_allocate {
179 # nothing to be done 371 # nothing to be done
180} 372}
181 373
182# return top left coordinates 374sub children {
183sub _topleft { 375}
376
377sub set_max_size {
184 my ($self, $x, $y) = @_; 378 my ($self, $w, $h) = @_;
185 379
186 $self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y}); 380 delete $self->{max_w}; $self->{max_w} = $w if $w;
381 delete $self->{max_h}; $self->{max_h} = $h if $h;
382}
383
384sub set_tooltip {
385 my ($self, $tooltip) = @_;
386
387 $tooltip =~ s/^\s+//;
388 $tooltip =~ s/\s+$//;
389
390 return if $self->{tooltip} eq $tooltip;
391
392 $self->{tooltip} = $tooltip;
393
394 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
395 delete $CFClient::UI::TOOLTIP->{owner};
396 CFClient::UI::check_tooltip;
397 }
187} 398}
188 399
189# translate global coordinates to local coordinate system 400# translate global coordinates to local coordinate system
190sub coord2local { 401sub coord2local {
191 my ($self, $x, $y) = @_; 402 my ($self, $x, $y) = @_;
192 403
193 my ($X, $Y) = $self->_topleft; 404 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
194 ($x - $X, $y - $Y)
195} 405}
196 406
197# translate local coordinates to global coordinate system 407# translate local coordinates to global coordinate system
198sub coord2global { 408sub coord2global {
199 my ($self, $x, $y) = @_; 409 my ($self, $x, $y) = @_;
200 410
201 my ($X, $Y) = $self->_topleft; 411 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
202 ($x + $X, $y + $Y)
203} 412}
204 413
205sub focus_in { 414sub focus_in {
206 my ($self) = @_; 415 my ($self) = @_;
207 416
208 return if $FOCUS == $self; 417 return if $FOCUS == $self;
209 return unless $self->{can_focus}; 418 return unless $self->{can_focus};
210 419
211 my $focus = $FOCUS; $FOCUS = $self; 420 my $focus = $FOCUS; $FOCUS = $self;
212 421
213 $self->emit (focus_in => $focus); 422 $self->_emit (focus_in => $focus);
214 423
215 $focus->update if $focus; 424 $focus->update if $focus;
216 $FOCUS->update; 425 $FOCUS->update;
217} 426}
218 427
… …
221 430
222 return unless $FOCUS == $self; 431 return unless $FOCUS == $self;
223 432
224 my $focus = $FOCUS; undef $FOCUS; 433 my $focus = $FOCUS; undef $FOCUS;
225 434
226 $self->emit (focus_out => $focus); 435 $self->_emit (focus_out => $focus);
227 436
228 $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;
229} 441}
230 442
231sub mouse_motion { } 443sub mouse_motion { }
232sub button_up { } 444sub button_up { }
233sub key_down { } 445sub key_down { }
234sub key_up { } 446sub key_up { }
235 447
236sub button_down { 448sub button_down {
237 my ($self, $ev, $x, $y) = @_; 449 my ($self, $ev, $x, $y) = @_;
238 450
239 $self->focus_in; 451 $self->focus_in;
… …
242sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 454sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }
243sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 455sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }
244sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 456sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }
245sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 457sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }
246sub 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}
247 529
248sub draw { 530sub draw {
249 my ($self) = @_; 531 my ($self) = @_;
250 532
251 return unless $self->{h} && $self->{w}; 533 return unless $self->{h} && $self->{w};
… …
267 glVertex $x + $self->{w}, $y + $self->{h}; 549 glVertex $x + $self->{w}, $y + $self->{h};
268 glVertex $x , $y + $self->{h}; 550 glVertex $x , $y + $self->{h};
269 glEnd; 551 glEnd;
270 glDisable GL_BLEND; 552 glDisable GL_BLEND;
271 } 553 }
554
555 if ($ENV{CFPLUS_DEBUG} & 1) {
556 glPushMatrix;
557 glColor 1, 1, 0, 1;
558 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
559 glBegin GL_LINE_LOOP;
560 glVertex 0 , 0;
561 glVertex $self->{w} - 1, 0;
562 glVertex $self->{w} - 1, $self->{h} - 1;
563 glVertex 0 , $self->{h} - 1;
564 glEnd;
565 glPopMatrix;
566 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
567 }
272} 568}
273 569
274sub _draw { 570sub _draw {
275 my ($self) = @_; 571 my ($self) = @_;
276 572
277 warn "no draw defined for $self\n"; 573 warn "no draw defined for $self\n";
278} 574}
279 575
280sub find_widget {
281 my ($self, $x, $y) = @_;
282
283 return $self
284 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
285 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
286
287 ()
288}
289
290sub set_parent {
291 my ($self, $parent) = @_;
292
293 Scalar::Util::weaken ($self->{parent} = $parent);
294}
295
296sub check_size {
297 my ($self) = @_;
298
299 my ($w, $h) = $self->size_request;
300
301 if ($w != $self->{req_w} || $h != $self->{req_h}) {
302 $self->{req_w} = $w;
303 $self->{req_h} = $h;
304
305 $self->{parent}->check_size
306 if $self->{parent};
307 }
308}
309
310sub update {
311 my ($self) = @_;
312
313 $self->{parent}->update
314 if $self->{parent};
315}
316
317sub connect {
318 my ($self, $signal, $cb) = @_;
319
320 push @{ $self->{signal_cb}{$signal} }, $cb;
321}
322
323sub emit {
324 my ($self, $signal, @args) = @_;
325
326 for my $cb (@{$self->{signal_cb}{$signal} || []}) {
327 $cb->($self, @args);
328 }
329}
330
331sub DESTROY { 576sub DESTROY {
332 my ($self) = @_; 577 my ($self) = @_;
333 578
579 delete $WIDGET{$self+0};
334 #$self->deactivate; 580 #$self->deactivate;
335} 581}
336 582
337############################################################################# 583#############################################################################
338 584
… …
347 my $class = shift; 593 my $class = shift;
348 594
349 # range [value, low, high, page] 595 # range [value, low, high, page]
350 596
351 $class->SUPER::new ( 597 $class->SUPER::new (
352 bg => [0, 0, 0, 0.2], 598 #bg => [0, 0, 0, 0.2],
353 active_bg => [1, 1, 1, 0.5], 599 #active_bg => [1, 1, 1, 0.5],
354 @_ 600 @_
355 ) 601 )
356} 602}
357 603
358sub _draw { 604sub _draw {
359 my ($self) = @_; 605 my ($self) = @_;
360 606
607 my $color = $FOCUS == $self && $self->{active_bg}
608 ? $self->{active_bg}
609 : $self->{bg};
610
611 if ($color && (@$color < 4 || $color->[3])) {
361 my ($w, $h) = @$self{qw(w h)}; 612 my ($w, $h) = @$self{qw(w h)};
362 613
363 glEnable GL_BLEND; 614 glEnable GL_BLEND;
364 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 615 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
365 glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} }; 616 glColor @$color;
366 617
367 glBegin GL_QUADS; 618 glBegin GL_QUADS;
368 glVertex 0 , 0; 619 glVertex 0 , 0;
369 glVertex 0 , $h; 620 glVertex 0 , $h;
370 glVertex $w, $h; 621 glVertex $w, $h;
371 glVertex $w, 0; 622 glVertex $w, 0;
372 glEnd; 623 glEnd;
373 624
374 glDisable GL_BLEND; 625 glDisable GL_BLEND;
626 }
375} 627}
376 628
377############################################################################# 629#############################################################################
378 630
379package CFClient::UI::Empty; 631package CFClient::UI::Empty;
380
381our @ISA = CFClient::UI::Base::;
382
383sub size_request {
384 (0, 0)
385}
386
387sub draw { }
388
389#############################################################################
390
391package CFClient::UI::Container;
392 632
393our @ISA = CFClient::UI::Base::; 633our @ISA = CFClient::UI::Base::;
394 634
395sub new { 635sub new {
396 my ($class, %arg) = @_; 636 my ($class, %arg) = @_;
637 $class->SUPER::new (can_events => 0, %arg);
638}
639
640sub size_request {
641 my ($self) = @_;
642
643 ($self->{w} + 0, $self->{h} + 0)
644}
645
646sub draw { }
647
648#############################################################################
649
650package CFClient::UI::Container;
651
652our @ISA = CFClient::UI::Base::;
653
654sub new {
655 my ($class, %arg) = @_;
397 656
398 my $children = delete $arg{children} || []; 657 my $children = delete $arg{children} || [];
399 658
400 my $self = $class->SUPER::new (children => [], %arg); 659 my $self = $class->SUPER::new (
660 children => [],
661 can_events => 0,
662 %arg,
663 );
401 $self->add ($_) for @$children; 664 $self->add ($_) for @$children;
402 665
403 $self 666 $self
404} 667}
405 668
406sub add { 669sub add {
407 my ($self, $child) = @_; 670 my ($self, @widgets) = @_;
408 671
409 $child->set_parent ($self); 672 $_->set_parent ($self)
673 for @widgets;
410 674
411 use sort 'stable'; 675 use sort 'stable';
412 676
413 $self->{children} = [ 677 $self->{children} = [
414 sort { $a->{z} <=> $b->{z} } 678 sort { $a->{z} <=> $b->{z} }
415 @{$self->{children}}, $child 679 @{$self->{children}}, @widgets
416 ]; 680 ];
417 681
418 $child->check_size; 682 $self->realloc;
683}
684
685sub children {
686 @{ $_[0]{children} }
419} 687}
420 688
421sub remove { 689sub remove {
422 my ($self, $child) = @_; 690 my ($self, $child) = @_;
423 691
424 delete $child->{parent}; 692 delete $child->{parent};
693 $child->hide;
425 694
426 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 695 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
427 696
428 $self->check_size; 697 $self->realloc;
698}
699
700sub clear {
701 my ($self) = @_;
702
703 my $children = delete $self->{children};
704 $self->{children} = [];
705
706 for (@$children) {
707 delete $_->{parent};
708 $_->hide;
709 }
710
711 $self->realloc;
429} 712}
430 713
431sub find_widget { 714sub find_widget {
432 my ($self, $x, $y) = @_; 715 my ($self, $x, $y) = @_;
433 716
… …
508} 791}
509 792
510sub update { 793sub update {
511 my ($self) = @_; 794 my ($self) = @_;
512 795
513 # we want to do this delayed... 796 $ROOT->on_post_alloc ($self => sub { $self->render_child });
514 $self->render_chld;
515 $self->SUPER::update; 797 $self->SUPER::update;
516}
517
518sub render_chld {
519 my ($self) = @_;
520
521 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
522 glClearColor 0, 0, 0, 1;
523 glClear GL_COLOR_BUFFER_BIT;
524 $self->child->draw;
525 };
526} 798}
527 799
528sub size_allocate { 800sub size_allocate {
529 my ($self, $w, $h) = @_; 801 my ($self, $w, $h) = @_;
530 802
531 $self->child->configure (0, 0, $w, $h); 803 $self->SUPER::size_allocate ($w, $h);
804 $self->update;
805}
532 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
533 $self->render_chld; 818 $self->_render;
819 };
534} 820}
535 821
536sub _draw { 822sub _draw {
537 my ($self) = @_; 823 my ($self) = @_;
538 824
539 my ($w, $h) = ($self->w, $self->h); 825 my ($w, $h) = ($self->w, $self->h);
540 826
541 my $tex = $self->{texture} 827 my $tex = $self->{texture}
542 or return; 828 or return;
543 829
544 glEnable GL_BLEND;
545 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
546 glEnable GL_TEXTURE_2D; 830 glEnable GL_TEXTURE_2D;
547 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;
548 833
549 $tex->draw_quad (0, 0, $w, $h); 834 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
550 835
551 glDisable GL_BLEND;
552 glDisable GL_TEXTURE_2D; 836 glDisable GL_TEXTURE_2D;
553} 837}
554 838
555############################################################################# 839#############################################################################
556 840
557package CFClient::UI::ViewPort; 841package CFClient::UI::ViewPort;
558 842
559our @ISA = CFClient::UI::Window::; 843our @ISA = CFClient::UI::Window::;
560
561sub new { die }
562
563sub size_request {
564 my ($self) = @_;
565
566 @$self{qw(child_w child_h)} = $self->child->size_request;
567 $self->child->size_allocate (0, 0, @$self{qw(child_w child_h)});
568
569 @$self{qw(child_w child_h)}
570}
571
572sub _draw {
573 my ($self) = @_;
574
575 $self->{children}[1]->draw;
576}
577
578
579#############################################################################
580
581package CFClient::UI::Frame;
582
583our @ISA = CFClient::UI::Bin::;
584
585use CFClient::OpenGL;
586 844
587sub new { 845sub new {
588 my $class = shift; 846 my $class = shift;
589 847
590 my $self = $class->SUPER::new ( 848 $class->SUPER::new (
591 bg => [1, 1, 1, 1], 849 scroll_x => 0,
592 border_bg => [1, 1, 1, 1], 850 scroll_y => 1,
593 border => 0.8,
594 @_ 851 @_,
595 ); 852 )
596
597 $self
598}
599
600sub set_size {
601 my ($self, $w, $h) = @_;
602 $self->{req_w} = $w;
603 $self->{req_h} = $h;
604 $self->check_size;
605} 853}
606 854
607sub size_request { 855sub size_request {
608 my ($self) = @_; 856 my ($self) = @_;
609 ($self->{req_w}, $self->{req_h}) 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)
610} 864}
611 865
612sub size_allocate { 866sub size_allocate {
613 my ($self, $w, $h) = @_; 867 my ($self, $w, $h) = @_;
614 $self->{w} = $w; 868
615 $self->{h} = $h; 869 my $child = $self->child;
870
871 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
872 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
873
616 $self->child->configure (0, 0, $w, $h); 874 $self->child->configure (0, 0, $w, $h);
875 $self->update;
617} 876}
618 877
619sub _draw { 878sub set_offset {
620 my ($self) = @_; 879 my ($self, $x, $y) = @_;
621 880
622 my ($w, $h) = ($self->{w}, $self->{h}); 881 $self->{view_x} = int $x;
882 $self->{view_y} = int $y;
623 883
624 glEnable GL_BLEND; 884 $self->update;
625 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 885}
626 glEnable GL_TEXTURE_2D;
627 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
628 886
629# glBegin GL_QUADS; 887# hmm, this does not work for topleft of $self... but we should not ask for that
630# glColor 0, 0, 0, 0; 888sub coord2local {
631# glVertex 0 , 0; 889 my ($self, $x, $y) = @_;
632# glVertex 0 , $h;
633# glVertex $w, $h;
634# glVertex $w, 0;
635# glEnd;
636 890
891 $self->SUPER::coord2local ($x + $self->{view_x}, $y + $self->{view_y})
892}
637 893
638 $self->child->draw; 894sub coord2global {
639 glDisable GL_BLEND; 895 my ($self, $x, $y) = @_;
640 glDisable GL_TEXTURE_2D; 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;
641} 921}
642 922
643############################################################################# 923#############################################################################
644 924
645package CFClient::UI::FancyFrame; 925package CFClient::UI::ScrolledWindow;
646 926
647our @ISA = CFClient::UI::Bin::; 927our @ISA = CFClient::UI::HBox::;
648
649use CFClient::OpenGL;
650
651my @tex =
652 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
653 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
654 928
655sub new { 929sub new {
656 my $class = shift; 930 my $class = shift;
657 931
658 # 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;
659 1035
660 my $self = $class->SUPER::new ( 1036 my $self = $class->SUPER::new (
661 bg => [1, 1, 1, 1], 1037 bg => [1, 1, 1, 1],
662 border_bg => [1, 1, 1, 1], 1038 border_bg => [1, 1, 1, 1],
663 border => 0.8, 1039 border => 0.6,
1040 can_events => 1,
1041 min_w => 16,
1042 min_h => 16,
664 @_ 1043 @_
665 ); 1044 );
666 1045
667 $self->{title} &&= new CFClient::UI::Label 1046 $self->{title} &&= new CFClient::UI::Label
668 align => 0, 1047 align => 0,
669 valign => 1, 1048 valign => 1,
670 text => $self->{title}, 1049 text => $self->{title},
671 fontsize => 1; 1050 fontsize => $self->{border};
672 1051
673 $self 1052 $self
674} 1053}
675 1054
676sub border { 1055sub border {
677 int $_[0]{border} * $::FONTSIZE 1056 int $_[0]{border} * $::FONTSIZE
678} 1057}
679 1058
680sub size_request { 1059sub size_request {
681 my ($self) = @_; 1060 my ($self) = @_;
682
683 return ($self->{user_w}, $self->{user_h}) if $self->{user_w} && $self->{user_h};
684 1061
685 my ($w, $h) = $self->SUPER::size_request; 1062 my ($w, $h) = $self->SUPER::size_request;
686 1063
687 ( 1064 (
688 $w + $self->border * 2, 1065 $w + $self->border * 2,
… …
694 my ($self, $w, $h) = @_; 1071 my ($self, $w, $h) = @_;
695 1072
696 $h -= List::Util::max 0, $self->border * 2; 1073 $h -= List::Util::max 0, $self->border * 2;
697 $w -= List::Util::max 0, $self->border * 2; 1074 $w -= List::Util::max 0, $self->border * 2;
698 1075
699 $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)
700 if $self->{title}; 1077 if $self->{title};
701 1078
702 $self->child->configure ($self->border, $self->border, $w, $h); 1079 $self->child->configure ($self->border, $self->border, $w, $h);
703} 1080}
704 1081
705sub button_down { 1082sub button_down {
706 my ($self, $ev, $x, $y) = @_; 1083 my ($self, $ev, $x, $y) = @_;
707 1084
1085 my ($w, $h) = @$self{qw(w h)};
708 my $border = $self->border; 1086 my $border = $self->border;
709 1087
710 if ($x < $self->{w} && $x >= $self->{w} - $border 1088 my $lr = ($x >= 0 && $x < $border) || ($x > $w - $border && $x < $w);
711 && $y < $self->{h} && $y >= $self->{h} - $border) { 1089 my $td = ($y >= 0 && $y < $border) || ($y > $h - $border && $y < $h);
712 1090
1091 if ($lr & $td) {
1092 my ($wx, $wy) = ($self->{x}, $self->{y});
713 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1093 my ($ox, $oy) = ($ev->{x}, $ev->{y});
714 my ($bw, $bh) = ($self->{w}, $self->{h}); 1094 my ($bw, $bh) = ($self->{w}, $self->{h});
715 1095
1096 my $mx = $x < $border;
1097 my $my = $y < $border;
1098
716 $self->{motion} = sub { 1099 $self->{motion} = sub {
717 my ($ev, $x, $y) = @_; 1100 my ($ev, $x, $y) = @_;
718 1101
719 ($x, $y) = ($ev->{x}, $ev->{y}); 1102 my $dx = $ev->{x} - $ox;
1103 my $dy = $ev->{y} - $oy;
720 1104
721 $self->{user_w} = $bw + $x - $ox; 1105 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
722 $self->{user_h} = $bh + $y - $oy; 1106 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
723 $self->check_size; 1107
1108 $self->realloc;
1109 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
724 }; 1110 };
725 1111
726 } elsif ($x >= 0 && $x < $self->{w} 1112 } elsif ($lr ^ $td) {
727 && $y >= 0 && $y < $border) {
728
729 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1113 my ($ox, $oy) = ($ev->{x}, $ev->{y});
730 my ($bx, $by) = ($self->{x}, $self->{y}); 1114 my ($bx, $by) = ($self->{x}, $self->{y});
731 1115
732 $self->{motion} = sub { 1116 $self->{motion} = sub {
733 my ($ev, $x, $y) = @_; 1117 my ($ev, $x, $y) = @_;
734 1118
735 ($x, $y) = ($ev->{x}, $ev->{y}); 1119 ($x, $y) = ($ev->{x}, $ev->{y});
736 1120
737 $self->move ($bx + $x - $ox, $by + $y - $oy); 1121 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
738 $self->update;
739 }; 1122 };
740 } 1123 }
741} 1124}
742 1125
743sub button_up { 1126sub button_up {
… …
756 my ($self) = @_; 1139 my ($self) = @_;
757 1140
758 my ($w, $h ) = ($self->{w}, $self->{h}); 1141 my ($w, $h ) = ($self->{w}, $self->{h});
759 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1142 my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
760 1143
761 glEnable GL_BLEND;
762 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
763 glEnable GL_TEXTURE_2D; 1144 glEnable GL_TEXTURE_2D;
764 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1145 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
765 1146
766 my $border = $self->border; 1147 my $border = $self->border;
767 1148
768 glColor @{ $self->{border_bg} }; 1149 glColor @{ $self->{border_bg} };
769 $tex[1]->draw_quad (0, 0, $w, $border); 1150 $border[0]->draw_quad_alpha (0, 0, $w, $border);
770 $tex[3]->draw_quad (0, $border, $border, $ch); 1151 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
771 $tex[2]->draw_quad ($w - $border, $border, $border, $ch); 1152 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
772 $tex[4]->draw_quad (0, $h - $border, $w, $border); 1153 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
773 1154
774 my $bg = $tex[0]; 1155 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1156 glColor @{ $self->{bg} };
775 1157
776 # TODO: repeat texture not scale 1158 # TODO: repeat texture not scale
777 my $rep_x = $cw / $bg->{w}; 1159 # solve this better(?)
778 my $rep_y = $ch / $bg->{h}; 1160 $bg->{s} = $cw / $bg->{w};
779 1161 $bg->{t} = $ch / $bg->{h};
780 glColor @{ $self->{bg} };
781
782 $bg->{s} = $rep_x;
783 $bg->{t} = $rep_y;
784 $bg->{wrap_mode} = 1;
785 $bg->draw_quad ($border, $border, $cw, $ch); 1162 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1163 }
786 1164
787 glDisable GL_TEXTURE_2D; 1165 glDisable GL_TEXTURE_2D;
788 glDisable GL_BLEND;
789 1166
790 $self->{title}->draw if $self->{title}; 1167 $self->{title}->draw if $self->{title};
1168
791 $self->child->draw; 1169 $self->child->draw;
792} 1170}
793 1171
794############################################################################# 1172#############################################################################
795 1173
… …
804sub new { 1182sub new {
805 my $class = shift; 1183 my $class = shift;
806 1184
807 $class->SUPER::new ( 1185 $class->SUPER::new (
808 col_expand => [], 1186 col_expand => [],
809 @_ 1187 @_,
810 ) 1188 )
1189}
1190
1191sub children {
1192 grep $_, map @$_, grep $_, @{ $_[0]{children} }
811} 1193}
812 1194
813sub add { 1195sub add {
814 my ($self, $x, $y, $child) = @_; 1196 my ($self, $x, $y, $child) = @_;
815 1197
816 $child->set_parent ($self); 1198 $child->set_parent ($self);
817 $self->{children}[$y][$x] = $child; 1199 $self->{children}[$y][$x] = $child;
818 1200
819 $child->check_size; 1201 $self->realloc;
820} 1202}
821 1203
822# 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?
823sub clear { 1205sub clear {
824 my ($self) = @_; 1206 my ($self) = @_;
825 1207
1208 my @children = $self->children;
826 delete $self->{children}; 1209 delete $self->{children};
827 $self->update; 1210
1211 for (@children) {
1212 delete $_->{parent};
1213 $_->hide;
1214 }
1215
1216 $self->realloc;
828} 1217}
829 1218
830sub get_wh { 1219sub get_wh {
831 my ($self) = @_; 1220 my ($self) = @_;
832 1221
… …
837 or next; 1226 or next;
838 1227
839 for my $x (0 .. $#$row) { 1228 for my $x (0 .. $#$row) {
840 my $widget = $row->[$x] 1229 my $widget = $row->[$x]
841 or next; 1230 or next;
842 my ($w, $h) = $widget->size_request; 1231 my ($w, $h) = @$widget{qw(req_w req_h)};
843 1232
844 $w[$x] = max $w[$x], $w; 1233 $w[$x] = max $w[$x], $w;
845 $h[$y] = max $h[$y], $h; 1234 $h[$y] = max $h[$y], $h;
846 } 1235 }
847 } 1236 }
… …
863sub size_allocate { 1252sub size_allocate {
864 my ($self, $w, $h) = @_; 1253 my ($self, $w, $h) = @_;
865 1254
866 my ($ws, $hs) = $self->get_wh; 1255 my ($ws, $hs) = $self->get_wh;
867 1256
868 my $req_w = sum @$ws; 1257 my $req_w = (sum @$ws) || 1;
869 my $req_h = sum @$hs; 1258 my $req_h = (sum @$hs) || 1;
870 1259
871 # TODO: nicer code && do row_expand 1260 # TODO: nicer code && do row_expand
872 my @col_expand = @{$self->{col_expand}}; 1261 my @col_expand = @{$self->{col_expand}};
873 @col_expand = (1) x @$ws unless @col_expand; 1262 @col_expand = (1) x @$ws unless @col_expand;
874 my $col_expand = (sum @col_expand) || 1; 1263 my $col_expand = (sum @col_expand) || 1;
… …
928 } 1317 }
929} 1318}
930 1319
931############################################################################# 1320#############################################################################
932 1321
933package CFClient::UI::HBox; 1322package CFClient::UI::Box;
934
935# TODO: wrap into common Box base class
936 1323
937our @ISA = CFClient::UI::Container::; 1324our @ISA = CFClient::UI::Container::;
938 1325
939sub size_request { 1326sub size_request {
940 my ($self) = @_; 1327 my ($self) = @_;
941 1328
942 my @alloc = map [$_->size_request], @{$self->{children}}; 1329 $self->{vertical}
943 1330 ? (
944 ( 1331 (List::Util::max map $_->{req_w}, @{$self->{children}}),
945 (List::Util::sum map $_->[0], @alloc), 1332 (List::Util::sum map $_->{req_h}, @{$self->{children}}),
946 (List::Util::max map $_->[1], @alloc), 1333 )
947 ) 1334 : (
1335 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1336 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1337 )
948} 1338}
949 1339
950sub size_allocate { 1340sub size_allocate {
951 my ($self, $w, $h) = @_; 1341 my ($self, $w, $h) = @_;
952 1342
953 ($h, $w) = ($w, $h); 1343 my $space = $self->{vertical} ? $h : $w;
954
955 my $children = $self->{children}; 1344 my $children = $self->{children};
956 1345
957 my @h = map +($_->size_request)[0], @$children; 1346 my @req;
958 1347
959 my $req_h = List::Util::sum @h; 1348 if ($self->{homogeneous}) {
960 1349 @req = ($space / (@$children || 1)) x @$children;
961 if ($req_h > $h) {
962 # ah well, not enough space
963 $_ *= $h / $req_h for @h;
964 } 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 {
965 my $exp = List::Util::sum map $_->{expand}, @$children; 1358 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
966 $exp ||= 1;
967 1359
1360 $space = ($space - $req) / $expand; # remaining space to give away
1361
1362 $req[$_] += $space * $children->[$_]{expand}
968 for (0 .. $#$children) { 1363 for 0 .. $#$children;
969 my $child = $children->[$_];
970
971 my $alloc_h = $h[$_];
972 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
973 $h[$_] = $alloc_h;
974 } 1364 }
975 } 1365 }
976 1366
977 CFClient::UI::harmonize \@h; 1367 CFClient::UI::harmonize \@req;
978 1368
979 my $y = 0; 1369 my $pos = 0;
980 for (0 .. $#$children) { 1370 for (0 .. $#$children) {
981 my $child = $children->[$_];
982 my $h = $h[$_]; 1371 my $alloc = $req[$_];
983 $child->configure ($y, 0, $h, $w); 1372 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
984 1373
985 $y += $h; 1374 $pos += $alloc;
986 } 1375 }
987 1376
988 1 1377 1
989} 1378}
990 1379
991############################################################################# 1380#############################################################################
992 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
993package CFClient::UI::VBox; 1397package CFClient::UI::VBox;
994 1398
995# TODO: wrap into common Box base class
996
997our @ISA = CFClient::UI::Container::; 1399our @ISA = CFClient::UI::Box::;
998 1400
999sub size_request { 1401sub new {
1000 my ($self) = @_; 1402 my $class = shift;
1001 1403
1002 my @alloc = map [$_->size_request], @{$self->{children}}; 1404 $class->SUPER::new (
1003 1405 vertical => 1,
1004 ( 1406 @_,
1005 (List::Util::max map $_->[0], @alloc),
1006 (List::Util::sum map $_->[1], @alloc),
1007 ) 1407 )
1008} 1408}
1009 1409
1010sub size_allocate {
1011 my ($self, $w, $h) = @_;
1012
1013 my $children = $self->{children};
1014
1015 my @h = map +($_->size_request)[1], @$children;
1016
1017 my $req_h = List::Util::sum @h;
1018
1019 if ($req_h > $h) {
1020 # ah well, not enough space
1021 $_ *= $h / $req_h for @h;
1022 } else {
1023 my $exp = List::Util::sum map $_->{expand}, @$children;
1024 $exp ||= 1;
1025
1026 for (0 .. $#$children) {
1027 my $child = $children->[$_];
1028
1029 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1030 }
1031 }
1032
1033 CFClient::UI::harmonize \@h;
1034
1035 my $y = 0;
1036 for (0 .. $#$children) {
1037 my $child = $children->[$_];
1038 my $h = $h[$_];
1039 $child->configure (0, $y, $w, $h);
1040
1041 $y += $h;
1042 }
1043
1044 1
1045}
1046
1047############################################################################# 1410#############################################################################
1048 1411
1049package CFClient::UI::Label; 1412package CFClient::UI::Label;
1050 1413
1051our @ISA = CFClient::UI::Base::; 1414our @ISA = CFClient::UI::DrawBG::;
1052 1415
1053use CFClient::OpenGL; 1416use CFClient::OpenGL;
1054 1417
1055sub new { 1418sub new {
1056 my ($class, %arg) = @_; 1419 my ($class, %arg) = @_;
1057 1420
1058 my $self = $class->SUPER::new ( 1421 my $self = $class->SUPER::new (
1059 fg => [1, 1, 1], 1422 fg => [1, 1, 1],
1423 #bg => none
1424 #active_bg => none
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),
1060 fontsize => 1, 1431 fontsize => 1,
1061 text => "",
1062 align => -1, 1432 align => -1,
1063 valign => -1, 1433 valign => -1,
1064 padding => 2, 1434 padding_x => 2,
1065 layout => new CFClient::Layout, 1435 padding_y => 2,
1436 can_events => 0,
1066 %arg 1437 %arg
1067 ); 1438 );
1068 1439
1069 if (exists $self->{template}) { 1440 if (exists $self->{template}) {
1070 my $layout = new CFClient::Layout; 1441 my $layout = new CFClient::Layout;
1071 $layout->set_text (delete $self->{template}); 1442 $layout->set_text (delete $self->{template});
1072 $self->{template} = $layout; 1443 $self->{template} = $layout;
1073 } 1444 }
1074 1445
1075 $self->set_text (delete $self->{text}) if exists $self->{text}; 1446 if (exists $self->{markup}) {
1076 $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 }
1077 1451
1078 $self 1452 $self
1079} 1453}
1080 1454
1081sub escape_text { 1455sub escape($) {
1082 local $_ = $_[1]; 1456 local $_ = $_[0];
1083 1457
1084 s/&/&amp;/g; 1458 s/&/&amp;/g;
1085 s/>/&gt;/g; 1459 s/>/&gt;/g;
1086 s/</&lt;/g; 1460 s/</&lt;/g;
1087 1461
1088 $_[1] 1462 $_
1463}
1464
1465sub update {
1466 my ($self) = @_;
1467
1468 delete $self->{texture};
1469 $self->SUPER::update;
1089} 1470}
1090 1471
1091sub set_text { 1472sub set_text {
1092 my ($self, $text) = @_; 1473 my ($self, $text) = @_;
1093 1474
1475 return if $self->{text} eq "T$text";
1476 $self->{text} = "T$text";
1477
1478 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1094 $self->{layout}->set_text ($text); 1479 $self->{layout}->set_text ($text);
1095 1480
1096 delete $self->{texture}; 1481 $self->realloc;
1097 $self->update; 1482 $self->update;
1098} 1483}
1099 1484
1100sub set_markup { 1485sub set_markup {
1101 my ($self, $markup) = @_; 1486 my ($self, $markup) = @_;
1102 1487
1488 return if $self->{text} eq "M$markup";
1489 $self->{text} = "M$markup";
1490
1491 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1492
1493 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1103 $self->{layout}->set_markup ($markup); 1494 $self->{layout}->set_markup ($markup);
1104 1495
1105 delete $self->{texture}; 1496 $self->realloc;
1106 $self->update; 1497 $self->update;
1107} 1498}
1108 1499
1109sub size_request { 1500sub size_request {
1110 my ($self) = @_; 1501 my ($self) = @_;
1111 1502
1112 $self->{layout}->set_width; 1503 $self->{layout}->set_font ($self->{font}) if $self->{font};
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});
1113 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1507 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1114 1508
1115 my ($w, $h) = $self->{layout}->size; 1509 my ($w, $h) = $self->{layout}->size;
1116 1510
1117 if (exists $self->{template}) { 1511 if (exists $self->{template}) {
1512 $self->{template}->set_font ($self->{font}) if $self->{font};
1118 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1513 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1119 1514
1120 my ($w2, $h2) = $self->{template}->size; 1515 my ($w2, $h2) = $self->{template}->size;
1121 1516
1122 $w = List::Util::max $w, $w2; 1517 $w = List::Util::max $w, $w2;
1123 $h = List::Util::max $h, $h2; 1518 $h = List::Util::max $h, $h2;
1124 } 1519 }
1125 1520
1126 ( 1521 ($w, $h)
1127 $w + $self->{padding} * 2,
1128 $h + $self->{padding} * 2,
1129 )
1130} 1522}
1131 1523
1132sub size_allocate { 1524sub size_allocate {
1133 my ($self, $w, $h) = @_; 1525 my ($self, $w, $h) = @_;
1134 1526
… …
1137 1529
1138sub set_fontsize { 1530sub set_fontsize {
1139 my ($self, $fontsize) = @_; 1531 my ($self, $fontsize) = @_;
1140 1532
1141 $self->{fontsize} = $fontsize; 1533 $self->{fontsize} = $fontsize;
1142 $self->check_size; 1534 delete $self->{texture};
1535
1536 $self->realloc;
1143} 1537}
1144 1538
1145sub _draw { 1539sub _draw {
1146 my ($self) = @_; 1540 my ($self) = @_;
1147 1541
1542 $self->SUPER::_draw; # draw background, if applicable
1543
1148 my $tex = $self->{texture} ||= do { 1544 my $tex = $self->{texture} ||= do {
1545 $self->{layout}->set_foreground (@{$self->{fg}});
1546 $self->{layout}->set_font ($self->{font}) if $self->{font};
1149 $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});
1150 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1550 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1551
1151 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
1152 }; 1563 };
1153 1564
1154 glEnable GL_BLEND;
1155 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1156 glEnable GL_TEXTURE_2D; 1565 glEnable GL_TEXTURE_2D;
1157 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1566 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1158 1567
1568 if ($tex->{format} == GL_ALPHA) {
1159 glColor @{$self->{fg}}; 1569 glColor @{$self->{fg}};
1160
1161 $self->{ox} = int (
1162 $self->{align} < 0 ? $self->{padding}
1163 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1164 : ($self->{w} - $tex->{w}) * 0.5
1165 );
1166
1167 $self->{oy} = int (
1168 $self->{valign} < 0 ? $self->{padding}
1169 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1170 : ($self->{h} - $tex->{h}) * 0.5
1171 );
1172
1173 $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 }
1174 1574
1175 glDisable GL_TEXTURE_2D; 1575 glDisable GL_TEXTURE_2D;
1176 glDisable GL_BLEND;
1177} 1576}
1178 1577
1179############################################################################# 1578#############################################################################
1180 1579
1181package CFClient::UI::EntryBase; 1580package CFClient::UI::EntryBase;
… …
1186 1585
1187sub new { 1586sub new {
1188 my $class = shift; 1587 my $class = shift;
1189 1588
1190 $class->SUPER::new ( 1589 $class->SUPER::new (
1191 fg => [1, 1, 1], 1590 fg => [1, 1, 1],
1192 bg => [0, 0, 0, 0.2], 1591 bg => [0, 0, 0, 0.2],
1193 active_bg => [1, 1, 1, 0.5], 1592 active_bg => [1, 1, 1, 0.5],
1194 active_fg => [0, 0, 0], 1593 active_fg => [0, 0, 0],
1195 can_hover => 1, 1594 can_hover => 1,
1196 can_focus => 1, 1595 can_focus => 1,
1197 valign => 0, 1596 valign => 0,
1597 can_events => 1,
1598 #text => ...
1198 @_ 1599 @_
1199 ) 1600 )
1200} 1601}
1201 1602
1202sub _set_text { 1603sub _set_text {
… …
1212 $self->{text} = $text; 1613 $self->{text} = $text;
1213 1614
1214 $text =~ s/./*/g if $self->{hidden}; 1615 $text =~ s/./*/g if $self->{hidden};
1215 $self->{layout}->set_text ("$text "); 1616 $self->{layout}->set_text ("$text ");
1216 1617
1217 $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;
1218} 1628}
1219 1629
1220sub get_text { 1630sub get_text {
1221 $_[0]{text} 1631 $_[0]{text}
1222} 1632}
… …
1225 my ($self) = @_; 1635 my ($self) = @_;
1226 1636
1227 my ($w, $h) = $self->SUPER::size_request; 1637 my ($w, $h) = $self->SUPER::size_request;
1228 1638
1229 ($w + 1, $h) # add 1 for cursor 1639 ($w + 1, $h) # add 1 for cursor
1230}
1231
1232sub size_allocate {
1233 my ($self, $w, $h) = @_;
1234
1235 $self->_set_text ($self->{text});
1236}
1237
1238sub set_text {
1239 my ($self, $text) = @_;
1240
1241 $self->{cursor} = length $text;
1242 $self->_set_text ($text);
1243 $self->update;
1244} 1640}
1245 1641
1246sub key_down { 1642sub key_down {
1247 my ($self, $ev) = @_; 1643 my ($self, $ev) = @_;
1248 1644
… …
1250 my $sym = $ev->{sym}; 1646 my $sym = $ev->{sym};
1251 my $uni = $ev->{unicode}; 1647 my $uni = $ev->{unicode};
1252 1648
1253 my $text = $self->get_text; 1649 my $text = $self->get_text;
1254 1650
1255 if ($sym == 8) { 1651 if ($uni == 8) {
1256 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1652 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1257 } elsif ($sym == 127) { 1653 } elsif ($uni == 127) {
1258 substr $text, $self->{cursor}, 1, ""; 1654 substr $text, $self->{cursor}, 1, "";
1259 } elsif ($sym == CFClient::SDLK_LEFT) { 1655 } elsif ($sym == CFClient::SDLK_LEFT) {
1260 --$self->{cursor} if $self->{cursor}; 1656 --$self->{cursor} if $self->{cursor};
1261 } elsif ($sym == CFClient::SDLK_RIGHT) { 1657 } elsif ($sym == CFClient::SDLK_RIGHT) {
1262 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1658 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1263 } elsif ($sym == CFClient::SDLK_HOME) { 1659 } elsif ($sym == CFClient::SDLK_HOME) {
1264 $self->{cursor} = 0; 1660 $self->{cursor} = 0;
1265 } elsif ($sym == CFClient::SDLK_END) { 1661 } elsif ($sym == CFClient::SDLK_END) {
1266 $self->{cursor} = length $text; 1662 $self->{cursor} = length $text;
1267 } elsif ($sym == 27) { 1663 } elsif ($uni == 27) {
1268 $self->emit ('escape'); 1664 $self->_emit ('escape');
1269 } elsif ($uni) { 1665 } elsif ($uni) {
1270 substr $text, $self->{cursor}++, 0, chr $uni; 1666 substr $text, $self->{cursor}++, 0, chr $uni;
1271 } 1667 }
1272 1668
1273 $self->_set_text ($text); 1669 $self->_set_text ($text);
1274 $self->update; 1670
1671 $self->realloc;
1275} 1672}
1276 1673
1277sub focus_in { 1674sub focus_in {
1278 my ($self) = @_; 1675 my ($self) = @_;
1279 1676
… …
1355 my ($self, $ev) = @_; 1752 my ($self, $ev) = @_;
1356 1753
1357 my $sym = $ev->{sym}; 1754 my $sym = $ev->{sym};
1358 1755
1359 if ($sym == 13) { 1756 if ($sym == 13) {
1757 unshift @{$self->{history}},
1758 my $txt = $self->get_text;
1759 $self->{history_pointer} = -1;
1760 $self->{history_saveback} = '';
1360 $self->emit (activate => $self->get_text); 1761 $self->_emit (activate => $txt);
1361 $self->update; 1762 $self->update;
1763
1764 } elsif ($sym == CFClient::SDLK_UP) {
1765 if ($self->{history_pointer} < 0) {
1766 $self->{history_saveback} = $self->get_text;
1767 }
1768 if (@{$self->{history} || []} > 0) {
1769 $self->{history_pointer}++;
1770 if ($self->{history_pointer} >= @{$self->{history} || []}) {
1771 $self->{history_pointer} = @{$self->{history} || []} - 1;
1772 }
1773 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1774 }
1775
1776 } elsif ($sym == CFClient::SDLK_DOWN) {
1777 $self->{history_pointer}--;
1778 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1779
1780 if ($self->{history_pointer} >= 0) {
1781 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1782 } else {
1783 $self->set_text ($self->{history_saveback});
1784 }
1362 1785
1363 } else { 1786 } else {
1364 $self->SUPER::key_down ($ev); 1787 $self->SUPER::key_down ($ev);
1365 } 1788 }
1366 1789
… …
1380 1803
1381sub new { 1804sub new {
1382 my $class = shift; 1805 my $class = shift;
1383 1806
1384 $class->SUPER::new ( 1807 $class->SUPER::new (
1385 padding => 4, 1808 padding_x => 4,
1809 padding_y => 4,
1386 fg => [1, 1, 1], 1810 fg => [1, 1, 1],
1387 bg => [1, 1, 1, 0.2],
1388 active_fg => [0, 0, 1], 1811 active_fg => [0, 0, 1],
1389 can_hover => 1, 1812 can_hover => 1,
1390 align => 0, 1813 align => 0,
1391 valign => 0, 1814 valign => 0,
1815 can_events => 1,
1392 @_ 1816 @_
1393 ) 1817 )
1394} 1818}
1395 1819
1820sub activate { }
1821
1396sub button_up { 1822sub button_up {
1397 my ($self, $ev, $x, $y) = @_; 1823 my ($self, $ev, $x, $y) = @_;
1398 1824
1825 $self->emit ("activate")
1399 if ($x >= 0 && $x < $self->{w} 1826 if $x >= 0 && $x < $self->{w}
1400 && $y >= 0 && $y < $self->{h}) { 1827 && $y >= 0 && $y < $self->{h};
1401 $self->emit ("activate");
1402 }
1403} 1828}
1404 1829
1405sub _draw { 1830sub _draw {
1406 my ($self) = @_; 1831 my ($self) = @_;
1407 1832
… …
1409 1834
1410 if ($GRAB == $self) { 1835 if ($GRAB == $self) {
1411 $self->{fg} = $self->{active_fg}; 1836 $self->{fg} = $self->{active_fg};
1412 } 1837 }
1413 1838
1414 glEnable GL_BLEND;
1415 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1416 glEnable GL_TEXTURE_2D; 1839 glEnable GL_TEXTURE_2D;
1417 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1840 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1418 glColor 0, 0, 0, 1; 1841 glColor 0, 0, 0, 1;
1419 1842
1420 $tex[0]->draw_quad (0, 0, $self->{w}, $self->{h}); 1843 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1421 1844
1422 glDisable GL_TEXTURE_2D; 1845 glDisable GL_TEXTURE_2D;
1423 glDisable GL_BLEND;
1424 1846
1425 $self->SUPER::_draw; 1847 $self->SUPER::_draw;
1426} 1848}
1427 1849
1428############################################################################# 1850#############################################################################
… …
1439 1861
1440sub new { 1862sub new {
1441 my $class = shift; 1863 my $class = shift;
1442 1864
1443 $class->SUPER::new ( 1865 $class->SUPER::new (
1444 padding => 2, 1866 padding_x => 2,
1867 padding_y => 2,
1445 fg => [1, 1, 1], 1868 fg => [1, 1, 1],
1446 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],
1447 state => 0, 1872 state => 0,
1448 can_hover => 1, 1873 can_hover => 1,
1449 @_ 1874 @_
1450 ) 1875 )
1451} 1876}
1452 1877
1453sub size_request { 1878sub size_request {
1454 my ($self) = @_; 1879 my ($self) = @_;
1455 1880
1456 ($self->{padding} * 2 + 6) x 2 1881 (6) x 2
1457} 1882}
1458 1883
1459sub button_down { 1884sub button_down {
1460 my ($self, $ev, $x, $y) = @_; 1885 my ($self, $ev, $x, $y) = @_;
1461 1886
1462 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1887 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1463 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1888 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1464 $self->{state} = !$self->{state}; 1889 $self->{state} = !$self->{state};
1465 $self->emit (changed => $self->{state}); 1890 $self->_emit (changed => $self->{state});
1466 } 1891 }
1467} 1892}
1468 1893
1469sub _draw { 1894sub _draw {
1470 my ($self) = @_; 1895 my ($self) = @_;
1471 1896
1472 $self->SUPER::_draw; 1897 $self->SUPER::_draw;
1473 1898
1474 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 1899 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1475 1900
1476 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;
1477 1904
1478 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1905 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1479 1906
1480 glEnable GL_BLEND; 1907 my $tex = $self->{state} ? $tex[1] : $tex[0];
1908
1481 glEnable GL_TEXTURE_2D; 1909 glEnable GL_TEXTURE_2D;
1482 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1483
1484 my $tex = $self->{state} ? $tex[1] : $tex[0];
1485
1486 $tex->draw_quad (0, 0, $s, $s); 1910 $tex->draw_quad_alpha (0, 0, $s, $s);
1487
1488 glDisable GL_TEXTURE_2D; 1911 glDisable GL_TEXTURE_2D;
1489 glDisable GL_BLEND;
1490} 1912}
1491 1913
1492############################################################################# 1914#############################################################################
1493 1915
1494package CFClient::UI::Image; 1916package CFClient::UI::Image;
… …
1501our %loaded_images; 1923our %loaded_images;
1502 1924
1503sub new { 1925sub new {
1504 my $class = shift; 1926 my $class = shift;
1505 1927
1506 my $self = $class->SUPER::new (@_); 1928 my $self = $class->SUPER::new (can_events => 0, @_);
1507 1929
1508 $self->{image} or confess "Image has 'image' not set. This is a fatal error!"; 1930 $self->{image} or confess "Image has 'image' not set. This is a fatal error!";
1509 1931
1510 $loaded_images{$self->{image}} ||= 1932 $loaded_images{$self->{image}} ||=
1511 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1; 1933 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1;
… …
1537 glTranslate 0, -$self->{w}, 0; 1959 glTranslate 0, -$self->{w}, 0;
1538 1960
1539 ($w, $h) = ($h, $w); 1961 ($w, $h) = ($h, $w);
1540 } 1962 }
1541 1963
1542 glEnable GL_BLEND;
1543 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1544 glEnable GL_TEXTURE_2D; 1964 glEnable GL_TEXTURE_2D;
1545 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1965 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1546 1966
1547 $tex->draw_quad (0, 0, $w, $h); 1967 $tex->draw_quad_alpha (0, 0, $w, $h);
1548 1968
1549 glDisable GL_BLEND;
1550 glDisable GL_TEXTURE_2D; 1969 glDisable GL_TEXTURE_2D;
1551} 1970}
1552 1971
1553############################################################################# 1972#############################################################################
1554 1973
1555package CFClient::UI::VGauge; 1974package CFClient::UI::VGauge;
1556 1975
1557our @ISA = CFClient::UI::Base::; 1976our @ISA = CFClient::UI::Base::;
1977
1978use List::Util qw(min max);
1558 1979
1559use CFClient::OpenGL; 1980use CFClient::OpenGL;
1560 1981
1561my %tex = ( 1982my %tex = (
1562 food => [ 1983 food => [
1563 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1984 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1564 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 1985 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
1565 ], 1986 ],
1566 grace => [ 1987 grace => [
1567 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1988 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1568 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png/ 1989 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
1569 ], 1990 ],
1570 hp => [ 1991 hp => [
1571 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1992 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1572 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 1993 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
1573 ], 1994 ],
1574 mana => [ 1995 mana => [
1575 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1996 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1576 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png/ 1997 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
1577 ], 1998 ],
1578); 1999);
1579 2000
1580# eg. VGauge->new (gauge => 'food'), default gauge: food 2001# eg. VGauge->new (gauge => 'food'), default gauge: food
1581sub new { 2002sub new {
… …
1600} 2021}
1601 2022
1602sub set_max { 2023sub set_max {
1603 my ($self, $max) = @_; 2024 my ($self, $max) = @_;
1604 2025
2026 return if $self->{max_val} == $max;
2027
1605 $self->{max_val} = $max; 2028 $self->{max_val} = $max;
2029 $self->update;
1606} 2030}
1607 2031
1608sub set_value { 2032sub set_value {
1609 my ($self, $val, $max) = @_; 2033 my ($self, $val, $max) = @_;
1610 2034
1611 $self->set_max ($max) 2035 $self->set_max ($max)
1612 if defined $max; 2036 if defined $max;
1613 2037
1614 $max = $self->{max_val}; 2038 return if $self->{val} == $val;
2039
1615 $self->{val} = $val; 2040 $self->{val} = $val;
1616
1617 $self->update; 2041 $self->update;
1618} 2042}
1619 2043
1620sub _draw { 2044sub _draw {
1621 my ($self) = @_; 2045 my ($self) = @_;
1622 2046
1623 my $tex = $tex{$self->{type}}; 2047 my $tex = $tex{$self->{type}};
2048 my ($t1, $t2, $t3) = @$tex;
1624 2049
1625 my ($w, $h) = ($self->{w}, $self->{h}); 2050 my ($w, $h) = ($self->{w}, $self->{h});
1626 2051
1627 if ($self->{vertical}) { 2052 if ($self->{vertical}) {
1628 glRotate 90, 0, 0, 1; 2053 glRotate 90, 0, 0, 1;
… …
1630 2055
1631 ($w, $h) = ($h, $w); 2056 ($w, $h) = ($h, $w);
1632 } 2057 }
1633 2058
1634 my $ycut = $self->{val} / ($self->{max_val} || 1); 2059 my $ycut = $self->{val} / ($self->{max_val} || 1);
1635 $ycut = 1 if $self->{val} > $self->{max_val};
1636 2060
1637 my $t1 = $tex->[0]; 2061 my $ycut1 = max 0, min 1, $ycut;
1638 my $t2 = $tex->[1]; 2062 my $ycut2 = max 0, min 1, $ycut - 1;
2063
2064 my $h1 = $self->{h} * (1 - $ycut1);
2065 my $h2 = $self->{h} * (1 - $ycut2);
1639 2066
1640 glEnable GL_BLEND; 2067 glEnable GL_BLEND;
1641 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2068 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1642 glEnable GL_TEXTURE_2D; 2069 glEnable GL_TEXTURE_2D;
1643 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2070 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1644 2071
1645 my $h1 = $self->{h} - $ycut * $self->{h};
1646 my $h2 = $ycut * $self->{h};
1647
1648 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2072 glBindTexture GL_TEXTURE_2D, $t1->{name};
1649 glBegin GL_QUADS; 2073 glBegin GL_QUADS;
1650 glTexCoord 0 , 0; glVertex 0 , 0; 2074 glTexCoord 0 , 0; glVertex 0 , 0;
1651 glTexCoord 0 , $t1->{t} * (1 - $ycut); glVertex 0 , $h1; 2075 glTexCoord 0 , $t1->{t} * (1 - $ycut1); glVertex 0 , $h1;
1652 glTexCoord $t1->{s}, $t1->{t} * (1 - $ycut); glVertex $w, $h1; 2076 glTexCoord $t1->{s}, $t1->{t} * (1 - $ycut1); glVertex $w, $h1;
1653 glTexCoord $t1->{s}, 0; glVertex $w, 0; 2077 glTexCoord $t1->{s}, 0; glVertex $w, 0;
1654 glEnd; 2078 glEnd;
1655 2079
2080 my $ycut1 = List::Util::min 1, $ycut;
1656 glBindTexture GL_TEXTURE_2D, $t2->{name}; 2081 glBindTexture GL_TEXTURE_2D, $t2->{name};
1657 glBegin GL_QUADS; 2082 glBegin GL_QUADS;
1658 glTexCoord 0 , $t2->{t} * (1 - $ycut); glVertex 0 , $h1; 2083 glTexCoord 0 , $t2->{t} * (1 - $ycut1); glVertex 0 , $h1;
1659 glTexCoord 0 , $t2->{t}; glVertex 0 , $h1 + $h2; 2084 glTexCoord 0 , $t2->{t} * (1 - $ycut2); glVertex 0 , $h2;
1660 glTexCoord $t2->{s}, $t2->{t}; glVertex $w, $h1 + $h2; 2085 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut2); glVertex $w, $h2;
1661 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut); glVertex $w, $h1; 2086 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut1); glVertex $w, $h1;
1662 glEnd; 2087 glEnd;
2088
2089 if ($t3) {
2090 glBindTexture GL_TEXTURE_2D, $t3->{name};
2091 glBegin GL_QUADS;
2092 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2093 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h};
2094 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h};
2095 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2096 glEnd;
2097 }
1663 2098
1664 glDisable GL_BLEND; 2099 glDisable GL_BLEND;
1665 glDisable GL_TEXTURE_2D; 2100 glDisable GL_TEXTURE_2D;
1666} 2101}
1667 2102
… …
1670package CFClient::UI::Gauge; 2105package CFClient::UI::Gauge;
1671 2106
1672our @ISA = CFClient::UI::VBox::; 2107our @ISA = CFClient::UI::VBox::;
1673 2108
1674sub new { 2109sub new {
1675 my ($class, %arg) = shift; 2110 my ($class, %arg) = @_;
1676 2111
1677 my $self = $class->SUPER::new ( 2112 my $self = $class->SUPER::new (
1678 @_, 2113 tooltip => $arg{type},
2114 can_hover => 1,
2115 can_events => 1,
2116 %arg,
1679 ); 2117 );
1680 2118
1681 $self->add ($self->{value} = new CFClient::UI::Label valign => 1, align => 0, template => "999"); 2119 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");
1682 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1); 2120 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
1683 $self->add ($self->{max} = new CFClient::UI::Label valign => 1, align => 0, template => "999"); 2121 $self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999");
1684 2122
1685 $self 2123 $self
1686} 2124}
1687 2125
1688sub set_fontsize { 2126sub set_fontsize {
… …
1690 2128
1691 $self->{value}->set_fontsize ($fsize); 2129 $self->{value}->set_fontsize ($fsize);
1692 $self->{max} ->set_fontsize ($fsize); 2130 $self->{max} ->set_fontsize ($fsize);
1693} 2131}
1694 2132
2133sub set_max {
2134 my ($self, $max) = @_;
2135
2136 $self->{gauge}->set_max ($max);
2137 $self->{max}->set_text ($max);
2138}
2139
1695sub set_value { 2140sub set_value {
1696 my ($self, $val, $max) = @_; 2141 my ($self, $val, $max) = @_;
1697 2142
1698 $self->set_max ($max) 2143 $self->set_max ($max)
1699 if defined $max; 2144 if defined $max;
1700 2145
1701 $self->{gauge}->set_value ($val, $max); 2146 $self->{gauge}->set_value ($val, $max);
1702 $self->{value}->set_text ($val); 2147 $self->{value}->set_text ($val);
1703}
1704
1705sub set_max {
1706 my ($self, $max) = @_;
1707
1708 $self->{gauge}->set_max ($max);
1709 $self->{max}->set_text ($max);
1710} 2148}
1711 2149
1712############################################################################# 2150#############################################################################
1713 2151
1714package CFClient::UI::Slider; 2152package CFClient::UI::Slider;
… …
1724 qw(s1_slider.png s1_slider_bg.png); 2162 qw(s1_slider.png s1_slider_bg.png);
1725 2163
1726sub new { 2164sub new {
1727 my $class = shift; 2165 my $class = shift;
1728 2166
1729 # range [value, low, high, page] 2167 # range [value, low, high, page, unit]
1730 2168
1731 # TODO: 0-width page 2169 # TODO: 0-width page
1732 # TODO: req_w/h are wrong with vertical 2170 # TODO: req_w/h are wrong with vertical
1733 # TODO: calculations are off 2171 # TODO: calculations are off
1734 my $self = $class->SUPER::new ( 2172 my $self = $class->SUPER::new (
1735 fg => [1, 1, 1], 2173 fg => [1, 1, 1],
1736 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],
1737 range => [0, 0, 100, 10], 2177 range => [0, 0, 100, 10, 0],
1738 req_w => 20, 2178 min_w => $::WIDTH / 80,
1739 req_h => 20, 2179 min_h => $::WIDTH / 80,
1740 vertical => 0, 2180 vertical => 0,
1741 can_hover => 1, 2181 can_hover => 1,
1742 inner_pad => 5, 2182 inner_pad => 0.02,
1743 @_ 2183 @_
1744 ); 2184 );
1745 2185
2186 $self->set_value ($self->{range}[0]);
2187 $self->update;
2188
1746 $self 2189 $self
1747} 2190}
1748 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
1749sub size_request { 2226sub size_request {
1750 my ($self) = @_; 2227 my ($self) = @_;
1751 2228
1752 my $w = $self->{req_w}; 2229 ($self->{req_w}, $self->{req_h})
1753 my $h = $self->{req_h};
1754
1755 $self->{vertical} ? ($h, $w) : ($w, $h)
1756} 2230}
1757 2231
1758sub button_down { 2232sub button_down {
1759 my ($self, $ev, $x, $y) = @_; 2233 my ($self, $ev, $x, $y) = @_;
1760 2234
1761 $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
1762 $self->mouse_motion ($ev, $x, $y); 2239 $self->mouse_motion ($ev, $x, $y);
1763} 2240}
1764 2241
1765sub mouse_motion { 2242sub mouse_motion {
1766 my ($self, $ev, $x, $y) = @_; 2243 my ($self, $ev, $x, $y) = @_;
1767 2244
1768 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
1769 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2262 my ($value, $lo, $hi, $page) = @{$self->{range}};
2263 my $range = ($hi - $page - $lo) || 1e-100;
1770 2264
1771 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2265 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
1772 2266
1773 my $inner_pad_px = $self->_calc_inner_pad_px ($w); 2267 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
1774 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right 2268 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
1775 2269
1776 $x -= $inner_pad_px; # substract the padding 2270 $value = ($value - $lo) / $range;
1777 $x = $x * ($hi - $lo) / $inner_w + $lo; 2271 $value = $value * $self->{scale} + $self->{offset};
1778 $x = $lo if $x < $lo;
1779 $x = $hi - $page if $x > $hi - $page;
1780 $self->{range}[0] = $x;
1781 2272
1782 $self->emit (changed => $x); 2273 $self->{knob_x} = $value - $knob_w * 0.5;
1783 $self->update; 2274 $self->{knob_w} = $knob_w;
1784 } 2275 });
1785}
1786 2276
1787# the inner_* stuff is for generating a padding for the slider handle, 2277 $self->SUPER::update;
1788# so that the handle doesn't leave the texture. This calculation isn't 100%
1789# correct propably, but it does the job for now
1790sub _calc_inner_pad_px {
1791 my ($self, $w) = @_;
1792 ($w / 100) * $self->{inner_pad} # % to pixels
1793} 2278}
1794 2279
1795sub _draw { 2280sub _draw {
1796 my ($self) = @_; 2281 my ($self) = @_;
1797 2282
1798 $self->SUPER::_draw (); 2283 $self->SUPER::_draw ();
1799 2284
1800 my ($w, $h) = @$self{qw(w h)}; 2285 glScale $self->{w}, $self->{h};
1801 2286
1802 if ($self->{vertical}) { 2287 if ($self->{vertical}) {
1803 # draw a vertical slider like a rotated horizontal slider 2288 # draw a vertical slider like a rotated horizontal slider
1804 2289
2290 glTranslate 1, 0, 0;
1805 glRotate 90, 0, 0, 1; 2291 glRotate 90, 0, 0, 1;
1806 glTranslate 0, -$self->{w}, 0;
1807
1808 ($w, $h) = ($h, $w);
1809 } 2292 }
1810 2293
1811 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2294 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
1812 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2295 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
1813 2296
1814 my ($value, $lo, $hi, $page) = @{$self->{range}};
1815
1816 $hi = $value + 1 if $lo == $hi;
1817
1818 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
1819 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
1820
1821 $page = int $page * $inner_w / ($hi - $lo);
1822 $value = int +($value - $lo) * $inner_w / ($hi - $lo);
1823
1824 $w -= $page;
1825 $page &= ~1;
1826 glTranslate $page * 0.5, 0, 0;
1827 $page ||= 2;
1828
1829 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
1830 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
1831
1832 glEnable GL_BLEND;
1833 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1834 glEnable GL_TEXTURE_2D; 2297 glEnable GL_TEXTURE_2D;
1835 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2298 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1836 2299
1837 # draw background 2300 # draw background
1838 $tex[1]->draw_quad (0, 0, $w, $h); 2301 $tex[1]->draw_quad_alpha (0, 0, 1, 1);
1839 2302
1840 # draw handle 2303 # draw handle
1841 $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);
1842 2305
1843 glDisable GL_BLEND;
1844 glDisable GL_TEXTURE_2D; 2306 glDisable GL_TEXTURE_2D;
1845} 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 (@_) }
1846 2349
1847############################################################################# 2350#############################################################################
1848 2351
1849package CFClient::UI::TextView; 2352package CFClient::UI::TextView;
1850 2353
… …
1854 2357
1855sub new { 2358sub new {
1856 my $class = shift; 2359 my $class = shift;
1857 2360
1858 my $self = $class->SUPER::new ( 2361 my $self = $class->SUPER::new (
1859 fontsize => 1, 2362 fontsize => 1,
2363 can_events => 0,
2364 #font => default_font
1860 @_, 2365 @_,
1861 2366
1862 layout => (new CFClient::Layout), 2367 layout => (new CFClient::Layout 1),
1863 par => [], 2368 par => [],
1864 height => 0, 2369 height => 0,
1865 children => [ 2370 children => [
1866 (new CFClient::UI::Empty expand => 1), 2371 (new CFClient::UI::Empty expand => 1),
1867 (new CFClient::UI::Slider vertical => 1), 2372 (new CFClient::UI::Slider vertical => 1),
1868 ], 2373 ],
1869 ); 2374 );
1870 2375
1871 $self->{children}[1]->connect (changed => sub { 2376 $self->{children}[1]->connect (changed => sub { $self->update });
1872 $self->update;
1873 });
1874 2377
1875 $self 2378 $self
1876} 2379}
1877 2380
1878sub set_fontsize { 2381sub set_fontsize {
… …
1880 2383
1881 $self->{fontsize} = $fontsize; 2384 $self->{fontsize} = $fontsize;
1882 $self->reflow; 2385 $self->reflow;
1883} 2386}
1884 2387
2388sub size_allocate {
2389 my ($self, $w, $h) = @_;
2390
2391 $self->SUPER::size_allocate ($w, $h);
2392
2393 $self->{layout}->set_font ($self->{font}) if $self->{font};
2394 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2395 $self->{layout}->set_width ($self->{children}[0]{w});
2396
2397 $self->reflow;
2398}
2399
1885sub text_height { 2400sub text_size {
1886 my ($self, $text) = @_; 2401 my ($self, $text, $indent) = @_;
1887 2402
1888 my $layout = $self->{layout}; 2403 my $layout = $self->{layout};
1889 2404
1890 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2405 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
1891 $layout->set_width ($self->{w}); 2406 $layout->set_width ($self->{children}[0]{w} - $indent);
1892 $layout->set_text ($text); 2407 $layout->set_markup ($text);
1893 2408
1894 ($layout->size)[1] 2409 $layout->size
1895} 2410}
1896 2411
1897sub reflow { 2412sub reflow {
1898 my ($self) = @_; 2413 my ($self) = @_;
1899 2414
1900 $self->{need_reflow}++; 2415 $self->{need_reflow}++;
1901 $self->update; 2416 $self->update;
1902} 2417}
1903 2418
1904sub size_allocate { 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 {
1905 my ($self, $w, $h) = @_; 2427 my ($self) = @_;
1906 2428
1907 $self->SUPER::size_allocate ($w, $h); 2429 $self->{par} = [];
1908 2430 $self->{height} = 0;
1909 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2431 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
1910 $self->{layout}->set_width ($self->{children}[0]{w});
1911
1912 $self->reflow;
1913} 2432}
1914 2433
1915sub add_paragraph { 2434sub add_paragraph {
1916 my ($self, $color, $text) = @_; 2435 my ($self, $color, $text, $indent) = @_;
1917 2436
1918 #TODO: intelligently "reformat" paragraph 2437 for my $line (split /\n/, $text) {
1919 2438 my ($w, $h) = $self->text_size ($line);
1920 my $height = $self->text_height ($text);
1921
1922 $self->{height} += $height; 2439 $self->{height} += $h;
2440 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
2441 }
1923 2442
1924 push @{$self->{par}}, [$height, $color, $text];
1925
1926 $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]);
1927 $self->{children}[1]->update;
1928} 2444}
1929 2445
1930sub update { 2446sub update {
1931 my ($self) = @_; 2447 my ($self) = @_;
1932 2448
… …
1934 2450
1935 return unless $self->{h} > 0; 2451 return unless $self->{h} > 0;
1936 2452
1937 delete $self->{texture}; 2453 delete $self->{texture};
1938 2454
1939 $ROOT->on_refresh ($self, sub { 2455 $ROOT->on_post_alloc ($self, sub {
2456 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2457
1940 if (delete $self->{need_reflow}) { 2458 if (delete $self->{need_reflow}) {
1941 my $height = 0; 2459 my $height = 0;
1942 2460
1943 $height += $_->[0] = $self->text_height ($_->[2]) 2461 my $layout = $self->{layout};
2462
2463 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2464
1944 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 }
1945 2476
1946 $self->{height} = $height; 2477 $self->{height} = $height;
1947 2478
1948 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2479 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
1949 2480
1950 delete $self->{texture}; 2481 delete $self->{texture};
1951 } 2482 }
1952 2483
1953 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 2484 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
1954 glClearColor 0, 0, 0, 1; 2485 glClearColor 0.5, 0.5, 0.5, 0;
1955 glClear GL_COLOR_BUFFER_BIT; 2486 glClear GL_COLOR_BUFFER_BIT;
1956 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
1957 glEnable GL_BLEND; 2499 glEnable GL_BLEND;
2500 #TODO# not correct in windows where rgba is forced off
1958 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2501 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1959 glEnable GL_TEXTURE_2D;
1960 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1961
1962 my $top = int $self->{children}[1]{range}[0];
1963
1964 my $y0 = $top;
1965 my $y1 = $top + $self->{h};
1966
1967 my $y = 0;
1968
1969 my $layout = $self->{layout};
1970 2502
1971 for my $par (@{$self->{par}}) { 2503 for my $par (@{$self->{par}}) {
1972 my $h = $par->[0]; 2504 my $h = $par->[1];
1973 2505
1974 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]);
1975 $layout->set_text ($par->[2]); 2509 $layout->set_markup ($par->[4]);
1976 2510
1977 glColor @{ $par->[1] }; 2511 my ($w, $h, $data, $format, $internalformat) = $layout->render;
1978 my ($W, $H) = $layout->size; 2512
1979 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;
1980 } 2515 }
1981 2516
1982 $y += $h; 2517 $y += $h;
1983 } 2518 }
1984 2519
1985 glDisable GL_TEXTURE_2D;
1986 glDisable GL_BLEND; 2520 glDisable GL_BLEND;
1987 }; 2521 };
1988 }); 2522 });
1989} 2523}
1990 2524
1991sub _draw { 2525sub _draw {
1992 my ($self) = @_; 2526 my ($self) = @_;
1993 2527
1994 if ($self->{texture}) {
1995 glEnable GL_TEXTURE_2D; 2528 glEnable GL_TEXTURE_2D;
1996 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2529 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2530 glColor 1, 1, 1, 1;
1997 $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});
1998 glDisable GL_TEXTURE_2D; 2532 glDisable GL_TEXTURE_2D;
1999 }
2000 2533
2001 $self->{children}[1]->draw; 2534 $self->{children}[1]->draw;
2002 2535
2003} 2536}
2004 2537
… …
2052 2585
2053sub new { 2586sub new {
2054 my $class = shift; 2587 my $class = shift;
2055 2588
2056 my $self = $class->SUPER::new ( 2589 my $self = $class->SUPER::new (
2057 state => 0, 2590 state => 0,
2058 connect_activate => \&toggle_flopper, 2591 on_activate => \&toggle_flopper,
2059 @_ 2592 @_
2060 ); 2593 );
2061 2594
2062 if ($self->{state}) {
2063 $self->{state} = 0;
2064 $self->toggle_flopper;
2065 }
2066
2067 $self 2595 $self
2068} 2596}
2069 2597
2070sub toggle_flopper { 2598sub toggle_flopper {
2071 my ($self) = @_; 2599 my ($self) = @_;
2072 2600
2073 # TODO: use animation 2601 $self->{other}->toggle_visibility;
2074 if ($self->{state} = !$self->{state}) { 2602}
2075 $CFClient::UI::ROOT->add ($self->{other}); 2603
2076 $self->{other}->move ($self->coord2global (0, $self->{h})); 2604#############################################################################
2605
2606package CFClient::UI::Tooltip;
2607
2608our @ISA = CFClient::UI::Bin::;
2609
2610use CFClient::OpenGL;
2611
2612sub new {
2613 my $class = shift;
2614
2615 $class->SUPER::new (
2616 @_,
2617 can_events => 0,
2618 )
2619}
2620
2621sub set_tooltip_from {
2622 my ($self, $widget) = @_;
2623
2624 my $tooltip = $widget->{tooltip};
2625
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 );
2641}
2642
2643sub size_request {
2644 my ($self) = @_;
2645
2646 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2647
2648 ($w + 4, $h + 4)
2649}
2650
2651sub size_allocate {
2652 my ($self, $w, $h) = @_;
2653
2654 $self->SUPER::size_allocate ($w - 4, $h - 4);
2655}
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
2675sub _draw {
2676 my ($self) = @_;
2677
2678 glTranslate 0.375, 0.375;
2679
2680 my ($w, $h) = @$self{qw(w h)};
2681
2682 glColor 1, 0.8, 0.4;
2683 glBegin GL_QUADS;
2684 glVertex 0 , 0;
2685 glVertex 0 , $h;
2686 glVertex $w, $h;
2687 glVertex $w, 0;
2688 glEnd;
2689
2690 glColor 0, 0, 0;
2691 glBegin GL_LINE_LOOP;
2692 glVertex 0 , 0;
2693 glVertex 0 , $h;
2694 glVertex $w, $h;
2695 glVertex $w, 0;
2696 glEnd;
2697
2698 glTranslate 2 - 0.375, 2 - 0.375;
2699
2700 $self->SUPER::_draw;
2701}
2702
2703#############################################################################
2704
2705package CFClient::UI::Face;
2706
2707our @ISA = CFClient::UI::Base::;
2708
2709use CFClient::OpenGL;
2710
2711sub new {
2712 my $class = shift;
2713
2714 my $self = $class->SUPER::new (
2715 aspect => 1,
2716 can_events => 0,
2717 @_,
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
2735}
2736
2737sub size_request {
2738 (32, 8)
2739}
2740
2741sub update {
2742 my ($self) = @_;
2743
2744 return unless $self->{visible};
2745
2746 $self->SUPER::update;
2747}
2748
2749sub _draw {
2750 my ($self) = @_;
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
2763 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2764
2765 if ($tex) {
2766 glEnable GL_TEXTURE_2D;
2767 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2768 glColor 1, 1, 1, 1;
2769 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2770 glDisable GL_TEXTURE_2D;
2771 }
2772}
2773
2774sub DESTROY {
2775 my ($self) = @_;
2776
2777 $self->{timer}->cancel
2778 if $self->{timer};
2779
2780 $self->SUPER::DESTROY;
2781}
2782
2783#############################################################################
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
2077 $self->emit ("open"); 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};
2078 } else { 2981 } else {
2079 $CFClient::UI::ROOT->remove ($self->{other}); 2982 $self->{item}{$group} = {
2080 $self->emit ("close"); 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 };
2081 } 2992 }
2082 2993
2083 $self->emit (changed => $self->{state}); 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;
2084} 3005}
2085 3006
2086############################################################################# 3007#############################################################################
2087 3008
2088package CFClient::UI::Root; 3009package CFClient::UI::Root;
2089 3010
2090our @ISA = CFClient::UI::Container::; 3011our @ISA = CFClient::UI::Container::;
2091 3012
2092use CFClient::OpenGL; 3013use CFClient::OpenGL;
2093 3014
2094sub check_size { 3015sub new {
2095 my ($self) = @_; 3016 my $class = shift;
2096 3017
2097 $self->configure (0, 0, $::WITH, $::HEIGHT); 3018 my $self = $class->SUPER::new (
3019 visible => 1,
3020 @_,
3021 );
3022
3023 Scalar::Util::weaken ($self->{root} = $self);
3024
3025 $self
2098} 3026}
2099 3027
2100sub size_request { 3028sub size_request {
2101 ($::WIDTH, $::HEIGHT) 3029 my ($self) = @_;
2102}
2103 3030
2104sub 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 {
2105 my ($self, $x, $y, $w, $h) = @_; 3049 my ($self, $w, $h) = @_;
2106 3050
2107 $self->SUPER::configure ($x, $y, $w, $h); 3051 for my $child ($self->children) {
3052 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2108 3053
2109 $_->configure ($_->{x}, $_->{y}, $_->size_request) 3054 $X = $child->{force_x} if exists $child->{force_x};
2110 for @{$self->{children}}; 3055 $Y = $child->{force_y} if exists $child->{force_y};
2111}
2112 3056
2113sub _topleft { 3057 $X = _to_pixel $X, $W, $self->{w};
3058 $Y = _to_pixel $Y, $H, $self->{h};
3059
3060 $child->configure ($X, $Y, $W, $H);
3061 }
3062}
3063
3064sub coord2local {
2114 my ($self, $x, $y) = @_; 3065 my ($self, $x, $y) = @_;
2115 3066
2116 ($x, $y) 3067 ($x, $y)
2117} 3068}
2118 3069
3070sub coord2global {
3071 my ($self, $x, $y) = @_;
3072
3073 ($x, $y)
3074}
3075
2119sub update { 3076sub update {
2120 my ($self) = @_; 3077 my ($self) = @_;
2121 3078
2122 $self->check_size; 3079 $::WANT_REFRESH++;
2123 ::refresh ();
2124} 3080}
2125 3081
2126sub add { 3082sub add {
2127 my ($self, $child) = @_; 3083 my ($self, @children) = @_;
2128 3084
2129 # integerize window positions 3085 $_->{is_toplevel} = 1
2130 $child->{x} = int $child->{x}; 3086 for @children;
2131 $child->{y} = int $child->{y};
2132 3087
2133 $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 }
2134} 3104}
2135 3105
2136sub on_refresh { 3106sub on_refresh {
2137 my ($self, $id, $cb) = @_; 3107 my ($self, $id, $cb) = @_;
2138 3108
2139 $self->{refresh_hook}{$id} = $cb; 3109 $self->{refresh_hook}{$id} = $cb;
2140} 3110}
2141 3111
3112sub on_post_alloc {
3113 my ($self, $id, $cb) = @_;
3114
3115 $self->{post_alloc_hook}{$id} = $cb;
3116}
3117
2142sub draw { 3118sub draw {
2143 my ($self) = @_; 3119 my ($self) = @_;
2144 3120
2145 while (my $rcb = delete $self->{refresh_hook}) { 3121 while ($self->{refresh_hook}) {
2146 $_->() for values %$rcb; 3122 $_->()
3123 for values %{delete $self->{refresh_hook}};
2147 } 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
2148 3199
2149 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3200 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2150 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3201 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2151 glClear GL_COLOR_BUFFER_BIT; 3202 glClear GL_COLOR_BUFFER_BIT;
2152 3203
2153 glMatrixMode GL_PROJECTION; 3204 glMatrixMode GL_PROJECTION;
2154 glLoadIdentity; 3205 glLoadIdentity;
2155 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000; 3206 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2156 glMatrixMode GL_MODELVIEW; 3207 glMatrixMode GL_MODELVIEW;
2157 glLoadIdentity; 3208 glLoadIdentity;
2158 3209
2159 $self->_draw; 3210 $self->_draw;
2160} 3211}
2161 3212
2162############################################################################# 3213#############################################################################
2163 3214
3215package CFClient::UI::BindEditor;
3216
3217our @ISA = CFClient::UI::FancyFrame::;
3218
3219sub new {
3220 my $class = shift;
3221
3222 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3223
3224 $self->add (my $vb = new CFClient::UI::VBox);
3225
3226
3227 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3228 text => "start recording",
3229 tooltip => "Start/Stops recording of actions."
3230 ."All subsequent actions after the recording started will be captured."
3231 ."The actions are displayed after the record was stopped."
3232 ."To bind the action you have to click on the 'Bind' button",
3233 on_activate => sub {
3234 unless ($self->{recording}) {
3235 $self->start;
3236 } else {
3237 $self->stop;
3238 }
3239 });
3240
3241 $vb->add (new CFClient::UI::Label text => "Actions:");
3242 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3243
3244 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3245 $vb->add (my $hb = new CFClient::UI::HBox);
3246 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3247 $hb->add (new CFClient::UI::Button
3248 text => "bind",
3249 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3250 on_activate => sub {
3251 $self->ask_for_bind;
3252 });
3253
3254 $vb->add (my $hb = new CFClient::UI::HBox);
3255 $hb->add (new CFClient::UI::Button
3256 text => "ok",
3257 expand => 1,
3258 tooltip => "This closes the binding editor and saves the binding",
3259 on_activate => sub {
3260 $self->hide;
3261 $self->commit;
3262 });
3263
3264 $hb->add (new CFClient::UI::Button
3265 text => "cancel",
3266 expand => 1,
3267 tooltip => "This closes the binding editor without saving",
3268 on_activate => sub {
3269 $self->hide;
3270 $self->{binding_cancel}->()
3271 if $self->{binding_cancel};
3272 });
3273
3274 $self->update_binding_widgets;
3275
3276 $self
3277}
3278
3279sub commit {
3280 my ($self) = @_;
3281 my ($mod, $sym, $cmds) = $self->get_binding;
3282 if ($sym != 0 && @$cmds > 0) {
3283 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3284 ."'. Don't forget 'Save Config'!");
3285 $self->{binding_change}->($mod, $sym, $cmds)
3286 if $self->{binding_change};
3287 } else {
3288 $::STATUSBOX->add ("No action bound, no key or action specified!");
3289 $self->{binding_cancel}->()
3290 if $self->{binding_cancel};
3291 }
3292}
3293
3294sub start {
3295 my ($self) = @_;
3296
3297 $self->{rec_btn}->set_text ("stop recording");
3298 $self->{recording} = 1;
3299 $self->clear_command_list;
3300 $::CONN->start_record if $::CONN;
3301}
3302
3303sub stop {
3304 my ($self) = @_;
3305
3306 $self->{rec_btn}->set_text ("start recording");
3307 $self->{recording} = 0;
3308
3309 my $rec;
3310 $rec = $::CONN->stop_record if $::CONN;
3311 return unless ref $rec eq 'ARRAY';
3312 $self->set_command_list ($rec);
3313}
3314
3315sub ask_for_bind {
3316 my ($self, $commit) = @_;
3317
3318 CFClient::Binder::open_binding_dialog (sub {
3319 my ($mod, $sym) = @_;
3320 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3321 $self->update_binding_widgets;
3322 $self->commit if $commit;
3323 });
3324}
3325
3326sub set_binding {
3327 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3328
3329 $self->clear_command_list;
3330 $self->{recording} = 0;
3331 $self->{rec_btn}->set_text ("start recording");
3332
3333 $self->{binding} = [$mod, $sym];
3334 $self->{commands} = $cmds;
3335
3336 $self->{binding_change} = $cb;
3337 $self->{binding_cancel} = $ccb;
3338
3339 $self->update_binding_widgets;
3340}
3341
3342sub update_binding_widgets {
3343 my ($self) = @_;
3344 my ($mod, $sym, $cmds) = $self->get_binding;
3345 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3346 $self->set_command_list ($cmds);
3347}
3348
3349sub get_binding {
3350 my ($self) = @_;
3351 return (
3352 $self->{binding}->[0],
3353 $self->{binding}->[1],
3354 [ grep { defined $_ } @{$self->{commands}} ]
3355 );
3356}
3357
3358sub clear_command_list {
3359 my ($self) = @_;
3360 $self->{cmdbox}->clear ();
3361}
3362
3363sub set_command_list {
3364 my ($self, $cmds) = @_;
3365
3366 $self->{cmdbox}->clear ();
3367 $self->{commands} = $cmds;
3368
3369 my $idx = 0;
3370
3371 for (@$cmds) {
3372 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3373
3374 my $i = $idx;
3375 $hb->add (new CFClient::UI::Button
3376 text => "delete",
3377 tooltip => "Deletes the action from the record",
3378 on_activate => sub {
3379 $self->{cmdbox}->remove ($hb);
3380 $cmds->[$i] = undef;
3381 });
3382
3383 $hb->add (new CFClient::UI::Label text => $_);
3384
3385 $idx++
3386 }
3387}
3388
3389
3390#############################################################################
3391
2164package CFClient::UI; 3392package CFClient::UI;
2165 3393
2166$ROOT = new CFClient::UI::Root; 3394$ROOT = new CFClient::UI::Root;
3395$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2167 3396
21681 33971
2169 3398

Diff Legend

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