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

Diff Legend

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