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.341 by root, Sun Aug 13 03:20:56 2006 UTC

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

Diff Legend

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