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

Diff Legend

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