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.34 by elmex, Sun Apr 9 02:44:51 2006 UTC vs.
Revision 1.39 by root, Sun Apr 9 21:39:08 2006 UTC

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

Diff Legend

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