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

Diff Legend

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