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.230 by root, Wed May 24 21:59:54 2006 UTC vs.
Revision 1.388 by root, Fri Jul 20 18:30:03 2007 UTC

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

Diff Legend

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