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

Diff Legend

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