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.197 by root, Fri May 12 01:47:04 2006 UTC vs.
Revision 1.329 by root, Sun Jul 23 02:44:06 2006 UTC

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

Diff Legend

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