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

Diff Legend

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