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

Diff Legend

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