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

Diff Legend

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