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

Diff Legend

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