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

Diff Legend

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