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

Diff Legend

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