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.55 by root, Mon Apr 10 19:34:04 2006 UTC vs.
Revision 1.174 by root, Tue Apr 25 11:18:49 2006 UTC

1package Crossfire::Client::Widget; 1package CFClient::UI;
2 2
3use strict; 3use strict;
4 4
5use Scalar::Util; 5use Scalar::Util ();
6use List::Util ();
6 7
7use SDL::OpenGL; 8use CFClient;
8use SDL::OpenGL::Constants;
9
10use Crossfire::Client;
11 9
12our ($FOCUS, $HOVER, $GRAB); # various widgets 10our ($FOCUS, $HOVER, $GRAB); # various widgets
13 11
14our $TOPLEVEL; 12our $ROOT;
13our $TOOLTIP;
15our $BUTTON_STATE; 14our $BUTTON_STATE;
15
16sub check_tooltip {
17 if (!$GRAB) {
18 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
19 if (length $widget->{tooltip}) {
20
21 if ($TOOLTIP->{owner} != $widget) {
22 $TOOLTIP->{owner} = $widget;
23
24 my $tip = $widget->{tooltip};
25
26 $tip = $tip->($widget) if CODE:: eq ref $tip;
27
28 $TOOLTIP->set_markup ($widget->{tooltip});
29
30 $TOOLTIP->show;
31
32 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
33
34 if ($x + $TOOLTIP->{w} > $::WIDTH) {
35 ($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0);
36 }
37
38 $TOOLTIP->move ($x, $y);
39 }
40
41 return;
42 }
43 }
44 }
45
46 $TOOLTIP->hide;
47 delete $TOOLTIP->{owner};
48}
16 49
17# class methods for events 50# class methods for events
18sub feed_sdl_key_down_event { 51sub feed_sdl_key_down_event {
19 $FOCUS->key_down ($_[0]) if $FOCUS; 52 $FOCUS->emit (key_down => $_[0]) || $FOCUS->key_down ($_[0])
53 if $FOCUS;
20} 54}
21 55
22sub feed_sdl_key_up_event { 56sub feed_sdl_key_up_event {
23 $FOCUS->key_up ($_[0]) if $FOCUS; 57 $FOCUS->emit (key_up => $_[0]) || $FOCUS->key_up ($_[0])
58 if $FOCUS;
24} 59}
25 60
26sub feed_sdl_button_down_event { 61sub feed_sdl_button_down_event {
27 my ($ev) = @_; 62 my ($ev) = @_;
28 my ($x, $y) = ($ev->motion_x, $ev->motion_y); 63 my ($x, $y) = ($ev->{x}, $ev->{y});
29 64
30 if (!$BUTTON_STATE) { 65 if (!$BUTTON_STATE) {
31 my $widget = $TOPLEVEL->find_widget ($x, $y); 66 my $widget = $ROOT->find_widget ($x, $y);
32 67
33 $GRAB = $widget; 68 $GRAB = $widget;
34 $GRAB->update if $GRAB; 69 $GRAB->update if $GRAB;
35 }
36 70
71 check_tooltip;
72 }
73
37 $BUTTON_STATE |= 1 << ($ev->button - 1); 74 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
38 75
39 $GRAB->button_down ($ev) if $GRAB; 76 if ($GRAB) {
77 ($x, $y) = $GRAB->coord2local ($x, $y);
78 $GRAB->emit (button_down => $ev, $x, $y) || $GRAB->button_down ($ev, $x, $y);
79 }
40} 80}
41 81
42sub feed_sdl_button_up_event { 82sub feed_sdl_button_up_event {
43 my ($ev) = @_; 83 my ($ev) = @_;
44 my ($x, $y) = ($ev->motion_x, $ev->motion_y); 84 my ($x, $y) = ($ev->{x}, $ev->{y});
45 85
46 my $widget = $GRAB || $TOPLEVEL->find_widget ($x, $y); 86 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
47 87
48 $BUTTON_STATE &= ~(1 << ($ev->button - 1)); 88 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
89
90 if ($GRAB) {
91 ($x, $y) = $GRAB->coord2local ($x, $y);
92 $GRAB->emit (button_up => $ev, $x, $y) || $GRAB->button_up ($ev, $x, $y);
93 }
49 94
50 if (!$BUTTON_STATE) { 95 if (!$BUTTON_STATE) {
51 my $grab = $GRAB; undef $GRAB; 96 my $grab = $GRAB; undef $GRAB;
52 $grab->update if $grab; 97 $grab->update if $grab;
53 $GRAB->update if $GRAB; 98 $GRAB->update if $GRAB;
99
100 check_tooltip;
54 } 101 }
55} 102}
56 103
57sub feed_sdl_motion_event { 104sub feed_sdl_motion_event {
58 my ($ev) = @_; 105 my ($ev) = @_;
59 my ($x, $y) = ($ev->motion_x, $ev->motion_y); 106 my ($x, $y) = ($ev->{x}, $ev->{y});
60 107
61 my $widget = $GRAB || $TOPLEVEL->find_widget ($x, $y); 108 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
62 109
63 if ($widget != $HOVER) { 110 if ($widget != $HOVER) {
64 my $hover = $HOVER; $HOVER = $widget; 111 my $hover = $HOVER; $HOVER = $widget;
65 112
66 $hover->update if $hover; 113 $hover->update if $hover && $hover->{can_hover};
67 $HOVER->update if $HOVER; 114 $HOVER->update if $HOVER && $HOVER->{can_hover};
68 }
69 115
70 $HOVER->mouse_motion ($ev) if $HOVER; 116 check_tooltip;
117 }
118
119 if ($HOVER) {
120 ($x, $y) = $HOVER->coord2local ($x, $y);
121 $HOVER->emit (mouse_motion => $ev, $x, $y) || $HOVER->mouse_motion ($ev, $x, $y);
122 }
71} 123}
124
125# convert position array to integers
126sub harmonize {
127 my ($vals) = @_;
128
129 my $rem = 0;
130
131 for (@$vals) {
132 my $i = int $_ + $rem;
133 $rem += $_ - $i;
134 $_ = $i;
135 }
136}
137
138#############################################################################
139
140package CFClient::UI::Base;
141
142use strict;
143
144use CFClient::OpenGL;
72 145
73sub new { 146sub new {
74 my $class = shift; 147 my $class = shift;
75 148
76 bless { @_ }, $class 149 my $self = bless {
150 x => 0,
151 y => 0,
152 z => 0,
153 can_events => 1,
154 @_
155 }, $class;
156
157 for (keys %$self) {
158 if (/^connect_(.*)$/) {
159 $self->connect ($1 => delete $self->{$_});
160 }
161 }
162
163 $self
164}
165
166sub destroy {
167 my ($self) = @_;
168
169 $self->hide;
170 %$self = ();
171}
172
173sub show {
174 my ($self) = @_;
175
176 return if $self->{parent};
177
178 $CFClient::UI::ROOT->add ($self);
179}
180
181sub hide {
182 my ($self) = @_;
183
184 undef $GRAB if $GRAB == $self;
185 undef $HOVER if $HOVER == $self;
186
187 $self->{parent}->remove ($self)
188 if $self->{parent};
77} 189}
78 190
79sub move { 191sub move {
80 my ($self, $x, $y, $z) = @_; 192 my ($self, $x, $y, $z) = @_;
193
81 $self->{x} = $x; 194 $self->{x} = int $x;
82 $self->{y} = $y; 195 $self->{y} = int $y;
83 $self->{z} = $z if defined $z; 196 $self->{z} = $z if defined $z;
84}
85 197
86sub needs_redraw { 198 $self->update;
87 0 199}
200
201sub set_size {
202 my ($self, $w, $h) = @_;
203
204 $self->{user_w} = $w;
205 $self->{user_h} = $h;
206
207 $self->check_size;
88} 208}
89 209
90sub size_request { 210sub size_request {
91 require Carp; 211 require Carp;
92 Carp::confess "size_request is abtract"; 212 Carp::confess "size_request is abstract";
213}
214
215sub configure {
216 my ($self, $x, $y, $w, $h) = @_;
217
218 if ($self->{aspect}) {
219 my $w2 = List::Util::min $w, int $h * $self->{aspect};
220 my $h2 = List::Util::min $h, int $w / $self->{aspect};
221
222 # use alignment to adjust x, y
223
224 $x += int +($w - $w2) * 0.5;
225 $y += int +($h - $h2) * 0.5;
226
227 ($w, $h) = ($w2, $h2);
228 }
229
230 if ($self->{x} != $x || $self->{y} != $y) {
231 $self->{x} = $x;
232 $self->{y} = $y;
233 $self->update;
234 }
235
236 if ($self->{w} != $w || $self->{h} != $h) {
237 $self->{w} = $w;
238 $self->{h} = $h;
239
240 $self->size_allocate ($w, $h);
241 $self->update;
242 }
93} 243}
94 244
95sub size_allocate { 245sub size_allocate {
246 # nothing to be done
247}
248
249sub children {
250}
251
252# call when resoltuion changes etc.
253sub reconfigure {
254 my ($self) = @_;
255
256 $_->reconfigure
257 for $self->children;
258
259 $_->check_size;
260}
261
262sub set_max_size {
96 my ($self, $w, $h) = @_; 263 my ($self, $w, $h) = @_;
97 264
98 $self->{w} = $w; 265 delete $self->{max_w}; $self->{max_w} = $w if $w;
99 $self->{h} = $h; 266 delete $self->{max_h}; $self->{max_h} = $h if $h;
267}
268
269# return top left coordinates
270sub _topleft {
271 my ($self, $x, $y) = @_;
272
273 $self->{parent}
274 or Carp::confess "no parent widget in _topleft\n";#d#
275
276 $self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y});
277}
278
279# translate global coordinates to local coordinate system
280sub coord2local {
281 my ($self, $x, $y) = @_;
282
283 my ($X, $Y) = $self->_topleft;
284 ($x - $X, $y - $Y)
285}
286
287# translate local coordinates to global coordinate system
288sub coord2global {
289 my ($self, $x, $y) = @_;
290
291 my ($X, $Y) = $self->_topleft;
292 ($x + $X, $y + $Y)
100} 293}
101 294
102sub focus_in { 295sub focus_in {
103 my ($self) = @_; 296 my ($self) = @_;
104 297
298 return if $FOCUS == $self;
299 return unless $self->{can_focus};
300
105 my $focus = $FOCUS; $FOCUS = $self; 301 my $focus = $FOCUS; $FOCUS = $self;
302
303 $self->emit (focus_in => $focus);
304
106 $focus->update if $focus; 305 $focus->update if $focus;
107 $FOCUS->update; 306 $FOCUS->update;
108} 307}
109 308
110sub focus_out { 309sub focus_out {
111 my ($self) = @_; 310 my ($self) = @_;
112 311
113 return unless $FOCUS == $self; 312 return unless $FOCUS == $self;
114 313
115 my $focus = $FOCUS; undef $FOCUS; 314 my $focus = $FOCUS; undef $FOCUS;
315
316 $self->emit (focus_out => $focus);
317
116 $focus->update if $focus; #? 318 $focus->update if $focus; #?
117} 319}
118 320
119sub mouse_motion { } 321sub mouse_motion { }
120sub button_up { } 322sub button_up { }
121sub button_down { }
122sub key_down { } 323sub key_down { }
123sub key_up { } 324sub key_up { }
325
326sub button_down {
327 my ($self, $ev, $x, $y) = @_;
328
329 $self->focus_in;
330}
124 331
125sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 332sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }
126sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 333sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }
127sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 334sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }
128sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 335sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }
129sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} } 336sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} }
130 337
131sub draw { 338sub draw {
132 my ($self) = @_; 339 my ($self) = @_;
133 340
341 return unless $self->{h} && $self->{w};
342
134 glPushMatrix; 343 glPushMatrix;
135 glTranslate $self->{x}, $self->{y}, 0; 344 glTranslate $self->{x}, $self->{y}, 0;
136 $self->_draw; 345 $self->_draw;
137 if ($self == $HOVER) { 346 glPopMatrix;
138 glColor 1, 1, 1, 0.4; 347
348 if ($self == $HOVER && $self->{can_hover}) {
349 my ($x, $y) = @$self{qw(x y)};
350
351 glColor 1, 0.8, 0.5, 0.2;
139 glEnable GL_BLEND; 352 glEnable GL_BLEND;
353 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
140 glBegin GL_QUADS; 354 glBegin GL_QUADS;
355 glVertex $x , $y;
356 glVertex $x + $self->{w}, $y;
357 glVertex $x + $self->{w}, $y + $self->{h};
358 glVertex $x , $y + $self->{h};
359 glEnd;
360 glDisable GL_BLEND;
361 }
362
363 if ($ENV{PCLIENT_DEBUG}) {
364 glPushMatrix;
365 glColor 1, 1, 0, 1;
366 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
367 glBegin GL_LINE_LOOP;
141 glVertex 0 , 0; 368 glVertex 0 , 0;
142 glVertex $self->{w}, 0; 369 glVertex $self->{w}, 0;
143 glVertex $self->{w}, $self->{h}; 370 glVertex $self->{w}, $self->{h};
144 glVertex 0 , $self->{h}; 371 glVertex 0 , $self->{h};
145 glEnd; 372 glEnd;
146 glDisable GL_BLEND;
147 }
148 glPopMatrix; 373 glPopMatrix;
374 CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
375 }
149} 376}
150 377
151sub _draw { 378sub _draw {
152 my ($self) = @_; 379 my ($self) = @_;
153 380
154 warn "no draw defined for $self\n"; 381 warn "no draw defined for $self\n";
155}
156
157sub bbox {
158 my ($self) = @_;
159 my ($w, $h) = $self->size_request;
160 (
161 $self->{x},
162 $self->{y},
163 $self->{x} = $w,
164 $self->{y} = $h
165 )
166} 382}
167 383
168sub find_widget { 384sub find_widget {
169 my ($self, $x, $y) = @_; 385 my ($self, $x, $y) = @_;
386
387 return () unless $self->{can_events};
170 388
171 return $self 389 return $self
172 if $x >= $self->{x} && $x < $self->{x} + $self->{w} 390 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
173 && $y >= $self->{y} && $y < $self->{y} + $self->{h}; 391 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
174 392
175 () 393 ()
176} 394}
177 395
178sub del_parent { $_[0]->{parent} = undef }
179
180sub set_parent { 396sub set_parent {
181 my ($self, $par) = @_; 397 my ($self, $parent) = @_;
182 398
183 $self->{parent} = $par;
184 Scalar::Util::weaken $self->{parent}; 399 Scalar::Util::weaken ($self->{parent} = $parent);
185} 400}
186 401
187sub get_parent { 402sub check_size {
403 my ($self) = @_;
404
188 $_[0]->{parent} 405 $self->{parent}
406 or return 1;
407
408 my ($w, $h) = $self->{user_w} && $self->{user_h}
409 ? @$self{qw(user_w user_h)}
410 : $self->size_request;
411
412 if ($w != $self->{req_w} || $h != $self->{req_h}) {
413 $self->{req_w} = $w;
414 $self->{req_h} = $h;
415
416 $self->{parent}->check_size
417 or $self->size_allocate (
418 (List::Util::max $self->{w}, $w),
419 (List::Util::max $self->{h}, $h),
420 );
421
422 1
423 } else {
424 0
425 }
189} 426}
190 427
191sub update { 428sub update {
192 my ($self) = @_; 429 my ($self) = @_;
193 430
194 $self->{parent}->update 431 $self->{parent}->update
195 if $self->{parent}; 432 if $self->{parent};
196} 433}
197 434
435sub connect {
436 my ($self, $signal, $cb) = @_;
437
438 push @{ $self->{signal_cb}{$signal} }, $cb;
439}
440
441sub emit {
442 my ($self, $signal, @args) = @_;
443
444 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
445}
446
198sub DESTROY { 447sub DESTROY {
199 my ($self) = @_; 448 my ($self) = @_;
200 449
201 #$self->deactivate; 450 #$self->deactivate;
202} 451}
203 452
204############################################################################# 453#############################################################################
205 454
206package Crossfire::Client::Widget::Container; 455package CFClient::UI::DrawBG;
207 456
208our @ISA = Crossfire::Client::Widget::; 457our @ISA = CFClient::UI::Base::;
458
459use strict;
460use CFClient::OpenGL;
209 461
210sub new { 462sub new {
463 my $class = shift;
464
465 # range [value, low, high, page]
466
467 $class->SUPER::new (
468 bg => [0, 0, 0, 0.2],
469 active_bg => [1, 1, 1, 0.5],
470 @_
471 )
472}
473
474sub _draw {
475 my ($self) = @_;
476
477 my ($w, $h) = @$self{qw(w h)};
478
479 glEnable GL_BLEND;
480 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
481 glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} };
482
483 glBegin GL_QUADS;
484 glVertex 0 , 0;
485 glVertex 0 , $h;
486 glVertex $w, $h;
487 glVertex $w, 0;
488 glEnd;
489
490 glDisable GL_BLEND;
491}
492
493#############################################################################
494
495package CFClient::UI::Empty;
496
497our @ISA = CFClient::UI::Base::;
498
499sub new {
211 my ($class, @widgets) = @_; 500 my ($class, %arg) = @_;
501 $class->SUPER::new (can_events => 0, %arg);
502}
212 503
504sub size_request {
505 (0, 0)
506}
507
508sub draw { }
509
510#############################################################################
511
512package CFClient::UI::Container;
513
514our @ISA = CFClient::UI::Base::;
515
516sub new {
517 my ($class, %arg) = @_;
518
519 my $children = delete $arg{children} || [];
520
213 my $self = $class->SUPER::new (children => []); 521 my $self = $class->SUPER::new (
522 children => [],
523 can_events => 0,
524 %arg,
525 );
214 $self->add ($_) for @widgets; 526 $self->add ($_) for @$children;
215 527
216 $self 528 $self
217} 529}
218 530
219sub add { 531sub add {
220 my ($self, $chld, $expand) = @_; 532 my ($self, $child) = @_;
221 533
222 $chld->{expand} = $expand;
223 $chld->set_parent ($self); 534 $child->set_parent ($self);
224 535
536 use sort 'stable';
537
225 @{$self->{children}} = 538 $self->{children} = [
226 sort { $a->{z} <=> $b->{z} } 539 sort { $a->{z} <=> $b->{z} }
227 @{$self->{children}}, $chld; 540 @{$self->{children}}, $child
541 ];
228 542
229 $self->size_allocate ($self->{w}, $self->{h}) 543 $child->check_size;
230 if $self->{w}; #TODO: check for "realised state" 544}
545
546sub children {
547 @{ $_[0]{children} }
231} 548}
232 549
233sub remove { 550sub remove {
234 my ($self, $widget) = @_; 551 my ($self, $child) = @_;
235 552
553 delete $child->{parent};
554 $child->hide;
555
236 $self->{children} = [ grep $_ != $widget, @{ $self->{children} } ]; 556 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
237 557
238 $self->size_allocate ($self->{w}, $self->{h}); 558 $self->check_size;
559 $self->update;
560}
561
562sub clear {
563 my ($self) = @_;
564
565 my $children = delete $self->{children};
566 $self->{children} = [];
567
568 for (@$children) {
569 delete $_->{parent};
570 $_->hide;
571 }
239} 572}
240 573
241sub find_widget { 574sub find_widget {
242 my ($self, $x, $y) = @_; 575 my ($self, $x, $y) = @_;
243 576
… …
260 $_->draw for @{$self->{children}}; 593 $_->draw for @{$self->{children}};
261} 594}
262 595
263############################################################################# 596#############################################################################
264 597
265package Crossfire::Client::Widget::Bin; 598package CFClient::UI::Bin;
266 599
267our @ISA = Crossfire::Client::Widget::Container::; 600our @ISA = CFClient::UI::Container::;
601
602sub new {
603 my ($class, %arg) = @_;
604
605 my $child = (delete $arg{child}) || new CFClient::UI::Empty::;
606
607 $class->SUPER::new (children => [$child], %arg)
608}
609
610sub add {
611 my ($self, $child) = @_;
612
613 $self->{children} = [];
614
615 $self->SUPER::add ($child);
616}
617
618sub remove {
619 my ($self, $widget) = @_;
620
621 $self->SUPER::remove ($widget);
622
623 $self->{children} = [new CFClient::UI::Empty]
624 unless @{$self->{children}};
625}
268 626
269sub child { $_[0]->{children}[0] } 627sub child { $_[0]->{children}[0] }
270 628
271sub size_request { 629sub size_request {
272 $_[0]{children}[0]->size_request if $_[0]{children}[0]; 630 $_[0]{children}[0]->size_request
273} 631}
274 632
275sub size_allocate { 633sub size_allocate {
276 my ($self, $w, $h) = @_; 634 my ($self, $w, $h) = @_;
277 635
278 $self->SUPER::size_allocate ($w, $h); 636 $self->{children}[0]->configure (0, 0, $w, $h);
279 $self->{children}[0]->size_allocate ($w, $h)
280 if $self->{children}[0]
281} 637}
282 638
283############################################################################# 639#############################################################################
284 640
285package Crossfire::Client::Widget::Window; 641package CFClient::UI::Window;
286 642
287our @ISA = Crossfire::Client::Widget::Bin::; 643our @ISA = CFClient::UI::Bin::;
288 644
289use SDL::OpenGL; 645use CFClient::OpenGL;
290 646
291sub new { 647sub new {
292 my ($class, $x, $y, $z, $w, $h) = @_; 648 my ($class, %arg) = @_;
293 649
294 my $self = $class->SUPER::new; 650 my $self = $class->SUPER::new (%arg);
295
296 @$self{qw(x y z w h)} = ($x, $y, $z, $w, $h);
297} 651}
298 652
299sub update { 653sub update {
300 my ($self) = @_; 654 my ($self) = @_;
301 655
302 $self->render_chld; 656 $ROOT->on_refresh ($self => sub { $self->render_child });
303 $self->SUPER::update; 657 $self->SUPER::update;
304}
305
306sub render_chld {
307 my ($self) = @_;
308
309 $self->{texture} =
310 Crossfire::Client::Texture->new_from_opengl (
311 $self->{w}, $self->{h}, sub { $self->child->draw }
312 );
313} 658}
314 659
315sub size_allocate { 660sub size_allocate {
316 my ($self, $w, $h) = @_; 661 my ($self, $w, $h) = @_;
317 662
318 $self->{w} = $w;
319 $self->{h} = $h;
320
321 $self->child->size_allocate ($w, $h); 663 $self->SUPER::size_allocate ($w, $h);
664 $self->update;
665}
322 666
323 $self->render_chld; 667sub render_child {
668 my ($self) = @_;
669
670 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
671 glClearColor 0, 0, 0, 0;
672 glClear GL_COLOR_BUFFER_BIT;
673 $self->child->draw;
674 };
324} 675}
325 676
326sub _draw { 677sub _draw {
327 my ($self) = @_; 678 my ($self) = @_;
328 679
… …
330 681
331 my $tex = $self->{texture} 682 my $tex = $self->{texture}
332 or return; 683 or return;
333 684
334 glEnable GL_BLEND; 685 glEnable GL_BLEND;
686 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
335 glEnable GL_TEXTURE_2D; 687 glEnable GL_TEXTURE_2D;
336 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 688 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
337 glBindTexture GL_TEXTURE_2D, $tex->{name}; 689 glColor 0, 0, 0, 1;
338 690
339 glBegin GL_QUADS; 691 $tex->draw_quad (0, 0, $w, $h);
340 glTexCoord 0, 0; glVertex 0, 0;
341 glTexCoord 0, 1; glVertex 0, $h;
342 glTexCoord 1, 1; glVertex $w, $h;
343 glTexCoord 1, 0; glVertex $w, 0;
344 glEnd;
345 692
346 glDisable GL_BLEND; 693 glDisable GL_BLEND;
347 glDisable GL_TEXTURE_2D; 694 glDisable GL_TEXTURE_2D;
348} 695}
349 696
350############################################################################# 697#############################################################################
351 698
352package Crossfire::Client::Widget::Frame; 699package CFClient::UI::ViewPort;
353 700
354our @ISA = Crossfire::Client::Widget::Bin::; 701our @ISA = CFClient::UI::Window::;
355 702
356use SDL::OpenGL; 703sub new { die }
357 704
358sub size_request { 705sub size_request {
359 my ($self) = @_; 706 my ($self) = @_;
360 my $chld = $self->child
361 or return (0, 0);
362 707
363 $chld->move (2, 2); 708 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
709 $self->child->size_allocate (0, 0, @$self{qw(child_w child_h)});
364 710
365 map { $_ + 4 } $chld->size_request; 711 @$self{qw(child_w child_h)}
712}
713
714sub _draw {
715 my ($self) = @_;
716
717 $self->{children}[1]->draw;
718}
719
720
721#############################################################################
722
723package CFClient::UI::Frame;
724
725our @ISA = CFClient::UI::Bin::;
726
727use CFClient::OpenGL;
728
729sub new {
730 my $class = shift;
731
732 my $self = $class->SUPER::new (
733 bg => [1, 1, 1, 1],
734 border_bg => [1, 1, 1, 1],
735 border => 0.8,
736 @_
737 );
738
739 $self
740}
741
742sub _draw {
743 my ($self) = @_;
744
745 my ($w, $h) = ($self->{w}, $self->{h});
746
747 glEnable GL_BLEND;
748 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
749 glEnable GL_TEXTURE_2D;
750 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
751
752# glBegin GL_QUADS;
753# glColor 0, 0, 0, 0;
754# glVertex 0 , 0;
755# glVertex 0 , $h;
756# glVertex $w, $h;
757# glVertex $w, 0;
758# glEnd;
759
760
761 $self->child->draw;
762 glDisable GL_BLEND;
763 glDisable GL_TEXTURE_2D;
764}
765
766#############################################################################
767
768package CFClient::UI::FancyFrame;
769
770our @ISA = CFClient::UI::Bin::;
771
772use CFClient::OpenGL;
773
774my @tex =
775 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
776 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
777
778sub new {
779 my $class = shift;
780
781 # TODO: user_x, user_y, overwrite moveto?
782
783 my $self = $class->SUPER::new (
784 bg => [1, 1, 1, 1],
785 border_bg => [1, 1, 1, 1],
786 border => 0.8,
787 can_events => 1,
788 @_
789 );
790
791 $self->{title} &&= new CFClient::UI::Label
792 align => 0,
793 valign => 1,
794 text => $self->{title},
795 fontsize => 1;
796
797 $self
798}
799
800sub border {
801 int $_[0]{border} * $::FONTSIZE
802}
803
804sub size_request {
805 my ($self) = @_;
806
807 my ($w, $h) = $self->SUPER::size_request;
808
809 (
810 $w + $self->border * 2,
811 $h + $self->border * 2,
812 )
366} 813}
367 814
368sub size_allocate { 815sub size_allocate {
369 my ($self, $w, $h) = @_; 816 my ($self, $w, $h) = @_;
817
818 $h -= List::Util::max 0, $self->border * 2;
819 $w -= List::Util::max 0, $self->border * 2;
820
821 $self->{title}->configure ($self->border, $self->border - $::FONTSIZE * 2, $w, $::FONTSIZE * 2)
822 if $self->{title};
823
824 $self->child->configure ($self->border, $self->border, $w, $h);
825}
826
827sub button_down {
828 my ($self, $ev, $x, $y) = @_;
829
830 my $border = $self->border;
831
832 if ($x < $self->{w} && $x >= $self->{w} - $border
833 && $y < $self->{h} && $y >= $self->{h} - $border) {
834
835 my ($ox, $oy) = ($ev->{x}, $ev->{y});
836 my ($bw, $bh) = ($self->{w}, $self->{h});
837
838 $self->{motion} = sub {
839 my ($ev, $x, $y) = @_;
840
841 ($x, $y) = ($ev->{x}, $ev->{y});
842
843 $self->{user_w} = $bw + $x - $ox;
844 $self->{user_h} = $bh + $y - $oy;
845 $self->check_size;
846 };
847
848 } elsif ($x >= 0 && $x < $self->{w}
849 && $y >= 0 && $y < $border) {
850
851 my ($ox, $oy) = ($ev->{x}, $ev->{y});
852 my ($bx, $by) = ($self->{x}, $self->{y});
853
854 $self->{motion} = sub {
855 my ($ev, $x, $y) = @_;
856
857 ($x, $y) = ($ev->{x}, $ev->{y});
858
859 $self->move ($bx + $x - $ox, $by + $y - $oy);
860 $self->update;
861 };
862 }
863}
864
865sub button_up {
866 my ($self, $ev, $x, $y) = @_;
867
868 delete $self->{motion};
869}
870
871sub mouse_motion {
872 my ($self, $ev, $x, $y) = @_;
873
874 $self->{motion}->($ev, $x, $y) if $self->{motion};
875}
876
877sub _draw {
878 my ($self) = @_;
879
880 my ($w, $h ) = ($self->{w}, $self->{h});
881 my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
882
883 glEnable GL_BLEND;
884 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
885 glEnable GL_TEXTURE_2D;
886 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
887
888 my $border = $self->border;
889
890 glColor @{ $self->{border_bg} };
891 $tex[1]->draw_quad (0, 0, $w, $border);
892 $tex[3]->draw_quad (0, $border, $border, $ch);
893 $tex[2]->draw_quad ($w - $border, $border, $border, $ch);
894 $tex[4]->draw_quad (0, $h - $border, $w, $border);
895
896 my $bg = $tex[0];
897
898 # TODO: repeat texture not scale
899 my $rep_x = $cw / $bg->{w};
900 my $rep_y = $ch / $bg->{h};
901
902 glColor @{ $self->{bg} };
903
904 $bg->{s} = $rep_x;
905 $bg->{t} = $rep_y;
906 $bg->{wrap_mode} = 1;
907 $bg->draw_quad ($border, $border, $cw, $ch);
908
909 glDisable GL_TEXTURE_2D;
910 glDisable GL_BLEND;
911
912 $self->{title}->draw if $self->{title};
913 $self->child->draw;
914}
915
916#############################################################################
917
918package CFClient::UI::Table;
919
920our @ISA = CFClient::UI::Base::;
921
922use List::Util qw(max sum);
923
924use CFClient::OpenGL;
925
926sub new {
927 my $class = shift;
928
929 $class->SUPER::new (
930 col_expand => [],
931 @_
932 )
933}
934
935sub add {
936 my ($self, $x, $y, $child) = @_;
937
938 $child->set_parent ($self);
939 $self->{children}[$y][$x] = $child;
940
941 $child->check_size;
942}
943
944sub children {
945 grep $_, map @$_, grep $_, @{ $_[0]{children} }
946}
947
948# TODO: move to container class maybe? send childs a signal on removal?
949sub clear {
950 my ($self) = @_;
951
952 my @children = $self->children;
953 delete $self->{children};
370 954
371 $self->{w} = $w; 955 for (@children) {
372 $self->{h} = $h; 956 delete $_->{parent};
957 $_->hide;
958 }
373 959
374 $self->child->size_allocate ($w - 4, $h - 4); 960 $self->update;
375 $self->child->move (2, 2);
376} 961}
377 962
378sub _draw { 963sub get_wh {
379 my ($self) = @_; 964 my ($self) = @_;
380 965
381 my $chld = $self->child; 966 my (@w, @h);
382 967
383 my ($w, $h) = $chld->size_request; 968 for my $y (0 .. $#{$self->{children}}) {
969 my $row = $self->{children}[$y]
970 or next;
384 971
385 glBegin GL_QUADS; 972 for my $x (0 .. $#$row) {
386 glColor 0, 0, 0; 973 my $widget = $row->[$x]
387 glTexCoord 0, 0; glVertex 0 , 0; 974 or next;
388 glTexCoord 0, 1; glVertex 0 , $h + 4; 975 my ($w, $h) = @$widget{qw(req_w req_h)};
389 glTexCoord 1, 1; glVertex $w + 4 , $h + 4;
390 glTexCoord 1, 0; glVertex $w + 4 , 0;
391 glEnd;
392 976
393 $chld->draw; 977 $w[$x] = max $w[$x], $w;
394} 978 $h[$y] = max $h[$y], $h;
979 }
980 }
395 981
396############################################################################# 982 (\@w, \@h)
397 983}
398package Crossfire::Client::Widget::FancyFrame;
399
400our @ISA = Crossfire::Client::Widget::Bin::;
401
402use SDL::OpenGL;
403
404my @tex =
405 map { new_from_file Crossfire::Client::Texture Crossfire::Client::find_rcfile $_ }
406 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
407 984
408sub size_request { 985sub size_request {
409 my ($self) = @_; 986 my ($self) = @_;
410 987
411 my ($w, $h) = $self->SUPER::size_request; 988 my ($ws, $hs) = $self->get_wh;
412 989
413 $h += $tex[1]->{height}; 990 (
414 $h += $tex[4]->{height}; 991 (sum @$ws),
415 $w += $tex[2]->{width}; 992 (sum @$hs),
416 $w += $tex[3]->{width}; 993 )
417
418 ($w, $h)
419} 994}
420 995
421sub size_allocate { 996sub size_allocate {
422 my ($self, $w, $h) = @_; 997 my ($self, $w, $h) = @_;
423 998
424 $self->SUPER::size_allocate ($w, $h); 999 my ($ws, $hs) = $self->get_wh;
425 1000
426 $h -= $tex[1]->{height}; 1001 my $req_w = sum @$ws;
427 $h -= $tex[4]->{height}; 1002 my $req_h = sum @$hs;
428 $w -= $tex[2]->{width};
429 $w -= $tex[3]->{width};
430 1003
431 $h = $h < 0 ? 0 : $h; 1004 # TODO: nicer code && do row_expand
432 $w = $w < 0 ? 0 : $w; 1005 my @col_expand = @{$self->{col_expand}};
1006 @col_expand = (1) x @$ws unless @col_expand;
1007 my $col_expand = (sum @col_expand) || 1;
433 1008
434 $self->child->size_allocate ($w, $h); 1009 # linearly scale sizes
435 $self->child->move ($tex[3]->{width}, $tex[1]->{height}); 1010 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1011 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1012
1013 CFClient::UI::harmonize $ws;
1014 CFClient::UI::harmonize $hs;
1015
1016 my $y;
1017
1018 for my $r (0 .. $#{$self->{children}}) {
1019 my $row = $self->{children}[$r]
1020 or next;
1021
1022 my $x = 0;
1023 my $row_h = $hs->[$r];
1024
1025 for my $c (0 .. $#$row) {
1026 my $col_w = $ws->[$c];
1027
1028 if (my $widget = $row->[$c]) {
1029 $widget->configure ($x, $y, $col_w, $row_h);
1030 }
1031
1032 $x += $col_w;
1033 }
1034
1035 $y += $row_h;
1036 }
1037
1038}
1039
1040sub find_widget {
1041 my ($self, $x, $y) = @_;
1042
1043 $x -= $self->{x};
1044 $y -= $self->{y};
1045
1046 my $res;
1047
1048 for (grep $_, map @$_, grep $_, @{ $self->{children} }) {
1049 $res = $_->find_widget ($x, $y)
1050 and return $res;
1051 }
1052
1053 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
436} 1054}
437 1055
438sub _draw { 1056sub _draw {
439 my ($self) = @_; 1057 my ($self) = @_;
440 1058
441 my ($w, $h) = ($self->{w}, $self->{h}); 1059 for (grep $_, @{$self->{children}}) {
442 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1060 $_->draw for grep $_, @$_;
443 1061 }
444 glEnable GL_BLEND;
445 glEnable GL_TEXTURE_2D;
446 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
447 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
448
449 my $top = $tex[1];
450 glBindTexture GL_TEXTURE_2D, $top->{name};
451
452 glBegin GL_QUADS;
453 glTexCoord 0, 0; glVertex 0 , 0;
454 glTexCoord 0, 1; glVertex 0 , $top->{height};
455 glTexCoord 1, 1; glVertex $w , $top->{height};
456 glTexCoord 1, 0; glVertex $w , 0;
457 glEnd;
458
459 my $left = $tex[3];
460 glBindTexture GL_TEXTURE_2D, $left->{name};
461
462 glBegin GL_QUADS;
463 glTexCoord 0, 0; glVertex 0 , $top->{height};
464 glTexCoord 0, 1; glVertex 0 , $top->{height} + $ch;
465 glTexCoord 1, 1; glVertex $left->{width}, $top->{height} + $ch;
466 glTexCoord 1, 0; glVertex $left->{width}, $top->{height};
467 glEnd;
468
469 my $right = $tex[2];
470 glBindTexture GL_TEXTURE_2D, $right->{name};
471
472 glBegin GL_QUADS;
473 glTexCoord 0, 0; glVertex $w - $right->{width}, $top->{height};
474 glTexCoord 0, 1; glVertex $w - $right->{width}, $top->{height} + $ch;
475 glTexCoord 1, 1; glVertex $w , $top->{height} + $ch;
476 glTexCoord 1, 0; glVertex $w , $top->{height};
477 glEnd;
478
479 my $bottom = $tex[4];
480 glBindTexture GL_TEXTURE_2D, $bottom->{name};
481
482 glBegin GL_QUADS;
483 glTexCoord 0, 0; glVertex 0 , $h - $bottom->{height};
484 glTexCoord 0, 1; glVertex 0 , $h;
485 glTexCoord 1, 1; glVertex $w , $h;
486 glTexCoord 1, 0; glVertex $w , $h - $bottom->{height};
487 glEnd;
488
489 my $bg = $tex[0];
490 glBindTexture GL_TEXTURE_2D, $bg->{name};
491 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
492 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT;
493 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT;
494
495 my $rep_x = $cw / $bg->{width};
496 my $rep_y = $ch / $bg->{height};
497
498 glBegin GL_QUADS;
499 glTexCoord 0, 0; glVertex $left->{width}, $top->{height};
500 glTexCoord 0, $rep_y; glVertex $left->{width}, $top->{height} + $ch;
501 glTexCoord $rep_x, $rep_y; glVertex $left->{width} + $cw , $top->{height} + $ch;
502 glTexCoord $rep_x, 0; glVertex $left->{width} + $cw , $top->{height};
503 glEnd;
504
505 glDisable GL_BLEND;
506 glDisable GL_TEXTURE_2D;
507
508 $self->child->draw;
509
510} 1062}
511 1063
512############################################################################# 1064#############################################################################
513 1065
514package Crossfire::Client::Widget::Table; 1066package CFClient::UI::HBox;
515 1067
516our @ISA = Crossfire::Client::Widget::Bin::; 1068# TODO: wrap into common Box base class
517 1069
518use SDL::OpenGL; 1070our @ISA = CFClient::UI::Container::;
519 1071
520sub add { 1072sub size_request {
521 my ($self, $x, $y, $chld) = @_; 1073 my ($self) = @_;
522 my $old_chld = $self->{children}[$y][$x];
523 1074
524 $self->{children}[$y][$x] = $chld; 1075 my @alloc = map [$_->size_request], @{$self->{children}};
525 $chld->set_parent ($self);
526 $self->update;
527}
528 1076
529sub max_row_height { 1077 (
1078 (List::Util::sum map $_->[0], @alloc),
1079 (List::Util::max map $_->[1], @alloc),
1080 )
1081}
1082
1083sub size_allocate {
530 my ($self, $row) = @_; 1084 my ($self, $w, $h) = @_;
531 1085
532 my $hs = 0; 1086 ($h, $w) = ($w, $h);
533 for (my $xi = 0; $xi <= $#{$self->{children}->[$row] || []}; $xi++) { 1087
534 my $c = $self->{children}->[$row]->[$xi]; 1088 my $children = $self->{children};
535 if ($c) { 1089
536 my ($w, $h) = $c->size_request; 1090 my @h = map $_->{req_w}, @$children;
537 if ($hs < $h) { $hs = $h } 1091
1092 my $req_h = List::Util::sum @h;
1093
1094 if ($req_h > $h) {
1095 # ah well, not enough space
1096 $_ *= $h / $req_h for @h;
1097 } else {
1098 my $exp = List::Util::sum map $_->{expand}, @$children;
1099 $exp ||= 1;
1100
1101 for (0 .. $#$children) {
1102 my $child = $children->[$_];
1103
1104 my $alloc_h = $h[$_];
1105 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1106 $h[$_] = $alloc_h;
538 } 1107 }
539 } 1108 }
540 return $hs;
541}
542 1109
543sub max_col_width { 1110 CFClient::UI::harmonize \@h;
544 my ($self, $col) = @_;
545
546 my $ws = 0;
547 for (my $yi = 0; $yi <= $#{$self->{children} || []}; $yi++) {
548 my $c = ($self->{children}->[$yi] || [])->[$col];
549 if ($c) {
550 my ($w, $h) = $c->size_request;
551 if ($ws < $w) { $ws = $w }
552 }
553 }
554 return $ws;
555}
556
557sub size_request {
558 my ($self) = @_;
559
560 my ($hs, $ws) = (0, 0);
561
562 for (my $yi = 0; $yi <= $#{$self->{children}}; $yi++) {
563 $hs += $self->max_row_height ($yi);
564 }
565
566 for (my $yi = 0; $yi <= $#{$self->{children}}; $yi++) {
567 my $wm = 0;
568 for (my $xi = 0; $xi <= $#{$self->{children}->[$yi]}; $xi++) {
569 $wm += $self->max_col_width ($xi)
570 }
571 if ($ws < $wm) { $ws = $wm }
572 }
573
574 return ($ws, $hs);
575}
576
577sub _draw {
578 my ($self) = @_;
579 1111
580 my $y = 0; 1112 my $y = 0;
581 for (my $yi = 0; $yi <= $#{$self->{children}}; $yi++) { 1113 for (0 .. $#$children) {
1114 my $child = $children->[$_];
582 my $x = 0; 1115 my $h = $h[$_];
1116 $child->configure ($y, 0, $h, $w);
583 1117
584 for (my $xi = 0; $xi <= $#{$self->{children}->[$yi]}; $xi++) { 1118 $y += $h;
1119 }
585 1120
586 my $c = $self->{children}->[$yi]->[$xi];
587 if ($c) {
588 $c->move ($x, $y, 0); #TODO: Move to size_request
589 $c->draw if $c;
590 }
591
592 $x += $self->max_col_width ($xi);
593 }
594
595 $y += $self->max_row_height ($yi);
596 } 1121 1
597} 1122}
598 1123
599############################################################################# 1124#############################################################################
600 1125
601package Crossfire::Client::Widget::VBox; 1126package CFClient::UI::VBox;
602 1127
1128# TODO: wrap into common Box base class
1129
603our @ISA = Crossfire::Client::Widget::Container::; 1130our @ISA = CFClient::UI::Container::;
604
605use SDL::OpenGL;
606 1131
607sub size_request { 1132sub size_request {
608 my ($self) = @_; 1133 my ($self) = @_;
609 1134
610 my @alloc = map [$_->size_request], @{$self->{children}}; 1135 my @alloc = map [$_->size_request], @{$self->{children}};
… …
616} 1141}
617 1142
618sub size_allocate { 1143sub size_allocate {
619 my ($self, $w, $h) = @_; 1144 my ($self, $w, $h) = @_;
620 1145
621 $self->w ($w); 1146 my $children = $self->{children};
622 $self->h ($h);
623 1147
624 my $exp; 1148 my @h = map $_->{req_h}, @$children;
625 my @oth; 1149
626 # find expand widget 1150 my $req_h = List::Util::sum @h;
627 for (@{$self->{children}}) { 1151
628 if ($_->{expand}) { 1152 if ($req_h > $h) {
1153 # ah well, not enough space
1154 $_ *= $h / $req_h for @h;
1155 } else {
1156 my $exp = List::Util::sum map $_->{expand}, @$children;
629 $exp = $_; 1157 $exp ||= 1;
630 last; 1158
1159 for (0 .. $#$children) {
1160 my $child = $children->[$_];
1161
1162 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
631 } 1163 }
632 push @oth, $_;
633 } 1164 }
634 1165
635 my ($ow, $oh); 1166 CFClient::UI::harmonize \@h;
636
637 # get sizes of other widgets
638 for (@oth) {
639 my ($w, $h) = $_->size_request;
640 $oh += $h;
641 if ($ow < $w) { $ow = $w }
642 }
643 1167
644 my $y = 0; 1168 my $y = 0;
645 for (@{$self->{children}}) { 1169 for (0 .. $#$children) {
646 $_->move (0, $y); 1170 my $child = $children->[$_];
1171 my $h = $h[$_];
1172 $child->configure (0, $y, $w, $h);
647 1173
648 if ($_ == $exp) {
649 $_->size_allocate ($w, $h - $oh);
650 $y += $h - $oh;
651 } else {
652 my ($cw, $h) = $_->size_request;
653 $_->size_allocate ($w, $h);
654 $y += $h; 1174 $y += $h;
655 } 1175 }
1176
656 } 1177 1
657} 1178}
658 1179
659############################################################################# 1180#############################################################################
660 1181
661package Crossfire::Client::Widget::Label; 1182package CFClient::UI::Label;
662 1183
663our @ISA = Crossfire::Client::Widget::; 1184our @ISA = CFClient::UI::Base::;
664 1185
665use SDL::OpenGL; 1186use CFClient::OpenGL;
666 1187
667sub new { 1188sub new {
668 my ($class, $x, $y, $z, $height, $text) = @_; 1189 my ($class, %arg) = @_;
669 1190
670 $height ||= $::FONTSIZE; 1191 my $self = $class->SUPER::new (
1192 fg => [1, 1, 1],
1193 #font => default_font
1194 fontsize => 1,
1195 text => "",
1196 align => -1,
1197 valign => -1,
1198 padding => 2,
1199 layout => new CFClient::Layout,
1200 can_events => 0,
1201 %arg
1202 );
671 1203
672 # TODO: color, and make height, xyz etc. optional 1204 if (exists $self->{template}) {
673 my $self = $class->SUPER::new (x => $x, y => $y, z => $z, height => $height); 1205 my $layout = new CFClient::Layout;
1206 $layout->set_text (delete $self->{template});
1207 $self->{template} = $layout;
1208 }
674 1209
675 $self->set_text ($text); 1210 $self->set_text (delete $self->{text}) if exists $self->{text};
1211 $self->set_markup (delete $self->{markup}) if exists $self->{markup};
676 1212
677 $self 1213 $self
1214}
1215
1216sub escape {
1217 local $_ = $_[1];
1218
1219 s/&/&amp;/g;
1220 s/>/&gt;/g;
1221 s/</&lt;/g;
1222
1223 $_[1]
1224}
1225
1226sub update {
1227 my ($self) = @_;
1228
1229 delete $self->{texture};
1230 $self->SUPER::update;
1231}
1232
1233sub reconfigure {
1234 my ($self) = @_;
1235
1236 delete $self->{texture};
678} 1237}
679 1238
680sub set_text { 1239sub set_text {
681 my ($self, $text) = @_; 1240 my ($self, $text) = @_;
682 1241
1242 return if $self->{text} eq "T$text";
1243 $self->{text} = "T$text";
1244
1245 $self->{layout}->set_text ($text);
1246
1247 delete $self->{texture};
1248 $self->update;
1249 $self->check_size;
1250}
1251
1252sub set_markup {
1253 my ($self, $markup) = @_;
1254
1255 return if $self->{text} eq "M$markup";
1256 $self->{text} = "M$markup";
1257
1258 $self->{layout}->set_markup ($markup);
1259
1260 delete $self->{texture};
1261 $self->update;
1262 $self->check_size;
1263}
1264
1265sub size_request {
1266 my ($self) = @_;
1267
1268 $self->{layout}->set_font ($self->{font}) if $self->{font};
1269 $self->{layout}->set_width ($self->{max_w} || -1);
1270 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1271
1272 my ($w, $h) = $self->{layout}->size;
1273
1274 if (exists $self->{template}) {
1275 $self->{template}->set_font ($self->{font}) if $self->{font};
1276 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1277
1278 my ($w2, $h2) = $self->{template}->size;
1279
1280 $w = List::Util::max $w, $w2;
1281 $h = List::Util::max $h, $h2;
1282 }
1283
1284 (
1285 $w + $self->{padding} * 2,
1286 $h + $self->{padding} * 2,
1287 )
1288}
1289
1290sub size_allocate {
1291 my ($self, $w, $h) = @_;
1292
1293 delete $self->{texture};
1294}
1295
1296sub set_fontsize {
1297 my ($self, $fontsize) = @_;
1298
1299 $self->{fontsize} = $fontsize;
1300 delete $self->{texture};
1301 $self->check_size;
1302 $self->update;
1303}
1304
1305sub _draw {
1306 my ($self) = @_;
1307
1308 my $tex = $self->{texture} ||= do {
1309 $self->{layout}->set_font ($self->{font}) if $self->{font};
1310 $self->{layout}->set_width ($self->{w});
1311 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE);
1312 new_from_layout CFClient::Texture $self->{layout}
1313 };
1314
1315 glEnable GL_BLEND;
1316 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1317 glEnable GL_TEXTURE_2D;
1318 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1319
1320 glColor @{$self->{fg}};
1321
1322 $self->{ox} = int (
1323 $self->{align} < 0 ? $self->{padding}
1324 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1325 : ($self->{w} - $tex->{w}) * 0.5
1326 );
1327
1328 $self->{oy} = int (
1329 $self->{valign} < 0 ? $self->{padding}
1330 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1331 : ($self->{h} - $tex->{h}) * 0.5
1332 );
1333
1334 $tex->draw_quad ($self->{ox}, $self->{oy});
1335
1336 glDisable GL_TEXTURE_2D;
1337 glDisable GL_BLEND;
1338}
1339
1340#############################################################################
1341
1342package CFClient::UI::EntryBase;
1343
1344our @ISA = CFClient::UI::Label::;
1345
1346use CFClient::OpenGL;
1347
1348sub new {
1349 my $class = shift;
1350
1351 $class->SUPER::new (
1352 fg => [1, 1, 1],
1353 bg => [0, 0, 0, 0.2],
1354 active_bg => [1, 1, 1, 0.5],
1355 active_fg => [0, 0, 0],
1356 can_hover => 1,
1357 can_focus => 1,
1358 valign => 0,
1359 can_events => 1,
1360 @_
1361 )
1362}
1363
1364sub _set_text {
1365 my ($self, $text) = @_;
1366
1367 delete $self->{cur_h};
1368
1369 return if $self->{text} eq $text;
1370
1371 delete $self->{texture};
1372
1373 $self->{last_activity} = $::NOW;
683 $self->{text} = $text; 1374 $self->{text} = $text;
684 $self->{texture} = new_from_text Crossfire::Client::Texture $text, $self->{height};
685 1375
1376 $text =~ s/./*/g if $self->{hidden};
1377 $self->{layout}->set_text ("$text ");
1378
1379 $self->emit (changed => $self->{text});
1380}
1381
1382sub get_text {
1383 $_[0]{text}
1384}
1385
1386sub size_request {
1387 my ($self) = @_;
1388
1389 my ($w, $h) = $self->SUPER::size_request;
1390
1391 ($w + 1, $h) # add 1 for cursor
1392}
1393
1394sub size_allocate {
1395 my ($self, $w, $h) = @_;
1396
1397 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1398}
1399
1400sub set_text {
1401 my ($self, $text) = @_;
1402
1403 $self->{cursor} = length $text;
1404 $self->_set_text ($text);
686 $self->update; 1405 $self->update;
687} 1406}
688 1407
689sub get_text { 1408sub key_down {
690 my ($self, $text) = @_; 1409 my ($self, $ev) = @_;
691 1410
692 $self->{text} 1411 my $mod = $ev->{mod};
1412 my $sym = $ev->{sym};
1413 my $uni = $ev->{unicode};
1414
1415 my $text = $self->get_text;
1416
1417 if ($sym == 8) {
1418 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1419 } elsif ($sym == 127) {
1420 substr $text, $self->{cursor}, 1, "";
1421 } elsif ($sym == CFClient::SDLK_LEFT) {
1422 --$self->{cursor} if $self->{cursor};
1423 } elsif ($sym == CFClient::SDLK_RIGHT) {
1424 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1425 } elsif ($sym == CFClient::SDLK_HOME) {
1426 $self->{cursor} = 0;
1427 } elsif ($sym == CFClient::SDLK_END) {
1428 $self->{cursor} = length $text;
1429 } elsif ($sym == 27) {
1430 $self->emit ('escape');
1431 } elsif ($uni) {
1432 substr $text, $self->{cursor}++, 0, chr $uni;
1433 }
1434
1435 $self->_set_text ($text);
1436 $self->update;
1437}
1438
1439sub focus_in {
1440 my ($self) = @_;
1441
1442 $self->{last_activity} = $::NOW;
1443
1444 $self->SUPER::focus_in;
1445}
1446
1447sub button_down {
1448 my ($self, $ev, $x, $y) = @_;
1449
1450 $self->SUPER::button_down ($ev, $x, $y);
1451
1452 my $idx = $self->{layout}->xy_to_index ($x, $y);
1453
1454 # byte-index to char-index
1455 my $text = $self->{text};
1456 utf8::encode $text;
1457 $self->{cursor} = length substr $text, 0, $idx;
1458
1459 $self->_set_text ($self->{text});
1460 $self->update;
1461}
1462
1463sub mouse_motion {
1464 my ($self, $ev, $x, $y) = @_;
1465# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1466}
1467
1468sub _draw {
1469 my ($self) = @_;
1470
1471 local $self->{fg} = $self->{fg};
1472
1473 if ($FOCUS == $self) {
1474 glColor @{$self->{active_bg}};
1475 $self->{fg} = $self->{active_fg};
1476 } else {
1477 glColor @{$self->{bg}};
1478 }
1479
1480 glEnable GL_BLEND;
1481 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1482 glBegin GL_QUADS;
1483 glVertex 0 , 0;
1484 glVertex 0 , $self->{h};
1485 glVertex $self->{w}, $self->{h};
1486 glVertex $self->{w}, 0;
1487 glEnd;
1488 glDisable GL_BLEND;
1489
1490 $self->SUPER::_draw;
1491
1492 #TODO: force update every cursor change :(
1493 if ($FOCUS == $self && (($::NOW - $self->{last_activity}) & 1023) < 600) {
1494
1495 unless (exists $self->{cur_h}) {
1496 my $text = substr $self->{text}, 0, $self->{cursor};
1497 utf8::encode $text;
1498
1499 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1500 }
1501
1502 glColor @{$self->{fg}};
1503 glBegin GL_LINES;
1504 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};
1505 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1506 glEnd;
1507 }
1508}
1509
1510package CFClient::UI::Entry;
1511
1512our @ISA = CFClient::UI::EntryBase::;
1513
1514use CFClient::OpenGL;
1515
1516sub key_down {
1517 my ($self, $ev) = @_;
1518
1519 my $sym = $ev->{sym};
1520
1521 if ($sym == 13) {
1522 unshift @{$self->{history}},
1523 my $txt = $self->get_text;
1524 $self->{history_pointer} = -1;
1525 $self->{history_saveback} = '';
1526 $self->emit (activate => $txt);
1527 $self->update;
1528
1529 } elsif ($sym == CFClient::SDLK_UP) {
1530 if ($self->{history_pointer} < 0) {
1531 $self->{history_saveback} = $self->get_text;
1532 }
1533 if (@{$self->{history} || []} > 0) {
1534 $self->{history_pointer}++;
1535 if ($self->{history_pointer} >= @{$self->{history} || []}) {
1536 $self->{history_pointer} = @{$self->{history} || []} - 1;
1537 }
1538 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1539 }
1540
1541 } elsif ($sym == CFClient::SDLK_DOWN) {
1542 $self->{history_pointer}--;
1543 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1544
1545 if ($self->{history_pointer} >= 0) {
1546 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1547 } else {
1548 $self->set_text ($self->{history_saveback});
1549 }
1550
1551 } else {
1552 $self->SUPER::key_down ($ev);
1553 }
1554
1555}
1556
1557#############################################################################
1558
1559package CFClient::UI::Button;
1560
1561our @ISA = CFClient::UI::Label::;
1562
1563use CFClient::OpenGL;
1564
1565my @tex =
1566 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1567 qw(b1_button_active.png);
1568
1569sub new {
1570 my $class = shift;
1571
1572 $class->SUPER::new (
1573 padding => 4,
1574 fg => [1, 1, 1],
1575 bg => [1, 1, 1, 0.2],
1576 active_fg => [0, 0, 1],
1577 can_hover => 1,
1578 align => 0,
1579 valign => 0,
1580 can_events => 1,
1581 @_
1582 )
1583}
1584
1585sub button_up {
1586 my ($self, $ev, $x, $y) = @_;
1587
1588 if ($x >= 0 && $x < $self->{w}
1589 && $y >= 0 && $y < $self->{h}) {
1590 $self->emit ("activate");
1591 }
1592}
1593
1594sub _draw {
1595 my ($self) = @_;
1596
1597 local $self->{fg} = $self->{fg};
1598
1599 if ($GRAB == $self) {
1600 $self->{fg} = $self->{active_fg};
1601 }
1602
1603 glEnable GL_BLEND;
1604 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1605 glEnable GL_TEXTURE_2D;
1606 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1607 glColor 0, 0, 0, 1;
1608
1609 $tex[0]->draw_quad (0, 0, $self->{w}, $self->{h});
1610
1611 glDisable GL_TEXTURE_2D;
1612 glDisable GL_BLEND;
1613
1614 $self->SUPER::_draw;
1615}
1616
1617#############################################################################
1618
1619package CFClient::UI::CheckBox;
1620
1621our @ISA = CFClient::UI::DrawBG::;
1622
1623my @tex =
1624 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1625 qw(c1_checkbox_bg.png c1_checkbox_active.png);
1626
1627use CFClient::OpenGL;
1628
1629sub new {
1630 my $class = shift;
1631
1632 $class->SUPER::new (
1633 padding => 2,
1634 fg => [1, 1, 1],
1635 active_fg => [1, 1, 0],
1636 state => 0,
1637 can_hover => 1,
1638 @_
1639 )
693} 1640}
694 1641
695sub size_request { 1642sub size_request {
696 my ($self) = @_; 1643 my ($self) = @_;
697 1644
698 if ($self->{texture}{width} > 1 && $self->{texture}{height} > 1) { #TODO: hack 1645 ($self->{padding} * 2 + 6) x 2
699 ( 1646}
700 $self->{texture}{width},
701 $self->{texture}{height},
702 )
703 } else {
704 my ($w, $h, $data) = Crossfire::Client::font_render "Yy", $self->{height};
705 1647
706 ($w, $h) 1648sub button_down {
707 } 1649 my ($self, $ev, $x, $y) = @_;
708 1650
1651 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}
1652 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {
1653 $self->{state} = !$self->{state};
1654 $self->emit (changed => $self->{state});
1655 }
709} 1656}
710 1657
711sub _draw { 1658sub _draw {
712 my ($self) = @_; 1659 my ($self) = @_;
713 1660
714 my $tex = $self->{texture}; 1661 $self->SUPER::_draw;
1662
1663 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0;
1664
1665 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;
1666
1667 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
715 1668
716 glEnable GL_BLEND; 1669 glEnable GL_BLEND;
717 glEnable GL_TEXTURE_2D; 1670 glEnable GL_TEXTURE_2D;
718 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1671 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1672
1673 my $tex = $self->{state} ? $tex[1] : $tex[0];
1674
1675 $tex->draw_quad (0, 0, $s, $s);
1676
1677 glDisable GL_TEXTURE_2D;
1678 glDisable GL_BLEND;
1679}
1680
1681#############################################################################
1682
1683package CFClient::UI::Image;
1684
1685our @ISA = CFClient::UI::Base::;
1686
1687use CFClient::OpenGL;
1688use Carp qw/confess/;
1689
1690our %loaded_images;
1691
1692sub new {
1693 my $class = shift;
1694
1695 my $self = $class->SUPER::new (can_events => 0, @_);
1696
1697 $self->{image} or confess "Image has 'image' not set. This is a fatal error!";
1698
1699 $loaded_images{$self->{image}} ||=
1700 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1;
1701
1702 my $tex = $self->{tex} = $loaded_images{$self->{image}};
1703
1704 Scalar::Util::weaken $loaded_images{$self->{image}};
1705
1706 $self->{aspect} = $tex->{w} / $tex->{h};
1707
1708 $self
1709}
1710
1711sub size_request {
1712 my ($self) = @_;
1713
1714 ($self->{tex}->{w}, $self->{tex}->{h})
1715}
1716
1717sub _draw {
1718 my ($self) = @_;
1719
1720 my $tex = $self->{tex};
1721
1722 my ($w, $h) = ($self->{w}, $self->{h});
1723
1724 if ($self->{rot90}) {
1725 glRotate 90, 0, 0, 1;
1726 glTranslate 0, -$self->{w}, 0;
1727
1728 ($w, $h) = ($h, $w);
1729 }
1730
1731 glEnable GL_BLEND;
1732 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1733 glEnable GL_TEXTURE_2D;
719 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1734 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
720 glBindTexture GL_TEXTURE_2D, $tex->{name};
721 1735
722 glColor 1, 0, 0, 1; # TODO color 1736 $tex->draw_quad (0, 0, $w, $h);
723
724 glBegin GL_QUADS;
725 glTexCoord 0, 0; glVertex 0 , 0;
726 glTexCoord 0, 1; glVertex 0 , $tex->{height};
727 glTexCoord 1, 1; glVertex $tex->{width}, $tex->{height};
728 glTexCoord 1, 0; glVertex $tex->{width}, 0;
729 glEnd;
730 1737
731 glDisable GL_BLEND; 1738 glDisable GL_BLEND;
732 glDisable GL_TEXTURE_2D; 1739 glDisable GL_TEXTURE_2D;
733} 1740}
734 1741
735############################################################################# 1742#############################################################################
736 1743
737package Crossfire::Client::Widget::Entry; 1744package CFClient::UI::VGauge;
738 1745
739our @ISA = Crossfire::Client::Widget::Label::; 1746our @ISA = CFClient::UI::Base::;
740 1747
741use SDL; 1748use List::Util qw(min max);
742use SDL::OpenGL;
743 1749
744sub key_down { 1750use CFClient::OpenGL;
1751
1752my %tex = (
1753 food => [
1754 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1755 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
1756 ],
1757 grace => [
1758 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1759 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
1760 ],
1761 hp => [
1762 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1763 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
1764 ],
1765 mana => [
1766 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1767 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
1768 ],
1769);
1770
1771# eg. VGauge->new (gauge => 'food'), default gauge: food
1772sub new {
1773 my $class = shift;
1774
1775 my $self = $class->SUPER::new (
1776 type => 'food',
1777 @_
1778 );
1779
1780 $self->{aspect} = $tex{$self->{type}}[0]{w} / $tex{$self->{type}}[0]{h};
1781
1782 $self
1783}
1784
1785sub size_request {
1786 my ($self) = @_;
1787
1788 #my $tex = $tex{$self->{type}}[0];
1789 #@$tex{qw(w h)}
1790 (0, 0)
1791}
1792
1793sub set_max {
1794 my ($self, $max) = @_;
1795
1796 return if $self->{max_val} == $max;
1797
1798 $self->{max_val} = $max;
1799 $self->update;
1800}
1801
1802sub set_value {
1803 my ($self, $val, $max) = @_;
1804
1805 $self->set_max ($max)
1806 if defined $max;
1807
1808 return if $self->{val} == $val;
1809
1810 $self->{val} = $val;
1811 $self->update;
1812}
1813
1814sub _draw {
1815 my ($self) = @_;
1816
1817 my $tex = $tex{$self->{type}};
1818 my ($t1, $t2, $t3) = @$tex;
1819
1820 my ($w, $h) = ($self->{w}, $self->{h});
1821
1822 if ($self->{vertical}) {
1823 glRotate 90, 0, 0, 1;
1824 glTranslate 0, -$self->{w}, 0;
1825
1826 ($w, $h) = ($h, $w);
1827 }
1828
1829 my $ycut = $self->{val} / ($self->{max_val} || 1);
1830
1831 my $ycut1 = max 0, min 1, $ycut;
1832 my $ycut2 = max 0, min 1, $ycut - 1;
1833
1834 my $h1 = $self->{h} * (1 - $ycut1);
1835 my $h2 = $self->{h} * (1 - $ycut2);
1836
1837 glEnable GL_BLEND;
1838 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1839 glEnable GL_TEXTURE_2D;
1840 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1841
1842 glBindTexture GL_TEXTURE_2D, $t1->{name};
1843 glBegin GL_QUADS;
1844 glTexCoord 0 , 0; glVertex 0 , 0;
1845 glTexCoord 0 , $t1->{t} * (1 - $ycut1); glVertex 0 , $h1;
1846 glTexCoord $t1->{s}, $t1->{t} * (1 - $ycut1); glVertex $w, $h1;
1847 glTexCoord $t1->{s}, 0; glVertex $w, 0;
1848 glEnd;
1849
1850 my $ycut1 = List::Util::min 1, $ycut;
1851 glBindTexture GL_TEXTURE_2D, $t2->{name};
1852 glBegin GL_QUADS;
1853 glTexCoord 0 , $t2->{t} * (1 - $ycut1); glVertex 0 , $h1;
1854 glTexCoord 0 , $t2->{t} * (1 - $ycut2); glVertex 0 , $h2;
1855 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut2); glVertex $w, $h2;
1856 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut1); glVertex $w, $h1;
1857 glEnd;
1858
1859 if ($t3) {
1860 glBindTexture GL_TEXTURE_2D, $t3->{name};
1861 glBegin GL_QUADS;
1862 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
1863 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h};
1864 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h};
1865 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
1866 glEnd;
1867 }
1868
1869 glDisable GL_BLEND;
1870 glDisable GL_TEXTURE_2D;
1871}
1872
1873#############################################################################
1874
1875package CFClient::UI::Gauge;
1876
1877our @ISA = CFClient::UI::VBox::;
1878
1879sub new {
1880 my ($class, %arg) = @_;
1881
1882 my $self = $class->SUPER::new (
1883 tooltip => $arg{type},
1884 can_hover => 1,
1885 can_events => 1,
1886 %arg,
1887 );
1888
1889 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");
1890 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
1891 $self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999");
1892
1893 $self
1894}
1895
1896sub set_fontsize {
745 my ($self, $ev) = @_; 1897 my ($self, $fsize) = @_;
746 1898
747 my $mod = $ev->key_mod; 1899 $self->{value}->set_fontsize ($fsize);
748 my $sym = $ev->key_sym; 1900 $self->{max} ->set_fontsize ($fsize);
1901}
749 1902
750 my $uni = $ev->key_unicode; 1903sub set_max {
1904 my ($self, $max) = @_;
751 1905
752 my $text = $self->get_text; 1906 $self->{gauge}->set_max ($max);
753
754 if ($sym == SDLK_BACKSPACE) {
755 substr $text, -1, 1, '';
756 } elsif ($uni) {
757 $text .= chr $uni;
758 print "$uni <$text>\n";#d#
759 }
760
761 $self->set_text ($text); 1907 $self->{max}->set_text ($max);
1908}
1909
1910sub set_value {
1911 my ($self, $val, $max) = @_;
1912
1913 $self->set_max ($max)
1914 if defined $max;
1915
1916 $self->{gauge}->set_value ($val, $max);
1917 $self->{value}->set_text ($val);
1918}
1919
1920#############################################################################
1921
1922package CFClient::UI::Slider;
1923
1924use strict;
1925
1926use CFClient::OpenGL;
1927
1928our @ISA = CFClient::UI::DrawBG::;
1929
1930my @tex =
1931 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
1932 qw(s1_slider.png s1_slider_bg.png);
1933
1934sub new {
1935 my $class = shift;
1936
1937 # range [value, low, high, page]
1938
1939 # TODO: 0-width page
1940 # TODO: req_w/h are wrong with vertical
1941 # TODO: calculations are off
1942 my $self = $class->SUPER::new (
1943 fg => [1, 1, 1],
1944 active_fg => [0, 0, 0],
1945 range => [0, 0, 100, 10],
1946 req_w => 20,
1947 req_h => 20,
1948 vertical => 0,
1949 can_hover => 1,
1950 inner_pad => 5,
1951 @_
1952 );
1953
1954 $self
1955}
1956
1957sub size_request {
1958 my ($self) = @_;
1959
1960 my $w = $self->{req_w};
1961 my $h = $self->{req_h};
1962
1963 $self->{vertical} ? ($h, $w) : ($w, $h)
762} 1964}
763 1965
764sub button_down { 1966sub button_down {
1967 my ($self, $ev, $x, $y) = @_;
1968
1969 $self->SUPER::button_down ($ev, $x, $y);
1970 $self->mouse_motion ($ev, $x, $y);
1971}
1972
1973sub mouse_motion {
1974 my ($self, $ev, $x, $y) = @_;
1975
1976 if ($GRAB == $self) {
1977 my ($value, $lo, $hi, $page) = @{$self->{range}};
1978
1979 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
1980
1981 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
1982 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
1983
1984 $x -= $inner_pad_px; # substract the padding
1985 $x = $x * ($hi - $lo) / $inner_w + $lo;
1986 $x = $lo if $x < $lo;
1987 $x = $hi - $page if $x > $hi - $page;
1988 $self->{range}[0] = $x;
1989
1990 $self->emit (changed => $x);
1991 $self->update;
1992 }
1993}
1994
1995# the inner_* stuff is for generating a padding for the slider handle,
1996# so that the handle doesn't leave the texture. This calculation isn't 100%
1997# correct propably, but it does the job for now
1998sub _calc_inner_pad_px {
765 my ($self, $ev) = @_; 1999 my ($self, $w) = @_;
766 2000 ($w / 100) * $self->{inner_pad} # % to pixels
767 $self->focus_in;
768} 2001}
769 2002
770sub _draw { 2003sub _draw {
771 my ($self) = @_; 2004 my ($self) = @_;
772 2005
773 if ($FOCUS == $self) {
774 glColor 1, 1, 1;
775 } else {
776 glColor 0.7, 0.7, 0.7;
777 }
778
779 glBegin GL_QUADS;
780 glVertex 0 , 0;
781 glVertex 0 , $self->{h} - 1;
782 glVertex $self->{w} - 1, $self->{h} - 1;
783 glVertex $self->{w} - 1, 0;
784 glEnd;
785
786 $self->SUPER::_draw; 2006 $self->SUPER::_draw ();
787}
788 2007
789############################################################################# 2008 my ($w, $h) = @$self{qw(w h)};
790 2009
791package Crossfire::Client::Widget::MapWidget; 2010 if ($self->{vertical}) {
2011 # draw a vertical slider like a rotated horizontal slider
2012
2013 glRotate 90, 0, 0, 1;
2014 glTranslate 0, -$self->{w}, 0;
792 2015
793use strict; 2016 ($w, $h) = ($h, $w);
794
795use List::Util qw(min max);
796
797use SDL;
798use SDL::OpenGL;
799use SDL::OpenGL::Constants;
800
801our @ISA = Crossfire::Client::Widget::;
802
803sub key_down {
804 print "MAPKEYDOWN\n";
805}
806
807sub key_up {
808}
809
810sub size_request {
811 ( 2017 }
812 1 + int $::WIDTH / 32, 2018
813 1 + int $::HEIGHT / 32, 2019 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
2020 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
2021
2022 my ($value, $lo, $hi, $page) = @{$self->{range}};
2023
2024 $hi = $value + 1 if $lo == $hi;
2025
2026 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
2027 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
2028
2029 $page = int $page * $inner_w / ($hi - $lo);
2030 $value = int +($value - $lo) * $inner_w / ($hi - $lo);
2031
2032 $w -= $page;
2033 $page &= ~1;
2034 glTranslate $page * 0.5, 0, 0;
2035 $page ||= 2;
2036
2037 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
2038 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
2039
2040 glEnable GL_BLEND;
2041 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2042 glEnable GL_TEXTURE_2D;
2043 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2044
2045 # draw background
2046 $tex[1]->draw_quad (0, 0, $w, $h);
2047
2048 # draw handle
2049 $tex[0]->draw_quad ($knob_a, 0, $knob_b - $knob_a, $h);
2050
2051 glDisable GL_BLEND;
2052 glDisable GL_TEXTURE_2D;
2053}
2054
2055#############################################################################
2056
2057package CFClient::UI::TextView;
2058
2059our @ISA = CFClient::UI::HBox::;
2060
2061use CFClient::OpenGL;
2062
2063sub new {
2064 my $class = shift;
2065
2066 my $self = $class->SUPER::new (
2067 fontsize => 1,
2068 can_events => 0,
2069 #font => default_font
2070 @_,
2071
2072 layout => (new CFClient::Layout),
2073 par => [],
2074 height => 0,
2075 children => [
2076 (new CFClient::UI::Empty expand => 1),
2077 (new CFClient::UI::Slider vertical => 1),
2078 ],
814 ) 2079 );
2080
2081 $self->{children}[1]->connect (changed => sub {
2082 $self->update;
2083 });
2084
2085 $self
2086}
2087
2088sub set_fontsize {
2089 my ($self, $fontsize) = @_;
2090
2091 $self->{fontsize} = $fontsize;
2092 $self->reflow;
2093}
2094
2095sub text_height {
2096 my ($self, $text) = @_;
2097
2098 my $layout = $self->{layout};
2099
2100 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2101 $layout->set_width ($self->{w});
2102 $layout->set_text ($text);
2103
2104 ($layout->size)[1]
2105}
2106
2107sub reflow {
2108 my ($self) = @_;
2109
2110 $self->{need_reflow}++;
2111 $self->update;
2112}
2113
2114sub size_allocate {
2115 my ($self, $w, $h) = @_;
2116
2117 $self->SUPER::size_allocate ($w, $h);
2118
2119 $self->{layout}->set_font ($self->{font}) if $self->{font};
2120 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2121 $self->{layout}->set_width ($self->{children}[0]{w});
2122
2123 $self->reflow;
2124}
2125
2126sub add_paragraph {
2127 my ($self, $color, $text) = @_;
2128
2129 #TODO: intelligently "reformat" paragraph
2130
2131 my $height = $self->text_height ($text);
2132
2133 $self->{height} += $height;
2134
2135 push @{$self->{par}}, [$height, $color, $text];
2136
2137 $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}];
2138 $self->{children}[1]->update;
2139}
2140
2141sub update {
2142 my ($self) = @_;
2143
2144 $self->SUPER::update;
2145
2146 return unless $self->{h} > 0;
2147
2148 delete $self->{texture};
2149
2150 $ROOT->on_refresh ($self, sub {
2151 if (delete $self->{need_reflow}) {
2152 my $height = 0;
2153
2154 $height += $_->[0] = $self->text_height ($_->[2])
2155 for @{$self->{par}};
2156
2157 $self->{height} = $height;
2158
2159 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];
2160
2161 delete $self->{texture};
2162 }
2163
2164 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
2165 glClearColor 0, 0, 0, 1;
2166 glClear GL_COLOR_BUFFER_BIT;
2167
2168 glEnable GL_BLEND;
2169 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2170 glEnable GL_TEXTURE_2D;
2171 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2172
2173 my $top = int $self->{children}[1]{range}[0];
2174
2175 my $y0 = $top;
2176 my $y1 = $top + $self->{h};
2177
2178 my $y = 0;
2179
2180 my $layout = $self->{layout};
2181
2182 $layout->set_font ($self->{font}) if $self->{font};
2183
2184 for my $par (@{$self->{par}}) {
2185 my $h = $par->[0];
2186
2187 if ($y0 < $y + $h && $y < $y1) {
2188 $layout->set_text ($par->[2]);
2189
2190 glColor @{ $par->[1] };
2191 my ($W, $H) = $layout->size;
2192 CFClient::Texture->new_from_layout ($layout)->draw_quad (0, $y - $y0);
2193 }
2194
2195 $y += $h;
2196 }
2197
2198 glDisable GL_TEXTURE_2D;
2199 glDisable GL_BLEND;
2200 };
2201 });
815} 2202}
816 2203
817sub _draw { 2204sub _draw {
818 my ($self) = @_; 2205 my ($self) = @_;
819 2206
820 my $mx = $::CONN->{mapx}; 2207 if ($self->{texture}) {
821 my $my = $::CONN->{mapy};
822
823 my $map = $::CONN->{map};
824
825 my ($xofs, $yofs);
826
827 my $sw = 1 + int $::WIDTH / 32;
828 my $sh = 1 + int $::HEIGHT / 32;
829
830 if ($::CONN->{mapw} > $sw) {
831 $xofs = $mx + ($::CONN->{mapw} - $sw) * 0.5;
832 } else {
833 $xofs = $self->{xofs} = min $mx, max $mx + $::CONN->{mapw} - $sw + 1, $self->{xofs};
834 }
835
836 if ($::CONN->{maph} > $sh) {
837 $yofs = $my + ($::CONN->{maph} - $sh) * 0.5;
838 } else {
839 $yofs = $self->{yofs} = min $my, max $my + $::CONN->{maph} - $sh + 1, $self->{yofs};
840 }
841
842 glEnable GL_TEXTURE_2D; 2208 glEnable GL_TEXTURE_2D;
843 glEnable GL_BLEND;
844 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2209 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
845 2210 glColor 1, 1, 1, 1;
846 my $sw4 = ($sw + 3) & ~3; 2211 $self->{texture}->draw_quad (0, 0, $self->{w}, $self->{h});
847 my $lighting = "\x00" x ($sw4 * $sh);
848
849 for my $x (0 .. $sw - 1) {
850 for my $y (0 .. $sh - 1) {
851
852 my $cell = $map->[$x + $xofs][$y + $yofs]
853 or next;
854
855 my $darkness = $cell->[0] * (1 / 255);
856 if ($darkness < 0) {
857 $darkness = $cell->[1] ? 0.1 : 0;
858 }
859 substr $lighting, $y * $sw4 + $x, 1, chr 255 - $darkness * 255;
860
861 for my $num (grep $_, @$cell[1,2,3]) {
862 my $tex = $::CONN->{face}[$num]{texture} || next;
863
864 glBindTexture GL_TEXTURE_2D, $tex->{name};
865
866 my $w = $tex->{width};
867 my $h = $tex->{height};
868
869 my $px = ($x + 1) * 32 - $w;
870 my $py = ($y + 1) * 32 - $h;
871
872 glBegin GL_QUADS;
873 glTexCoord 0, 0; glVertex $px , $py;
874 glTexCoord 0, 1; glVertex $px , $py + $h;
875 glTexCoord 1, 1; glVertex $px + $w, $py + $h;
876 glTexCoord 1, 0; glVertex $px + $w, $py;
877 glEnd;
878 }
879 }
880 }
881
882# if (1) { # higher quality darkness
883# $lighting =~ s/(.)/$1$1$1/gs;
884# my $pb = new_from_data Gtk2::Gdk::Pixbuf $lighting, "rgb", 0, 8, $sw4, $sh, $sw4 * 3;
885#
886# $pb = $pb->scale_simple ($sw4 * 0.5, $sh * 0.5, "bilinear");
887#
888# $lighting = $pb->get_pixels;
889# $lighting =~ s/(.)../$1/gs;
890# }
891
892 $lighting = new Crossfire::Client::Texture
893 width => $sw4,
894 height => $sh,
895 data => $lighting,
896 internalformat => GL_ALPHA,
897 format => GL_ALPHA;
898
899 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
900 glColor 0.45, 0.45, 0.45, 1;
901 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
902 glBindTexture GL_TEXTURE_2D, $lighting->{name};
903 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR;
904 glBegin GL_QUADS;
905 glTexCoord 0, 0; glVertex 0 , 0;
906 glTexCoord 0, 1; glVertex 0 , $sh * 32;
907 glTexCoord 1, 1; glVertex $sw4 * 32, $sh * 32;
908 glTexCoord 1, 0; glVertex $sw4 * 32, 0;
909 glEnd;
910
911 glDisable GL_TEXTURE_2D; 2212 glDisable GL_TEXTURE_2D;
912 glDisable GL_BLEND;
913}
914
915my %DIR = (
916 SDLK_KP8, [1, "north"],
917 SDLK_KP9, [2, "northeast"],
918 SDLK_KP6, [3, "east"],
919 SDLK_KP3, [4, "southeast"],
920 SDLK_KP2, [5, "south"],
921 SDLK_KP1, [6, "southwest"],
922 SDLK_KP4, [7, "west"],
923 SDLK_KP7, [8, "northwest"],
924
925 SDLK_UP, [1, "north"],
926 SDLK_RIGHT, [3, "east"],
927 SDLK_DOWN, [5, "south"],
928 SDLK_LEFT, [7, "west"],
929);
930
931sub key_down {
932 my ($self, $ev) = @_;
933
934 my $mod = $ev->key_mod;
935 my $sym = $ev->key_sym;
936
937 if ($sym == SDLK_KP5) {
938 $::CONN->send ("command stay fire");
939 } elsif (exists $DIR{$sym}) {
940 if ($mod & KMOD_SHIFT) {
941 $self->{shft}++;
942 $::CONN->send ("command fire $DIR{$sym}[0]");
943 } elsif ($mod & KMOD_CTRL) {
944 $self->{ctrl}++;
945 $::CONN->send ("command run $DIR{$sym}[0]");
946 } else {
947 $::CONN->send ("command $DIR{$sym}[1]");
948 }
949 } 2213 }
950}
951 2214
952sub key_up { 2215 $self->{children}[1]->draw;
953 my ($self, $ev) = @_;
954 2216
955 my $mod = $ev->key_mod;
956 my $sym = $ev->key_sym;
957
958 if (!($mod & KMOD_SHIFT) && delete $self->{shft}) {
959 $::CONN->send ("command fire_stop");
960 }
961 if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) {
962 $::CONN->send ("command run_stop");
963 }
964} 2217}
965 2218
966############################################################################# 2219#############################################################################
967 2220
968package Crossfire::Client::Widget::Animator; 2221package CFClient::UI::Animator;
969 2222
970use SDL::OpenGL; 2223use CFClient::OpenGL;
971 2224
972our @ISA = Crossfire::Client::Widget::Bin::; 2225our @ISA = CFClient::UI::Bin::;
973 2226
974sub moveto { 2227sub moveto {
975 my ($self, $x, $y) = @_; 2228 my ($self, $x, $y) = @_;
976 2229
977 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 2230 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
978 $self->{speed} = 2; 2231 $self->{speed} = 0.001;
979 $self->{time} = 1; 2232 $self->{time} = 1;
980 2233
981 ::animation_start $self; 2234 ::animation_start $self;
982} 2235}
983 2236
… …
1005 glPopMatrix; 2258 glPopMatrix;
1006} 2259}
1007 2260
1008############################################################################# 2261#############################################################################
1009 2262
1010package Crossfire::Client::Widget::Toplevel; 2263package CFClient::UI::Flopper;
1011 2264
2265our @ISA = CFClient::UI::Button::;
2266
2267sub new {
2268 my $class = shift;
2269
2270 my $self = $class->SUPER::new (
2271 state => 0,
2272 connect_activate => \&toggle_flopper,
2273 @_
2274 );
2275
2276 if ($self->{state}) {
2277 $self->{state} = 0;
2278 $self->toggle_flopper;
2279 }
2280
2281 $self
2282}
2283
2284sub toggle_flopper {
2285 my ($self) = @_;
2286
2287 # TODO: use animation
2288 if ($self->{state} = !$self->{state}) {
2289 $CFClient::UI::ROOT->add ($self->{other});
2290 $self->{other}->move ($self->coord2global (0, $self->{h}));
2291 $self->emit ("open");
2292 } else {
2293 $CFClient::UI::ROOT->remove ($self->{other});
2294 $self->emit ("close");
2295 }
2296
2297 $self->emit (changed => $self->{state});
2298}
2299
2300#############################################################################
2301
2302package CFClient::UI::Tooltip;
2303
2304our @ISA = CFClient::UI::Bin::;
2305
2306use CFClient::OpenGL;
2307
2308sub new {
2309 my $class = shift;
2310
2311 $class->SUPER::new (
2312 @_,
2313 can_events => 0,
2314 )
2315}
2316
2317sub set_markup {
2318 my ($self, $text) = @_;
2319
2320 $self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0];
2321 $self->{label}->set_markup ($text);
2322 $self->add ($self->{label});
2323}
2324
2325sub size_request {
2326 my ($self) = @_;
2327
2328 $self->child->set_max_size ($::WIDTH * 0.3);
2329
2330 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2331
2332 ($w + 4, $h + 4)
2333}
2334
2335sub size_allocate {
2336 my ($self, $w, $h) = @_;
2337
2338 $self->SUPER::size_allocate ($w - 4, $h - 4);
2339}
2340
2341sub _draw {
2342 my ($self) = @_;
2343
2344 glPushMatrix;
2345 glTranslate 0.375, 0.375;
2346
2347 my ($w, $h) = @$self{qw(w h)};
2348
2349 glColor 1, 0.8, 0.4;
2350 glBegin GL_QUADS;
2351 glVertex 0 , 0;
2352 glVertex 0 , $h;
2353 glVertex $w, $h;
2354 glVertex $w, 0;
2355 glEnd;
2356
2357 glColor 0, 0, 0;
2358 glBegin GL_LINE_LOOP;
2359 glVertex 0 , 0;
2360 glVertex 0 , $h;
2361 glVertex $w, $h;
2362 glVertex $w, 0;
2363 glEnd;
2364
2365 glPopMatrix;
2366
2367 glTranslate 2, 2;
2368 $self->SUPER::_draw;
2369}
2370
2371#############################################################################
2372
2373package CFClient::UI::Face;
2374
2375our @ISA = CFClient::UI::Base::;
2376
2377use CFClient::OpenGL;
2378
2379sub new {
2380 my $class = shift;
2381
2382 $class->SUPER::new (
2383 aspect => 1,
2384 @_,
2385 )
2386}
2387
2388sub size_request {
2389 (32, 8)
2390}
2391
2392sub draw {
2393 my ($self) = @_;
2394
2395 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]];
2396
2397 if ($tex) {
2398 glEnable GL_BLEND;
2399 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2400 glEnable GL_TEXTURE_2D;
2401 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2402 glColor 1, 1, 1, 1;
2403 $tex->draw_quad (0, 0, $self->{w}, $self->{h});
2404 glDisable GL_TEXTURE_2D;
2405 glDisable GL_BLEND;
2406 }
2407}
2408
2409#############################################################################
2410
2411package CFClient::UI::Root;
2412
1012our @ISA = Crossfire::Client::Widget::Container::; 2413our @ISA = CFClient::UI::Container::;
2414
2415use CFClient::OpenGL;
2416
2417sub check_size {
2418 my ($self) = @_;
2419
2420 $self->configure (0, 0, $::WIDTH, $::HEIGHT);
2421}
1013 2422
1014sub size_request { 2423sub size_request {
1015 ($::WIDTH, $::HEIGHT) 2424 ($::WIDTH, $::HEIGHT)
1016} 2425}
1017 2426
1018sub size_allocate { 2427sub configure {
2428 my ($self, $x, $y, $w, $h) = @_;
2429
2430 $self->SUPER::configure ($x, $y, $w, $h);
2431
2432 for my $child (@{$self->{children}}) {
2433 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2434
2435 $X = List::Util::max 0, List::Util::min $w - $W, $X;
2436 $Y = List::Util::max 0, List::Util::min $h - $H, $Y;
2437 $child->configure ($X, $Y, $W,$H);
2438 }
2439}
2440
2441sub _topleft {
1019 my ($self, $w, $h) = @_; 2442 my ($self, $x, $y) = @_;
1020 2443
1021 $self->SUPER::size_allocate ($w, $h); 2444 ($x, $y)
1022
1023 $_->size_allocate ($_->size_request)
1024 for @{$self->{children}};
1025} 2445}
1026 2446
1027sub update { 2447sub update {
1028 my ($self) = @_; 2448 my ($self) = @_;
1029 2449
1030 $self->size_allocate ($self->size_request); 2450 $self->check_size;
1031 ::refresh (); 2451 ::refresh ();
1032} 2452}
1033 2453
1034sub add { 2454sub add {
1035 my ($self, $widget) = @_; 2455 my ($self, $child) = @_;
1036 2456
2457 # integerize window positions
2458 $child->{x} = int $child->{x};
2459 $child->{y} = int $child->{y};
2460
1037 $self->SUPER::add ($widget); 2461 $self->SUPER::add ($child);
2462}
1038 2463
1039 $widget->size_allocate ($widget->size_request); 2464sub on_refresh {
2465 my ($self, $id, $cb) = @_;
2466
2467 $self->{refresh_hook}{$id} = $cb;
1040} 2468}
1041 2469
1042sub draw { 2470sub draw {
1043 my ($self) = @_; 2471 my ($self) = @_;
1044 2472
2473 while (my $rcb = delete $self->{refresh_hook}) {
2474 $_->() for values %$rcb;
2475 }
2476
2477 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2478 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2479 glClear GL_COLOR_BUFFER_BIT;
2480
2481 glMatrixMode GL_PROJECTION;
2482 glLoadIdentity;
2483 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000;
2484 glMatrixMode GL_MODELVIEW;
2485 glLoadIdentity;
2486
1045 $self->_draw; 2487 $self->_draw;
1046} 2488}
1047 2489
1048############################################################################# 2490#############################################################################
1049 2491
1050package Crossfire::Client::Widget; 2492package CFClient::UI;
1051 2493
1052$TOPLEVEL = new Crossfire::Client::Widget::Toplevel; 2494$ROOT = new CFClient::UI::Root;
2495$TOOLTIP = new CFClient::UI::Tooltip;
1053 2496
10541 24971
1055 2498

Diff Legend

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