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

Diff Legend

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