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

Diff Legend

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