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

Diff Legend

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