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.216 by root, Fri May 19 16:43:57 2006 UTC vs.
Revision 1.312 by root, Fri Jun 23 23:54:30 2006 UTC

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

Diff Legend

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