~ubuntu-branches/ubuntu/karmic/recordmydesktop/karmic

Committer: Bazaar Package Importer
Author(s): Alan Pope
Date: 2009-04-21 10:57:22 UTC
mfrom: (1.1.5 upstream)
Revision ID: james.westby@ubuntu.com-20090421105722-w6l4gz958gva15wn

Tags: 0.3.8.1-0ubuntu1

* New upstream release (LP: #364674)
* debian/control: Fixed libjack0.100.0-dev dependancy
* debian/control: Fixed project home page

files added:
src/rmd.c

src/rmd_cache.h

src/rmd_cache_audio.c

src/rmd_cache_audio.h

src/rmd_cache_frame.c

src/rmd_cache_frame.h

src/rmd_capture_sound.c

src/rmd_capture_sound.h

src/rmd_encode_cache.c

src/rmd_encode_cache.h

src/rmd_encode_image_buffer.c

src/rmd_encode_image_buffer.h

src/rmd_encode_sound_buffer.c

src/rmd_encode_sound_buffer.h

src/rmd_error.h

src/rmd_flush_to_ogg.c

src/rmd_flush_to_ogg.h

src/rmd_frame.h

src/rmd_get_frame.c

src/rmd_get_frame.h

src/rmd_getzpixmap.c

src/rmd_getzpixmap.h

src/rmd_init_encoder.c

src/rmd_init_encoder.h

src/rmd_initialize_data.c

src/rmd_initialize_data.h

src/rmd_jack.h

src/rmd_load_cache.c

src/rmd_load_cache.h

src/rmd_macro.h

src/rmd_make_dummy_pointer.c

src/rmd_make_dummy_pointer.h

src/rmd_math.c

src/rmd_math.h

src/rmd_opendev.c

src/rmd_opendev.h

src/rmd_parseargs.c

src/rmd_parseargs.h

src/rmd_poll_events.c

src/rmd_poll_events.h

src/rmd_queryextensions.c

src/rmd_queryextensions.h

src/rmd_rectinsert.c

src/rmd_rectinsert.h

src/rmd_register_callbacks.c

src/rmd_register_callbacks.h

src/rmd_rescue.h

src/rmd_setbrwindow.c

src/rmd_setbrwindow.h

src/rmd_shortcuts.c

src/rmd_shortcuts.h

src/rmd_specsfile.c

src/rmd_specsfile.h

src/rmd_threads.c

src/rmd_threads.h

src/rmd_timer.h

src/rmd_types.h

src/rmd_update_image.c

src/rmd_update_image.h

src/rmd_wm_check.c

src/rmd_wm_check.h

src/rmd_wm_is_compositing.c

src/rmd_wm_is_compositing.h

src/rmd_yuv_utils.c

src/rmd_yuv_utils.h

src/skeleton.h

src/test-rectinsert-data.c

src/test-rectinsert-data.h

src/test-rectinsert-types.h

src/test-rectinsert.c

files removed:
include

include/Makefile.am

include/Makefile.in

include/recordmydesktop.h

include/rmdfunc.h

include/rmdmacro.h

include/rmdtypes.h

include/skeleton.h

mkinstalldirs

src/bgr_to_yuv.c

src/cache_audio.c

src/cache_frame.c

src/capture_sound.c

src/cleanup.c

src/encode_cache.c

src/encode_image_buffer.c

src/encode_sound_buffer.c

src/flush_to_ogg.c

src/get_frame.c

src/getzpixmap.c

src/init_encoder.c

src/initialize_data.c

src/load_cache.c

src/make_dummy_pointer.c

src/opendev.c

src/parseargs.c

src/poll_events.c

src/queryextensions.c

src/recordmydesktop.c

src/rectinsert.c

src/register_callbacks.c

src/rmdthreads.c

src/setbrwindow.c

src/shortcuts.c

src/specsfile.c

src/update_image.c

src/wm_check.c

files modified:
ChangeLog

Makefile.am

Makefile.in

aclocal.m4

compile

config.guess

config.h.in

config.sub

configure

configure.ac

debian/changelog

debian/control

depcomp

doc/Makefile.in

doc/recordmydesktop.1

install-sh

missing

src/Makefile.am

src/Makefile.in

src/rmd_cache.c

src/rmd_error.c

src/rmd_frame.c

src/rmd_jack.c

src/rmd_rescue.c

src/rmd_timer.c

src/skeleton.c

Show diffs side-by-side

added added

removed removed

src/rmd_shortcuts.c

/******************************************************************************

* recordMyDesktop *

*******************************************************************************

* *

* This program is free software; you can redistribute it and/or modify *

* it under the terms of the GNU General Public License as published by *

* the Free Software Foundation; either version 2 of the License, or *

* (at your option) any later version. *

* *

* This program is distributed in the hope that it will be useful, *

* but WITHOUT ANY WARRANTY; without even the implied warranty of *

* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *

* GNU General Public License for more details. *

* *

* You should have received a copy of the GNU General Public License *

* along with this program; if not, write to the Free Software *

* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA *

* *

* For further information contact me at johnvarouhakis@gmail.com *

******************************************************************************/

#include "config.h"

#include "rmd_shortcuts.h"

#include "rmd_types.h"

#include <X11/Xlib.h>

#include <X11/Xlibint.h>

#include <X11/keysym.h>

#include <stdio.h>

#include <stdlib.h>

#include <string.h>

int RegisterShortcut(Display *dpy,

Window root,

const char *shortcut,

HotKey *hotkey){

int keycode=0,

i, j ;

KeySym key=0;

unsigned int modifier_mask=0,

numlock_mask=0;

char *keystr=NULL;

XModifierKeymap *modmap;

if(strstr(shortcut,"Shift"))

modifier_mask = modifier_mask|ShiftMask;

if(strstr(shortcut,"Control"))

modifier_mask = modifier_mask|ControlMask;

if(strstr(shortcut,"Mod1"))

modifier_mask = modifier_mask|Mod1Mask;

if(strstr(shortcut,"Mod2"))

modifier_mask = modifier_mask|Mod2Mask;

if(strstr(shortcut,"Mod3"))

modifier_mask = modifier_mask|Mod3Mask;

if(strstr(shortcut,"Mod4"))

modifier_mask = modifier_mask|Mod4Mask;

if(strstr(shortcut,"Mod5"))

modifier_mask = modifier_mask|Mod5Mask;

//we register the shortcut on the root

//window, which means on every keypress event,

//so I think it's neccessary to have at least one

//modifier.

if(modifier_mask == 0)

return 1;

if((keystr=rindex(shortcut,'+'))!=NULL){

keystr++;

if((key=XStringToKeysym(keystr))==NoSymbol)

return 1;

else

keycode=XKeysymToKeycode(dpy,key);

}

else

return 1;

/* Key grabbing stuff taken from tilda who took it from yeahconsole

* who took it from evilwm */

modmap = XGetModifierMapping(dpy);

for(i=0;i<8;i++){

for(j=0;j<modmap->max_keypermod;j++){

if(modmap->modifiermap[i*modmap->max_keypermod+j]==

XKeysymToKeycode(dpy,XK_Num_Lock))

numlock_mask=(1<<i);

}

XFreeModifiermap(modmap);

hotkey->modnum=0;

hotkey->key=keycode;

100

101

XGrabKey(dpy,

102

keycode,

103

modifier_mask,

104

root,

105

True,

106

GrabModeAsync,

107

GrabModeAsync);

108

hotkey->mask[0]=modifier_mask;

109

hotkey->modnum++;

110

111

XGrabKey(dpy,

112

keycode,

113

LockMask | modifier_mask,

114

root,

115

True,

116

GrabModeAsync,

117

GrabModeAsync);

118

hotkey->mask[1]=LockMask | modifier_mask;

119

hotkey->modnum++;

120

121

if(numlock_mask){

122

123

XGrabKey(dpy,

124

keycode,

125

numlock_mask | modifier_mask,

126

root,

127

True,

128

GrabModeAsync,

129

GrabModeAsync);

130

hotkey->mask[2]=numlock_mask | modifier_mask;

131

hotkey->modnum++;

132

133

XGrabKey(dpy,

134

keycode,

135

numlock_mask | LockMask | modifier_mask,

136

root,

137

True,

138

GrabModeAsync,

139

GrabModeAsync);

140

hotkey->mask[3]=numlock_mask | LockMask | modifier_mask;

141

hotkey->modnum++;

142

143

}

144

145

return 0;

146

147

}

148

149

150

151

152

153

Older »