ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/DC/UI.pm
(Generate patch)

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

Diff Legend

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