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.16 by root, Fri Apr 7 23:16:29 2006 UTC vs.
Revision 1.43 by root, Sun Apr 9 22:12:11 2006 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines