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.305 by root, Sun Jun 18 17:13:12 2006 UTC

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

Diff Legend

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