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

Diff Legend

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