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.245 by elmex, Sat May 27 21:15:57 2006 UTC vs.
Revision 1.388 by root, Fri Jul 20 18:30:03 2007 UTC

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

Diff Legend

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