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.146 by elmex, Fri Apr 21 15:03:46 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 abtract"; 337 Carp::confess "size_request is abstract";
146} 338}
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 += ($w - $w2) * 0.5; 351 $x += int 0.5 * ($ow - $w);
158 $y += ($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 my ($w, $h) = $self->size_request;
300
301 if ($w != $self->{req_w} || $h != $self->{req_h}) {
302 $self->{req_w} = $w;
303 $self->{req_h} = $h;
304
305 $self->{parent}->check_size
306 if $self->{parent};
307 }
308}
309
310sub update {
311 my ($self) = @_;
312
313 $self->{parent}->update
314 if $self->{parent};
315}
316
317sub connect {
318 my ($self, $signal, $cb) = @_;
319
320 push @{ $self->{signal_cb}{$signal} }, $cb;
321}
322
323sub emit {
324 my ($self, $signal, @args) = @_;
325
326 for my $cb (@{$self->{signal_cb}{$signal} || []}) {
327 $cb->($self, @args);
328 }
329}
330
331sub DESTROY { 583sub DESTROY {
332 my ($self) = @_; 584 my ($self) = @_;
333 585
586 delete $WIDGET{$self+0};
334 #$self->deactivate; 587 #$self->deactivate;
335} 588}
336 589
337############################################################################# 590#############################################################################
338 591
… …
347 my $class = shift; 600 my $class = shift;
348 601
349 # range [value, low, high, page] 602 # range [value, low, high, page]
350 603
351 $class->SUPER::new ( 604 $class->SUPER::new (
352 bg => [0, 0, 0, 0.2], 605 #bg => [0, 0, 0, 0.2],
353 active_bg => [1, 1, 1, 0.5], 606 #active_bg => [1, 1, 1, 0.5],
354 @_ 607 @_
355 ) 608 )
356} 609}
357 610
358sub _draw { 611sub _draw {
359 my ($self) = @_; 612 my ($self) = @_;
360 613
614 my $color = $FOCUS == $self && $self->{active_bg}
615 ? $self->{active_bg}
616 : $self->{bg};
617
618 if ($color && (@$color < 4 || $color->[3])) {
361 my ($w, $h) = @$self{qw(w h)}; 619 my ($w, $h) = @$self{qw(w h)};
362 620
363 glEnable GL_BLEND; 621 glEnable GL_BLEND;
364 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 622 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
365 glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} }; 623 glColor @$color;
366 624
367 glBegin GL_QUADS; 625 glBegin GL_QUADS;
368 glVertex 0 , 0; 626 glVertex 0 , 0;
369 glVertex 0 , $h; 627 glVertex 0 , $h;
370 glVertex $w, $h; 628 glVertex $w, $h;
371 glVertex $w, 0; 629 glVertex $w, 0;
372 glEnd; 630 glEnd;
373 631
374 glDisable GL_BLEND; 632 glDisable GL_BLEND;
633 }
375} 634}
376 635
377############################################################################# 636#############################################################################
378 637
379package CFClient::UI::Empty; 638package CFClient::UI::Empty;
380
381our @ISA = CFClient::UI::Base::;
382
383sub size_request {
384 (0, 0)
385}
386
387sub draw { }
388
389#############################################################################
390
391package CFClient::UI::Container;
392 639
393our @ISA = CFClient::UI::Base::; 640our @ISA = CFClient::UI::Base::;
394 641
395sub new { 642sub new {
396 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) = @_;
397 663
398 my $children = delete $arg{children} || []; 664 my $children = delete $arg{children} || [];
399 665
400 my $self = $class->SUPER::new (children => [], %arg); 666 my $self = $class->SUPER::new (
667 children => [],
668 can_events => 0,
669 %arg,
670 );
401 $self->add ($_) for @$children; 671 $self->add ($_) for @$children;
402 672
403 $self 673 $self
404} 674}
405 675
406sub add { 676sub add {
407 my ($self, $child) = @_; 677 my ($self, @widgets) = @_;
408 678
409 $child->set_parent ($self); 679 $_->set_parent ($self)
680 for @widgets;
410 681
411 use sort 'stable'; 682 use sort 'stable';
412 683
413 $self->{children} = [ 684 $self->{children} = [
414 sort { $a->{z} <=> $b->{z} } 685 sort { $a->{z} <=> $b->{z} }
415 @{$self->{children}}, $child 686 @{$self->{children}}, @widgets
416 ]; 687 ];
417 688
418 $child->check_size; 689 $self->realloc;
690}
691
692sub children {
693 @{ $_[0]{children} }
419} 694}
420 695
421sub remove { 696sub remove {
422 my ($self, $child) = @_; 697 my ($self, $child) = @_;
423 698
424 delete $child->{parent}; 699 delete $child->{parent};
700 $child->hide;
425 701
426 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 702 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
427 703
428 $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;
429} 719}
430 720
431sub find_widget { 721sub find_widget {
432 my ($self, $x, $y) = @_; 722 my ($self, $x, $y) = @_;
433 723
… …
508} 798}
509 799
510sub update { 800sub update {
511 my ($self) = @_; 801 my ($self) = @_;
512 802
513 # we want to do this delayed... 803 $ROOT->on_post_alloc ($self => sub { $self->render_child });
514 $self->render_chld;
515 $self->SUPER::update; 804 $self->SUPER::update;
516}
517
518sub render_chld {
519 my ($self) = @_;
520
521 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
522 glClearColor 0, 0, 0, 1;
523 glClear GL_COLOR_BUFFER_BIT;
524 $self->child->draw;
525 };
526} 805}
527 806
528sub size_allocate { 807sub size_allocate {
529 my ($self, $w, $h) = @_; 808 my ($self, $w, $h) = @_;
530 809
531 $self->child->configure (0, 0, $w, $h); 810 $self->SUPER::size_allocate ($w, $h);
811 $self->update;
812}
532 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
533 $self->render_chld; 834 $self->_render;
835 };
534} 836}
535 837
536sub _draw { 838sub _draw {
537 my ($self) = @_; 839 my ($self) = @_;
538 840
539 my ($w, $h) = ($self->w, $self->h); 841 my ($w, $h) = @$self{qw(w h)};
540 842
541 my $tex = $self->{texture} 843 my $tex = $self->{texture}
542 or return; 844 or return;
543 845
544 glEnable GL_BLEND;
545 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
546 glEnable GL_TEXTURE_2D; 846 glEnable GL_TEXTURE_2D;
547 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;
548 849
549 $tex->draw_quad (0, 0, $w, $h); 850 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
550 851
551 glDisable GL_BLEND;
552 glDisable GL_TEXTURE_2D; 852 glDisable GL_TEXTURE_2D;
553} 853}
554 854
555############################################################################# 855#############################################################################
556 856
557package CFClient::UI::ViewPort; 857package CFClient::UI::ViewPort;
558 858
559our @ISA = CFClient::UI::Window::; 859our @ISA = CFClient::UI::Window::;
560
561sub new { die }
562
563sub size_request {
564 my ($self) = @_;
565
566 @$self{qw(child_w child_h)} = $self->child->size_request;
567 $self->child->size_allocate (0, 0, @$self{qw(child_w child_h)});
568
569 @$self{qw(child_w child_h)}
570}
571
572sub _draw {
573 my ($self) = @_;
574
575 $self->{children}[1]->draw;
576}
577
578
579#############################################################################
580
581package CFClient::UI::Frame;
582
583our @ISA = CFClient::UI::Bin::;
584
585use CFClient::OpenGL;
586
587sub size_request {
588 my ($self) = @_;
589 my $chld = $self->child
590 or return (0, 0);
591
592 $chld->move (2, 2);
593
594 map { $_ + 4 } $chld->size_request;
595}
596
597sub size_allocate {
598 my ($self, $x, $y, $w, $h) = @_;
599
600 $self->child->configure (2, 2, $w - 4, $h - 4);
601}
602
603sub _draw {
604 my ($self) = @_;
605
606 my $chld = $self->child;
607
608 my ($w, $h) = $chld->size_request;
609
610 glBegin GL_QUADS;
611 glColor 0, 0, 0;
612 glVertex 0 , 0;
613 glVertex 0 , $h + 4;
614 glVertex $w + 4 , $h + 4;
615 glVertex $w + 4 , 0;
616 glEnd;
617
618 $chld->draw;
619}
620
621#############################################################################
622
623package CFClient::UI::FancyFrame;
624
625our @ISA = CFClient::UI::Bin::;
626
627use CFClient::OpenGL;
628
629my @tex =
630 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
631 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
632 860
633sub new { 861sub new {
634 my $class = shift; 862 my $class = shift;
635 863
636 # TODO: user_x, user_y, overwrite moveto? 864 $class->SUPER::new (
865 scroll_x => 0,
866 scroll_y => 1,
867 @_,
868 )
869}
870
871sub size_request {
872 my ($self) = @_;
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)
880}
881
882sub size_allocate {
883 my ($self, $w, $h) = @_;
884
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
890 $self->child->configure (0, 0, $w, $h);
891 $self->update;
892}
893
894sub set_offset {
895 my ($self, $x, $y) = @_;
896
897 $self->{view_x} = int $x;
898 $self->{view_y} = int $y;
899
900 $self->update;
901}
902
903# hmm, this does not work for topleft of $self... but we should not ask for that
904sub coord2local {
905 my ($self, $x, $y) = @_;
906
907 $self->SUPER::coord2local ($x + $self->{view_x}, $y + $self->{view_y})
908}
909
910sub coord2global {
911 my ($self, $x, $y) = @_;
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;
940}
941
942#############################################################################
943
944package CFClient::UI::ScrolledWindow;
945
946our @ISA = CFClient::UI::HBox::;
947
948sub new {
949 my $class = shift;
950
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;
637 1054
638 my $self = $class->SUPER::new ( 1055 my $self = $class->SUPER::new (
639 bg => [1, 1, 1, 1], 1056 bg => [1, 1, 1, 1],
640 border_bg => [1, 1, 1, 1], 1057 border_bg => [1, 1, 1, 1],
641 border => 0.8, 1058 border => 0.6,
1059 can_events => 1,
1060 min_w => 16,
1061 min_h => 16,
642 @_ 1062 @_
643 ); 1063 );
644 1064
645 $self->{title} &&= new CFClient::UI::Label 1065 $self->{title} &&= new CFClient::UI::Label
646 align => 0, 1066 align => 0,
647 valign => 1, 1067 valign => 1,
648 text => $self->{title}, 1068 text => $self->{title},
649 fontsize => 1; 1069 fontsize => $self->{border};
650 1070
651 $self 1071 $self
652} 1072}
653 1073
654sub border { 1074sub border {
655 int $_[0]{border} * $::FONTSIZE 1075 int $_[0]{border} * $::FONTSIZE
656} 1076}
657 1077
658sub size_request { 1078sub size_request {
659 my ($self) = @_; 1079 my ($self) = @_;
660
661 return ($self->{user_w}, $self->{user_h}) if $self->{user_w} && $self->{user_h};
662 1080
663 my ($w, $h) = $self->SUPER::size_request; 1081 my ($w, $h) = $self->SUPER::size_request;
664 1082
665 ( 1083 (
666 $w + $self->border * 2, 1084 $w + $self->border * 2,
… …
672 my ($self, $w, $h) = @_; 1090 my ($self, $w, $h) = @_;
673 1091
674 $h -= List::Util::max 0, $self->border * 2; 1092 $h -= List::Util::max 0, $self->border * 2;
675 $w -= List::Util::max 0, $self->border * 2; 1093 $w -= List::Util::max 0, $self->border * 2;
676 1094
677 $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)
678 if $self->{title}; 1096 if $self->{title};
679 1097
680 $self->child->configure ($self->border, $self->border, $w, $h); 1098 $self->child->configure ($self->border, $self->border, $w, $h);
681} 1099}
682 1100
683sub button_down { 1101sub button_down {
684 my ($self, $ev, $x, $y) = @_; 1102 my ($self, $ev, $x, $y) = @_;
685 1103
1104 my ($w, $h) = @$self{qw(w h)};
686 my $border = $self->border; 1105 my $border = $self->border;
687 1106
688 if ($x < $self->{w} && $x >= $self->{w} - $border 1107 my $lr = ($x >= 0 && $x < $border) || ($x > $w - $border && $x < $w);
689 && $y < $self->{h} && $y >= $self->{h} - $border) { 1108 my $td = ($y >= 0 && $y < $border) || ($y > $h - $border && $y < $h);
690 1109
1110 if ($lr & $td) {
1111 my ($wx, $wy) = ($self->{x}, $self->{y});
691 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1112 my ($ox, $oy) = ($ev->{x}, $ev->{y});
692 my ($bw, $bh) = ($self->{w}, $self->{h}); 1113 my ($bw, $bh) = ($self->{w}, $self->{h});
693 1114
1115 my $mx = $x < $border;
1116 my $my = $y < $border;
1117
694 $self->{motion} = sub { 1118 $self->{motion} = sub {
695 my ($ev, $x, $y) = @_; 1119 my ($ev, $x, $y) = @_;
696 1120
697 ($x, $y) = ($ev->{x}, $ev->{y}); 1121 my $dx = $ev->{x} - $ox;
1122 my $dy = $ev->{y} - $oy;
698 1123
699 $self->{user_w} = $bw + $x - $ox; 1124 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
700 $self->{user_h} = $bh + $y - $oy; 1125 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
701 $self->check_size; 1126
1127 $self->realloc;
1128 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
702 }; 1129 };
703 1130
704 } elsif ($x >= 0 && $x < $self->{w} 1131 } elsif ($lr ^ $td) {
705 && $y >= 0 && $y < $border) {
706
707 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1132 my ($ox, $oy) = ($ev->{x}, $ev->{y});
708 my ($bx, $by) = ($self->{x}, $self->{y}); 1133 my ($bx, $by) = ($self->{x}, $self->{y});
709 1134
710 $self->{motion} = sub { 1135 $self->{motion} = sub {
711 my ($ev, $x, $y) = @_; 1136 my ($ev, $x, $y) = @_;
712 1137
713 ($x, $y) = ($ev->{x}, $ev->{y}); 1138 ($x, $y) = ($ev->{x}, $ev->{y});
714 1139
715 $self->move ($bx + $x - $ox, $by + $y - $oy); 1140 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
716 $self->update;
717 }; 1141 };
718 } 1142 }
719} 1143}
720 1144
721sub button_up { 1145sub button_up {
… …
734 my ($self) = @_; 1158 my ($self) = @_;
735 1159
736 my ($w, $h ) = ($self->{w}, $self->{h}); 1160 my ($w, $h ) = ($self->{w}, $self->{h});
737 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1161 my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
738 1162
739 glEnable GL_BLEND;
740 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
741 glEnable GL_TEXTURE_2D; 1163 glEnable GL_TEXTURE_2D;
742 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1164 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
743 1165
744 my $border = $self->border; 1166 my $border = $self->border;
745 1167
746 glColor @{ $self->{border_bg} }; 1168 glColor @{ $self->{border_bg} };
747 $tex[1]->draw_quad (0, 0, $w, $border); 1169 $border[0]->draw_quad_alpha (0, 0, $w, $border);
748 $tex[3]->draw_quad (0, $border, $border, $ch); 1170 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
749 $tex[2]->draw_quad ($w - $border, $border, $border, $ch); 1171 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
750 $tex[4]->draw_quad (0, $h - $border, $w, $border); 1172 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
751 1173
752 my $bg = $tex[0]; 1174 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1175 glColor @{ $self->{bg} };
753 1176
754 # TODO: repeat texture not scale 1177 # TODO: repeat texture not scale
755 my $rep_x = $cw / $bg->{w}; 1178 # solve this better(?)
756 my $rep_y = $ch / $bg->{h}; 1179 $bg->{s} = $cw / $bg->{w};
757 1180 $bg->{t} = $ch / $bg->{h};
758 glColor @{ $self->{bg} };
759
760 $bg->{s} = $rep_x;
761 $bg->{t} = $rep_y;
762 $bg->{wrap_mode} = 1;
763 $bg->draw_quad ($border, $border, $cw, $ch); 1181 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1182 }
764 1183
765 glDisable GL_TEXTURE_2D; 1184 glDisable GL_TEXTURE_2D;
766 glDisable GL_BLEND;
767 1185
768 $self->{title}->draw if $self->{title}; 1186 $self->{title}->draw if $self->{title};
1187
769 $self->child->draw; 1188 $self->child->draw;
770} 1189}
771 1190
772############################################################################# 1191#############################################################################
773 1192
… …
782sub new { 1201sub new {
783 my $class = shift; 1202 my $class = shift;
784 1203
785 $class->SUPER::new ( 1204 $class->SUPER::new (
786 col_expand => [], 1205 col_expand => [],
787 @_ 1206 @_,
788 ) 1207 )
1208}
1209
1210sub children {
1211 grep $_, map @$_, grep $_, @{ $_[0]{children} }
789} 1212}
790 1213
791sub add { 1214sub add {
792 my ($self, $x, $y, $child) = @_; 1215 my ($self, $x, $y, $child) = @_;
793 1216
794 $child->set_parent ($self); 1217 $child->set_parent ($self);
795 $self->{children}[$y][$x] = $child; 1218 $self->{children}[$y][$x] = $child;
796 1219
797 $child->check_size; 1220 $self->realloc;
798} 1221}
799 1222
800# 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?
801sub clear { 1224sub clear {
802 my ($self) = @_; 1225 my ($self) = @_;
803 1226
1227 my @children = $self->children;
804 delete $self->{children}; 1228 delete $self->{children};
805 $self->update; 1229
1230 for (@children) {
1231 delete $_->{parent};
1232 $_->hide;
1233 }
1234
1235 $self->realloc;
806} 1236}
807 1237
808sub get_wh { 1238sub get_wh {
809 my ($self) = @_; 1239 my ($self) = @_;
810 1240
… …
815 or next; 1245 or next;
816 1246
817 for my $x (0 .. $#$row) { 1247 for my $x (0 .. $#$row) {
818 my $widget = $row->[$x] 1248 my $widget = $row->[$x]
819 or next; 1249 or next;
820 my ($w, $h) = $widget->size_request; 1250 my ($w, $h) = @$widget{qw(req_w req_h)};
821 1251
822 $w[$x] = max $w[$x], $w; 1252 $w[$x] = max $w[$x], $w;
823 $h[$y] = max $h[$y], $h; 1253 $h[$y] = max $h[$y], $h;
824 } 1254 }
825 } 1255 }
… …
841sub size_allocate { 1271sub size_allocate {
842 my ($self, $w, $h) = @_; 1272 my ($self, $w, $h) = @_;
843 1273
844 my ($ws, $hs) = $self->get_wh; 1274 my ($ws, $hs) = $self->get_wh;
845 1275
846 my $req_w = sum @$ws; 1276 my $req_w = (sum @$ws) || 1;
847 my $req_h = sum @$hs; 1277 my $req_h = (sum @$hs) || 1;
848 1278
849 # TODO: nicer code && do row_expand 1279 # TODO: nicer code && do row_expand
850 my @col_expand = @{$self->{col_expand}}; 1280 my @col_expand = @{$self->{col_expand}};
851 @col_expand = (1) x @$ws unless @col_expand; 1281 @col_expand = (1) x @$ws unless @col_expand;
852 my $col_expand = (sum @col_expand) || 1; 1282 my $col_expand = (sum @col_expand) || 1;
… …
906 } 1336 }
907} 1337}
908 1338
909############################################################################# 1339#############################################################################
910 1340
911package CFClient::UI::HBox; 1341package CFClient::UI::Box;
912
913# TODO: wrap into common Box base class
914 1342
915our @ISA = CFClient::UI::Container::; 1343our @ISA = CFClient::UI::Container::;
916 1344
917sub size_request { 1345sub size_request {
918 my ($self) = @_; 1346 my ($self) = @_;
919 1347
920 my @alloc = map [$_->size_request], @{$self->{children}}; 1348 $self->{vertical}
921 1349 ? (
922 ( 1350 (List::Util::max map $_->{req_w}, @{$self->{children}}),
923 (List::Util::sum map $_->[0], @alloc), 1351 (List::Util::sum map $_->{req_h}, @{$self->{children}}),
924 (List::Util::max map $_->[1], @alloc), 1352 )
925 ) 1353 : (
1354 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1355 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1356 )
926} 1357}
927 1358
928sub size_allocate { 1359sub size_allocate {
929 my ($self, $w, $h) = @_; 1360 my ($self, $w, $h) = @_;
930 1361
931 ($h, $w) = ($w, $h); 1362 my $space = $self->{vertical} ? $h : $w;
932
933 my $children = $self->{children}; 1363 my $children = $self->{children};
934 1364
935 my @h = map +($_->size_request)[0], @$children; 1365 my @req;
936 1366
937 my $req_h = List::Util::sum @h; 1367 if ($self->{homogeneous}) {
938 1368 @req = ($space / (@$children || 1)) x @$children;
939 if ($req_h > $h) {
940 # ah well, not enough space
941 $_ *= $h / $req_h for @h;
942 } 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 {
943 my $exp = List::Util::sum map $_->{expand}, @$children; 1377 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
944 $exp ||= 1;
945 1378
1379 $space = ($space - $req) / $expand; # remaining space to give away
1380
1381 $req[$_] += $space * $children->[$_]{expand}
946 for (0 .. $#$children) { 1382 for 0 .. $#$children;
947 my $child = $children->[$_];
948
949 my $alloc_h = $h[$_];
950 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
951 $h[$_] = $alloc_h;
952 } 1383 }
953 } 1384 }
954 1385
955 CFClient::UI::harmonize \@h; 1386 CFClient::UI::harmonize \@req;
956 1387
957 my $y = 0; 1388 my $pos = 0;
958 for (0 .. $#$children) { 1389 for (0 .. $#$children) {
959 my $child = $children->[$_];
960 my $h = $h[$_]; 1390 my $alloc = $req[$_];
961 $child->configure ($y, 0, $h, $w); 1391 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
962 1392
963 $y += $h; 1393 $pos += $alloc;
964 } 1394 }
965 1395
966 1 1396 1
967} 1397}
968 1398
969############################################################################# 1399#############################################################################
970 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
971package CFClient::UI::VBox; 1416package CFClient::UI::VBox;
972 1417
973# TODO: wrap into common Box base class
974
975our @ISA = CFClient::UI::Container::; 1418our @ISA = CFClient::UI::Box::;
976 1419
977sub size_request { 1420sub new {
978 my ($self) = @_; 1421 my $class = shift;
979 1422
980 my @alloc = map [$_->size_request], @{$self->{children}}; 1423 $class->SUPER::new (
981 1424 vertical => 1,
982 ( 1425 @_,
983 (List::Util::max map $_->[0], @alloc),
984 (List::Util::sum map $_->[1], @alloc),
985 ) 1426 )
986} 1427}
987 1428
988sub size_allocate {
989 my ($self, $w, $h) = @_;
990
991 my $children = $self->{children};
992
993 my @h = map +($_->size_request)[1], @$children;
994
995 my $req_h = List::Util::sum @h;
996
997 if ($req_h > $h) {
998 # ah well, not enough space
999 $_ *= $h / $req_h for @h;
1000 } else {
1001 my $exp = List::Util::sum map $_->{expand}, @$children;
1002 $exp ||= 1;
1003
1004 for (0 .. $#$children) {
1005 my $child = $children->[$_];
1006
1007 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1008 }
1009 }
1010
1011 CFClient::UI::harmonize \@h;
1012
1013 my $y = 0;
1014 for (0 .. $#$children) {
1015 my $child = $children->[$_];
1016 my $h = $h[$_];
1017 $child->configure (0, $y, $w, $h);
1018
1019 $y += $h;
1020 }
1021
1022 1
1023}
1024
1025############################################################################# 1429#############################################################################
1026 1430
1027package CFClient::UI::Label; 1431package CFClient::UI::Label;
1028 1432
1029our @ISA = CFClient::UI::Base::; 1433our @ISA = CFClient::UI::DrawBG::;
1030 1434
1031use CFClient::OpenGL; 1435use CFClient::OpenGL;
1032 1436
1033sub new { 1437sub new {
1034 my ($class, %arg) = @_; 1438 my ($class, %arg) = @_;
1035 1439
1036 my $self = $class->SUPER::new ( 1440 my $self = $class->SUPER::new (
1037 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),
1038 fontsize => 1, 1450 fontsize => 1,
1039 text => "",
1040 align => -1, 1451 align => -1,
1041 valign => -1, 1452 valign => -1,
1042 padding => 2, 1453 padding_x => 2,
1043 layout => new CFClient::Layout, 1454 padding_y => 2,
1455 can_events => 0,
1044 %arg 1456 %arg
1045 ); 1457 );
1046 1458
1047 if (exists $self->{template}) { 1459 if (exists $self->{template}) {
1048 my $layout = new CFClient::Layout; 1460 my $layout = new CFClient::Layout;
1049 $layout->set_text (delete $self->{template}); 1461 $layout->set_text (delete $self->{template});
1050 $self->{template} = $layout; 1462 $self->{template} = $layout;
1051 } 1463 }
1052 1464
1053 $self->set_text (delete $self->{text}) if exists $self->{text}; 1465 if (exists $self->{markup}) {
1054 $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 }
1055 1470
1056 $self 1471 $self
1057} 1472}
1058 1473
1059sub escape_text { 1474sub escape($) {
1060 local $_ = $_[1]; 1475 local $_ = $_[0];
1061 1476
1062 s/&/&amp;/g; 1477 s/&/&amp;/g;
1063 s/>/&gt;/g; 1478 s/>/&gt;/g;
1064 s/</&lt;/g; 1479 s/</&lt;/g;
1065 1480
1066 $_[1] 1481 $_
1482}
1483
1484sub update {
1485 my ($self) = @_;
1486
1487 delete $self->{texture};
1488 $self->SUPER::update;
1067} 1489}
1068 1490
1069sub set_text { 1491sub set_text {
1070 my ($self, $text) = @_; 1492 my ($self, $text) = @_;
1071 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;
1072 $self->{layout}->set_text ($text); 1498 $self->{layout}->set_text ($text);
1073 1499
1074 delete $self->{texture}; 1500 $self->realloc;
1075 $self->update; 1501 $self->update;
1076} 1502}
1077 1503
1078sub set_markup { 1504sub set_markup {
1079 my ($self, $markup) = @_; 1505 my ($self, $markup) = @_;
1080 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;
1081 $self->{layout}->set_markup ($markup); 1513 $self->{layout}->set_markup ($markup);
1082 1514
1083 delete $self->{texture}; 1515 $self->realloc;
1084 $self->update; 1516 $self->update;
1085} 1517}
1086 1518
1087sub size_request { 1519sub size_request {
1088 my ($self) = @_; 1520 my ($self) = @_;
1089 1521
1090 $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});
1091 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1526 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1092 1527
1093 my ($w, $h) = $self->{layout}->size; 1528 my ($w, $h) = $self->{layout}->size;
1094 1529
1095 if (exists $self->{template}) { 1530 if (exists $self->{template}) {
1531 $self->{template}->set_font ($self->{font}) if $self->{font};
1096 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1532 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1097 1533
1098 my ($w2, $h2) = $self->{template}->size; 1534 my ($w2, $h2) = $self->{template}->size;
1099 1535
1100 $w = List::Util::max $w, $w2; 1536 $w = List::Util::max $w, $w2;
1101 $h = List::Util::max $h, $h2; 1537 $h = List::Util::max $h, $h2;
1102 } 1538 }
1103 1539
1104 ( 1540 ($w, $h)
1105 $w + $self->{padding} * 2,
1106 $h + $self->{padding} * 2,
1107 )
1108} 1541}
1109 1542
1110sub size_allocate { 1543sub size_allocate {
1111 my ($self, $w, $h) = @_; 1544 my ($self, $w, $h) = @_;
1112 1545
1113 delete $self->{texture}; 1546 delete $self->{texture}
1547 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1114} 1548}
1115 1549
1116sub set_fontsize { 1550sub set_fontsize {
1117 my ($self, $fontsize) = @_; 1551 my ($self, $fontsize) = @_;
1118 1552
1119 $self->{fontsize} = $fontsize; 1553 $self->{fontsize} = $fontsize;
1120 $self->update; 1554 delete $self->{texture};
1555
1556 $self->realloc;
1121} 1557}
1122 1558
1123sub _draw { 1559sub _draw {
1124 my ($self) = @_; 1560 my ($self) = @_;
1125 1561
1562 $self->SUPER::_draw; # draw background, if applicable
1563
1126 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};
1127 $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});
1128 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1570 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1571
1129 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
1130 }; 1583 };
1131 1584
1132 glEnable GL_BLEND;
1133 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1134 glEnable GL_TEXTURE_2D; 1585 glEnable GL_TEXTURE_2D;
1135 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1586 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1136 1587
1588 if ($tex->{format} == GL_ALPHA) {
1137 glColor @{$self->{fg}}; 1589 glColor @{$self->{fg}};
1138
1139 $self->{ox} = int (
1140 $self->{align} < 0 ? $self->{padding}
1141 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1142 : ($self->{w} - $tex->{w}) * 0.5
1143 );
1144
1145 $self->{oy} = int (
1146 $self->{valign} < 0 ? $self->{padding}
1147 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1148 : ($self->{h} - $tex->{h}) * 0.5
1149 );
1150
1151 $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 }
1152 1594
1153 glDisable GL_TEXTURE_2D; 1595 glDisable GL_TEXTURE_2D;
1154 glDisable GL_BLEND;
1155} 1596}
1156 1597
1157############################################################################# 1598#############################################################################
1158 1599
1159package CFClient::UI::EntryBase; 1600package CFClient::UI::EntryBase;
… …
1164 1605
1165sub new { 1606sub new {
1166 my $class = shift; 1607 my $class = shift;
1167 1608
1168 $class->SUPER::new ( 1609 $class->SUPER::new (
1169 fg => [1, 1, 1], 1610 fg => [1, 1, 1],
1170 bg => [0, 0, 0, 0.2], 1611 bg => [0, 0, 0, 0.2],
1171 active_bg => [1, 1, 1, 0.5], 1612 active_bg => [1, 1, 1, 0.5],
1172 active_fg => [0, 0, 0], 1613 active_fg => [0, 0, 0],
1173 can_hover => 1, 1614 can_hover => 1,
1174 can_focus => 1, 1615 can_focus => 1,
1175 valign => 0, 1616 valign => 0,
1617 can_events => 1,
1618 #text => ...
1176 @_ 1619 @_
1177 ) 1620 )
1178} 1621}
1179 1622
1180sub _set_text { 1623sub _set_text {
… …
1190 $self->{text} = $text; 1633 $self->{text} = $text;
1191 1634
1192 $text =~ s/./*/g if $self->{hidden}; 1635 $text =~ s/./*/g if $self->{hidden};
1193 $self->{layout}->set_text ("$text "); 1636 $self->{layout}->set_text ("$text ");
1194 1637
1195 $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;
1196} 1648}
1197 1649
1198sub get_text { 1650sub get_text {
1199 $_[0]{text} 1651 $_[0]{text}
1200} 1652}
… …
1203 my ($self) = @_; 1655 my ($self) = @_;
1204 1656
1205 my ($w, $h) = $self->SUPER::size_request; 1657 my ($w, $h) = $self->SUPER::size_request;
1206 1658
1207 ($w + 1, $h) # add 1 for cursor 1659 ($w + 1, $h) # add 1 for cursor
1208}
1209
1210sub size_allocate {
1211 my ($self, $w, $h) = @_;
1212
1213 $self->_set_text ($self->{text});
1214}
1215
1216sub set_text {
1217 my ($self, $text) = @_;
1218
1219 $self->{cursor} = length $text;
1220 $self->_set_text ($text);
1221 $self->update;
1222} 1660}
1223 1661
1224sub key_down { 1662sub key_down {
1225 my ($self, $ev) = @_; 1663 my ($self, $ev) = @_;
1226 1664
… …
1228 my $sym = $ev->{sym}; 1666 my $sym = $ev->{sym};
1229 my $uni = $ev->{unicode}; 1667 my $uni = $ev->{unicode};
1230 1668
1231 my $text = $self->get_text; 1669 my $text = $self->get_text;
1232 1670
1233 if ($sym == 8) { 1671 if ($uni == 8) {
1234 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1672 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1235 } elsif ($sym == 127) { 1673 } elsif ($uni == 127) {
1236 substr $text, $self->{cursor}, 1, ""; 1674 substr $text, $self->{cursor}, 1, "";
1237 } elsif ($sym == CFClient::SDLK_LEFT) { 1675 } elsif ($sym == CFClient::SDLK_LEFT) {
1238 --$self->{cursor} if $self->{cursor}; 1676 --$self->{cursor} if $self->{cursor};
1239 } elsif ($sym == CFClient::SDLK_RIGHT) { 1677 } elsif ($sym == CFClient::SDLK_RIGHT) {
1240 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1678 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1241 } elsif ($sym == CFClient::SDLK_HOME) { 1679 } elsif ($sym == CFClient::SDLK_HOME) {
1242 $self->{cursor} = 0; 1680 $self->{cursor} = 0;
1243 } elsif ($sym == CFClient::SDLK_END) { 1681 } elsif ($sym == CFClient::SDLK_END) {
1244 $self->{cursor} = length $text; 1682 $self->{cursor} = length $text;
1245 } elsif ($sym == 27) { 1683 } elsif ($uni == 27) {
1246 $self->emit ('escape'); 1684 $self->_emit ('escape');
1247 } elsif ($uni) { 1685 } elsif ($uni) {
1248 substr $text, $self->{cursor}++, 0, chr $uni; 1686 substr $text, $self->{cursor}++, 0, chr $uni;
1249 } 1687 }
1250 1688
1251 $self->_set_text ($text); 1689 $self->_set_text ($text);
1252 $self->update; 1690
1691 $self->realloc;
1253} 1692}
1254 1693
1255sub focus_in { 1694sub focus_in {
1256 my ($self) = @_; 1695 my ($self) = @_;
1257 1696
… …
1333 my ($self, $ev) = @_; 1772 my ($self, $ev) = @_;
1334 1773
1335 my $sym = $ev->{sym}; 1774 my $sym = $ev->{sym};
1336 1775
1337 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} = '';
1338 $self->emit (activate => $self->get_text); 1781 $self->_emit (activate => $txt);
1339 $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 }
1340 1805
1341 } else { 1806 } else {
1342 $self->SUPER::key_down ($ev); 1807 $self->SUPER::key_down ($ev);
1343 } 1808 }
1344 1809
… …
1358 1823
1359sub new { 1824sub new {
1360 my $class = shift; 1825 my $class = shift;
1361 1826
1362 $class->SUPER::new ( 1827 $class->SUPER::new (
1363 padding => 4, 1828 padding_x => 4,
1829 padding_y => 4,
1364 fg => [1, 1, 1], 1830 fg => [1, 1, 1],
1365 bg => [1, 1, 1, 0.2],
1366 active_fg => [0, 0, 1], 1831 active_fg => [0, 0, 1],
1367 can_hover => 1, 1832 can_hover => 1,
1368 align => 0, 1833 align => 0,
1369 valign => 0, 1834 valign => 0,
1835 can_events => 1,
1370 @_ 1836 @_
1371 ) 1837 )
1372} 1838}
1373 1839
1840sub activate { }
1841
1374sub button_up { 1842sub button_up {
1375 my ($self, $ev, $x, $y) = @_; 1843 my ($self, $ev, $x, $y) = @_;
1376 1844
1845 $self->emit ("activate")
1377 if ($x >= 0 && $x < $self->{w} 1846 if $x >= 0 && $x < $self->{w}
1378 && $y >= 0 && $y < $self->{h}) { 1847 && $y >= 0 && $y < $self->{h};
1379 $self->emit ("activate");
1380 }
1381} 1848}
1382 1849
1383sub _draw { 1850sub _draw {
1384 my ($self) = @_; 1851 my ($self) = @_;
1385 1852
… …
1387 1854
1388 if ($GRAB == $self) { 1855 if ($GRAB == $self) {
1389 $self->{fg} = $self->{active_fg}; 1856 $self->{fg} = $self->{active_fg};
1390 } 1857 }
1391 1858
1392 glEnable GL_BLEND;
1393 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1394 glEnable GL_TEXTURE_2D; 1859 glEnable GL_TEXTURE_2D;
1395 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1860 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1396 glColor 0, 0, 0, 1; 1861 glColor 0, 0, 0, 1;
1397 1862
1398 $tex[0]->draw_quad (0, 0, $self->{w}, $self->{h}); 1863 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1399 1864
1400 glDisable GL_TEXTURE_2D; 1865 glDisable GL_TEXTURE_2D;
1401 glDisable GL_BLEND;
1402 1866
1403 $self->SUPER::_draw; 1867 $self->SUPER::_draw;
1404} 1868}
1405 1869
1406############################################################################# 1870#############################################################################
… …
1417 1881
1418sub new { 1882sub new {
1419 my $class = shift; 1883 my $class = shift;
1420 1884
1421 $class->SUPER::new ( 1885 $class->SUPER::new (
1422 padding => 2, 1886 padding_x => 2,
1887 padding_y => 2,
1423 fg => [1, 1, 1], 1888 fg => [1, 1, 1],
1424 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],
1425 state => 0, 1892 state => 0,
1426 can_hover => 1, 1893 can_hover => 1,
1427 @_ 1894 @_
1428 ) 1895 )
1429} 1896}
1430 1897
1431sub size_request { 1898sub size_request {
1432 my ($self) = @_; 1899 my ($self) = @_;
1433 1900
1434 ($self->{padding} * 2 + 6) x 2 1901 (6) x 2
1435} 1902}
1436 1903
1437sub button_down { 1904sub button_down {
1438 my ($self, $ev, $x, $y) = @_; 1905 my ($self, $ev, $x, $y) = @_;
1439 1906
1440 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1907 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1441 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1908 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1442 $self->{state} = !$self->{state}; 1909 $self->{state} = !$self->{state};
1443 $self->emit (changed => $self->{state}); 1910 $self->_emit (changed => $self->{state});
1444 } 1911 }
1445} 1912}
1446 1913
1447sub _draw { 1914sub _draw {
1448 my ($self) = @_; 1915 my ($self) = @_;
1449 1916
1450 $self->SUPER::_draw; 1917 $self->SUPER::_draw;
1451 1918
1452 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 1919 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1453 1920
1454 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;
1455 1924
1456 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1925 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1457 1926
1458 glEnable GL_BLEND; 1927 my $tex = $self->{state} ? $tex[1] : $tex[0];
1928
1459 glEnable GL_TEXTURE_2D; 1929 glEnable GL_TEXTURE_2D;
1460 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1461
1462 my $tex = $self->{state} ? $tex[1] : $tex[0];
1463
1464 $tex->draw_quad (0, 0, $s, $s); 1930 $tex->draw_quad_alpha (0, 0, $s, $s);
1465
1466 glDisable GL_TEXTURE_2D; 1931 glDisable GL_TEXTURE_2D;
1467 glDisable GL_BLEND;
1468} 1932}
1469 1933
1470############################################################################# 1934#############################################################################
1471 1935
1472package CFClient::UI::Image; 1936package CFClient::UI::Image;
… …
1479our %loaded_images; 1943our %loaded_images;
1480 1944
1481sub new { 1945sub new {
1482 my $class = shift; 1946 my $class = shift;
1483 1947
1484 my $self = $class->SUPER::new (@_); 1948 my $self = $class->SUPER::new (can_events => 0, @_);
1485 1949
1486 $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!";
1487 1951
1488 $loaded_images{$self->{image}} ||= 1952 $loaded_images{$self->{image}} ||=
1489 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;
1490 1954
1491 my $tex = $self->{tex} = $loaded_images{$self->{image}}; 1955 my $tex = $self->{tex} = $loaded_images{$self->{image}};
1956
1957 Scalar::Util::weaken $loaded_images{$self->{image}};
1492 1958
1493 $self->{aspect} = $tex->{w} / $tex->{h}; 1959 $self->{aspect} = $tex->{w} / $tex->{h};
1494 1960
1495 $self 1961 $self
1496} 1962}
… …
1513 glTranslate 0, -$self->{w}, 0; 1979 glTranslate 0, -$self->{w}, 0;
1514 1980
1515 ($w, $h) = ($h, $w); 1981 ($w, $h) = ($h, $w);
1516 } 1982 }
1517 1983
1518 glEnable GL_BLEND;
1519 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1520 glEnable GL_TEXTURE_2D; 1984 glEnable GL_TEXTURE_2D;
1521 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1985 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1522 1986
1523 $tex->draw_quad (0, 0, $w, $h); 1987 $tex->draw_quad_alpha (0, 0, $w, $h);
1524 1988
1525 glDisable GL_BLEND;
1526 glDisable GL_TEXTURE_2D; 1989 glDisable GL_TEXTURE_2D;
1527} 1990}
1528 1991
1529############################################################################# 1992#############################################################################
1530 1993
1531package CFClient::UI::VGauge; 1994package CFClient::UI::VGauge;
1532 1995
1533our @ISA = CFClient::UI::Base::; 1996our @ISA = CFClient::UI::Base::;
1997
1998use List::Util qw(min max);
1534 1999
1535use CFClient::OpenGL; 2000use CFClient::OpenGL;
1536 2001
1537my %tex = ( 2002my %tex = (
1538 food => [ 2003 food => [
1539 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2004 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1540 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 2005 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
1541 ], 2006 ],
1542 grace => [ 2007 grace => [
1543 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2008 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1544 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/
1545 ], 2010 ],
1546 hp => [ 2011 hp => [
1547 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2012 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1548 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 2013 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
1549 ], 2014 ],
1550 mana => [ 2015 mana => [
1551 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2016 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1552 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/
1553 ], 2018 ],
1554); 2019);
1555 2020
1556# eg. VGauge->new (gauge => 'food'), default gauge: food 2021# eg. VGauge->new (gauge => 'food'), default gauge: food
1557sub new { 2022sub new {
… …
1576} 2041}
1577 2042
1578sub set_max { 2043sub set_max {
1579 my ($self, $max) = @_; 2044 my ($self, $max) = @_;
1580 2045
2046 return if $self->{max_val} == $max;
2047
1581 $self->{max_val} = $max; 2048 $self->{max_val} = $max;
2049 $self->update;
1582} 2050}
1583 2051
1584sub set_value { 2052sub set_value {
1585 my ($self, $val, $max) = @_; 2053 my ($self, $val, $max) = @_;
1586 2054
1587 $self->set_max ($max) 2055 $self->set_max ($max)
1588 if defined $max; 2056 if defined $max;
1589 2057
1590 $max = $self->{max_val}; 2058 return if $self->{val} == $val;
2059
1591 $self->{val} = $val; 2060 $self->{val} = $val;
1592
1593 $self->update; 2061 $self->update;
1594} 2062}
1595 2063
1596sub _draw { 2064sub _draw {
1597 my ($self) = @_; 2065 my ($self) = @_;
1598 2066
1599 my $tex = $tex{$self->{type}}; 2067 my $tex = $tex{$self->{type}};
2068 my ($t1, $t2, $t3) = @$tex;
1600 2069
1601 my ($w, $h) = ($self->{w}, $self->{h}); 2070 my ($w, $h) = ($self->{w}, $self->{h});
1602 2071
1603 if ($self->{vertical}) { 2072 if ($self->{vertical}) {
1604 glRotate 90, 0, 0, 1; 2073 glRotate 90, 0, 0, 1;
… …
1606 2075
1607 ($w, $h) = ($h, $w); 2076 ($w, $h) = ($h, $w);
1608 } 2077 }
1609 2078
1610 my $ycut = $self->{val} / ($self->{max_val} || 1); 2079 my $ycut = $self->{val} / ($self->{max_val} || 1);
1611 $ycut = 1 if $self->{val} > $self->{max_val};
1612 2080
1613 my $t1 = $tex->[0]; 2081 my $ycut1 = max 0, min 1, $ycut;
1614 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);
1615 2086
1616 glEnable GL_BLEND; 2087 glEnable GL_BLEND;
1617 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2088 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1618 glEnable GL_TEXTURE_2D; 2089 glEnable GL_TEXTURE_2D;
1619 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2090 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1620 2091
1621 my $h1 = $self->{h} - $ycut * $self->{h};
1622 my $h2 = $ycut * $self->{h};
1623
1624 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2092 glBindTexture GL_TEXTURE_2D, $t1->{name};
1625 glBegin GL_QUADS; 2093 glBegin GL_QUADS;
1626 glTexCoord 0 , 0; glVertex 0 , 0; 2094 glTexCoord 0 , 0; glVertex 0 , 0;
1627 glTexCoord 0 , $t1->{t} * (1 - $ycut); glVertex 0 , $h1; 2095 glTexCoord 0 , $t1->{t} * (1 - $ycut1); glVertex 0 , $h1;
1628 glTexCoord $t1->{s}, $t1->{t} * (1 - $ycut); glVertex $w, $h1; 2096 glTexCoord $t1->{s}, $t1->{t} * (1 - $ycut1); glVertex $w, $h1;
1629 glTexCoord $t1->{s}, 0; glVertex $w, 0; 2097 glTexCoord $t1->{s}, 0; glVertex $w, 0;
1630 glEnd; 2098 glEnd;
1631 2099
2100 my $ycut1 = List::Util::min 1, $ycut;
1632 glBindTexture GL_TEXTURE_2D, $t2->{name}; 2101 glBindTexture GL_TEXTURE_2D, $t2->{name};
1633 glBegin GL_QUADS; 2102 glBegin GL_QUADS;
1634 glTexCoord 0 , $t2->{t} * (1 - $ycut); glVertex 0 , $h1; 2103 glTexCoord 0 , $t2->{t} * (1 - $ycut1); glVertex 0 , $h1;
1635 glTexCoord 0 , $t2->{t}; glVertex 0 , $h1 + $h2; 2104 glTexCoord 0 , $t2->{t} * (1 - $ycut2); glVertex 0 , $h2;
1636 glTexCoord $t2->{s}, $t2->{t}; glVertex $w, $h1 + $h2; 2105 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut2); glVertex $w, $h2;
1637 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut); glVertex $w, $h1; 2106 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut1); glVertex $w, $h1;
1638 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 }
1639 2118
1640 glDisable GL_BLEND; 2119 glDisable GL_BLEND;
1641 glDisable GL_TEXTURE_2D; 2120 glDisable GL_TEXTURE_2D;
1642} 2121}
1643 2122
… …
1646package CFClient::UI::Gauge; 2125package CFClient::UI::Gauge;
1647 2126
1648our @ISA = CFClient::UI::VBox::; 2127our @ISA = CFClient::UI::VBox::;
1649 2128
1650sub new { 2129sub new {
1651 my ($class, %arg) = shift; 2130 my ($class, %arg) = @_;
1652 2131
1653 my $self = $class->SUPER::new ( 2132 my $self = $class->SUPER::new (
1654 @_, 2133 tooltip => $arg{type},
2134 can_hover => 1,
2135 can_events => 1,
2136 %arg,
1655 ); 2137 );
1656 2138
1657 $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");
1658 $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);
1659 $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");
1660 2142
1661 $self 2143 $self
1662} 2144}
1663 2145
1664sub set_fontsize { 2146sub set_fontsize {
1665 my ($self, $fsize) = @_; 2147 my ($self, $fsize) = @_;
1666 2148
1667 $self->{value}->set_fontsize ($fsize); 2149 $self->{value}->set_fontsize ($fsize);
1668 $self->{max} ->set_fontsize ($fsize); 2150 $self->{max} ->set_fontsize ($fsize);
1669 $self->update; 2151}
2152
2153sub set_max {
2154 my ($self, $max) = @_;
2155
2156 $self->{gauge}->set_max ($max);
2157 $self->{max}->set_text ($max);
1670} 2158}
1671 2159
1672sub set_value { 2160sub set_value {
1673 my ($self, $val, $max) = @_; 2161 my ($self, $val, $max) = @_;
1674 2162
1675 $self->set_max ($max) 2163 $self->set_max ($max)
1676 if defined $max; 2164 if defined $max;
1677 2165
1678 $self->{gauge}->set_value ($val, $max); 2166 $self->{gauge}->set_value ($val, $max);
1679 $self->{value}->set_text ($val); 2167 $self->{value}->set_text ($val);
1680}
1681
1682sub set_max {
1683 my ($self, $max) = @_;
1684
1685 $self->{gauge}->set_max ($max);
1686 $self->{max}->set_text ($max);
1687} 2168}
1688 2169
1689############################################################################# 2170#############################################################################
1690 2171
1691package CFClient::UI::Slider; 2172package CFClient::UI::Slider;
… …
1701 qw(s1_slider.png s1_slider_bg.png); 2182 qw(s1_slider.png s1_slider_bg.png);
1702 2183
1703sub new { 2184sub new {
1704 my $class = shift; 2185 my $class = shift;
1705 2186
1706 # range [value, low, high, page] 2187 # range [value, low, high, page, unit]
1707 2188
1708 # TODO: 0-width page 2189 # TODO: 0-width page
1709 # TODO: req_w/h are wrong with vertical 2190 # TODO: req_w/h are wrong with vertical
1710 # TODO: calculations are off 2191 # TODO: calculations are off
1711 my $self = $class->SUPER::new ( 2192 my $self = $class->SUPER::new (
1712 fg => [1, 1, 1], 2193 fg => [1, 1, 1],
1713 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],
1714 range => [0, 0, 100, 10], 2197 range => [0, 0, 100, 10, 0],
1715 req_w => 20, 2198 min_w => $::WIDTH / 80,
1716 req_h => 20, 2199 min_h => $::WIDTH / 80,
1717 vertical => 0, 2200 vertical => 0,
1718 can_hover => 1, 2201 can_hover => 1,
1719 inner_pad => 5, 2202 inner_pad => 0.02,
1720 @_ 2203 @_
1721 ); 2204 );
1722 2205
2206 $self->set_value ($self->{range}[0]);
2207 $self->update;
2208
1723 $self 2209 $self
1724} 2210}
1725 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
1726sub size_request { 2246sub size_request {
1727 my ($self) = @_; 2247 my ($self) = @_;
1728 2248
1729 my $w = $self->{req_w}; 2249 ($self->{req_w}, $self->{req_h})
1730 my $h = $self->{req_h};
1731
1732 $self->{vertical} ? ($h, $w) : ($w, $h)
1733} 2250}
1734 2251
1735sub button_down { 2252sub button_down {
1736 my ($self, $ev, $x, $y) = @_; 2253 my ($self, $ev, $x, $y) = @_;
1737 2254
1738 $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
1739 $self->mouse_motion ($ev, $x, $y); 2259 $self->mouse_motion ($ev, $x, $y);
1740} 2260}
1741 2261
1742sub mouse_motion { 2262sub mouse_motion {
1743 my ($self, $ev, $x, $y) = @_; 2263 my ($self, $ev, $x, $y) = @_;
1744 2264
1745 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
1746 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2282 my ($value, $lo, $hi, $page) = @{$self->{range}};
2283 my $range = ($hi - $page - $lo) || 1e-100;
1747 2284
1748 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2285 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
1749 2286
1750 my $inner_pad_px = $self->_calc_inner_pad_px ($w); 2287 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
1751 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right 2288 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
1752 2289
1753 $x -= $inner_pad_px; # substract the padding 2290 $value = ($value - $lo) / $range;
1754 $x = $x * ($hi - $lo) / $inner_w + $lo; 2291 $value = $value * $self->{scale} + $self->{offset};
1755 $x = $lo if $x < $lo;
1756 $x = $hi - $page if $x > $hi - $page;
1757 $self->{range}[0] = $x;
1758 2292
1759 $self->emit (changed => $x); 2293 $self->{knob_x} = $value - $knob_w * 0.5;
1760 $self->update; 2294 $self->{knob_w} = $knob_w;
1761 } 2295 });
1762}
1763 2296
1764# the inner_* stuff is for generating a padding for the slider handle, 2297 $self->SUPER::update;
1765# so that the handle doesn't leave the texture. This calculation isn't 100%
1766# correct propably, but it does the job for now
1767sub _calc_inner_pad_px {
1768 my ($self, $w) = @_;
1769 ($w / 100) * $self->{inner_pad} # % to pixels
1770} 2298}
1771 2299
1772sub _draw { 2300sub _draw {
1773 my ($self) = @_; 2301 my ($self) = @_;
1774 2302
1775 $self->SUPER::_draw (); 2303 $self->SUPER::_draw ();
1776 2304
1777 my ($w, $h) = @$self{qw(w h)}; 2305 glScale $self->{w}, $self->{h};
1778 2306
1779 if ($self->{vertical}) { 2307 if ($self->{vertical}) {
1780 # draw a vertical slider like a rotated horizontal slider 2308 # draw a vertical slider like a rotated horizontal slider
1781 2309
2310 glTranslate 1, 0, 0;
1782 glRotate 90, 0, 0, 1; 2311 glRotate 90, 0, 0, 1;
1783 glTranslate 0, -$self->{w}, 0;
1784
1785 ($w, $h) = ($h, $w);
1786 } 2312 }
1787 2313
1788 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2314 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
1789 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2315 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
1790 2316
1791 my ($value, $lo, $hi, $page) = @{$self->{range}};
1792
1793 $hi = $value + 1 if $lo == $hi;
1794
1795 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
1796 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
1797
1798 $page = int $page * $inner_w / ($hi - $lo);
1799 $value = int +($value - $lo) * $inner_w / ($hi - $lo);
1800
1801 $w -= $page;
1802 $page &= ~1;
1803 glTranslate $page * 0.5, 0, 0;
1804 $page ||= 2;
1805
1806 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
1807 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
1808
1809 glEnable GL_BLEND;
1810 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1811 glEnable GL_TEXTURE_2D; 2317 glEnable GL_TEXTURE_2D;
1812 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2318 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1813 2319
1814 # draw background 2320 # draw background
1815 $tex[1]->draw_quad (0, 0, $w, $h); 2321 $tex[1]->draw_quad_alpha (0, 0, 1, 1);
1816 2322
1817 # draw handle 2323 # draw handle
1818 $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);
1819 2325
1820 glDisable GL_BLEND;
1821 glDisable GL_TEXTURE_2D; 2326 glDisable GL_TEXTURE_2D;
1822} 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 (@_) }
1823 2369
1824############################################################################# 2370#############################################################################
1825 2371
1826package CFClient::UI::TextView; 2372package CFClient::UI::TextView;
1827 2373
… …
1831 2377
1832sub new { 2378sub new {
1833 my $class = shift; 2379 my $class = shift;
1834 2380
1835 my $self = $class->SUPER::new ( 2381 my $self = $class->SUPER::new (
1836 fontsize => 1, 2382 fontsize => 1,
2383 can_events => 0,
2384 #font => default_font
1837 @_, 2385 @_,
1838 2386
1839 layout => (new CFClient::Layout), 2387 layout => (new CFClient::Layout 1),
1840 par => [], 2388 par => [],
1841 height => 0, 2389 height => 0,
1842 children => [ 2390 children => [
1843 (new CFClient::UI::Empty expand => 1), 2391 (new CFClient::UI::Empty expand => 1),
1844 (new CFClient::UI::Slider vertical => 1), 2392 (new CFClient::UI::Slider vertical => 1),
1845 ], 2393 ],
1846 ); 2394 );
1847 2395
1848 $self->{children}[1]->connect (changed => sub { 2396 $self->{children}[1]->connect (changed => sub { $self->update });
1849 $self->update;
1850 });
1851 2397
1852 $self 2398 $self
1853} 2399}
1854 2400
1855sub set_fontsize { 2401sub set_fontsize {
… …
1857 2403
1858 $self->{fontsize} = $fontsize; 2404 $self->{fontsize} = $fontsize;
1859 $self->reflow; 2405 $self->reflow;
1860} 2406}
1861 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
1862sub text_height { 2420sub text_size {
1863 my ($self, $text) = @_; 2421 my ($self, $text, $indent) = @_;
1864 2422
1865 my $layout = $self->{layout}; 2423 my $layout = $self->{layout};
1866 2424
1867 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2425 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
1868 $layout->set_width ($self->{w}); 2426 $layout->set_width ($self->{children}[0]{w} - $indent);
1869 $layout->set_text ($text); 2427 $layout->set_markup ($text);
1870 2428
1871 ($layout->size)[1] 2429 $layout->size
1872} 2430}
1873 2431
1874sub reflow { 2432sub reflow {
1875 my ($self) = @_; 2433 my ($self) = @_;
1876 2434
1877 $self->{need_reflow}++; 2435 $self->{need_reflow}++;
1878 $self->update; 2436 $self->update;
1879} 2437}
1880 2438
1881sub 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 {
1882 my ($self, $w, $h) = @_; 2447 my ($self) = @_;
1883 2448
1884 $self->SUPER::size_allocate ($w, $h); 2449 $self->{par} = [];
1885 2450 $self->{height} = 0;
1886 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2451 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
1887 $self->{layout}->set_width ($self->{children}[0]{w});
1888
1889 $self->reflow;
1890} 2452}
1891 2453
1892sub add_paragraph { 2454sub add_paragraph {
1893 my ($self, $color, $text) = @_; 2455 my ($self, $color, $text, $indent) = @_;
1894 2456
1895 #TODO: intelligently "reformat" paragraph 2457 for my $line (split /\n/, $text) {
1896 2458 my ($w, $h) = $self->text_size ($line);
1897 my $height = $self->text_height ($text);
1898
1899 $self->{height} += $height; 2459 $self->{height} += $h;
2460 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
2461 }
1900 2462
1901 push @{$self->{par}}, [$height, $color, $text];
1902
1903 $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]);
1904 $self->{children}[1]->update;
1905} 2464}
1906 2465
1907sub update { 2466sub update {
1908 my ($self) = @_; 2467 my ($self) = @_;
1909 2468
… …
1911 2470
1912 return unless $self->{h} > 0; 2471 return unless $self->{h} > 0;
1913 2472
1914 delete $self->{texture}; 2473 delete $self->{texture};
1915 2474
1916 $ROOT->on_refresh ($self, sub { 2475 $ROOT->on_post_alloc ($self, sub {
2476 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2477
1917 if (delete $self->{need_reflow}) { 2478 if (delete $self->{need_reflow}) {
1918 my $height = 0; 2479 my $height = 0;
1919 2480
1920 $height += $_->[0] = $self->text_height ($_->[2]) 2481 my $layout = $self->{layout};
2482
2483 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2484
1921 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 }
1922 2496
1923 $self->{height} = $height; 2497 $self->{height} = $height;
1924 2498
1925 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2499 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
1926 2500
1927 delete $self->{texture}; 2501 delete $self->{texture};
1928 } 2502 }
1929 2503
1930 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 2504 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
1931 glClearColor 0, 0, 0, 1; 2505 glClearColor 0.5, 0.5, 0.5, 0;
1932 glClear GL_COLOR_BUFFER_BIT; 2506 glClear GL_COLOR_BUFFER_BIT;
1933 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
1934 glEnable GL_BLEND; 2519 glEnable GL_BLEND;
2520 #TODO# not correct in windows where rgba is forced off
1935 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2521 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1936 glEnable GL_TEXTURE_2D;
1937 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1938
1939 my $top = int $self->{children}[1]{range}[0];
1940
1941 my $y0 = $top;
1942 my $y1 = $top + $self->{h};
1943
1944 my $y = 0;
1945
1946 my $layout = $self->{layout};
1947 2522
1948 for my $par (@{$self->{par}}) { 2523 for my $par (@{$self->{par}}) {
1949 my $h = $par->[0]; 2524 my $h = $par->[1];
1950 2525
1951 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]);
1952 $layout->set_text ($par->[2]); 2529 $layout->set_markup ($par->[4]);
1953 2530
1954 glColor @{ $par->[1] }; 2531 my ($w, $h, $data, $format, $internalformat) = $layout->render;
1955 my ($W, $H) = $layout->size; 2532
1956 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;
1957 } 2535 }
1958 2536
1959 $y += $h; 2537 $y += $h;
1960 } 2538 }
1961 2539
1962 glDisable GL_TEXTURE_2D;
1963 glDisable GL_BLEND; 2540 glDisable GL_BLEND;
1964 }; 2541 };
1965 }); 2542 });
1966} 2543}
1967 2544
1968sub _draw { 2545sub _draw {
1969 my ($self) = @_; 2546 my ($self) = @_;
1970 2547
1971 if ($self->{texture}) {
1972 glEnable GL_TEXTURE_2D; 2548 glEnable GL_TEXTURE_2D;
1973 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;
1974 $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});
1975 glDisable GL_TEXTURE_2D; 2552 glDisable GL_TEXTURE_2D;
1976 }
1977 2553
1978 $self->{children}[1]->draw; 2554 $self->{children}[1]->draw;
1979 2555
1980} 2556}
1981 2557
… …
2029 2605
2030sub new { 2606sub new {
2031 my $class = shift; 2607 my $class = shift;
2032 2608
2033 my $self = $class->SUPER::new ( 2609 my $self = $class->SUPER::new (
2034 state => 0, 2610 state => 0,
2035 connect_activate => \&toggle_flopper, 2611 on_activate => \&toggle_flopper,
2036 @_ 2612 @_
2037 ); 2613 );
2038 2614
2039 if ($self->{state}) {
2040 $self->{state} = 0;
2041 $self->toggle_flopper;
2042 }
2043
2044 $self 2615 $self
2045} 2616}
2046 2617
2047sub toggle_flopper { 2618sub toggle_flopper {
2048 my ($self) = @_; 2619 my ($self) = @_;
2049 2620
2050 # TODO: use animation 2621 $self->{other}->toggle_visibility;
2051 if ($self->{state} = !$self->{state}) { 2622}
2052 $CFClient::UI::ROOT->add ($self->{other}); 2623
2053 $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
2054 $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};
2055 } else { 2959 } else {
2056 $CFClient::UI::ROOT->remove ($self->{other}); 2960 $self->{item}{$group} = {
2057 $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 };
2058 } 2970 }
2059 2971
2060 $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;
2061} 2983}
2062 2984
2063############################################################################# 2985#############################################################################
2064 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
2065package CFClient::UI::Root; 3278package CFClient::UI::Root;
2066 3279
2067our @ISA = CFClient::UI::Container::; 3280our @ISA = CFClient::UI::Container::;
2068 3281
2069use CFClient::OpenGL; 3282use CFClient::OpenGL;
2070 3283
2071sub check_size { 3284sub new {
2072 my ($self) = @_; 3285 my $class = shift;
2073 3286
2074 $self->configure (0, 0, $::WITH, $::HEIGHT); 3287 my $self = $class->SUPER::new (
3288 visible => 1,
3289 @_,
3290 );
3291
3292 Scalar::Util::weaken ($self->{root} = $self);
3293
3294 $self
2075} 3295}
2076 3296
2077sub size_request { 3297sub size_request {
2078 ($::WIDTH, $::HEIGHT) 3298 my ($self) = @_;
2079}
2080 3299
2081sub 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 {
2082 my ($self, $x, $y, $w, $h) = @_; 3318 my ($self, $w, $h) = @_;
2083 3319
2084 $self->SUPER::configure ($x, $y, $w, $h); 3320 for my $child ($self->children) {
3321 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2085 3322
2086 $_->configure ($_->{x}, $_->{y}, $_->size_request) 3323 $X = $child->{force_x} if exists $child->{force_x};
2087 for @{$self->{children}}; 3324 $Y = $child->{force_y} if exists $child->{force_y};
2088}
2089 3325
2090sub _topleft { 3326 $X = _to_pixel $X, $W, $self->{w};
3327 $Y = _to_pixel $Y, $H, $self->{h};
3328
3329 $child->configure ($X, $Y, $W, $H);
3330 }
3331}
3332
3333sub coord2local {
2091 my ($self, $x, $y) = @_; 3334 my ($self, $x, $y) = @_;
2092 3335
2093 ($x, $y) 3336 ($x, $y)
2094} 3337}
2095 3338
3339sub coord2global {
3340 my ($self, $x, $y) = @_;
3341
3342 ($x, $y)
3343}
3344
2096sub update { 3345sub update {
2097 my ($self) = @_; 3346 my ($self) = @_;
2098 3347
2099 $self->check_size; 3348 $::WANT_REFRESH++;
2100 ::refresh ();
2101} 3349}
2102 3350
2103sub add { 3351sub add {
2104 my ($self, $child) = @_; 3352 my ($self, @children) = @_;
2105 3353
2106 # integerize window positions 3354 $_->{is_toplevel} = 1
2107 $child->{x} = int $child->{x}; 3355 for @children;
2108 $child->{y} = int $child->{y};
2109 3356
2110 $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 }
2111} 3373}
2112 3374
2113sub on_refresh { 3375sub on_refresh {
2114 my ($self, $id, $cb) = @_; 3376 my ($self, $id, $cb) = @_;
2115 3377
2116 $self->{refresh_hook}{$id} = $cb; 3378 $self->{refresh_hook}{$id} = $cb;
2117} 3379}
2118 3380
3381sub on_post_alloc {
3382 my ($self, $id, $cb) = @_;
3383
3384 $self->{post_alloc_hook}{$id} = $cb;
3385}
3386
2119sub draw { 3387sub draw {
2120 my ($self) = @_; 3388 my ($self) = @_;
2121 3389
2122 while (my $rcb = delete $self->{refresh_hook}) { 3390 while ($self->{refresh_hook}) {
2123 $_->() for values %$rcb; 3391 $_->()
3392 for values %{delete $self->{refresh_hook}};
2124 } 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
2125 3483
2126 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3484 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2127 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3485 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2128 glClear GL_COLOR_BUFFER_BIT; 3486 glClear GL_COLOR_BUFFER_BIT;
2129 3487
2130 glMatrixMode GL_PROJECTION; 3488 glMatrixMode GL_PROJECTION;
2131 glLoadIdentity; 3489 glLoadIdentity;
2132 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000; 3490 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2133 glMatrixMode GL_MODELVIEW; 3491 glMatrixMode GL_MODELVIEW;
2134 glLoadIdentity; 3492 glLoadIdentity;
2135 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
2136 $self->_draw; 3501 $self->_draw;
2137} 3502}
2138 3503
2139############################################################################# 3504#############################################################################
2140 3505
2141package CFClient::UI; 3506package CFClient::UI;
2142 3507
2143$ROOT = new CFClient::UI::Root; 3508$ROOT = new CFClient::UI::Root;
3509$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2144 3510
21451 35111
2146 3512

Diff Legend

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