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.251 by root, Sun May 28 22:24:24 2006 UTC vs.
Revision 1.381 by root, Thu Jul 19 13:45:18 2007 UTC

1package CFClient::UI; 1package CFPlus::UI;
2 2
3use utf8; 3use utf8;
4use strict; 4use strict;
5 5
6use Scalar::Util ();
7use List::Util (); 6use List::Util ();
7use Event;
8 8
9use CFClient; 9use CFPlus;
10use CFPlus::Pod;
10use CFClient::Texture; 11use CFPlus::Texture;
11 12
12our ($FOCUS, $HOVER, $GRAB); # various widgets 13our ($FOCUS, $HOVER, $GRAB); # various widgets
13 14
14our $LAYOUT; 15our $LAYOUT;
15our $ROOT; 16our $ROOT;
16our $TOOLTIP; 17our $TOOLTIP;
17our $BUTTON_STATE; 18our $BUTTON_STATE;
18 19
19our %WIDGET; # all widgets, weak-referenced 20our %WIDGET; # all widgets, weak-referenced
20 21
21sub get_layout { 22our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub {
22 for (grep { $_->{name} } values %WIDGET) {
23 $LAYOUT->{$_->{name}} = {
24 x => $_->{x} / $::WIDTH,
25 y => $_->{y} / $::HEIGHT,
26 w => $_->{w} / $::WIDTH,
27 h => $_->{h} / $::HEIGHT
28 };
29 }
30
31 return $LAYOUT;
32}
33
34sub set_layout {
35 my ($layout) = @_;
36 $LAYOUT = $layout;
37}
38
39sub check_tooltip {
40 if (!$GRAB) { 23 if (!$GRAB) {
41 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 24 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
42 if (length $widget->{tooltip}) { 25 if (length $widget->{tooltip}) {
43
44 if ($TOOLTIP->{owner} != $widget) { 26 if ($TOOLTIP->{owner} != $widget) {
27 $TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
28 $TOOLTIP->hide;
29
45 $TOOLTIP->{owner} = $widget; 30 $TOOLTIP->{owner} = $widget;
31 $TOOLTIP->{owner}->emit ("tooltip_show") if $TOOLTIP->{owner};
32
33 return if $ENV{CFPLUS_DEBUG} & 8;
46 34
47 my $tip = $widget->{tooltip}; 35 my $tip = $widget->{tooltip};
48 36
49 $tip = $tip->($widget) if CODE:: eq ref $tip; 37 $tip = $tip->($widget) if CODE:: eq ref $tip;
50 38
51 $TOOLTIP->set_tooltip_from ($widget); 39 $TOOLTIP->set_tooltip_from ($widget);
52 $TOOLTIP->show; 40 $TOOLTIP->show;
53
54 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
55
56 ($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0)
57 if $x + $TOOLTIP->{w} > $::WIDTH;
58
59 $TOOLTIP->move ($x, $y);
60 $TOOLTIP->realloc;
61 } 41 }
62 42
63 return; 43 return;
64 } 44 }
65 } 45 }
66 } 46 }
67 47
68 $TOOLTIP->hide; 48 $TOOLTIP->hide;
49 $TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
69 delete $TOOLTIP->{owner}; 50 delete $TOOLTIP->{owner};
51});
52
53sub get_layout {
54 my $layout;
55
56 for (grep { $_->{name} } values %WIDGET) {
57 my $win = $layout->{$_->{name}} = { };
58
59 $win->{x} = ($_->{x} + $_->{w} * 0.5) / $::WIDTH if $_->{x} =~ /^[0-9.]+$/;
60 $win->{y} = ($_->{y} + $_->{h} * 0.5) / $::HEIGHT if $_->{y} =~ /^[0-9.]+$/;
61 $win->{w} = $_->{w} / $::WIDTH if defined $_->{w};
62 $win->{h} = $_->{h} / $::HEIGHT if defined $_->{h};
63
64 $win->{show} = $_->{visible} && $_->{is_toplevel};
65 }
66
67 $layout
68}
69
70sub set_layout {
71 my ($layout) = @_;
72
73 $LAYOUT = $layout;
70} 74}
71 75
72# class methods for events 76# class methods for events
73sub feed_sdl_key_down_event { 77sub feed_sdl_key_down_event {
74 $FOCUS->emit (key_down => $_[0]) 78 $FOCUS->emit (key_down => $_[0])
… …
78sub feed_sdl_key_up_event { 82sub feed_sdl_key_up_event {
79 $FOCUS->emit (key_up => $_[0]) 83 $FOCUS->emit (key_up => $_[0])
80 if $FOCUS; 84 if $FOCUS;
81} 85}
82 86
87sub check_hover {
88 my ($widget) = @_;
89
90 if ($widget != $HOVER) {
91 my $hover = $HOVER; $HOVER = $widget;
92
93 $hover->update if $hover && $hover->{can_hover};
94 $HOVER->update if $HOVER && $HOVER->{can_hover};
95
96 $TOOLTIP_WATCHER->start;
97 }
98}
99
83sub feed_sdl_button_down_event { 100sub feed_sdl_button_down_event {
84 my ($ev) = @_; 101 my ($ev) = @_;
85 my ($x, $y) = ($ev->{x}, $ev->{y}); 102 my ($x, $y) = ($ev->{x}, $ev->{y});
86 103
87 if (!$BUTTON_STATE) { 104 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
105
106 unless ($GRAB) {
88 my $widget = $ROOT->find_widget ($x, $y); 107 my $widget = $ROOT->find_widget ($x, $y);
89 108
90 $GRAB = $widget; 109 $GRAB = $widget;
91 $GRAB->update if $GRAB; 110 $GRAB->update if $GRAB;
92 111
93 check_tooltip; 112 $TOOLTIP_WATCHER->cb->();
94 } 113 }
95 114
96 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 115 if ($GRAB) {
97 116 if ($ev->{button} == 4 || $ev->{button} == 5) {
98 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y)) 117 # mousewheel
99 if $GRAB; 118 $ev->{dx} = 0;
119 $ev->{dy} = $ev->{button} * 2 - 9;
120 $GRAB->emit (mouse_wheel => $ev);
121 } else {
122 $GRAB->emit (button_down => $ev)
123 }
124 }
100} 125}
101 126
102sub feed_sdl_button_up_event { 127sub feed_sdl_button_up_event {
103 my ($ev) = @_; 128 my ($ev) = @_;
104 my ($x, $y) = ($ev->{x}, $ev->{y});
105 129
106 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 130 my $widget = $GRAB || $ROOT->find_widget ($ev->{x}, $ev->{y});
107 131
108 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); 132 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
109 133
110 $GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y)) 134 $GRAB->emit (button_up => $ev)
111 if $GRAB; 135 if $GRAB && $ev->{button} != 4 && $ev->{button} != 5;
112 136
113 if (!$BUTTON_STATE) { 137 unless ($BUTTON_STATE) {
114 my $grab = $GRAB; undef $GRAB; 138 my $grab = $GRAB; undef $GRAB;
115 $grab->update if $grab; 139 $grab->update if $grab;
116 $GRAB->update if $GRAB; 140 $GRAB->update if $GRAB;
117 141
118 check_tooltip; 142 check_hover $widget;
143 $TOOLTIP_WATCHER->cb->();
119 } 144 }
120} 145}
121 146
122sub feed_sdl_motion_event { 147sub feed_sdl_motion_event {
123 my ($ev) = @_; 148 my ($ev) = @_;
124 my ($x, $y) = ($ev->{x}, $ev->{y}); 149 my ($x, $y) = ($ev->{x}, $ev->{y});
125 150
126 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 151 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
127 152
128 if ($widget != $HOVER) { 153 check_hover $widget;
129 my $hover = $HOVER; $HOVER = $widget;
130 154
131 $hover->update if $hover && $hover->{can_hover}; 155 $HOVER->emit (mouse_motion => $ev)
132 $HOVER->update if $HOVER && $HOVER->{can_hover};
133
134 check_tooltip;
135 }
136
137 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
138 if $HOVER; 156 if $HOVER;
139} 157}
140 158
141# convert position array to integers 159# convert position array to integers
142sub harmonize { 160sub harmonize {
… …
171sub rescale_widgets { 189sub rescale_widgets {
172 my ($sx, $sy) = @_; 190 my ($sx, $sy) = @_;
173 191
174 for my $widget (values %WIDGET) { 192 for my $widget (values %WIDGET) {
175 if ($widget->{is_toplevel}) { 193 if ($widget->{is_toplevel}) {
194 $widget->{x} += int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
195 $widget->{y} += int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
196
176 $widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x}; 197 $widget->{x} = int 0.5 + $widget->{x} * $sx if $widget->{x} =~ /^[0-9.]+$/;
177 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w}; 198 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
178 $widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w}; 199 $widget->{force_w} = int 0.5 + $widget->{force_w} * $sx if exists $widget->{force_w};
179 $widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y}; 200 $widget->{y} = int 0.5 + $widget->{y} * $sy if $widget->{y} =~ /^[0-9.]+$/;
180 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h}; 201 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
181 $widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h}; 202 $widget->{force_h} = int 0.5 + $widget->{force_h} * $sy if exists $widget->{force_h};
203
204 $widget->{x} -= int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
205 $widget->{y} -= int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
206
182 } 207 }
183 } 208 }
184 209
185 reconfigure_widgets; 210 reconfigure_widgets;
186} 211}
187 212
188############################################################################# 213#############################################################################
189 214
215package CFPlus::UI::Event;
216
217sub xy {
218 $_[1]->coord2local ($_[0]{x}, $_[0]{y})
219}
220
221#############################################################################
222
190package CFClient::UI::Base; 223package CFPlus::UI::Base;
191 224
192use strict; 225use strict;
193 226
194use CFClient::OpenGL; 227use CFPlus::OpenGL;
195 228
196sub new { 229sub new {
197 my $class = shift; 230 my $class = shift;
198 231
199 my $self = bless { 232 my $self = bless {
200 x => 0, 233 x => "center",
201 y => 0, 234 y => "center",
202 z => 0, 235 z => 0,
236 w => undef,
237 h => undef,
203 can_events => 1, 238 can_events => 1,
204 @_ 239 @_
205 }, $class; 240 }, $class;
241
242 CFPlus::weaken ($CFPlus::UI::WIDGET{$self+0} = $self);
206 243
207 for (keys %$self) { 244 for (keys %$self) {
208 if (/^on_(.*)$/) { 245 if (/^on_(.*)$/) {
209 $self->connect ($1 => delete $self->{$_}); 246 $self->connect ($1 => delete $self->{$_});
210 } 247 }
211 } 248 }
212 249
213 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
214
215 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) { 250 if (my $layout = $CFPlus::UI::LAYOUT->{$self->{name}}) {
216 $self->{req_x} = $layout->{x} * $::WIDTH; 251 $self->{x} = $layout->{x} * $CFPlus::UI::ROOT->{alloc_w} if exists $layout->{x};
217 $self->{req_y} = $layout->{y} * $::HEIGHT; 252 $self->{y} = $layout->{y} * $CFPlus::UI::ROOT->{alloc_h} if exists $layout->{y};
218 $self->{def_w} = ($layout->{w} != 0 ? $layout->{w} : 1) * $::WIDTH; 253 $self->{force_w} = $layout->{w} * $CFPlus::UI::ROOT->{alloc_w} if exists $layout->{w};
219 $self->{def_h} = ($layout->{h} != 0 ? $layout->{h} : 1) * $::HEIGHT; 254 $self->{force_h} = $layout->{h} * $CFPlus::UI::ROOT->{alloc_h} if exists $layout->{h};
255
256 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
257 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
258
259 $self->show if $layout->{show};
220 } 260 }
221 261
222 $self 262 $self
223} 263}
224 264
225sub destroy { 265sub destroy {
226 my ($self) = @_; 266 my ($self) = @_;
227 267
228 $self->hide; 268 $self->hide;
269 $self->emit ("destroy");
229 %$self = (); 270 %$self = ();
230} 271}
231 272
273sub TO_JSON {
274 { __widget_ref__ => $_[0]{s_id} }
275}
276
232sub show { 277sub show {
233 my ($self) = @_; 278 my ($self) = @_;
234 279
235 return if $self->{parent}; 280 return if $self->{parent};
236 281
237 $CFClient::UI::ROOT->add ($self); 282 $CFPlus::UI::ROOT->add ($self);
238}
239
240sub center {
241 my ($self) = @_;
242
243 $CFClient::UI::ROOT->on_post_alloc (
244 "center_$self" => sub {
245 $self->move (($self->{parent}{w} - $self->{w}) * 0.5, ($self->{parent}{h} - $self->{h}) * 0.5);
246 },
247 );
248
249 $self->update;
250} 283}
251 284
252sub set_visible { 285sub set_visible {
253 my ($self) = @_; 286 my ($self) = @_;
254 287
… …
257 $self->{root} = $self->{parent}{root}; 290 $self->{root} = $self->{parent}{root};
258 $self->{visible} = $self->{parent}{visible} + 1; 291 $self->{visible} = $self->{parent}{visible} + 1;
259 292
260 $self->emit (visibility_change => 1); 293 $self->emit (visibility_change => 1);
261 294
262 $self->realloc unless exists $self->{req_w}; 295 $self->realloc if !exists $self->{req_w};
263 296
264 $_->set_visible for $self->children; 297 $_->set_visible for $self->children;
265} 298}
266 299
267sub set_invisible { 300sub set_invisible {
… …
269 302
270 return unless $self->{visible}; 303 return unless $self->{visible};
271 304
272 $_->set_invisible for $self->children; 305 $_->set_invisible for $self->children;
273 306
307 delete $self->{visible};
274 delete $self->{root}; 308 delete $self->{root};
275 delete $self->{visible};
276 309
277 undef $GRAB if $GRAB == $self; 310 undef $GRAB if $GRAB == $self;
278 undef $HOVER if $HOVER == $self; 311 undef $HOVER if $HOVER == $self;
279 312
280 CFClient::UI::check_tooltip 313 $CFPlus::UI::TOOLTIP_WATCHER->cb->()
281 if $TOOLTIP->{owner} == $self; 314 if $TOOLTIP->{owner} == $self;
282 315
283 $self->focus_out; 316 $self->emit ("focus_out");
284
285 $self->emit (visibility_change => 0); 317 $self->emit (visibility_change => 0);
286} 318}
287 319
288sub set_visibility { 320sub set_visibility {
289 my ($self, $visible) = @_; 321 my ($self, $visible) = @_;
290 322
291 return if $self->{visible} == $visible; 323 return if $self->{visible} == $visible;
292 324
293 $visible ? $self->hide 325 $visible ? $self->show
294 : $self->show; 326 : $self->hide;
295} 327}
296 328
297sub toggle_visibility { 329sub toggle_visibility {
298 my ($self) = @_; 330 my ($self) = @_;
299 331
… …
309 341
310 $self->{parent}->remove ($self) 342 $self->{parent}->remove ($self)
311 if $self->{parent}; 343 if $self->{parent};
312} 344}
313 345
314sub move { 346sub move_abs {
315 my ($self, $x, $y, $z) = @_; 347 my ($self, $x, $y, $z) = @_;
316 348
317 $self->{x} = int $x; 349 $self->{x} = List::Util::max 0, List::Util::min $self->{root}{w} - $self->{w}, int $x;
318 $self->{y} = int $y; 350 $self->{y} = List::Util::max 0, List::Util::min $self->{root}{h} - $self->{h}, int $y;
319 $self->{z} = $z if defined $z; 351 $self->{z} = $z if defined $z;
320 352
321 $self->update; 353 $self->update;
322} 354}
323 355
324sub set_size { 356sub set_size {
325 my ($self, $w, $h) = @_; 357 my ($self, $w, $h) = @_;
326 358
327 $self->{def_w} = $w; 359 $self->{force_w} = $w;
328 $self->{def_h} = $h; 360 $self->{force_h} = $h;
329 361
330 $self->realloc; 362 $self->realloc;
331} 363}
332 364
333sub size_request { 365sub size_request {
334 require Carp; 366 require Carp;
335 Carp::confess "size_request is abstract"; 367 Carp::confess "size_request is abstract";
336} 368}
337 369
370sub baseline_shift {
371 0
372}
373
338sub configure { 374sub configure {
339 my ($self, $x, $y, $w, $h) = @_; 375 my ($self, $x, $y, $w, $h) = @_;
340 376
341 if ($self->{aspect}) { 377 if ($self->{aspect}) {
378 my ($ow, $oh) = ($w, $h);
379
342 my $w2 = List::Util::min $w, int $h * $self->{aspect}; 380 $w = List::Util::min $w, CFPlus::ceil $h * $self->{aspect};
343 my $h2 = List::Util::min $h, int $w / $self->{aspect}; 381 $h = List::Util::min $h, CFPlus::ceil $w / $self->{aspect};
344 382
345 # use alignment to adjust x, y 383 # use alignment to adjust x, y
346 384
347 $x += int +($w - $w2) * 0.5; 385 $x += int 0.5 * ($ow - $w);
348 $y += int +($h - $h2) * 0.5; 386 $y += int 0.5 * ($oh - $h);
349
350 ($w, $h) = ($w2, $h2);
351 } 387 }
352 388
353 if ($self->{x} != $x || $self->{y} != $y) { 389 if ($self->{x} ne $x || $self->{y} ne $y) {
354 $self->{x} = $x; 390 $self->{x} = $x;
355 $self->{y} = $y; 391 $self->{y} = $y;
356 $self->update; 392 $self->update;
357 } 393 }
358 394
359 if ($self->{w} != $w || $self->{h} != $h) { 395 if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
360 return unless $self->{visible}; 396 return unless $self->{visible};
361 397
398 $self->{alloc_w} = $w;
399 $self->{alloc_h} = $h;
400
362 $self->{root}->{size_alloc}{$self+0} = [$self, $w, $h]; 401 $self->{root}{size_alloc}{$self+0} = $self;
363 } 402 }
364}
365
366sub size_allocate {
367 # nothing to be done
368} 403}
369 404
370sub children { 405sub children {
406 # nop
407}
408
409sub visible_children {
410 $_[0]->children
371} 411}
372 412
373sub set_max_size { 413sub set_max_size {
374 my ($self, $w, $h) = @_; 414 my ($self, $w, $h) = @_;
375 415
376 delete $self->{max_w}; $self->{max_w} = $w if $w; 416 $self->{max_w} = int $w if defined $w;
377 delete $self->{max_h}; $self->{max_h} = $h if $h; 417 $self->{max_h} = int $h if defined $h;
418
419 $self->realloc;
378} 420}
379 421
380sub set_tooltip { 422sub set_tooltip {
381 my ($self, $tooltip) = @_; 423 my ($self, $tooltip) = @_;
382 424
… …
385 427
386 return if $self->{tooltip} eq $tooltip; 428 return if $self->{tooltip} eq $tooltip;
387 429
388 $self->{tooltip} = $tooltip; 430 $self->{tooltip} = $tooltip;
389 431
390 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 432 if ($CFPlus::UI::TOOLTIP->{owner} == $self) {
391 delete $CFClient::UI::TOOLTIP->{owner}; 433 delete $CFPlus::UI::TOOLTIP->{owner};
392 CFClient::UI::check_tooltip; 434 $CFPlus::UI::TOOLTIP_WATCHER->cb->();
393 } 435 }
394} 436}
395 437
396# translate global coordinates to local coordinate system 438# translate global coordinates to local coordinate system
397sub coord2local { 439sub coord2local {
398 my ($self, $x, $y) = @_; 440 my ($self, $x, $y) = @_;
399 441
442 Carp::confess unless $self->{parent};#d#
443
400 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y}) 444 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
401} 445}
402 446
403# translate local coordinates to global coordinate system 447# translate local coordinates to global coordinate system
404sub coord2global { 448sub coord2global {
405 my ($self, $x, $y) = @_; 449 my ($self, $x, $y) = @_;
406 450
451 Carp::confess unless $self->{parent};#d#
452
407 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y}) 453 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
408} 454}
409 455
410sub focus_in { 456sub invoke_focus_in {
411 my ($self) = @_; 457 my ($self) = @_;
412 458
413 return if $FOCUS == $self; 459 return if $FOCUS == $self;
414 return unless $self->{can_focus}; 460 return unless $self->{can_focus};
415 461
416 my $focus = $FOCUS; $FOCUS = $self; 462 $FOCUS = $self;
417 463
418 $self->_emit (focus_in => $focus); 464 $self->update;
419 465
420 $focus->update if $focus; 466 0
421 $FOCUS->update;
422} 467}
423 468
424sub focus_out { 469sub invoke_focus_out {
425 my ($self) = @_; 470 my ($self) = @_;
426 471
427 return unless $FOCUS == $self; 472 return unless $FOCUS == $self;
428 473
429 my $focus = $FOCUS; undef $FOCUS; 474 undef $FOCUS;
430 475
431 $self->_emit (focus_out => $focus); 476 $self->update;
432 477
433 $focus->update if $focus; #?
434
435 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus 478 $::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus
436 unless $FOCUS; 479 unless $FOCUS;
437}
438 480
481 0
482}
483
484sub grab_focus {
485 my ($self) = @_;
486
487 $FOCUS->emit ("focus_out") if $FOCUS;
488 $self->emit ("focus_in");
489}
490
439sub mouse_motion { } 491sub invoke_mouse_motion { 0 }
440sub button_up { } 492sub invoke_button_up { 0 }
441sub key_down { } 493sub invoke_key_down { 0 }
442sub key_up { } 494sub invoke_key_up { 0 }
495sub invoke_mouse_wheel { 0 }
443 496
444sub button_down { 497sub invoke_button_down {
445 my ($self, $ev, $x, $y) = @_; 498 my ($self, $ev, $x, $y) = @_;
446 499
447 $self->focus_in; 500 $self->grab_focus;
448}
449 501
450sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 502 0
451sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 503}
452sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 504
453sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 505sub connect {
454sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} } 506 my ($self, $signal, $cb) = @_;
507
508 push @{ $self->{signal_cb}{$signal} }, $cb;
509
510 defined wantarray and CFPlus::guard {
511 @{ $self->{signal_cb}{$signal} } = grep $_ != $cb,
512 @{ $self->{signal_cb}{$signal} };
513 }
514}
515
516sub disconnect_all {
517 my ($self, $signal) = @_;
518
519 delete $self->{signal_cb}{$signal};
520}
521
522my %has_coords = (
523 button_down => 1,
524 button_up => 1,
525 mouse_motion => 1,
526 mouse_wheel => 1,
527);
528
529sub emit {
530 my ($self, $signal, @args) = @_;
531
532 # I do not really like this solution, but I do not like duplication
533 # and needlessly verbose code, either.
534 my @append
535 = $has_coords{$signal}
536 ? $args[0]->xy ($self)
537 : ();
538
539 #warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d#
540
541 for my $cb (
542 @{$self->{signal_cb}{$signal} || []}, # before
543 ($self->can ("invoke_$signal") || sub { 1 }), # closure
544 ) {
545 return $cb->($self, @args, @append) || next;
546 }
547
548 # parent
549 $self->{parent} && $self->{parent}->emit ($signal, @args)
550}
455 551
456sub find_widget { 552sub find_widget {
457 my ($self, $x, $y) = @_; 553 my ($self, $x, $y) = @_;
458 554
459 return () unless $self->{can_events}; 555 return () unless $self->{can_events};
… …
466} 562}
467 563
468sub set_parent { 564sub set_parent {
469 my ($self, $parent) = @_; 565 my ($self, $parent) = @_;
470 566
471 Scalar::Util::weaken ($self->{parent} = $parent); 567 CFPlus::weaken ($self->{parent} = $parent);
472
473 $self->set_visible if $parent->{visible}; 568 $self->set_visible if $parent->{visible};
474
475 $self->realloc;
476}
477
478sub connect {
479 my ($self, $signal, $cb) = @_;
480
481 push @{ $self->{signal_cb}{$signal} }, $cb;
482}
483
484sub _emit {
485 my ($self, $signal, @args) = @_;
486
487 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
488}
489
490sub emit {
491 my ($self, $signal, @args) = @_;
492
493 $self->_emit ($signal, @args)
494 || $self->$signal (@args);
495}
496
497sub visibility_change {
498 #my ($self, $visible) = @_;
499} 569}
500 570
501sub realloc { 571sub realloc {
502 my ($self) = @_; 572 my ($self) = @_;
503 573
504 return unless $self->{visible}; 574 if ($self->{visible}) {
505
506 return if $self->{root}{realloc}{$self}; 575 return if $self->{root}{realloc}{$self+0};
507 576
508 $self->{root}{realloc}{$self} = $self; 577 $self->{root}{realloc}{$self+0} = $self;
509 $self->{root}->update; 578 $self->{root}->update;
579 } else {
580 delete $self->{req_w};
581 delete $self->{req_h};
582 }
510} 583}
511 584
512sub update { 585sub update {
513 my ($self) = @_; 586 my ($self) = @_;
514 587
515 $self->{parent}->update 588 $self->{parent}->update
516 if $self->{parent}; 589 if $self->{parent};
517} 590}
518 591
592sub reconfigure {
593 my ($self) = @_;
594
595 $self->realloc;
596 $self->update;
597}
598
599# using global variables seems a bit hacky, but passing through all drawing
600# functions seems pointless.
601our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn
602
519sub draw { 603sub draw {
520 my ($self) = @_; 604 my ($self) = @_;
521 605
522 return unless $self->{h} && $self->{w}; 606 return unless $self->{h} && $self->{w};
607
608 # update screen rectangle
609 local $draw_x = $draw_x + $self->{x};
610 local $draw_y = $draw_y + $self->{y};
611
612 # skip widgets that are entirely outside the drawing area
613 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
614 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
523 615
524 glPushMatrix; 616 glPushMatrix;
525 glTranslate $self->{x}, $self->{y}, 0; 617 glTranslate $self->{x}, $self->{y}, 0;
526 $self->_draw;
527 glPopMatrix;
528 618
529 if ($self == $HOVER && $self->{can_hover}) { 619 if ($self == $HOVER && $self->{can_hover}) {
530 my ($x, $y) = @$self{qw(x y)};
531
532 glColor 1, 0.8, 0.5, 0.2; 620 glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
533 glEnable GL_BLEND; 621 glEnable GL_BLEND;
534 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 622 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
535 glBegin GL_QUADS; 623 glBegin GL_QUADS;
536 glVertex $x , $y; 624 glVertex 0 , 0;
537 glVertex $x + $self->{w}, $y; 625 glVertex $self->{w}, 0;
538 glVertex $x + $self->{w}, $y + $self->{h}; 626 glVertex $self->{w}, $self->{h};
539 glVertex $x , $y + $self->{h}; 627 glVertex 0 , $self->{h};
540 glEnd; 628 glEnd;
541 glDisable GL_BLEND; 629 glDisable GL_BLEND;
542 } 630 }
543 631
544 if ($ENV{PCLIENT_DEBUG}) { 632 if ($ENV{CFPLUS_DEBUG} & 1) {
545 glPushMatrix; 633 glPushMatrix;
546 glColor 1, 1, 0, 1; 634 glColor 1, 1, 0, 1;
547 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 635 glTranslate 0.375, 0.375;
548 glBegin GL_LINE_LOOP; 636 glBegin GL_LINE_LOOP;
549 glVertex 0 , 0; 637 glVertex 0 , 0;
550 glVertex $self->{w} - 1, 0; 638 glVertex $self->{w} - 1, 0;
551 glVertex $self->{w} - 1, $self->{h} - 1; 639 glVertex $self->{w} - 1, $self->{h} - 1;
552 glVertex 0 , $self->{h} - 1; 640 glVertex 0 , $self->{h} - 1;
553 glEnd; 641 glEnd;
554 glPopMatrix; 642 glPopMatrix;
555 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 643 #CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
556 } 644 }
645
646 $self->_draw;
647 glPopMatrix;
557} 648}
558 649
559sub _draw { 650sub _draw {
560 my ($self) = @_; 651 my ($self) = @_;
561 652
562 warn "no draw defined for $self\n"; 653 warn "no draw defined for $self\n";
563} 654}
564 655
656my $cntx;#d#
565sub DESTROY { 657sub DESTROY {
566 my ($self) = @_; 658 my ($self) = @_;
567 659
660 return if CFPlus::in_destruct;
661
662 eval { $self->destroy };
663 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
664
568 delete $WIDGET{$self+0}; 665 delete $WIDGET{$self+0};
569 #$self->deactivate;
570} 666}
571 667
572############################################################################# 668#############################################################################
573 669
574package CFClient::UI::DrawBG; 670package CFPlus::UI::DrawBG;
575 671
576our @ISA = CFClient::UI::Base::; 672our @ISA = CFPlus::UI::Base::;
577 673
578use strict; 674use strict;
579use CFClient::OpenGL; 675use CFPlus::OpenGL;
580 676
581sub new { 677sub new {
582 my $class = shift; 678 my $class = shift;
583 679
584 # range [value, low, high, page] 680 # range [value, low, high, page]
… …
599 695
600 if ($color && (@$color < 4 || $color->[3])) { 696 if ($color && (@$color < 4 || $color->[3])) {
601 my ($w, $h) = @$self{qw(w h)}; 697 my ($w, $h) = @$self{qw(w h)};
602 698
603 glEnable GL_BLEND; 699 glEnable GL_BLEND;
604 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 700 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
605 glColor @$color; 701 glColor_premultiply @$color;
606 702
607 glBegin GL_QUADS; 703 glBegin GL_QUADS;
608 glVertex 0 , 0; 704 glVertex 0 , 0;
609 glVertex 0 , $h; 705 glVertex 0 , $h;
610 glVertex $w, $h; 706 glVertex $w, $h;
… …
615 } 711 }
616} 712}
617 713
618############################################################################# 714#############################################################################
619 715
620package CFClient::UI::Empty; 716package CFPlus::UI::Empty;
621 717
622our @ISA = CFClient::UI::Base::; 718our @ISA = CFPlus::UI::Base::;
623 719
624sub new { 720sub new {
625 my ($class, %arg) = @_; 721 my ($class, %arg) = @_;
626 $class->SUPER::new (can_events => 0, %arg); 722 $class->SUPER::new (can_events => 0, %arg);
627} 723}
628 724
629sub size_request { 725sub size_request {
630 (0, 0) 726 my ($self) = @_;
727
728 ($self->{w} + 0, $self->{h} + 0)
631} 729}
632 730
633sub draw { } 731sub draw { }
634 732
635############################################################################# 733#############################################################################
636 734
637package CFClient::UI::Container; 735package CFPlus::UI::Container;
638 736
639our @ISA = CFClient::UI::Base::; 737our @ISA = CFPlus::UI::Base::;
640 738
641sub new { 739sub new {
642 my ($class, %arg) = @_; 740 my ($class, %arg) = @_;
643 741
644 my $children = delete $arg{children} || []; 742 my $children = delete $arg{children};
645 743
646 my $self = $class->SUPER::new ( 744 my $self = $class->SUPER::new (
647 children => [], 745 children => [],
648 can_events => 0, 746 can_events => 0,
649 %arg, 747 %arg,
650 ); 748 );
749
651 $self->add ($_) for @$children; 750 $self->add (@$children)
751 if $children;
652 752
653 $self 753 $self
754}
755
756sub realloc {
757 my ($self) = @_;
758
759 $self->{force_realloc} = 1;
760 $self->{force_size_alloc} = 1;
761 $self->SUPER::realloc;
654} 762}
655 763
656sub add { 764sub add {
657 my ($self, @widgets) = @_; 765 my ($self, @widgets) = @_;
658 766
… …
704 $x -= $self->{x}; 812 $x -= $self->{x};
705 $y -= $self->{y}; 813 $y -= $self->{y};
706 814
707 my $res; 815 my $res;
708 816
709 for (reverse @{ $self->{children} }) { 817 for (reverse $self->visible_children) {
710 $res = $_->find_widget ($x, $y) 818 $res = $_->find_widget ($x, $y)
711 and return $res; 819 and return $res;
712 } 820 }
713 821
714 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y}) 822 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
… …
720 $_->draw for @{$self->{children}}; 828 $_->draw for @{$self->{children}};
721} 829}
722 830
723############################################################################# 831#############################################################################
724 832
725package CFClient::UI::Bin; 833package CFPlus::UI::Bin;
726 834
727our @ISA = CFClient::UI::Container::; 835our @ISA = CFPlus::UI::Container::;
728 836
729sub new { 837sub new {
730 my ($class, %arg) = @_; 838 my ($class, %arg) = @_;
731 839
732 my $child = (delete $arg{child}) || new CFClient::UI::Empty::; 840 my $child = (delete $arg{child}) || new CFPlus::UI::Empty::;
733 841
734 $class->SUPER::new (children => [$child], %arg) 842 $class->SUPER::new (children => [$child], %arg)
735} 843}
736 844
737sub add { 845sub add {
738 my ($self, $child) = @_; 846 my ($self, $child) = @_;
739 847
740 $self->{children} = []; 848 $self->SUPER::remove ($_) for @{ $self->{children} };
741
742 $self->SUPER::add ($child); 849 $self->SUPER::add ($child);
743} 850}
744 851
745sub remove { 852sub remove {
746 my ($self, $widget) = @_; 853 my ($self, $widget) = @_;
747 854
748 $self->SUPER::remove ($widget); 855 $self->SUPER::remove ($widget);
749 856
750 $self->{children} = [new CFClient::UI::Empty] 857 $self->{children} = [new CFPlus::UI::Empty]
751 unless @{$self->{children}}; 858 unless @{$self->{children}};
752} 859}
753 860
754sub child { $_[0]->{children}[0] } 861sub child { $_[0]->{children}[0] }
755 862
756sub size_request { 863sub size_request {
757 $_[0]{children}[0]->size_request 864 $_[0]{children}[0]->size_request
758} 865}
759 866
760sub size_allocate { 867sub invoke_size_allocate {
761 my ($self, $w, $h, $changed) = @_; 868 my ($self, $w, $h) = @_;
762 869
763 $self->{children}[0]->configure (0, 0, $w, $h); 870 $self->{children}[0]->configure (0, 0, $w, $h);
871
872 1
764} 873}
765 874
766############################################################################# 875#############################################################################
767 876
877# back-buffered drawing area
878
768package CFClient::UI::Window; 879package CFPlus::UI::Window;
769 880
770our @ISA = CFClient::UI::Bin::; 881our @ISA = CFPlus::UI::Bin::;
771 882
772use CFClient::OpenGL; 883use CFPlus::OpenGL;
773 884
774sub new { 885sub new {
775 my ($class, %arg) = @_; 886 my ($class, %arg) = @_;
776 887
777 my $self = $class->SUPER::new (%arg); 888 my $self = $class->SUPER::new (%arg);
… …
782 893
783 $ROOT->on_post_alloc ($self => sub { $self->render_child }); 894 $ROOT->on_post_alloc ($self => sub { $self->render_child });
784 $self->SUPER::update; 895 $self->SUPER::update;
785} 896}
786 897
787sub size_allocate { 898sub invoke_size_allocate {
788 my ($self, $w, $h, $changed) = @_; 899 my ($self, $w, $h) = @_;
789 900
790 $self->SUPER::size_allocate ($w, $h, $changed);
791 $self->update 901 $self->update;
792 if $changed; 902
903 $self->SUPER::invoke_size_allocate ($w, $h)
793} 904}
794 905
795sub _render { 906sub _render {
907 my ($self) = @_;
908
796 $_[0]{children}[0]->draw; 909 $self->{children}[0]->draw;
797} 910}
798 911
799sub render_child { 912sub render_child {
800 my ($self) = @_; 913 my ($self) = @_;
801 914
802 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 915 $self->{texture} = new_from_opengl CFPlus::Texture $self->{w}, $self->{h}, sub {
803 glClearColor 0, 0, 0, 0; 916 glClearColor 0, 0, 0, 0;
804 glClear GL_COLOR_BUFFER_BIT; 917 glClear GL_COLOR_BUFFER_BIT;
805 918
919 {
920 package CFPlus::UI::Base;
921
922 local ($draw_x, $draw_y, $draw_w, $draw_h) =
923 (0, 0, $self->{w}, $self->{h});
924
806 $self->_render; 925 $self->_render;
926 }
807 }; 927 };
808} 928}
809 929
810sub _draw { 930sub _draw {
811 my ($self) = @_; 931 my ($self) = @_;
812
813 my ($w, $h) = ($self->w, $self->h);
814 932
815 my $tex = $self->{texture} 933 my $tex = $self->{texture}
816 or return; 934 or return;
817 935
818 glEnable GL_TEXTURE_2D; 936 glEnable GL_TEXTURE_2D;
819 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 937 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
820 glColor 1, 1, 1, 1; 938 glColor 0, 0, 0, 1;
821 939
822 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 940 $tex->draw_quad_alpha_premultiplied (0, 0);
823 941
824 glDisable GL_TEXTURE_2D; 942 glDisable GL_TEXTURE_2D;
825} 943}
826 944
827############################################################################# 945#############################################################################
828 946
829package CFClient::UI::ViewPort; 947package CFPlus::UI::ViewPort;
830 948
949use List::Util qw(min max);
950
831our @ISA = CFClient::UI::Window::; 951our @ISA = CFPlus::UI::Window::;
832 952
833sub new { 953sub new {
834 my $class = shift; 954 my $class = shift;
835 955
836 $class->SUPER::new ( 956 $class->SUPER::new (
… …
841} 961}
842 962
843sub size_request { 963sub size_request {
844 my ($self) = @_; 964 my ($self) = @_;
845 965
846 my ($w, $h) = @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 966 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
847 967
848 $w = 10 if $self->{scroll_x}; 968 $w = 10 if $self->{scroll_x};
849 $h = 10 if $self->{scroll_y}; 969 $h = 10 if $self->{scroll_y};
850 970
851 ($w, $h) 971 ($w, $h)
852} 972}
853 973
854sub size_allocate { 974sub invoke_size_allocate {
855 my ($self, $w, $h, $changed) = @_; 975 my ($self, $w, $h) = @_;
856 976
977 my $child = $self->child;
978
857 $w = $self->{child_w} if $self->{scroll_x} && $self->{child_w}; 979 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
858 $h = $self->{child_h} if $self->{scroll_y} && $self->{child_h}; 980 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
859 981
860 $self->child->configure (0, 0, $w, $h); 982 $self->child->configure (0, 0, $w, $h);
861 $self->update; 983 $self->update;
984
985 1
862} 986}
863 987
864sub set_offset { 988sub set_offset {
865 my ($self, $x, $y) = @_; 989 my ($self, $x, $y) = @_;
866 990
991 my $x = max 0, min $self->child->{w} - $self->{w}, int $x;
992 my $y = max 0, min $self->child->{h} - $self->{h}, int $y;
993
994 if ($x != $self->{view_x} or $y != $self->{view_y}) {
867 $self->{view_x} = int $x; 995 $self->{view_x} = $x;
868 $self->{view_y} = int $y; 996 $self->{view_y} = $y;
869 997
998 $self->emit (changed => $x, $y);
870 $self->update; 999 $self->update;
1000 }
871} 1001}
872 1002
873# hmm, this does not work for topleft of $self... but we should not ask for that 1003# hmm, this does not work for topleft of $self... but we should not ask for that
874sub coord2local { 1004sub coord2local {
875 my ($self, $x, $y) = @_; 1005 my ($self, $x, $y) = @_;
… …
892 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w} 1022 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
893 && $y >= $self->{y} && $y < $self->{y} + $self->{h} 1023 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
894 ) { 1024 ) {
895 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y}) 1025 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
896 } else { 1026 } else {
897 $self->CFClient::UI::Base::find_widget ($x, $y) 1027 $self->CFPlus::UI::Base::find_widget ($x, $y)
898 } 1028 }
899} 1029}
900 1030
901sub _render { 1031sub _render {
902 my ($self) = @_; 1032 my ($self) = @_;
903 1033
1034 local $CFPlus::UI::Base::draw_x = $CFPlus::UI::Base::draw_x - $self->{view_x};
1035 local $CFPlus::UI::Base::draw_y = $CFPlus::UI::Base::draw_y - $self->{view_y};
1036
904 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 1037 CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
905 1038
906 $self->SUPER::_render; 1039 $self->SUPER::_render;
907} 1040}
908 1041
909############################################################################# 1042#############################################################################
910 1043
911package CFClient::UI::ScrolledWindow; 1044package CFPlus::UI::ScrolledWindow;
912 1045
913our @ISA = CFClient::UI::HBox::; 1046our @ISA = CFPlus::UI::Table::;
914 1047
915sub new { 1048sub new {
916 my $class = shift; 1049 my ($class, %arg) = @_;
1050
1051 my $child = delete $arg{child};
917 1052
918 my $self; 1053 my $self;
919 1054
920 my $slider = new CFClient::UI::Slider 1055 my $hslider = new CFPlus::UI::Slider
1056 vertical => 0,
1057 range => [0, 0, 1, 0.01], # HACK fix
1058 on_changed => sub {
1059 $self->{hpos} = $_[1];
1060 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1061 },
1062 ;
1063
1064 my $vslider = new CFPlus::UI::Slider
921 vertical => 1, 1065 vertical => 1,
922 range => [0, 0, 1, 0.01], # HACK fix 1066 range => [0, 0, 1, 0.01], # HACK fix
923 on_changed => sub { 1067 on_changed => sub {
924 $self->{vp}->set_offset (0, $_[1]); 1068 $self->{vpos} = $_[1];
1069 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
925 }, 1070 },
926 ; 1071 ;
927 1072
928 $self = $class->SUPER::new ( 1073 $self = $class->SUPER::new (
929 vp => (new CFClient::UI::ViewPort expand => 1), 1074 scroll_x => 0,
1075 scroll_y => 1,
1076 can_events => 1,
930 slider => $slider, 1077 hslider => $hslider,
931 @_, 1078 vslider => $vslider,
1079 col_expand => [1, 0],
1080 row_expand => [1, 0],
1081 %arg,
932 ); 1082 );
933 1083
934 $self->{vp}->add ($self->{scrolled}); 1084 $self->{vp} = new CFPlus::UI::ViewPort
1085 expand => 1,
1086 scroll_x => $self->{scroll_x},
1087 scroll_y => $self->{scroll_y},
1088 on_changed => sub {
1089 my ($vp, $x, $y) = @_;
1090
1091 $vp->{parent}{hslider}->set_value ($x);
1092 $vp->{parent}{vslider}->set_value ($y);
1093
1094 0
1095 },
1096 ;
1097
935 $self->add ($self->{vp}); 1098 $self->SUPER::add (0, 0, $self->{vp});
936 $self->add ($self->{slider}); 1099
1100 $self->add ($child) if $child;
937 1101
938 $self 1102 $self
939} 1103}
940 1104
1105#TODO# update range on size_allocate depending on child
1106
1107sub add {
1108 my ($self, $widget) = @_;
1109
1110 $self->{vp}->add ($self->{child} = $widget);
1111}
1112
1113sub update_slider {
1114 my ($self) = @_;
1115
1116 my $child = ($self->{vp} or return)->child;
1117
1118 my ($w1, $w2) = ($child->{w}, $self->{vp}{w});
1119 $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
1120
1121 my $visible = $w1 > $w2;
1122 if ($visible != $self->{hslider}{visible}) {
1123 $visible ? $self->SUPER::add (0, 1, $self->{hslider})
1124 : $self->{hslider}->hide;
1125 }
1126
1127 my ($h1, $h2) = ($child->{h}, $self->{vp}{h});
1128 $self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
1129
1130 my $visible = $h1 > $h2;
1131 if ($visible != $self->{vslider}{visible}) {
1132 $visible ? $self->SUPER::add (1, 0, $self->{vslider})
1133 : $self->{vslider}->hide;
1134 }
1135}
1136
941sub update { 1137sub update {
942 my ($self) = @_; 1138 my ($self) = @_;
943 1139
944 $self->SUPER::update; 1140 $self->SUPER::update;
945 1141 $self->update_slider;
946 # todo: overwrite size_allocate of child
947 my $child = $self->{vp}->child;
948 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
949} 1142}
950 1143
1144sub invoke_mouse_wheel {
1145 my ($self, $ev) = @_;
1146
1147 return 0 unless $ev->{dy}; # only vertical movements for now
1148
1149 $self->{vslider}->emit (mouse_wheel => $ev);
1150
1151 1
1152}
1153
1154sub invoke_button_down {
1155 my ($self, $ev, $x, $y) = @_;
1156
1157 if ($ev->{button} == 2) {
1158 $self->grab_focus;
1159
1160 my $ox = $self->{vp}{view_x} + $ev->{x};
1161 my $oy = $self->{vp}{view_y} + $ev->{y};
1162
1163 $self->{motion} = sub {
1164 my ($ev, $x, $y) = @_;
1165
1166 $self->{vp}->set_offset ($ox - $ev->{x}, $oy - $ev->{y});
1167 $self->update;
1168 };
1169
1170 return 1;
1171 }
1172
1173 0
1174}
1175
1176sub invoke_button_up {
1177 my ($self, $ev, $x, $y) = @_;
1178
1179 if (delete $self->{motion}) {
1180 return 1;
1181 }
1182
1183 0
1184}
1185
1186sub invoke_mouse_motion {
1187 my ($self, $ev, $x, $y) = @_;
1188
1189 if ($self->{motion}) {
1190 $self->{motion}->($ev, $x, $y);
1191 return 1;
1192 }
1193
1194 0
1195}
1196
951sub size_allocate { 1197sub invoke_size_allocate {
952 my ($self, $w, $h, $changed) = @_; 1198 my ($self, $w, $h) = @_;
953 1199
1200 $self->update_slider;
954 $self->SUPER::size_allocate ($w, $h, $changed); 1201 $self->SUPER::invoke_size_allocate ($w, $h)
955
956 my $child = $self->{vp}->child;
957 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
958} 1202}
959
960#TODO# update range on size_allocate depending on child
961# update viewport offset on scroll
962 1203
963############################################################################# 1204#############################################################################
964 1205
965package CFClient::UI::Frame; 1206package CFPlus::UI::Frame;
966 1207
967our @ISA = CFClient::UI::Bin::; 1208our @ISA = CFPlus::UI::Bin::;
968 1209
969use CFClient::OpenGL; 1210use CFPlus::OpenGL;
970 1211
971sub new { 1212sub new {
972 my $class = shift; 1213 my $class = shift;
973 1214
974 $class->SUPER::new ( 1215 $class->SUPER::new (
… …
982 1223
983 if ($self->{bg}) { 1224 if ($self->{bg}) {
984 my ($w, $h) = @$self{qw(w h)}; 1225 my ($w, $h) = @$self{qw(w h)};
985 1226
986 glEnable GL_BLEND; 1227 glEnable GL_BLEND;
987 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1228 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
988 glColor @{ $self->{bg} }; 1229 glColor_premultiply @{ $self->{bg} };
989 1230
990 glBegin GL_QUADS; 1231 glBegin GL_QUADS;
991 glVertex 0 , 0; 1232 glVertex 0 , 0;
992 glVertex 0 , $h; 1233 glVertex 0 , $h;
993 glVertex $w, $h; 1234 glVertex $w, $h;
… …
1000 $self->SUPER::_draw; 1241 $self->SUPER::_draw;
1001} 1242}
1002 1243
1003############################################################################# 1244#############################################################################
1004 1245
1005package CFClient::UI::FancyFrame; 1246package CFPlus::UI::FancyFrame;
1006 1247
1007our @ISA = CFClient::UI::Bin::; 1248our @ISA = CFPlus::UI::Bin::;
1008 1249
1009use CFClient::OpenGL; 1250use CFPlus::OpenGL;
1010
1011my @tex =
1012 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1013 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1014 1251
1015sub new { 1252sub new {
1016 my $class = shift; 1253 my ($class, %arg) = @_;
1254
1255 if ((exists $arg{label}) && !ref $arg{label}) {
1256 $arg{label} = new CFPlus::UI::Label
1257 align => 1,
1258 valign => 0,
1259 text => $arg{label},
1260 fontsize => ($arg{border} || 0.8) * 0.75;
1261 }
1262
1263 my $self = $class->SUPER::new (
1264 # label => "",
1265 fg => [0.6, 0.3, 0.1],
1266 border => 0.8,
1267 style => 'single',
1268 %arg,
1269 );
1270
1271 $self
1272}
1273
1274sub add {
1275 my ($self, @widgets) = @_;
1276
1277 $self->SUPER::add (@widgets);
1278 $self->CFPlus::UI::Container::add ($self->{label}) if $self->{label};
1279}
1280
1281sub border {
1282 int $_[0]{border} * $::FONTSIZE
1283}
1284
1285sub size_request {
1286 my ($self) = @_;
1287
1288 ($self->{label_w}, undef) = $self->{label}->size_request
1289 if $self->{label};
1290
1291 my ($w, $h) = $self->SUPER::size_request;
1292
1293 (
1294 $w + $self->border * 2,
1295 $h + $self->border * 2,
1296 )
1297}
1298
1299sub invoke_size_allocate {
1300 my ($self, $w, $h) = @_;
1301
1302 my $border = $self->border;
1303
1304 $w -= List::Util::max 0, $border * 2;
1305 $h -= List::Util::max 0, $border * 2;
1306
1307 if (my $label = $self->{label}) {
1308 $label->{w} = List::Util::max 0, List::Util::min $self->{label_w}, $w - $border * 2;
1309 $label->{h} = List::Util::min $h, $border;
1310 $label->invoke_size_allocate ($label->{w}, $label->{h});
1311 }
1312
1313 $self->child->configure ($border, $border, $w, $h);
1314
1315 1
1316}
1317
1318sub _draw {
1319 my ($self) = @_;
1320
1321 my $child = $self->{children}[0];
1322
1323 my $border = $self->border;
1324 my ($w, $h) = ($self->{w}, $self->{h});
1325
1326 $child->draw;
1327
1328 glColor @{$self->{fg}};
1329 glBegin GL_LINE_STRIP;
1330 glVertex $border * 1.5 , $border * 0.5 + 0.5;
1331 glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1332 glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1333 glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1334 glVertex $w - $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1335 glVertex $self->{label} ? $border * 2 + $self->{label}{w} : $border * 1.5, $border * 0.5 + 0.5;
1336 glEnd;
1337
1338 if ($self->{label}) {
1339 glTranslate $border * 2, 0;
1340 $self->{label}->_draw;
1341 }
1342}
1343
1344#############################################################################
1345
1346package CFPlus::UI::Toplevel;
1347
1348our @ISA = CFPlus::UI::Bin::;
1349
1350use CFPlus::OpenGL;
1351
1352my $bg =
1353 new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1354 mipmap => 1, wrap => 1;
1355
1356my @border =
1357 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1358 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1359
1360sub new {
1361 my ($class, %arg) = @_;
1017 1362
1018 my $self = $class->SUPER::new ( 1363 my $self = $class->SUPER::new (
1019 bg => [1, 1, 1, 1], 1364 bg => [1, 1, 1, 1],
1020 border_bg => [1, 1, 1, 1], 1365 border_bg => [1, 1, 1, 1],
1021 border => 0.6, 1366 border => 0.6,
1022 is_toplevel => 1,
1023 can_events => 1, 1367 can_events => 1,
1024 @_ 1368 min_w => 64,
1369 min_h => 32,
1370 %arg,
1025 ); 1371 );
1026 1372
1027 $self->{title} &&= new CFClient::UI::Label 1373 $self->{title_widget} = new CFPlus::UI::Label
1028 align => 0, 1374 align => 0,
1029 valign => 1, 1375 valign => 1,
1030 text => $self->{title}, 1376 text => $self->{title},
1031 fontsize => $self->{border}; 1377 fontsize => $self->{border},
1378 if exists $self->{title};
1379
1380 if ($self->{has_close_button}) {
1381 $self->{close_button} =
1382 new CFPlus::UI::ImageButton
1383 path => 'x1_close.png',
1384 on_activate => sub { $self->emit ("delete") };
1385
1386 $self->CFPlus::UI::Container::add ($self->{close_button});
1387 }
1032 1388
1033 $self 1389 $self
1390}
1391
1392sub add {
1393 my ($self, @widgets) = @_;
1394
1395 $self->SUPER::add (@widgets);
1396 $self->CFPlus::UI::Container::add ($self->{close_button}) if $self->{close_button};
1397 $self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1034} 1398}
1035 1399
1036sub border { 1400sub border {
1037 int $_[0]{border} * $::FONTSIZE 1401 int $_[0]{border} * $::FONTSIZE
1038} 1402}
1039 1403
1040sub size_request { 1404sub size_request {
1041 my ($self) = @_; 1405 my ($self) = @_;
1406
1407 $self->{title_widget}->size_request
1408 if $self->{title_widget};
1409
1410 $self->{close_button}->size_request
1411 if $self->{close_button};
1042 1412
1043 my ($w, $h) = $self->SUPER::size_request; 1413 my ($w, $h) = $self->SUPER::size_request;
1044 1414
1045 ( 1415 (
1046 $w + $self->border * 2, 1416 $w + $self->border * 2,
1047 $h + $self->border * 2, 1417 $h + $self->border * 2,
1048 ) 1418 )
1049} 1419}
1050 1420
1051sub size_allocate { 1421sub invoke_size_allocate {
1052 my ($self, $w, $h, $changed) = @_; 1422 my ($self, $w, $h) = @_;
1053 1423
1054 return unless $changed; 1424 if ($self->{title_widget}) {
1425 $self->{title_widget}{w} = $w;
1426 $self->{title_widget}{h} = $h;
1427 $self->{title_widget}->invoke_size_allocate ($w, $h);
1428 }
1055 1429
1430 my $border = $self->border;
1431
1056 $h -= List::Util::max 0, $self->border * 2; 1432 $h -= List::Util::max 0, $border * 2;
1057 $w -= List::Util::max 0, $self->border * 2; 1433 $w -= List::Util::max 0, $border * 2;
1058 1434
1059 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
1060 if $self->{title};
1061
1062 $self->child->configure ($self->border, $self->border, $w, $h); 1435 $self->child->configure ($border, $border, $w, $h);
1063}
1064 1436
1437 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1438 if $self->{close_button};
1439
1440 1
1441}
1442
1443sub invoke_delete {
1444 my ($self) = @_;
1445
1446 $self->hide;
1447
1448 1
1449}
1450
1065sub button_down { 1451sub invoke_button_down {
1066 my ($self, $ev, $x, $y) = @_; 1452 my ($self, $ev, $x, $y) = @_;
1067 1453
1068 my ($w, $h) = @$self{qw(w h)}; 1454 my ($w, $h) = @$self{qw(w h)};
1069 my $border = $self->border; 1455 my $border = $self->border;
1070 1456
… …
1083 my ($ev, $x, $y) = @_; 1469 my ($ev, $x, $y) = @_;
1084 1470
1085 my $dx = $ev->{x} - $ox; 1471 my $dx = $ev->{x} - $ox;
1086 my $dy = $ev->{y} - $oy; 1472 my $dy = $ev->{y} - $oy;
1087 1473
1088 $self->{user_x} = $wx + $dx * $mx;
1089 $self->{user_y} = $wy + $dy * $my;
1090 $self->{def_w} = $bw + $dx * ($mx ? -1 : 1); 1474 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1091 $self->{def_h} = $bh + $dy * ($my ? -1 : 1); 1475 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1092 $self->move ($self->{user_x}, $self->{user_y}); 1476
1477 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1093 $self->realloc; 1478 $self->realloc;
1094 }; 1479 };
1095 1480
1096 } elsif ($lr ^ $td) { 1481 } elsif ($lr ^ $td) {
1097 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1482 my ($ox, $oy) = ($ev->{x}, $ev->{y});
… …
1100 $self->{motion} = sub { 1485 $self->{motion} = sub {
1101 my ($ev, $x, $y) = @_; 1486 my ($ev, $x, $y) = @_;
1102 1487
1103 ($x, $y) = ($ev->{x}, $ev->{y}); 1488 ($x, $y) = ($ev->{x}, $ev->{y});
1104 1489
1105 $self->{user_x} = $bx + $x - $ox; 1490 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1106 $self->{user_y} = $by + $y - $oy; 1491 # HACK: the next line is required to enforce placement
1107 1492 $self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
1108 $self->move ($self->{user_x}, $self->{user_y});
1109 $self->realloc;
1110 }; 1493 };
1494 } else {
1495 return 0;
1496 }
1497
1111 } 1498 1
1112} 1499}
1113 1500
1114sub button_up { 1501sub invoke_button_up {
1115 my ($self, $ev, $x, $y) = @_; 1502 my ($self, $ev, $x, $y) = @_;
1116 1503
1117 delete $self->{motion}; 1504 ! ! delete $self->{motion}
1118} 1505}
1119 1506
1120sub mouse_motion { 1507sub invoke_mouse_motion {
1121 my ($self, $ev, $x, $y) = @_; 1508 my ($self, $ev, $x, $y) = @_;
1122 1509
1123 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1510 $self->{motion}->($ev, $x, $y) if $self->{motion};
1511
1512 ! ! $self->{motion}
1513}
1514
1515sub invoke_visibility_change {
1516 my ($self, $visible) = @_;
1517
1518 delete $self->{motion} unless $visible;
1519
1520 0
1124} 1521}
1125 1522
1126sub _draw { 1523sub _draw {
1127 my ($self) = @_; 1524 my ($self) = @_;
1128 1525
1526 my $child = $self->{children}[0];
1527
1129 my ($w, $h ) = ($self->{w}, $self->{h}); 1528 my ($w, $h ) = ($self->{w}, $self->{h});
1130 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1529 my ($cw, $ch) = ($child->{w}, $child->{h});
1131 1530
1132 glEnable GL_TEXTURE_2D; 1531 glEnable GL_TEXTURE_2D;
1133 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1532 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1134 1533
1135 my $border = $self->border; 1534 my $border = $self->border;
1136 1535
1137 glColor @{ $self->{border_bg} }; 1536 glColor @{ $self->{border_bg} };
1138 $tex[1]->draw_quad_alpha (0, 0, $w, $border); 1537 $border[0]->draw_quad_alpha (0, 0, $w, $border);
1139 $tex[3]->draw_quad_alpha (0, $border, $border, $ch); 1538 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
1140 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1539 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1141 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border); 1540 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
1142 1541
1143 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1542 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1144 my $bg = $tex[0]; 1543 glColor @{ $self->{bg} };
1145 1544
1146 # TODO: repeat texture not scale 1545 # TODO: repeat texture not scale
1546 # solve this better(?)
1147 my $rep_x = $cw / $bg->{w}; 1547 $bg->{s} = $cw / $bg->{w};
1148 my $rep_y = $ch / $bg->{h}; 1548 $bg->{t} = $ch / $bg->{h};
1149
1150 glColor @{ $self->{bg} };
1151
1152 $bg->{s} = $rep_x;
1153 $bg->{t} = $rep_y;
1154 $bg->{wrap_mode} = 1;
1155 $bg->draw_quad_alpha ($border, $border, $cw, $ch); 1549 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1156 } 1550 }
1157 1551
1158 glDisable GL_TEXTURE_2D; 1552 glDisable GL_TEXTURE_2D;
1159 1553
1160 $self->{title}->draw if $self->{title};
1161
1162 $self->child->draw; 1554 $child->draw;
1555
1556 if ($self->{title_widget}) {
1557 glTranslate 0, $border - $self->{h};
1558 $self->{title_widget}->_draw;
1559
1560 glTranslate 0, - ($border - $self->{h});
1561 }
1562
1563 $self->{close_button}->draw
1564 if $self->{close_button};
1163} 1565}
1164 1566
1165############################################################################# 1567#############################################################################
1166 1568
1167package CFClient::UI::Table; 1569package CFPlus::UI::Table;
1168 1570
1169our @ISA = CFClient::UI::Base::; 1571our @ISA = CFPlus::UI::Base::;
1170 1572
1171use List::Util qw(max sum); 1573use List::Util qw(max sum);
1172 1574
1173use CFClient::OpenGL; 1575use CFPlus::OpenGL;
1174 1576
1175sub new { 1577sub new {
1176 my $class = shift; 1578 my $class = shift;
1177 1579
1178 $class->SUPER::new ( 1580 $class->SUPER::new (
1581 children => [],
1179 col_expand => [], 1582 col_expand => [],
1583 row_expand => [],
1180 @_, 1584 @_,
1181 ) 1585 )
1182} 1586}
1183 1587
1184sub children { 1588sub children {
1185 grep $_, map @$_, grep $_, @{ $_[0]{children} } 1589 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1186} 1590}
1187 1591
1592# TODO: store row/col info in child widget and use standard add/del
1188sub add { 1593sub add {
1189 my ($self, $x, $y, $child) = @_; 1594 my ($self) = shift;
1190 1595
1596 while (@_) {
1597 my ($x, $y, $child) = splice @_, 0, 3, ();
1191 $child->set_parent ($self); 1598 $child->set_parent ($self);
1192 $self->{children}[$y][$x] = $child; 1599 $self->{children}[$y][$x] = $child;
1600 }
1193 1601
1602 $self->{force_realloc} = 1;
1603 $self->{force_size_alloc} = 1;
1194 $self->realloc; 1604 $self->realloc;
1605}
1606
1607sub remove {
1608 my ($self, $child) = @_;
1609
1610 for (@{ $self->{children} }) {
1611 for (@{ $_ || [] }) {
1612 $_ = undef if $_ == $child;
1613 }
1614 }
1195} 1615}
1196 1616
1197# TODO: move to container class maybe? send children a signal on removal? 1617# TODO: move to container class maybe? send children a signal on removal?
1198sub clear { 1618sub clear {
1199 my ($self) = @_; 1619 my ($self) = @_;
… …
1240 (sum @$ws), 1660 (sum @$ws),
1241 (sum @$hs), 1661 (sum @$hs),
1242 ) 1662 )
1243} 1663}
1244 1664
1245sub size_allocate { 1665sub invoke_size_allocate {
1246 my ($self, $w, $h, $changed) = @_; 1666 my ($self, $w, $h) = @_;
1247 1667
1248 my ($ws, $hs) = $self->get_wh; 1668 my ($ws, $hs) = $self->get_wh;
1249 1669
1250 my $req_w = (sum @$ws) || 1; 1670 my $req_w = (sum @$ws) || 1;
1251 my $req_h = (sum @$hs) || 1; 1671 my $req_h = (sum @$hs) || 1;
1252 1672
1253 # TODO: nicer code && do row_expand 1673 # TODO: nicer code
1254 my @col_expand = @{$self->{col_expand}}; 1674 my @col_expand = @{$self->{col_expand}};
1255 @col_expand = (1) x @$ws unless @col_expand; 1675 @col_expand = (1) x @$ws unless @col_expand;
1256 my $col_expand = (sum @col_expand) || 1; 1676 my $col_expand = (sum @col_expand) || 1;
1257 1677
1258 # linearly scale sizes
1259 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1678 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1260 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1261 1679
1262 CFClient::UI::harmonize $ws; 1680 CFPlus::UI::harmonize $ws;
1681
1682 my @row_expand = @{$self->{row_expand}};
1683 @row_expand = (1) x @$ws unless @row_expand;
1684 my $row_expand = (sum @row_expand) || 1;
1685
1686 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
1687
1263 CFClient::UI::harmonize $hs; 1688 CFPlus::UI::harmonize $hs;
1264 1689
1265 my $y; 1690 my $y;
1266 1691
1267 for my $r (0 .. $#{$self->{children}}) { 1692 for my $r (0 .. $#{$self->{children}}) {
1268 my $row = $self->{children}[$r] 1693 my $row = $self->{children}[$r]
… …
1282 } 1707 }
1283 1708
1284 $y += $row_h; 1709 $y += $row_h;
1285 } 1710 }
1286 1711
1712 1
1287} 1713}
1288 1714
1289sub find_widget { 1715sub find_widget {
1290 my ($self, $x, $y) = @_; 1716 my ($self, $x, $y) = @_;
1291 1717
… …
1310 } 1736 }
1311} 1737}
1312 1738
1313############################################################################# 1739#############################################################################
1314 1740
1315package CFClient::UI::Box; 1741package CFPlus::UI::Fixed;
1316 1742
1743use List::Util qw(min max);
1744
1317our @ISA = CFClient::UI::Container::; 1745our @ISA = CFPlus::UI::Container::;
1746
1747sub add {
1748 my ($self, $child, $posmode, $x, $y, $sizemode, $w, $h) = @_;
1749
1750 $child->{_fixed} = [$posmode, $x, $y, $sizemode, $w, $h];
1751 $self->SUPER::add ($child);
1752}
1753
1754sub _scale($$$) {
1755 my ($mode, $val, $max) = @_;
1756
1757 $mode eq "abs" ? $val
1758 : $mode eq "rel" ? $val * $max
1759 : 0
1760}
1761
1762sub size_request {
1763 my ($self) = @_;
1764
1765 my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
1766
1767 # determine overall size by querying abs widgets
1768 for my $child ($self->visible_children) {
1769 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1770
1771 if ($pos eq "abs") {
1772 $w = _scale $size, $w, $child->{req_w};
1773 $h = _scale $size, $h, $child->{req_h};
1774
1775 $x1 = min $x1, $x; $x2 = max $x2, $x + $w;
1776 $y1 = min $y1, $y; $y2 = max $y2, $y + $h;
1777 }
1778 }
1779
1780 my $W = $x2 - $x1;
1781 my $H = $y2 - $y1;
1782
1783 # now layout remaining widgets
1784 for my $child ($self->visible_children) {
1785 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1786
1787 if ($pos ne "abs") {
1788 $x = _scale $pos, $x, $W;
1789 $y = _scale $pos, $x, $H;
1790 $w = _scale $size, $w, $child->{req_w};
1791 $h = _scale $size, $h, $child->{req_h};
1792
1793 $x1 = min $x1, $x; $x2 = max $x2, $x + $w;
1794 $y1 = min $y1, $y; $y2 = max $y2, $y + $h;
1795 }
1796 }
1797
1798 my $W = $x2 - $x1;
1799 my $H = $y2 - $y1;
1800
1801 ($W, $H)
1802}
1803
1804sub invoke_size_allocate {
1805 my ($self, $W, $H) = @_;
1806
1807 for my $child ($self->visible_children) {
1808 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1809
1810 $x = _scale $pos, $x, $W;
1811 $y = _scale $pos, $x, $H;
1812 $w = _scale $size, $w, $child->{req_w};
1813 $h = _scale $size, $h, $child->{req_h};
1814
1815 $child->configure ($x, $y, $w, $h);
1816 }
1817
1818 1
1819}
1820
1821#############################################################################
1822
1823package CFPlus::UI::Box;
1824
1825our @ISA = CFPlus::UI::Container::;
1318 1826
1319sub size_request { 1827sub size_request {
1320 my ($self) = @_; 1828 my ($self) = @_;
1321 1829
1322 $self->{vertical} 1830 $self->{vertical}
… …
1328 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1836 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1329 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1837 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1330 ) 1838 )
1331} 1839}
1332 1840
1333sub size_allocate { 1841sub invoke_size_allocate {
1334 my ($self, $w, $h, $changed) = @_; 1842 my ($self, $w, $h) = @_;
1335 1843
1336 my $space = $self->{vertical} ? $h : $w; 1844 my $space = $self->{vertical} ? $h : $w;
1337 my $children = $self->{children}; 1845 my @children = $self->visible_children;
1338 1846
1339 my @req; 1847 my @req;
1340 1848
1341 if ($self->{homogeneous}) { 1849 if ($self->{homogeneous}) {
1342 @req = ($space / (@$children || 1)) x @$children; 1850 @req = ($space / (@children || 1)) x @children;
1343 } else { 1851 } else {
1344 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children; 1852 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1345 my $req = List::Util::sum @req; 1853 my $req = List::Util::sum @req;
1346 1854
1347 if ($req > $space) { 1855 if ($req > $space) {
1348 # ah well, not enough space 1856 # ah well, not enough space
1349 $_ *= $space / $req for @req; 1857 $_ *= $space / $req for @req;
1350 } else { 1858 } else {
1351 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1; 1859 my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1352 1860
1353 $space = ($space - $req) / $expand; # remaining space to give away 1861 $space = ($space - $req) / $expand; # remaining space to give away
1354 1862
1355 $req[$_] += $space * $children->[$_]{expand} 1863 $req[$_] += $space * $children[$_]{expand}
1356 for 0 .. $#$children; 1864 for 0 .. $#children;
1357 } 1865 }
1358 } 1866 }
1359 1867
1360 CFClient::UI::harmonize \@req; 1868 CFPlus::UI::harmonize \@req;
1361 1869
1362 my $pos = 0; 1870 my $pos = 0;
1363 for (0 .. $#$children) { 1871 for (0 .. $#children) {
1364 my $alloc = $req[$_]; 1872 my $alloc = $req[$_];
1365 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h)); 1873 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1366 1874
1367 $pos += $alloc; 1875 $pos += $alloc;
1368 } 1876 }
1369 1877
1370 1 1878 1
1371} 1879}
1372 1880
1373############################################################################# 1881#############################################################################
1374 1882
1375package CFClient::UI::HBox; 1883package CFPlus::UI::HBox;
1376 1884
1377our @ISA = CFClient::UI::Box::; 1885our @ISA = CFPlus::UI::Box::;
1378 1886
1379sub new { 1887sub new {
1380 my $class = shift; 1888 my $class = shift;
1381 1889
1382 $class->SUPER::new ( 1890 $class->SUPER::new (
… …
1385 ) 1893 )
1386} 1894}
1387 1895
1388############################################################################# 1896#############################################################################
1389 1897
1390package CFClient::UI::VBox; 1898package CFPlus::UI::VBox;
1391 1899
1392our @ISA = CFClient::UI::Box::; 1900our @ISA = CFPlus::UI::Box::;
1393 1901
1394sub new { 1902sub new {
1395 my $class = shift; 1903 my $class = shift;
1396 1904
1397 $class->SUPER::new ( 1905 $class->SUPER::new (
… …
1400 ) 1908 )
1401} 1909}
1402 1910
1403############################################################################# 1911#############################################################################
1404 1912
1405package CFClient::UI::Label; 1913package CFPlus::UI::Label;
1406 1914
1407our @ISA = CFClient::UI::DrawBG::; 1915our @ISA = CFPlus::UI::DrawBG::;
1408 1916
1409use CFClient::OpenGL; 1917use CFPlus::OpenGL;
1410 1918
1411sub new { 1919sub new {
1412 my ($class, %arg) = @_; 1920 my ($class, %arg) = @_;
1413 1921
1414 my $self = $class->SUPER::new ( 1922 my $self = $class->SUPER::new (
… …
1417 #active_bg => none 1925 #active_bg => none
1418 #font => default_font 1926 #font => default_font
1419 #text => initial text 1927 #text => initial text
1420 #markup => initial narkup 1928 #markup => initial narkup
1421 #max_w => maximum pixel width 1929 #max_w => maximum pixel width
1930 #style => 0, # render flags
1422 ellipsise => 3, # end 1931 ellipsise => 3, # end
1423 layout => (new CFClient::Layout), 1932 layout => (new CFPlus::Layout),
1424 fontsize => 1, 1933 fontsize => 1,
1425 align => -1, 1934 align => -1,
1426 valign => -1, 1935 valign => -1,
1427 padding => 2, 1936 padding_x => 2,
1937 padding_y => 2,
1428 can_events => 0, 1938 can_events => 0,
1429 %arg 1939 %arg
1430 ); 1940 );
1431 1941
1432 if (exists $self->{template}) { 1942 if (exists $self->{template}) {
1433 my $layout = new CFClient::Layout; 1943 my $layout = new CFPlus::Layout;
1434 $layout->set_text (delete $self->{template}); 1944 $layout->set_text (delete $self->{template});
1435 $self->{template} = $layout; 1945 $self->{template} = $layout;
1436 } 1946 }
1437 1947
1438 if (exists $self->{markup}) { 1948 if (exists $self->{markup}) {
… …
1442 } 1952 }
1443 1953
1444 $self 1954 $self
1445} 1955}
1446 1956
1447sub escape($) {
1448 local $_ = $_[0];
1449
1450 s/&/&amp;/g;
1451 s/>/&gt;/g;
1452 s/</&lt;/g;
1453
1454 $_
1455}
1456
1457sub update { 1957sub update {
1458 my ($self) = @_; 1958 my ($self) = @_;
1459 1959
1460 delete $self->{texture}; 1960 delete $self->{texture};
1461 $self->SUPER::update; 1961 $self->SUPER::update;
1462} 1962}
1463 1963
1964sub realloc {
1965 my ($self) = @_;
1966
1967 delete $self->{ox};
1968 $self->SUPER::realloc;
1969}
1970
1464sub set_text { 1971sub set_text {
1465 my ($self, $text) = @_; 1972 my ($self, $text) = @_;
1466 1973
1467 return if $self->{text} eq "T$text"; 1974 return if $self->{text} eq "T$text";
1468 $self->{text} = "T$text"; 1975 $self->{text} = "T$text";
1469 1976
1470 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1471 $self->{layout}->set_text ($text); 1977 $self->{layout}->set_text ($text);
1472 1978
1979 delete $self->{size_req};
1473 $self->realloc; 1980 $self->realloc;
1981 $self->update;
1474} 1982}
1475 1983
1476sub set_markup { 1984sub set_markup {
1477 my ($self, $markup) = @_; 1985 my ($self, $markup) = @_;
1478 1986
1479 return if $self->{text} eq "M$markup"; 1987 return if $self->{text} eq "M$markup";
1480 $self->{text} = "M$markup"; 1988 $self->{text} = "M$markup";
1481 1989
1482 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1990 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1483 1991
1484 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1485 $self->{layout}->set_markup ($markup); 1992 $self->{layout}->set_markup ($markup);
1486 1993
1994 delete $self->{size_req};
1487 $self->realloc; 1995 $self->realloc;
1996 $self->update;
1488} 1997}
1489 1998
1490sub size_request { 1999sub size_request {
1491 my ($self) = @_; 2000 my ($self) = @_;
1492 2001
2002 $self->{size_req} ||= do {
1493 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2003 $self->{layout}->set_font ($self->{font}) if $self->{font};
1494 $self->{layout}->set_width ($self->{max_w} || -1); 2004 $self->{layout}->set_width ($self->{max_w} || -1);
1495 $self->{layout}->set_ellipsise ($self->{ellipsise}); 2005 $self->{layout}->set_ellipsise ($self->{ellipsise});
1496 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 2006 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1497 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2007 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1498 2008
1499 my ($w, $h) = $self->{layout}->size; 2009 my ($w, $h) = $self->{layout}->size;
1500 2010
1501 if (exists $self->{template}) { 2011 if (exists $self->{template}) {
1502 $self->{template}->set_font ($self->{font}) if $self->{font}; 2012 $self->{template}->set_font ($self->{font}) if $self->{font};
2013 $self->{template}->set_width ($self->{max_w} || -1);
1503 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 2014 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1504 2015
1505 my ($w2, $h2) = $self->{template}->size; 2016 my ($w2, $h2) = $self->{template}->size;
1506 2017
1507 $w = List::Util::max $w, $w2; 2018 $w = List::Util::max $w, $w2;
1508 $h = List::Util::max $h, $h2; 2019 $h = List::Util::max $h, $h2;
2020 }
2021
2022 [$w, $h]
1509 } 2023 };
1510 2024
1511 ( 2025 @{ $self->{size_req} }
1512 $w + $self->{padding} * 2,
1513 $h + $self->{padding} * 2,
1514 )
1515} 2026}
1516 2027
2028sub baseline_shift {
2029 $_[0]{layout}->descent
2030}
2031
1517sub size_allocate { 2032sub invoke_size_allocate {
1518 my ($self, $w, $h, $changed) = @_; 2033 my ($self, $w, $h) = @_;
2034
2035 delete $self->{ox};
1519 2036
1520 delete $self->{texture} 2037 delete $self->{texture}
1521 if $changed; 2038 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
2039
2040 1
1522} 2041}
1523 2042
1524sub set_fontsize { 2043sub set_fontsize {
1525 my ($self, $fontsize) = @_; 2044 my ($self, $fontsize) = @_;
1526 2045
1527 $self->{fontsize} = $fontsize; 2046 $self->{fontsize} = $fontsize;
2047 delete $self->{size_req};
1528 delete $self->{texture}; 2048 delete $self->{texture};
1529 2049
1530 $self->realloc; 2050 $self->realloc;
1531} 2051}
1532 2052
2053sub reconfigure {
2054 my ($self) = @_;
2055
2056 delete $self->{size_req};
2057 delete $self->{texture};
2058
2059 $self->SUPER::reconfigure;
2060}
2061
1533sub _draw { 2062sub _draw {
1534 my ($self) = @_; 2063 my ($self) = @_;
1535 2064
1536 $self->SUPER::_draw; # draw background, if applicable 2065 $self->SUPER::_draw; # draw background, if applicable
1537 2066
1538 my $tex = $self->{texture} ||= do { 2067 my $size = $self->{texture} ||= do {
1539 $self->{layout}->set_foreground (@{$self->{fg}}); 2068 $self->{layout}->set_foreground (@{$self->{fg}});
1540 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2069 $self->{layout}->set_font ($self->{font}) if $self->{font};
1541 $self->{layout}->set_width ($self->{w}); 2070 $self->{layout}->set_width ($self->{w});
1542 $self->{layout}->set_ellipsise ($self->{ellipsise}); 2071 $self->{layout}->set_ellipsise ($self->{ellipsise});
1543 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 2072 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1544 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2073 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1545 2074
1546 my $tex = new_from_layout CFClient::Texture $self->{layout}; 2075 [$self->{layout}->size]
1547
1548 $self->{ox} = int ($self->{align} < 0 ? $self->{padding}
1549 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1550 : ($self->{w} - $tex->{w}) * 0.5);
1551
1552 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding}
1553 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1554 : ($self->{h} - $tex->{h}) * 0.5);
1555
1556 $tex
1557 }; 2076 };
1558 2077
1559 glEnable GL_TEXTURE_2D; 2078 unless (exists $self->{ox}) {
1560 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2079 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
2080 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
2081 : ($self->{w} - $size->[0]) * 0.5);
1561 2082
1562 if ($tex->{format} == GL_ALPHA) { 2083 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1563 glColor @{$self->{fg}}; 2084 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1564 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}); 2085 : ($self->{h} - $size->[1]) * 0.5);
1565 } else {
1566 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1567 } 2086 };
1568 2087
1569 glDisable GL_TEXTURE_2D; 2088 my $w = List::Util::min $self->{w} + 4, $size->[0];
2089 my $h = List::Util::min $self->{h} + 2, $size->[1];
2090
2091 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1570} 2092}
1571 2093
1572############################################################################# 2094#############################################################################
1573 2095
1574package CFClient::UI::EntryBase; 2096package CFPlus::UI::EntryBase;
1575 2097
1576our @ISA = CFClient::UI::Label::; 2098our @ISA = CFPlus::UI::Label::;
1577 2099
1578use CFClient::OpenGL; 2100use CFPlus::OpenGL;
1579 2101
1580sub new { 2102sub new {
1581 my $class = shift; 2103 my $class = shift;
1582 2104
1583 $class->SUPER::new ( 2105 $class->SUPER::new (
… …
1587 active_fg => [0, 0, 0], 2109 active_fg => [0, 0, 0],
1588 can_hover => 1, 2110 can_hover => 1,
1589 can_focus => 1, 2111 can_focus => 1,
1590 valign => 0, 2112 valign => 0,
1591 can_events => 1, 2113 can_events => 1,
2114 ellipsise => 0,
1592 #text => ... 2115 #text => ...
2116 #hidden => "*",
1593 @_ 2117 @_
1594 ) 2118 )
1595} 2119}
1596 2120
1597sub _set_text { 2121sub _set_text {
… …
1599 2123
1600 delete $self->{cur_h}; 2124 delete $self->{cur_h};
1601 2125
1602 return if $self->{text} eq $text; 2126 return if $self->{text} eq $text;
1603 2127
1604 delete $self->{texture};
1605
1606 $self->{last_activity} = $::NOW; 2128 $self->{last_activity} = $::NOW;
1607 $self->{text} = $text; 2129 $self->{text} = $text;
1608 2130
1609 $text =~ s/./*/g if $self->{hidden}; 2131 $text =~ s/./*/g if $self->{hidden};
1610 $self->{layout}->set_text ("$text "); 2132 $self->{layout}->set_text ("$text ");
2133 delete $self->{size_req};
1611 2134
1612 $self->_emit (changed => $self->{text}); 2135 $self->emit (changed => $self->{text});
2136
2137 $self->realloc;
2138 $self->update;
1613} 2139}
1614 2140
1615sub set_text { 2141sub set_text {
1616 my ($self, $text) = @_; 2142 my ($self, $text) = @_;
1617 2143
1618 $self->{cursor} = length $text; 2144 $self->{cursor} = length $text;
1619 $self->_set_text ($text); 2145 $self->_set_text ($text);
1620
1621 $self->realloc;
1622} 2146}
1623 2147
1624sub get_text { 2148sub get_text {
1625 $_[0]{text} 2149 $_[0]{text}
1626} 2150}
… …
1631 my ($w, $h) = $self->SUPER::size_request; 2155 my ($w, $h) = $self->SUPER::size_request;
1632 2156
1633 ($w + 1, $h) # add 1 for cursor 2157 ($w + 1, $h) # add 1 for cursor
1634} 2158}
1635 2159
1636sub key_down { 2160sub invoke_key_down {
1637 my ($self, $ev) = @_; 2161 my ($self, $ev) = @_;
1638 2162
1639 my $mod = $ev->{mod}; 2163 my $mod = $ev->{mod};
1640 my $sym = $ev->{sym}; 2164 my $sym = $ev->{sym};
1641 my $uni = $ev->{unicode}; 2165 my $uni = $ev->{unicode};
1642 2166
1643 my $text = $self->get_text; 2167 my $text = $self->get_text;
2168
2169 $self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
1644 2170
1645 if ($uni == 8) { 2171 if ($uni == 8) {
1646 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 2172 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1647 } elsif ($uni == 127) { 2173 } elsif ($uni == 127) {
1648 substr $text, $self->{cursor}, 1, ""; 2174 substr $text, $self->{cursor}, 1, "";
1649 } elsif ($sym == CFClient::SDLK_LEFT) { 2175 } elsif ($sym == CFPlus::SDLK_LEFT) {
1650 --$self->{cursor} if $self->{cursor}; 2176 --$self->{cursor} if $self->{cursor};
1651 } elsif ($sym == CFClient::SDLK_RIGHT) { 2177 } elsif ($sym == CFPlus::SDLK_RIGHT) {
1652 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 2178 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1653 } elsif ($sym == CFClient::SDLK_HOME) { 2179 } elsif ($sym == CFPlus::SDLK_HOME) {
2180 # what a hack
2181 $self->{cursor} =
2182 (substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
2183 ? length $1
2184 : 0;
2185 } elsif ($sym == CFPlus::SDLK_END) {
2186 # uh, again
2187 $self->{cursor} =
2188 (substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
2189 ? $self->{cursor} + length $1
2190 : length $self->{text};
2191 } elsif ($uni == 21) { # ctrl-u
2192 $text = "";
1654 $self->{cursor} = 0; 2193 $self->{cursor} = 0;
1655 } elsif ($sym == CFClient::SDLK_END) {
1656 $self->{cursor} = length $text;
1657 } elsif ($uni == 27) { 2194 } elsif ($uni == 27) {
1658 $self->_emit ('escape'); 2195 $self->emit ('escape');
1659 } elsif ($uni) { 2196 } elsif ($uni == 0x0d) {
2197 substr $text, $self->{cursor}++, 0, "\012";
2198 } elsif ($uni >= 0x20) {
1660 substr $text, $self->{cursor}++, 0, chr $uni; 2199 substr $text, $self->{cursor}++, 0, chr $uni;
2200 } else {
2201 return 0;
1661 } 2202 }
1662 2203
1663 $self->_set_text ($text); 2204 $self->_set_text ($text);
1664 2205
1665 $self->realloc; 2206 $self->realloc;
1666} 2207 $self->update;
1667 2208
2209 1
2210}
2211
1668sub focus_in { 2212sub invoke_focus_in {
1669 my ($self) = @_; 2213 my ($self) = @_;
1670 2214
1671 $self->{last_activity} = $::NOW; 2215 $self->{last_activity} = $::NOW;
1672 2216
1673 $self->SUPER::focus_in; 2217 $self->SUPER::invoke_focus_in
1674} 2218}
1675 2219
1676sub button_down { 2220sub invoke_button_down {
1677 my ($self, $ev, $x, $y) = @_; 2221 my ($self, $ev, $x, $y) = @_;
1678 2222
1679 $self->SUPER::button_down ($ev, $x, $y); 2223 $self->SUPER::invoke_button_down ($ev, $x, $y);
1680 2224
1681 my $idx = $self->{layout}->xy_to_index ($x, $y); 2225 my $idx = $self->{layout}->xy_to_index ($x, $y);
1682 2226
1683 # byte-index to char-index 2227 # byte-index to char-index
1684 my $text = $self->{text}; 2228 my $text = $self->{text};
1685 utf8::encode $text; 2229 utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1686 $self->{cursor} = length substr $text, 0, $idx; 2230 $self->{cursor} = length $text;
1687 2231
1688 $self->_set_text ($self->{text}); 2232 $self->_set_text ($self->{text});
1689 $self->update; 2233 $self->update;
2234
2235 1
1690} 2236}
1691 2237
1692sub mouse_motion { 2238sub invoke_mouse_motion {
1693 my ($self, $ev, $x, $y) = @_; 2239 my ($self, $ev, $x, $y) = @_;
1694# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 2240# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
2241
2242 1
1695} 2243}
1696 2244
1697sub _draw { 2245sub _draw {
1698 my ($self) = @_; 2246 my ($self) = @_;
1699 2247
1700 local $self->{fg} = $self->{fg}; 2248 local $self->{fg} = $self->{fg};
1701 2249
1702 if ($FOCUS == $self) { 2250 if ($FOCUS == $self) {
1703 glColor @{$self->{active_bg}}; 2251 glColor_premultiply @{$self->{active_bg}};
1704 $self->{fg} = $self->{active_fg}; 2252 $self->{fg} = $self->{active_fg};
1705 } else { 2253 } else {
1706 glColor @{$self->{bg}}; 2254 glColor_premultiply @{$self->{bg}};
1707 } 2255 }
1708 2256
1709 glEnable GL_BLEND; 2257 glEnable GL_BLEND;
1710 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2258 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1711 glBegin GL_QUADS; 2259 glBegin GL_QUADS;
1712 glVertex 0 , 0; 2260 glVertex 0 , 0;
1713 glVertex 0 , $self->{h}; 2261 glVertex 0 , $self->{h};
1714 glVertex $self->{w}, $self->{h}; 2262 glVertex $self->{w}, $self->{h};
1715 glVertex $self->{w}, 0; 2263 glVertex $self->{w}, 0;
… …
1726 utf8::encode $text; 2274 utf8::encode $text;
1727 2275
1728 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text) 2276 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1729 } 2277 }
1730 2278
1731 glColor @{$self->{fg}};
1732 glBegin GL_LINES; 2279 glBegin GL_LINES;
1733 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy}; 2280 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};
1734 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h}; 2281 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1735 glEnd; 2282 glEnd;
1736 } 2283 }
1737} 2284}
1738 2285
2286#############################################################################
2287
1739package CFClient::UI::Entry; 2288package CFPlus::UI::Entry;
1740 2289
1741our @ISA = CFClient::UI::EntryBase::; 2290our @ISA = CFPlus::UI::EntryBase::;
1742 2291
1743use CFClient::OpenGL; 2292use CFPlus::OpenGL;
1744 2293
1745sub key_down { 2294sub invoke_key_down {
1746 my ($self, $ev) = @_; 2295 my ($self, $ev) = @_;
1747 2296
1748 my $sym = $ev->{sym}; 2297 my $sym = $ev->{sym};
1749 2298
1750 if ($sym == 13) { 2299 if ($ev->{uni} == 0x0d || $sym == 13) {
1751 unshift @{$self->{history}}, 2300 unshift @{$self->{history}},
1752 my $txt = $self->get_text; 2301 my $txt = $self->get_text;
2302
1753 $self->{history_pointer} = -1; 2303 $self->{history_pointer} = -1;
1754 $self->{history_saveback} = ''; 2304 $self->{history_saveback} = '';
1755 $self->_emit (activate => $txt); 2305 $self->emit (activate => $txt);
1756 $self->update; 2306 $self->update;
1757 2307
1758 } elsif ($sym == CFClient::SDLK_UP) { 2308 } elsif ($sym == CFPlus::SDLK_UP) {
1759 if ($self->{history_pointer} < 0) { 2309 if ($self->{history_pointer} < 0) {
1760 $self->{history_saveback} = $self->get_text; 2310 $self->{history_saveback} = $self->get_text;
1761 } 2311 }
1762 if (@{$self->{history} || []} > 0) { 2312 if (@{$self->{history} || []} > 0) {
1763 $self->{history_pointer}++; 2313 $self->{history_pointer}++;
… …
1765 $self->{history_pointer} = @{$self->{history} || []} - 1; 2315 $self->{history_pointer} = @{$self->{history} || []} - 1;
1766 } 2316 }
1767 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2317 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1768 } 2318 }
1769 2319
1770 } elsif ($sym == CFClient::SDLK_DOWN) { 2320 } elsif ($sym == CFPlus::SDLK_DOWN) {
1771 $self->{history_pointer}--; 2321 $self->{history_pointer}--;
1772 $self->{history_pointer} = -1 if $self->{history_pointer} < 0; 2322 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1773 2323
1774 if ($self->{history_pointer} >= 0) { 2324 if ($self->{history_pointer} >= 0) {
1775 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2325 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1776 } else { 2326 } else {
1777 $self->set_text ($self->{history_saveback}); 2327 $self->set_text ($self->{history_saveback});
1778 } 2328 }
1779 2329
1780 } else { 2330 } else {
1781 $self->SUPER::key_down ($ev); 2331 return $self->SUPER::invoke_key_down ($ev)
2332 }
2333
1782 } 2334 1
1783
1784} 2335}
1785 2336
1786############################################################################# 2337#############################################################################
1787 2338
2339package CFPlus::UI::TextEdit;
2340
2341our @ISA = CFPlus::UI::EntryBase::;
2342
2343use CFPlus::OpenGL;
2344
2345sub move_cursor_ver {
2346 my ($self, $dy) = @_;
2347
2348 my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
2349
2350 $y += $dy;
2351
2352 if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {
2353 $self->{cursor} = $index;
2354 delete $self->{cur_h};
2355 $self->update;
2356 return;
2357 }
2358}
2359
2360sub invoke_key_down {
2361 my ($self, $ev) = @_;
2362
2363 my $sym = $ev->{sym};
2364
2365 if ($sym == CFPlus::SDLK_UP) {
2366 $self->move_cursor_ver (-1);
2367 } elsif ($sym == CFPlus::SDLK_DOWN) {
2368 $self->move_cursor_ver (+1);
2369 } else {
2370 return $self->SUPER::invoke_key_down ($ev)
2371 }
2372
2373 1
2374}
2375
2376#############################################################################
2377
1788package CFClient::UI::Button; 2378package CFPlus::UI::Button;
1789 2379
1790our @ISA = CFClient::UI::Label::; 2380our @ISA = CFPlus::UI::Label::;
1791 2381
1792use CFClient::OpenGL; 2382use CFPlus::OpenGL;
1793 2383
1794my @tex = 2384my @tex =
1795 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2385 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1796 qw(b1_button_active.png); 2386 qw(b1_button_inactive.png b1_button_active.png);
1797 2387
1798sub new { 2388sub new {
1799 my $class = shift; 2389 my $class = shift;
1800 2390
1801 $class->SUPER::new ( 2391 $class->SUPER::new (
1802 padding => 4, 2392 padding_x => 4,
2393 padding_y => 4,
1803 fg => [1, 1, 1], 2394 fg => [1.0, 1.0, 1.0],
1804 active_fg => [0, 0, 1], 2395 active_fg => [0.8, 0.8, 0.8],
1805 can_hover => 1, 2396 can_hover => 1,
1806 align => 0, 2397 align => 0,
1807 valign => 0, 2398 valign => 0,
1808 can_events => 1, 2399 can_events => 1,
1809 @_ 2400 @_
1810 ) 2401 )
1811} 2402}
1812 2403
1813sub activate { }
1814
1815sub button_up { 2404sub invoke_button_up {
1816 my ($self, $ev, $x, $y) = @_; 2405 my ($self, $ev, $x, $y) = @_;
1817 2406
1818 $self->emit ("activate") 2407 $self->emit ("activate")
1819 if $x >= 0 && $x < $self->{w} 2408 if $x >= 0 && $x < $self->{w}
1820 && $y >= 0 && $y < $self->{h}; 2409 && $y >= 0 && $y < $self->{h};
2410
2411 1
1821} 2412}
1822 2413
1823sub _draw { 2414sub _draw {
1824 my ($self) = @_; 2415 my ($self) = @_;
1825 2416
1826 local $self->{fg} = $self->{fg}; 2417 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1827
1828 if ($GRAB == $self) {
1829 $self->{fg} = $self->{active_fg};
1830 }
1831 2418
1832 glEnable GL_TEXTURE_2D; 2419 glEnable GL_TEXTURE_2D;
1833 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2420 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1834 glColor 0, 0, 0, 1; 2421 glColor 0, 0, 0, 1;
1835 2422
2423 my $tex = $tex[$GRAB == $self];
1836 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2424 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1837 2425
1838 glDisable GL_TEXTURE_2D; 2426 glDisable GL_TEXTURE_2D;
1839 2427
1840 $self->SUPER::_draw; 2428 $self->SUPER::_draw;
1841} 2429}
1842 2430
1843############################################################################# 2431#############################################################################
1844 2432
1845package CFClient::UI::CheckBox; 2433package CFPlus::UI::CheckBox;
1846 2434
1847our @ISA = CFClient::UI::DrawBG::; 2435our @ISA = CFPlus::UI::DrawBG::;
1848 2436
1849my @tex = 2437my @tex =
1850 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2438 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1851 qw(c1_checkbox_bg.png c1_checkbox_active.png); 2439 qw(c1_checkbox_bg.png c1_checkbox_active.png);
1852 2440
1853use CFClient::OpenGL; 2441use CFPlus::OpenGL;
1854 2442
1855sub new { 2443sub new {
1856 my $class = shift; 2444 my $class = shift;
1857 2445
1858 $class->SUPER::new ( 2446 $class->SUPER::new (
1859 padding => 2, 2447 padding_x => 2,
2448 padding_y => 2,
1860 fg => [1, 1, 1], 2449 fg => [1, 1, 1],
1861 active_fg => [1, 1, 0], 2450 active_fg => [1, 1, 0],
1862 bg => [0, 0, 0, 0.2], 2451 bg => [0, 0, 0, 0.2],
1863 active_bg => [1, 1, 1, 0.5], 2452 active_bg => [1, 1, 1, 0.5],
1864 state => 0, 2453 state => 0,
… …
1868} 2457}
1869 2458
1870sub size_request { 2459sub size_request {
1871 my ($self) = @_; 2460 my ($self) = @_;
1872 2461
1873 ($self->{padding} * 2 + 6) x 2 2462 (6) x 2
1874} 2463}
1875 2464
2465sub toggle {
2466 my ($self) = @_;
2467
2468 $self->{state} = !$self->{state};
2469 $self->emit (changed => $self->{state});
2470 $self->update;
2471}
2472
1876sub button_down { 2473sub invoke_button_down {
1877 my ($self, $ev, $x, $y) = @_; 2474 my ($self, $ev, $x, $y) = @_;
1878 2475
1879 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 2476 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1880 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 2477 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1881 $self->{state} = !$self->{state}; 2478 $self->toggle;
1882 $self->_emit (changed => $self->{state}); 2479 } else {
2480 return 0
2481 }
2482
1883 } 2483 1
1884} 2484}
1885 2485
1886sub _draw { 2486sub _draw {
1887 my ($self) = @_; 2487 my ($self) = @_;
1888 2488
1889 $self->SUPER::_draw; 2489 $self->SUPER::_draw;
1890 2490
1891 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 2491 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1892 2492
1893 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 2493 my ($w, $h) = @$self{qw(w h)};
2494
2495 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1894 2496
1895 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 2497 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1896 2498
1897 my $tex = $self->{state} ? $tex[1] : $tex[0]; 2499 my $tex = $self->{state} ? $tex[1] : $tex[0];
1898 2500
… …
1901 glDisable GL_TEXTURE_2D; 2503 glDisable GL_TEXTURE_2D;
1902} 2504}
1903 2505
1904############################################################################# 2506#############################################################################
1905 2507
1906package CFClient::UI::Image; 2508package CFPlus::UI::Image;
1907 2509
1908our @ISA = CFClient::UI::Base::; 2510our @ISA = CFPlus::UI::Base::;
1909 2511
1910use CFClient::OpenGL; 2512use CFPlus::OpenGL;
1911use Carp qw/confess/;
1912 2513
1913our %loaded_images; 2514our %texture_cache;
1914 2515
1915sub new { 2516sub new {
1916 my $class = shift; 2517 my $class = shift;
1917 2518
1918 my $self = $class->SUPER::new (can_events => 0, @_); 2519 my $self = $class->SUPER::new (
2520 can_events => 0,
2521 @_,
2522 );
1919 2523
1920 $self->{image} or confess "Image has 'image' not set. This is a fatal error!"; 2524 $self->{path} || $self->{tex}
2525 or Carp::croak "'path' or 'tex' attributes required";
1921 2526
1922 $loaded_images{$self->{image}} ||= 2527 $self->{tex} ||= $texture_cache{$self->{path}} ||=
1923 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1; 2528 new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
1924 2529
1925 my $tex = $self->{tex} = $loaded_images{$self->{image}}; 2530 CFPlus::weaken $texture_cache{$self->{path}};
1926 2531
1927 Scalar::Util::weaken $loaded_images{$self->{image}}; 2532 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
1928
1929 $self->{aspect} = $tex->{w} / $tex->{h};
1930 2533
1931 $self 2534 $self
1932} 2535}
1933 2536
2537sub STORABLE_freeze {
2538 my ($self, $cloning) = @_;
2539
2540 $self->{path}
2541 or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
2542
2543 $self->{path}
2544}
2545
2546sub STORABLE_attach {
2547 my ($self, $cloning, $path) = @_;
2548
2549 $self->new (path => $path)
2550}
2551
1934sub size_request { 2552sub size_request {
1935 my ($self) = @_; 2553 my ($self) = @_;
1936 2554
1937 ($self->{tex}->{w}, $self->{tex}->{h}) 2555 ($self->{tex}{w}, $self->{tex}{h})
1938} 2556}
1939 2557
1940sub _draw { 2558sub _draw {
1941 my ($self) = @_; 2559 my ($self) = @_;
1942 2560
… …
1952 } 2570 }
1953 2571
1954 glEnable GL_TEXTURE_2D; 2572 glEnable GL_TEXTURE_2D;
1955 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2573 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1956 2574
1957 $tex->draw_quad_alpha (0, 0, $w, $h); 2575 $tex->draw_quad (0, 0, $w, $h);
1958 2576
1959 glDisable GL_TEXTURE_2D; 2577 glDisable GL_TEXTURE_2D;
1960} 2578}
1961 2579
1962############################################################################# 2580#############################################################################
1963 2581
2582package CFPlus::UI::ImageButton;
2583
2584our @ISA = CFPlus::UI::Image::;
2585
2586use CFPlus::OpenGL;
2587
2588my %textures;
2589
2590sub new {
2591 my $class = shift;
2592
2593 my $self = $class->SUPER::new (
2594 padding_x => 4,
2595 padding_y => 4,
2596 fg => [1, 1, 1],
2597 active_fg => [0, 0, 1],
2598 can_hover => 1,
2599 align => 0,
2600 valign => 0,
2601 can_events => 1,
2602 @_
2603 );
2604}
2605
2606sub invoke_button_up {
2607 my ($self, $ev, $x, $y) = @_;
2608
2609 $self->emit ("activate")
2610 if $x >= 0 && $x < $self->{w}
2611 && $y >= 0 && $y < $self->{h};
2612
2613 1
2614}
2615
2616#############################################################################
2617
1964package CFClient::UI::VGauge; 2618package CFPlus::UI::VGauge;
1965 2619
1966our @ISA = CFClient::UI::Base::; 2620our @ISA = CFPlus::UI::Base::;
1967 2621
1968use List::Util qw(min max); 2622use List::Util qw(min max);
1969 2623
1970use CFClient::OpenGL; 2624use CFPlus::OpenGL;
1971 2625
1972my %tex = ( 2626my %tex = (
1973 food => [ 2627 food => [
1974 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2628 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1975 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 2629 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
1976 ], 2630 ],
1977 grace => [ 2631 grace => [
1978 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2632 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1979 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/ 2633 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
1980 ], 2634 ],
1981 hp => [ 2635 hp => [
1982 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2636 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1983 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 2637 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
1984 ], 2638 ],
1985 mana => [ 2639 mana => [
1986 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2640 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1987 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/ 2641 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
1988 ], 2642 ],
1989); 2643);
1990 2644
1991# eg. VGauge->new (gauge => 'food'), default gauge: food 2645# eg. VGauge->new (gauge => 'food'), default gauge: food
… …
2051 my $ycut1 = max 0, min 1, $ycut; 2705 my $ycut1 = max 0, min 1, $ycut;
2052 my $ycut2 = max 0, min 1, $ycut - 1; 2706 my $ycut2 = max 0, min 1, $ycut - 1;
2053 2707
2054 my $h1 = $self->{h} * (1 - $ycut1); 2708 my $h1 = $self->{h} * (1 - $ycut1);
2055 my $h2 = $self->{h} * (1 - $ycut2); 2709 my $h2 = $self->{h} * (1 - $ycut2);
2710 my $h3 = $self->{h};
2711
2712 $_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
2056 2713
2057 glEnable GL_BLEND; 2714 glEnable GL_BLEND;
2058 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2715 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2716 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2059 glEnable GL_TEXTURE_2D; 2717 glEnable GL_TEXTURE_2D;
2060 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2718 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2061 2719
2062 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2720 glBindTexture GL_TEXTURE_2D, $t1->{name};
2063 glBegin GL_QUADS; 2721 glBegin GL_QUADS;
… …
2078 2736
2079 if ($t3) { 2737 if ($t3) {
2080 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2738 glBindTexture GL_TEXTURE_2D, $t3->{name};
2081 glBegin GL_QUADS; 2739 glBegin GL_QUADS;
2082 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2740 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2083 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2741 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2084 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2742 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2085 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2743 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2086 glEnd; 2744 glEnd;
2087 } 2745 }
2088 2746
2089 glDisable GL_BLEND; 2747 glDisable GL_BLEND;
2090 glDisable GL_TEXTURE_2D; 2748 glDisable GL_TEXTURE_2D;
2091} 2749}
2092 2750
2093############################################################################# 2751#############################################################################
2094 2752
2095package CFClient::UI::Gauge; 2753package CFPlus::UI::Gauge;
2096 2754
2097our @ISA = CFClient::UI::VBox::; 2755our @ISA = CFPlus::UI::VBox::;
2098 2756
2099sub new { 2757sub new {
2100 my ($class, %arg) = @_; 2758 my ($class, %arg) = @_;
2101 2759
2102 my $self = $class->SUPER::new ( 2760 my $self = $class->SUPER::new (
… …
2104 can_hover => 1, 2762 can_hover => 1,
2105 can_events => 1, 2763 can_events => 1,
2106 %arg, 2764 %arg,
2107 ); 2765 );
2108 2766
2109 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999"); 2767 $self->add ($self->{value} = new CFPlus::UI::Label valign => +1, align => 0, template => "999");
2110 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1); 2768 $self->add ($self->{gauge} = new CFPlus::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
2111 $self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999"); 2769 $self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
2112 2770
2113 $self 2771 $self
2114} 2772}
2115 2773
2116sub set_fontsize { 2774sub set_fontsize {
… …
2137 $self->{value}->set_text ($val); 2795 $self->{value}->set_text ($val);
2138} 2796}
2139 2797
2140############################################################################# 2798#############################################################################
2141 2799
2142package CFClient::UI::Slider; 2800package CFPlus::UI::Slider;
2143 2801
2144use strict; 2802use strict;
2145 2803
2146use CFClient::OpenGL; 2804use CFPlus::OpenGL;
2147 2805
2148our @ISA = CFClient::UI::DrawBG::; 2806our @ISA = CFPlus::UI::DrawBG::;
2149 2807
2150my @tex = 2808my @tex =
2151 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 2809 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2152 qw(s1_slider.png s1_slider_bg.png); 2810 qw(s1_slider.png s1_slider_bg.png);
2153 2811
2154sub new { 2812sub new {
2155 my $class = shift; 2813 my $class = shift;
2156 2814
… …
2163 fg => [1, 1, 1], 2821 fg => [1, 1, 1],
2164 active_fg => [0, 0, 0], 2822 active_fg => [0, 0, 0],
2165 bg => [0, 0, 0, 0.2], 2823 bg => [0, 0, 0, 0.2],
2166 active_bg => [1, 1, 1, 0.5], 2824 active_bg => [1, 1, 1, 0.5],
2167 range => [0, 0, 100, 10, 0], 2825 range => [0, 0, 100, 10, 0],
2168 req_w => $::WIDTH / 80, 2826 min_w => $::WIDTH / 80,
2169 req_h => $::WIDTH / 80, 2827 min_h => $::WIDTH / 80,
2170 vertical => 0, 2828 vertical => 0,
2171 can_hover => 1, 2829 can_hover => 1,
2172 inner_pad => 0.02, 2830 inner_pad => 0.02,
2173 @_ 2831 @_
2174 ); 2832 );
… …
2177 $self->update; 2835 $self->update;
2178 2836
2179 $self 2837 $self
2180} 2838}
2181 2839
2182sub changed { }
2183
2184sub set_range { 2840sub set_range {
2185 my ($self, $range) = @_; 2841 my ($self, $range) = @_;
2186 2842
2187 ($range, $self->{range}) = ($self->{range}, $range); 2843 ($range, $self->{range}) = ($self->{range}, $range);
2188 2844
2189 $self->update
2190 if "@$range" ne "@{$self->{range}}"; 2845 if ("@$range" ne "@{$self->{range}}") {
2846 $self->update;
2847 $self->set_value ($self->{range}[0]);
2848 }
2191} 2849}
2192 2850
2193sub set_value { 2851sub set_value {
2194 my ($self, $value) = @_; 2852 my ($self, $value) = @_;
2195 2853
… …
2206 if $unit; 2864 if $unit;
2207 2865
2208 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2866 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2209 2867
2210 if ($value != $old_value) { 2868 if ($value != $old_value) {
2211 $self->_emit (changed => $value); 2869 $self->emit (changed => $value);
2212 $self->update; 2870 $self->update;
2213 } 2871 }
2214} 2872}
2215 2873
2216sub size_request { 2874sub size_request {
2217 my ($self) = @_; 2875 my ($self) = @_;
2218 2876
2219 my $w = $self->{req_w}; 2877 ($self->{req_w}, $self->{req_h})
2220 my $h = $self->{req_h};
2221
2222 $self->{vertical} ? ($h, $w) : ($w, $h)
2223} 2878}
2224 2879
2225sub button_down { 2880sub invoke_button_down {
2226 my ($self, $ev, $x, $y) = @_; 2881 my ($self, $ev, $x, $y) = @_;
2227 2882
2228 $self->SUPER::button_down ($ev, $x, $y); 2883 $self->SUPER::invoke_button_down ($ev, $x, $y);
2229 2884
2230 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2885 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2231 2886
2232 $self->mouse_motion ($ev, $x, $y); 2887 $self->invoke_mouse_motion ($ev, $x, $y)
2233} 2888}
2234 2889
2235sub mouse_motion { 2890sub invoke_mouse_motion {
2236 my ($self, $ev, $x, $y) = @_; 2891 my ($self, $ev, $x, $y) = @_;
2237 2892
2238 if ($GRAB == $self) { 2893 if ($GRAB == $self) {
2239 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2894 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2240 2895
2241 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2896 my (undef, $lo, $hi, $page) = @{$self->{range}};
2242 2897
2243 $x = ($x - $self->{click}[1]) / ($w * $self->{scale}); 2898 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2244 2899
2245 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo)); 2900 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2901 } else {
2902 return 0;
2903 }
2904
2246 } 2905 1
2906}
2907
2908sub invoke_mouse_wheel {
2909 my ($self, $ev) = @_;
2910
2911 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2912
2913 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
2914
2915 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2916
2917 ! ! $delta
2247} 2918}
2248 2919
2249sub update { 2920sub update {
2250 my ($self) = @_; 2921 my ($self) = @_;
2251 2922
2252 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 2923 delete $self->{knob_w};
2924 $self->SUPER::update;
2925}
2926
2927sub _draw {
2928 my ($self) = @_;
2929
2930 unless ($self->{knob_w}) {
2253 $self->set_value ($self->{range}[0]); 2931 $self->set_value ($self->{range}[0]);
2254 2932
2255 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2933 my ($value, $lo, $hi, $page) = @{$self->{range}};
2256 my $range = ($hi - $page - $lo) || 1e-100; 2934 my $range = ($hi - $page - $lo) || 1e-100;
2257 2935
… …
2263 $value = ($value - $lo) / $range; 2941 $value = ($value - $lo) / $range;
2264 $value = $value * $self->{scale} + $self->{offset}; 2942 $value = $value * $self->{scale} + $self->{offset};
2265 2943
2266 $self->{knob_x} = $value - $knob_w * 0.5; 2944 $self->{knob_x} = $value - $knob_w * 0.5;
2267 $self->{knob_w} = $knob_w; 2945 $self->{knob_w} = $knob_w;
2268 }); 2946 }
2269
2270 $self->SUPER::update;
2271}
2272
2273sub _draw {
2274 my ($self) = @_;
2275 2947
2276 $self->SUPER::_draw (); 2948 $self->SUPER::_draw ();
2277 2949
2278 glScale $self->{w}, $self->{h}; 2950 glScale $self->{w}, $self->{h};
2279 2951
… …
2299 glDisable GL_TEXTURE_2D; 2971 glDisable GL_TEXTURE_2D;
2300} 2972}
2301 2973
2302############################################################################# 2974#############################################################################
2303 2975
2304package CFClient::UI::ValSlider; 2976package CFPlus::UI::ValSlider;
2305 2977
2306our @ISA = CFClient::UI::HBox::; 2978our @ISA = CFPlus::UI::HBox::;
2307 2979
2308sub new { 2980sub new {
2309 my ($class, %arg) = @_; 2981 my ($class, %arg) = @_;
2310 2982
2311 my $range = delete $arg{range}; 2983 my $range = delete $arg{range};
2312 2984
2313 my $self = $class->SUPER::new ( 2985 my $self = $class->SUPER::new (
2314 slider => (new CFClient::UI::Slider expand => 1, range => $range), 2986 slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2315 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}), 2987 entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2316 to_value => sub { shift }, 2988 to_value => sub { shift },
2317 from_value => sub { shift }, 2989 from_value => sub { shift },
2318 %arg, 2990 %arg,
2319 ); 2991 );
2320 2992
… …
2340sub set_range { shift->{slider}->set_range (@_) } 3012sub set_range { shift->{slider}->set_range (@_) }
2341sub set_value { shift->{slider}->set_value (@_) } 3013sub set_value { shift->{slider}->set_value (@_) }
2342 3014
2343############################################################################# 3015#############################################################################
2344 3016
2345package CFClient::UI::TextView; 3017package CFPlus::UI::TextScroller;
2346 3018
2347our @ISA = CFClient::UI::HBox::; 3019our @ISA = CFPlus::UI::HBox::;
2348 3020
2349use CFClient::OpenGL; 3021use CFPlus::OpenGL;
2350 3022
2351sub new { 3023sub new {
2352 my $class = shift; 3024 my $class = shift;
2353 3025
2354 my $self = $class->SUPER::new ( 3026 my $self = $class->SUPER::new (
2355 fontsize => 1, 3027 fontsize => 1,
2356 can_events => 0, 3028 can_events => 1,
3029 indent => 0,
2357 #font => default_font 3030 #font => default_font
2358 @_, 3031 @_,
2359 3032
2360 layout => (new CFClient::Layout 1), 3033 layout => (new CFPlus::Layout),
2361 par => [], 3034 par => [],
3035 max_par => 0,
2362 height => 0, 3036 height => 0,
2363 children => [ 3037 children => [
2364 (new CFClient::UI::Empty expand => 1), 3038 (new CFPlus::UI::Empty expand => 1),
2365 (new CFClient::UI::Slider vertical => 1), 3039 (new CFPlus::UI::Slider vertical => 1),
2366 ], 3040 ],
2367 ); 3041 );
2368 3042
2369 $self->{children}[1]->connect (changed => sub { $self->update }); 3043 $self->{children}[1]->connect (changed => sub { $self->update });
2370 3044
… …
2376 3050
2377 $self->{fontsize} = $fontsize; 3051 $self->{fontsize} = $fontsize;
2378 $self->reflow; 3052 $self->reflow;
2379} 3053}
2380 3054
3055sub size_request {
3056 my ($self) = @_;
3057
3058 my ($empty, $slider) = @{ $self->{children} };
3059
3060 local $self->{children} = [$empty, $slider];
3061 $self->SUPER::size_request
3062}
3063
2381sub size_allocate { 3064sub invoke_size_allocate {
2382 my ($self, $w, $h, $changed) = @_; 3065 my ($self, $w, $h) = @_;
2383 3066
2384 $self->SUPER::size_allocate ($w, $h, $changed); 3067 my ($empty, $slider, @other) = @{ $self->{children} };
2385 3068 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
2386 return unless $changed;
2387 3069
2388 $self->{layout}->set_font ($self->{font}) if $self->{font}; 3070 $self->{layout}->set_font ($self->{font}) if $self->{font};
2389 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 3071 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2390 $self->{layout}->set_width ($self->{children}[0]{w}); 3072 $self->{layout}->set_width ($empty->{w});
3073 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2391 3074
2392 $self->reflow; 3075 $self->reflow;
2393}
2394 3076
2395sub text_size { 3077 local $self->{children} = [$empty, $slider];
3078 $self->SUPER::invoke_size_allocate ($w, $h)
3079}
3080
3081sub invoke_mouse_wheel {
2396 my ($self, $text, $indent) = @_; 3082 my ($self, $ev) = @_;
3083
3084 return 0 unless $ev->{dy}; # only vertical movements
3085
3086 $self->{children}[1]->emit (mouse_wheel => $ev);
3087
3088 1
3089}
3090
3091sub get_layout {
3092 my ($self, $para) = @_;
2397 3093
2398 my $layout = $self->{layout}; 3094 my $layout = $self->{layout};
2399 3095
3096 $layout->set_font ($self->{font}) if $self->{font};
3097 $layout->set_foreground (@{$para->{fg}});
2400 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 3098 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2401 $layout->set_width ($self->{children}[0]{w} - $indent); 3099 $layout->set_width ($self->{children}[0]{w} - $para->{indent});
3100 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2402 $layout->set_markup ($text); 3101 $layout->set_markup ($para->{markup});
3102
3103 $layout->set_shapes (
3104 map
3105 +(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
3106 @{$para->{widget}}
2403 3107 );
3108
2404 $layout->size 3109 $layout
2405} 3110}
2406 3111
2407sub reflow { 3112sub reflow {
2408 my ($self) = @_; 3113 my ($self) = @_;
2409 3114
… …
2416 3121
2417 # todo: base offset on lines or so, not on pixels 3122 # todo: base offset on lines or so, not on pixels
2418 $self->{children}[1]->set_value ($offset); 3123 $self->{children}[1]->set_value ($offset);
2419} 3124}
2420 3125
3126sub current_paragraph {
3127 my ($self) = @_;
3128
3129 $self->{top_paragraph} - 1
3130}
3131
3132sub scroll_to {
3133 my ($self, $para) = @_;
3134
3135 $para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
3136
3137 $self->{scroll_to} = $para;
3138 $self->update;
3139}
3140
2421sub clear { 3141sub clear {
2422 my ($self) = @_; 3142 my ($self) = @_;
3143
3144 my (undef, undef, @other) = @{ $self->{children} };
3145 $self->remove ($_) for @other;
2423 3146
2424 $self->{par} = []; 3147 $self->{par} = [];
2425 $self->{height} = 0; 3148 $self->{height} = 0;
2426 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 3149 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2427} 3150}
2428 3151
2429sub add_paragraph { 3152sub add_paragraph {
2430 my ($self, $color, $text, $indent) = @_; 3153 my $self = shift;
2431 3154
2432 for my $line (split /\n/, $text) { 3155 for my $para (@_) {
2433 my ($w, $h) = $self->text_size ($line); 3156 $para = {
3157 fg => [1, 1, 1, 1],
3158 indent => 0,
3159 markup => "",
3160 widget => [],
3161 ref $para ? %$para : (markup => $para),
3162 w => 1e10,
3163 wrapped => 1,
3164 };
3165
3166 $self->add (@{ $para->{widget} }) if @{ $para->{widget} };
3167 push @{$self->{par}}, $para;
3168 }
3169
3170 if (my $max = $self->{max_par}) {
3171 shift @{$self->{par}} while @{$self->{par}} > $max;
3172 }
3173
3174 $self->{need_reflow}++;
3175 $self->update;
3176}
3177
3178sub scroll_to_bottom {
3179 my ($self) = @_;
3180
3181 $self->{scroll_to} = $#{$self->{par}};
3182 $self->update;
3183}
3184
3185sub force_uptodate {
3186 my ($self) = @_;
3187
3188 if (delete $self->{need_reflow}) {
3189 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
3190
3191 my $height = 0;
3192
3193 for my $para (@{$self->{par}}) {
3194 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
3195 my $layout = $self->get_layout ($para);
3196 my ($w, $h) = $layout->size;
3197
3198 $para->{w} = $w + $para->{indent};
3199 $para->{h} = $h;
3200 $para->{wrapped} = $layout->has_wrapped;
3201 }
3202
3203 $para->{y} = $height;
3204 $height += $para->{h};
3205 }
3206
2434 $self->{height} += $h; 3207 $self->{height} = $height;
2435 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line]; 3208 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2436 }
2437 3209
2438 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]); 3210 delete $self->{texture};
3211 }
3212
3213 if (my $paridx = delete $self->{scroll_to}) {
3214 $self->{children}[1]->set_value ($self->{par}[$paridx]{y});
3215 }
2439} 3216}
2440 3217
2441sub update { 3218sub update {
2442 my ($self) = @_; 3219 my ($self) = @_;
2443 3220
… …
2445 3222
2446 return unless $self->{h} > 0; 3223 return unless $self->{h} > 0;
2447 3224
2448 delete $self->{texture}; 3225 delete $self->{texture};
2449 3226
2450 $ROOT->on_post_alloc ($self, sub { 3227 $ROOT->on_post_alloc ($self => sub {
3228 $self->force_uptodate;
3229
2451 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 3230 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2452 3231
2453 if (delete $self->{need_reflow}) {
2454 my $height = 0;
2455
2456 my $layout = $self->{layout};
2457
2458 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2459
2460 for (@{$self->{par}}) {
2461 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2462 $layout->set_width ($W - $_->[3]);
2463 $layout->set_markup ($_->[4]);
2464 my ($w, $h) = $layout->size;
2465 $_->[0] = $w + $_->[3];
2466 $_->[1] = $h;
2467 }
2468
2469 $height += $_->[1];
2470 }
2471
2472 $self->{height} = $height;
2473
2474 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2475
2476 delete $self->{texture};
2477 }
2478
2479 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 3232 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2480 glClearColor 0.5, 0.5, 0.5, 0; 3233 glClearColor 0, 0, 0, 0;
2481 glClear GL_COLOR_BUFFER_BIT; 3234 glClear GL_COLOR_BUFFER_BIT;
2482 3235
3236 package CFPlus::UI::Base;
3237 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3238 (0, 0, $self->{w}, $self->{h});
3239
3240 my $top = int $self->{children}[1]{range}[0];
3241
3242 my $paridx = 0;
3243 my $top_paragraph;
2483 my $top = int $self->{children}[1]{range}[0]; 3244 my $top = int $self->{children}[1]{range}[0];
2484 3245
2485 my $y0 = $top; 3246 my $y0 = $top;
2486 my $y1 = $top + $H; 3247 my $y1 = $top + $H;
2487 3248
2488 my $y = 0;
2489
2490 my $layout = $self->{layout};
2491
2492 $layout->set_font ($self->{font}) if $self->{font};
2493
2494 glEnable GL_BLEND;
2495 #TODO# not correct in windows where rgba is forced off
2496 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2497
2498 for my $par (@{$self->{par}}) { 3249 for my $para (@{$self->{par}}) {
2499 my $h = $par->[1]; 3250 my $h = $para->{h};
3251 my $y = $para->{y};
2500 3252
2501 if ($y0 < $y + $h && $y < $y1) { 3253 if ($y0 < $y + $h && $y < $y1) {
2502 $layout->set_foreground (@{ $par->[2] }); 3254 my $layout = $self->get_layout ($para);
2503 $layout->set_width ($W - $par->[3]);
2504 $layout->set_markup ($par->[4]);
2505 3255
2506 my ($w, $h, $data, $format, $internalformat) = $layout->render; 3256 $layout->render ($para->{indent}, $y - $y0);
2507 3257
2508 glRasterPos $par->[3], $y - $y0; 3258 if (my @w = @{ $para->{widget} }) {
2509 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data; 3259 my @s = $layout->get_shapes;
3260
3261 for (@w) {
3262 my ($dx, $dy) = splice @s, 0, 2, ();
3263
3264 $_->{x} = $dx + $para->{indent};
3265 $_->{y} = $dy + $y - $y0;
3266
3267 $_->draw;
3268 }
3269 }
2510 } 3270 }
2511 3271
2512 $y += $h; 3272 $paridx++;
3273 $top_paragraph ||= $paridx if $y >= $top;
2513 } 3274 }
2514 3275
2515 glDisable GL_BLEND; 3276 $self->{top_paragraph} = $top_paragraph;
2516 }; 3277 };
2517 }); 3278 });
2518} 3279}
2519 3280
3281sub reconfigure {
3282 my ($self) = @_;
3283
3284 $self->SUPER::reconfigure;
3285
3286 $_->{w} = 1e10 for @{ $self->{par} };
3287 $self->reflow;
3288}
3289
2520sub _draw { 3290sub _draw {
2521 my ($self) = @_; 3291 my ($self) = @_;
2522 3292
2523 glEnable GL_TEXTURE_2D; 3293 glEnable GL_TEXTURE_2D;
2524 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3294 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2525 glColor 1, 1, 1, 1; 3295 glColor 0, 0, 0, 1;
2526 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 3296 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2527 glDisable GL_TEXTURE_2D; 3297 glDisable GL_TEXTURE_2D;
2528 3298
2529 $self->{children}[1]->draw; 3299 $self->{children}[1]->draw;
2530
2531} 3300}
2532 3301
2533############################################################################# 3302#############################################################################
2534 3303
2535package CFClient::UI::Animator; 3304package CFPlus::UI::Animator;
2536 3305
2537use CFClient::OpenGL; 3306use CFPlus::OpenGL;
2538 3307
2539our @ISA = CFClient::UI::Bin::; 3308our @ISA = CFPlus::UI::Bin::;
2540 3309
2541sub moveto { 3310sub moveto {
2542 my ($self, $x, $y) = @_; 3311 my ($self, $x, $y) = @_;
2543 3312
2544 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 3313 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
… …
2572 glPopMatrix; 3341 glPopMatrix;
2573} 3342}
2574 3343
2575############################################################################# 3344#############################################################################
2576 3345
2577package CFClient::UI::Flopper; 3346package CFPlus::UI::Flopper;
2578 3347
2579our @ISA = CFClient::UI::Button::; 3348our @ISA = CFPlus::UI::Button::;
2580 3349
2581sub new { 3350sub new {
2582 my $class = shift; 3351 my $class = shift;
2583 3352
2584 my $self = $class->SUPER::new ( 3353 my $self = $class->SUPER::new (
… …
2596 $self->{other}->toggle_visibility; 3365 $self->{other}->toggle_visibility;
2597} 3366}
2598 3367
2599############################################################################# 3368#############################################################################
2600 3369
2601package CFClient::UI::Tooltip; 3370package CFPlus::UI::Tooltip;
2602 3371
2603our @ISA = CFClient::UI::Bin::; 3372our @ISA = CFPlus::UI::Bin::;
2604 3373
2605use CFClient::OpenGL; 3374use CFPlus::OpenGL;
2606 3375
2607sub new { 3376sub new {
2608 my $class = shift; 3377 my $class = shift;
2609 3378
2610 $class->SUPER::new ( 3379 $class->SUPER::new (
… …
2614} 3383}
2615 3384
2616sub set_tooltip_from { 3385sub set_tooltip_from {
2617 my ($self, $widget) = @_; 3386 my ($self, $widget) = @_;
2618 3387
3388 $widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
3389 if $widget->{tooltip} =~ /^#(.*)$/;
3390
3391 my $tooltip = $widget->{tooltip};
3392
3393 if ($ENV{CFPLUS_DEBUG} & 2) {
3394 $tooltip .= "\n\n" . (ref $widget) . "\n"
3395 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
3396 . "req $widget->{req_w} $widget->{req_h}\n"
3397 . "visible $widget->{visible}";
3398 }
3399
3400 $tooltip =~ s/^\n+//;
3401 $tooltip =~ s/\n+$//;
3402
2619 $self->add (new CFClient::UI::Label 3403 $self->add (new CFPlus::UI::Label
2620 markup => $widget->{tooltip}, 3404 markup => $tooltip,
2621 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3405 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2622 fontsize => 0.8, 3406 fontsize => 0.8,
2623 fg => [0, 0, 0, 1], 3407 style => 1, # FLAG_INVERSE
2624 ellipsise => 0, 3408 ellipsise => 0,
2625 font => ($widget->{tooltip_font} || $::FONT_PROP), 3409 font => ($widget->{tooltip_font} || $::FONT_PROP),
2626 ); 3410 );
2627} 3411}
2628 3412
… …
2632 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 3416 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2633 3417
2634 ($w + 4, $h + 4) 3418 ($w + 4, $h + 4)
2635} 3419}
2636 3420
2637sub size_allocate { 3421sub invoke_size_allocate {
2638 my ($self, $w, $h, $changed) = @_; 3422 my ($self, $w, $h) = @_;
2639 3423
2640 return unless $changed;
2641
2642 $self->SUPER::size_allocate ($w - 4, $h - 4, $changed); 3424 $self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
3425}
3426
3427sub invoke_visibility_change {
3428 my ($self, $visible) = @_;
3429
3430 return unless $visible;
3431
3432 $self->{root}->on_post_alloc ("move_$self" => sub {
3433 my $widget = $self->{owner}
3434 or return;
3435
3436 if ($widget->{visible}) {
3437 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
3438
3439 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
3440 if $x + $self->{w} > $self->{root}{w};
3441
3442 $self->move_abs ($x, $y);
3443 } else {
3444 $self->hide;
3445 }
3446 });
2643} 3447}
2644 3448
2645sub _draw { 3449sub _draw {
2646 my ($self) = @_; 3450 my ($self) = @_;
2647 3451
… …
2664 glVertex $w, $h; 3468 glVertex $w, $h;
2665 glVertex $w, 0; 3469 glVertex $w, 0;
2666 glEnd; 3470 glEnd;
2667 3471
2668 glTranslate 2 - 0.375, 2 - 0.375; 3472 glTranslate 2 - 0.375, 2 - 0.375;
3473
2669 $self->SUPER::_draw; 3474 $self->SUPER::_draw;
2670} 3475}
2671 3476
2672############################################################################# 3477#############################################################################
2673 3478
2674package CFClient::UI::Face; 3479package CFPlus::UI::Face;
2675 3480
2676our @ISA = CFClient::UI::Base::; 3481our @ISA = CFPlus::UI::DrawBG::;
2677 3482
2678use CFClient::OpenGL; 3483use CFPlus::OpenGL;
2679 3484
2680sub new { 3485sub new {
2681 my $class = shift; 3486 my $class = shift;
2682 3487
2683 my $self = $class->SUPER::new ( 3488 my $self = $class->SUPER::new (
3489 size_w => 32,
3490 size_h => 8,
2684 aspect => 1, 3491 aspect => 1,
2685 can_events => 0, 3492 can_events => 0,
2686 @_, 3493 @_,
2687 ); 3494 );
2688 3495
2689 if ($self->{anim} && $self->{animspeed}) { 3496 if ($self->{anim} && $self->{animspeed}) {
2690 Scalar::Util::weaken (my $widget = $self); 3497 CFPlus::weaken (my $widget = $self);
2691 3498
3499 $widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
3500 $widget->{anim_start} = $self->{animspeed} * Event::time / $self->{animspeed};
2692 $self->{timer} = Event->timer ( 3501 $self->{timer} = Event->timer (
2693 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2694 hard => 1, 3502 parked => 1,
2695 interval => $self->{animspeed},
2696 cb => sub { 3503 cb => sub {
3504 return unless $::CONN && $widget;
3505
2697 ++$widget->{frame}; 3506 ++$widget->{frame};
3507 $widget->update_face;
2698 $widget->update; 3508 $widget->update;
3509
3510 $widget->update_timer;
2699 }, 3511 },
2700 ); 3512 );
3513
3514 $self->update_face;
3515 $self->update_timer;
2701 } 3516 }
2702 3517
2703 $self 3518 $self
2704} 3519}
2705 3520
3521sub update_timer {
3522 my ($self) = @_;
3523
3524 return unless $self->{timer};
3525
3526 if ($self->{visible}) {
3527 $self->{timer}->at (
3528 $self->{anim_start}
3529 + $self->{animspeed}
3530 * int 1.5 + (Event::time - $self->{anim_start}) / $self->{animspeed}
3531 );
3532 $self->{timer}->start;
3533 } else {
3534 $self->{timer}->stop;
3535 }
3536}
3537
3538sub update_face {
3539 my ($self) = @_;
3540
3541 return unless $::CONN;
3542
3543 if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3544 if ($anim && @$anim) {
3545 delete $self->{wait_face};
3546 $self->{face} = $anim->[ $self->{frame} % @$anim ];
3547 }
3548 }
3549}
3550
2706sub size_request { 3551sub size_request {
2707 (32, 8) 3552 my ($self) = @_;
3553
3554 if ($::CONN) {
3555 if (my $faceid = $::CONN->{faceid}[$self->{face}]) {
3556 if (my $tex = $::CONN->{texture}[$faceid]) {
3557 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
3558 } else {
3559 $self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub {
3560 $self->realloc;
3561 });
3562 }
3563 }
3564 }
3565
3566 ($self->{size_w} || 8, $self->{size_h} || 8)
2708} 3567}
2709 3568
2710sub update { 3569sub update {
2711 my ($self) = @_; 3570 my ($self) = @_;
2712 3571
2713 return unless $self->{visible}; 3572 return unless $self->{visible};
2714 3573
2715 $self->SUPER::update; 3574 $self->SUPER::update;
2716} 3575}
2717 3576
3577sub invoke_visibility_change {
3578 my ($self) = @_;
3579
3580 $self->update_timer;
3581
3582 0
3583}
3584
2718sub _draw { 3585sub _draw {
2719 my ($self) = @_; 3586 my ($self) = @_;
2720 3587
2721 return unless $::CONN; 3588 return unless $::CONN;
2722 3589
2723 my $face; 3590 $self->SUPER::_draw;
2724 3591
2725 if ($self->{frame}) {
2726 my $anim = $::CONN->{anim}[$self->{anim}]; 3592 my $faceid = $::CONN->{faceid}[$self->{face}]
2727 3593 or return;
2728 $face = $anim->[ $self->{frame} % @$anim ]
2729 if $anim && @$anim;
2730 }
2731 3594
2732 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 3595 my $tex = $::CONN->{texture}[$faceid];
2733 3596
2734 if ($tex) { 3597 if ($tex) {
2735 glEnable GL_TEXTURE_2D; 3598 glEnable GL_TEXTURE_2D;
2736 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3599 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2737 glColor 1, 1, 1, 1; 3600 glColor 0, 0, 0, 1;
2738 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3601 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2739 glDisable GL_TEXTURE_2D; 3602 glDisable GL_TEXTURE_2D;
2740 } 3603 }
2741} 3604}
2742 3605
2743sub DESTROY { 3606sub destroy {
2744 my ($self) = @_; 3607 my ($self) = @_;
2745 3608
2746 $self->{timer}->cancel 3609 (delete $self->{timer})->cancel
2747 if $self->{timer}; 3610 if $self->{timer};
2748 3611
2749 $self->SUPER::DESTROY; 3612 $self->SUPER::destroy;
2750} 3613}
2751 3614
2752############################################################################# 3615#############################################################################
2753 3616
2754package CFClient::UI::Inventory; 3617package CFPlus::UI::Buttonbar;
2755 3618
2756our @ISA = CFClient::UI::ScrolledWindow::; 3619our @ISA = CFPlus::UI::HBox::;
2757 3620
2758sub new { 3621# TODO: should actually wrap buttons and other goodies.
2759 my $class = shift;
2760
2761 my $self = $class->SUPER::new (
2762 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2763 @_,
2764 );
2765
2766 $self
2767}
2768
2769sub set_items {
2770 my ($self, $items) = @_;
2771
2772 $self->{scrolled}->clear;
2773 return unless $items;
2774
2775 my @items = sort {
2776 ($a->{type} <=> $b->{type})
2777 or ($a->{name} cmp $b->{name})
2778 } @$items;
2779
2780 $self->{real_items} = \@items;
2781
2782 my $row = 0;
2783 for my $item (@items) {
2784 CFClient::Item::update_widgets $item;
2785
2786 $self->{scrolled}->add (0, $row, $item->{face_widget});
2787 $self->{scrolled}->add (1, $row, $item->{desc_widget});
2788 $self->{scrolled}->add (2, $row, $item->{weight_widget});
2789
2790 $row++;
2791 }
2792}
2793 3622
2794############################################################################# 3623#############################################################################
2795 3624
2796package CFClient::UI::Menu; 3625package CFPlus::UI::Menu;
2797 3626
2798our @ISA = CFClient::UI::FancyFrame::; 3627our @ISA = CFPlus::UI::Toplevel::;
2799 3628
2800use CFClient::OpenGL; 3629use CFPlus::OpenGL;
2801 3630
2802sub new { 3631sub new {
2803 my $class = shift; 3632 my $class = shift;
2804 3633
2805 my $self = $class->SUPER::new ( 3634 my $self = $class->SUPER::new (
2806 items => [], 3635 items => [],
2807 z => 100, 3636 z => 100,
2808 @_, 3637 @_,
2809 ); 3638 );
2810 3639
2811 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3640 $self->add ($self->{vbox} = new CFPlus::UI::VBox);
2812 3641
2813 for my $item (@{ $self->{items} }) { 3642 for my $item (@{ $self->{items} }) {
2814 my ($widget, $cb) = @$item; 3643 my ($widget, $cb, $tooltip) = @$item;
2815 3644
2816 # handle various types of items, only text for now 3645 # handle various types of items, only text for now
2817 if (!ref $widget) { 3646 if (!ref $widget) {
3647 if ($widget =~ /\t/) {
3648 my ($left, $right) = split /\t/, $widget, 2;
3649
2818 $widget = new CFClient::UI::Label 3650 $widget = new CFPlus::UI::HBox
2819 can_hover => 1, 3651 can_hover => 1,
2820 can_events => 1, 3652 can_events => 1,
3653 tooltip => $tooltip,
3654 children => [
3655 (new CFPlus::UI::Label markup => $left, expand => 1),
3656 (new CFPlus::UI::Label markup => $right, align => +1),
3657 ],
3658 ;
3659
3660 } else {
3661 $widget = new CFPlus::UI::Label
3662 can_hover => 1,
3663 can_events => 1,
2821 text => $widget; 3664 markup => $widget,
3665 tooltip => $tooltip;
3666 }
2822 } 3667 }
2823 3668
2824 $self->{item}{$widget} = $item; 3669 $self->{item}{$widget} = $item;
2825 3670
2826 $self->{vbox}->add ($widget); 3671 $self->{vbox}->add ($widget);
… …
2831 3676
2832# popup given the event (must be a mouse button down event currently) 3677# popup given the event (must be a mouse button down event currently)
2833sub popup { 3678sub popup {
2834 my ($self, $ev) = @_; 3679 my ($self, $ev) = @_;
2835 3680
2836 $self->_emit ("popdown"); 3681 $self->emit ("popdown");
2837 3682
2838 # maybe save $GRAB? must be careful about events... 3683 # maybe save $GRAB? must be careful about events...
2839 $GRAB = $self; 3684 $GRAB = $self;
2840 $self->{button} = $ev->{button}; 3685 $self->{button} = $ev->{button};
2841 3686
2842 $self->show; 3687 $self->show;
2843 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 3688 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2844} 3689}
2845 3690
2846sub mouse_motion { 3691sub invoke_mouse_motion {
2847 my ($self, $ev, $x, $y) = @_; 3692 my ($self, $ev, $x, $y) = @_;
2848 3693
2849 # TODO: should use vbox->find_widget or so 3694 # TODO: should use vbox->find_widget or so
2850 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3695 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2851 $self->{hover} = $self->{item}{$HOVER}; 3696 $self->{hover} = $self->{item}{$HOVER};
2852}
2853 3697
3698 0
3699}
3700
2854sub button_up { 3701sub invoke_button_up {
2855 my ($self, $ev, $x, $y) = @_; 3702 my ($self, $ev, $x, $y) = @_;
2856 3703
2857 if ($ev->{button} == $self->{button}) { 3704 if ($ev->{button} == $self->{button}) {
2858 undef $GRAB; 3705 undef $GRAB;
2859 $self->hide; 3706 $self->hide;
2860 3707
2861 $self->_emit ("popdown"); 3708 $self->emit ("popdown");
2862 $self->{hover}[1]->() if $self->{hover}; 3709 $self->{hover}[1]->() if $self->{hover};
3710 } else {
3711 return 0
3712 }
3713
2863 } 3714 1
2864} 3715}
2865 3716
2866############################################################################# 3717#############################################################################
2867 3718
2868package CFClient::UI::Statusbox; 3719package CFPlus::UI::Multiplexer;
2869 3720
2870our @ISA = CFClient::UI::VBox::; 3721our @ISA = CFPlus::UI::Container::;
2871 3722
2872sub new { 3723sub new {
2873 my $class = shift; 3724 my $class = shift;
2874 3725
2875 $class->SUPER::new ( 3726 my $self = $class->SUPER::new (
3727 @_,
3728 );
3729
3730 $self->{current} = $self->{children}[0]
3731 if @{ $self->{children} };
3732
3733 $self
3734}
3735
3736sub add {
3737 my ($self, @widgets) = @_;
3738
3739 $self->SUPER::add (@widgets);
3740
3741 $self->{current} = $self->{children}[0]
3742 if @{ $self->{children} };
3743}
3744
3745sub get_current_page {
3746 my ($self) = @_;
3747
3748 $self->{current}
3749}
3750
3751sub set_current_page {
3752 my ($self, $page_or_widget) = @_;
3753
3754 my $widget = ref $page_or_widget
3755 ? $page_or_widget
3756 : $self->{children}[$page_or_widget];
3757
3758 $self->{current} = $widget;
3759 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3760
3761 $self->emit (page_changed => $self->{current});
3762
3763 $self->realloc;
3764}
3765
3766sub visible_children {
3767 $_[0]{current}
3768}
3769
3770sub size_request {
3771 my ($self) = @_;
3772
3773 $self->{current}->size_request
3774}
3775
3776sub invoke_size_allocate {
3777 my ($self, $w, $h) = @_;
3778
3779 $self->{current}->configure (0, 0, $w, $h);
3780
3781 1
3782}
3783
3784sub _draw {
3785 my ($self) = @_;
3786
3787 $self->{current}->draw;
3788}
3789
3790#############################################################################
3791
3792package CFPlus::UI::Notebook;
3793
3794our @ISA = CFPlus::UI::VBox::;
3795
3796sub new {
3797 my $class = shift;
3798
3799 my $self = $class->SUPER::new (
3800 buttonbar => (new CFPlus::UI::Buttonbar),
3801 multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3802 # filter => # will be put between multiplexer and $self
3803 @_,
3804 );
3805
3806 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3807 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3808
3809 $self
3810}
3811
3812sub add {
3813 my ($self, $title, $widget, $tooltip) = @_;
3814
3815 CFPlus::weaken $self;
3816
3817 $self->{buttonbar}->add (new CFPlus::UI::Button
3818 markup => $title,
3819 tooltip => $tooltip,
3820 on_activate => sub { $self->set_current_page ($widget) },
3821 );
3822
3823 $self->{multiplexer}->add ($widget);
3824}
3825
3826sub get_current_page {
3827 my ($self) = @_;
3828
3829 $self->{multiplexer}->get_current_page
3830}
3831
3832sub set_current_page {
3833 my ($self, $page) = @_;
3834
3835 $self->{multiplexer}->set_current_page ($page);
3836 $self->emit (page_changed => $self->{multiplexer}{current});
3837}
3838
3839#############################################################################
3840
3841package CFPlus::UI::Selector;
3842
3843use utf8;
3844
3845our @ISA = CFPlus::UI::Button::;
3846
3847sub new {
3848 my $class = shift;
3849
3850 my $self = $class->SUPER::new (
3851 options => [], # [value, title, longdesc], ...
3852 value => undef,
3853 @_,
3854 );
3855
3856 $self->_set_value ($self->{value});
3857
3858 $self
3859}
3860
3861sub invoke_button_down {
3862 my ($self, $ev) = @_;
3863
3864 my @menu_items;
3865
3866 for (@{ $self->{options} }) {
3867 my ($value, $title, $tooltip) = @$_;
3868
3869 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3870 }
3871
3872 CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3873}
3874
3875sub _set_value {
3876 my ($self, $value) = @_;
3877
3878 my ($item) = grep $_->[0] eq $value, @{ $self->{options} }
3879 or return;
3880
3881 $self->{value} = $item->[0];
3882 $self->set_markup ("$item->[1] ⇓");
3883 $self->set_tooltip ($item->[2]);
3884}
3885
3886sub set_value {
3887 my ($self, $value) = @_;
3888
3889 return unless $self->{value} ne $value;
3890
3891 $self->_set_value ($value);
3892 $self->emit (changed => $value);
3893}
3894
3895#############################################################################
3896
3897package CFPlus::UI::Statusbox;
3898
3899our @ISA = CFPlus::UI::VBox::;
3900
3901sub new {
3902 my $class = shift;
3903
3904 my $self = $class->SUPER::new (
2876 fontsize => 0.8, 3905 fontsize => 0.8,
2877 @_, 3906 @_,
2878 ) 3907 );
3908
3909 CFPlus::weaken (my $this = $self);
3910
3911 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3912
3913 $self
2879} 3914}
2880 3915
2881sub reorder { 3916sub reorder {
2882 my ($self) = @_; 3917 my ($self) = @_;
2883 my $NOW = time; 3918 my $NOW = Time::HiRes::time;
3919
3920 # freeze display when hovering over any label
3921 return if $CFPlus::UI::TOOLTIP->{owner}
3922 && grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3923 values %{ $self->{item} };
2884 3924
2885 while (my ($k, $v) = each %{ $self->{item} }) { 3925 while (my ($k, $v) = each %{ $self->{item} }) {
2886 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3926 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2887 } 3927 }
2888 3928
… …
2891 my @items = sort { 3931 my @items = sort {
2892 $a->{pri} <=> $b->{pri} 3932 $a->{pri} <=> $b->{pri}
2893 or $b->{id} <=> $a->{id} 3933 or $b->{id} <=> $a->{id}
2894 } values %{ $self->{item} }; 3934 } values %{ $self->{item} };
2895 3935
3936 $self->{timer}->interval (1);
3937
2896 my $count = 10 + 1; 3938 my $count = 10 + 1;
2897 for my $item (@items) { 3939 for my $item (@items) {
2898 last unless --$count; 3940 last unless --$count;
2899 3941
2900 push @widgets, $item->{label} ||= do { 3942 my $label = $item->{label} ||= do {
2901 # TODO: doesn't handle markup well (read as: at all) 3943 # TODO: doesn't handle markup well (read as: at all)
2902 my $short = $item->{count} > 1 3944 my $short = $item->{count} > 1
2903 ? "<b>$item->{count} ×</b> $item->{text}" 3945 ? "<b>$item->{count} ×</b> $item->{text}"
2904 : $item->{text}; 3946 : $item->{text};
2905 3947
2906 for ($short) { 3948 for ($short) {
2907 s/^\s+//; 3949 s/^\s+//;
2908 s/\s+/ /g; 3950 s/\s+/ /g;
2909 } 3951 }
2910 3952
2911 new CFClient::UI::Label 3953 new CFPlus::UI::Label
2912 markup => $short, 3954 markup => $short,
2913 tooltip => $item->{tooltip}, 3955 tooltip => $item->{tooltip},
2914 tooltip_font => $::FONT_PROP, 3956 tooltip_font => $::FONT_PROP,
2915 tooltip_width => 0.67, 3957 tooltip_width => 0.67,
2916 fontsize => $item->{fontsize} || $self->{fontsize}, 3958 fontsize => $item->{fontsize} || $self->{fontsize},
2917 max_w => $::WIDTH * 0.44, 3959 max_w => $::WIDTH * 0.44,
2918 fg => $item->{fg}, 3960 fg => [@{ $item->{fg} }],
2919 can_events => 1, 3961 can_events => 1,
2920 can_hover => 1 3962 can_hover => 1
2921 }; 3963 };
3964
3965 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3966 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3967 $label->update;
3968 $label->set_max_size (undef, $label->{req_h} * $diff)
3969 if $diff < 1;
3970 $self->{timer}->interval (1/30);
3971 } else {
3972 $label->{fg}[3] = $item->{fg}[3] || 1;
3973 }
3974
3975 push @widgets, $label;
2922 } 3976 }
2923 3977
2924 $self->clear; 3978 $self->clear;
2925 $self->SUPER::add (reverse @widgets); 3979 $self->SUPER::add (reverse @widgets);
2926} 3980}
… …
2931 $text =~ s/^\s+//; 3985 $text =~ s/^\s+//;
2932 $text =~ s/\s+$//; 3986 $text =~ s/\s+$//;
2933 3987
2934 return unless $text; 3988 return unless $text;
2935 3989
2936 my $timeout = time + ((delete $arg{timeout}) || 60); 3990 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
2937 3991
2938 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3992 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2939 3993
2940 if (my $item = $self->{item}{$group}) { 3994 if (my $item = $self->{item}{$group}) {
2941 if ($item->{text} eq $text) { 3995 if ($item->{text} eq $text) {
2942 $item->{count}++; 3996 $item->{count}++;
2943 } else { 3997 } else {
2944 $item->{count} = 1; 3998 $item->{count} = 1;
2945 $item->{text} = $item->{tooltip} = $text; 3999 $item->{text} = $item->{tooltip} = $text;
2946 } 4000 }
2947 $item->{id} = ++$self->{id}; 4001 $item->{id} += 0.2;#d#
2948 $item->{timeout} = $timeout; 4002 $item->{timeout} = $timeout;
2949 delete $item->{label}; 4003 delete $item->{label};
2950 } else { 4004 } else {
2951 $self->{item}{$group} = { 4005 $self->{item}{$group} = {
2952 id => ++$self->{id}, 4006 id => ++$self->{id},
… …
2958 count => 1, 4012 count => 1,
2959 %arg, 4013 %arg,
2960 }; 4014 };
2961 } 4015 }
2962 4016
4017 $ROOT->on_refresh (reorder => sub {
2963 $self->reorder; 4018 $self->reorder;
4019 });
2964} 4020}
2965 4021
2966sub reconfigure { 4022sub reconfigure {
2967 my ($self) = @_; 4023 my ($self) = @_;
2968 4024
… …
2971 4027
2972 $self->reorder; 4028 $self->reorder;
2973 $self->SUPER::reconfigure; 4029 $self->SUPER::reconfigure;
2974} 4030}
2975 4031
4032sub destroy {
4033 my ($self) = @_;
4034
4035 $self->{timer}->cancel;
4036
4037 $self->SUPER::destroy;
4038}
4039
2976############################################################################# 4040#############################################################################
2977 4041
2978package CFClient::UI::Root; 4042package CFPlus::UI::Root;
2979 4043
2980our @ISA = CFClient::UI::Container::; 4044our @ISA = CFPlus::UI::Container::;
2981 4045
4046use List::Util qw(min max);
4047
2982use CFClient::OpenGL; 4048use CFPlus::OpenGL;
2983 4049
2984sub new { 4050sub new {
2985 my $class = shift; 4051 my $class = shift;
2986 4052
2987 my $self = $class->SUPER::new ( 4053 my $self = $class->SUPER::new (
2988 visible => 1, 4054 visible => 1,
2989 @_, 4055 @_,
2990 ); 4056 );
2991 4057
2992 Scalar::Util::weaken ($self->{root} = $self); 4058 CFPlus::weaken ($self->{root} = $self);
2993 4059
2994 $self 4060 $self
2995} 4061}
2996 4062
2997sub configure {
2998 my ($self, $x, $y, $w, $h) = @_;
2999
3000 $self->{w} = $w;
3001 $self->{h} = $h;
3002}
3003
3004sub reconfigure {
3005 my ($self) = @_;
3006
3007 $self->SUPER::reconfigure;
3008
3009 $self->size_allocate ($self->{w}, $self->{h}, 1)
3010 if $self->{w};
3011}
3012
3013sub size_request { 4063sub size_request {
3014 my ($self) = @_; 4064 my ($self) = @_;
3015 4065
3016 ($self->{w}, $self->{h}) 4066 ($self->{w}, $self->{h})
3017} 4067}
3018 4068
4069sub _to_pixel {
4070 my ($coord, $size, $max) = @_;
4071
4072 $coord =
4073 $coord eq "center" ? ($max - $size) * 0.5
4074 : $coord eq "max" ? $max
4075 : $coord;
4076
4077 $coord = 0 if $coord < 0;
4078 $coord = $max - $size if $coord > $max - $size;
4079
4080 int $coord + 0.5
4081}
4082
3019sub size_allocate { 4083sub invoke_size_allocate {
3020 my ($self, $w, $h, $changed) = @_; 4084 my ($self, $w, $h) = @_;
3021 4085
3022 for my $child ($self->children) { 4086 for my $child ($self->children) {
3023 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 4087 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3024 4088
3025 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 4089 $X = $child->{force_x} if exists $child->{force_x};
3026 if exists $child->{req_x}; 4090 $Y = $child->{force_y} if exists $child->{force_y};
3027 4091
3028 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1 4092 $X = _to_pixel $X, $W, $self->{w};
3029 if exists $child->{req_y}; 4093 $Y = _to_pixel $Y, $H, $self->{h};
3030
3031 #delete @$child{qw(req_x req_y)};#d# def_x, def_y
3032
3033 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
3034 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
3035 4094
3036 $child->configure ($X, $Y, $W, $H); 4095 $child->configure ($X, $Y, $W, $H);
3037 } 4096 }
4097
4098 1
3038} 4099}
3039 4100
3040sub coord2local { 4101sub coord2local {
3041 my ($self, $x, $y) = @_; 4102 my ($self, $x, $y) = @_;
3042 4103
… …
3056} 4117}
3057 4118
3058sub add { 4119sub add {
3059 my ($self, @children) = @_; 4120 my ($self, @children) = @_;
3060 4121
3061 for my $child (@children) {
3062 $child->{is_toplevel} = 1; 4122 $_->{is_toplevel} = 1
3063 4123 for @children;
3064 # integerise window positions
3065 $child->{x} = int $child->{x};
3066 $child->{y} = int $child->{y};
3067 }
3068 4124
3069 $self->SUPER::add (@children); 4125 $self->SUPER::add (@children);
3070} 4126}
3071 4127
3072sub remove { 4128sub remove {
3073 my ($self, @children) = @_; 4129 my ($self, @children) = @_;
3074 4130
3075 $self->SUPER::remove (@children); 4131 $self->SUPER::remove (@children);
4132
4133 delete $self->{is_toplevel}
4134 for @children;
3076 4135
3077 while (@children) { 4136 while (@children) {
3078 my $w = pop @children; 4137 my $w = pop @children;
3079 push @children, $w->children; 4138 push @children, $w->children;
3080 $w->set_invisible; 4139 $w->set_invisible;
… …
3100 $_->() 4159 $_->()
3101 for values %{delete $self->{refresh_hook}}; 4160 for values %{delete $self->{refresh_hook}};
3102 } 4161 }
3103 4162
3104 if ($self->{realloc}) { 4163 if ($self->{realloc}) {
4164 my %queue;
3105 my @queue; 4165 my @queue;
4166 my $widget;
3106 4167
4168 outer:
3107 while () { 4169 while () {
3108 if ($self->{realloc}) { 4170 if (my $realloc = delete $self->{realloc}) {
3109 #TODO use array-of-depth approach 4171 for $widget (values %$realloc) {
4172 $widget->{visible} or next; # do not resize invisible widgets
3110 4173
3111 @queue = sort { $a->{visible} <=> $b->{visible} } 4174 $queue{$widget+0}++ and next; # duplicates are common
3112 @queue, values %{delete $self->{realloc}}; 4175
4176 push @{ $queue[$widget->{visible}] }, $widget;
4177 }
3113 } 4178 }
3114 4179
4180 while () {
4181 @queue or last outer;
4182
4183 $widget = pop @{ $queue[-1] || [] }
4184 and last;
4185
4186 pop @queue;
4187 }
4188
4189 delete $queue{$widget+0};
4190
4191 my ($w, $h) = $widget->size_request;
4192
4193 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
4194 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
4195
4196 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
4197 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
4198
4199 $w = $widget->{force_w} if exists $widget->{force_w};
4200 $h = $widget->{force_h} if exists $widget->{force_h};
4201
4202 if ($widget->{req_w} != $w || $widget->{req_h} != $h
4203 || delete $widget->{force_realloc}) {
4204 $widget->{req_w} = $w;
4205 $widget->{req_h} = $h;
4206
4207 $self->{size_alloc}{$widget+0} = $widget;
4208
4209 if (my $parent = $widget->{parent}) {
4210 $self->{realloc}{$parent+0} = $parent
4211 unless $queue{$parent+0};
4212
4213 $parent->{force_size_alloc} = 1;
4214 $self->{size_alloc}{$parent+0} = $parent;
4215 }
4216 }
4217
4218 delete $self->{realloc}{$widget+0};
4219 }
4220 }
4221
4222 while (my $size_alloc = delete $self->{size_alloc}) {
4223 my @queue = sort { $b->{visible} <=> $a->{visible} }
4224 values %$size_alloc;
4225
4226 while () {
3115 my $widget = pop @queue || last; 4227 my $widget = pop @queue || last;
3116 4228
3117 $widget->{visible} or last; # do not resize invisible widgets 4229 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3118
3119 my ($w, $h) = $widget->{def_w} && $widget->{def_h}
3120 ? @$widget{qw(def_w def_h)}
3121 : $widget->size_request;
3122
3123 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
3124
3125 $widget->{req_w} = $w;
3126 $widget->{req_h} = $h;
3127
3128 $self->{size_alloc}{$widget} = [$widget, $widget->{w}, $widget->{h}];
3129
3130 push @queue, $widget->{parent}
3131 if $widget->{parent};
3132 }
3133 }
3134
3135 while (my $size_alloc = delete $self->{size_alloc}) {
3136 my @queue = sort $b->[0]{visible} <=> $a->[0]{visible},
3137 values %$size_alloc;
3138
3139 while () {
3140 my ($widget, $w, $h) = @{ pop @queue or last };
3141 4230
3142 $w = 0 if $w < 0; 4231 $w = 0 if $w < 0;
3143 $h = 0 if $h < 0; 4232 $h = 0 if $h < 0;
3144 4233
4234 $w = max $widget->{min_w}, $w;
4235 $h = max $widget->{min_h}, $h;
4236
4237# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
4238# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
4239
4240 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
4241 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
4242
4243 $w = int $w + 0.5;
4244 $h = int $h + 0.5;
4245
4246 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
4247 $widget->{old_w} = $widget->{w};
4248 $widget->{old_h} = $widget->{h};
4249
3145 $widget->{w} = $w; 4250 $widget->{w} = $w;
3146 $widget->{h} = $h; 4251 $widget->{h} = $h;
4252
3147 $widget->emit (size_allocate => $w, $h, 1); 4253 $widget->emit (size_allocate => $w, $h);
4254 }
3148 } 4255 }
3149 } 4256 }
3150 4257
3151 while ($self->{post_alloc_hook}) { 4258 while ($self->{post_alloc_hook}) {
3152 $_->() 4259 $_->()
… …
3161 glLoadIdentity; 4268 glLoadIdentity;
3162 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 4269 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3163 glMatrixMode GL_MODELVIEW; 4270 glMatrixMode GL_MODELVIEW;
3164 glLoadIdentity; 4271 glLoadIdentity;
3165 4272
4273 {
4274 package CFPlus::UI::Base;
4275
4276 local ($draw_x, $draw_y, $draw_w, $draw_h) =
4277 (0, 0, $self->{w}, $self->{h});
4278
3166 $self->_draw; 4279 $self->_draw;
4280 }
3167} 4281}
3168 4282
3169############################################################################# 4283#############################################################################
3170 4284
3171package CFClient::UI; 4285package CFPlus::UI;
3172 4286
3173$ROOT = new CFClient::UI::Root; 4287$ROOT = new CFPlus::UI::Root;
3174$TOOLTIP = new CFClient::UI::Tooltip z => 900; 4288$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
3175 4289
31761 42901
3177 4291

Diff Legend

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