summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2012-04-05Merge branch 'jess'HEADmasterJeremy Huddleston21-713/+748
Conflicts: include/xcwm/xtoq.h src/libxcwm/context_list.c src/libxcwm/event_loop.c src/libxcwm/init.c src/libxcwm/input.c src/libxcwm/window.c src/libxcwm/xcwm.c src/libxcwm/xcwm_internal.h src/xtoq/XtoqApplication.h src/xtoq/XtoqApplication.m src/xtoq/XtoqController.h src/xtoq/XtoqController.m src/xtoq/XtoqImageRep.m src/xtoq/XtoqView.h src/xtoq/XtoqView.m src/xtoq/XtoqWindow.h src/xtoq/XtoqWindow.m Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
2012-04-05Separate xcwm_context_t into two types, a context and a windowJess VanDerwalker16-329/+398
xcwm_context_t is now broken into xcwm_context_t which holds connection data, and xcwm_window_t which holds window specific data. Signed-off-by: Jess VanDerwalker <washu@sonic.net>
2012-04-05*.orig and *.patch files added to gitignoreJess VanDerwalker1-0/+4
Signed-off-by: Jess VanDerwalker <washu@sonic.net>
2012-04-05Key up and down events rolled into one handler.Jess VanDerwalker3-31/+20
xcwm_input_key_pressed and xcwm_input_key_released compressed into xcwm_input_key_event with state parameter to determine if key has been pressed or released. Signed-off-by: Jess VanDerwalker <washu@sonic.net>
2012-04-05Mouse button press and release rolled into one function.Jess VanDerwalker5-48/+37
xcwm_input_button_pressed and xcwm_input_button_released compressed into one function - xcwm_input_mouse_button_event that takes a state parameter to determine if mouse button has been pressed or released. Signed-off-by: Jess VanDerwalker <washu@sonic.net>
2012-04-05Namespaced input functions and removed window parameter.Jess VanDerwalker3-43/+35
Input functions are not prefixed with xcwm_input_*. Also removed the Mac window ID that was being passed into input functions for debugging purposes. Signed-off-by: Jess VanDerwalker <washu@sonic.net>
2012-04-05Removed dead code and formatted lines so under 80 chars.Jess VanDerwalker3-21/+29
Signed-off-by: Jess VanDerwalker <washu@sonic.net>
2012-04-05Removed dead code.Jess VanDerwalker2-8/+9
Signed-off-by: Jess VanDerwalker <washu@sonic.net>
2012-04-05Removed dead code. Added spaces for readability.Jess VanDerwalker4-103/+40
Signed-off-by: Jess VanDerwalker <washu@sonic.net>
2012-04-05Removal of dead code from XtoqController.*Jess VanDerwalker2-39/+11
Signed-off-by: Jess VanDerwalker <washu@sonic.net>
2012-04-05Mouse handler added to window (from milestone4-sendEvent on old repo).Jess VanDerwalker2-6/+33
2012-04-05Removed bad cookie checks. Button handlers taking mouse button (from ↵Jess VanDerwalker1-21/+5
milestone4-sendEvent branch on old repo).
2012-04-05Hard coded path to executables - was not always able to find application. ↵Jess VanDerwalker1-7/+12
xcb connection was being made before server started.
2012-04-05Commented out unnessary handlers. Removed tracking area (from ↵Jess VanDerwalker2-46/+37
milestone4-sendEvent branch on old repo).
2012-04-05Improved handling of window movement. Comments for *.h file. (from ↵Jess VanDerwalker2-61/+176
milestone4-sendEvent branch of old repository).
2012-04-05Expanded handling of events in sendEvent (from branch in old repository).Jess VanDerwalker2-27/+165
2012-03-27Expanded handling of events in sendEvent (from branch in old repository).Jess VanDerwalker2-66/+230
2012-03-26Formatting changes using uncrustifyJeremy Huddleston26-2086/+2323
indent butchers Objective C, so use this uncrustify config for consistent formatting: tok_split_gte=false utf8_byte=true utf8_force=true indent_cmt_with_tabs=false indent_align_string=false indent_braces=false indent_braces_no_func=false indent_braces_no_class=false indent_braces_no_struct=false indent_brace_parent=false indent_namespace=false indent_extern=false indent_class=false indent_class_colon=false indent_else_if=false indent_var_def_cont=false indent_func_call_param=false indent_func_def_param=false indent_func_proto_param=false indent_func_class_param=false indent_func_ctor_var_param=false indent_template_param=false indent_func_param_double=false indent_relative_single_line_comments=false indent_col1_comment=false indent_access_spec_body=false indent_paren_nl=false indent_comma_paren=false indent_bool_paren=false indent_first_bool_expr=false indent_square_nl=false indent_preserve_sql=false indent_align_assign=true sp_balance_nested_parens=false align_keep_tabs=false align_with_tabs=false align_on_tabstop=false align_number_left=false align_func_params=false align_same_func_call_params=false align_var_def_colon=true align_var_def_attribute=true align_var_def_inline=true align_right_cmt_mix=false align_on_operator=false align_mix_var_proto=false align_single_line_func=false align_single_line_brace=false align_nl_cont=false align_left_shift=true align_oc_decl_colon=true nl_collapse_empty_body=true nl_assign_leave_one_liners=true nl_class_leave_one_liners=true nl_enum_leave_one_liners=true nl_getset_leave_one_liners=true nl_func_leave_one_liners=true nl_if_leave_one_liners=true nl_multi_line_cond=false nl_multi_line_define=false nl_before_case=true nl_after_case=true nl_after_return=false nl_after_semicolon=true nl_after_brace_open=true nl_after_brace_open_cmt=false nl_after_vbrace_open=false nl_after_vbrace_open_empty=false nl_after_brace_close=false nl_after_vbrace_close=false nl_define_macro=false nl_squeeze_ifdef=false nl_ds_struct_enum_cmt=false nl_ds_struct_enum_close_brace=false nl_create_if_one_liner=false nl_create_for_one_liner=false nl_create_while_one_liner=false ls_for_split_full=false ls_func_split_full=false nl_after_multiline_comment=false eat_blanks_after_open_brace=false eat_blanks_before_close_brace=false mod_full_brace_if_chain=false mod_pawn_semicolon=false mod_full_paren_if_bool=false mod_remove_extra_semicolon=false mod_sort_import=false mod_sort_using=false mod_sort_include=false mod_move_case_break=false mod_remove_empty_return=false cmt_indent_multi=true cmt_c_group=false cmt_c_nl_start=false cmt_c_nl_end=false cmt_cpp_group=false cmt_cpp_nl_start=false cmt_cpp_nl_end=false cmt_cpp_to_c=false cmt_star_cont=false cmt_multi_check_last=true cmt_insert_before_preproc=false pp_indent_at_level=false pp_region_indent_code=false pp_if_indent_code=false pp_define_at_level=false indent_columns=4 indent_brace=0 indent_switch_case=0 align_struct_init_span=2 align_pp_define_gap=0 align_pp_define_span=2 align_oc_msg_colon_span=16 nl_end_of_file_min=1 nl_func_var_def_blk=0 code_width=78 nl_max=2 newlines=auto indent_with_tabs=0 sp_arith=force sp_assign=force sp_assign_default=force sp_before_assign=force sp_after_assign=force sp_enum_assign=force sp_enum_before_assign=force sp_enum_after_assign=force sp_pp_stringify=add sp_bool=force sp_compare=force sp_inside_paren=remove sp_paren_paren=remove sp_paren_brace=force sp_before_ptr_star=ignore sp_before_unnamed_ptr_star=force sp_before_byref=force sp_before_unnamed_byref=force sp_after_byref=remove sp_after_type=force sp_before_sparen=force sp_inside_sparen=remove sp_inside_sparen_close=remove sp_after_sparen=force sp_sparen_brace=force sp_special_semi=force sp_before_semi=remove sp_after_semi=force sp_after_semi_for=force sp_after_semi_for_empty=remove sp_before_square=remove sp_inside_square=remove sp_after_comma=force sp_before_comma=remove sp_paren_comma=force sp_before_ellipsis=force sp_after_class_colon=force sp_before_class_colon=force sp_before_case_colon=remove sp_after_cast=remove sp_inside_paren_cast=remove sp_sizeof_paren=remove sp_inside_braces_enum=force sp_inside_braces_struct=force sp_inside_braces=force sp_inside_braces_empty=remove sp_func_proto_paren=remove sp_func_def_paren=remove sp_inside_fparens=remove sp_inside_fparen=remove sp_square_fparen=remove sp_fparen_brace=force sp_func_call_paren=remove sp_func_call_paren_empty=remove sp_return_paren=force sp_attribute_paren=remove sp_defined_paren=remove sp_macro=force sp_macro_func=force sp_else_brace=force sp_brace_else=force sp_brace_typedef=force sp_not=remove sp_inv=remove nl_start_of_file=remove nl_end_of_file=force nl_assign_square=remove nl_after_square_assign=remove nl_fcall_brace=remove nl_enum_brace=remove nl_struct_brace=remove nl_union_brace=remove nl_if_brace=remove nl_brace_else=force nl_elseif_brace=remove nl_else_brace=remove nl_else_if=remove nl_for_brace=remove nl_do_brace=remove nl_brace_while=remove nl_switch_brace=remove nl_case_colon_brace=force nl_func_type_name=force nl_func_type_name_class=force nl_func_proto_type_name=force nl_func_paren=remove nl_func_def_paren=remove nl_func_decl_start=remove nl_func_def_start=remove nl_func_decl_args=remove nl_func_decl_end=remove nl_func_def_end=remove nl_func_decl_end_single=remove nl_func_def_end_single=remove nl_func_decl_empty=remove nl_func_def_empty=remove nl_fdef_brace=force nl_return_expr=remove nl_before_if=ignore nl_after_if=ignore nl_before_for=ignore nl_after_for=ignore nl_before_while=ignore nl_after_while=ignore nl_before_switch=ignore nl_after_switch=ignore nl_before_do=ignore nl_after_do=ignore pp_space=remove Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
2012-03-23Remove experimental subdirectoryJeremy Huddleston67-7922/+0
This contained student test code which should not be part of this distributable. Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
2012-03-23libxcwm: Formatting changes from modular/x-indent.shJeremy Huddleston12-631/+711
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
2012-03-23keymap: Remove dependence on pthreadsJeremy Huddleston2-17/+6
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
2012-03-23keymap: Rename functions to match our new namespaceJeremy Huddleston1-25/+25
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
2012-03-23keymap: Compile successfullyJeremy Huddleston1-79/+60
Add appropriate header includes and comment out a bunch of code to get keymap.c to at least compile Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
2012-03-23keymap: Establish our keymap.h APIJeremy Huddleston1-28/+10
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
2012-03-23Intitial import of keymap.[hc] and keysym2ucs.[hc]Jeremy Huddleston4-0/+1869
This is from hw/xquartz/quartzKeyboard.[hc] in xorg/xserver as of 3ac93a00ee76e9ed512142dee85649aa41dcdc6a Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
2012-03-23configure.ac: Add a check for libdispatchJeremy Huddleston1-0/+4
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
2012-03-23Add missing includes for config.hJeremy Huddleston13-6/+49
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
2012-03-23configure.ac: Add an --enable-xtoq option with auto detectionJeremy Huddleston2-1/+18
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
2012-03-21Rename us libxcwm (The X11 Compositing Window Manager Library)Jeremy Huddleston13-8/+8
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
2012-03-21API: Change namespace from xtoq_ to xcwm_Jeremy Huddleston20-309/+314
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
2012-03-21API: Begin obfuscation of private typesJeremy Huddleston15-90/+192
xtoq no longer pulls in private headers xtoq_event_t is now obfuscated (the other types need to be similarly changed) Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
2012-03-21API: Move xtoq.h into /include as public APIJeremy Huddleston11-11/+12
The API wis not stable at this point, and nothing outside of this repository should be using it yet. Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
2012-03-21Dead code removalJeremy Huddleston2-404/+0
Delete old xinitrc and xcode project Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
2012-03-19added contact info and how to run application to README file. Still need to ↵Benjamin Sanabria Carr1-2/+25
add comment about how you will need to update to most recent version of XQuartz to get to buiild properly, pending on discussion with Jeremy
2012-03-14Merge with milestone4-damage branch.Jess VanDerwalker8-85/+165
2012-03-13Merge branch 'milestone4-damage' of ↵Jess VanDerwalker2-21/+28
https://projects.cecs.pdx.edu/git/fa2011cs487-euclid into milestone4-damage
2012-03-13More code cleanup.Jess VanDerwalker3-14/+0
2012-03-11Added a few doxygen commentsDavid Snyder1-3/+27
2012-03-11Removed xtoq_free_image, which is redundantDavid Snyder1-5/+0
2012-03-11Removed dead some commented and dead codeDavid Snyder1-13/+1
2012-03-11removed some commented codeDavid Snyder1-15/+3
2012-03-11removed xtoq_free_imageDavid Snyder2-16/+4
2012-03-11Changes to settings of the contexts damaged area to get redrawing when ↵Jess VanDerwalker5-37/+90
window is enlarged and shrunk correct.
2012-03-10Removing damage from context when area redrawn in window.Jess VanDerwalker3-30/+35
2012-03-10Beginning work on changing how XtoQ gets image for damaged area.Jess VanDerwalker4-24/+36
2012-03-10Merge with milestone4-input.Jess VanDerwalker16-188/+439
2012-03-10Merge remote-tracking branch 'origin/milestone3'Jess VanDerwalker3-6/+10
2012-03-10Fixed some compiler warnings.Jess VanDerwalker4-7/+4
2012-03-10Error with decleration of notificationCenter var. Fixed.Jess VanDerwalker3-8/+13
2012-03-10Fix to merge conflict in event_loopJess VanDerwalker6-56/+80