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.401 by root, Sat Jul 21 20:05:37 2007 UTC

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

Diff Legend

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