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.35 by root, Sun Apr 9 17:34:15 2006 UTC vs.
Revision 1.65 by root, Tue Apr 11 14:04:27 2006 UTC

1package Crossfire::Client::Widget; 1package CFClient::Widget;
2 2
3use strict; 3use strict;
4 4
5use Scalar::Util; 5use Scalar::Util;
6 6
7use SDL::OpenGL; 7use SDL::OpenGL;
8use SDL::OpenGL::Constants; 8use SDL::OpenGL::Constants;
9 9
10our $FOCUS; # the widget with current focus 10use CFClient;
11#our @ACTIVE_WIDGETS; 11
12our ($FOCUS, $HOVER, $GRAB); # various widgets
13
14our $TOPLEVEL;
15our $BUTTON_STATE;
12 16
13# class methods for events 17# class methods for events
14sub feed_sdl_key_down_event { $FOCUS->key_down ($_[0]) if $FOCUS } 18sub feed_sdl_key_down_event {
15sub feed_sdl_key_up_event { $FOCUS->key_up ($_[0]) if $FOCUS } 19 $FOCUS->key_down ($_[0]) if $FOCUS;
20}
21
22sub feed_sdl_key_up_event {
23 $FOCUS->key_up ($_[0]) if $FOCUS;
24}
25
16sub feed_sdl_button_down_event { } 26sub feed_sdl_button_down_event {
27 my ($ev) = @_;
28 my ($x, $y) = ($ev->motion_x, $ev->motion_y);
29
30 if (!$BUTTON_STATE) {
31 my $widget = $TOPLEVEL->find_widget ($x, $y);
32
33 $GRAB = $widget;
34 $GRAB->update if $GRAB;
35 }
36
37 $BUTTON_STATE |= 1 << ($ev->button - 1);
38
39 $GRAB->button_down ($ev, $GRAB->translate ($x, $y)) if $GRAB;
40}
41
17sub feed_sdl_button_up_event { } 42sub feed_sdl_button_up_event {
43 my ($ev) = @_;
44 my ($x, $y) = ($ev->motion_x, $ev->motion_y);
45
46 my $widget = $GRAB || $TOPLEVEL->find_widget ($x, $y);
47
48 $BUTTON_STATE &= ~(1 << ($ev->button - 1));
49
50 $GRAB->button_down ($ev, $GRAB->translate ($x, $y)) if $GRAB;
51
52 if (!$BUTTON_STATE) {
53 my $grab = $GRAB; undef $GRAB;
54 $grab->update if $grab;
55 $GRAB->update if $GRAB;
56 }
57}
58
59sub feed_sdl_motion_event {
60 my ($ev) = @_;
61 my ($x, $y) = ($ev->motion_x, $ev->motion_y);
62
63 my $widget = $GRAB || $TOPLEVEL->find_widget ($x, $y);
64
65 if ($widget != $HOVER) {
66 my $hover = $HOVER; $HOVER = $widget;
67
68 $hover->update if $hover;
69 $HOVER->update if $HOVER;
70 }
71
72 $HOVER->mouse_motion ($ev, $HOVER->translate ($x, $y)) if $HOVER;
73}
18 74
19sub new { 75sub new {
20 my $class = shift; 76 my $class = shift;
21 77
22 bless { @_ }, $class 78 bless {
79 x => 0,
80 y => 0,
81 z => 0,
82 @_
83 }, $class
23} 84}
24
25#sub activate {
26# push @ACTIVE_WIDGETS, $_[0];
27# Scalar::Util::weaken $ACTIVE_WIDGETS[-1];
28#}
29
30#sub deactivate {
31# @ACTIVE_WIDGETS =
32# sort { $a->{z} <=> $b->{z} }
33# grep { $_ && $_ != $_[0] }
34# @ACTIVE_WIDGETS;
35#}
36 85
37sub move { 86sub move {
38 my ($self, $x, $y, $z) = @_; 87 my ($self, $x, $y, $z) = @_;
39 $self->{x} = $x; 88 $self->{x} = $x;
40 $self->{y} = $y; 89 $self->{y} = $y;
44sub needs_redraw { 93sub needs_redraw {
45 0 94 0
46} 95}
47 96
48sub size_request { 97sub size_request {
98 require Carp;
49 die "size_request is abtract"; 99 Carp::confess "size_request is abtract";
100}
101
102sub size_allocate {
103 my ($self, $w, $h) = @_;
104
105 $self->{w} = $w;
106 $self->{h} = $h;
107}
108
109# translate global koordinates to local coordinate system
110sub translate {
111 my ($self, $x, $y) = @_;
112
113 $self->{parent}->translate ($x - $self->{x}, $y - $self->{y});
50} 114}
51 115
52sub focus_in { 116sub focus_in {
53 my ($widget) = @_; 117 my ($self) = @_;
54 $FOCUS = $widget; 118
119 my $focus = $FOCUS; $FOCUS = $self;
120 $focus->update if $focus;
121 $FOCUS->update;
55} 122}
56 123
57sub focus_out { 124sub focus_out {
58 my ($widget) = @_; 125 my ($self) = @_;
59}
60 126
61sub key_down { 127 return unless $FOCUS == $self;
62 my ($widget, $sdlev) = @_;
63}
64 128
65sub key_up { 129 my $focus = $FOCUS; undef $FOCUS;
66 my ($widget, $sdlev) = @_; 130 $focus->update if $focus; #?
67} 131}
68 132
133sub mouse_motion { }
134sub button_up { }
69sub button_down { 135sub button_down { }
70 my ($widget, $sdlev) = @_; 136sub key_down { }
71} 137sub key_up { }
72 138
73sub button_up { 139sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }
74 my ($widget, $sdlev) = @_; 140sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }
75}
76
77sub w { $_[0]->{w} }
78sub h { $_[0]->{h} }
79sub x { $_[0]->{x} = $_[1] if $_[1]; $_[0]->{x} } 141sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }
80sub y { $_[0]->{y} = $_[1] if $_[1]; $_[0]->{y} } 142sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }
81sub z { $_[0]->{z} = $_[1] if $_[1]; $_[0]->{z} } 143sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} }
82 144
83sub draw { 145sub draw {
84 my ($self) = @_; 146 my ($self) = @_;
85 147
86 glPushMatrix; 148 glPushMatrix;
87 glTranslate $self->{x}, $self->{y}, 0; 149 glTranslate $self->{x}, $self->{y}, 0;
88 $self->_draw; 150 $self->_draw;
151 if ($self == $HOVER) {
152 glColor 1, 1, 1, 0.4;
153 glEnable GL_BLEND;
154 glBegin GL_QUADS;
155 glVertex 0 , 0;
156 glVertex $self->{w}, 0;
157 glVertex $self->{w}, $self->{h};
158 glVertex 0 , $self->{h};
159 glEnd;
160 glDisable GL_BLEND;
161 }
89 glPopMatrix; 162 glPopMatrix;
90} 163}
91 164
92sub _draw { 165sub _draw {
93 my ($widget) = @_; 166 my ($self) = @_;
167
168 warn "no draw defined for $self\n";
94} 169}
95 170
96sub bbox { 171sub bbox {
97 my ($self) = @_; 172 my ($self) = @_;
98 my ($w, $h) = $self->size_request; 173 my ($w, $h) = $self->size_request;
102 $self->{x} = $w, 177 $self->{x} = $w,
103 $self->{y} = $h 178 $self->{y} = $h
104 ) 179 )
105} 180}
106 181
182sub find_widget {
183 my ($self, $x, $y) = @_;
184
185 return $self
186 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
187 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
188
189 ()
190}
191
107sub del_parent { $_[0]->{parent} = undef } 192sub del_parent { $_[0]->{parent} = undef }
108 193
109sub set_parent { 194sub set_parent {
110 my ($self, $par) = @_; 195 my ($self, $par) = @_;
111 196
128 my ($self) = @_; 213 my ($self) = @_;
129 214
130 #$self->deactivate; 215 #$self->deactivate;
131} 216}
132 217
133package Crossfire::Client::Widget::Bin; 218#############################################################################
134 219
220package CFClient::Widget::Container;
221
135our @ISA = Crossfire::Client::Widget::; 222our @ISA = CFClient::Widget::;
136 223
137sub add { $_[0]->{child} = $_[1]; $_[1]->set_parent ($_[0]); $_[1]->update } 224sub new {
225 my ($class, %arg) = @_;
138 226
139sub get { $_[0]->{child} } 227 my $children = delete $arg{children} || [];
228
229 my $self = $class->SUPER::new (children => [], %arg);
230 $self->add ($_) for @$children;
231
232 $self
233}
234
235sub add {
236 my ($self, $chld, $expand) = @_;
237
238 $chld->{expand} = $expand;
239 $chld->set_parent ($self);
240
241 @{$self->{children}} =
242 sort { $a->{z} <=> $b->{z} }
243 @{$self->{children}}, $chld;
244
245 $self->size_allocate ($self->{w}, $self->{h})
246 if $self->{w}; #TODO: check for "realised state"
247}
140 248
141sub remove { 249sub remove {
142 my ($self, $chld) = @_; 250 my ($self, $widget) = @_;
143 delete $self->{child} 251
144 if $self->{child} == $chld; 252 $self->{children} = [ grep $_ != $widget, @{ $self->{children} } ];
253
254 $self->size_allocate ($self->{w}, $self->{h});
145} 255}
256
257sub find_widget {
258 my ($self, $x, $y) = @_;
259
260 $x -= $self->{x};
261 $y -= $self->{y};
262
263 my $res;
264
265 for (reverse @{ $self->{children} }) {
266 $res = $_->find_widget ($x, $y)
267 and return $res;
268 }
269
270 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
271}
272
273sub _draw {
274 my ($self) = @_;
275
276 $_->draw for @{$self->{children}};
277}
278
279#############################################################################
280
281package CFClient::Widget::Bin;
282
283our @ISA = CFClient::Widget::Container::;
284
285sub child { $_[0]->{children}[0] }
146 286
147sub size_request { 287sub size_request {
148 $_[0]->{child}->size_request if $_[0]->{child} 288 $_[0]{children}[0]->size_request if $_[0]{children}[0];
289}
290
291sub size_allocate {
292 my ($self, $w, $h) = @_;
293
294 $self->SUPER::size_allocate ($w, $h);
295 $self->{children}[0]->size_allocate ($w, $h)
296 if $self->{children}[0]
297}
298
299#############################################################################
300
301package CFClient::Widget::Window;
302
303our @ISA = CFClient::Widget::Bin::;
304
305use SDL::OpenGL;
306
307sub new {
308 my ($class, %arg) = @_;
309
310 my $self = $class->SUPER::new (%arg);
311}
312
313sub update {
314 my ($self) = @_;
315
316 # we want to do this delayed...
317 $self->render_chld;
318 $self->SUPER::update;
319}
320
321sub render_chld {
322 my ($self) = @_;
323
324 $self->{texture} =
325 CFClient::Texture->new_from_opengl (
326 $self->{w}, $self->{h}, sub { $self->child->draw }
327 );
328}
329
330sub size_allocate {
331 my ($self, $w, $h) = @_;
332
333 $self->{w} = $w;
334 $self->{h} = $h;
335
336 $self->child->size_allocate ($w, $h);
337
338 $self->render_chld;
149} 339}
150 340
151sub _draw { 341sub _draw {
152 my ($self) = @_; 342 my ($self) = @_;
153 343
154 $self->{child}->draw; 344 my ($w, $h) = ($self->w, $self->h);
155}
156
157package Crossfire::Client::Widget::Toplevel;
158
159our @ISA = Crossfire::Client::Widget::;
160
161use SDL::OpenGL;
162
163sub add {
164 my ($self, $chld) = @_;
165
166 push @{$self->{childs}}, $chld;
167 @{$self->{childs}} =
168 sort { $a->{z} <=> $b->{z} }
169 @{$self->{childs}};
170
171 $chld->set_parent ($self);
172}
173
174sub remove {
175 my ($self, $chld) = @_;
176 @{$self->{childs}} =
177 sort { $a->{z} <=> $b->{z} }
178 grep { $_ && $_ != $_[0] }
179 @{$self->{childs}}
180}
181
182sub update {
183 my ($self) = @_;
184 ::refresh ();
185}
186
187sub _draw {
188 my ($self) = @_;
189
190 $_->draw for @{$self->{childs}};
191}
192
193package Crossfire::Client::Widget::Window;
194
195our @ISA = Crossfire::Client::Widget::Bin::;
196
197use SDL::OpenGL;
198
199sub add {
200 my ($self, $chld) = @_;
201 $self->SUPER::add ($chld);
202 $chld->set_parent ($self);
203 $self->update; #TODO: Move this to the size_request event propably?
204}
205
206sub remove {
207 my ($self) = @_;
208 # TODO FIXME: removing a child from a window will crash, see render_chld
209 $self->update;
210}
211
212sub update {
213 my ($self) = @_;
214 $self->render_chld;
215}
216
217sub render_chld {
218 my ($self) = @_;
219 my $chld = $self->get;
220 my ($w, $h) = $self->size_request;
221
222 $self->{texture} =
223 Crossfire::Client::Texture->new_from_opengl (
224 $w, $h, sub { $chld->draw }
225 );
226 $self->{texture}->upload;
227}
228
229sub size_request {
230 my ($self) = @_;
231 my $chld = $self->get
232 or return (0, 0);
233 $chld->size_request
234}
235
236sub _draw {
237 my ($self) = @_;
238
239 my ($w, $h) = $self->size_request;#TODO# use width/height of texture
240 345
241 my $tex = $self->{texture} 346 my $tex = $self->{texture}
242 or return; 347 or return;
243 348
244 glEnable GL_BLEND; 349 glEnable GL_BLEND;
245 glEnable GL_TEXTURE_2D; 350 glEnable GL_TEXTURE_2D;
246 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 351 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
247 glBindTexture GL_TEXTURE_2D, $tex->{name};
248 352
249 glBegin GL_QUADS; 353 $tex->draw_quad (0, 0, $w, $h);
250 glTexCoord 0, 0; glVertex 0, 0;
251 glTexCoord 0, 1; glVertex 0, $h;
252 glTexCoord 1, 1; glVertex $w, $h;
253 glTexCoord 1, 0; glVertex $w, 0;
254 glEnd;
255 354
256 glDisable GL_BLEND; 355 glDisable GL_BLEND;
257 glDisable GL_TEXTURE_2D; 356 glDisable GL_TEXTURE_2D;
258} 357}
259 358
359#############################################################################
360
260package Crossfire::Client::Widget::Frame; 361package CFClient::Widget::Frame;
261 362
262our @ISA = Crossfire::Client::Widget::Bin::; 363our @ISA = CFClient::Widget::Bin::;
263 364
264use SDL::OpenGL; 365use SDL::OpenGL;
265 366
266sub size_request { 367sub size_request {
267 my ($self) = @_; 368 my ($self) = @_;
268 my $chld = $self->get 369 my $chld = $self->child
269 or return (0, 0); 370 or return (0, 0);
270 371
271 $chld->move (2, 2); 372 $chld->move (2, 2);
272 373
273 map { $_ + 4 } $chld->size_request; 374 map { $_ + 4 } $chld->size_request;
274} 375}
275 376
377sub size_allocate {
378 my ($self, $w, $h) = @_;
379
380 $self->{w} = $w;
381 $self->{h} = $h;
382
383 $self->child->size_allocate ($w - 4, $h - 4);
384 $self->child->move (2, 2);
385}
386
276sub _draw { 387sub _draw {
277 my ($self) = @_; 388 my ($self) = @_;
278 389
279 my $chld = $self->get; 390 my $chld = $self->child;
280 391
281 my ($w, $h) = $chld->size_request; 392 my ($w, $h) = $chld->size_request;
282 393
283 glBegin GL_QUADS; 394 glBegin GL_QUADS;
284 glColor 0, 0, 0; 395 glColor 0, 0, 0;
285 glTexCoord 0, 0; glVertex 0 , 0; 396 glVertex 0 , 0;
286 glTexCoord 0, 1; glVertex 0 , $h + 4; 397 glVertex 0 , $h + 4;
287 glTexCoord 1, 1; glVertex $w + 4 , $h + 4; 398 glVertex $w + 4 , $h + 4;
288 glTexCoord 1, 0; glVertex $w + 4 , 0; 399 glVertex $w + 4 , 0;
289 glEnd; 400 glEnd;
290 401
291 $chld->draw; 402 $chld->draw;
292} 403}
293 404
405#############################################################################
406
294package Crossfire::Client::Widget::FancyFrame; 407package CFClient::Widget::FancyFrame;
295 408
296our @ISA = Crossfire::Client::Widget::Frame::; 409our @ISA = CFClient::Widget::Bin::;
297 410
298use SDL::OpenGL; 411use SDL::OpenGL;
299 412
413my @tex =
414 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
415 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
416
417sub size_request {
418 my ($self) = @_;
419
420 my ($w, $h) = $self->SUPER::size_request;
421
422 $h += $tex[1]->{height};
423 $h += $tex[4]->{height};
424 $w += $tex[2]->{width};
425 $w += $tex[3]->{width};
426
427 ($w, $h)
428}
429
430sub size_allocate {
431 my ($self, $w, $h) = @_;
432
433 $self->SUPER::size_allocate ($w, $h);
434
435 $h -= $tex[1]->{height};
436 $h -= $tex[4]->{height};
437 $w -= $tex[2]->{width};
438 $w -= $tex[3]->{width};
439
440 $h = $h < 0 ? 0 : $h;
441 $w = $w < 0 ? 0 : $w;
442
443 $self->child->size_allocate ($w, $h);
444 $self->child->move ($tex[3]->{width}, $tex[1]->{height});
445}
446
447sub _draw {
448 my ($self) = @_;
449
450 my ($w, $h) = ($self->{w}, $self->{h});
451 my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
452
453 glEnable GL_BLEND;
454 glEnable GL_TEXTURE_2D;
455 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
456 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
457
458 my $top = $tex[1];
459 $top->draw_quad (0, 0, $w, $top->{height});
460
461 my $left = $tex[3];
462 $left->draw_quad (0, $top->{height}, $left->{width}, $ch);
463
464 my $right = $tex[2];
465 $right->draw_quad ($w - $right->{width}, $top->{height}, $right->{width}, $ch);
466
467 my $bottom = $tex[4];
468 $bottom->draw_quad (0, $h - $bottom->{height}, $w, $bottom->{height});
469
470 my $bg = $tex[0];
471 glBindTexture GL_TEXTURE_2D, $bg->{name};
472 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
473 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT;
474 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT;
475
476 my $rep_x = $cw / $bg->{width};
477 my $rep_y = $ch / $bg->{height};
478
479 $bg->draw_quad ($left->{width}, $top->{height}, $cw, $ch);
480
481 glDisable GL_BLEND;
482 glDisable GL_TEXTURE_2D;
483
484 $self->child->draw;
485
486}
487
488#############################################################################
489
490package CFClient::Widget::Table;
491
492our @ISA = CFClient::Widget::Bin::;
493
494use SDL::OpenGL;
495
496sub add {
497 my ($self, $x, $y, $chld) = @_;
498 my $old_chld = $self->{children}[$y][$x];
499
500 $self->{children}[$y][$x] = $chld;
501 $chld->set_parent ($self);
502 $self->update;
503}
504
505sub max_row_height {
506 my ($self, $row) = @_;
507
508 my $hs = 0;
509 for (my $xi = 0; $xi <= $#{$self->{children}->[$row] || []}; $xi++) {
510 my $c = $self->{children}->[$row]->[$xi];
511 if ($c) {
512 my ($w, $h) = $c->size_request;
513 if ($hs < $h) { $hs = $h }
514 }
515 }
516 return $hs;
517}
518
519sub max_col_width {
520 my ($self, $col) = @_;
521
522 my $ws = 0;
523 for (my $yi = 0; $yi <= $#{$self->{children} || []}; $yi++) {
524 my $c = ($self->{children}->[$yi] || [])->[$col];
525 if ($c) {
526 my ($w, $h) = $c->size_request;
527 if ($ws < $w) { $ws = $w }
528 }
529 }
530 return $ws;
531}
532
533sub size_request {
534 my ($self) = @_;
535
536 my ($hs, $ws) = (0, 0);
537
538 for (my $yi = 0; $yi <= $#{$self->{children}}; $yi++) {
539 $hs += $self->max_row_height ($yi);
540 }
541
542 for (my $yi = 0; $yi <= $#{$self->{children}}; $yi++) {
543 my $wm = 0;
544 for (my $xi = 0; $xi <= $#{$self->{children}->[$yi]}; $xi++) {
545 $wm += $self->max_col_width ($xi)
546 }
547 if ($ws < $wm) { $ws = $wm }
548 }
549
550 return ($ws, $hs);
551}
552
553sub _draw {
554 my ($self) = @_;
555
556 my $y = 0;
557 for (my $yi = 0; $yi <= $#{$self->{children}}; $yi++) {
558 my $x = 0;
559
560 for (my $xi = 0; $xi <= $#{$self->{children}->[$yi]}; $xi++) {
561
562 my $c = $self->{children}->[$yi]->[$xi];
563 if ($c) {
564 $c->move ($x, $y, 0); #TODO: Move to size_request
565 $c->draw if $c;
566 }
567
568 $x += $self->max_col_width ($xi);
569 }
570
571 $y += $self->max_row_height ($yi);
572 }
573}
574
575#############################################################################
576
577package CFClient::Widget::VBox;
578
579our @ISA = CFClient::Widget::Container::;
580
581use SDL::OpenGL;
582
583sub size_request {
584 my ($self) = @_;
585
586 my @alloc = map [$_->size_request], @{$self->{children}};
587
588 (
589 (List::Util::max map $_->[0], @alloc),
590 (List::Util::sum map $_->[1], @alloc),
591 )
592}
593
594sub size_allocate {
595 my ($self, $w, $h) = @_;
596
597 $self->w ($w);
598 $self->h ($h);
599
600 my $exp;
601 my @oth;
602 # find expand widget
603 for (@{$self->{children}}) {
604 if ($_->{expand}) {
605 $exp = $_;
606 last;
607 }
608 push @oth, $_;
609 }
610
611 my ($ow, $oh);
612
613 # get sizes of other widgets
614 for (@oth) {
615 my ($w, $h) = $_->size_request;
616 $oh += $h;
617 if ($ow < $w) { $ow = $w }
618 }
619
620 my $y = 0;
621 for (@{$self->{children}}) {
622 $_->move (0, $y);
623
624 if ($_ == $exp) {
625 $_->size_allocate ($w, $h - $oh);
626 $y += $h - $oh;
627 } else {
628 my ($cw, $h) = $_->size_request;
629 $_->size_allocate ($w, $h);
630 $y += $h;
631 }
632 }
633}
634
635#############################################################################
636
637package CFClient::Widget::Label;
638
639our @ISA = CFClient::Widget::;
640
641use SDL::OpenGL;
642
300sub new { 643sub new {
301 my ($self, $theme) = @_; 644 my ($class, %arg) = @_;
645
646 # TODO: color, and make height, xyz etc. optional
302 $self = $self->SUPER::new; 647 my $self = $class->SUPER::new (
303 648 color => [1, 1, 1],
304 $self->{txts} = [ 649 height => $::FONTSIZE,
305 map { new_from_file Crossfire::Client::Texture Crossfire::Client::find_rcfile $_ } 650 text => "",
306 qw/d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png/ 651 layout => new CFClient::Layout,
652 %arg
307 ]; 653 );
654
655 $self->set_text ($self->{text});
656
308 $self 657 $self
658}
309 659
660sub set_text {
661 my ($self, $text) = @_;
662
663 $self->{text} = $text;
664 $self->{layout}->set_markup ($text);
665
666 delete $self->{texture};
667}
668
669sub get_text {
670 my ($self, $text) = @_;
671
672 $self->{text}
310} 673}
311 674
312sub size_request { 675sub size_request {
313 my ($self) = @_; 676 my ($self) = @_;
314 my ($w, $h) = $self->get->size_request;
315 677
316 $h += $self->{txts}->[1]->{height}; 678 $self->{layout}->set_width;
317 $h += $self->{txts}->[4]->{height}; 679 $self->{layout}->set_height ($self->{height});
318 $w += $self->{txts}->[2]->{width}; 680 $self->{layout}->size
319 $w += $self->{txts}->[3]->{width}; 681# if ($self->{texture}{width} > 1 && $self->{texture}{height} > 1) { #TODO: hack
320 682# (
321 $self->get->move ($self->{txts}->[3]->{width}, $self->{txts}->[1]->{height}); 683# $self->{texture}{width},
322 684# $self->{texture}{height},
685# )
686# } else {
687# my ($w, $h, $data) = CFClient::font_render "Yy", $self->{height};
688#
323 ($w, $h) 689# ($w, $h)
690# }
691}
692
693sub size_allocate {
694 my ($self, $w, $h) = @_;
695
696 $self->SUPER::size_allocate ($w, $h);
697 delete $self->{texture};
324} 698}
325 699
326sub _draw { 700sub _draw {
327 my ($self) = @_; 701 my ($self) = @_;
328 702
329 my ($w, $h) = $self->size_request; 703 my $tex = $self->{texture} ||= do {
330 my ($cw, $ch) = $self->get->size_request; 704 $self->{layout}->set_width ($self->{w});
705 new_from_layout CFClient::Texture $self->{layout};
706 };
331 707
332 glEnable GL_BLEND; 708 glEnable GL_BLEND;
333 glEnable GL_TEXTURE_2D; 709 glEnable GL_TEXTURE_2D;
334 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 710 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
335 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 711 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
336 712
713 glColor @{$self->{color}};
337 714
338 my $top = $self->{txts}->[1]; 715 $tex->draw_quad (0, 0);
339 glBindTexture GL_TEXTURE_2D, $top->{name};
340
341 glColor 1, 1, 1, 0.8;
342
343 glBegin GL_QUADS;
344 glTexCoord 0, 0; glVertex 0 , 0;
345 glTexCoord 0, 1; glVertex 0 , $top->{height};
346 glTexCoord 1, 1; glVertex $w , $top->{height};
347 glTexCoord 1, 0; glVertex $w , 0;
348 glEnd;
349
350 my $left = $self->{txts}->[3];
351 glBindTexture GL_TEXTURE_2D, $left->{name};
352
353 glColor 1, 1, 1, 0.8;
354
355 glBegin GL_QUADS;
356 glTexCoord 0, 0; glVertex 0 , $top->{height};
357 glTexCoord 0, 1; glVertex 0 , $top->{height} + $ch;
358 glTexCoord 1, 1; glVertex $left->{width}, $top->{height} + $ch;
359 glTexCoord 1, 0; glVertex $left->{width}, $top->{height};
360 glEnd;
361
362 my $right = $self->{txts}->[2];
363 glBindTexture GL_TEXTURE_2D, $right->{name};
364
365 glColor 1, 1, 1, 0.8;
366
367 glBegin GL_QUADS;
368 glTexCoord 0, 0; glVertex $w - $right->{width}, $top->{height};
369 glTexCoord 0, 1; glVertex $w - $right->{width}, $top->{height} + $ch;
370 glTexCoord 1, 1; glVertex $w , $top->{height} + $ch;
371 glTexCoord 1, 0; glVertex $w , $top->{height};
372 glEnd;
373
374 my $bottom = $self->{txts}->[4];
375 glBindTexture GL_TEXTURE_2D, $bottom->{name};
376
377 glColor 1, 1, 1, 0.8;
378
379 glBegin GL_QUADS;
380 glTexCoord 0, 0; glVertex 0 , $h - $bottom->{height};
381 glTexCoord 0, 1; glVertex 0 , $h;
382 glTexCoord 1, 1; glVertex $w , $h;
383 glTexCoord 1, 0; glVertex $w , $h - $bottom->{height};
384 glEnd;
385
386 my $bg = $self->{txts}->[0];
387 glBindTexture GL_TEXTURE_2D, $bg->{name};
388 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT;
389 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT;
390
391 glColor 1, 1, 1, 0.8;
392
393 my $rep_x = $cw / $bg->{width};
394 my $rep_y = $ch / $bg->{height};
395
396 glBegin GL_QUADS;
397 glTexCoord 0, 0; glVertex $left->{width}, $top->{height};
398 glTexCoord 0, $rep_y; glVertex $left->{width}, $top->{height} + $ch;
399 glTexCoord $rep_x, $rep_y; glVertex $left->{width} + $cw , $top->{height} + $ch;
400 glTexCoord $rep_x, 0; glVertex $left->{width} + $cw , $top->{height};
401 glEnd;
402
403 $self->get->draw;
404 716
405 glDisable GL_BLEND; 717 glDisable GL_BLEND;
406 glDisable GL_TEXTURE_2D; 718 glDisable GL_TEXTURE_2D;
407} 719}
408 720
409package Crossfire::Client::Widget::Table; 721#############################################################################
410 722
411our @ISA = Crossfire::Client::Widget::Bin::;
412
413use SDL::OpenGL;
414
415sub add {
416 my ($self, $x, $y, $chld) = @_;
417 my $old_chld = $self->{childs}[$y][$x];
418
419 $self->{childs}[$y][$x] = $chld;
420 $chld->set_parent ($self);
421 $self->update;
422}
423
424sub max_row_height {
425 my ($self, $row) = @_;
426
427 my $hs = 0;
428 for (my $xi = 0; $xi <= $#{$self->{childs}->[$row] || []}; $xi++) {
429 my $c = $self->{childs}->[$row]->[$xi];
430 if ($c) {
431 my ($w, $h) = $c->size_request;
432 if ($hs < $h) { $hs = $h }
433 }
434 }
435 return $hs;
436}
437
438sub max_col_width {
439 my ($self, $col) = @_;
440
441 my $ws = 0;
442 for (my $yi = 0; $yi <= $#{$self->{childs} || []}; $yi++) {
443 my $c = ($self->{childs}->[$yi] || [])->[$col];
444 if ($c) {
445 my ($w, $h) = $c->size_request;
446 if ($ws < $w) { $ws = $w }
447 }
448 }
449 return $ws;
450}
451
452sub size_request {
453 my ($self) = @_;
454
455 my ($hs, $ws) = (0, 0);
456
457 for (my $yi = 0; $yi <= $#{$self->{childs}}; $yi++) {
458 $hs += $self->max_row_height ($yi);
459 }
460
461 for (my $yi = 0; $yi <= $#{$self->{childs}}; $yi++) {
462 my $wm = 0;
463 for (my $xi = 0; $xi <= $#{$self->{childs}->[$yi]}; $xi++) {
464 $wm += $self->max_col_width ($xi)
465 }
466 if ($ws < $wm) { $ws = $wm }
467 }
468
469 return ($ws, $hs);
470}
471
472sub _draw {
473 my ($self) = @_;
474
475 my $y = 0;
476 for (my $yi = 0; $yi <= $#{$self->{childs}}; $yi++) {
477 my $x = 0;
478
479 for (my $xi = 0; $xi <= $#{$self->{childs}->[$yi]}; $xi++) {
480
481 my $c = $self->{childs}->[$yi]->[$xi];
482 if ($c) {
483 $c->move ($x, $y, 0); #TODO: Move to size_request
484 $c->draw if $c;
485 }
486
487 $x += $self->max_col_width ($xi);
488 }
489
490 $y += $self->max_row_height ($yi);
491 }
492}
493
494package Crossfire::Client::Widget::VBox;
495
496our @ISA = Crossfire::Client::Widget::Bin::;
497
498use SDL::OpenGL;
499
500sub add {
501 my ($self, $chld) = @_;
502 push @{$self->{childs}}, $chld;
503 $chld->set_parent ($self);
504 $self->update;
505}
506
507sub size_request {
508 my ($self) = @_;
509
510 my ($hs, $ws) = (0, 0);
511 for (@{$self->{childs} || []}) {
512 my ($w, $h) = $_->size_request;
513 $hs += $h;
514 if ($ws < $w) { $ws = $w }
515 }
516
517 return ($ws, $hs);
518}
519
520sub _draw {
521 my ($self) = @_;
522
523 my ($x, $y);
524 for (@{$self->{childs} || []}) {
525 $_->move (0, $y, 0); #TODO: move to size_request
526 $_->draw;
527 my ($w, $h) = $_->size_request;
528 $y += $h;
529 }
530}
531
532package Crossfire::Client::Widget::Label;
533
534our @ISA = Crossfire::Client::Widget::;
535
536use SDL::OpenGL;
537
538sub new {
539 my ($class, $x, $y, $z, $height, $text) = @_;
540
541 # TODO: color, and make height, xyz etc. optional
542 my $self = $class->SUPER::new (x => $x, y => $y, z => $z, height => $height);
543
544 $self->set_text ($text);
545
546 $self
547}
548
549sub set_text {
550 my ($self, $text) = @_;
551
552 $self->{text} = $text;
553 $self->{texture} = new_from_text Crossfire::Client::Texture $text, $self->{height};
554
555 $self->update;
556}
557
558sub get_text {
559 my ($self, $text) = @_;
560
561 $self->{text}
562}
563
564sub size_request {
565 my ($self) = @_;
566
567 (
568 $self->{texture}{width},
569 $self->{texture}{height},
570 )
571}
572
573sub _draw {
574 my ($self) = @_;
575
576 my $tex = $self->{texture};
577
578 glEnable GL_BLEND;
579 glEnable GL_TEXTURE_2D;
580 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
581 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
582 glBindTexture GL_TEXTURE_2D, $tex->{name};
583
584 glColor 1, 1, 1, 0.6; # TODO color
585
586 glBegin GL_QUADS;
587 glTexCoord 0, 0; glVertex 0 , 0;
588 glTexCoord 0, 1; glVertex 0 , $tex->{height};
589 glTexCoord 1, 1; glVertex $tex->{width}, $tex->{height};
590 glTexCoord 1, 0; glVertex $tex->{width}, 0;
591 glEnd;
592
593 glDisable GL_BLEND;
594 glDisable GL_TEXTURE_2D;
595}
596
597package Crossfire::Client::Widget::TextEntry; 723package CFClient::Widget::Entry;
598 724
599our @ISA = Crossfire::Client::Widget::Label::; 725our @ISA = CFClient::Widget::Label::;
600 726
601use SDL; 727use SDL;
602use SDL::OpenGL; 728use SDL::OpenGL;
603 729
604sub key_down { 730sub key_down {
605 my ($self, $ev) = @_; 731 my ($self, $ev) = @_;
606 732
607 my $mod = $ev->key_mod; 733 my $mod = $ev->key_mod;
608 my $sym = $ev->key_sym; 734 my $sym = $ev->key_sym;
609 735
610 $ev->set_unicode (1);
611 my $uni = $ev->key_unicode; 736 my $uni = $ev->key_unicode;
612 737
613 my $text = $self->get_text; 738 my $text = $self->get_text;
614 739
615 if ($sym == SDLK_BACKSPACE) { 740 if ($sym == SDLK_BACKSPACE) {
616 substr $text, -1, 1, ''; 741 substr $text, -1, 1, '';
617
618 } elsif ($uni) { 742 } elsif ($uni) {
619 $text .= chr $uni; 743 $text .= chr $uni;
620 } 744 }
745
621 $self->set_text ($text); 746 $self->set_text ($text);
622} 747}
623 748
749sub button_down {
750 my ($self, $ev) = @_;
624 751
625# XXX: TextView isn't neccessary with pango multiline text rendering 752 $self->focus_in;
626package Crossfire::Client::Widget::TextView; 753}
627 754
628use strict; 755sub mouse_motion {
629
630our @ISA = qw/Crossfire::Client::Widget/;
631
632use SDL::OpenGL;
633use SDL::OpenGL::Constants;
634
635sub new {
636 my ($class, $text, $h) = @_; 756 my ($self, $ev, $x, $y) = @_;
637 my $self = $class->SUPER::new (); 757 printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
638
639 $self->{txt_height} = $h;
640 @{$self->{lines}} = split /\r?\n/, $text;
641
642 for (split /\r?\n/, $text) {
643 $self->add_line ($_);
644 }
645 $self
646} 758}
647 759
648#sub render_lines { 760sub _draw {
649# my ($self) = @_; 761 my ($self) = @_;
650# 762
651# $self->{txt_lines} = []; 763 if ($FOCUS == $self) {
652# 764 glColor 1, 1, 1;
653# for (@{$self->{lines}}) { 765 } else {
654# push @{$self->{txt_lines}}, 766 glColor 0.7, 0.7, 0.7;
655# new_from_ttf Crossfire::Client::Texture $self->{ttf}, $_;
656# } 767 }
657#}
658
659sub add_line {
660 my ($self, $line) = @_;
661 push @{$self->{lines}}, $line;
662
663 push @{$self->{txt_lines}},
664 new_from_text Crossfire::Client::Texture $line, $self->{txt_height};
665}
666
667sub size_request {
668 my ($self) = @_;
669
670 my $w = 0;
671 my $h = 0;
672
673 for (@{$self->{txt_lines}}) {
674 if ($w < $_->{width}) { $w = $_->{width} }
675 $h += $_->{height};
676 }
677
678 return ($w, $h);
679}
680
681sub draw_line {
682 my ($self, $tex, $y) = @_;
683
684 glBindTexture GL_TEXTURE_2D, $tex->{name};
685
686 glColor 1, 0, 1;
687 768
688 glBegin GL_QUADS; 769 glBegin GL_QUADS;
689 glTexCoord 0, 0; glVertex 0 , $y; 770 glVertex 0 , 0;
690 glTexCoord 0, 1; glVertex 0 , $y + $tex->{height}; 771 glVertex 0 , $self->{h} - 1;
691 glTexCoord 1, 1; glVertex $tex->{width}, $y + $tex->{height}; 772 glVertex $self->{w} - 1, $self->{h} - 1;
692 glTexCoord 1, 0; glVertex $tex->{width}, $y; 773 glVertex $self->{w} - 1, 0;
693 glEnd; 774 glEnd;
694}
695 775
696sub _draw { 776 $self->SUPER::_draw;
697 my ($self) = @_;
698
699 glEnable GL_BLEND;
700 glEnable GL_TEXTURE_2D;
701 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;#DECAL;
702
703 my $l = 0;
704 for (@{$self->{txt_lines}}) {
705 $self->draw_line ($_, $l);
706 $l += $_->{height};
707 }
708
709 glDisable GL_BLEND;
710 glDisable GL_TEXTURE_2D;
711} 777}
712 778
779#############################################################################
780
713package Crossfire::Client::Widget::MapWidget; 781package CFClient::Widget::MapWidget;
714 782
715use strict; 783use strict;
716 784
717use List::Util qw(min max); 785use List::Util qw(min max);
718 786
719use SDL; 787use SDL;
720use SDL::OpenGL; 788use SDL::OpenGL;
721use SDL::OpenGL::Constants; 789use SDL::OpenGL::Constants;
722 790
723our @ISA = Crossfire::Client::Widget::; 791our @ISA = CFClient::Widget::;
792
793sub new {
794 my $class = shift;
795
796 $class->SUPER::new (
797 z => -1,
798 list => (glGenLists 1),
799 @_
800 )
801}
724 802
725sub key_down { 803sub key_down {
726 print "MAPKEYDOWN\n"; 804 print "MAPKEYDOWN\n";
727} 805}
728 806
729sub key_up { 807sub key_up {
730} 808}
731 809
810sub size_request {
811 (
812 1 + int $::WIDTH / 32,
813 1 + int $::HEIGHT / 32,
814 )
815}
816
817sub update {
818 my ($self) = @_;
819
820 $self->{need_update} = 1;
821}
822
732sub _draw { 823sub _draw {
733 my ($self) = @_; 824 my ($self) = @_;
734 825
826 if (delete $self->{need_update}) {
827 glNewList $self->{list}, GL_COMPILE;
828
735 my $mx = $::CONN->{mapx}; 829 my $mx = $::CONN->{mapx};
736 my $my = $::CONN->{mapy}; 830 my $my = $::CONN->{mapy};
737 831
738 my $map = $::CONN->{map}; 832 my $map = $::CONN->{map};
739 833
740 my ($xofs, $yofs); 834 my ($xofs, $yofs);
741 835
742 my $sw = 1 + int $::WIDTH / 32; 836 my $sw = 1 + int $::WIDTH / 32;
743 my $sh = 1 + int $::HEIGHT / 32; 837 my $sh = 1 + int $::HEIGHT / 32;
744 838
745 if ($::CONN->{mapw} > $sw) { 839 if ($::CONN->{mapw} > $sw) {
746 $xofs = $mx + ($::CONN->{mapw} - $sw) * 0.5; 840 $xofs = $mx + ($::CONN->{mapw} - $sw) * 0.5;
747 } else { 841 } else {
748 $xofs = $self->{xofs} = min $mx, max $mx + $::CONN->{mapw} - $sw + 1, $self->{xofs}; 842 $xofs = $self->{xofs} = min $mx, max $mx + $::CONN->{mapw} - $sw + 1, $self->{xofs};
749 } 843 }
750 844
751 if ($::CONN->{maph} > $sh) { 845 if ($::CONN->{maph} > $sh) {
752 $yofs = $my + ($::CONN->{maph} - $sh) * 0.5; 846 $yofs = $my + ($::CONN->{maph} - $sh) * 0.5;
753 } else { 847 } else {
754 $yofs = $self->{yofs} = min $my, max $my + $::CONN->{maph} - $sh + 1, $self->{yofs}; 848 $yofs = $self->{yofs} = min $my, max $my + $::CONN->{maph} - $sh + 1, $self->{yofs};
755 } 849 }
756 850
757 glEnable GL_TEXTURE_2D; 851 glEnable GL_TEXTURE_2D;
758 glEnable GL_BLEND; 852 glEnable GL_BLEND;
759 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 853 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
760 854
761 my $sw4 = ($sw + 3) & ~3; 855 my $sw4 = ($sw + 3) & ~3;
762 my $lighting = "\x00" x ($sw4 * $sh); 856 my $darkness = "\x00" x ($sw4 * $sh);
763 857
764 for my $x (0 .. $sw - 1) { 858 for my $x (0 .. $sw - 1) {
859 my $row = $map->[$x + $xofs];
765 for my $y (0 .. $sh - 1) { 860 for my $y (0 .. $sh - 1) {
766 861
767 my $cell = $map->[$x + $xofs][$y + $yofs] 862 my $cell = $row->[$y + $yofs]
768 or next; 863 or next;
769 864
770 my $darkness = $cell->[0] * (1 / 255); 865 my $dark = $cell->[0];
771 if ($darkness < 0) { 866 if ($dark < 0) {
772 $darkness = 0.15; 867 substr $darkness, $y * $sw4 + $x, 1, chr 224;
868 } else {
869 substr $darkness, $y * $sw4 + $x, 1, chr 255 - $dark;
773 } 870 }
774 substr $lighting, $y * $sw4 + $x, 1, chr 255 - $darkness * 255;
775 871
776 for my $num (grep $_, @$cell[1,2,3]) { 872 for my $num (grep $_, @$cell[1,2,3]) {
777 my $tex = $::CONN->{face}[$num]{texture} || next; 873 my $tex = $::CONN->{face}[$num]{texture} || next;
778 874
779 glBindTexture GL_TEXTURE_2D, $tex->{name};
780
781 my $w = $tex->{width}; 875 my $w = $tex->{width};
782 my $h = $tex->{height}; 876 my $h = $tex->{height};
783 877
784 my $px = ($x + 1) * 32 - $w; 878 $tex->draw_quad (($x + 1) * 32 - $w, ($y + 1) * 32 - $h, $w, $h);
785 my $py = ($y + 1) * 32 - $h;
786
787 glBegin GL_QUADS;
788 glTexCoord 0, 0; glVertex $px , $py;
789 glTexCoord 0, 1; glVertex $px , $py + $h;
790 glTexCoord 1, 1; glVertex $px + $w, $py + $h;
791 glTexCoord 1, 0; glVertex $px + $w, $py;
792 glEnd; 879 }
793 } 880 }
794 } 881 }
795 }
796 882
797# if (1) { # higher quality darkness 883# if (1) { # higher quality darkness
798# $lighting =~ s/(.)/$1$1$1/gs; 884# $lighting =~ s/(.)/$1$1$1/gs;
799# my $pb = new_from_data Gtk2::Gdk::Pixbuf $lighting, "rgb", 0, 8, $sw4, $sh, $sw4 * 3; 885# my $pb = new_from_data Gtk2::Gdk::Pixbuf $lighting, "rgb", 0, 8, $sw4, $sh, $sw4 * 3;
800# 886#
802# 888#
803# $lighting = $pb->get_pixels; 889# $lighting = $pb->get_pixels;
804# $lighting =~ s/(.)../$1/gs; 890# $lighting =~ s/(.)../$1/gs;
805# } 891# }
806 892
807 $lighting = new Crossfire::Client::Texture
808 width => $sw4,
809 height => $sh,
810 data => $lighting,
811 internalformat => GL_ALPHA4,
812 format => GL_ALPHA;
813
814 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 893 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
815 glColor 0, 0, 0, 0.75;
816 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 894 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
817 glBindTexture GL_TEXTURE_2D, $lighting->{name};
818 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR;
819 glBegin GL_QUADS;
820 glTexCoord 0, 0; glVertex 0 , 0;
821 glTexCoord 0, 1; glVertex 0 , $sh * 32;
822 glTexCoord 1, 1; glVertex $sw4 * 32, $sh * 32;
823 glTexCoord 1, 0; glVertex $sw4 * 32, 0;
824 glEnd;
825 895
896 $darkness = new CFClient::Texture
897 width => $sw4,
898 height => $sh,
899 data => $darkness,
900 internalformat => GL_ALPHA,
901 format => GL_ALPHA;
902
903 glColor 0.45, 0.45, 0.45, 1;
904 $darkness->draw_quad (0, 0, $sw4 * 32, $sh * 32);
905
826 glDisable GL_TEXTURE_2D; 906 glDisable GL_TEXTURE_2D;
827 glDisable GL_BLEND; 907 glDisable GL_BLEND;
908
909 glEndList;
910 }
911
912 glCallList $self->{list};
828} 913}
829 914
830my %DIR = ( 915my %DIR = (
831 SDLK_KP8, [1, "north"], 916 SDLK_KP8, [1, "north"],
832 SDLK_KP9, [2, "northeast"], 917 SDLK_KP9, [2, "northeast"],
876 if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) { 961 if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) {
877 $::CONN->send ("command run_stop"); 962 $::CONN->send ("command run_stop");
878 } 963 }
879} 964}
880 965
966#############################################################################
967
881package Crossfire::Client::Widget::Animator; 968package CFClient::Widget::Animator;
882 969
883use SDL::OpenGL; 970use SDL::OpenGL;
884 971
885our @ISA = Crossfire::Client::Widget::Bin::; 972our @ISA = CFClient::Widget::Bin::;
886 973
887sub moveto { 974sub moveto {
888 my ($self, $x, $y) = @_; 975 my ($self, $x, $y) = @_;
889 976
890 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 977 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
891 $self->{speed} = 0.01; 978 $self->{speed} = 0.001;
892 $self->{time} = 1; 979 $self->{time} = 1;
893 980
894 ::animation_start $self; 981 ::animation_start $self;
895} 982}
896 983
911 998
912sub _draw { 999sub _draw {
913 my ($self) = @_; 1000 my ($self) = @_;
914 1001
915 glPushMatrix; 1002 glPushMatrix;
916 glRotate $self->{time} * 10000, 0, 1, 0; 1003 glRotate $self->{time} * 1000, 0, 1, 0;
917 $self->{child}->draw; 1004 $self->{children}[0]->draw;
918 glPopMatrix; 1005 glPopMatrix;
919} 1006}
920 1007
9211; 1008#############################################################################
922 1009
1010package CFClient::Widget::Toplevel;
1011
1012our @ISA = CFClient::Widget::Container::;
1013
1014sub size_request {
1015 ($::WIDTH, $::HEIGHT)
1016}
1017
1018sub size_allocate {
1019 my ($self, $w, $h) = @_;
1020
1021 $self->SUPER::size_allocate ($w, $h);
1022
1023 $_->size_allocate ($_->size_request)
1024 for @{$self->{children}};
1025}
1026
1027sub translate {
1028 my ($self, $x, $y) = @_;
1029
1030 ($x, $y)
1031}
1032
1033sub update {
1034 my ($self) = @_;
1035
1036 $self->size_allocate ($self->size_request);
1037 ::refresh ();
1038}
1039
1040sub add {
1041 my ($self, $widget) = @_;
1042
1043 $self->SUPER::add ($widget);
1044
1045 $widget->size_allocate ($widget->size_request);
1046}
1047
1048sub draw {
1049 my ($self) = @_;
1050
1051 $self->_draw;
1052}
1053
1054#############################################################################
1055
1056package CFClient::Widget;
1057
1058$TOPLEVEL = new CFClient::Widget::Toplevel;
1059
10601
1061

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines